Changeset 6726 for temp

Timestamp:

2006/10/25 19:36:25 (20 years ago)

Author:

naka

Message:

* empty log message *

File:

• temp/trunk/html/admin/system/module.php (modified) (1 diff)

temp/trunk/html/admin/system/module.php

@@ -147 +147 @@
             // ¥«¥é¥à¿ô¤¬Àµ¾ï¤Ç¤¢¤Ã¤¿¾ì¹ç¤Î¤ß
             if(count($arrCSV) == UPDATE_CSV_COL_MAX) {
-                
-                // ¼èÆÀ¤·¤¿¥¢¥Ã¥×¥Ç¡¼¥È¾ðÊó¤òDB¤Ë½ñ¤­¹þ¤à
-                $sqlval['module_id'] = $arrCSV[0];
-                $sqlval['module_name'] = $arrCSV[1];
-                $sqlval['latest_version'] = $arrCSV[3];
-                $sqlval['module_explain'] = $arrCSV[4];
-                $sqlval['main_php'] = $arrCSV[5];
-                $sqlval['extern_php'] = $arrCSV[6];
-                $sqlval['install_sql'] = $arrCSV[7];
-                $sqlval['uninstall_sql'] = $arrCSV[8];              
-                $sqlval['other_files'] = $arrCSV[9];
-                $sqlval['del_flg'] = $arrCSV[10];
-                $sqlval['update_date'] = "now()";
-                $sqlval['release_date'] = $arrCSV[12];
-                // ´û¸¥ì¥³¡¼¥É¤Î¥Á¥§¥Ã¥¯
-                $cnt = $objQuery->count("dtb_module", "module_id = ?", array($sqlval['module_id']));
-                if($cnt > 0) {
-                    // ¤¹¤Ç¤Ë¼èÆÀ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¹¹¿·¤¹¤ë¡£ 
-                    $objQuery->update("dtb_module", $sqlval, "module_id = ?", array($sqlval['module_id']));
-                } else {
-                    // ¿·µ¬¥ì¥³¡¼¥É¤ÎÄɲÃ
-                    $sqlval['create_date'] = "now()";
-                    $objQuery->insert("dtb_module", $sqlval);
+                // ¥â¥¸¥å¡¼¥ë¤¬Âбþ¤·¤Æ¤¤¤ëËÜÂΤΥС¼¥¸¥ç¥ó
+                $version = $arrCSV[13];
+                if(is_numeric(ECCUBE_VERSION) && is_numeric($version) && ECCUBE_VERSION > $version) {                               
+                    // ¼èÆÀ¤·¤¿¥¢¥Ã¥×¥Ç¡¼¥È¾ðÊó¤òDB¤Ë½ñ¤­¹þ¤à
+                    $sqlval['module_id'] = $arrCSV[0];
+                    $sqlval['module_name'] = $arrCSV[1];
+                    $sqlval['latest_version'] = $arrCSV[3];
+                    $sqlval['module_explain'] = $arrCSV[4];
+                    $sqlval['main_php'] = $arrCSV[5];
+                    $sqlval['extern_php'] = $arrCSV[6];
+                    $sqlval['install_sql'] = $arrCSV[7];
+                    $sqlval['uninstall_sql'] = $arrCSV[8];              
+                    $sqlval['other_files'] = $arrCSV[9];
+                    $sqlval['del_flg'] = $arrCSV[10];
+                    $sqlval['update_date'] = "now()";
+                    $sqlval['release_date'] = $arrCSV[12];
+                    // ´û¸¥ì¥³¡¼¥É¤Î¥Á¥§¥Ã¥¯
+                    $cnt = $objQuery->count("dtb_module", "module_id = ?", array($sqlval['module_id']));
+                    if($cnt > 0) {
+                        // ¤¹¤Ç¤Ë¼èÆÀ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¹¹¿·¤¹¤ë¡£ 
+                        $objQuery->update("dtb_module", $sqlval, "module_id = ?", array($sqlval['module_id']));
+                    } else {
+                        // ¿·µ¬¥ì¥³¡¼¥É¤ÎÄɲÃ
+                        $sqlval['create_date'] = "now()";
+                        $objQuery->insert("dtb_module", $sqlval);
+                    }
                 }
-                
             } else {
                 sfErrorHeader(">> ¥«¥é¥à¿ô¤¬°ìÃפ·¤Þ¤»¤ó¡£¡§".count($arrCSV));