From dce03cbc404ad370ece52fbf4f4b81621b97ad17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <timwolla@arcor.de>
Date: Thu, 18 Aug 2011 16:04:04 +0200
Subject: [PATCH] Using DirectoryUtil at more places

- TemplateEditor::deleteCompiledFiles()
- TemplateGroupEditor::deleteFolders()
---
 .../lib/data/template/TemplateEditor.class.php  |  6 ++----
 .../group/TemplateGroupEditor.class.php         | 17 ++---------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
index 39a7213b84..65b395f114 100644
--- 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 270a09a896..4b8f6db3a8 100644
--- 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();
 		}
 	}
 }
-- 
2.20.1