Index: branches/version-2_13-dev/data/Smarty/templates/sphone/entry/confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/entry/confirm.tpl	(revision 23066)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/entry/confirm.tpl	(revision 23162)
@@ -37,72 +37,5 @@
 
         <dl class="form_entry">
-
-            <dt>お名前</dt>
-            <dd><!--{$arrForm.name01.value|h}-->&nbsp;<!--{$arrForm.name02.value|h}--></dd>
-
-            <dt>お名前(フリガナ)</dt>
-            <dd><!--{$arrForm.kana01.value|h}-->&nbsp;<!--{$arrForm.kana02.value|h}--></dd>
-
-            <dt>住所</dt>
-            <dd>
-                〒<!--{$arrForm.zip01.value|h}--> - <!--{$arrForm.zip02.value|h}--><br />
-                <!--{$arrPref[$arrForm.pref.value]|h}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}-->
-            </dd>
-
-            <dt>電話番号</dt>
-            <dd><!--{$arrForm.tel01.value|h}--> - <!--{$arrForm.tel02.value|h}--> - <!--{$arrForm.tel03.value|h}--></dd>
-
-            <dt>FAX</dt>
-            <dd>
-                <!--{if strlen($arrForm.fax01.value) > 0 && strlen($arrForm.fax02.value) > 0 && strlen($arrForm.fax03.value) > 0}-->
-                    <!--{$arrForm.fax01.value|h}--> - <!--{$arrForm.fax02.value|h}--> - <!--{$arrForm.fax03.value|h}-->
-                <!--{else}-->
-                    未登録
-                <!--{/if}-->
-            </dd>
-
-            <dt>メールアドレス</dt>
-            <dd><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->" rel="external"><!--{$arrForm.email.value|escape:'hexentity'}--></a></dd>
-
-            <dt>性別</dt>
-            <dd>
-                <!--{if $arrForm.sex.value eq 1}-->
-                    男性
-                <!--{else}-->
-                    女性
-                <!--{/if}-->
-            </dd>
-
-            <dt>職業</dt>
-            <dd><!--{$arrJob[$arrForm.job.value]|default:"未登録"|h}--></dd>
-
-            <dt>生年月日</dt>
-            <dd>
-                <!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}-->
-                    <!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日
-                <!--{else}-->
-                    未登録
-                <!--{/if}-->
-            </dd>
-
-            <dt>希望するパスワード</dt>
-            <dd><!--{$passlen}--></dd>
-
-            <dt>パスワードを忘れた時のヒント</dt>
-            <dd>
-                質問：<!--{$arrReminder[$arrForm.reminder.value]|h}--><br />
-                答え：<!--{$arrForm.reminder_answer.value|h}-->
-            </dd>
-
-            <dt>メールマガジン送付について</dt>
-            <dd>
-                <!--{if $arrForm.mailmaga_flg.value eq 1}-->
-                    HTMLメール＋テキストメールを受け取る
-                <!--{elseif $arrForm.mailmaga_flg.value eq 2}-->
-                    テキストメールを受け取る
-                <!--{else}-->
-                    受け取らない
-                <!--{/if}-->
-            </dd>
+            <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/form_personal_confirm.tpl" flgFields=3 emailMobile=false prefix=""}-->
         </dl>
 
