[Svn-src-all:1343] [version-2_5-dev 20233] r20232 コミット漏れ

AMUAMU admin @ mail.ec-cube.net
2011年 2月 20日 (日) 05:53:16 JST


Subversion committed to /home/svn/open 20233
http://svn.ec-cube.net/open_trac/changeset/20233
$B(#(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!($(B
$B("99?7<T!!(B:  AMUAMU                                       $B("(B
$B("99?7F|;~(B:  2011-02-20 05:53:15 +0900 ($BF|(B, 20  2$B7n(B 2011)$B("(B
$B(&(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(%(B

Log:
--------------------------------------------------------
r20232 $B%3%_%C%HO3$l(B

Changed:                      [U:$B=$@5!$(BA:$BDI2C!$(BD:$B:o=|(B]
--------------------------------------------------------
D   branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl
D   branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl
D   branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
D   branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Customer.php

$B:o=|(B: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl	2011-02-19 20:48:39 UTC (rev 20232)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl	2011-02-19 20:53:15 UTC (rev 20233)
@@ -1,191 +0,0 @@
-<!--{*
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-*}-->
-<form name="form1" id="form1" method="post" action="?">
-    <input type="hidden" name="mode" value="confirm" />
-    <div id="customer" class="contents-main">
-        <h2>$B8\5REPO?(B</h2>
-        <table class="form">
-            <tr>
-                <th>$B2q0w>uBV(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.status}--></span>
-                    <input type="radio" name="status"value=1 id="no_mem" <!--{if $list_data.status == 1}--> checked="checked" <!--{/if}--> <!--{if $list_data.status == 2}-->disabled<!--{/if}-->><label for="no_mem">$B2>2q0w(B</label>
-                    <input type="radio" name="status"value=2 id="mem"<!--{if $list_data.status == 2}--> checked="checked" <!--{/if}-->><label for="mem">$BK\2q0w(B</label>
-                </td>
-            </tr>
-            <tr>
-                <th>$B$*L>A0(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></span>
-                    <input type="text" name="name01" value="<!--{$list_data.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.name01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;&nbsp;<input type="text" name="name02" value="<!--{$list_data.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.name02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                </td>
-            </tr>
-            <tr>
-                <th>$B$*L>A0(B($B%U%j%,%J(B)<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
-                    <input type="text" name="kana01" value="<!--{$list_data.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;&nbsp;<input type="text" name="kana02" value="<!--{$list_data.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                </td>
-            </tr>
-            <tr>
-                <th>$BM9JXHV9f(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
-                    $B")(B <input type="text" name="zip01" value="<!--{$list_data.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" maxlength="3" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$list_data.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" maxlength="4" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                    <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;">$B=;=jF~NO(B</a>
-                </td>
-            </tr>
-            <tr>
-                <th>$B=;=j(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
-                    <select class="top" name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-                        <option value="" selected="selected">$BETF;I\8)$rA*Br(B</option>
-                        <!--{html_options options=$arrPref selected=$list_data.pref}-->
-                    </select>
-                    <br />
-                    <input type="text" name="addr01" value="<!--{$list_data.addr01|h}-->" size="60" class="box60" <!--{if $arrErr.addr01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
-                    <!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
-                    <input type="text" name="addr02" value="<!--{$list_data.addr02|h}-->" size="60" class="box60" <!--{if $arrErr.addr02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
-                    <!--{$smarty.const.SAMPLE_ADDRESS2}-->
-                </td>
-            </tr>
-            <tr>
-                <th>$B%a!<%k%"%I%l%9(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.email}--></span>
-                    <input type="text" name="email" value="<!--{$list_data.email|h}-->" size="60" class="box60" <!--{if $arrErr.email != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                </td>
-            </tr>
-            <tr>
-                <th>$B7HBS%a!<%k%"%I%l%9(B</th>
-                <td>
-                    <span class="attention"><!--{$arrErr.email_mobile}--></span>
-                    <input type="text" name="email_mobile" value="<!--{$list_data.email_mobile|h}-->" size="60" class="box60" <!--{if $arrErr.email_mobile != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                </td>
-            </tr>
-            <tr>
-                <th>$BEEOCHV9f(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></span>
-                    <input type="text" name="tel01" value="<!--{$list_data.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="tel02" value="<!--{$list_data.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != "" || $arrErr.tel02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="tel03" value="<!--{$list_data.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != "" || $arrErr.tel03 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                </td>
-            </tr>
-            <tr>
-                <th>FAX</th>
-                <td>
-                    <span class="attention"><!--{$arrErr.fax01}--><!--{$arrErr.fax02}--><!--{$arrErr.fax03}--></span>
-                    <input type="text" name="fax01" value="<!--{$list_data.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="fax02" value="<!--{$list_data.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != "" || $arrErr.fax02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="fax03" value="<!--{$list_data.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != "" || $arrErr.fax03 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                </td>
-            </tr>
-            <tr>
-                <th>$B$4 @ -JL(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.sex}--></span>
-                    <span <!--{if $arrErr.sex != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-                        <!--{html_radios name="sex" options=$arrSex separator=" " selected=$list_data.sex}-->
-                    </span>
-                </td>
-            </tr>
-            <tr>
-                <th>$B$4?&6H(B</th>
-                <td>
-                    <span class="attention"><!--{$arrErr.job}--></span>
-                    <select name="job" <!--{if $arrErr.job != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
-                    <option value="" selected="selected">$BA*Br$7$F$/$@$5$$(B</option>
-                    <!--{html_options options=$arrJob selected=$list_data.job}-->
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <th>$B @ 8G/7nF|(B</th>
-                <td>
-                    <span class="attention"><!--{$arrErr.year}--></span>
-                    <select name="year" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
-                        <option value="" selected="selected">------</option>
-                        <!--{html_options options=$arrYear selected=$list_data.year}-->
-                    </select>$BG/(B
-                    <select name="month" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
-                        <option value="" selected="selected">----</option>
-                        <!--{html_options options=$arrMonth selected=$list_data.month}-->
-                    </select>$B7n(B
-                    <select name="day" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
-                        <option value="" selected="selected">----</option>
-                        <!--{html_options options=$arrDay selected=$list_data.day"}-->
-                    </select>$BF|(B
-                </td>
-            </tr>
-            <tr>
-                <th>$B%Q%9%o!<%I(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.password}--></span>
-                    <input type="password" name="password" value="<!--{$list_data.password|h}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />$B!!H>3Q1Q?t>.J8;z(B<!--{$smarty.const.PASSWORD_LEN1}-->$B!A(B<!--{$smarty.const.PASSWORD_LEN2}-->$BJ8;z!J5-9fIT2D!K(B
-                </td>
-            </tr>
-            <tr>
-                <th>$B%Q%9%o!<%I$rK:$l$?$H$-$N%R%s%H(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></span>
-                    $B<ALd!'(B 
-                    <select class="top" name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
-                        <option value="" selected="selected">$BA*Br$7$F$/$@$5$$(B</option>
-                        <!--{html_options options=$arrReminder selected=$list_data.reminder}-->
-                    </select><br />
-                    $BEz$(!'(B 
-                    <input type="text" name="reminder_answer" value="<!--{$list_data.reminder_answer|h}-->" size="30" class="box30" <!--{if $arrErr.reminder_answer != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                </td>
-            </tr>
-            <tr>
-                <th>$B%a!<%k%^%,%8%s(B<span class="attention"> *</span></th>
-                <td>
-                    <span class="attention"><!--{$arrErr.mailmaga_flg}--></span>
-                    <input type="radio" name="mailmaga_flg" value="1" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 1 or $list_data.mailmaga_flg eq 4}-->checked<!--{/if}--> />HTML$B!!(B
-                    <input type="radio" name="mailmaga_flg" value="2" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 2 or $list_data.mailmaga_flg eq 5}-->checked<!--{/if}--> />$B%F%-%9%H!!(B
-                    <input type="radio" name="mailmaga_flg" value="3" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq "" or $list_data.mailmaga_flg eq 3 or $list_data.mailmaga_flg eq 6}-->checked<!--{/if}--> />$B4uK>$7$J$$(B
-                </td>
-            </tr>
-            <tr>
-                <th>SHOP$BMQ%a%b(B</th>
-                <td>
-                    <span class="attention"><!--{$arrErr.note}--></span>
-                    <textarea name="note" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" <!--{if $arrErr.note != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> cols="60" rows="8" class="area60"><!--{$list_data.note|h}--></textarea>
-                </td>
-            </tr>
-            <tr>
-                <th>$B=j;}%]%$%s%H(B</th>
-                <td>
-                    <span class="attention"><!--{$arrErr.point}--></span>
-                    <input type="text" name="point" value="<!--{$list_data.point|h}-->" maxlength="<!--{$smarty.const.TEL_LEN}-->" <!--{if $arrErr.point != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> size="6" class="box6" <!--{if $arrErr.point != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> pt
-                </td>
-            </tr>
-        </table>
-
-        <div class="btn-area">
-            <ul>
-                <li><a class="btn-action" href="javascript:;" onclick="fnSetFormSubmit('form1', 'mode', 'confirm'); return false;"><span class="btn-next">$B3NG'%Z!<%8$X(B</span></a></li>
-            </ul>
-        </div>
-    </div>
-</form>
-

$B:o=|(B: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl	2011-02-19 20:48:39 UTC (rev 20232)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl	2011-02-19 20:53:15 UTC (rev 20233)
@@ -1,46 +0,0 @@
-<!--{*
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-*}-->
-<form name="form1" id="form1" method="post" action="?">
-<input type="hidden" name="mode" value="complete" />
-<!--{foreach from=$arrForm key=key item=item}-->
-<!--{if $key ne "mode" && $key ne "subm"}-->
-<input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->" />
-<!--{/if}-->
-<!--{/foreach}-->
-	<div id="complete">
-		<div class="complete-top"></div>
-		<div class="contents">
-			<div class="message">
-				$BEPO?$,40N;CW$7$^$7$?!#(B
-			</div>
-		</div>
-		<div class="btn-area-top"></div>
-		<div class="btn-area">
-			<ul>
-				<li><a class="btn-action" href="./customer.php"><span class="btn-next">$BB3$1$FEPO?$r9T$&(B</span></a></li>
-			</ul>
-		</div>
-		<div class="btn-area-bottom"></div>
-	</div>
-</form>

$B:o=|(B: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl	2011-02-19 20:48:39 UTC (rev 20232)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl	2011-02-19 20:53:15 UTC (rev 20233)
@@ -1,135 +0,0 @@
-<!--{*
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-*}-->
-<script type="text/javascript">
-<!--
-
-function func_return(){
-    document.form1.mode.value = "return";
-    document.form1.submit();
-}
-
-//-->
-</script>
-
-
-<form name="form1" id="form1" method="post" action="?">
-    <input type="hidden" name="mode" value="complete" />
-    <!--{foreach from=$arrForm key=key item=item}-->
-        <!--{if $key ne "mode" && $key ne "subm"}-->
-            <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->" />
-        <!--{/if}-->
-    <!--{/foreach}-->
-    <!-- $B8!:w>r7o$NJ];}(B -->
-    <!--{foreach from=$arrSearchData key="key" item="item"}-->
-        <!--{if $key ne "job" && $key ne "sex"}--><input type="hidden" name="search_data[<!--{$key|h}-->]" value="<!--{$item|h}-->"><!--{/if}-->
-    <!--{/foreach}-->
-    <!--{foreach from=$arrSearchData.job key="key" item="item"}-->
-        <input type="hidden" name="search_data[job][]" value=<!--{$item}--> />
-    <!--{/foreach}-->
-    <!--{foreach from=$arrSearchData.sex key="key" item="item"}-->
-        <input type="hidden" name="search_data[sex][]" value=<!--{$item}--> />
-    <!--{/foreach}-->
-    <div id="customer" class="contents-main">
-        <h2>$B8\5RJT=8(B</h2>
-        <table class="form">
-            <tr>
-                <th>$B2q0w>uBV(B<span class="attention"> *</span></th>
-                <td><!--{if $arrForm.status == 1}-->$B2>2q0w(B<!--{else}-->$BK\2q0w(B<!--{/if}--></td>
-            </tr>
-            <tr>
-                <th>$B$*L>A0(B<span class="attention"> *</span></th>
-                <td><!--{$arrForm.name01|h}--><!--{$arrForm.name02|h}-->$B!!MM(B</td>
-            </tr>
-            <tr>
-                <th>$B$*L>A0(B($B%U%j%,%J(B)<span class="attention"> *</span></th>
-                <td><!--{$arrForm.kana01|h}--><!--{$arrForm.kana02|h}-->$B!!MM(B</td>
-            </tr>
-            <tr>
-                <th>$BM9JXHV9f(B<span class="attention"> *</span></th>
-                <td>$B")(B <!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--></td>
-            </tr>
-            <tr>
-                <th>$B=;=j(B<span class="attention"> *</span></td>
-                <td><!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}--></td>
-            </tr>
-            <tr>
-                <th>$B%a!<%k%"%I%l%9(B<span class="attention"> *</span></th>
-                <td><!--{$arrForm.email|h}--></td>
-            </tr>
-            <tr>
-                <th>$B7HBS%a!<%k%"%I%l%9(B</th>
-                <td><!--{$arrForm.email_mobile|h}--></td>
-            </tr>
-            <tr>
-                <th>$B$*EEOCHV9f(B<span class="attention"> *</span></th>
-                <td><!--{$arrForm.tel01|h}--> - <!--{$arrForm.tel02|h}--> - <!--{$arrForm.tel03|h}--></td>
-            </tr>
-            <tr>
-                <th>FAX</th>
-                <td><!--{if strlen($arrForm.fax01) > 0}--><!--{$arrForm.fax01|h}--> - <!--{$arrForm.fax02|h}--> - <!--{$arrForm.fax03|h}--><!--{else}-->$BL$EPO?(B<!--{/if}--></td>
-            </tr>
-            <tr>
-                <th>$B$4 @ -JL(B<span class="attention"> *</span></th>
-                <td><!--{$arrSex[$arrForm.sex]|h}--></td>
-            </tr>
-            <tr>
-                <th>$B$4?&6H(B</th>
-                <td><!--{$arrJob[$arrForm.job]|default:"$BL$EPO?(B"|h}--></td>
-            </tr>
-            <tr>
-                <th>$B @ 8G/7nF|(B</th>
-                <td><!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|h}-->$BG/(B<!--{$arrForm.month|h}-->$B7n(B<!--{$arrForm.day|h}-->$BF|(B<!--{else}-->$BL$EPO?(B<!--{/if}--></td>
-            </tr>
-            <tr>
-                <th>$B%Q%9%o!<%I(B<span class="attention"> *</span></th>
-                <td><!--{$passlen}--></td>
-            </tr>
-            <tr>
-                <th>$B%Q%9%o!<%I$rK:$l$?$H$-$N%R%s%H(B<span class="attention"> *</span></th>
-                <td>
-                    $B<ALd!'(B <!--{$arrReminder[$arrForm.reminder]|h}--><br />
-                    $BEz$(!'(B <!--{$arrForm.reminder_answer|h}-->
-                </td>
-            </tr>
-            <tr>
-                <th>$B%a!<%k%^%,%8%s(B<span class="attention"> *</span></th>
-                <td><!--{if $arrForm.mailmaga_flg eq 1}-->HTML<!--{elseif $arrForm.mailmaga_flg eq 2}-->$B%F%-%9%H(B<!--{else}-->$B4uK>$7$J$$(B<!--{/if}--></td>
-            </tr>
-            <tr>
-                <th>SHOP$BMQ%a%b(B</th>
-                <td><!--{$arrForm.note|h|nl2br|default:"$BL$EPO?(B"}--></td>
-            </tr>
-            <tr>
-                <th>$B=j;}%]%$%s%H(B</td>
-                <td><!--{$arrForm.point|default:"0"|h}--> pt</td>
-            </tr>
-        </table>
-        <div class="btn-area">
-          <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="func_return(); return false;"><span class="btn-prev">$BJT=82hLL$KLa$k(B</span></a></li>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'complete', '', ''); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a></li>
-          </ul>
-        </div>
-    </div>
-</form>

$BJQ99(B: 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-19 20:48:39 UTC (rev 20232)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	2011-02-19 20:53:15 UTC (rev 20233)
@@ -48,10 +48,10 @@
         <!--{if $key ne "customer_id" && $key ne "mode" && $key ne "del_mode" && $key ne "edit_customer_id" && $key ne "del_customer_id" && $key ne "csv_mode" && $key ne "job" && $key ne "sex"}--><input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->"><!--{/if}-->
     <!--{/foreach}-->
     <!--{foreach from=$arrSearchData.job key="key" item="item"}-->
-        <input type="hidden" name="job[]" value="<!--{$item|h}-->" />
+        <input type="hidden" name="job[]" value="<!--{$item}-->" />
     <!--{/foreach}-->
     <!--{foreach from=$arrSearchData.sex key="key" item="item"}-->
-        <input type="hidden" name="sex[]" value="<!--{$item|h}-->" />
+        <input type="hidden" name="sex[]" value="<!--{$item}-->" />
     <!--{/foreach}-->
 </form>
 

$B:o=|(B: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Customer.php	2011-02-19 20:48:39 UTC (rev 20232)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Customer.php	2011-02-19 20:53:15 UTC (rev 20233)
@@ -1,288 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once(CLASS_REALDIR . "pages/admin/LC_Page_Admin.php");
-
-/**
- * $B8\5REPO?(B $B$N%Z!<%8%/%i%9(B
- *
- * @package Page
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class LC_Page_Admin_Customer_Customer extends LC_Page_Admin {
-
-    // }}}
-    // {{{ functions
-
-    /**
-     * Page $B$r=i4|2=$9$k(B.
-     *
-     * @return void
-     */
-    function init() {
-        parent::init();
-        $this->tpl_mainpage = 'customer/customer.tpl';
-        $this->tpl_mainno = 'customer';
-        $this->tpl_subnavi = 'customer/subnavi.tpl';
-        $this->tpl_subno = 'index';
-        $this->tpl_pager = 'pager.tpl';
-        $this->tpl_subtitle = '$B8\5REPO?(B';
-
-        $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData('mtb_pref');
-        $this->arrJob = $masterData->getMasterData("mtb_job");
-        $this->arrSex = $masterData->getMasterData("mtb_sex");
-        $this->arrReminder = $masterData->getMasterData("mtb_reminder");
-    }
-
-    /**
-     * Page $B$N%W%m%;%9(B.
-     *
-     * @return void
-     */
-    function process() {
-        $this->action();
-        $this->sendResponse();
-    }
-
-    /**
-     * Page $B$N%"%/%7%g%s(B.
-     *
-     * @return void
-     */
-    function action() {
-        // $BG'>Z2DH]$NH=Dj(B
-        $objSess = new SC_Session();
-        SC_Utils_Ex::sfIsSuccess($objSess);
-
-        $this->objQuery = new SC_Query();
-        $objDate = new SC_Date(1901);
-        $this->arrYear = $objDate->getYear();    //$B!!F|IU%W%k%@%&%s @ _Dj(B
-        $this->arrMonth = $objDate->getMonth();
-        $this->arrDay = $objDate->getDay();
-
-        //---- $BEPO?MQ%+%i%`G[Ns(B
-        $arrRegistColumn = array(
-                                 array(  "column" => "name01",        "convert" => "aKV" ),
-                                 array(  "column" => "name02",        "convert" => "aKV" ),
-                                 array(  "column" => "kana01",        "convert" => "CKV" ),
-                                 array(  "column" => "kana02",        "convert" => "CKV" ),
-                                 array(  "column" => "zip01",        "convert" => "n" ),
-                                 array(  "column" => "zip02",        "convert" => "n" ),
-                                 array(  "column" => "pref",        "convert" => "n" ),
-                                 array(  "column" => "addr01",        "convert" => "aKV" ),
-                                 array(  "column" => "addr02",        "convert" => "aKV" ),
-                                 array(  "column" => "email",        "convert" => "a" ),
-                                 array(  "column" => "email_mobile",    "convert" => "a" ),
-                                 array(  "column" => "tel01",        "convert" => "n" ),
-                                 array(  "column" => "tel02",        "convert" => "n" ),
-                                 array(  "column" => "tel03",        "convert" => "n" ),
-                                 array(  "column" => "fax01",        "convert" => "n" ),
-                                 array(  "column" => "fax02",        "convert" => "n" ),
-                                 array(  "column" => "fax03",        "convert" => "n" ),
-                                 array(  "column" => "sex",            "convert" => "n" ),
-                                 array(  "column" => "job",            "convert" => "n" ),
-                                 array(  "column" => "birth",        "convert" => "n" ),
-                                 array(  "column" => "password",    "convert" => "a" ),
-                                 array(  "column" => "reminder",    "convert" => "n" ),
-                                 array(  "column" => "reminder_answer", "convert" => "aKV" ),
-                                 array(  "column" => "mailmaga_flg", "convert" => "n" ),
-                                 array(  "column" => "note",        "convert" => "aKV" ),
-                                 array(  "column" => "point",        "convert" => "n" ),
-                                 array(  "column" => "status",        "convert" => "n" )
-                                 );
-
-        //---- $BEPO?=|30MQ%+%i%`G[Ns(B
-        $arrRejectRegistColumn = array("year", "month", "day");
-        
-        //-- POST$B%G!<%?$N0z$-7Q$.(B
-        $this->arrForm = $_POST;
-        $this->arrForm['email'] = strtolower($this->arrForm['email']); // email$B$O$9$Y$F>.J8;z$G=hM}(B
-        
-        //----$B!!8\5R>pJsJT=8(B
-        switch ($this->getMode()) {
-        case 'confirm':
-            //-- $BF~NO%G!<%?$NJQ49(B
-            $this->arrForm = $this->lfConvertParam($this->arrForm, $arrRegistColumn);
-            //-- $BF~NO%A%'%C%/(B
-            $this->arrErr = $this->lfErrorCheck($this->arrForm);
-            // $B%(%i!<$J$7$N>l9g(B
-            if(count($this->arrErr) == 0) {
-                $this->tpl_mainpage = 'customer/customer_confirm.tpl'; // $B3NG'%Z!<%8(B
-                $passlen = strlen($this->arrForm['password']);
-                $this->passlen = SC_Utils_Ex::sfPassLen($passlen);
-            } else {
-                foreach($this->arrForm as $key => $val) {
-                    $this->list_data[ $key ] = $val;
-                }
-            }
-            break;
-        case 'complete':
-            $this->tpl_mainpage = 'customer/customer_complete.tpl';
-            
-            // $B%7!<%/%l%C%H-b$bEPO?$9$k!#(B
-            $secret = SC_Utils_Ex::sfGetUniqRandomId("r");
-            $this->arrForm['secret_key'] = $secret;
-            array_push($arrRegistColumn, array('column' => 'secret_key', 'convert' => 'n'));
-            
-            //-- $BEPO?(B
-            $this->lfRegisData($this->arrForm, $arrRegistColumn);
-            break;
-        case 'return':
-            foreach($this->arrForm as $key => $val) {
-                $this->list_data[ $key ] = $val;
-            }
-            break;
-        default:
-            break;
-        }
-
-    }
-
-    /**
-     * $B%G%9%H%i%/%?(B.
-     *
-     * @return void
-     */
-    function destroy() {
-        parent::destroy();
-    }
-
-    // $BJT=8EPO?(B
-    function lfRegisData($array, $arrRegistColumn) {
-
-        foreach ($arrRegistColumn as $data) {
-            if($array[$data["column"]] != "") {
-                $arrRegist[$data["column"]] = $array[$data["column"]];
-            } else {
-                $arrRegist[$data["column"]] = NULL;
-            }
-        }
-        if (strlen($array["year"]) > 0) {
-            $arrRegist["birth"] = $array["year"] ."/". $array["month"] ."/". $array["day"] ." 00:00:00";
-        }
-
-        //-- $B%Q%9%o!<%I(B/$B%j%^%$%s%@!<$NEz$(0E9f2=!#(B
-        $salt = SC_Utils_Ex::sfGetRandomString(10);
-        $arrRegist["salt"] = $salt;
-        $arrRegist["password"] = SC_Utils_Ex::sfGetHashString($array["password"], $salt);
-        $arrRegist["reminder_answer"] = SC_Utils_Ex::sfGetHashString($arrRegist["reminder_answer"], $salt);
-
-        $arrRegist["update_date"] = "Now()";
-
-        //-- $BJT=8EPO?<B9T(B
-        $this->objQuery->begin();
-        $arrRegist['customer_id'] = $this->objQuery->nextVal('dtb_customer_customer_id');
-        $this->objQuery->Insert("dtb_customer", $arrRegist);
-        $this->objQuery->commit();
-    }
-
-
-    //----$B!!<hF @ J8;zNs$NJQ49(B
-    function lfConvertParam($array, $arrRegistColumn) {
-        /*
-         *    $BJ8;zNs$NJQ49(B
-         *    K :  $B!VH>3Q(B($B%O%s%+%/(B)$BJR2>L>!W$r!VA43QJR2>L>!W$KJQ49(B
-         *    C :  $B!VA43Q$R$i2>L>!W$r!VA43Q$+$?2>L>!W$KJQ49(B
-         *    V :  $BByE @ IU$-$NJ8;z$r0lJ8;z$KJQ49!#(B"K","H"$B$H6&$K;HMQ$7$^$9(B
-         *    n :  $B!VA43Q!W?t;z$r!VH>3Q(B($B%O%s%+%/(B)$B!W$KJQ49(B
-         *  a :  $BA43Q1Q?t;z$rH>3Q1Q?t;z$KJQ49$9$k(B
-         */
-        // $B%+%i%`L>$H%3%s%P!<%H>pJs(B
-        foreach ($arrRegistColumn as $data) {
-            $arrConvList[ $data["column"] ] = $data["convert"];
-        }
-        // $BJ8;zJQ49(B
-        foreach ($arrConvList as $key => $val) {
-            // POST$B$5$l$F$-$?CM$N$_JQ49$9$k!#(B
-            if(strlen(($array[$key])) > 0) {
-                $array[$key] = mb_convert_kana($array[$key] ,$val);
-            }
-        }
-        return $array;
-    }
-
-    //---- $BF~NO%(%i!<%A%'%C%/(B
-    function lfErrorCheck($array) {
-
-        $objErr = new SC_CheckError($array);
-
-        $objErr->doFunc(array("$B2q0w>uBV(B", 'status'), array("EXIST_CHECK"));
-        $objErr->doFunc(array("$B$*L>A0(B($B @ +(B)", 'name01', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("$B$*L>A0(B($BL>(B)", 'name02', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("$B$*L>A0(B($B%U%j%,%J!&@+(B)", 'kana01', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
-        $objErr->doFunc(array("$B$*L>A0(B($B%U%j%,%J!&L>(B)", 'kana02', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
-        $objErr->doFunc(array("$BM9JXHV9f(B1", "zip01", ZIP01_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
-        $objErr->doFunc(array("$BM9JXHV9f(B2", "zip02", ZIP02_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
-        $objErr->doFunc(array("$BM9JXHV9f(B", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
-        $objErr->doFunc(array("$BETF;I\8)(B", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
-        $objErr->doFunc(array("$B=;=j!J(B1$B!K(B", "addr01", MTEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("$B=;=j!J(B2$B!K(B", "addr02", MTEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array('$B%a!<%k%"%I%l%9(B', "email", MTEXT_LEN) ,array("EXIST_CHECK", "NO_SPTAB", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
-
-        //$B8=2q0w$NH=Dj(B $B"*!!8=2q0w$b$7$/$O2>EPO?Cf$O!"%a%"%I0l0U$,A0Ds$K$J$C$F$k$N$GF1$8%a%"%I$GEPO?IT2D(B
-        if (strlen($array["email"]) > 0) {
-            $array['email'] = strtolower($array['email']);
-            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
-            $checkMail = ereg_replace( "_", "#_", $array["email"]);
-            $result = $this->objQuery->getAll($sql, array($checkMail, $checkMail, $array["customer_id"]));
-            if (count($result) > 0) {
-                $objErr->arrErr["email"] .= "$B"((B $B$9$G$KEPO?$5$l$F$$$k%a!<%k%"%I%l%9$G$9!#(B<br />";
-            }
-        }
-
-        $objErr->doFunc(array('$B%a!<%k%"%I%l%9(B($B%b%P%$%k(B)', "email_mobile", MTEXT_LEN) ,array("EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
-        //$B8=2q0w$NH=Dj(B $B"*!!8=2q0w$b$7$/$O2>EPO?Cf$O!"%a%"%I0l0U$,A0Ds$K$J$C$F$k$N$GF1$8%a%"%I$GEPO?IT2D(B
-        if (strlen($array["email_mobile"]) > 0) {
-            $array['email_mobile'] = strtolower($array['email_mobile']);
-            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
-            $checkMail = ereg_replace( "_", "#_", $array["email_mobile"]);
-            $result = $this->objQuery->getAll($sql, array($checkMail, $checkMail, $array["customer_id"]));
-            if (count($result) > 0) {
-                $objErr->arrErr["email_mobile"] .= "$B"((B $B$9$G$KEPO?$5$l$F$$$k%a!<%k%"%I%l%9(B($B%b%P%$%k(B)$B$G$9!#(B<br />";
-            }
-        }
-
-
-        $objErr->doFunc(array("$B$*EEOCHV9f(B1", 'tel01'), array("EXIST_CHECK"));
-        $objErr->doFunc(array("$B$*EEOCHV9f(B2", 'tel02'), array("EXIST_CHECK"));
-        $objErr->doFunc(array("$B$*EEOCHV9f(B3", 'tel03'), array("EXIST_CHECK"));
-        $objErr->doFunc(array("$B$*EEOCHV9f(B", "tel01", "tel02", "tel03") ,array("TEL_CHECK"));
-        $objErr->doFunc(array("FAX$BHV9f(B", "fax01", "fax02", "fax03") ,array("TEL_CHECK"));
-        $objErr->doFunc(array("$B$4 @ -JL(B", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
-        $objErr->doFunc(array("$B$4?&6H(B", "job") ,array("NUM_CHECK"));
-        $objErr->doFunc(array("$B%Q%9%o!<%I(B", 'password', PASSWORD_LEN1, PASSWORD_LEN2), array("EXIST_CHECK", "ALNUM_CHECK", "NUM_RANGE_CHECK"));
-        $objErr->doFunc(array("$B%Q%9%o!<%I$rK:$l$?$H$-$N%R%s%H(B $B<ALd(B", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
-        $objErr->doFunc(array("$B%Q%9%o!<%I$rK:$l$?$H$-$N%R%s%H(B $BEz$((B", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("$B%a!<%k%^%,%8%s(B", "mailmaga_flg") ,array("SELECT_CHECK", "NUM_CHECK"));
-        $objErr->doFunc(array("$B @ 8G/7nF|(B", "year", "month", "day"), array("CHECK_DATE"));
-        $objErr->doFunc(array("SHOP$BMQ%a%b(B", 'note', LTEXT_LEN), array("MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("$B=j;}%]%$%s%H(B", "point", TEL_LEN) ,array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        return $objErr->arrErr;
-
-    }
-
-}
-?>




Svn-src-all メーリングリストの案内