mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Catch exceptions in upgrader if files or directories do not exist cp. http://board.s9y.org/viewtopic.php?f=1&t=19860

Browse Source
This commit is contained in:
Matthias Gutjahr 2014-04-16 23:45:16 +02:00
parent 6489cf7bf8
commit 7c8ac6822e
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/functions_upgrader.inc.php
View File

@ -158,13 +158,17 @@ $dead_htmlarea_dirs = array(
/** /**
* recursive directory call to purge files and directories * recursive directory call to purge files and directories
* *
* @param array $directories * @param array $dir directories
* @return * @return void
*/ */
function recursive_directory_iterator($dir = array()) { function recursive_directory_iterator($dir = array()) {
foreach ($dir AS $path) { foreach ($dir AS $path) {
serendipity_removeDeadFiles_SPL($path); try {
@rmdir($path); serendipity_removeDeadFiles_SPL($path);
@rmdir($path);
} catch (Exception $e) {
echo htmlspecialchars($path) . " &gt;&gt; File or directory probably does not exist.<br/>";
}
} }
} }
@ -273,20 +277,19 @@ function serendipity_killPlugin($name) {
serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}plugins WHERE name LIKE '" . serendipity_db_escape_string($name) . "%'"); serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}plugins WHERE name LIKE '" . serendipity_db_escape_string($name) . "%'");
} }
/** /**
* Empty a given directory recursively using the Standard PHP Library (SPL) iterator * Empty a given directory recursively using the Standard PHP Library (SPL) iterator
* Use as full purge by serendipity_removeDeadFiles_SPL(/path/to/dir) * Use as full purge by serendipity_removeDeadFiles_SPL(/path/to/dir)
* Or strict by serendipity_removeDeadFiles_SPL('/path/to/dir', $filelist, $directorylist, true) * Or strict by serendipity_removeDeadFiles_SPL('/path/to/dir', $filelist, $directorylist, true)
* *
* @access private * @access private
* *
* @param string directory * @param string $dir directory
* @param array dead files list * @param array $deadfiles dead files list
* @param array dead directories list * @param array $purgedir dead directories list
* @param boolean run list only else recursive default * @param boolean $list_only run list only else recursive default
* *
* @return * @return void
*/ */
function serendipity_removeDeadFiles_SPL($dir=null, $deadfiles=null, $purgedir=null, $list_only=false) { function serendipity_removeDeadFiles_SPL($dir=null, $deadfiles=null, $purgedir=null, $list_only=false) {
if (!is_dir($dir)) return; if (!is_dir($dir)) return;
@ -296,7 +299,7 @@ function serendipity_removeDeadFiles_SPL($dir=null, $deadfiles=null, $purgedir=n
foreach ($iterator as $file) { foreach ($iterator as $file) {
$thisfile = str_replace($search, $replace, $file->__toString()); $thisfile = str_replace($search, $replace, $file->__toString());
if ($file->isFile()) { if ($file->isFile()) {
if (is_array($deadfiles) && !empty($deadfiles)) { if (is_array($deadfiles) && !empty($deadfiles)) {
foreach ($deadfiles AS $deadfile) { foreach ($deadfiles AS $deadfile) {
#if( basename($deadfile) == basename($thisfile) ) echo 'LIST FILE: '.$dir . '/' . $deadfile . ' == ' . $thisfile . ' && basename(file) == ' . basename($thisfile) . "<br>\n"; #if( basename($deadfile) == basename($thisfile) ) echo 'LIST FILE: '.$dir . '/' . $deadfile . ' == ' . $thisfile . ' && basename(file) == ' . basename($thisfile) . "<br>\n";
if ($dir . '/' . $deadfile === $thisfile) { if ($dir . '/' . $deadfile === $thisfile) {