Using DirectoryUtil at more places

- TemplateEditor::deleteCompiledFiles()
- TemplateGroupEditor::deleteFolders()

diff --git a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
index 39a7213b84ca5044298e376e4e189777e0de2150..65b395f1147c51faef53e08d604ccdcb224edc89 100644 (file)
--- a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
+++ b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\template;
 use wcf\data\DatabaseObjectEditor;
+use wcf\util\DirectoryUtil;
 use wcf\system\io\File;
 use wcf\system\WCF;
 
@@ -111,9 +112,6 @@ class TemplateEditor extends DatabaseObjectEditor {
         * Deletes the compiled files of this template.
         */
        public function deleteCompiledFiles() {
-               $matches = glob(WCF_DIR . 'templates/compiled/' . $this->packageID . '_*_' . $this->templateName . '.php');
-               if (is_array($matches)) {
-                       foreach ($matches as $match) @unlink($match);
-               }
+               DirectoryUtil::getInstance(WCF_DIR . 'templates/compiled/')->removePattern('~' . intval($this->packageID) . '_.*_' . preg_quote($this->templateName, '~') . '.php~');
        }
 }

diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php
index 270a09a8960c90580e32d610a9374bf66e387e3b..4b8f6db3a8439c37fc12c198a2ce6e667fd5a747 100644 (file)
--- a/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php
+++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php
@@ -3,6 +3,7 @@ namespace wcf\data\template\group;
 use wcf\data\DatabaseObjectEditor;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
+use wcf\util\DirectoryUtil;
 
 /**
  * TemplateGroupEditor provides functions to create, edit or delete template group. 
@@ -90,21 +91,7 @@ class TemplateGroupEditor extends DatabaseObjectEditor {
                $statement->execute();
                while ($row = $statement->fetchArray()) {
                        $packageDir = FileUtil::getRealPath(WCF_DIR . $row['packageDir']);
-                       $folders[] = $packageDir . 'templates/' . $this->templateGroupFolderName;
-               }
-               
-               // rename folders
-               foreach ($folders as $folder) {
-                       if (file_exists($folder)) {
-                               // empty folder
-                               $files = glob(FileUtil::addTrailingSlash($folder).'*');
-                               if (is_array($files)) {
-                                       foreach ($files as $file) @unlink($file);
-                               }
-                               
-                               // delete foler
-                               @rmdir($folder);
-                       }
+                       DirectoryUtil::getInstance($packageDir . 'templates/' . $this->templateGroupFolderName)->deleteAll();
                }
        }
 }