Changeset 18007 for branches/version-2/data/class/pages/shopping

Timestamp:

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

Author:

kajiwara

Message:

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

Location:

branches/version-2/data/class/pages/shopping

Files:

• LC_Page_Shopping_Complete.php (modified) (1 diff)
• LC_Page_Shopping_Deliv.php (modified) (5 diffs)
• LC_Page_Shopping_Payment.php (modified) (7 diffs)

branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Complete.php

@@ -630 +630 @@
         $sqlval['buy_times']++;
         $sqlval['buy_total']+= $arrData['total'];
-        $sqlval['point'] = ($sqlval['point'] + $arrData['add_point'] - $arrData['use_point']);
+        if (USE_POINT === false) {
+            $sqlval['point'] = $sqlval['point'];
+        } else {
+            //$sqlval['point'] = ($sqlval['point'] - $arrData['use_point']);
+            $sqlval['point'] = ($sqlval['point'] + $arrData['add_point'] - $arrData['use_point']);
+        }
 
         // ポイントが不足している場合

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

@@ -85 +85 @@
 
         $this->objLoginFormParam = new SC_FormParam();  // ログインフォーム用
-        $this->lfInitLoginFormParam();                      // 初期設定
+        $this->lfInitLoginFormParam();
+        //パスワード・Eメールにある空白をトリム
+        $this->lfConvertEmail($_POST["login_email"]);
+        $this->lfConvertLoginPass($_POST["login_pass"]);
         $this->objLoginFormParam->setParam($_POST);     // POST値の取得
 
@@ -160 +163 @@
                         SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
                     }
-                    
+
                     // 登録済みの別のお届け先を受注一時テーブルに書き込む
                     $this->lfRegistOtherDelivData($uniqid, $objCustomer, $_POST['deliv_check']);
@@ -244 +247 @@
         $this->lfInitParam();
         // POST値の取得
+        $this->lfConvertEmail($_POST["login_email"]);
+        $this->lfConvertLoginPass($_POST["login_pass"]);
+
         $this->objFormParam->setParam($_POST);
 
@@ -429 +435 @@
         $this->objLoginFormParam->addParam("記憶する", "login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objLoginFormParam->addParam("メールアドレス", "login_email", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objLoginFormParam->addParam("パスワード", "login_pass", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objLoginFormParam->addParam("パスワード", "login_pass", PASSWORD_LEN1, "", array("EXIST_CHECK"));
+        $this->objLoginFormParam->addParam("パスワード", "login_pass1", PASSWORD_LEN1, "", array("EXIST_CHECK", "MIN_LENGTH_CHECK"));
+        $this->objLoginFormParam->addParam("パスワード", "login_pass2", PASSWORD_LEN2, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
     }
 
@@ -532 +540 @@
         return $objErr->arrErr;
     }
+
+    /**
+     * 入力されたEmailから余分な改行・空白を削除する
+     *
+     * @param string $_POST["login_email"]
+     */
+    function lfConvertEmail(){
+        if( strlen($_POST["login_email"]) < 1 ){ return ; }
+        $_POST["login_email"] = preg_replace('/^[ 　\r\n]*(.*?)[ 　\r\n]*$/u', '$1', $_POST["login_email"]);
+    }
+
+    /**
+     * 入力されたPassから余分な空白を削除し、最小桁数・最大桁数チェック用に変数に入れる
+     *
+     * @param string $_POST["login_pass"]
+     */
+    function lfConvertLoginPass(){
+    if( strlen($_POST["login_pass"]) < 1 ){ return ; }
+        $_POST["login_pass"] = trim($_POST["login_pass"]); //認証用
+        $_POST["login_pass1"] = $_POST["login_pass"];      //最小桁数比較用
+        $_POST["login_pass2"] = $_POST["login_pass"];      //最大桁数比較用
+    }
 }
 ?>

branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -114 +114 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError($this->arrData, $arrInfo, $objCartSess );
+            $this->arrErr = $this->lfCheckError($this->arrData );
             // 入力エラーなし
             if(count($this->arrErr) == 0) {
@@ -239 +239 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError($this->arrData, $arrInfo, $objCartSess);
+            $this->arrErr = $this->lfCheckError($this->arrData);
             if (!isset($this->arrErr['payment_id'])) {
                 // 支払い方法の入力エラーなし
@@ -255 +255 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError($this->arrData, $arrInfo, $objCartSess);
+            $this->arrErr = $this->lfCheckError($this->arrData );
             // 入力エラーなし
             if(count($this->arrErr) == 0) {
@@ -364 +364 @@
 
     /* 入力内容のチェック */
-    function lfCheckError($arrData, $arrInfo, $objCartSess) {
+    function lfCheckError($arrData) {
         // 入力データを渡す。
         $arrRet =  $this->objFormParam->getHashArray();
@@ -370 +370 @@
         $objErr->arrErr = $this->objFormParam->checkError();
 
+        if (USE_POINT === false) {
+            $_POST['point_check'] = "";
+            $_POST['use_point'] = "0";
+        }
         if (!isset($_POST['point_check'])) $_POST['point_check'] = "";
 
@@ -387 +391 @@
             }
         }
-        
+
+        $objView = new SC_MobileView();
+        $objSiteInfo = $objView->objSiteInfo;
+        $arrInfo = $objSiteInfo->data;
+        $objCartSess = new SC_CartSession();
+        $arrInfo = $objSiteInfo->data;
         // 購入金額の取得得
         $total_pretax = $objCartSess->getAllProductsTotal($arrInfo);
@@ -399 +408 @@
             }
         }
-        if ($pay_flag && $arrRet['payment_id'] != "") {
+        if ($pay_flag) {
             SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
         }
-        
+
         return $objErr->arrErr;
     }