diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 2a9c6bdb92b..fc7f4e25c68 100755 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -161,7 +161,7 @@ if ($action == 'edit') { $form=new Form($db); - if (! count($listofmethods)) print '
'.$langs->trans("NoSmsEngine",'DoliStore').'
'; + if (! count($listofmethods)) print '
'.$langs->trans("NoSmsEngine",'DoliStore').'
'; print '
'; print ''; @@ -217,7 +217,7 @@ else { $var=true; - if (! count($listofmethods)) print '
'.$langs->trans("NoSmsEngine",'DoliStore').'
'; + if (! count($listofmethods)) print '
'.$langs->trans("NoSmsEngine",'DoliStore').'
'; print ''; print ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index cea565515b5..66261dbe57b 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2279,4 +2279,4 @@ else // End of page llxFooter(); $db->close(); -?> +?> \ No newline at end of file diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 23bf990ae69..726b3486e30 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -42,7 +42,7 @@ function dol_basename($pathfile) * @param string $path Starting path from which to search * @param string $types Can be "directories", "files", or "all" * @param int $recursive Determines whether subdirectories are searched - * @param string $filter Regex for include filter + * @param string $filter Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function * @param string $excludefilter Array of Regex for exclude filter (example: array('\.meta$','^\.')) * @param string $sortcriteria Sort criteria ("","fullname","name","date","size") * @param string $sortorder Sort order (SORT_ASC, SORT_DESC) @@ -65,7 +65,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil $path=preg_replace('/([\\/]+)$/i','',$path); $newpath=dol_osencode($path); - if (! $nohook) + if (! $nohook) { $hookmanager->initHooks(array('fileslib')); @@ -1212,11 +1212,11 @@ function dol_uncompress($inputfile,$outputdir) /** - * Return most recent file + * Return file(s) into a directory (by default most recent) * * @param string $dir Directory to scan - * @param string $regexfilter Regexfilter - * @param string $excludefilter Array of Regex for exclude filter (example: array('\.meta$','^\.')) + * @param string $regexfilter Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function + * @param string $excludefilter Array of Regex for exclude filter (example: array('\.meta$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function * @param int $nohook Disable all hooks * @return string Full path to most recent file */ @@ -1225,4 +1225,5 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('\.meta$ $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,'',$nohook); return $tmparray[0]; } -?> + +?> \ No newline at end of file diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 0066b3ad485..390e4081066 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -1522,4 +1522,4 @@ else llxFooter(); $db->close(); -?> \ No newline at end of file +?>
'.$langs->trans("Parameter").''.$langs->trans("Value").'