Changeset 20885
- Timestamp:
- 2011/04/21 20:53:08 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20884
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/Smarty/templates/mobile/mypage/change.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmypage%2Fchange.tpl
data/Smarty/templates/mobile/mypage/change_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmypage%2Fchange_confirm.tpl
data/class/helper/SC_Helper_Customer.php 19864@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Customer.php
data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php 20543@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_UpDown.php- bzr:mapping-version:
- v4
- bzr:merge:
ohkouchi@loop-az.jp-20110421114225-070ogiwdu344i5rq- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20110421115305-05rkfwvld21yqhie
- bzr:revno:
- 3596
- bzr:revprop:branch-nick:
- branches/version-2_11-dev
- bzr:root:
- branches/version-2_11-dev
- bzr:text-revisions:
data/Smarty/templates/mobile/mypage/change.tpl ohkouchi@loop-az.jp-20110421114225-070ogiwdu344i5rq
data/Smarty/templates/mobile/mypage/change_confirm.tpl ohkouchi@loop-az.jp-20110421114225-070ogiwdu344i5rq
data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php ohkouchi@loop-az.jp-20110421114225-070ogiwdu344i5rq- bzr:timestamp:
- 2011-04-21 20:53:05.354000092 +0900
- bzr:user-agent:
- bzr2.2.1+bzr-svn1.0.4
- svn:original-date:
- 2011-04-21T11:53:05.354000Z
- Location:
- branches/version-2_11-dev/data
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_11-dev/data/Smarty/templates/mobile/mypage/change.tpl
r20840 r20885 43 43 <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br> 44 44 45 【性別】<font color="#FF0000"> *</font><br>45 【性別】<font color="#FF0000">※</font><br> 46 46 <font color="#FF0000"><!--{$arrErr.sex}--></font> 47 47 <input type="radio" name="sex" value="1" <!--{if $arrForm.sex eq 1}-->checked<!--{/if}--> />男性 <input type="radio" name="sex" value="2" <!--{if $arrForm.sex eq 2}-->checked<!--{/if}--> />女性<br> … … 66 66 <!--{assign var=key1 value="zip01"}--> 67 67 <!--{assign var=key2 value="zip02"}--> 68 【郵便番号】<font color="#FF0000"> *</font><br>68 【郵便番号】<font color="#FF0000">※</font><br> 69 69 <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font> 70 70 <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}--> … … 74 74 <input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 == ""}--><!--{$arrOtherDeliv.zip02|h}--><!--{else}--><!--{$arrForm.zip02|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br> 75 75 76 【都道府県】<font color="#FF0000"> *</font><br>76 【都道府県】<font color="#FF0000">※</font><br> 77 77 <font color="#FF0000"><!--{$arrErr.pref}--></font> 78 78 <select name="pref"> … … 81 81 </select><br> 82 82 83 【住所1】<font color="#FF0000"> *</font><br>83 【住所1】<font color="#FF0000">※</font><br> 84 84 <font color="#FF0000"><!--{$arrErr.addr01}--></font> 85 85 <input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" istyle="1"><br> 86 86 87 【住所2】<font color="#FF0000"> *</font><br>87 【住所2】<font color="#FF0000">※</font><br> 88 88 <font color="#FF0000"><!--{$arrErr.addr02}--></font> 89 89 <input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" istyle="1"><br> 90 90 91 【電話番号】<font color="#FF0000"> *</font><br>91 【電話番号】<font color="#FF0000">※</font><br> 92 92 <font color="#FF0000"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></font> 93 93 <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}--> … … 98 98 <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br> 99 99 100 【 メールアドレス】<font color="#FF0000">※</font><br>101 <font color="#FF0000"><!--{$arrErr.email }--></font>102 <input type="text" name="email " value="<!--{$arrForm.email|h}-->" istyle="3">100 【携帯メールアドレス】<font color="#FF0000">※</font><br> 101 <font color="#FF0000"><!--{$arrErr.email_mobile}--></font> 102 <input type="text" name="email_mobile" value="<!--{$arrForm.email_mobile|h}-->" istyle="3"> 103 103 <br> 104 105 <!--{* PCメールアドレス *}--> 106 <input type="hidden" name="email" value="<!--{$arrForm.email|h}-->" istyle="3"> 104 107 105 108 【パスワード】<font color="#FF0000">※</font><br> -
branches/version-2_11-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl
r20840 r20885 41 41 <!--{$arrForm.tel01|h}-->-<!--{$arrForm.tel02|h}-->-<!--{$arrForm.tel03|h}--><br> 42 42 <br> 43 44 【メールアドレス】<br>45 <!--{$arrForm.email|h}--><br>46 <br>47 43 48 44 【携帯メールアドレス】<br> 49 45 <!--{$arrForm.email_mobile|default:"未登録"|h}--><br> 50 46 <br> 51 47 52 48 【パスワード確認用質問】<br> 53 49 <!--{$arrReminder[$arrForm.reminder]|h}--><br> -
branches/version-2_11-dev/data/class/helper/SC_Helper_Customer.php
r20876 r20885 335 335 function sfCustomerMypageParam (&$objFormParam) { 336 336 SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam); 337 SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam );337 SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, false, true); 338 338 if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE){ 339 $objFormParam->addParam('携帯メールアドレス', "email_mobile", null, 'a', array("NO_SPTAB", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK")); 340 $objFormParam->addParam('携帯メールアドレス(確認)', "email_mobile02", null, 'a', array("NO_SPTAB", "EMAIL_CHECK","SPTAB_CHECK" , "EMAIL_CHAR_CHECK"), "", false); 339 $objFormParam->addParam('携帯メールアドレス', "email_mobile", null, 'a', array("NO_SPTAB", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK", "MOBILE_EMAIL_CHECK")); 340 $objFormParam->addParam('携帯メールアドレス(確認)', "email_mobile02", null, 'a', array("NO_SPTAB", "EMAIL_CHECK","SPTAB_CHECK" , "EMAIL_CHAR_CHECK", "MOBILE_EMAIL_CHECK"), "", false); 341 } else { 342 $objFormParam->addParam('携帯メールアドレス', "email_mobile", null, 'a', array("EXIST_CHECK", "NO_SPTAB", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK", "MOBILE_EMAIL_CHECK")); 343 $objFormParam->addParam('メールアドレス', 'email', null, 'a', array("NO_SPTAB", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK")); 341 344 } 342 345 } … … 381 384 * @param SC_FormParam $objFormParam SC_FormParam インスタンス 382 385 * @param boolean $isAdmin true:管理者画面 false:会員向け 386 * @param boolean $is_mypage マイページの場合 true 383 387 * @return void 384 388 */ 385 function sfCustomerRegisterParam (&$objFormParam, $isAdmin = false ) {389 function sfCustomerRegisterParam (&$objFormParam, $isAdmin = false, $is_mypage = false) { 386 390 $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK")); 387 391 $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); … … 404 408 } 405 409 } else { 406 $objFormParam->addParam('メールアドレス', 'email', null, 'a', array("EXIST_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK", "MOBILE_EMAIL_CHECK")); 410 if (!$is_mypage) { 411 $objFormParam->addParam('メールアドレス', 'email', null, 'a', array("EXIST_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK", "MOBILE_EMAIL_CHECK")); 412 } 407 413 } 408 414 } -
branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php
r20864 r20885 180 180 $arrErr['template_file'] = "※ テンプレートファイルが解凍できません。許可されている形式は、tar/tar.gzです。<br />"; 181 181 } else { 182 $arrErr['template_file'] = $objUpFile->makeTempFile('template_file', false); 182 $make_temp_error = $objUpFile->makeTempFile('template_file', false); 183 if (!SC_Utils_Ex::isBlank($make_temp_error)) { 184 $arrErr['template_file'] = $make_temp_error; 185 } 183 186 } 184 187 return $arrErr;
Note: See TracChangeset
for help on using the changeset viewer.