issue 92 add skin fix column in modules

add site_srl column in module_config table
modiy module_config each site


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8651 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/module/module.class.php

@@ -71,6 +71,11 @@
 			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
 			if(!$oDB->isColumnExists("modules", "mskin")) return true;
 
+			// check fix skin
+			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			
+			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+
             return false;
         }
 
@@ -289,7 +294,23 @@
 			if(!$oDB->isColumnExists("modules", "mskin")) {
 				$oDB->addColumn('modules','mskin','varchar',250);
 			}
-
+			if(!$oDB->isColumnExists("modules", "is_skin_fix")){
+				$oDB->addColumn('modules', 'is_skin_fix', 'char', 1, 'N');
+				$output = executeQueryArray('module.getAllSkinSetModule');
+				if ($output->toBool()){
+					$module_srls = array();
+					foreach($output->data as $val){
+						$module_srls[] = $val->module_srl;
+					}
+					unset($args);
+					$args->module_srls = implode(',', $module_srls);
+					$args->is_skin_fix = 'Y';
+					$output = executeQuery('module.updateSkinFixModules', $args);
+				}
+			}
+			if(!$oDB->isColumnExists("module_config", "site_srl")){
+				$oDB->addColumn('module_config', 'site_srl', 'number', 11, 0, true);
+			}
             return new Object(0, 'success_updated');
         }
 

modules/module/module.controller.php

@@ -122,9 +122,10 @@
          * @brief Enter a specific set of modules
          * In order to manage global configurations of modules such as board, member and so on
          **/
-        function insertModuleConfig($module, $config) {
+        function insertModuleConfig($module, $config, $site_srl = 0) {
             $args->module = $module;
             $args->config = serialize($config);
+			$args->site_srl = $site_srl;
 
             $output = executeQuery('module.deleteModuleConfig', $args);
             if(!$output->toBool()) return $output;

modules/module/module.model.php

@@ -860,6 +860,8 @@
                 }
             }
 
+            $thumbnail = sprintf("%s%s/%s/thumbnail.png", $path, $dir, $skin);
+            $skin_info->thumbnail = (file_exists($thumbnail))?$thumbnail:null;
             return $skin_info;
         }
 
@@ -877,14 +879,15 @@
          * @brief Return module configurations
          * Global configuration is used to manage board, member and others
          **/
-        function getModuleConfig($module) {
+        function getModuleConfig($module, $site_srl = 0) {
-            if(!$GLOBALS['__ModuleConfig__'][$module]) {
+            if(!$GLOBALS['__ModuleConfig__'][$site_srl][$module]) {
                 $args->module = $module;
+				$args->site_srl = $site_srl;
                 $output = executeQuery('module.getModuleConfig', $args);
                 $config = unserialize($output->data->config);
-                $GLOBALS['__ModuleConfig__'][$module] = $config;
+                $GLOBALS['__ModuleConfig__'][$site_srl][$module] = $config;
             }
-            return $GLOBALS['__ModuleConfig__'][$module];
+            return $GLOBALS['__ModuleConfig__'][$site_srl][$module];
         }
 
         /**

modules/module/queries/deleteModuleConfig.xml

@@ -4,5 +4,6 @@
     </tables>
     <conditions>
         <condition operation="equal" column="module" var="module" notnull="notnull" />
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/module/queries/getAllSkinSetModule.xml

@@ -0,0 +1,11 @@
+<query id="getAllSkinSetModule" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+    </columns>
+    <conditions>
+        <condition operation="notequal" column="skin" default=" " />
+    </conditions>
+</query>

modules/module/queries/getModuleConfig.xml

@@ -7,5 +7,6 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module" var="module" />
+        <condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
     </conditions>
 </query>

modules/module/queries/insertModuleConfig.xml

@@ -5,6 +5,7 @@
     <columns>
         <column name="module" var="module" notnull="notnull" />
         <column name="config" var="config" />
+        <column name="site_srl" var="site_srl" notnull="notnull" />
         <column name="regdate" default="curdate()" />
     </columns>
 </query>

modules/module/queries/updateAllModuleSkinInSiteWithTheme.xml

@@ -0,0 +1,15 @@
+<query id="updateModule" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+		<column name="skin" var="skin" notnull="notnull" />
+	</columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="module" var="module" notnull="notnull" pipe="and" />
+		<condition operation="equal" column="is_skin_fix" default="N" pipe="and" />
+		<condition operation="in" column="module_srl" var="module_srls" pipe="and" />
+    </conditions>
+</query>
+

modules/module/queries/updateSkinFixModules.xml

@@ -0,0 +1,11 @@
+<query id="updateSkinFixModules" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="is_skin_fix" var="is_skin_fix" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srls" notnull="notnull" />
+    </conditions>
+</query>

modules/module/schemas/module_config.xml

@@ -1,5 +1,6 @@
 <table name="module_config">
     <column name="module" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
+    <column name="site_srl" type="number" size="11" notnull="notnull" />
     <column name="config" type="text" />
     <column name="regdate" type="date" />
 </table>

modules/module/schemas/modules.xml

@@ -8,6 +8,7 @@
     <column name="menu_srl" type="number" size="11" default="0" />
     <column name="site_srl" type="number" size="11" notnull="notnull" default="0" />
     <column name="mid" type="varchar" size="40" notnull="notnull" />
+    <column name="is_skin_fix" type="char" size="1" notnull="notnull" default="Y" />
     <column name="skin" type="varchar" size="250" />
     <column name="mskin" type="varchar" size="250" />
     <column name="browser_title" type="varchar" size="250" notnull="notnull" />