Changeset 21275

Timestamp:

2011/10/07 12:52:54 (13 years ago)

Author:

Seasoft

Message:

#1498: 会員情報の正規化が効いていない

• まずはフロント機能

#1499: 会員登録内容変更の完了処理でバリデーションが働かない

Location:

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

Files:

• entry/LC_Page_Entry.php (modified) (4 diffs)
• mypage/LC_Page_Mypage_Change.php (modified) (1 diff)

branches/version-2_11-dev/data/class/pages/entry/LC_Page_Entry.php

@@ -78 +78 @@
         SC_Helper_Customer_Ex::sfCustomerEntryParam($objFormParam);
         $objFormParam->setParam($_POST);
-        $this->arrForm  = $objFormParam->getHashArray();
+        $arrForm  = $objFormParam->getHashArray();
 
         // PC時は規約ページからの遷移でなければエラー画面へ遷移する
-        if ($this->lfCheckReferer($this->arrForm, $_SERVER['HTTP_REFERER']) === false) {
+        if ($this->lfCheckReferer($arrForm, $_SERVER['HTTP_REFERER']) === false) {
             SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true);
         }
 
         // mobile用（戻るボタンでの遷移かどうかを判定）
-        if (!empty($this->arrForm['return'])) {
+        if (!empty($arrForm['return'])) {
             $_POST['mode'] = 'return';
         }
@@ -94 +94 @@
             //-- 確認
             $this->arrErr = SC_Helper_Customer_Ex::sfCustomerEntryErrorCheck($objFormParam);
+            $this->arrForm  = $objFormParam->getHashArray();
             // 入力エラーなし
             if(empty($this->arrErr)) {
@@ -106 +107 @@
             //-- 会員登録と完了画面
             $this->arrErr = SC_Helper_Customer_Ex::sfCustomerEntryErrorCheck($objFormParam);
+            $this->arrForm  = $objFormParam->getHashArray();
             if(empty($this->arrErr)) {
 
@@ -124 +126 @@
                 SC_Response_Ex::sendRedirect('complete.php', array('ci' => SC_Helper_Customer_Ex::sfGetCustomerId($uniqid)));
             }
+            break;
+        case 'return':
+            $this->arrForm  = $objFormParam->getHashArray();
             break;
         default:

branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php

@@ -89 +89 @@
         $objFormParam->setParam($_POST);    // POST値の取得
 
-        $this->arrForm = $objFormParam->getHashArray();
+        switch ($this->getMode()) {
+            // 確認
+            case 'confirm':
+                $this->arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam);
+                $this->arrForm = $objFormParam->getHashArray();
 
-        switch ($this->getMode()) {
-        case 'confirm':
-        //-- 確認
-            $this->arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam);
-            // 入力エラーなし
-            if(empty($this->arrErr)) {
-                //パスワード表示
-                $this->passlen      = SC_Utils_Ex::sfPassLen(strlen($this->arrForm['password']));
+                // 入力エラーなし
+                if (empty($this->arrErr)) {
+                    //パスワード表示
+                    $this->passlen      = SC_Utils_Ex::sfPassLen(strlen($this->arrForm['password']));
 
-                $this->tpl_mainpage = 'mypage/change_confirm.tpl';
-                $this->tpl_title    = '会員登録(確認ページ)';
-            }
-            break;
-        case 'complete':
-            //-- 会員登録と完了画面
+                    $this->tpl_mainpage = 'mypage/change_confirm.tpl';
+                    $this->tpl_title    = '会員登録(確認ページ)';
+                }
+                break;
+            // 会員登録と完了画面
+            case 'complete':
+                $this->arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam);
+                $this->arrForm = $objFormParam->getHashArray();
 
-            // 会員情報の登録
-            $this->lfRegistCustomerData($objFormParam, $customer_id);
+                // 入力エラーなし
+                if (empty($this->arrErr)) {
+                    // 会員情報の登録
+                    $this->lfRegistCustomerData($objFormParam, $customer_id);
 
-            // 完了ページに移動させる。
-            SC_Response_Ex::sendRedirect('change_complete.php');
-            break;
-        case 'return':
-            break;
-        default:
-            $this->arrForm = SC_Helper_Customer_Ex::sfGetCustomerData($customer_id);
-            break;
+                    // 完了ページに移動させる。
+                    SC_Response_Ex::sendRedirect('change_complete.php');
+                }
+                break;
+            // 確認ページからの戻り
+            case 'return':
+                $this->arrForm = $objFormParam->getHashArray();
+                break;
+            default:
+                $this->arrForm = SC_Helper_Customer_Ex::sfGetCustomerData($customer_id);
+                break;
         }
     }