Index: branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_confirm.tpl	(revision 23162)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_confirm.tpl	(revision 23162)
@@ -0,0 +1,145 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 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.
+ */
+*}-->
+
+<!--{strip}-->
+    <dt>お名前</dt>
+    <dd>
+        <!--{assign var=key1 value="`$prefix`name01"}-->
+        <!--{assign var=key2 value="`$prefix`name02"}-->
+        <!--{$arrForm[$key1].value|h}-->&nbsp;
+        <!--{$arrForm[$key2].value|h}-->
+    </dd>
+    <dt>お名前(フリガナ)</dt>
+    <dd>
+        <!--{assign var=key1 value="`$prefix`kana01"}-->
+        <!--{assign var=key2 value="`$prefix`kana02"}-->
+        <!--{$arrForm[$key1].value|h}-->&nbsp;
+        <!--{$arrForm[$key2].value|h}-->
+    </dd>
+    <dt>会社名</dt>
+    <dd>
+        <!--{assign var=key1 value="`$prefix`company_name"}-->
+        <!--{$arrForm[$key1].value|h}-->
+    </dd>
+    <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+        <dt>国</dt>
+        <dd>
+            <!--{assign var=key1 value="`$prefix`country_id"}-->
+            <!--{assign var="country_id" value=$arrForm[$key1].value}-->
+            <!--{$arrCountry[$country_id]|h}-->
+        </dd>
+        <dt>ZIP CODE</dt>
+        <dd>
+            <!--{assign var=key1 value="`$prefix`zipcode"}-->
+            <!--{$arrForm[$key1].value|h}-->
+        </dd>
+    <!--{/if}-->
+    <dt>住所</dt>
+    <dd>
+        <!--{assign var=key1 value="`$prefix`zip01"}-->
+        <!--{assign var=key2 value="`$prefix`zip02"}-->
+        〒 <!--{$arrForm[$key1].value|h}--> - <!--{$arrForm[$key2].value|h}--><br />
+        <!--{assign var=key1 value="`$prefix`pref"}-->
+        <!--{assign var=key2 value="`$prefix`addr01"}-->
+        <!--{assign var=key3 value="`$prefix`addr02"}-->
+        <!--{$arrPref[$arrForm[$key1].value]|h}--><!--{$arrForm[$key2].value|h}--><!--{$arrForm[$key3].value|h}-->
+    </dd>
+    <dt>電話番号</dt>
+    <dd>
+        <!--{assign var=key1 value="`$prefix`tel01"}-->
+        <!--{assign var=key2 value="`$prefix`tel02"}-->
+        <!--{assign var=key3 value="`$prefix`tel03"}-->
+        <!--{$arrForm[$key1].value|h}--> - <!--{$arrForm[$key2].value|h}--> - <!--{$arrForm[$key3].value|h}-->
+    </dd>
+    <dt>FAX</dt>
+    <dd>
+        <!--{assign var=key1 value="`$prefix`fax01"}-->
+        <!--{assign var=key2 value="`$prefix`fax02"}-->
+        <!--{assign var=key3 value="`$prefix`fax03"}-->
+        <!--{if strlen($arrForm[$key1].value) > 0 && strlen($arrForm[$key2].value) > 0 && strlen($arrForm[$key3].value) > 0}-->
+            <!--{$arrForm[$key1].value|h}--> - <!--{$arrForm[$key2].value|h}--> - <!--{$arrForm[$key3].value|h}-->
+        <!--{else}-->
+            未登録
+        <!--{/if}-->
+    </dd>
+    <!--{if $flgFields > 1}-->
+        <dt>メールアドレス</dt>
+        <dd>
+            <!--{assign var=key1 value="`$prefix`email"}-->
+            <a href="mailto:<!--{$arrForm[$key1].value|escape:'hex'}-->"><!--{$arrForm[$key1].value|escape:'hexentity'}--></a>
+        </dd>
+        <!--{if $emailMobile}-->
+            <dt>携帯メールアドレス</dt>
+            <dd>
+                <!--{assign var=key1 value="`$prefix`email_mobile"}-->
+                <!--{if strlen($arrForm[$key1].value) > 0}-->
+                    <a href="mailto:<!--{$arrForm[$key1].value|escape:'hex'}-->"><!--{$arrForm[$key1].value|escape:'hexentity'}--></a>
+                <!--{else}-->
+                    未登録
+                <!--{/if}-->
+            </dd>
+        <!--{/if}-->
+        <dt>性別</dt>
+        <dd>
+            <!--{assign var=key1 value="`$prefix`sex"}-->
+            <!--{assign var="sex_id" value=$arrForm[$key1].value}-->
+            <!--{$arrSex[$sex_id]|h}-->
+        </dd>
+        <dt>職業</dt>
+        <dd>
+            <!--{assign var=key1 value="`$prefix`job"}-->
+            <!--{assign var="job_id" value=$arrForm[$key1].value}-->
+            <!--{$arrJob[$job_id]|default:"未登録"|h}-->
+        </dd>
+        <dt>生年月日</dt>
+        <dd>
+            <!--{assign var=key1 value="`$prefix`year"}-->
+            <!--{assign var=key2 value="`$prefix`month"}-->
+            <!--{assign var=key3 value="`$prefix`day"}-->
+            <!--{if strlen($arrForm[$key1].value) > 0 && strlen($arrForm[$key2].value) > 0 && strlen($arrForm[$key3].value) > 0}-->
+                <!--{$arrForm[$key1].value|h}-->年<!--{$arrForm[$key2].value|h}-->月<!--{$arrForm[$key3].value|h}-->日
+            <!--{else}-->
+                未登録
+            <!--{/if}-->
+        </dd>
+        <!--{if $flgFields > 2}-->
+            <dt>希望するパスワード</dt>
+            <dd><!--{$passlen}--></dd>
+            <dt>パスワードを忘れた時のヒント</dt>
+            <dd>
+                <!--{assign var=key1 value="`$prefix`reminder"}-->
+                <!--{assign var=key2 value="`$prefix`reminder_answer"}-->
+                <!--{assign var="reminder_id" value=$arrForm[$key1].value}-->
+                質問：<!--{$arrReminder[$reminder_id]|h}--><br />
+                答え：<!--{$arrForm[$key2].value|h}-->
+            </dd>
+            <dt>メールマガジン送付について</dt>
+            <dd>
+                <!--{assign var=key1 value="`$prefix`mailmaga_flg"}-->
+                <!--{assign var="mailmaga_flg_id" value=$arrForm[$key1].value}-->
+                <!--{$arrMAILMAGATYPE[$mailmaga_flg_id]|h}-->
+            </dd>
+        <!--{/if}-->
+    <!--{/if}-->
+<!--{/strip}-->
Index: branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 23066)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 23162)
@@ -45,66 +45,5 @@
 
         <dl class="form_entry">
