Changeset 18609 for tmp/version-2_5-test/data/class/pages/campaign/LC_Page_CampaignEntry.php

Timestamp:

2010/03/11 10:35:11 (14 years ago)

Author:

kajiwara

Message:

正式版にナイトリービルド版をマージしてみるテスト

File:

• tmp/version-2_5-test/data/class/pages/campaign/LC_Page_CampaignEntry.php (modified) (6 diffs)

tmp/version-2_5-test/data/class/pages/campaign/LC_Page_CampaignEntry.php

@@ -52 +52 @@
         $this->arrJob = $masterData->getMasterData("mtb_job");
         $this->arrReminder = $masterData->getMasterData("mtb_reminder");
-        $this->objDate = new SC_Date(START_BIRTH_YEAR, date("Y",strtotime("now")));
-        $this->arrYear = $this->objDate->getYear('', 1950); //　日付プルダウン設定
-        $this->arrMonth = $this->objDate->getMonth();
-        $this->arrDay = $this->objDate->getDay();
+        
+        // 生年月日選択肢の取得
+        $objDate = new SC_Date(START_BIRTH_YEAR, date("Y",strtotime("now")));
+        $this->arrYear = $objDate->getYear('', 1950, '');
+        $this->arrMonth = $objDate->getMonth(true);
+        $this->arrDay = $objDate->getDay(true);
     }
 
@@ -115 +117 @@
             $this->arrForm = $_POST;
 
-            if($this->arrForm['year'] == '----') {
-                $this->arrForm['year'] = '';
-            }
-
             $this->arrForm['email'] = strtolower($this->arrForm['email']);      // emailはすべて小文字で処理
             $this->arrForm['email02'] = strtolower($this->arrForm['email02']);  // emailはすべて小文字で処理
@@ -129 +127 @@
 
             if ($this->arrErr || $_POST["mode"] == "return") {      // 入力エラーのチェック
-                foreach($arrRegistColumn as $key) {
-                    $this->$key['column'] = $arrForm[$key['column']];
+                foreach($this->arrForm as $key => $val) {
+                    $this->$key = $val;
                 }
 
@@ -171 +169 @@
                     $objQuery = new SC_Query();
 
-                    $subject = $objHelperMail->sfMakeSubject($objQuery, $objMailText, $this, '会員登録のご確認');
+                    $subject = $objHelperMail->sfMakeSubject('会員登録のご確認');
 
                     $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
@@ -201 +199 @@
         }
 
-        if($this->year == '') {
-            $this->year = '----';
-        }
-
         //---- ページ表示
         $objView->assignobj($this);
@@ -369 +363 @@
         $objErr->doFunc(array("パスワードを忘れたときのヒント 答え", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK","SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
         $objErr->doFunc(array("メールマガジン", "mailmaga_flg") ,array("SELECT_CHECK", "NUM_CHECK"));
-        $objErr->doFunc(array("生年月日", "year", "month", "day"), array("CHECK_DATE"));
+        $objErr->doFunc(array("生年月日", "year", "month", "day"), array("CHECK_BIRTHDAY"));