[Svn-src-all:1218] [version-2_5-dev 20106] リファクタリング #979

kimoto admin @ mail.ec-cube.net
2011年 2月 7日 (月) 11:54:45 JST


Subversion committed to /home/svn/open 20106
http://svn.ec-cube.net/open_trac/changeset/20106
┌────────────────────────────┐
│更新者 :  kimoto                                       │
│更新日時:  2011-02-07 11:54:44 +0900 (月, 07  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
リファクタリング #979


Changed:                      [U:修正,A:追加,D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
U   branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php
U   branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
U   branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php

変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	2011-02-06 14:56:54 UTC (rev 20105)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	2011-02-07 02:54:44 UTC (rev 20106)
@@ -35,10 +35,6 @@
 
     // {{{ properties
 
-    /** フォームパラメータの配列 */
-    var $objFormParam;
-
-
     // }}}
     // {{{ functions
 
@@ -60,10 +56,6 @@
         $this->arrDay       = $objDate->getDay(true);
 
         $this->httpCacheControl('nocache');
-
-        // パラメータ管理クラス,パラメータ情報の初期化
-        $this->objFormParam = new SC_FormParam();
-        $this->lfInitParam();
     }
 
     /**
@@ -77,39 +69,39 @@
     }
 
     /* パラメータ情報の初期化 */
-    function lfInitParam() {
+    function lfInitParam(&$objFormParam) {
 
-        $this->objFormParam->addParam("お名前(姓)", 'name01', STEXT_LEN, "aKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("お名前(名)", 'name02', STEXT_LEN, "aKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("お名前(フリガナ・姓)", 'kana01', STEXT_LEN, "CKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
-        $this->objFormParam->addParam("お名前(フリガナ・名)", 'kana02', STEXT_LEN, "CKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
-        $this->objFormParam->addParam("パスワード", 'password', STEXT_LEN, "a", array("EXIST_CHECK", "SPTAB_CHECK" ,"ALNUM_CHECK"));
-        $this->objFormParam->addParam("パスワード確認用の質問", "reminder", STEXT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, "aKV", array("EXIST_CHECK","SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("郵便番号1", "zip01", ZIP01_LEN, "n", array("EXIST_CHECK", "SPTAB_CHECK" ,"NUM_CHECK", "NUM_COUNT_CHECK"));
-        $this->objFormParam->addParam("郵便番号2", "zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "SPTAB_CHECK" ,"NUM_CHECK", "NUM_COUNT_CHECK"));
-        $this->objFormParam->addParam("都道府県", 'pref', INT_LEN, "n", array("EXIST_CHECK","NUM_CHECK"));
-        $this->objFormParam->addParam("住所1", "addr01", MTEXT_LEN, "aKV", array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("住所2", "addr02", MTEXT_LEN, "aKV", array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("お電話番号1", 'tel01', TEL_ITEM_LEN, "n", array("EXIST_CHECK","SPTAB_CHECK" ));
-        $this->objFormParam->addParam("お電話番号2", 'tel02', TEL_ITEM_LEN, "n", array("EXIST_CHECK","SPTAB_CHECK" ));
-        $this->objFormParam->addParam("お電話番号3", 'tel03', TEL_ITEM_LEN, "n", array("EXIST_CHECK","SPTAB_CHECK" ));
-        $this->objFormParam->addParam("性別", "sex", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("職業", "job", INT_LEN, "n", array("NUM_CHECK"));
-        $this->objFormParam->addParam("年", "year", INT_LEN, "n", array("MAX_LENGTH_CHECK"), "", false);
-        $this->objFormParam->addParam("月", "month", INT_LEN, "n", array("MAX_LENGTH_CHECK"), "", false);
-        $this->objFormParam->addParam("日", "day", INT_LEN, "n", array("MAX_LENGTH_CHECK"), "", false);
-        $this->objFormParam->addParam("メールマガジン", "mailmaga_flg", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK"));
+        $objFormParam->addParam("お名前(姓)", 'name01', STEXT_LEN, "aKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("お名前(名)", 'name02', STEXT_LEN, "aKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("お名前(フリガナ・姓)", 'kana01', STEXT_LEN, "CKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
+        $objFormParam->addParam("お名前(フリガナ・名)", 'kana02', STEXT_LEN, "CKV", array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
+        $objFormParam->addParam("パスワード", 'password', STEXT_LEN, "a", array("EXIST_CHECK", "SPTAB_CHECK" ,"ALNUM_CHECK"));
+        $objFormParam->addParam("パスワード確認用の質問", "reminder", STEXT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK"));
+        $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, "aKV", array("EXIST_CHECK","SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("郵便番号1", "zip01", ZIP01_LEN, "n", array("EXIST_CHECK", "SPTAB_CHECK" ,"NUM_CHECK", "NUM_COUNT_CHECK"));
+        $objFormParam->addParam("郵便番号2", "zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "SPTAB_CHECK" ,"NUM_CHECK", "NUM_COUNT_CHECK"));
+        $objFormParam->addParam("都道府県", 'pref', INT_LEN, "n", array("EXIST_CHECK","NUM_CHECK"));
+        $objFormParam->addParam("住所1", "addr01", MTEXT_LEN, "aKV", array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("住所2", "addr02", MTEXT_LEN, "aKV", array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("お電話番号1", 'tel01', TEL_ITEM_LEN, "n", array("EXIST_CHECK","SPTAB_CHECK" ));
+        $objFormParam->addParam("お電話番号2", 'tel02', TEL_ITEM_LEN, "n", array("EXIST_CHECK","SPTAB_CHECK" ));
+        $objFormParam->addParam("お電話番号3", 'tel03', TEL_ITEM_LEN, "n", array("EXIST_CHECK","SPTAB_CHECK" ));
+        $objFormParam->addParam("性別", "sex", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK"));
+        $objFormParam->addParam("職業", "job", INT_LEN, "n", array("NUM_CHECK"));
+        $objFormParam->addParam("年", "year", INT_LEN, "n", array("MAX_LENGTH_CHECK"), "", false);
+        $objFormParam->addParam("月", "month", INT_LEN, "n", array("MAX_LENGTH_CHECK"), "", false);
+        $objFormParam->addParam("日", "day", INT_LEN, "n", array("MAX_LENGTH_CHECK"), "", false);
+        $objFormParam->addParam("メールマガジン", "mailmaga_flg", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK"));
 
         if (SC_Display::detectDevice() !== DEVICE_TYPE_MOBILE){
-            $this->objFormParam->addParam("FAX番号1", 'fax01', TEL_ITEM_LEN, "n", array("SPTAB_CHECK"));
-            $this->objFormParam->addParam("FAX番号2", 'fax02', TEL_ITEM_LEN, "n", array("SPTAB_CHECK"));
-            $this->objFormParam->addParam("FAX番号3", 'fax03', TEL_ITEM_LEN, "n", array("SPTAB_CHECK"));
-            $this->objFormParam->addParam("パスワード(確認)", 'password02', STEXT_LEN, "a", array("EXIST_CHECK", "SPTAB_CHECK" ,"ALNUM_CHECK"), "", false);
-            $this->objFormParam->addParam('メールアドレス', "email", MTEXT_LEN, "a", array("NO_SPTAB", "EXIST_CHECK", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
-            $this->objFormParam->addParam('メールアドレス(確認)', "email02", MTEXT_LEN, "a", array("NO_SPTAB", "EXIST_CHECK", "EMAIL_CHECK","SPTAB_CHECK" , "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"), "", false);
+            $objFormParam->addParam("FAX番号1", 'fax01', TEL_ITEM_LEN, "n", array("SPTAB_CHECK"));
+            $objFormParam->addParam("FAX番号2", 'fax02', TEL_ITEM_LEN, "n", array("SPTAB_CHECK"));
+            $objFormParam->addParam("FAX番号3", 'fax03', TEL_ITEM_LEN, "n", array("SPTAB_CHECK"));
+            $objFormParam->addParam("パスワード(確認)", 'password02', STEXT_LEN, "a", array("EXIST_CHECK", "SPTAB_CHECK" ,"ALNUM_CHECK"), "", false);
+            $objFormParam->addParam('メールアドレス', "email", MTEXT_LEN, "a", array("NO_SPTAB", "EXIST_CHECK", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
+            $objFormParam->addParam('メールアドレス(確認)', "email02", MTEXT_LEN, "a", array("NO_SPTAB", "EXIST_CHECK", "EMAIL_CHECK","SPTAB_CHECK" , "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"), "", false);
         } else {
-            $this->objFormParam->addParam('メールアドレス', "email", MTEXT_LEN, "a", array("EXIST_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK","MOBILE_EMAIL_CHECK"));
+            $objFormParam->addParam('メールアドレス', "email", MTEXT_LEN, "a", array("EXIST_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK","MOBILE_EMAIL_CHECK"));
         }
     }
 
@@ -118,13 +110,19 @@
      * @return void
      */
     function action() {
+        $objFormParam = new SC_FormParam();
+
+        $this->lfInitParam($objFormParam);
+        $objFormParam->setParam($_POST);
+        $this->arrForm  = $objFormParam->getHashArray();
+
         // PC時は規約ページからの遷移でなければエラー画面へ遷移する
-        if ($this->lfCheckReferer($_POST, $_SERVER['HTTP_REFERER']) === false) {
+        if ($this->lfCheckReferer($this->arrForm, $_SERVER['HTTP_REFERER']) === false) {
             SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true);
         }
 
         // mobile用(戻るボタンでの遷移かどうかを判定)
-        if (!empty($_POST["return"])) {
+        if (!empty($this->arrForm["return"])) {
             $_POST["mode"] = "return";
         }
 
@@ -134,16 +132,10 @@
             }
         }
 
-        $this->objFormParam->setParam($_POST);    // POST値の取得
-        $this->objFormParam->convParam();
-        $this->objFormParam->toLower('email');
-        $this->objFormParam->toLower('email02');
-        $this->arrForm  = $this->objFormParam->getHashArray();
-
         switch ($this->getMode()) {
         case 'confirm':
             //-- 確認
-            $this->arrErr = $this->lfErrorCheck($this->arrForm);
+            $this->arrErr = $this->lfErrorCheck($objFormParam);
             // 入力エラーなし
             if(empty($this->arrErr)) {
                 //パスワード表示
@@ -155,10 +147,11 @@
             break;
         case 'complete':
             //-- 会員登録と完了画面
-            $this->arrErr = $this->lfErrorCheck($this->arrForm);
+            $this->arrErr = $this->lfErrorCheck($objFormParam);
             if(empty($this->arrErr)) {
-                $uniqid             = $this->lfRegistData($this->arrForm, $this->objFormParam->getDbArray());
 
+                $uniqid             = $this->lfRegistCustomerData($this->lfMakeSqlVal($objFormParam));
+
                 $this->tpl_mainpage = 'entry/complete.tpl';
                 $this->tpl_title    = '会員登録(完了ページ)';
                 $this->lfSendMail($uniqid, $this->arrForm);
@@ -193,17 +186,14 @@
     // }}}
     // {{{ protected functions
     /**
-     * lfRegistData
-     *
      * 会員情報の登録
      *
-     * @access public
-     * @return void
+     * @access private
+     * @return uniqid
      */
-    function lfRegistData($arrForm, $arrResults) {
+    function lfRegistCustomerData($sqlval) {
         $objQuery   = SC_Query::getSingletonInstance();
         //-- 登録実行
-        $sqlval     = $this->lfMakeSqlVal($arrForm, $arrResults);
         $objQuery->begin();
         SC_Helper_Customer_Ex::sfEditCustomerData($sqlval);
         $objQuery->commit();
@@ -219,18 +209,19 @@
      * モバイル端末の場合は, email を email_mobile にコピーし,
      * mobile_phone_id に携帯端末IDを格納する.
      *
-     * @access protected
-     * @param array $arrForm フォームパラメータの配列
-     * @param array $arrResults 結果用の配列. SC_FormParam::getDbArray() の結果
-     * @return array SQLパラメータの配列
-     * @see SC_FormParam::getDbArray()
+     * @param mixed $objFormParam
+     * @access private
+     * @return $arrResults
      */
-    function lfMakeSqlVal($arrForm, $arrResults) {
+    function lfMakeSqlVal(&$objFormParam) {
+        $arrForm                = $objFormParam->getHashArray();
+        $arrResults             = $objFormParam->getDbArray();
+
         // 生年月日の作成
-        $arrResults['birth']  = SC_Utils_Ex::sfGetTimestamp($arrForm['year'], $arrForm['month'], $arrForm['day']);
+        $arrResults['birth']    = SC_Utils_Ex::sfGetTimestamp($arrForm['year'], $arrForm['month'], $arrForm['day']);
 
         // 仮会員 1 本会員 2
-        $arrResults["status"] = (CUSTOMER_CONFIRM_MAIL == true) ? "1" : "2";
+        $arrResults["status"]   = (CUSTOMER_CONFIRM_MAIL == true) ? "1" : "2";
 
         /*
          * secret_keyは、テーブルで重複許可されていない場合があるので、
@@ -255,7 +246,7 @@
     /**
      * 会員登録完了メール送信する
      *
-     * @access public
+     * @access private
      * @return void
      */
     function lfSendMail($uniqid, $arrForm){
@@ -303,15 +294,18 @@
      *
      * 入力エラーチェック
      *
-     * @param mixed $array
-     * @access public
-     * @return void
+     * @param mixed $objFormParam
+     * @access private
+     * @return array エラー情報の配列
      */
-    function lfErrorCheck($arrForm) {
+    function lfErrorCheck(&$objFormParam) {
+        $objFormParam->convParam();
+        $objFormParam->toLower('email');
+        $objFormParam->toLower('email02');
 
         // 入力データを渡す。
-        $objErr = new SC_CheckError($arrForm);
-        $objErr->arrErr = $this->objFormParam->checkError();
+        $objErr = new SC_CheckError();
+        $objErr->arrErr = $objFormParam->checkError();
 
         $objErr->doFunc(array("お電話番号", "tel01", "tel02", "tel03"),array("TEL_CHECK"));
         $objErr->doFunc(array("郵便番号", "zip01", "zip02"), array("ALL_EXIST_CHECK"));

変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php	2011-02-06 14:56:54 UTC (rev 20105)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php	2011-02-07 02:54:44 UTC (rev 20106)
@@ -44,8 +44,7 @@
     function init() {
         parent::init();
 
-        $this->objFormParam = new SC_FormParam();
-        $this->lfInitParam();
+
     }
 
     /**
@@ -65,21 +64,24 @@
      */
     function action() {
         $objCustomer    = new SC_Customer;
+        $objFormParam   = new SC_FormParam();
 
+        $this->lfInitParam($objFormParam);
+        $objFormParam->setParam($_POST);
+
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->objFormParam->setParam($_POST);
-            $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError($objCustomer);
+            $this->arrErr = $this->lfCheckError($objFormParam);
 
             if (empty($this->arrErr)) {
-                $this->lfRegister($objCustomer);
+                $this->lfRegistEmailMobile(strtolower($objFormParam->getValue('email_mobile')),
+                                           $objCustomer->getValue('customer_id'));
                 $this->tpl_mainpage = 'entry/email_mobile_complete.tpl';
                 $this->tpl_title = '携帯メール登録完了';
             }
         }
 
         $this->tpl_name = $objCustomer->getValue('name01');
-        $this->arrForm  = $this->objFormParam->getFormParamList();
+        $this->arrForm  = $objFormParam->getFormParamList();
     }
 
     /**
@@ -97,22 +99,23 @@
      * @access public
      * @return void
      */
-    function lfInitParam() {
-        $this->objFormParam->addParam('メールアドレス', 'email_mobile', MTEXT_LEN, 'a',
+    function lfInitParam(&$objFormParam) {
+        $objFormParam->addParam('メールアドレス', 'email_mobile', MTEXT_LEN, 'a',
                                 array('NO_SPTAB', 'EXIST_CHECK', 'MAX_LENGTH_CHECK', 'CHANGE_LOWER', 'EMAIL_CHAR_CHECK', 'EMAIL_CHECK', 'MOBILE_EMAIL_CHECK'));
     }
 
     /**
-     * lfCheckError
+     * エラーチェックする
      *
+     * @param mixed $objFormParam
      * @param mixed $objCustomer
-     * @access public
-     * @return void
+     * @access private
+     * @return array エラー情報の配列
      */
-    function lfCheckError(&$objCustomer) {
-        $arrRet         = $this->objFormParam->getHashArray();
-        $objErr         = new SC_CheckError($arrRet);
-        $objErr->arrErr = $this->objFormParam->checkError();
+    function lfCheckError(&$objFormParam) {
+        $objFormParam->convParam();
+        $objErr         = new SC_CheckError();
+        $objErr->arrErr = $objFormParam->checkError();
 
         $objErr->doFunc(array("メールアドレス", "email_mobile"), array("CHECK_REGIST_CUSTOMER_EMAIL"));
 
@@ -120,19 +123,22 @@
     }
 
     /**
-     * lfRegister
      *
+     * 携帯メールアドレスが登録されていないユーザーに携帯アドレスを登録する
+     *
+     * 登録完了後にsessionのemail_mobileを更新する
+     *
+     * @param mixed $objFormParam
      * @param mixed $objCustomer
-     * @access public
+     * @access private
      * @return void
      */
-    function lfRegister(&$objCustomer) {
-        $customer_id    = $objCustomer->getValue('customer_id');
-        $email_mobile   = strtolower($this->objFormParam->getValue('email_mobile'));
+    function lfRegistEmailMobile($email_mobile, $customer_id) {
+        $objQuery = SC_Query::getSingletonInstance();
+        $objQuery->update('dtb_customer',
+                          array('email_mobile' => $email_mobile),
+                          'customer_id = ?', array($customer_id));
 
-        $objQuery       = new SC_Query();
-        $objQuery->update('dtb_customer', array('email_mobile' => $email_mobile), 'customer_id = ?', array($customer_id));
-
         $objCustomer->setValue('email_mobile', $email_mobile);
     }
 }

変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php	2011-02-06 14:56:54 UTC (rev 20105)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php	2011-02-07 02:54:44 UTC (rev 20106)
@@ -85,15 +85,13 @@
     }
 
     /**
-     * lfMakeKiyakuText
-     *
      * 規約文の作成
      *
      * @param mixed $arrKiyaku
      * @param mixed $max
      * @param mixed $offset
      * @access public
-     * @return void
+     * @return string 規約の内容をテキストエリアで表示するように整形したデータ
      */
     function lfMakeKiyakuText($arrKiyaku, $max, $offset) {
         $this->tpl_kiyaku_text = "";
@@ -106,28 +104,28 @@
     }
 
     /**
-     * lfGetKiyakuData
-     *
      * 規約内容の取得
      *
-     * @access public
-     * @return void
+     * @access private
+     * @return array $arrKiyaku 規約の配列
      */
     function lfGetKiyakuData() {
 
-        $objQuery = new SC_Query();
+        $objQuery   = SC_Query::getSingletonInstance();
+
         $objQuery->setOrder("rank DESC");
-        $arrRet = $objQuery->select("kiyaku_title, kiyaku_text", "dtb_kiyaku", "del_flg <> 1");
+        $arrKiyaku  = $objQuery->select("kiyaku_title, kiyaku_text", "dtb_kiyaku", "del_flg <> 1");
 
-        return $arrRet;
+        return $arrKiyaku;
     }
 
     /**
-     * lfSetOffset
      *
+     * 携帯の場合getで来る次ページのidを適切に処理する
+     *
      * @param mixed $offset
-     * @access public
-     * @return void
+     * @access private
+     * @return int
      */
     function lfSetOffset($offset) {
        return is_numeric($offset) === true ? intval($offset) : 1;

変更: branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php	2011-02-06 14:56:54 UTC (rev 20105)
+++ branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php	2011-02-07 02:54:44 UTC (rev 20106)
@@ -94,18 +94,15 @@
     }
 
     /**
-     * lfRegistData
-     *
      * 仮会員を本会員にUpdateする
      *
      * @param mixed $array
-     * @access public
-     * @return void
+     * @access private
+     * @return string $arrRegist["secret_key"] 本登録ID
      */
     function lfRegistData($array) {
-        $objQuery = new SC_Query();
-
-        $arrRegist["secret_key"]    = SC_Helper_Customer_Ex::sfGetUniqSecretKey(); // 本登録ID発行
+        $objQuery                   = SC_Query::getSingletonInstance();
+        $arrRegist["secret_key"]    = SC_Helper_Customer_Ex::sfGetUniqSecretKey(); //本登録ID発行
         $arrRegist["status"]        = 2;
         $arrRegist["update_date"]   = "NOW()";
 
@@ -113,17 +110,15 @@
         $objQuery->update("dtb_customer", $arrRegist, "secret_key = ? AND status = 1", array($array["id"]));
         $objQuery->commit();
 
-        return $arrRegist["secret_key"];		// 本登録IDを返す
+        return $arrRegist["secret_key"];
     }
 
     /**
-     * lfErrorCheck
-     *
      * 入力エラーチェック
      *
      * @param mixed $array
-     * @access public
-     * @return void
+     * @access private
+     * @return array エラーの配列
      */
     function lfErrorCheck($array) {
         $objErr     = new SC_CheckError($array);
@@ -141,28 +136,26 @@
     }
 
     /**
-     * lfSendRegistMail
-     *
      * 正会員登録完了メール送信
      *
      * @param mixed $registSecretKey
-     * @access public
+     * @access private
      * @return void
      */
     function lfSendRegistMail($registSecretKey) {
+        $objQuery       = SC_Query::getSingletonInstance();
         $objCustomer    = new SC_Customer();
-        $objQuery       = new SC_Query();
         $objHelperMail  = new SC_Helper_Mail_Ex();
-        $this->CONF     = SC_Helper_DB_Ex::sfGetBasisData();
+        $CONF           = SC_Helper_DB_Ex::sfGetBasisData();
 
         //-- 会員データを取得
-        $result         = $objQuery->select("*", "dtb_customer", "secret_key = ?", array($registSecretKey));
-        $data           = $result[0];
+        $arrCustomer    = $objQuery->select("*", "dtb_customer", "secret_key = ?", array($registSecretKey));
+        $data           = $arrCustomer[0];
         $objCustomer->setLogin($data['email']);
 
         //-- メール送信
         $objMailText    = new SC_SiteView();
-        $objMailText->assign("CONF", $this->CONF);
+        $objMailText->assign("CONF", $CONF);
         $objMailText->assign("name01", $data["name01"]);
         $objMailText->assign("name02", $data["name02"]);
         $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl");




Svn-src-all メーリングリストの案内