-            <dt>お名前</dt>
-            <dd><!--{$arrForm.name01.value|h}-->&nbsp;<!--{$arrForm.name02.value|h}--></dd>
-
-            <dt>お名前(フリガナ)</dt>
-            <dd><!--{$arrForm.kana01.value|h}-->&nbsp;<!--{$arrForm.kana02.value|h}--></dd>
-
-            <dt>住所</dt>
-            <dd>
-                〒<!--{$arrForm.zip01.value}-->-<!--{$arrForm.zip02.value}--><br />
-                <!--{$arrPref[$arrForm.pref.value]}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}-->
-            </dd>
-
-            <dt>電話番号</dt>
-            <dd><!--{$arrForm.tel01.value|h}-->-<!--{$arrForm.tel02.value|h}-->-<!--{$arrForm.tel03.value|h}--></dd>
-
-            <dt>FAX</dt>
-            <dd>
-                <!--{if strlen($arrForm.fax01.value) > 0}-->
-                    <!--{$arrForm.fax01.value}-->-<!--{$arrForm.fax02.value}-->-<!--{$arrForm.fax03.value}-->
-                <!--{else}-->
-                    未登録
-                <!--{/if}-->
-            </dd>
-
-            <dt>メールアドレス</dt>
-            <dd><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->" rel="external"><!--{$arrForm.email.value|escape:'hexentity'}--></a></dd>
-
-            <dt>携帯メールアドレス</dt>
-            <dd>
-                <!--{if strlen($arrForm.email_mobile.value) > 0}-->
-                    <a href="mailto:<!--{$arrForm.email_mobile.value|escape:'hex'}-->" rel="external"><!--{$arrForm.email_mobile.value|escape:'hexentity'}--></a>
-                <!--{else}-->
-                    未登録
-                <!--{/if}-->
-            </dd>
-
-            <dt>性別</dt>
-            <dd><!--{$arrSex[$arrForm.sex.value]}--></dd>
-
-            <dt>職業</dt>
-            <dd><!--{$arrJob[$arrForm.job.value]|default:"未登録"|h}--></dd>
-
-            <dt>生年月日</dt>
-            <dd>
-                <!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}-->
-                    <!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日
-                <!--{else}-->
-                    未登録
-                <!--{/if}-->
-            </dd>
-
-            <dt>希望するパスワード</dt>
-            <dd><!--{$passlen}--></dd>
-
-            <dt>パスワードを忘れた時のヒント</dt>
-            <dd>
-                質問：&nbsp;<!--{$arrReminder[$arrForm.reminder.value]|h}--><br />
-                答え：&nbsp;<!--{$arrForm.reminder_answer.value|h}-->
-            </dd>
-
-            <dt>メールマガジン送付について</dt>
-            <dd><!--{$arrMAILMAGATYPE[$arrForm.mailmaga_flg.value]}--></dd>
+            <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/form_personal_confirm.tpl" flgFields=3 emailMobile=true prefix=""}-->
         </dl>
 
