Changeset 20433


Ignore:
Timestamp:
2011/02/28 04:10:49 (10 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20432
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/admin/customer/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcustomer%2Fedit.tpl
data/Smarty/templates/default/frontparts/bloc/login_header.tpl 20408@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Ffrontparts%2Fbloc%2Flogin_header.tpl
data/Smarty/templates/default/frontparts/form_personal_input.tpl 17131@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Ffrontparts%2Fform_personal_input.tpl
data/Smarty/templates/mobile/entry/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fentry%2Findex.tpl
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/sphone/frontparts/form_personal_input.tpl 19898@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Ffrontparts%2Fform_personal_input.tpl
data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2FLC_Page_FrontParts_LoginCheck.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110227191043-aos49z5ibjlzreii
bzr:revno:
3161
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/customer/edit.tpl nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/Smarty/templates/default/frontparts/bloc/login_header.tpl nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/Smarty/templates/default/frontparts/form_personal_input.tpl nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/Smarty/templates/mobile/entry/index.tpl nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/Smarty/templates/mobile/mypage/change.tpl nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/Smarty/templates/sphone/frontparts/form_personal_input.tpl nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/class/pages/shopping/LC_Page_Shopping.php nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
data/mtb_constants_init.php nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
html/install/sql/insert_data.sql nanasess@fsm.ne.jp-20110227190903-f6f8dvy6psdokbju
bzr:timestamp:
2011-02-28 04:10:43.878000021 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-02-27T19:10:43.878000Z
Message:

#1007(lfConvertParamが散在する)

  • LC_Page_FrontParts_LoginCheck.php での処理を削除. ログイン時でのパスワード最小値, 最大値チェックは不要と思われるため

#627(ソース整形・ソースコメントの改善)

  • PASSWORD_LEN1, PASSWORD_LEN2 を PASSWORD_MIN_LEN, PASSWORD_MAX_LEN, に変更

#1032(フロントデザインリニューアル)

  • ヘッダ用ログインブロックを追加するとログアウトが動作しない場合があったのを修正

#986([フロント]フロントパーツ)

  • $objFormParam をローカル変数化
  • ログインパラメータのチェックを, shopping/index.php に合わせるよう修正
Location:
branches/version-2_5-dev
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl

    r20422 r20433  
    200200                <td> 
    201201                    <span class="attention"><!--{$arrErr.password}--></span> 
    202                     <input type="password" name="password" value="<!--{$arrForm.password|h}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字（記号不可） 
     202                    <input type="password" name="password" value="<!--{$arrForm.password|h}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字<!--{$smarty.const.PASSWORD_MIN_LEN}-->～<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字（記号不可） 
    203203                </td> 
    204204            </tr> 

  • branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl

    r20408 r20433  
    11<div class="bloc_outer"> 
    22    <div id="header_login_area" class="clearfix"> 
    3         <form name="login_form" id="login_form" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_form')"> 
     3        <form name="login_header_form" id="login_header_form" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_header_form')"> 
    44            <input type="hidden" name="mode" value="login" /> 
    55            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" /> 
    … …  
    1414                        所持ポイント: <span class="point"> <!--{$tpl_user_point|number_format|default:0}--> pt</span> 
    1515                    <!--{/if}-->&nbsp;&nbsp; 
    16                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg',this)" src="<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg" onclick="fnFormModeSubmit('login_form', 'logout', '', ''); return false;" alt="ログアウト" /> 
     16                       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg',this)" src="<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg" onclick="fnFormModeSubmit('login_header_form', 'logout', '', ''); return false;" alt="ログアウト" /> 
    1717                     </p> 
    1818                    <!--{/if}--> 

  • branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl

    r20340 r20433  
    192192    <div class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></div> 
    193193    <!--{/if}--> 
    194     <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" class="box120" /> 
    195     <p><span class="attention mini">半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字でお願いします。（記号不可）</span></p> 
    196     <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" class="box120" /> 
     194    <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" class="box120" /> 
     195    <p><span class="attention mini">半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->～<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字でお願いします。（記号不可）</span></p> 
     196    <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" class="box120" /> 
    197197    <p><span class="attention mini">確認のために2度入力してください。</span></p> 
    198198  </td> 

  • branches/version-2_5-dev/data/Smarty/templates/mobile/entry/index.tpl

    r20116 r20433  
    3434 
    3535    ●パスワード<font color="#FF0000"> *</font><br> 
    36     （半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->文字以上<!--{$smarty.const.PASSWORD_LEN2}-->文字以内）<br> 
     36    （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br> 
    3737    <font color="#FF0000"><!--{$arrErr.password}--></font> 
    38     <!--{assign var="size" value="`$smarty.const.PASSWORD_LEN2+2`"}--> 
    39     <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" size="<!--{$size}-->"><br> 
     38    <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}--> 
     39    <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br> 
    4040 
    4141    ●パスワード確認用の質問<font color="#FF0000"> *</font><br> 

  • branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/change.tpl

    r20116 r20433  
    3434 
    3535    【パスワード】<font color="#FF0000">※</font><br> 
    36     （半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->文字以上<!--{$smarty.const.PASSWORD_LEN2}-->文字以内）<br> 
     36    （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br> 
    3737    <font color="#FF0000"><!--{$arrErr.password}--></font> 
    38     <!--{assign var="size" value="`$smarty.const.PASSWORD_LEN2+2`"}--> 
    39     <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" size="<!--{$size}-->"><br> 
     38    <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}--> 
     39    <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br> 
    4040 
    4141    【パスワード確認用の質問】<font color="#FF0000">※</font><br> 

  • branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl

    r20116 r20433  
    185185    <div class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></div> 
    186186    <!--{/if}--> 
    187     <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" size="15" class="box120" /> 
    188     <p><em>半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字でお願いします。（記号不可）</em></p> 
    189     <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" size="15" class="box120" /> 
     187    <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" size="15" class="box120" /> 
     188    <p><em>半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->～<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字でお願いします。（記号不可）</em></p> 
     189    <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" size="15" class="box120" /> 
    190190    <p><em>確認のために2度入力してください。</em></p> 
    191191  </td> 

  • branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php

    r20344 r20433  
    7070        $objCookie = new SC_Cookie(COOKIE_EXPIRE); 
    7171        // パラメータ管理クラス 
    72         $this->objFormParam = new SC_FormParam(); 
     72        $objFormParam = new SC_FormParam(); 
    7373 
    7474        // パラメータ情報の初期化 
    75         $this->lfInitParam($this->objFormParam); 
     75        $this->lfInitParam($objFormParam); 
    7676 
    7777        // リクエスト値をフォームにセット 
    78         $this->objFormParam->setParam($this->lfConvertParam($_POST)); 
     78        $objFormParam->setParam($_POST); 
    7979 
    8080        // モードによって分岐 
    … …  
    8484 
    8585            // 入力値のエラーチェック 
    86             $this->objFormParam->toLower('login_email'); 
    87             $arrErr = $this->objFormParam->checkError(); 
     86            $objFormParam->trimParam(); 
     87            $objFormParam->toLower('login_email'); 
     88            $arrErr = $objFormParam->checkError(); 
    8889 
    8990            // エラーの場合はエラー画面に遷移 
    … …  
    9394 
    9495            // 入力チェック後の値を取得 
    95             $arrForm = $this->objFormParam->getHashArray(); 
     96            $arrForm = $objFormParam->getHashArray(); 
    9697 
    9798            // クッキー保存判定 
    … …  
    198199     * 
    199200     * @param SC_FormParam $objFormParam パラメータ管理クラス 
    200      * @return SC_FormParam $objFormParam 初期化したパラメータ管理クラスを返す 
     201     * @return void 
    201202     */ 
    202203    function lfInitParam(&$objFormParam) { 
    203204        $objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 
    204         $objFormParam->addParam('メールアドレス', 'login_email', MTEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB' ,'EMAIL_CHAR_CHECK')); 
    205         $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_LEN1, '', array('EXIST_CHECK')); 
    206         $objFormParam->addParam('パスワード', 'login_pass1', PASSWORD_LEN1, '', array('EXIST_CHECK', 'MIN_LENGTH_CHECK')); 
    207         $objFormParam->addParam('パスワード', 'login_pass2', PASSWORD_LEN2, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    208         return $objFormParam; 
    209     } 
    210  
    211     /** 
    212      * リクエスト値の整形. 
    213      * 
    214      * @param array $arrRequest リクエスト 
    215      * @return array $arrRequest 整形したリクエストを返す 
    216      */ 
    217     function lfConvertParam($arrRequest) { 
    218         // パスワード・Eメールにある空白をトリム 
    219         $arrRequest['login_email'] = preg_replace('/^[ 　\r\n]*(.*?)[ 　\r\n]*$/u', '$1', $arrRequest['login_email']); 
    220         $arrRequest['login_pass'] = trim($arrRequest['login_pass']); //認証用 
    221         $arrRequest['login_pass1'] = $arrRequest['login_pass'];      //最小桁数比較用 
    222         $arrRequest['login_pass2'] = $arrRequest['login_pass'];      //最大桁数比較用 
    223         return $arrRequest; 
    224     } 
    225  
     205        $objFormParam->addParam('メールアドレス', 'login_email', MTEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
     206        $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
     207    } 
    226208} 
    227209?> 

  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php

    r20344 r20433  
    291291    function lfInitLoginFormParam(&$objFormParam) { 
    292292        $objFormParam->addParam("記憶する", "login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
    293         $objFormParam->addParam("メールアドレス", "login_email", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
    294         $objFormParam->addParam("パスワード", "login_pass", PASSWORD_LEN2, "", array("EXIST_CHECK")); 
     293        $objFormParam->addParam("メールアドレス", "login_email", STEXT_LEN, "a", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
     294        $objFormParam->addParam("パスワード", "login_pass", PASSWORD_MAX_LEN, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
    295295    } 
    296296 

  • branches/version-2_5-dev/data/mtb_constants_init.php

    r20422 r20433  
    288288define('URL_LEN', 1024); 
    289289/** 管理画面用：ID・パスワードの文字数制限 */ 
    290 define('ID_MAX_LEN', 15); 
     290define('ID_MAX_LEN', STEXT_LEN); 
    291291/** 管理画面用：ID・パスワードの文字数制限 */ 
    292292define('ID_MIN_LEN', 4); 
    … …  
    306306define('TEL_LEN', 12); 
    307307/** フロント画面用：パスワードの最小文字数 */ 
    308 define('PASSWORD_LEN1', 4); 
     308define('PASSWORD_MIN_LEN', 4); 
    309309/** フロント画面用：パスワードの最大文字数 */ 
    310 define('PASSWORD_LEN2', 10); 
     310define('PASSWORD_MAX_LEN', STEXT_LEN); 
    311311/** 検査数値用桁数(INT) */ 
    312312define('INT_LEN', 9); 

  • branches/version-2_5-dev/html/install/sql/insert_data.sql

    r20422 r20433  
    11081108INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LLTEXT_LEN', '99999', 193, '超長文の文字数 (メルマガなど)'); 
    11091109INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LEN', '1024', 194, 'URLの文字長'); 
    1110 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ID_MAX_LEN', '15', 195, '管理画面用：ID・パスワードの文字数制限'); 
     1110INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ID_MAX_LEN', 'STEXT_LEN', 195, '管理画面用：ID・パスワードの文字数制限'); 
    11111111INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ID_MIN_LEN', '4', 196, '管理画面用：ID・パスワードの文字数制限'); 
    11121112INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PRICE_LEN', '8', 197, '金額桁数'); 
    … …  
    11171117INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEL_ITEM_LEN', '6', 202, '電話番号各項目制限'); 
    11181118INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEL_LEN', '12', 203, '電話番号総数'); 
    1119 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_LEN1', '4', 204, 'フロント画面用：パスワードの最小文字数'); 
    1120 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_LEN2', '10', 205, 'フロント画面用：パスワードの最大文字数'); 
     1119INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MIN_LEN', '4', 204, 'フロント画面用：パスワードの最小文字数'); 
     1120INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MAX_LEN', 'STEXT_LEN', 205, 'フロント画面用：パスワードの最大文字数'); 
    11211121INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('INT_LEN', '9', 206, '検査数値用桁数(INT)'); 
    11221122INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CREDIT_NO_LEN', '4', 207, 'クレジットカードの文字数'); 
Note: See TracChangeset for help on using the changeset viewer.