Changeset 15120 for branches/beta/html/admin

Timestamp:

2007/07/24 21:57:44 (16 years ago)

Author:

adati

Message:

1.4.2betaのマージ

Location:

branches/beta/html/admin

Files:

• basis/template_input.php (modified) (2 diffs)
• products/upload_csv.php (modified) (1 diff)
• system/module.php (modified) (6 diffs)
• system/resize_image.php (copied) (copied from branches/dev/html/admin/system/resize_image.php)

branches/beta/html/admin/basis/template_input.php

@@ -48 +48 @@
     // ¿·µ¬ÅÐÏ¿
     $objPage->arrForm = lfConvData( $_POST );
-    //print_r($objPage->arrForm);print("<br>");
     $objPage->arrErr = lfErrorCheck($objPage->arrForm);
     
@@ -54 +53 @@
         // ¥¨¥é¡¼¤¬Ìµ¤¤¤È¤­¤ÏÅÐÏ¿¡¦ÊÔ½¸
         lfRegistData( $objPage->arrForm, $_POST['template_id']);    
-        //sfReload("mode=complete");    // ¼«Ê¬¤òºÆÆɹþ¤·¤Æ¡¢´°Î»²èÌ̤ØÁ«°Ü
     }
 } 

branches/beta/html/admin/products/upload_csv.php

@@ -305 +305 @@
         }
         $sqlval['product_id'] = $product_id;
+        // ¿·µ¬ÅÐÏ¿
+        // postgresql¤Èmysql¤È¤Ç½èÍý¤òʬ¤±¤ë
+        if (DB_TYPE == "pgsql") {
+            $product_id = $objQuery->nextval("dtb_products","product_id");
+        }elseif (DB_TYPE == "mysql") {
+            $product_id = $objQuery->get_auto_increment("dtb_products");
+        }
+        
+        $sqlval['product_id'] = $product_id;
         $sqlval['create_date'] = $time;
         

branches/beta/html/admin/system/module.php

@@ -61 +61 @@
 //-------------------------------------------------------------------------------------------------------
 // ¹¹¿·¥Õ¥¡¥¤¥ë¤Î¼èÆÀ
-function lfCopyUpdateFile($file) {
+function lfCopyUpdateFile($file, $icon = false) {
     global $objPage;
     
@@ -93 +93 @@
         }
     }
-    
+    
+    if($icon === true) return $flg_ok;
+    
     if($flg_ok) {
         $objPage->update_mess.= ">> " . $dst_path . "¡§¥³¥Ô¡¼À®¸ù<br>";
@@ -171 +173 @@
                     $sqlval['module_x'] = $arrCSV[14];
                     $sqlval['module_y'] = $arrCSV[15];
+                    $sqlval['icon'] = $arrCSV[16];
+                    $sqlval['url'] = $arrCSV[17];
                     // ¥â¥¸¥å¡¼¥ë¤¬Âбþ¤·¤Æ¤¤¤ëËÜÂΤΥС¼¥¸¥ç¥ó
                     $sqlval['eccube_version'] = $arrCSV[13];                    
@@ -183 +187 @@
                         $objQuery->insert("dtb_module", $sqlval);
                     }
+                    // ¥¢¥¤¥³¥ó¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É
+                    if ( !empty($arrCSV[16]) ) {
+                        lfCopyUpdateFile($arrCSV[16], true);
+                    }
             } else {
                 sfErrorHeader(">> ¥«¥é¥à¿ô¤¬°ìÃפ·¤Þ¤»¤ó¡£¡§".count($arrCSV));
@@ -228 +236 @@
         sfErrorHeader(">> Âоݤε¡Ç½¤Ï¡¢ÇÛÉÛ¤ò½ªÎ»¤·¤Æ¤ª¤ê¤Þ¤¹¡£");
         $flg_ok = false;
-    }
+    } 
     
     // ɬÍפÊSQLʸ¤Î¼Â¹Ô
@@ -250 +258 @@
     }
     
-    if($flg_ok) {       
+    if($flg_ok) {
         $path = MODULE_PATH . $arrRet[0]['extern_php'];
         $sqlval['now_version'] = sfGetFileVersion($path);
+        
         $sqlval['update_date'] = "now()";
         $objQuery->update("dtb_module", $sqlval, "module_id = ?", array($arrRet[0]['module_id']));