Index: branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 23138)
+++ branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 23162)
@@ -173,64 +173,5 @@
                 <col width="70%" />
                 <tbody>
-                    <tr>
-                        <th scope="row">お名前</th>
-                        <td><!--{$arrForm.order_name01|h}--> <!--{$arrForm.order_name02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">お名前(フリガナ)</th>
-                        <td><!--{$arrForm.order_kana01|h}--> <!--{$arrForm.order_kana02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">会社名</th>
-                        <td><!--{$arrForm.order_company_name|h}--></td>
-                    </tr>
-                    <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
-                    <tr>
-                        <th scope="row">国</th>
-                        <td><!--{$arrCountry[$arrForm.order_country_id]|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">ZIPCODE</th>
-                        <td><!--{$arrForm.order_zipcode|h}--></td>
-                    </tr>
-                    <!--{/if}-->
-                    <tr>
-                        <th scope="row">郵便番号</th>
-                        <td>〒<!--{$arrForm.order_zip01|h}-->-<!--{$arrForm.order_zip02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">住所</th>
-                        <td><!--{$arrPref[$arrForm.order_pref]}--><!--{$arrForm.order_addr01|h}--><!--{$arrForm.order_addr02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">電話番号</th>
-                        <td><!--{$arrForm.order_tel01}-->-<!--{$arrForm.order_tel02}-->-<!--{$arrForm.order_tel03}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">FAX番号</th>
-                        <td>
-                            <!--{if $arrForm.order_fax01 > 0}-->
-                                <!--{$arrForm.order_fax01}-->-<!--{$arrForm.order_fax02}-->-<!--{$arrForm.order_fax03}-->
-                            <!--{/if}-->
-                        </td>
-                    </tr>
-                    <tr>
-                        <th scope="row">メールアドレス</th>
-                        <td><!--{$arrForm.order_email|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">性別</th>
-                        <td><!--{$arrSex[$arrForm.order_sex]|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">職業</th>
-                        <td><!--{$arrJob[$arrForm.order_job]|default:'(未登録)'|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">生年月日</th>
-                        <td>
-                            <!--{$arrForm.order_birth|regex_replace:"/ .+/":""|regex_replace:"/-/":"/"|default:'(未登録)'|h}-->
-                        </td>
-                    </tr>
+                <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/form_personal_confirm.tpl" flgFields=2 emailMobile=false prefix="order_"}-->
                 </tbody>
             </table>
Index: branches/version-2_13-dev/data/Smarty/templates/default/entry/confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/entry/confirm.tpl	(revision 23160)
+++ branches/version-2_13-dev/data/Smarty/templates/default/entry/confirm.tpl	(revision 23162)
@@ -34,122 +34,5 @@
 
             <table summary="入力内容確認">
-                <col width="30%" />
-                <col width="70%" />
-                <tr>
-                    <th>お名前</th>
-                    <td>
-                        <!--{$arrForm.name01.value|h}-->&nbsp;
-                        <!--{$arrForm.name02.value|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>お名前(フリガナ)</th>
-                    <td>
-                        <!--{$arrForm.kana01.value|h}-->&nbsp;
-                        <!--{$arrForm.kana02.value|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>会社名</th>
-                    <td>
-                        <!--{$arrForm.company_name.value|h}-->
-                    </td>
-                </tr>
-                <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
-                <tr>
-                    <th>国</th>
-                    <td>
-                        <!--{$arrCountry[$arrForm.country_id.value]|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>ZIP CODE</th>
-                    <td>
-                        <!--{$arrForm.zipcode.value|h}-->
-                    </td>
-                </tr>
-                <!--{/if}-->
-                <tr>
-                    <th>郵便番号</th>
-                    <td>
-                        〒<!--{$arrForm.zip01.value|h}--> - <!--{$arrForm.zip02.value|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>住所</th>
-                    <td>
-                        <!--{$arrPref[$arrForm.pref.value]|h}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>電話番号</th>
-                    <td>
-                        <!--{$arrForm.tel01.value|h}--> - <!--{$arrForm.tel02.value|h}--> - <!--{$arrForm.tel03.value|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>FAX</th>
-                    <td>
-                        <!--{if strlen($arrForm.fax01.value) > 0 && strlen($arrForm.fax02.value) > 0 && strlen($arrForm.fax03.value) > 0}-->
-                            <!--{$arrForm.fax01.value|h}--> - <!--{$arrForm.fax02.value|h}--> - <!--{$arrForm.fax03.value|h}-->
-                        <!--{else}-->
-                            未登録
-                        <!--{/if}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>メールアドレス</th>
-                    <td>
-                        <a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a>
-                    </td>
-                </tr>
-                <tr>
-                    <th>性別</th>
-                    <td>
-                        <!--{if $arrForm.sex.value eq 1}-->
-                        男性
-                        <!--{else}-->
-                        女性
-                        <!--{/if}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>職業</th>
-                    <td><!--{$arrJob[$arrForm.job.value]|default:"未登録"|h}--></td>
-                </tr>
-                <tr>
-                    <th>生年月日</th>
-                    <td>
-                        <!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}-->
-                            <!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日
-                        <!--{else}-->
-                        未登録
-                        <!--{/if}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>希望するパスワード<br />
-                    </th>
-                    <td><!--{$passlen}--></td>
-                </tr>
-                <tr>
-                    <th>パスワードを忘れた時のヒント</th>
-                    <td>
-                        質問：<!--{$arrReminder[$arrForm.reminder.value]|h}--><br />
-                        答え：<!--{$arrForm.reminder_answer.value|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>メールマガジン送付について</th>
-                    <td>
-                        <!--{if $arrForm.mailmaga_flg.value eq 1}-->
-                        HTMLメール＋テキストメールを受け取る
-                        <!--{elseif $arrForm.mailmaga_flg.value eq 2}-->
-                        テキストメールを受け取る
-                        <!--{else}-->
-                        受け取らない
-                        <!--{/if}-->
-                    </td>
-                </tr>
+                <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/form_personal_confirm.tpl" flgFields=3 emailMobile=false prefix=""}-->
             </table>
 
Index: branches/version-2_13-dev/data/Smarty/templates/default/frontparts/form_personal_confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/frontparts/form_personal_confirm.tpl	(revision 23162)
+++ branches/version-2_13-dev/data/Smarty/templates/default/frontparts/form_personal_confirm.tpl	(revision 23162)
@@ -0,0 +1,185 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 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.
+ */
+*}-->
+
+<!--{strip}-->
+    <col width="30%" />
+    <col width="70%" />
+    <tr>
+        <th>お名前</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`name01"}-->
+            <!--{assign var=key2 value="`$prefix`name02"}-->
+            <!--{$arrForm[$key1].value|h}-->&nbsp;
+            <!--{$arrForm[$key2].value|h}-->
+        </td>
+    </tr>
+    <tr>
+        <th>お名前(フリガナ)</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`kana01"}-->
+            <!--{assign var=key2 value="`$prefix`kana02"}-->
+            <!--{$arrForm[$key1].value|h}-->&nbsp;
+            <!--{$arrForm[$key2].value|h}-->
+        </td>
+    </tr>
+    <tr>
+        <th>会社名</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`company_name"}-->
+            <!--{$arrForm[$key1].value|h}-->
+        </td>
+    </tr>
+    <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+    <tr>
+        <th>国</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`country_id"}-->
+            <!--{assign var="country_id" value=$arrForm[$key1].value}-->
+            <!--{$arrCountry[$country_id]|h}-->
+        </td>
+    </tr>
+    <tr>
+        <th>ZIP CODE</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`zipcode"}-->
+            <!--{$arrForm[$key1].value|h}-->
+        </td>
+    </tr>
+    <!--{/if}-->
+    <tr>
+        <th>郵便番号</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`zip01"}-->
+            <!--{assign var=key2 value="`$prefix`zip02"}-->
+            〒 <!--{$arrForm[$key1].value|h}--> - <!--{$arrForm[$key2].value|h}-->
+        </td>
+    </tr>
+    <tr>
+        <th>住所</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`pref"}-->
+            <!--{assign var=key2 value="`$prefix`addr01"}-->
+            <!--{assign var=key3 value="`$prefix`addr02"}-->
+            <!--{assign var="pref_id" value=$arrForm[$key1].value}-->
+            <!--{$arrPref[$pref_id]|h}--><!--{$arrForm[$key2].value|h}--><!--{$arrForm[$key3].value|h}-->
+        </td>
+    </tr>
+    <tr>
+        <th>電話番号</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`tel01"}-->
+            <!--{assign var=key2 value="`$prefix`tel02"}-->
+            <!--{assign var=key3 value="`$prefix`tel03"}-->
+            <!--{$arrForm[$key1].value|h}--> - <!--{$arrForm[$key2].value|h}--> - <!--{$arrForm[$key3].value|h}-->
+        </td>
+    </tr>
+    <tr>
+        <th>FAX</th>
+        <td>
+            <!--{assign var=key1 value="`$prefix`fax01"}-->
+            <!--{assign var=key2 value="`$prefix`fax02"}-->
+            <!--{assign var=key3 value="`$prefix`fax03"}-->
+            <!--{if strlen($arrForm[$key1].value) > 0 && strlen($arrForm[$key2].value) > 0 && strlen($arrForm[$key3].value) > 0}-->
+                <!--{$arrForm[$key1].value|h}--> - <!--{$arrForm[$key2].value|h}--> - <!--{$arrForm[$key3].value|h}-->
+            <!--{else}-->
+                未登録
+            <!--{/if}-->
+        </td>
+    </tr>
+    <!--{if $flgFields > 1}-->
+        <tr>
+            <th>メールアドレス</th>
+            <td>
+                <!--{assign var=key1 value="`$prefix`email"}-->
+                <a href="mailto:<!--{$arrForm[$key1].value|escape:'hex'}-->"><!--{$arrForm[$key1].value|escape:'hexentity'}--></a>
+            </td>
+        </tr>
+        <!--{if $emailMobile}-->
+            <tr>
+                <th>携帯メールアドレス</th>
+                <td>
+                    <!--{assign var=key1 value="`$prefix`email_mobile"}-->
+                    <!--{if strlen($arrForm[$key1].value) > 0}-->
+                        <a href="mailto:<!--{$arrForm[$key1].value|escape:'hex'}-->"><!--{$arrForm[$key1].value|escape:'hexentity'}--></a>
+                    <!--{else}-->
+                        未登録
+                    <!--{/if}-->
+                </td>
+            </tr>
+        <!--{/if}-->
+        <tr>
+            <th>性別</th>
+            <td>
+                <!--{assign var=key1 value="`$prefix`sex"}-->
+                <!--{assign var="sex_id" value=$arrForm[$key1].value}-->
+                <!--{$arrSex[$sex_id]|h}-->
+            </td>
+        </tr>
+        <tr>
+            <th>職業</th>
+            <td>
+                <!--{assign var=key1 value="`$prefix`job"}-->
+                <!--{assign var="job_id" value=$arrForm[$key1].value}-->
+                <!--{$arrJob[$job_id]|default:"未登録"|h}-->
+            </td>
+        </tr>
+        <tr>
+            <th>生年月日</th>
+            <td>
+                <!--{assign var=key1 value="`$prefix`year"}-->
+                <!--{assign var=key2 value="`$prefix`month"}-->
+                <!--{assign var=key3 value="`$prefix`day"}-->
+                <!--{if strlen($arrForm[$key1].value) > 0 && strlen($arrForm[$key2].value) > 0 && strlen($arrForm[$key3].value) > 0}-->
+                <!--{$arrForm[$key1].value|h}-->年<!--{$arrForm[$key2].value|h}-->月<!--{$arrForm[$key3].value|h}-->日
+                <!--{else}-->
+                未登録
+                <!--{/if}-->
+            </td>
+        </tr>
+        <!--{if $flgFields > 2}-->
+            <tr>
+                <th>希望するパスワード</th>
+                <td><!--{$passlen}--></td>
+            </tr>
+            <tr>
+                <th>パスワードを忘れた時のヒント</th>
+                <td>
+                    <!--{assign var=key1 value="`$prefix`reminder"}-->
+                    <!--{assign var=key2 value="`$prefix`reminder_answer"}-->
+                    <!--{assign var="reminder_id" value=$arrForm[$key1].value}-->
+                    質問：<!--{$arrReminder[$reminder_id]|h}--><br />
+                    答え：<!--{$arrForm[$key2].value|h}-->
+                </td>
+            </tr>
+            <tr>
+                <th>メールマガジン送付について</th>
+                <td>
+                    <!--{assign var=key1 value="`$prefix`mailmaga_flg"}-->
+                    <!--{assign var="mailmaga_flg_id" value=$arrForm[$key1].value}-->
+                    <!--{$arrMAILMAGATYPE[$mailmaga_flg_id]|h}-->
+                </td>
+            </tr>
+        <!--{/if}-->
+    <!--{/if}-->
+<!--{/strip}-->
Index: branches/version-2_13-dev/data/Smarty/templates/default/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 23109)
+++ branches/version-2_13-dev/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 23162)
@@ -41,90 +41,5 @@
             <!--{/foreach}-->
             <table summary=" " class="delivname">
-                <col width="30%" />
-                <col width="70%" />
-                <tr>
-                    <th>お名前</th>
-                    <td><!--{$arrForm.name01.value|h}-->　<!--{$arrForm.name02.value|h}--></td>
-                </tr>
-                <tr>
-                    <th>お名前(フリガナ)</th>
-                    <td><!--{$arrForm.kana01.value|h}-->　<!--{$arrForm.kana02.value|h}--></td>
-                </tr>
-                <tr>
-                    <th>会社名</th>
-                    <td>
-                        <!--{$arrForm.company_name.value|h}-->
-                    </td>
-                </tr>
-                <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
-                <tr>
-                    <th>国</th>
-                    <td>
-                        <!--{$arrCountry[$arrForm.country_id.value]|h}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>ZIP CODE</th>
-                    <td>
-                        <!--{$arrForm.zipcode.value|h}-->
-                    </td>
-                </tr>
-                <!--{/if}-->
-                <tr>
-                    <th>郵便番号</th>
-                    <td><!--{$arrForm.zip01.value}-->-<!--{$arrForm.zip02.value}--></td>
-                </tr>
-                <tr>
-                    <th>住所</th>
-                    <td><!--{$arrPref[$arrForm.pref.value]}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}--></td>
-                </tr>
-                <tr>
-                    <th>電話番号</th>
-                    <td><!--{$arrForm.tel01.value|h}-->-<!--{$arrForm.tel02.value}-->-<!--{$arrForm.tel03.value}--></td>
-                </tr>
-                <tr>
-                    <th>FAX</th>
-                    <td><!--{if strlen($arrForm.fax01.value) > 0}--><!--{$arrForm.fax01.value}-->-<!--{$arrForm.fax02.value}-->-<!--{$arrForm.fax03.value}--><!--{else}-->未登録<!--{/if}--></td>
-                </tr>
-                <tr>
-                    <th>メールアドレス</th>
-                    <td><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></td>
-                </tr>
-                <tr>
-                    <th>携帯メールアドレス</th>
-                    <td>
-                        <!--{if strlen($arrForm.email_mobile.value) > 0}-->
-                        <a href="mailto:<!--{$arrForm.email_mobile.value|escape:'hex'}-->"><!--{$arrForm.email_mobile.value|escape:'hexentity'}--></a>
-                        <!--{else}-->
-                        未登録
-                        <!--{/if}-->
-                    </td>
-                </tr>
-                <tr>
-                    <th>性別</th>
-                    <td><!--{$arrSex[$arrForm.sex.value]}--></td>
-                </tr>
-                <tr>
-                    <th>職業</th>
-                    <td><!--{$arrJob[$arrForm.job.value]|default:"未登録"|h}--></td>
-                </tr>
-                <tr>
-                    <th>生年月日</th>
-                    <td><!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}--><!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日<!--{else}-->未登録<!--{/if}--></td>
-                </tr>
-                <tr>
-                    <th>希望するパスワード<br />
-                    </th>
-                    <td><!--{$passlen}--></td>
-                </tr>
-                <tr>
-                    <th>パスワードを忘れた時のヒント</th>
-                    <td>質問：&nbsp;<!--{$arrReminder[$arrForm.reminder.value]|h}--><br />
-                            答え：&nbsp;<!--{$arrForm.reminder_answer.value|h}--></td>
-                </tr>
-                <tr>
-                    <th>メールマガジン送付について</th>
-                    <td><!--{$arrMAILMAGATYPE[$arrForm.mailmaga_flg.value]}--></td>
-                </tr>
+                <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/form_personal_confirm.tpl" flgFields=3 emailMobile=true prefix=""}-->
             </table>