Index: branches/dev/data/Smarty/templates/entry/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/entry/index.tpl	(revision 21)
+++ branches/dev/data/Smarty/templates/entry/index.tpl	(revision 11577)
@@ -196,8 +196,8 @@
 					<tr>
 						<td bgcolor="#f0f0f0" class="fs12">¥á¡¼¥ë¥Þ¥¬¥¸¥óÁ÷ÉդˤĤ¤¤Æ<span class="red">¢¨</span></td>
-						<td bgcolor="#ffffff" class="fs12"><span class="red"><!--{$arrErr.mail_flag}--></span>
-						<input type="radio" name="mail_flag" id="html" value="1" style="<!--{$arrErr.mail_flag|sfGetErrorColor}-->" <!--{if $mail_flag eq 1 || $mail_flag eq ""}-->checked<!--{/if}--> /><label for="html">HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
-						<input type="radio" name="mail_flag" id="text"value="2" style="<!--{$arrErr.mail_flag|sfGetErrorColor}-->" <!--{if $mail_flag eq 2}-->checked<!--{/if}--> /><label for="text">¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
-						<input type="radio" name="mail_flag" id="no" value="3" style="<!--{$arrErr.mail_flag|sfGetErrorColor}-->" <!--{if $mail_flag eq 3}-->checked<!--{/if}--> /><label for="no">¼õ¤±¼è¤é¤Ê¤¤</label></td>
+						<td bgcolor="#ffffff" class="fs12"><span class="red"><!--{$arrErr.mailmaga_flg}--></span>
+						<input type="radio" name="mailmaga_flg" id="html" value="1" style="<!--{$arrErr.mailmaga_flg|sfGetErrorColor}-->" <!--{if $mailmaga_flg eq 1 || $mailmaga_flg eq ""}-->checked<!--{/if}--> /><label for="html">HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
+						<input type="radio" name="mailmaga_flg" id="text"value="2" style="<!--{$arrErr.mailmaga_flg|sfGetErrorColor}-->" <!--{if $mailmaga_flg eq 2}-->checked<!--{/if}--> /><label for="text">¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
+						<input type="radio" name="mailmaga_flg" id="no" value="3" style="<!--{$arrErr.mailmaga_flg|sfGetErrorColor}-->" <!--{if $mailmaga_flg eq 3}-->checked<!--{/if}--> /><label for="no">¼õ¤±¼è¤é¤Ê¤¤</label></td>
 					</tr>
 				</table>
Index: branches/dev/data/Smarty/templates/entry/confirm.tpl
===================================================================
--- branches/dev/data/Smarty/templates/entry/confirm.tpl	(revision 17)
+++ branches/dev/data/Smarty/templates/entry/confirm.tpl	(revision 11577)
@@ -90,5 +90,5 @@
 					<tr>
 						<td bgcolor="#f0f0f0" class="fs12">¥á¡¼¥ë¥Þ¥¬¥¸¥óÁ÷ÉդˤĤ¤¤Æ<span class="red">¢¨</span></td>
-						<td bgcolor="#ffffff" class="fs12"><!--{if $list_data.mail_flag eq 1}-->HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{elseif $list_data.mail_flag eq 2}-->¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{else}-->¼õ¤±¼è¤é¤Ê¤¤<!--{/if}--></td>
+						<td bgcolor="#ffffff" class="fs12"><!--{if $list_data.mailmaga_flg eq 1}-->HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{elseif $list_data.mailmaga_flg eq 2}-->¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{else}-->¼õ¤±¼è¤é¤Ê¤¤<!--{/if}--></td>
 					</tr>
 				</table>
Index: branches/dev/data/Smarty/templates/shopping/nonmember_input.tpl
===================================================================
--- branches/dev/data/Smarty/templates/shopping/nonmember_input.tpl	(revision 21)
+++ branches/dev/data/Smarty/templates/shopping/nonmember_input.tpl	(revision 11577)
@@ -223,5 +223,5 @@
 						<td bgcolor="#f0f0f0" class="fs12">¥á¡¼¥ë¥Þ¥¬¥¸¥óÁ÷ÉդˤĤ¤¤Æ<span class="red">¢¨</span></td>
 						<td bgcolor="#ffffff" class="fs12">
-							<!--{assign var=key value="mail_flag"}-->
+							<!--{assign var=key value="mailmaga_flg"}-->
 							<!--{if $arrErr[$key]}-->
 							<!--{assign var=err_mail value="background-color: `$smarty.const.ERR_COLOR`"}-->
Index: branches/dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/admin/mail/index.tpl	(revision 17)
+++ branches/dev/data/Smarty/templates/admin/mail/index.tpl	(revision 11577)
@@ -394,5 +394,5 @@
 							<td><!--{$arrResults[i].name01|escape}--> <!--{$arrResults[i].name02|escape}--></td>
 							<td><!--{$arrResults[i].email|escape}--></td>
-							<!--{assign var="key" value="`$arrResults[i].mail_flag`"}-->
+							<!--{assign var="key" value="`$arrResults[i].mailmaga_flg`"}-->
 							<td align="center"><!--{$arrMAILMAGATYPE[$key]}--></td>
 							<td><!--{$arrResults[i].create_date|sfDispDBDate}--></td>
Index: branches/dev/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- branches/dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 149)
+++ branches/dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 11577)
@@ -141,5 +141,5 @@
 									<tr class="fs12n">
 										<td bgcolor="#f2f1ec" width="190">¥á¡¼¥ë¥Þ¥¬¥¸¥ó<span class="red"> *</span></td>
-										<td bgcolor="#ffffff" width="527"><!--{if $arrForm.mail_flag eq 1}-->HTML<!--{elseif $arrForm.mail_flag eq 2}-->¥Æ¥­¥¹¥È<!--{else}-->´õ˾¤·¤Ê¤¤<!--{/if}--></td>
+										<td bgcolor="#ffffff" width="527"><!--{if $arrForm.mailmaga_flg eq 1}-->HTML<!--{elseif $arrForm.mailmaga_flg eq 2}-->¥Æ¥­¥¹¥È<!--{else}-->´õ˾¤·¤Ê¤¤<!--{/if}--></td>
 									</tr>
 									<tr class="fs12n">
Index: branches/dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 21)
+++ branches/dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 11577)
@@ -213,8 +213,8 @@
 									<tr class="fs12n">
 										<td bgcolor="#f2f1ec" width="190">¥á¡¼¥ë¥Þ¥¬¥¸¥ó<span class="red"> *</span></td>
-										<td bgcolor="#ffffff" width="527"><span class="red12"><!--{$arrErr.mail_flag}--></span>
-											<input type="radio" name="mail_flag" value="1" <!--{if $arrErr.mail_flag != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mail_flag eq 1 or $list_data.mail_flag eq 4}-->checked<!--{/if}--> />HTML¡¡
-											<input type="radio" name="mail_flag" value="2" <!--{if $arrErr.mail_flag != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mail_flag eq 2 or $list_data.mail_flag eq 5}-->checked<!--{/if}--> />¥Æ¥­¥¹¥È¡¡
-											<input type="radio" name="mail_flag" value="3" <!--{if $arrErr.mail_flag != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mail_flag eq "" or $list_data.mail_flag eq 3 or $list_data.mail_flag eq 6}-->checked<!--{/if}--> />´õ˾¤·¤Ê¤¤</td>
+										<td bgcolor="#ffffff" width="527"><span class="red12"><!--{$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¡¡
+											<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}--> />¥Æ¥­¥¹¥È¡¡
+											<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}--> />´õ˾¤·¤Ê¤¤</td>
 									</tr>
 									<tr>