added opendir() error handling

This commit is contained in:
following
2013-04-11 20:38:02 +02:00
parent c594dfa443
commit ffc9b68081
3 changed files with 21 additions and 16 deletions

View File

@ -51,7 +51,9 @@ function smarty_core_rm_auto($params, &$smarty)
$_res = smarty_core_rmdir($_params, $smarty); $_res = smarty_core_rmdir($_params, $smarty);
} else { } else {
// remove matching file names // remove matching file names
$_handle = opendir($params['auto_base']); $_res = false;
if ($_handle = opendir($params['auto_base']))
{
$_res = true; $_res = true;
while (false !== ($_filename = readdir($_handle))) { while (false !== ($_filename = readdir($_handle))) {
if($_filename == '.' || $_filename == '..') { if($_filename == '.' || $_filename == '..') {
@ -62,6 +64,7 @@ function smarty_core_rm_auto($params, &$smarty)
} }
} }
} }
}
return $_res; return $_res;
} }

View File

@ -164,7 +164,8 @@ if (substr($folder,-1) != '/')
} }
$fileList = array(); $fileList = array();
$handle = opendir($folder); if ($handle = opendir($folder))
{
while (false !== ($file = readdir($handle))) while (false !== ($file = readdir($handle)))
{ {
if (is_file($file)) if (is_file($file))
@ -177,6 +178,7 @@ while (false !== ($file = readdir($handle)))
} }
} }
closedir($handle); closedir($handle);
}
if (count($fileList) > 0) if (count($fileList) > 0)
{ {

View File

@ -1093,7 +1093,7 @@ function unlinkrecursiv($path)
$notunlinked = 0; $notunlinked = 0;
$hDir = opendir($path); $hDir = opendir($path);
if ($hDir === FALSE) if ($hDir === false)
++$notunlinked; ++$notunlinked;
else else
{ {