Index: /branches/comu-ver2/html/install/index.php
===================================================================
--- /branches/comu-ver2/html/install/index.php	(revision 17994)
+++ /branches/comu-ver2/html/install/index.php	(revision 18021)
@@ -623,6 +623,6 @@
     $objWebParam->addParam("店名", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $shop_name);
     $objWebParam->addParam("管理者：メールアドレス", "admin_mail", MTEXT_LEN, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"), $admin_mail);
-    $objWebParam->addParam("管理者：ログインID", "login_id", MTEXT_LEN, "", array("EXIST_CHECK","EXIST_CHECK", "ALNUM_CHECK"));
-    $objWebParam->addParam("管理者：パスワード", "login_pass", MTEXT_LEN, "", array("EXIST_CHECK","EXIST_CHECK", "ALNUM_CHECK"));
+    $objWebParam->addParam("管理者：ログインID", "login_id", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
+    $objWebParam->addParam("管理者：パスワード", "login_pass", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
     $objWebParam->addParam("URL(通常)", "normal_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $normal_url);
     $objWebParam->addParam("URL(セキュア)", "secure_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $secure_url);
@@ -692,8 +692,8 @@
 
     // ログインIDチェック
-    $objErr->doFunc(array("管理者：ログインID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array("NUM_RANGE_CHECK"));
+    $objErr->doFunc(array("管理者：ログインID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK"));
 
     // パスワードのチェック
-    $objErr->doFunc( array("管理者：パスワード",'login_pass',4 ,15 ) ,array( "NUM_RANGE_CHECK" ) );
+    $objErr->doFunc( array("管理者：パスワード",'login_pass',ID_MIN_LEN ,ID_MAX_LEN ) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK" ));
 
     return $objErr->arrErr;
Index: /branches/comu-ver2/html/install/templates/step1.tpl
===================================================================
--- /branches/comu-ver2/html/install/templates/step1.tpl	(revision 17605)
+++ /branches/comu-ver2/html/install/templates/step1.tpl	(revision 18021)
@@ -53,5 +53,5 @@
         </tr>
         <tr>
-            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：ログインID<span class="red">※</span></span><br/><span class="fs10">半角英数字・15文字以内</span></td>
+            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：ログインID<span class="red">※</span></span><br/><span class="fs10">半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字</span></td>
             <td bgcolor="#ffffff" width="332">
             <!--{assign var=key value="login_id"}-->
@@ -62,5 +62,5 @@
         </tr>
         <tr>
-            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：パスワード<span class="red">※</span></span><br/><span class="fs10">半角英数字・15文字以内</span></td>
+            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：パスワード<span class="red">※</span></span><br/><span class="fs10">半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字</span></td>
             <td bgcolor="#ffffff" width="332">
             <!--{assign var=key value="login_pass"}-->
Index: /branches/comu-ver2/html/install/sql/insert_data.sql
===================================================================
--- /branches/comu-ver2/html/install/sql/insert_data.sql	(revision 18019)
+++ /branches/comu-ver2/html/install/sql/insert_data.sql	(revision 18021)
@@ -954,6 +954,6 @@
 INSERT INTO mtb_constants VALUES ('LLTEXT_LEN','99999',193,'超長文の文字数（メルマガなど）');
 INSERT INTO mtb_constants VALUES ('URL_LEN','300',194,'URLの文字長');
-INSERT INTO mtb_constants VALUES ('ID_MAX_LEN','15',195,'ID・パスワードの文字数制限');
-INSERT INTO mtb_constants VALUES ('ID_MIN_LEN','4',196,'ID・パスワードの文字数制限');
+INSERT INTO mtb_constants VALUES ('ID_MAX_LEN','15',195,'管理画面用：ID・パスワードの文字数制限');
+INSERT INTO mtb_constants VALUES ('ID_MIN_LEN','4',196,'管理画面用：ID・パスワードの文字数制限');
 INSERT INTO mtb_constants VALUES ('PRICE_LEN','8',197,'金額桁数');
 INSERT INTO mtb_constants VALUES ('PERCENTAGE_LEN','3',198,'率桁数');
@@ -963,6 +963,6 @@
 INSERT INTO mtb_constants VALUES ('TEL_ITEM_LEN','6',202,'電話番号各項目制限');
 INSERT INTO mtb_constants VALUES ('TEL_LEN','12',203,'電話番号総数');
-INSERT INTO mtb_constants VALUES ('PASSWORD_LEN1','4',204,'パスワード1');
-INSERT INTO mtb_constants VALUES ('PASSWORD_LEN2','10',205,'パスワード2');
+INSERT INTO mtb_constants VALUES ('PASSWORD_LEN1','4',204,'フロント画面用：パスワードの最小文字数');
+INSERT INTO mtb_constants VALUES ('PASSWORD_LEN2','10',205,'フロント画面用：パスワードの最大文字数');
 INSERT INTO mtb_constants VALUES ('INT_LEN','8',206,'検査数値用桁数(INT)');
 INSERT INTO mtb_constants VALUES ('CREDIT_NO_LEN','4',207,'クレジットカードの文字数');
Index: /branches/comu-ver2/data/class/pages/mypage/LC_Page_Mypage_LoginCheck.php
===================================================================
--- /branches/comu-ver2/data/class/pages/mypage/LC_Page_Mypage_LoginCheck.php	(revision 17605)
+++ /branches/comu-ver2/data/class/pages/mypage/LC_Page_Mypage_LoginCheck.php	(revision 18021)
@@ -62,4 +62,9 @@
         // パラメータ情報の初期化
         $this->lfInitParam();
+        //パスワード・Eメールにある空白をトリム
+        $_POST["mypage_login_email"] = trim($_POST["mypage_login_email"]);
+        $_POST["mypage_login_pass"] = trim($_POST["mypage_login_pass"]);  //認証用
+        $_POST["mypage_login_pass1"] = trim($_POST["mypage_login_pass"]); //最小桁数比較用
+        $_POST["mypage_login_pass2"] = trim($_POST["mypage_login_pass"]); //最大桁数比較用
         // POST値の取得
         $this->objFormParam->setParam($_POST);
@@ -116,6 +121,9 @@
         $this->objFormParam->addParam("記憶する", "mypage_login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("メールアドレス", "mypage_login_email", MTEXT_LEN, "a", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK"));
-        $this->objFormParam->addParam("パスワード", "mypage_login_pass", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("パスワード", "mypage_login_pass", PASSWORD_LEN1, "KVa", array("EXIST_CHECK"));
+        $this->objFormParam->addParam("パスワード", "mypage_login_pass1", PASSWORD_LEN1, "KVa", array("EXIST_CHECK", "MIN_LENGTH_CHECK"));
+        $this->objFormParam->addParam("パスワード", "mypage_login_pass2", PASSWORD_LEN2, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
     }
+
 }
 ?>
Index: /branches/comu-ver2/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- /branches/comu-ver2/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	(revision 17969)
+++ /branches/comu-ver2/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	(revision 18021)
@@ -85,5 +85,8 @@
 
         $this->objLoginFormParam = new SC_FormParam();	// ログインフォーム用
-        $this->lfInitLoginFormParam();						// 初期設定
+        $this->lfInitLoginFormParam();
+        //パスワード・Eメールにある空白をトリム
+        $this->lfConvertEmail($_POST["login_email"]);
+        $this->lfConvertLoginPass($_POST["login_pass"]);
         $this->objLoginFormParam->setParam($_POST);		// POST値の取得
 
@@ -160,5 +163,5 @@
                         SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
                     }
-                    
+
                     // 登録済みの別のお届け先を受注一時テーブルに書き込む
                     $this->lfRegistOtherDelivData($uniqid, $objCustomer, $_POST['deliv_check']);
@@ -244,4 +247,7 @@
         $this->lfInitParam();
         // POST値の取得
+        $this->lfConvertEmail($_POST["login_email"]);
+        $this->lfConvertLoginPass($_POST["login_pass"]);
+
         $this->objFormParam->setParam($_POST);
 
@@ -429,5 +435,7 @@
         $this->objLoginFormParam->addParam("記憶する", "login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objLoginFormParam->addParam("メールアドレス", "login_email", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objLoginFormParam->addParam("パスワード", "login_pass", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objLoginFormParam->addParam("パスワード", "login_pass", PASSWORD_LEN1, "", array("EXIST_CHECK"));
+        $this->objLoginFormParam->addParam("パスワード", "login_pass1", PASSWORD_LEN1, "", array("EXIST_CHECK", "MIN_LENGTH_CHECK"));
+        $this->objLoginFormParam->addParam("パスワード", "login_pass2", PASSWORD_LEN2, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
     }
 
@@ -532,4 +540,26 @@
         return $objErr->arrErr;
     }
+
+    /**
+     * 入力されたEmailから余分な改行・空白を削除する
+     *
+     * @param string $_POST["login_email"]
+     */
+    function lfConvertEmail(){
+        if( strlen($_POST["login_email"]) < 1 ){ return ; }
+        $_POST["login_email"] = preg_replace('/^[ 　\r\n]*(.*?)[ 　\r\n]*$/u', '$1', $_POST["login_email"]);
+    }
+
+    /**
+     * 入力されたPassから余分な空白を削除し、最小桁数・最大桁数チェック用に変数に入れる
+     *
+     * @param string $_POST["login_pass"]
+     */
+    function lfConvertLoginPass(){
+    if( strlen($_POST["login_pass"]) < 1 ){ return ; }
+        $_POST["login_pass"] = trim($_POST["login_pass"]); //認証用
+        $_POST["login_pass1"] = $_POST["login_pass"];      //最小桁数比較用
+        $_POST["login_pass2"] = $_POST["login_pass"];      //最大桁数比較用
+    }
 }
 ?>
Index: /branches/comu-ver2/data/class/pages/admin/LC_Page_Admin_Login.php
===================================================================
--- /branches/comu-ver2/data/class/pages/admin/LC_Page_Admin_Login.php	(revision 17675)
+++ /branches/comu-ver2/data/class/pages/admin/LC_Page_Admin_Login.php	(revision 18021)
@@ -65,5 +65,5 @@
 
         // 入力判定
-        if(strlen($_POST{'login_id'}) > 0 && strlen($_POST{'password'}) > 0) {
+        if(strlen($_POST{'login_id'}) > 0 && strlen($_POST{'password'}) >= ID_MIN_LEN && strlen($_POST{'password'}) <= ID_MAX_LEN) {
             // 認証パスワードの判定
             $ret = $this->fnCheckPassword($conn);
Index: /branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
===================================================================
--- /branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	(revision 16834)
+++ /branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	(revision 18021)
@@ -253,6 +253,6 @@
         // ログインID・パスワードの文字数チェック
         $objErr = new SC_CheckError();
-        $objErr->doFunc(array("パスワード", 'password', ID_MIN_LEN, ID_MAX_LEN), array("NUM_RANGE_CHECK"));
-        $objErr->doFunc(array("ログインID", 'login_id', ID_MIN_LEN, ID_MAX_LEN), array("NUM_RANGE_CHECK"));
+        $objErr->doFunc(array("パスワード", 'password', ID_MIN_LEN, ID_MAX_LEN), array("SPTAB_CHECK" ,"NUM_RANGE_CHECK"));
+        $objErr->doFunc(array("ログインID", 'login_id', ID_MIN_LEN, ID_MAX_LEN), array("SPTAB_CHECK" ,"NUM_RANGE_CHECK"));
 
         $arrErr = $objErr->arrErr;
Index: /branches/comu-ver2/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- /branches/comu-ver2/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php	(revision 17568)
+++ /branches/comu-ver2/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php	(revision 18021)
@@ -67,4 +67,9 @@
         // パラメータ情報の初期化
         $this->lfInitParam();
+        //パスワード・Eメールにある空白をトリム
+        $_POST["login_email"] = preg_replace('/^[ 　\r\n]*(.*?)[ 　\r\n]*$/u', '$1', $_POST["login_email"]);
+        $_POST["login_pass"] = trim($_POST["login_pass"]); //認証用
+        $_POST["login_pass1"] = $_POST["login_pass"];      //最小桁数比較用
+        $_POST["login_pass2"] = $_POST["login_pass"];      //最大桁数比較用
         // POST値の取得
         $this->objFormParam->setParam($_POST);
@@ -76,4 +81,6 @@
             $this->objFormParam->toLower('login_email');
             $arrErr = $this->objFormParam->checkError();
+
+            $this->p($arrErr);
 
             // エラーの場合はエラー画面に遷移
@@ -139,5 +146,7 @@
         $this->objFormParam->addParam("記憶する", "login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("メールアドレス", "login_email", MTEXT_LEN, "a", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK"));
-        $this->objFormParam->addParam("パスワード", "login_pass", MTEXT_LEN, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("パスワード", "login_pass", PASSWORD_LEN1, "", array("EXIST_CHECK"));
+        $this->objFormParam->addParam("パスワード", "login_pass1", PASSWORD_LEN1, "", array("EXIST_CHECK", "MIN_LENGTH_CHECK"));
+        $this->objFormParam->addParam("パスワード", "login_pass2", PASSWORD_LEN2, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
     }
 }
Index: /branches/comu-ver2/data/class/SC_FormParam.php
===================================================================
--- /branches/comu-ver2/data/class/SC_FormParam.php	(revision 17577)
+++ /branches/comu-ver2/data/class/SC_FormParam.php	(revision 18021)
@@ -154,4 +154,5 @@
         $arrRet = $this->getHashArray($keyname);
         $objErr = new SC_CheckError($arrRet);
+
         $cnt = 0;
         foreach($this->keyname as $val) {
@@ -196,4 +197,5 @@
                     break;
                 case 'MAX_LENGTH_CHECK':
+                case 'MIN_LENGTH_CHECK':
                 case 'NUM_COUNT_CHECK':
                     if(!is_array($this->param[$cnt])) {
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/system/input.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/system/input.tpl	(revision 17997)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/system/input.tpl	(revision 18021)
@@ -60,5 +60,5 @@
       <input type="text" name="login_id" size="20" class="box20"  value="<!--{$arrForm.login_id}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
       <span class="attention">※必須入力</span><br />
-      ※半角英数字・15文字以内
+      ※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字
     </td>
   </tr>
@@ -69,5 +69,5 @@
       <input type="password" name="password" size="20" class="box20" value="<!--{$arrForm.password}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
       <span class="attention">※必須入力</span><br />
-      ※半角英数字・15文字以内
+      ※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字
   </td>
   </tr>
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/customer/edit.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/customer/edit.tpl	(revision 17997)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/customer/edit.tpl	(revision 18021)
@@ -24,19 +24,19 @@
 <script type="text/javascript">
 <!--
-  
-  function fnReturn() {
-    document.form_search.action = './<!--{$smarty.const.DIR_INDEX_URL}-->';
-    document.form_search.submit();
-    return false;
-  }
-
-  function fnOrderidSubmit(order_id, order_id_value) {
-    if(order_id != "" && order_id_value != "") {
-      document.form2[order_id].value = order_id_value;
-    }
-    document.form2.action = '../order/edit.php';
-    document.form2.submit();
-  }
-  
+
+	function fnReturn() {
+		document.form_search.action = './<!--{$smarty.const.DIR_INDEX_URL}-->';
+		document.form_search.submit();
+		return false;
+	}
+
+	function fnOrderidSubmit(order_id, order_id_value) {
+		if(order_id != "" && order_id_value != "") {
+			document.form2[order_id].value = order_id_value;
+		}
+		document.form2.action = '../order/edit.php';
+		document.form2.submit();
+	}
+
 //-->
 </script>
@@ -182,5 +182,5 @@
         <select name="day" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
           <option value="" selected="selected">----</option>
-          <!--{html_options options=$arrDay selected=$list_data.day"}-->    
+          <!--{html_options options=$arrDay selected=$list_data.day"}-->
         </select>日
       </td>
@@ -190,5 +190,5 @@
       <td>
         <span class="attention"><!--{$arrErr.password}--></span>
-        <input type="password" name="password" value="<!--{$list_data.password|escape}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字4～10文字（記号不可）
+        <input type="password" name="password" value="<!--{$list_data.password|escape}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字（記号不可）
       </td>
     </tr>
Index: /branches/comu-ver2/data/Smarty/templates/default/frontparts/form_personal_input.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/frontparts/form_personal_input.tpl	(revision 17795)
+++ /branches/comu-ver2/data/Smarty/templates/default/frontparts/form_personal_input.tpl	(revision 18021)
@@ -186,5 +186,5 @@
     <!--{/if}-->
     <input type="password" name="password" value="<!--{$arrForm.password|escape}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" size="15" class="box120" />
-    <p><em>半角英数字4～10文字でお願いします。（記号不可）</em></p>
+    <p><em>半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字でお願いします。（記号不可）</em></p>
     <input type="password" name="password02" value="<!--{$arrForm.password02|escape}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" size="15" class="box120" />
     <p><em>確認のために2度入力してください。</em></p>
Index: /branches/comu-ver2/data/mtb_constants_init.php
===================================================================
--- /branches/comu-ver2/data/mtb_constants_init.php	(revision 17673)
+++ /branches/comu-ver2/data/mtb_constants_init.php	(revision 18021)
@@ -349,7 +349,7 @@
 /** URLの文字長 */
 define('URL_LEN', 300);
-/** ID・パスワードの文字数制限 */
+/** 管理画面用：ID・パスワードの文字数制限 */
 define('ID_MAX_LEN', 15);
-/** ID・パスワードの文字数制限 */
+/** 管理画面用：ID・パスワードの文字数制限 */
 define('ID_MIN_LEN', 4);
 /** 金額桁数 */
@@ -367,7 +367,7 @@
 /** 電話番号総数 */
 define('TEL_LEN', 12);
-/** パスワード1 */
+/** フロント画面用：パスワードの最小文字数 */
 define('PASSWORD_LEN1', 4);
-/** パスワード2 */
+/** フロント画面用：パスワードの最大文字数 */
 define('PASSWORD_LEN2', 10);
 /** 検査数値用桁数(INT) */