OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

added opendir() error handling

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/lib2/smarty/internals/core.rm_auto.php
View File

@ -51,14 +51,17 @@ 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;
$_res = true; if ($_handle = opendir($params['auto_base']))
while (false !== ($_filename = readdir($_handle))) { {
if($_filename == '.' || $_filename == '..') { $_res = true;
continue; while (false !== ($_filename = readdir($_handle))) {
} elseif (substr($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) { if($_filename == '.' || $_filename == '..') {
$_res &= (bool)$smarty->_unlink($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, $params['exp_time']); continue;
} } elseif (substr($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) {
$_res &= (bool)$smarty->_unlink($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, $params['exp_time']);
}
}
} }
} }
} }

16
htdocs/resource2/ocstyle/images/head/rotator.php
View File

@ -164,19 +164,21 @@ if (substr($folder,-1) != '/')
} }
$fileList = array(); $fileList = array();
$handle = opendir($folder); if ($handle = opendir($folder))
while (false !== ($file = readdir($handle)))
{ {
if (is_file($file)) while (false !== ($file = readdir($handle)))
{ {
$file_info = pathinfo($file); if (is_file($file))
if (isset($extList[strtolower($file_info['extension'])]))
{ {
$fileList[] = $file; $file_info = pathinfo($file);
if (isset($extList[strtolower($file_info['extension'])]))
{
$fileList[] = $file;
}
} }
} }
closedir($handle);
} }
closedir($handle);
if (count($fileList) > 0) if (count($fileList) > 0)
{ {

2
htdocs/xml/ocxml11.php
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
{ {