Changeset 21589

Timestamp:

2012/03/04 22:25:28 (12 years ago)

Author:

Seasoft

Message:

#1633 (エラーハンドリングの改善)
#1613 (typo修正・ソース整形・ソースコメントの改善)

Location:

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

Files:

• SC_Query.php (modified) (1 diff)
• SC_View.php (modified) (1 diff)
• helper/SC_Helper_Purchase.php (modified) (3 diffs)
• util/GC_Utils.php (modified) (2 diffs)

branches/version-2_12-dev/data/class/SC_Query.php

@@ -1082 +1082 @@
         }
 
-        $msg .= 'execution time: ' . sprintf("%.2f sec", $timeExecTime) . "\n";
+        $msg .= 'execution time: ' . sprintf('%.2f sec', $timeExecTime) . "\n";
         GC_Utils_Ex::gfPrintLog($msg, DB_LOG_REALFILE);
     }

branches/version-2_12-dev/data/class/SC_View.php

@@ -57 +57 @@
         $this->_smarty->register_function('sfIsHTTPS', array('SC_Utils_Ex', 'sfIsHTTPS'));
         $this->_smarty->register_function('sfSetErrorStyle', array('SC_Utils_Ex', 'sfSetErrorStyle'));
-        $this->_smarty->register_function('printXMLDeclaration', array('SC_Utils_Ex', 'printXMLDeclaration'));
+        $this->_smarty->register_function('printXMLDeclaration', array('GC_Utils_Ex', 'printXMLDeclaration'));
         $this->_smarty->default_modifiers = array('script_escape');
 

branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php

@@ -79 +79 @@
         $orderTemp['status'] = $orderStatus;
         $cartkey = $objCartSession->getKey();
-        $orderId = $this->registerOrderComplete($orderTemp, $objCartSession, $cartkey);
+        $order_id = $this->registerOrderComplete($orderTemp, $objCartSession, $cartkey);
         $isMultiple = SC_Helper_Purchase::isMultiple();
         $shippingTemp =& $this->getShippingTemp($isMultiple);
         foreach ($shippingTemp as $shippingId => $val) {
-            $this->registerShipmentItem($orderId, $shippingId, $val['shipment_item']);
-        }
-
-        $this->registerShipping($orderId, $shippingTemp);
+            $this->registerShipmentItem($order_id, $shippingId, $val['shipment_item']);
+        }
+
+        $this->registerShipping($order_id, $shippingTemp);
         $objQuery->commit();
 
@@ -94 +94 @@
         }
 
-        $this->cleanupSession($orderId, $objCartSession, $objCustomer, $cartkey);
-
-        GC_Utils_Ex::gfFrontLog('order complete. customerId=' . $customerId);
-
+        $this->cleanupSession($order_id, $objCartSession, $objCustomer, $cartkey);
+
+        GC_Utils_Ex::gfPrintLog('order complete. order_id=' . $order_id);
     }
 
@@ -516 +515 @@
     function extractShipping($arrSrc) {
         $arrKey = array();
-        foreach($this->arrShippingKey as $key) {
+        foreach ($this->arrShippingKey as $key) {
             $arrKey[] = 'shipping_' . $key;
         }

branches/version-2_12-dev/data/class/util/GC_Utils.php

@@ -106 +106 @@
             }
             if (($arrLine['class'] === 'GC_Utils' || $arrLine['class'] === 'GC_Utils_Ex')
-                && $arrLine['function'] === 'gfDebugLog'
+                && ($arrLine['function'] === 'gfDebugLog' || $arrLine['function'] === 'gfPrintLog')
             ) {
                 break 1;
@@ -389 +389 @@
         return defined('INSTALL_FUNCTION') && INSTALL_FUNCTION === true;
     }
+
+    /**
+     * XML宣言を出力する.
+     *
+     * XML宣言があると問題が発生する UA は出力しない.
+     *
+     * @return string XML宣言の文字列
+     */
+    function printXMLDeclaration() {
+        $ua = $_SERVER['HTTP_USER_AGENT'];
+        if (!preg_match('/MSIE/', $ua) || preg_match('/MSIE 7/', $ua)) {
+            echo '<?xml version="1.0" encoding="' . CHAR_CODE . '"?>' . "\n";
+        }
+    }
 }