This commit is contained in:
Laurent Destailleur
2010-09-29 13:14:48 +00:00
parent c3b4655e21
commit c3c4015df1
2 changed files with 31 additions and 34 deletions

View File

@@ -258,9 +258,9 @@ function dol_mimetype($file,$default='application/octet-stream',$mode=0)
/** /**
* \brief Test if filename is a directory * Test if filename is a directory
* \param folder Name of folder * @param folder Name of folder
* \return boolean True if it's a directory, False if not found * @return boolean True if it's a directory, False if not found
*/ */
function dol_is_dir($folder) function dol_is_dir($folder)
{ {
@@ -269,11 +269,21 @@ function dol_is_dir($folder)
else return false; else return false;
} }
/**
* Return if path is a file
* @param $pathoffile
* @return boolean True or false
*/
function dol_is_file($pathoffile)
{
$newpathoffile=dol_osencode($pathoffile);
return is_file($newpathoffile);
}
/** /**
* \brief Test if a folder is empty * Test if a folder is empty
* \param folder Name of folder * @param folder Name of folder
* \return boolean True if dir is empty or non-existing, False if it contains files * @return boolean True if dir is empty or non-existing, False if it contains files
*/ */
function dol_dir_is_emtpy($folder) function dol_dir_is_emtpy($folder)
{ {
@@ -297,9 +307,9 @@ function dol_dir_is_emtpy($folder)
} }
/** /**
* \brief Count number of lines in a file * Count number of lines in a file
* \param file Filename * @param file Filename
* \return int <0 if KO, Number of lines in files if OK * @return int <0 if KO, Number of lines in files if OK
*/ */
function dol_count_nb_of_line($file) function dol_count_nb_of_line($file)
{ {
@@ -328,7 +338,6 @@ function dol_count_nb_of_line($file)
/** /**
* Return size of a file * Return size of a file
*
* @param $pathoffile * @param $pathoffile
* @return string File size * @return string File size
*/ */
@@ -350,18 +359,6 @@ function dol_filemtime($pathoffile)
return filemtime($newpathoffile); return filemtime($newpathoffile);
} }
/**
* Return if path is a file
*
* @param $pathoffile
* @return boolean True or false
*/
function dol_is_file($pathoffile)
{
$newpathoffile=dol_osencode($pathoffile);
return is_file($newpathoffile);
}
/** /**
* Copy a file to another file * Copy a file to another file
* @param $srcfile Source file (can't be a directory) * @param $srcfile Source file (can't be a directory)

View File

@@ -2250,10 +2250,10 @@ function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrow
/** /**
* \brief Remove a file or several files with a mask * Remove a file or several files with a mask
* \param file File to delete or mask of file to delete * @param file File to delete or mask of file to delete
* \param disableglob Disable usage of glob like * * @param disableglob Disable usage of glob like *
* \param boolean True if file is deleted, False if error * @param boolean True if file is deleted, False if error
*/ */
function dol_delete_file($file,$disableglob=0) function dol_delete_file($file,$disableglob=0)
{ {
@@ -2279,10 +2279,10 @@ function dol_delete_file($file,$disableglob=0)
} }
/** /**
* \brief Remove a directory * Remove a directory (not recursive, so content must be empty).
* \param file Directory to delete * If directory is not empty, return false
* \return boolean True if success, false if error * @param file Directory to delete
* \remarks If directory is not empty, return false * @return boolean True if success, false if error
*/ */
function dol_delete_dir($dir) function dol_delete_dir($dir)
{ {
@@ -2291,10 +2291,10 @@ function dol_delete_dir($dir)
} }
/** /**
* \brief Remove a directory $dir and its subdirectories * Remove a directory $dir and its subdirectories
* \param file Dir to delete * @param file Dir to delete
* \param count Counter to count nb of deleted elements * @param count Counter to count nb of deleted elements
* \return int Number of files and directory removed * @return int Number of files and directory removed
*/ */
function dol_delete_dir_recursive($dir,$count=0) function dol_delete_dir_recursive($dir,$count=0)
{ {