From 825ea283b635d70dce0ebafa7659a9178ed6a622 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 15 Mar 2007 04:34:15 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@453
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/install/install.controller.php  | 8 +++++++-
 modules/module/queries/insertModule.xml | 2 +-
 modules/module/schemas/modules.xml      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index e1cd0e0b3..090582f4a 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -121,6 +121,9 @@
          **/
         function installDownloadedModule() {
 
+            // 수동으로 설치를 할 목록
+            $manual_modules = array('install','module','pagemaker');
+
             // install, module 모듈은 미리 설치 
             $this->installModule('install', './modules/install/');
             $this->installModule('module', './modules/module/');
@@ -135,10 +138,13 @@
                 $module = $tmp_arr[count($tmp_arr)-1];
 
                 // 미리 수동으로 설치한 모듈이면 패스~
-                if(in_array($module, array('install','module'))) continue;
+                if(in_array($module, $manual_modules)) continue;
 
                 $this->installModule($module, $module_path);
             }
+
+            // pagemaker는 모두 설치된 후에 설치
+            $this->installModule('pagemaker','./modules/pagemaker');
             return new Object();
         }
 
diff --git a/modules/module/queries/insertModule.xml b/modules/module/queries/insertModule.xml
index d146db8a4..e7dd470d7 100644
--- a/modules/module/queries/insertModule.xml
+++ b/modules/module/queries/insertModule.xml
@@ -6,7 +6,7 @@
     <column name="module_srl" default="module_srl" notnull="notnull" />
     <column name="module_category_srl" default="module_category_srl" />
     <column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />
-    <column name="skin" var="skin" notnull="notnull" minlength="1" maxlength="250" />
+    <column name="skin" var="skin" minlength="1" maxlength="250" />
     <column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />
     <column name="description" var="description" />
     <column name="module" var="module" notnull="notnull" maxlength="80"/>
diff --git a/modules/module/schemas/modules.xml b/modules/module/schemas/modules.xml
index f3ab488e6..b399299f1 100644
--- a/modules/module/schemas/modules.xml
+++ b/modules/module/schemas/modules.xml
@@ -4,7 +4,7 @@
   <column name="module_category_srl" type="number" size="11" notnull="notnull" default="0" index="idx_module_category" />
   <column name="layout_srl" type="number" size="11" notnull="notnull" default="0" />
   <column name="mid" type="varchar" size="40" notnull="notnull" unique="unique_mid"/>
-  <column name="skin" type="varchar" size="250" notnull="notnull" />
+  <column name="skin" type="varchar" size="250" />
   <column name="browser_title" type="varchar" size="250" notnull="notnull"/>
   <column name="description" type="text" size="250" />
   <column name="is_default" type="char" size="1" notnull="notnull" default="N" />