Changeset 22818 for branches/version-2_12-dev/data/class/pages

Timestamp:

2013/05/14 12:08:44 (13 years ago)

Author:

m_uehara

Message:

#2236 2.12.3にて行われていた対応(r22231,r22241,r22282,r22348,r22374,r22376,r22440,r22545,r22546)を元に戻します

Location:

branches/version-2_12-dev/data/class/pages

Files:

• admin/order/LC_Page_Admin_Order_Mail.php (modified) (1 diff)
• admin/products/LC_Page_Admin_Products_ReviewEdit.php (modified) (1 diff)
• admin/products/LC_Page_Admin_Products_UploadCSV.php (modified) (1 diff)
• mypage/LC_Page_Mypage_Delivery.php (modified) (1 diff)
• mypage/LC_Page_Mypage_DeliveryAddr.php (modified) (2 diffs)
• mypage/LC_Page_Mypage_DownLoad.php (modified) (2 diffs)
• shopping/LC_Page_Shopping_Deliv.php (modified) (2 diffs)
• shopping/LC_Page_Shopping_Multiple.php (modified) (1 diff)

branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php

@@ -221 +221 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-        if (!SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
-            trigger_error('テンプレートが指定されていません。', E_USER_ERROR);
-        }
-
-        $where = 'template_id = ?';
-        $arrWhereVal = array($objFormParam->getValue('template_id'));
-        $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
+        $template_id = $objFormParam->getValue('template_id');
+
+        // 未選択時
+        if (strlen($template_id) === 0) {
+            $mailTemplates = null;
+        }
+        // 有効選択時
+        elseif (SC_Utils_Ex::sfIsInt($template_id)) {
+            $where = 'template_id = ?';
+            $arrWhereVal = array($template_id);
+            $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
+        }
+        // 不正選択時
+        else {
+            trigger_error('テンプレートの指定が不正。', E_USER_ERROR);
+        }
+
         if (empty($mailTemplates)) {
             foreach (array('subject','header','footer') as $key) {

branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php

@@ -88 +88 @@
                 $this->arrErr = $objFormParam->checkError();
                 // エラー無し
-                if (!SC_Utils_Ex::isBlank($this->arrErr)) {
+                if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     // レビュー情報の更新
                     $this->lfRegistReviewData($this->arrForm['review_id'], $objFormParam);

branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php

@@ -584 +584 @@
 
         // 在庫無制限フラグ列を利用する場合、
-        if (array_key_exists('stock_unlimited', $sqlval)) {
+        if (array_key_exists('stock_unlimited', $sqlval) and $sqlval['stock_unlimited'] != '') {
             // 在庫無制限フラグ = 無制限の場合、
             if ($sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) {

branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php

@@ -85 +85 @@
                 }
 
-                $objAddress->delete($objFormParam->getValue('other_deliv_id'));
+                $objAddress->deleteAddress($objFormParam->getValue('other_deliv_id'));
                 break;
 

branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php

@@ -136 +136 @@
 
                 if ($_GET['other_deliv_id'] != '') {
-                    $arrOtherDeliv = $objAddress->get($_SESSION['other_deliv_id']);
+                    $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id']);
 
                     //不正アクセス判定
@@ -174 +174 @@
         $sqlval['customer_id'] = $customer_id;
 
-        $objAddress->save($sqlval);
+        $objAddress->registAddress($sqlval);
     }
 

branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php

@@ -253 +253 @@
         }
         echo fread($fp, $content_length) ;
-        ob_flush();
-        flush();
+        SC_Utils_Ex::sfFlush();
     }
 
@@ -306 +305 @@
                 $buffer = fread($realpath, $chunksize);
                 print($buffer);
-                ob_flush();
-                flush();
+                SC_Utils_Ex::sfFlush();
+                SC_Utils_Ex::extendTimeOut();
                 $bytes_send += strlen($buffer);
             }

branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php

@@ -110 +110 @@
             // 削除
             case 'delete':
-                $objAddress->delete($arrForm['other_deliv_id']);
+                $objAddress->deleteAddress($arrForm['other_deliv_id']);
                 break;
 
@@ -228 +228 @@
         // 別のお届け先がチェックされている場合
         else {
-            $arrOtherDeliv = $objAddress->get($other_deliv_id);
+            $arrOtherDeliv = $objAddress->getAddress($other_deliv_id);
             if (!$arrOtherDeliv) {
                 return false;

branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

@@ -307 +307 @@
             if ($objCustomer->isLoginSuccess(true)) {
                 if ($other_deliv_id != 0) {
-                    $otherDeliv = $objAddress->get($other_deliv_id);
+                    $otherDeliv = $objAddress->getAddress($other_deliv_id);
                     foreach ($otherDeliv as $key => $val) {
                         $arrValues[$other_deliv_id]['shipping_' . $key] = $val;