From 1349cf70ed0ad024e09f99242998cd0c68bc07dd Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 16 Mar 2007 01:10:11 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@464
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/file/file.class.php            | 13 ++-----------
 modules/install/install.controller.php | 10 ++--------
 modules/layout/layout.class.php        | 13 ++-----------
 modules/module/module.class.php        | 12 +-----------
 modules/pagemaker/pagemaker.class.php  | 20 +-------------------
 modules/plugin/plugin.class.php        | 11 +----------
 6 files changed, 9 insertions(+), 70 deletions(-)

diff --git a/modules/file/file.class.php b/modules/file/file.class.php
index 80a948532..ef8752054 100644
--- a/modules/file/file.class.php
+++ b/modules/file/file.class.php
@@ -12,18 +12,9 @@
          **/
         function moduleInstall() {
             // file 모듈에서 사용할 디렉토리 생성
-            $directory_list = array(
-                    './files',
-                    './files/attach',
-                    './files/attach/images',
-                    './files/attach/binaries',
-                );
+            FileHandler::makeDir('./files/attach/images');
+            FileHandler::makeDir('./files/attach/binaries');
 
-            foreach($directory_list as $dir) {
-                if(is_dir($dir)) continue;
-                @mkdir($dir, 0707);
-                @chmod($dir, 0707);
-            }
             return new Object();
         }
 
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 090582f4a..0ed683421 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -95,22 +95,18 @@
          **/
         function makeDefaultDirectory() {
             $directory_list = array(
-                    './files',
                     './files/config',
                     './files/modules',
                     './files/plugins',
                     './files/addons',
                     './files/layouts',
-                    './files/cache',
                     './files/cache/queries',
                     './files/cache/js_filter_compiled',
                     './files/cache/template_compiled',
                 );
 
             foreach($directory_list as $dir) {
-                if(is_dir($dir)) continue;
-                @mkdir($dir, 0707);
-                @chmod($dir, 0707);
+                FileHandler::makeDir($dir);
             }
         }
 
@@ -122,7 +118,7 @@
         function installDownloadedModule() {
 
             // 수동으로 설치를 할 목록
-            $manual_modules = array('install','module','pagemaker');
+            $manual_modules = array('install','module');
 
             // install, module 모듈은 미리 설치 
             $this->installModule('install', './modules/install/');
@@ -143,8 +139,6 @@
                 $this->installModule($module, $module_path);
             }
 
-            // pagemaker는 모두 설치된 후에 설치
-            $this->installModule('pagemaker','./modules/pagemaker');
             return new Object();
         }
 
diff --git a/modules/layout/layout.class.php b/modules/layout/layout.class.php
index 91a3e50eb..ffc7fe3c6 100644
--- a/modules/layout/layout.class.php
+++ b/modules/layout/layout.class.php
@@ -11,18 +11,9 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // layout 에서 사용할 cache디렉토리 생성
-            $directory_list = array(
-                    './files',
-                    './files/cache',
-                    './files/cache/layout',
-                );
+            // 레이아웃에서 사용할 디렉토리 생성
+            FileHandler::makeDir('./files/cache/layout');
 
-            foreach($directory_list as $dir) {
-                if(is_dir($dir)) continue;
-                @mkdir($dir, 0707);
-                @chmod($dir, 0707);
-            }
             return new Object();
         }
 
diff --git a/modules/module/module.class.php b/modules/module/module.class.php
index e290b8235..e5dfab687 100644
--- a/modules/module/module.class.php
+++ b/modules/module/module.class.php
@@ -12,17 +12,7 @@
          **/
         function moduleInstall() {
             // module 모듈에서 사용할 디렉토리 생성
-            $directory_list = array(
-                    './files',
-                    './files/cache',
-                    './files/cache/module_info',
-                );
-
-            foreach($directory_list as $dir) {
-                if(is_dir($dir)) continue;
-                @mkdir($dir, 0707);
-                @chmod($dir, 0707);
-            }
+            FileHandler::makeDir('./files/cache/module_info');
 
             // 기본 모듈을 생성
             $oModule = &getController('module');
diff --git a/modules/pagemaker/pagemaker.class.php b/modules/pagemaker/pagemaker.class.php
index ef319f7b8..88a882355 100644
--- a/modules/pagemaker/pagemaker.class.php
+++ b/modules/pagemaker/pagemaker.class.php
@@ -12,25 +12,7 @@
          **/
         function moduleInstall() {
             // plugin 에서 사용할 cache디렉토리 생성
-            $directory_list = array(
-                    './files',
-                    './files/cache',
-                    './files/cache/page',
-                );
-
-            foreach($directory_list as $dir) {
-                if(is_dir($dir)) continue;
-                @mkdir($dir, 0707);
-                @chmod($dir, 0707);
-            }
-
-            // page 모듈로 모듈 추가
-            $oModuleController = &getController('module');
-            $args->mid = 'pagemaker';
-            $args->module = 'pagemaker';
-            $args->browser_title = 'pagemaker';
-            $args->is_default = 'N';
-            $output = $oModuleController->insertModule($args);
+            FileHandler::makeDir('./files/cache/page');
 
             return new Object();
         }
diff --git a/modules/plugin/plugin.class.php b/modules/plugin/plugin.class.php
index b002ed160..7c452f7ea 100644
--- a/modules/plugin/plugin.class.php
+++ b/modules/plugin/plugin.class.php
@@ -12,17 +12,8 @@
          **/
         function moduleInstall() {
             // plugin 에서 사용할 cache디렉토리 생성
-            $directory_list = array(
-                    './files',
-                    './files/cache',
-                    './files/cache/plugin',
-                );
+            FileHandler::makeDir('./files/cache/plugin');
 
-            foreach($directory_list as $dir) {
-                if(is_dir($dir)) continue;
-                @mkdir($dir, 0707);
-                @chmod($dir, 0707);
-            }
             return new Object();
         }