Changeset 18007 for branches/version-2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

Timestamp:

2009/05/15 16:30:40 (15 years ago)

Author:

kajiwara

Message:

2.4.0 正式版のコミット。コミット内容の詳細はこちら（http://svn.ec-cube.net/open_trac/query?status=closed&milestone=EC-CUBE2.4.0）

File:

• branches/version-2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (modified) (9 diffs)

branches/version-2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

@@ -180 +180 @@
             $this->arrErr = array_merge((array)$this->arrErr, (array)$this->objUpFile->checkEXISTS($_POST['image_key']));
             // 画像保存処理
-            $this->arrErr[$_POST['image_key']] = $this->objUpFile->makeTempFile($_POST['image_key']);
+            $this->arrErr[$_POST['image_key']] = $this->objUpFile->makeTempFile($_POST['image_key'],IMAGE_RENAME);
 
             // 中、小画像生成
@@ -395 +395 @@
                             "deliv_fee", "comment1", "comment2", "comment3",
                             "comment4", "comment5", "comment6", "main_list_comment",
-                            "sale_limit", "sale_unlimited", "deliv_date_id");
+                            "sale_limit", "sale_unlimited", "deliv_date_id", "note");
         $arrList = SC_Utils_Ex::arrayDefineIndexes($arrList, $checkArray);
 
@@ -416 +416 @@
         $sqlval['sale_unlimited'] = $arrList['sale_unlimited'];
         $sqlval['deliv_date_id'] = $arrList['deliv_date_id'];
+        $sqlval['note'] = $arrList['note'];
         $sqlval['update_date'] = "Now()";
         $sqlval['creator_id'] = $_SESSION['member_id'];
@@ -457 +458 @@
                 unset($arrColList[$arrColList_tmp["product_class_id"]]);     //規格ID
                 unset($arrColList[$arrColList_tmp["product_id"]]);           //商品ID
-                unset($arrColList[$arrColList_tmp["create_date"]]);
+                unset($arrColList[$arrColList_tmp["create_date"]]);
 
                 $col = SC_Utils_Ex::sfGetCommaList($arrColList);
@@ -481 +482 @@
         //商品登録の時は規格を生成する。複製の場合は規格も複製されるのでこの処理は不要。
         if( $_POST["copy_product_id"] == "" ){
-            // 規格登録
-            SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id , $arrList['product_class_id'] );
+            // 規格登録
+            SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id , $arrList['product_class_id'] );
         }
 
@@ -507 +508 @@
         $arrConvList['main_list_comment'] = "KVa";
         $arrConvList['main_comment'] = "KVa";
+        $arrConvList['note'] = "KVa";
         $arrConvList['price01'] = "n";
         $arrConvList['price02'] = "n";
@@ -553 +555 @@
         $objErr->doFunc(array("ポイント付与率", "point_rate", PERCENTAGE_LEN), array("EXIST_CHECK", "NUM_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $objErr->doFunc(array("商品送料", "deliv_fee", PRICE_LEN), array("NUM_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("備考欄(SHOP専用)", "note", LLTEXT_LEN), array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $objErr->doFunc(array("検索ワード", "comment3", LLTEXT_LEN), array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $objErr->doFunc(array("メーカーURL", "comment1", URL_LEN), array("SPTAB_CHECK", "URL_CHECK", "MAX_LENGTH_CHECK"));
@@ -690 +693 @@
                empty($this->objUpFile->save_file[$arrImageKey[$to_key]])) {
 
-                $path = $this->objUpFile->makeThumb($from_path, $to_w, $to_h);
+                // リネームする際は、自動生成される画像名に一意となるように、Suffixを付ける
+                $dst_file = $this->objUpFile->lfGetTmpImageName(IMAGE_RENAME, "", $this->objUpFile->temp_file[$arrImageKey[$from_key]]) . $this->lfGetAddSuffix($to_key);
+                $path = $this->objUpFile->makeThumb($from_path, $to_w, $to_h, $dst_file);
                 $this->objUpFile->temp_file[$arrImageKey[$to_key]] = basename($path);
             }
@@ -697 +702 @@
         }
     }
+
+    // リネームする際は、自動生成される画像名に一意となるように、Suffixを付ける
+    function lfGetAddSuffix($to_key){
+        if( IMAGE_RENAME === true ){ return ; }
+
+        // 自動生成される画像名
+        $dist_name = "";
+        switch($to_key){
+            case "main_list_image":
+                $dist_name = '_s';
+                break;
+            case "main_image":
+                $dist_name = '_m';
+                break;
+            default;
+                $arrRet = explode('sub_image', $to_key);
+                $dist_name = '_sub' .$arrRet[1];
+                break;
+        }
+        return $dist_name;
+    }
 }
 ?>