[Svn-src-all:1537] [version-2_5-dev 20433] #1007(lfConvertParamが散在する)
nanasess
admin ＠ mail.ec-cube.net
2011年 2月 28日 (月) 04:10:50 JST
Subversion committed to /home/svn/open 20433
http://svn.ec-cube.net/open_trac/changeset/20433
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2011-02-28 04:10:49 +0900 (月, 28 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1007(lfConvertParamが散在する)
* LC_Page_FrontParts_LoginCheck.php での処理を削除. ログイン時でのパスワード最小値, 最大値チェックは不要と思われるため
#627(ソース整形・ソースコメントの改善)
* PASSWORD_LEN1, PASSWORD_LEN2 を PASSWORD_MIN_LEN, PASSWORD_MAX_LEN, に変更
#1032(フロントデザインリニューアル)
* ヘッダ用ログインブロックを追加するとログアウトが動作しない場合があったのを修正
#986([フロント]フロントパーツ)
* $objFormParam をローカル変数化
* ログインパラメータのチェックを, shopping/index.php に合わせるよう修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl
U branches/version-2_5-dev/data/Smarty/templates/mobile/entry/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/change.tpl
U branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
U branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_5-dev/data/mtb_constants_init.php
U branches/version-2_5-dev/html/install/sql/insert_data.sql
変更: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl 2011-02-27 19:10:49 UTC (rev 20433)
@@ -199,7 +199,7 @@
<th>パスワード<span class="attention"> *</span></th>
<td>
<span class="attention"><!--{$arrErr.password}--></span>
- <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}-->文字（記号不可）
+ <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}-->文字（記号不可）
</td>
</tr>
<tr>
変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl 2011-02-27 19:10:49 UTC (rev 20433)
@@ -1,6 +1,6 @@
<div class="bloc_outer">
<div id="header_login_area" class="clearfix">
- <form name="login_form" id="login_form" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_form')">
+ <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')">
<input type="hidden" name="mode" value="login" />
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
<input type="hidden" name="url" value="<!--{$smarty.server.PHP_SELF|h}-->" />
@@ -13,7 +13,7 @@
<!--{if $smarty.const.USE_POINT !== false}-->
所持ポイント: <span class="point"> <!--{$tpl_user_point|number_format|default:0}--> pt</span>
<!--{/if}-->
- <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="ログアウト" />
+ <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="ログアウト" />
</p>
<!--{/if}-->
<!--{else}-->
変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl 2011-02-27 19:10:49 UTC (rev 20433)
@@ -191,9 +191,9 @@
<!--{if $arrErr.password || $arrErr.password02}-->
<div class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></div>
<!--{/if}-->
- <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" class="box120" />
- <p><span class="attention mini">半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->〜<!--{$smarty.const.PASSWORD_LEN2}-->文字でお願いします。（記号不可）</span></p>
- <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" class="box120" />
+ <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" class="box120" />
+ <p><span class="attention mini">半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->〜<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字でお願いします。（記号不可）</span></p>
+ <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" class="box120" />
<p><span class="attention mini">確認のために2度入力してください。</span></p>
</td>
</tr>
変更: branches/version-2_5-dev/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/entry/index.tpl 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/entry/index.tpl 2011-02-27 19:10:49 UTC (rev 20433)
@@ -33,10 +33,10 @@
<br>
●パスワード<font color="#FF0000"> *</font><br>
- （半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->文字以上<!--{$smarty.const.PASSWORD_LEN2}-->文字以内）<br>
+ （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br>
<font color="#FF0000"><!--{$arrErr.password}--></font>
- <!--{assign var="size" value="`$smarty.const.PASSWORD_LEN2+2`"}-->
- <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" size="<!--{$size}-->"><br>
+ <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}-->
+ <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br>
●パスワード確認用の質問<font color="#FF0000"> *</font><br>
<font color="#FF0000"><!--{$arrErr.reminder}--></font>
変更: branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/change.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/change.tpl 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/change.tpl 2011-02-27 19:10:49 UTC (rev 20433)
@@ -33,10 +33,10 @@
<br>
【パスワード】<font color="#FF0000">※</font><br>
- （半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->文字以上<!--{$smarty.const.PASSWORD_LEN2}-->文字以内）<br>
+ （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br>
<font color="#FF0000"><!--{$arrErr.password}--></font>
- <!--{assign var="size" value="`$smarty.const.PASSWORD_LEN2+2`"}-->
- <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" size="<!--{$size}-->"><br>
+ <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}-->
+ <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br>
【パスワード確認用の質問】<font color="#FF0000">※</font><br>
<font color="#FF0000"><!--{$arrErr.reminder}--></font>
変更: branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl 2011-02-27 19:10:49 UTC (rev 20433)
@@ -184,9 +184,9 @@
<!--{if $arrErr.password || $arrErr.password02}-->
<div class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></div>
<!--{/if}-->
- <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" size="15" class="box120" />
- <p><em>半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->〜<!--{$smarty.const.PASSWORD_LEN2}-->文字でお願いします。（記号不可）</em></p>
- <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" />
+ <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" size="15" class="box120" />
+ <p><em>半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->〜<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字でお願いします。（記号不可）</em></p>
+ <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" />
<p><em>確認のために2度入力してください。</em></p>
</td>
</tr>
変更: branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2011-02-27 19:10:49 UTC (rev 20433)
@@ -69,13 +69,13 @@
// クッキー管理クラス
$objCookie = new SC_Cookie(COOKIE_EXPIRE);
// パラメータ管理クラス
- $this->objFormParam = new SC_FormParam();
+ $objFormParam = new SC_FormParam();
// パラメータ情報の初期化
- $this->lfInitParam($this->objFormParam);
+ $this->lfInitParam($objFormParam);
// リクエスト値をフォームにセット
- $this->objFormParam->setParam($this->lfConvertParam($_POST));
+ $objFormParam->setParam($_POST);
// モードによって分岐
switch ($this->getMode()) {
@@ -83,8 +83,9 @@
// --- ログイン
// 入力値のエラーチェック
- $this->objFormParam->toLower('login_email');
- $arrErr = $this->objFormParam->checkError();
+ $objFormParam->trimParam();
+ $objFormParam->toLower('login_email');
+ $arrErr = $objFormParam->checkError();
// エラーの場合はエラー画面に遷移
if (count($arrErr) > 0) {
@@ -92,7 +93,7 @@
}
// 入力チェック後の値を取得
- $arrForm = $this->objFormParam->getHashArray();
+ $arrForm = $objFormParam->getHashArray();
// クッキー保存判定
if ($arrForm['login_memory'] == '1' && $arrForm['login_email'] != '') {
@@ -197,31 +198,12 @@
* パラメータ情報の初期化.
*
* @param SC_FormParam $objFormParam パラメータ管理クラス
- * @return SC_FormParam $objFormParam 初期化したパラメータ管理クラスを返す
+ * @return void
*/
function lfInitParam(&$objFormParam) {
$objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
- $objFormParam->addParam('メールアドレス', 'login_email', MTEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB' ,'EMAIL_CHAR_CHECK'));
- $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_LEN1, '', array('EXIST_CHECK'));
- $objFormParam->addParam('パスワード', 'login_pass1', PASSWORD_LEN1, '', array('EXIST_CHECK', 'MIN_LENGTH_CHECK'));
- $objFormParam->addParam('パスワード', 'login_pass2', PASSWORD_LEN2, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
- return $objFormParam;
+ $objFormParam->addParam('メールアドレス', 'login_email', MTEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
}
-
- /**
- * リクエスト値の整形.
- *
- * @param array $arrRequest リクエスト
- * @return array $arrRequest 整形したリクエストを返す
- */
- function lfConvertParam($arrRequest) {
- // パスワード・Eメールにある空白をトリム
- $arrRequest['login_email'] = preg_replace('/^[ \r\n]*(.*?)[ \r\n]*$/u', '$1', $arrRequest['login_email']);
- $arrRequest['login_pass'] = trim($arrRequest['login_pass']); //認証用
- $arrRequest['login_pass1'] = $arrRequest['login_pass']; //最小桁数比較用
- $arrRequest['login_pass2'] = $arrRequest['login_pass']; //最大桁数比較用
- return $arrRequest;
- }
-
}
?>
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2011-02-27 19:10:49 UTC (rev 20433)
@@ -290,8 +290,8 @@
*/
function lfInitLoginFormParam(&$objFormParam) {
$objFormParam->addParam("記憶する", "login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
- $objFormParam->addParam("メールアドレス", "login_email", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $objFormParam->addParam("パスワード", "login_pass", PASSWORD_LEN2, "", array("EXIST_CHECK"));
+ $objFormParam->addParam("メールアドレス", "login_email", STEXT_LEN, "a", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("パスワード", "login_pass", PASSWORD_MAX_LEN, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
}
/**
変更: branches/version-2_5-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_5-dev/data/mtb_constants_init.php 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/data/mtb_constants_init.php 2011-02-27 19:10:49 UTC (rev 20433)
@@ -287,7 +287,7 @@
/** URLの文字長 */
define('URL_LEN', 1024);
/** 管理画面用：ID・パスワードの文字数制限 */
-define('ID_MAX_LEN', 15);
+define('ID_MAX_LEN', STEXT_LEN);
/** 管理画面用：ID・パスワードの文字数制限 */
define('ID_MIN_LEN', 4);
/** 金額桁数 */
@@ -305,9 +305,9 @@
/** 電話番号総数 */
define('TEL_LEN', 12);
/** フロント画面用：パスワードの最小文字数 */
-define('PASSWORD_LEN1', 4);
+define('PASSWORD_MIN_LEN', 4);
/** フロント画面用：パスワードの最大文字数 */
-define('PASSWORD_LEN2', 10);
+define('PASSWORD_MAX_LEN', STEXT_LEN);
/** 検査数値用桁数(INT) */
define('INT_LEN', 9);
/** クレジットカードの文字数 */
変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-27 18:51:15 UTC (rev 20432)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-27 19:10:49 UTC (rev 20433)
@@ -1107,7 +1107,7 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LTEXT_LEN', '3000', 192, '長文の文字数');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LLTEXT_LEN', '99999', 193, '超長文の文字数 (メルマガなど)');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LEN', '1024', 194, 'URLの文字長');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ID_MAX_LEN', '15', 195, '管理画面用：ID・パスワードの文字数制限');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ID_MAX_LEN', 'STEXT_LEN', 195, '管理画面用：ID・パスワードの文字数制限');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ID_MIN_LEN', '4', 196, '管理画面用：ID・パスワードの文字数制限');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PRICE_LEN', '8', 197, '金額桁数');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PERCENTAGE_LEN', '3', 198, '率桁数');
@@ -1116,8 +1116,8 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ZIP02_LEN', '4', 201, '郵便番号2');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEL_ITEM_LEN', '6', 202, '電話番号各項目制限');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEL_LEN', '12', 203, '電話番号総数');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_LEN1', '4', 204, 'フロント画面用：パスワードの最小文字数');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_LEN2', '10', 205, 'フロント画面用：パスワードの最大文字数');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MIN_LEN', '4', 204, 'フロント画面用：パスワードの最小文字数');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MAX_LEN', 'STEXT_LEN', 205, 'フロント画面用：パスワードの最大文字数');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('INT_LEN', '9', 206, '検査数値用桁数(INT)');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CREDIT_NO_LEN', '4', 207, 'クレジットカードの文字数');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SEARCH_CATEGORY_LEN', '18', 208, '検索カテゴリ最大表示文字数(byte)');
Svn-src-all メーリングリストの案内