Changeset 22859 for branches/version-2_12-multilang/data/class

Timestamp:

2013/06/13 19:35:56 (13 years ago)

Author:

michael_nelson

Message:

#2263 - Merged 2.12.4en into 2.12multi_lang

Location:

branches/version-2_12-multilang

Files:

• . (modified) (1 prop)
• data (modified) (1 prop)
• data/class/helper/SC_Helper_Session.php (modified) (1 diff)
• data/class/pages/cart/LC_Page_Cart.php (modified) (3 diffs)
• data/class/pages/forgot/LC_Page_Forgot.php (modified) (2 diffs)

branches/version-2_12-multilang/data/class/helper/SC_Helper_Session.php

@@ -216 +216 @@
      */
     function adminAuthorization() {
-        $masterData = new SC_DB_MasterData_Ex();
-        $arrExcludes = $masterData->getMasterData('mtb_auth_excludes');
-        if (preg_match('|^' . ROOT_URLPATH . ADMIN_DIR . '|', $_SERVER['SCRIPT_NAME'])) {
-            $is_auth = true;
-
-            foreach ($arrExcludes as $exclude) {
-                if (preg_match('|^' . ROOT_URLPATH . ADMIN_DIR . $exclude . '|', $_SERVER['SCRIPT_NAME'])) {
-                    $is_auth = false;
-                    break;
+        if (($script_path = realpath($_SERVER['SCRIPT_FILENAME'])) !== FALSE) {
+            $arrScriptPath = explode('/', str_replace('\\', '/', $script_path));
+            $arrAdminPath = explode('/', str_replace('\\', '/', substr(HTML_REALDIR . ADMIN_DIR, 0, -1)));
+            $arrDiff = array_diff_assoc($arrAdminPath, $arrScriptPath);
+            if (in_array(substr(ADMIN_DIR, 0, -1), $arrDiff)) {
+                return;
+            } else {
+                $masterData = new SC_DB_MasterData_Ex();
+                $arrExcludes = $masterData->getMasterData('mtb_auth_excludes');
+                foreach ($arrExcludes as $exclude) {
+                    $arrExcludesPath = explode('/', str_replace('\\', '/', HTML_REALDIR . ADMIN_DIR . $exclude));
+                    $arrDiff = array_diff_assoc($arrExcludesPath, $arrScriptPath);
+                    if (count($arrDiff) === 0) {
+                        return;
+                    }
                 }
             }
-            if ($is_auth) {
-                SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
-            }
-        }
+        }
+        SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
     }
 }

branches/version-2_12-multilang/data/class/pages/cart/LC_Page_Cart.php

@@ -83 +83 @@
         $objCustomer = new SC_Customer_Ex();
 
-        $objFormParam = $this->lfInitParam($_REQUEST);
+        $objFormParam = $this->lfInitParam($_POST);
         $this->mode = $this->getMode();
 
-        $this->cartKeys = $objCartSess->getKeys();
+        // モバイル対応
+        if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
+            if (isset($_GET['cart_no'])) {
+                $objFormParam->setValue('cart_no', $_GET['cart_no']);
+            }
+            if (isset($_GET['cartKey'])) {
+                    $objFormParam->setValue('cartKey', $_GET['cartKey']);
+            }
+        }
+        
+        $this->cartKeys = $objCartSess->getKeys();
         foreach ($this->cartKeys as $key) {
             // 商品購入中にカート内容が変更された。
@@ -96 +106 @@
         $cart_no = $objFormParam->getValue('cart_no');
         $cartKey = $objFormParam->getValue('cartKey');
+        
+        // エラーチェック
+        $arrError = $objFormParam->checkError();
+        if(isset($arrError) && !empty($arrError)) {
+            SC_Utils_Ex::sfDispSiteError(CART_NOT_FOUND);
+            SC_Response_Ex::actionExit();
+        }
 
         switch ($this->mode) {
@@ -207 +224 @@
         $objFormParam->addParam(t('c_Category ID_01'), 'category_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         // スマートフォン版での数量変更用
-        $objFormParam->addParam(t('c_Quantity_01'), 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam(t('c_Quantity_01'), 'quantity', INT_LEN, 'n', array('ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         // 値の取得
         $objFormParam->setParam($arrRequest);

branches/version-2_12-multilang/data/class/pages/forgot/LC_Page_Forgot.php

@@ -150 +150 @@
         $errmsg = NULL;
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = '(email Like ? OR email_mobile Like ?) AND name01 Like ? AND name02 Like ? AND del_flg = 0';
+        $where = '(email = ? OR email_mobile = ?) AND name01 = ? AND name02 = ? AND del_flg = 0';
         $arrVal = array($arrForm['email'], $arrForm['email'], $arrForm['name01'], $arrForm['name02']);
         $result = $objQuery->select('reminder, status', 'dtb_customer', $where, $arrVal);
@@ -198 +198 @@
         $cols = 'customer_id, reminder, reminder_answer, salt';
         $table = 'dtb_customer';
-        $where = '(email Like ? OR email_mobile Like ?)'
-                    . ' AND name01 Like ? AND name02 Like ?'
+        $where = '(email = ? OR email_mobile = ?)'
+                    . ' AND name01 = ? AND name02 = ?'
                     . ' AND status = 2 AND del_flg = 0';
         $arrVal = array($arrForm['email'], $arrForm['email'],