NobuNobu
nobun****@users*****
2006年 12月 3日 (日) 00:50:21 JST
Index: xoops2jp/html/modules/legacy/admin/templates/block_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.4 Sun Nov 12 14:12:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/block_edit.html Sun Dec 3 00:50:20 2006 @@ -10,7 +10,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/block_list.html diff -u xoops2jp/html/modules/legacy/admin/templates/block_list.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/block_list.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/block_list.html:1.1.2.4 Sun Nov 12 14:12:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/block_list.html Sun Dec 3 00:50:20 2006 @@ -18,7 +18,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.4 Sun Nov 12 14:12:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html Sun Dec 3 00:50:20 2006 @@ -10,7 +10,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/comment_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/comment_edit.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/comment_edit.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/comment_edit.html:1.1.2.4 Sun Nov 12 14:12:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/comment_edit.html Sun Dec 3 00:50:20 2006 @@ -20,7 +20,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html:1.1.2.4 Sun Nov 12 14:12:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html Sun Dec 3 00:50:20 2006 @@ -28,7 +28,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/help.html diff -u xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.3 --- xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.2 Wed Nov 8 19:53:49 2006 +++ xoops2jp/html/modules/legacy/admin/templates/help.html Sun Dec 3 00:50:20 2006 @@ -1,10 +1,10 @@ <div class="adminnavi"> - <a href="<{$module->getAdminIndex()|escape}>"><{$module->mXoopsModule->getShow('name')}></a> + <a href="<{$module->getAdminIndex()|xoops_escape:link}>"><{$module->mXoopsModule->getShow('name')}></a> »» <span class="adminnaviTitle"><{$smarty.const._HELP}></span> </div> <h3 class="admintitle"><{$smarty.const._HELP}> - <a href="<{$module->getAdminIndex()|escape}>"><{$module->mXoopsModule->getShow('name')}></a> + <a href="<{$module->getAdminIndex()|xoops_escape:link}>"><{$module->mXoopsModule->getShow('name')}></a> </h3> <div class="help"><{$contents}></div> Index: xoops2jp/html/modules/legacy/admin/templates/image_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/image_edit.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/image_edit.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/image_edit.html:1.1.2.4 Sun Nov 12 14:12:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/image_edit.html Sun Dec 3 00:50:20 2006 @@ -19,7 +19,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html:1.1.2.4 Sun Nov 12 14:12:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html Sun Dec 3 00:50:20 2006 @@ -19,7 +19,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html diff -u xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html Sun Dec 3 00:50:20 2006 @@ -61,7 +61,7 @@ </td> <td class="legacy_list_order"><{$obj->getShow('imgcat_weight')}></td> <td class="legacy_list_type"><{$obj->getShow('imgcat_storetype')}></td> - <td class="legacy_list_number"><{$obj->getImageCount()|escape}></td> + <td class="legacy_list_number"><{$obj->getImageCount()|xoops_escape}></td> <td class="legacy_list_control"> <a href="./index.php?action=ImageList&imgcat_id=<{$obj->getShow('imgcat_id')}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACY_LANG_LIST}>" title="<{$smarty.const._AD_LEGACY_LANG_LIST}>" /></a> <a href="./index.php?action=ImageCreate&imgcat_id=<{$obj->getShow('imgcat_id')}>"><img src="<{"icons/add.gif"|theme}>" alt="<{$smarty.const._AD_LEGACY_LANG_IMAGE_NEW}>" title="<{$smarty.const._AD_LEGACY_LANG_IMAGE_NEW}>" /></a> Index: xoops2jp/html/modules/legacy/admin/templates/install_wizard.html diff -u xoops2jp/html/modules/legacy/admin/templates/install_wizard.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/install_wizard.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/install_wizard.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/install_wizard.html Sun Dec 3 00:50:20 2006 @@ -20,13 +20,13 @@ </tr> <tr> <td class="head legacy_list_image"> - <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.installer.image|escape}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" /> + <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.installer.image|xoops_escape:link}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" /> </td> <td class="even"> <h4 class="admintitle"><{$module->getShow('name')}></h4> <ul> <{foreach item=item from=$module->modinfo.installer.description}> - <li><{$item|escape}> + <li><{$item|xoops_escape}> <{/foreach}> </ul> </td> Index: xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html diff -u xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html:1.1.2.3 --- xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html:1.1.2.2 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html Sun Dec 3 00:50:20 2006 @@ -3,11 +3,11 @@ <ul> <{foreach item=msg from=$log}> <{if $msg.type=="error"}> - <li class="legacy_module_error"><{$msg.message|escape}></li> + <li class="legacy_module_error"><{$msg.message|xoops_escape}></li> <{elseif $msg.type=="warning"}> - <li class="legacy_module_warning"><{$msg.message|escape}></li> + <li class="legacy_module_warning"><{$msg.message|xoops_escape}></li> <{else}> - <li class="legacy_module_message"><{$msg.message|escape}></li> + <li class="legacy_module_message"><{$msg.message|xoops_escape}></li> <{/if}> <{/foreach}> </ul> Index: xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html diff -u xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html:1.1.2.3 Mon Oct 16 00:29:46 2006 +++ xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html Sun Dec 3 00:50:20 2006 @@ -5,13 +5,13 @@ »» <span class="adminnaviTitle"><{$smarty.const._AD_LEGACY_LANG_MODINSTALL_CONF}></span> </div> -<h3 class="admintitle"><{$licence|escape}></h3> +<h3 class="admintitle"><{$licence|xoops_escape}></h3> <{if $actionForm->hasError()}> <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> @@ -22,11 +22,11 @@ <{xoops_input type=hidden name=dirname value=$actionForm->get('dirname')}> <table class="outer"> <tr> - <th><{$licence|escape}></th> + <th><{$licence|xoops_escape}></th> </tr> <tr> <td class="head"> - <textarea cols="75" rows="15"><{$licenceText|escape}></textarea> + <textarea cols="75" rows="15"><{$licenceText|xoops_escape:edit}></textarea> </td> <tr> <td class="foot"> Index: xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html Sun Dec 3 00:50:20 2006 @@ -10,7 +10,7 @@ <form action="index.php" method="get"> <{xoops_input type=hidden name=action value=ActSearch}> <{xoops_token form=$actionForm}> - <input type="text" size="40" name="keywords" <{if $actionForm}>value="<{$actionForm->get('keywords')|escape}>"<{/if}> /> + <input type="text" size="40" name="keywords" <{if $actionForm}>value="<{$actionForm->get('keywords')|xoops_escape:edit}>"<{/if}> /> <input type="submit" value="<{$smarty.const._SEARCH}>" class="formButton" /> </form> </div> \ No newline at end of file Index: xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html Sun Dec 3 00:50:20 2006 @@ -4,9 +4,9 @@ <ul class="legacy_actionsearch_records"> <{foreach item=record from=$records}> - <li>[ <{$record->mModuleName|escape}> ] »» <a href="<{$record->mActionUrl}>"><{$record->mTitle|escape}></a> + <li>[ <{$record->mModuleName|xoops_escape}> ] »» <a href="<{$record->mActionUrl}>"><{$record->mTitle|xoops_escape}></a> <{if $record->mDescription}> - <div class="legacy_actionsearch_records_desc"><{$record->mDescription|escape}></div> + <div class="legacy_actionsearch_records_desc"><{$record->mDescription|xoops_escape}></div> <{/if}> </li> <{/foreach}> Index: xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html:1.1.2.3 --- xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html:1.1.2.2 Mon Oct 16 00:29:46 2006 +++ xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html Sun Dec 3 00:50:20 2006 @@ -1,11 +1,11 @@ <div class='confirmMsg'> <h4 class="admintitle"><{$message}></h4> - <form method="post" action="<{$action|escape}>"> + <form method="post" action="<{$action|xoops_escape}>"> <{xoops_input type=hidden name=$tokenName value=$tokenValue}> <{foreach key=key item=value from=$hiddens}> <{if is_array($value)}> <{foreach key=radioName item=radioValue from=$value}> - <label><{xoops_input type=radio name=$key value=$radioValue}><{$radioName|escape}></label><br/> + <label><{xoops_input type=radio name=$key value=$radioValue}><{$radioName|xoops_escape}></label><br/> <{/foreach}> <{else}> <{xoops_input type=hidden name=$key value=$value}> Index: xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html:1.1.2.1 xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html:1.1.2.2 --- xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html:1.1.2.1 Sat Oct 14 23:55:24 2006 +++ xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html Sun Dec 3 00:50:20 2006 @@ -4,9 +4,9 @@ <{/if}> <{if is_array($message)}> <{foreach item=msg from=$message}> - <{$msg|escape}><br/> + <{$msg|xoops_escape}><br/> <{/foreach}> <{else}> - <{$message|escape}> + <{$message|xoops_escape}> <{/if}> </div> Index: xoops2jp/html/modules/legacy/admin/templates/module_information.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_information.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_information.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/module_information.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_information.html Sun Dec 3 00:50:20 2006 @@ -17,7 +17,7 @@ <tr> <td class="head legacy_list_image" rowspan="6"> <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" /> - <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div> + <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div> </td> <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td> <td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td> @@ -112,7 +112,7 @@ <{foreach from=$module->modinfo.tables item=table key=table_key}> <tr class="<{cycle values='odd,even'}>"> <td class="head legacy_list_id"><{$table_key}></td> - <td><{$table|escape}></td> + <td><{$table|xoops_escape}></td> <td></td> </tr> <{/foreach}> @@ -172,15 +172,15 @@ </tr> <tr class="<{cycle values='odd,even'}>"> <td class="head"><{$smarty.const._AD_LEGACY_LANG_ADMINMENU_INDEX}></td> - <td><{$module->modinfo.adminindex|escape}></td> + <td><{$module->modinfo.adminindex|xoops_escape}></td> </tr> <tr class="<{cycle values='odd,even'}>"> <td class="head"><{$smarty.const._AD_LEGACY_LANG_ADMINMENU_MENU}></td> - <td><{$module->modinfo.adminmenu|escape}></td> + <td><{$module->modinfo.adminmenu|xoops_escape}></td> </tr> <tr class="<{cycle values='odd,even'}>"> <td class="head"><{$smarty.const._HELP}></td> - <td><{$module->modinfo.help|escape}></td> + <td><{$module->modinfo.help|xoops_escape}></td> </tr> </table> <{if $module->adminmenu}> @@ -193,9 +193,9 @@ </tr> <{foreach from=$module->adminmenu item=admin key=admin_key}> <tr class="<{cycle values='odd,even'}>"> - <td class="head legacy_list_id"><{$admin_key|escape}></td> - <td><{$admin.title|escape}></td> - <td><{$admin.link|escape}></td> + <td class="head legacy_list_id"><{$admin_key|xoops_escape}></td> + <td><{$admin.title|xoops_escape}></td> + <td><{$admin.link|xoops_escape}></td> </tr> <{/foreach}> </table> @@ -231,8 +231,8 @@ <{foreach from=$module->modinfo.templates item=template key=template_key}> <tr class="<{cycle values='odd,even'}>"> <td class="head legacy_list_id"><{$template_key}></td> - <td><{$template.file|escape}></td> - <td><{$template.description|escape}></td> + <td><{$template.file|xoops_escape}></td> + <td><{$template.description|xoops_escape}></td> </tr> <{/foreach}> </table> @@ -247,16 +247,16 @@ <{foreach from=$module->modinfo.blocks item=block key=block_num }> <table class="outer"> <tr> - <th><{$smarty.const._AD_LEGACY_LANG_BLOCK_KEY}> (<{$block_num|escape}>)</th> + <th><{$smarty.const._AD_LEGACY_LANG_BLOCK_KEY}> (<{$block_num|xoops_escape}>)</th> <th><{$smarty.const._AD_LEGACY_LANG_BLOCK_VAL}></th> </tr> <{foreach from=$block key=block_key item=block_val name=block }> <tr class="<{cycle values='odd,even' name=block}>"> - <td class="head legacy_list_name" style="width:30%;"><{$block_key|escape}></td> + <td class="head legacy_list_name" style="width:30%;"><{$block_key|xoops_escape}></td> <{if $block_key == "name" }> - <td><b><{$block_val|escape}></b></td> + <td><b><{$block_val|xoops_escape}></b></td> <{else}> - <td><{$block_val|escape}></td> + <td><{$block_val|xoops_escape}></td> <{/if}> </tr> <{/foreach}> @@ -278,16 +278,16 @@ </tr> <{foreach from=$config key=config_key item=config_val name=config}> <tr class="<{cycle values="odd,even" name=config}>"> - <td class="head legacy_list_name" style="width:30%;"><{$config_key|escape}></td> + <td class="head legacy_list_name" style="width:30%;"><{$config_key|xoops_escape}></td> <td> <{if $config_key == "name" }> - <b><{$config_val|escape}></b> + <b><{$config_val|xoops_escape}></b> <{elseif $config_key == options }> <{foreach from=$config_val item=opt key=opt_key }> - <{$opt_key}> » <{$opt|escape}><br /> + <{$opt_key}> » <{$opt|xoops_escape}><br /> <{/foreach}> <{else}> - <{$config_val|escape}> + <{$config_val|xoops_escape}> <{/if}> </td> </tr> Index: xoops2jp/html/modules/legacy/admin/templates/module_install.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_install.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/module_install.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/module_install.html:1.1.2.4 Wed Nov 1 23:56:56 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_install.html Sun Dec 3 00:50:20 2006 @@ -13,7 +13,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> @@ -28,8 +28,8 @@ </tr> <tr> <td class="head legacy_list_image" rowspan="6"> - <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->modinfo.name|escape}>" title="<{$module->modinfo.name|escape}>" /> - <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div> + <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->modinfo.name|xoops_escape}>" title="<{$module->modinfo.name|xoops_escape}>" /> + <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div> </td> <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td> <td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td> @@ -66,7 +66,7 @@ </tr> <tr> <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_DESC}></td> - <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td> + <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|xoops_escape}></td> </tr> <tr> <td class="foot" colspan="3"> Index: xoops2jp/html/modules/legacy/admin/templates/module_install_success.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_install_success.html Sun Dec 3 00:50:20 2006 @@ -12,11 +12,11 @@ <ul> <{foreach item=msg from=$log}> <{if $msg.type=="error"}> - <li class="legacy_modinstall_error"><{$msg.message|escape}></li> + <li class="legacy_modinstall_error"><{$msg.message|xoops_escape}></li> <{elseif $msg.type=="warning"}> - <li class="legacy_modinstall_warning"><{$msg.message|escape}></li> + <li class="legacy_modinstall_warning"><{$msg.message|xoops_escape}></li> <{else}> - <li class="legacy_modinstall_message"><{$msg.message|escape}></li> + <li class="legacy_modinstall_message"><{$msg.message|xoops_escape}></li> <{/if}> <{/foreach}> </ul> Index: xoops2jp/html/modules/legacy/admin/templates/module_list.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.6 xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.7 --- xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.6 Wed Nov 8 20:59:52 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_list.html Sun Dec 3 00:50:20 2006 @@ -13,7 +13,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html Sun Dec 3 00:50:20 2006 @@ -22,16 +22,16 @@ <td class="legacy_list_id"><{$mid}></td> <td class="legacy_list_name"> <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->get('name')}> - <{$actionForm->get('name',$mid)|escape}> + <{$actionForm->get('name',$mid)|xoops_escape}> <{else}> - (<{$moduleObjects[$mid]->getShow('name')}>) » <b class="legacy_module_error"><{$actionForm->get('name',$mid)|escape}></b> + (<{$moduleObjects[$mid]->getShow('name')}>) » <b class="legacy_module_error"><{$actionForm->get('name',$mid)|xoops_escape}></b> <{/if}> </td> <td class="legacy_list_order"> <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->get('weight')}> - <{$actionForm->get('weight',$mid)|escape}> + <{$actionForm->get('weight',$mid)|xoops_escape}> <{else}> - (<{$moduleObjects[$mid]->getShow('weight')}>) » <b class="legacy_module_error"><{$actionForm->get('weight',$mid)|escape}></b> + (<{$moduleObjects[$mid]->getShow('weight')}>) » <b class="legacy_module_error"><{$actionForm->get('weight',$mid)|xoops_escape}></b> <{/if}> </td> <td class="legacy_list_select"> @@ -51,8 +51,8 @@ <{$smarty.const._AD_LEGACY_LANG_DEACTIVATE}> <{/if}></b> <{/if}> - <input type="hidden" name="name[<{$mid}>]" value="<{$actionForm->get('name',$mid)|escape}>" /> - <input type="hidden" name="weight[<{$mid}>]" value="<{$actionForm->get('weight',$mid)|escape}>" /> + <input type="hidden" name="name[<{$mid}>]" value="<{$actionForm->get('name',$mid)|xoops_escape:edit}>" /> + <input type="hidden" name="weight[<{$mid}>]" value="<{$actionForm->get('weight',$mid)|xoops_escape:edit}>" /> <{if $actionForm->get('isactive',$mid)}> <input type="hidden" name="isactive[<{$mid}>]" value="1" /> <{else}> Index: xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html:1.1.2.6 xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html:1.1.2.7 --- xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html:1.1.2.6 Wed Nov 1 20:54:36 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html Sun Dec 3 00:50:20 2006 @@ -12,7 +12,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> @@ -29,7 +29,7 @@ <tr> <td rowspan="6" class="head legacy_list_image"> <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" /> - <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div> + <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div> </td> <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td> <td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td> @@ -66,7 +66,7 @@ </tr> <tr> <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_DESC}></td> - <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td> + <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|xoops_escape}></td> </tr> <tr> <td class="foot" colspan="3"> Index: xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html Sun Dec 3 00:50:20 2006 @@ -10,11 +10,11 @@ <ul> <{foreach item=msg from=$log}> <{if $msg.type == "error"}> - <li class="legacy_module_error"><{$msg.message|escape}></li> + <li class="legacy_module_error"><{$msg.message|xoops_escape}></li> <{elseif $msg.type == "warning"}> - <li class="legacy_module_warning"><{$msg.message|escape}></li> + <li class="legacy_module_warning"><{$msg.message|xoops_escape}></li> <{else}> - <li class="legacy_module_message"><{$msg.message|escape}></li> + <li class="legacy_module_message"><{$msg.message|xoops_escape}></li> <{/if}> <{/foreach}> </ul> Index: xoops2jp/html/modules/legacy/admin/templates/module_update.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_update.html:1.1.2.6 xoops2jp/html/modules/legacy/admin/templates/module_update.html:1.1.2.7 --- xoops2jp/html/modules/legacy/admin/templates/module_update.html:1.1.2.6 Fri Nov 3 10:35:52 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_update.html Sun Dec 3 00:50:20 2006 @@ -18,7 +18,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> @@ -34,7 +34,7 @@ <tr> <td class="head legacy_list_image" rowspan="6"> <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" /> - <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div> + <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div> </td> <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td> <td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td> @@ -74,7 +74,7 @@ </tr> <tr> <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_DESC}></td> - <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td> + <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|xoops_escape}></td> </tr> <tr> <td class="foot" colspan="3"> Index: xoops2jp/html/modules/legacy/admin/templates/module_update_success.html diff -u xoops2jp/html/modules/legacy/admin/templates/module_update_success.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/module_update_success.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/module_update_success.html:1.1.2.4 Mon Oct 30 18:53:45 2006 +++ xoops2jp/html/modules/legacy/admin/templates/module_update_success.html Sun Dec 3 00:50:20 2006 @@ -10,11 +10,11 @@ <ul> <{foreach item=msg from=$log}> <{if $msg.type=="error"}> - <li class="legacy_module_error"><{$msg.message|escape}></li> + <li class="legacy_module_error"><{$msg.message|xoops_escape}></li> <{elseif $msg.type=="warning"}> - <li class="legacy_module_warning"><{$msg.message|escape}></li> + <li class="legacy_module_warning"><{$msg.message|xoops_escape}></li> <{else}> - <li class="legacy_module_message"><{$msg.message|escape}></li> + <li class="legacy_module_message"><{$msg.message|xoops_escape}></li> <{/if}> <{/foreach}> </ul> Index: xoops2jp/html/modules/legacy/admin/templates/preference_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.6 xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.7 --- xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.6 Sun Nov 12 14:12:23 2006 +++ xoops2jp/html/modules/legacy/admin/templates/preference_edit.html Sun Dec 3 00:50:20 2006 @@ -1,22 +1,22 @@ <div class="adminnavi"> <{if $module != null}> - <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getShow('dirname')}>/<{$module->getInfo('adminindex')|escape}>"><{$module->getShow('name')}></a> + <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getShow('dirname')}>/<{$module->getInfo('adminindex')|xoops_escape}>"><{$module->getShow('name')}></a> <{if $category != null}> »» <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getVar('dirname')}>/admin/index.php?action=PreferenceList"><{$smarty.const._MI_LEGACY_MENU_PREFERENCE}></a> - »» <{$category->getName()|escape}> + »» <{$category->getName()|xoops_escape}> <{else}> »» <span class="adminnaviTitle"><{$smarty.const._MI_LEGACY_MENU_PREFERENCE}></span> <{/if}> <{else}> <a href="<{$smarty.const.XOOPS_URL}>/modules/legacy/admin/index.php"><{$smarty.const._MI_LEGACY_NAME}></a> »» <a href="./index.php?action=PreferenceList"><{$smarty.const._MI_LEGACY_MENU_PREFERENCE}></a> - »» <span class="adminnaviTitle"><{$category->getName()|escape}></span> + »» <span class="adminnaviTitle"><{$category->getName()|xoops_escape}></span> <{/if}> </div> <h3 class="admintitle"> <{if $category != null}> - <{$category->getName()|escape}> + <{$category->getName()|xoops_escape}> <{else}> <{$smarty.const._MI_LEGACY_MENU_PREFERENCE}> <{/if}> @@ -26,7 +26,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> @@ -40,7 +40,7 @@ <th colspan="2"> <{$smarty.const._MI_LEGACY_MENU_PREFERENCE}> <{if $category != null}> - - <{$category->getName()|escape}> + - <{$category->getName()|xoops_escape}> <{/if}> </th> </tr> @@ -62,7 +62,7 @@ <{elseif $config->get('conf_formtype') == 'select'}> <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'> <{foreach item=option from=$config->getOptionItems()}> - <option value='<{$option->getOptionKey()|escape}>' <{if $actionForm->get($config->get('conf_name')) == $option->getOptionKey()}>selected="selected"<{/if}>><{$option->getOptionLabel()|escape}></option> + <option value='<{$option->getOptionKey()|xoops_escape}>' <{if $actionForm->get($config->get('conf_name')) == $option->getOptionKey()}>selected="selected"<{/if}>><{$option->getOptionLabel()|xoops_escape}></option> <{/foreach}> </select> @@ -74,7 +74,7 @@ <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}> <{if $option->getOptionKey() == $selected}><{assign var=flag value=1}><{/if}> <{/foreach}> - <option value="<{$option->getOptionKey()|escape}>" <{if $flag}>selected="selected"<{/if}>><{$option->getOptionLabel()|escape}></option> + <option value="<{$option->getOptionKey()|xoops_escape}>" <{if $flag}>selected="selected"<{/if}>><{$option->getOptionLabel()|xoops_escape}></option> <{/foreach}> </select> @@ -112,7 +112,7 @@ <{elseif $config->get('conf_formtype') == 'language'}> <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'> <{foreach item=language from=$languageArr}> - <option value="<{$language|escape}>" <{if $actionForm->get($config->get('conf_name')) == $language}>selected="selected"<{/if}>><{$language|escape}></option> + <option value="<{$language|xoops_escape}>" <{if $actionForm->get($config->get('conf_name')) == $language}>selected="selected"<{/if}>><{$language|xoops_escape}></option> <{/foreach}> </select> @@ -145,7 +145,7 @@ <{elseif $config->get('conf_formtype') == 'user'}> <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'> <{foreach key=value item=label from=$userArr}> - <option value="<{$value|escape}>" <{if $value == $actionForm->get($config->get('conf_name'))}>selected<{/if}>><{$label|escape}></option> + <option value="<{$value|xoops_escape}>" <{if $value == $actionForm->get($config->get('conf_name'))}>selected<{/if}>><{$label|xoops_escape}></option> <{/foreach}> </select> @@ -157,7 +157,7 @@ <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}> <{if $value == $selected}><{assign var=flag value=1}><{/if}> <{/foreach}> - <option value="<{$value|escape}>" <{if $flag}>selected="selected"<{/if}>><{$label|escape}></option> + <option value="<{$value|xoops_escape}>" <{if $flag}>selected="selected"<{/if}>><{$label|xoops_escape}></option> <{/foreach}> </select> Index: xoops2jp/html/modules/legacy/admin/templates/preference_list.html diff -u xoops2jp/html/modules/legacy/admin/templates/preference_list.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/preference_list.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/preference_list.html:1.1.2.3 Sun Oct 15 01:54:59 2006 +++ xoops2jp/html/modules/legacy/admin/templates/preference_list.html Sun Dec 3 00:50:20 2006 @@ -14,7 +14,7 @@ <{foreach item=obj from=$objects}> <tr class="<{cycle values='odd,even'}>"> <td class="legacy_list_id"><{$obj->getVar('confcat_id')}></td> - <td class="legacy_list_title"><{$obj->getName()|escape}></td> + <td class="legacy_list_title"><{$obj->getName()|xoops_escape}></td> <td class="legacy_list_control"> <a href="./index.php?action=PreferenceEdit&confcat_id=<{$obj->getVar('confcat_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> </td> Index: xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html diff -u xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html:1.1.2.4 --- xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html:1.1.2.3 Mon Oct 16 00:29:46 2006 +++ xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html Sun Dec 3 00:50:20 2006 @@ -18,7 +18,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div> Index: xoops2jp/html/modules/legacy/admin/templates/theme_list.html diff -u xoops2jp/html/modules/legacy/admin/templates/theme_list.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/theme_list.html:1.1.2.5 --- xoops2jp/html/modules/legacy/admin/templates/theme_list.html:1.1.2.4 Mon Nov 27 14:54:18 2006 +++ xoops2jp/html/modules/legacy/admin/templates/theme_list.html Sun Dec 3 00:50:20 2006 @@ -11,7 +11,7 @@ <div class="error"> <ul> <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message|escape}></li> + <li><{$message|xoops_escape}></li> <{/foreach}> </ul> </div>