opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

now use new core funtion to recursively delete

This commit is contained in:
Andreas Gohr 2014-01-06 21:06:09 +01:00
parent 9a6e0ba0d0
commit 0826f6cbd9
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/plugins/extension/helper/extension.php
View File

@ -33,7 +33,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
*/
public function __destruct() {
foreach($this->temporary as $dir){
$this->dir_delete($dir);
io_rmdir($dir, true);
}
}
@ -640,7 +640,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
*/
public function uninstall() {
$this->purgeCache();
return $this->dir_delete($this->getInstallDir());
return io_rmdir($this->getInstallDir(), true);
}
/**
@ -768,30 +768,6 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
io_saveFile($managerpath, $data);
}
/**
* delete, with recursive sub-directory support
*
* @param string $path The path that shall be deleted
* @return bool If the directory has been successfully deleted
*/
protected function dir_delete($path) {
if(!is_string($path) || $path == "") return false;
if(is_dir($path) && !is_link($path)) {
if(!$dh = @opendir($path)) return false;
while ($f = readdir($dh)) {
if($f == '..' || $f == '.') continue;
$this->dir_delete("$path/$f");
}
closedir($dh);
return @rmdir($path);
} else {
return @unlink($path);
}
}
/**
* Returns a temporary directory
*
@ -828,7 +804,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
// download
if(!$file = io_download($url, $tmp.'/', true, $file, 0)) {
$this->dir_delete($tmp);
io_rmdir($tmp, true);
throw new Exception(sprintf($this->getLang('error_download'), '<bdi>'.hsc($url).'</bdi>'));
}
@ -926,7 +902,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
}
// cleanup
if($tmp) $this->dir_delete($tmp);
if($tmp) io_rmdir($tmp, true);
return $installed_extensions;
}