Minahito
minah****@users*****
2006年 7月 13日 (木) 19:53:25 JST
Index: xoops2jp/html/modules/user/admin/templates/group_delete.html diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.10 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/group_delete.html Thu Jul 13 19:53:25 2006 @@ -7,7 +7,7 @@ <h3><{$smarty.const._AD_USER_LANG_GROUP_DELETE}></h3> <div class="confirm"> - <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getVar('name')}><br /> + <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getShow('name')}><br /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE2}> </div> @@ -23,35 +23,35 @@ <form action="?action=GroupDelete" method="post"> <{xoops_token form=$actionForm}> - <{xoops_input type=hidden name=groupid value=$object->getVar('groupid')}> + <{xoops_input type=hidden name=groupid value=$object->get('groupid')}> <table class="outer"> <tr> <th colspan="2"><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE}></th> </tr> <tr> <td class="head" style="width:30%;"><{$smarty.const._AD_USER_LANG_GROUP_GID}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('groupid')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('groupid')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_NAME}></td> - <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('name')}></b></td> + <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('name')}></b></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_DESC}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('description')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('description')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_TYPE}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('group_type')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('group_type')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_AMMO}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('user_count')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getUserCount()|escape}></td> </tr> <tr> <td class="foot" colspan="2"> - <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </tr> </table> </form> Index: xoops2jp/html/modules/user/admin/templates/group_member.html diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.11 --- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.10 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/group_member.html Thu Jul 13 19:53:25 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}> </div> -<h3><{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}> ( <{$group->getVar('name')}> )</h3> +<h3><{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}> ( <{$group->getShow('name')}> )</h3> <table class="outer"> <tr> @@ -18,19 +18,19 @@ </tr> <tr class="odd" style="text-align:center;"> <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td> - <td><{$group->getVar('groupid')}></td> - <td><b><{$group->getVar('name')}></b></td> - <td><{$group->getVar('description')}></td> - <td><{$group->getVar('group_type')}></td> - <td><{$group->getVar('user_count')}></td> + <td><{$group->getShow('groupid')}></td> + <td><b><{$group->getShow('name')}></b></td> + <td><{$group->getShow('description')}></td> + <td><{$group->getShow('group_type')}></td> + <td><{$group->getUserCount()|escape}></td> <td> - <a href="index.php?action=GroupEdit&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> - <a href="index.php?action=GroupDelete&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="index.php?action=GroupEdit&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> + <a href="index.php?action=GroupDelete&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> - <a href="index.php?action=GroupProperty&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> - <a href="index.php?action=GroupPerm&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> - <a href="index.php?action=GroupMember&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> + <a href="index.php?action=GroupProperty&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> + <a href="index.php?action=GroupPerm&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> + <a href="index.php?action=GroupMember&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> </td> </tr> </table> @@ -72,19 +72,19 @@ </tr> <{foreach from=$noUsers item=user }> <tr class="<{cycle values="odd,even"}>"> - <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getVar('uid')}>]" value="1" /></td> + <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getShow('uid')}>]" value="1" /></td> <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td> - <td style="text-align:center;"><{$user->getVar('uid')}></td> - <td><b><{$user->getVar('uname')}></b></td> - <td><{$user->getVar('name')}></td> - <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td> - <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td> - <td style="text-align:right;"><{$user->getVar('posts')}></td> - <td style="text-align:right;"><{$user->getVar('level')}></td> + <td style="text-align:center;"><{$user->getShow('uid')}></td> + <td><b><{$user->getShow('uname')}></b></td> + <td><{$user->getShow('name')}></td> + <td><{$user->get('user_regdate')|xoops_formattimestamp}></td> + <td><{$user->get('last_login')|xoops_formattimestamp:l}></td> + <td style="text-align:right;"><{$user->getShow('posts')}></td> + <td style="text-align:right;"><{$user->getShow('level')}></td> <td style="text-align:center;"> - <a href="./index.php?action=UserEdit&uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $user->getVar('uid') != 1 }> - <a href="index.php?action=UserDelete&uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="./index.php?action=UserEdit&uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $user->get('uid') != 1 }> + <a href="index.php?action=UserDelete&uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> </td> </tr> @@ -123,19 +123,19 @@ </tr> <{foreach from=$users item=user }> <tr class="<{cycle values="odd,even"}>"> - <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getVar('uid')}>]" value="2" /></td> + <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getShow('uid')}>]" value="2" /></td> <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td> - <td style="text-align:center;"><{$user->getVar('uid')}></td> - <td><b><{$user->getVar('uname')}></b></td> - <td><{$user->getVar('name')}></td> - <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td> - <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td> - <td style="text-align:right;"><{$user->getVar('posts')}></td> - <td style="text-align:right;"><{$user->getVar('level')}></td> + <td style="text-align:center;"><{$user->getShow('uid')}></td> + <td><b><{$user->getShow('uname')}></b></td> + <td><{$user->getShow('name')}></td> + <td><{$user->get('user_regdate')|xoops_formattimestamp}></td> + <td><{$user->get('last_login')|xoops_formattimestamp:l}></td> + <td style="text-align:right;"><{$user->getShow('posts')}></td> + <td style="text-align:right;"><{$user->getShow('level')}></td> <td style="text-align:center;"> - <a href="<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user->getVar('uid')}>&op=modifyUser"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $user->getVar('uid') != 1 }> - <a href="index.php?action=UserDelete&uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user->getShow('uid')}>&op=modifyUser"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $user->get('uid') != 1 }> + <a href="index.php?action=UserDelete&uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> </td> </tr> Index: xoops2jp/html/modules/user/admin/templates/user_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.13 --- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.12 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/user/admin/templates/user_list.html Thu Jul 13 19:53:25 2006 @@ -38,17 +38,17 @@ <{foreach item=user from=$objects}> <tr class="<{cycle values='odd,even'}>"> <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td> - <td style="text-align:center;"><{$user->getVar('uid')}></td> - <td><{$user->getVar('uname')}></td> - <td><{$user->getVar('name')}></td> - <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td> - <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td> - <td style="text-align:right;"><{$user->getVar('posts')}></td> - <td style="text-align:right;"><{$user->getVar('level')}></td> + <td style="text-align:center;"><{$user->getShow('uid')}></td> + <td><{$user->getShow('uname')}></td> + <td><{$user->getShow('name')}></td> + <td><{$user->get('user_regdate')|xoops_formattimestamp}></td> + <td><{$user->get('last_login')|xoops_formattimestamp:l}></td> + <td style="text-align:right;"><{$user->getShow('posts')}></td> + <td style="text-align:right;"><{$user->getShow('level')}></td> <td style="text-align:center;"> - <a href="./index.php?action=UserEdit&uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $user->getVar('uid') != 1 }> - <a href="index.php?action=UserDelete&uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="./index.php?action=UserEdit&uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $user->get('uid') != 1 }> + <a href="index.php?action=UserDelete&uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> </td> </tr> Index: xoops2jp/html/modules/user/admin/templates/user_search_list.html diff -u xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.7 --- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.6 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search_list.html Thu Jul 13 19:53:25 2006 @@ -40,17 +40,17 @@ <{foreach item=user from=$objects}> <tr class="<{cycle values='odd,even'}>"> <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td> - <td style="text-align:center;"><{$user->getVar('uid')}></td> - <td><{$user->getVar('uname')}></td> - <td><{$user->getVar('name')}></td> - <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td> - <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td> - <td style="text-align:right;"><{$user->getVar('posts')}></td> - <td style="text-align:right;"><{$user->getVar('level')}></td> + <td style="text-align:center;"><{$user->getShow('uid')}></td> + <td><{$user->getShow('uname')}></td> + <td><{$user->getShow('name')}></td> + <td><{$user->get('user_regdate')|xoops_formattimestamp}></td> + <td><{$user->get('last_login')|xoops_formattimestamp:l}></td> + <td style="text-align:right;"><{$user->getShow('posts')}></td> + <td style="text-align:right;"><{$user->getShow('level')}></td> <td style="text-align:center;"> - <a href="./index.php?action=UserEdit&uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $user->getVar('uid') != 1 }> - <a href="index.php?action=UserDelete&uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="./index.php?action=UserEdit&uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $user->get('uid') != 1 }> + <a href="index.php?action=UserDelete&uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> </td> </tr> Index: xoops2jp/html/modules/user/admin/templates/group_edit.html diff -u xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.9 --- xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.8 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/group_edit.html Thu Jul 13 19:53:25 2006 @@ -52,8 +52,8 @@ </tr> <tr> <td colspan="2" class="foot"> - <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/mailjob_delete.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_delete.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/mailjob_delete.html:1.1.2.5 --- xoops2jp/html/modules/user/admin/templates/mailjob_delete.html:1.1.2.4 Wed Jun 14 00:41:26 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_delete.html Thu Jul 13 19:53:25 2006 @@ -17,31 +17,31 @@ </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_MAILJOB_ID}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('mailjob_id')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('mailjob_id')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_TITLE}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('title')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_BODY}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('body')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('body')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_FROM_NAME}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_name')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_name')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_FROM_EMAIL}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_email')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_email')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_IS_PM}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_pm')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_pm')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_IS_MAIL}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_mail')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_mail')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}></td> @@ -49,8 +49,8 @@ </tr> <tr> <td class="foot" colspan="2"> - <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/group_list.html diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.10 --- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.9 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/user/admin/templates/group_list.html Thu Jul 13 19:53:25 2006 @@ -12,29 +12,37 @@ <table class="outer"> <tr> <th> </th> - <th><{$smarty.const._AD_USER_LANG_GROUP_GID}></th> - <th><{$smarty.const._AD_USER_LANG_GROUP_NAME}></th> - <th><{$smarty.const._AD_USER_LANG_GROUP_DESC}></th> - <th><{$smarty.const._AD_USER_LANG_GROUP_TYPE}></th> + <th><{$smarty.const._AD_USER_LANG_GROUP_GID}><br /> + <a href="<{$pageNavi->renderSortUrl()}>&sort=<{$smarty.const.GROUP_SORT_KEY_GROUPID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a> + <a href="<{$pageNavi->renderSortUrl()}>&sort=-<{$smarty.const.GROUP_SORT_KEY_GROUPID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th> + <th><{$smarty.const._AD_USER_LANG_GROUP_NAME}><br /> + <a href="<{$pageNavi->renderSortUrl()}>&sort=<{$smarty.const.GROUP_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a> + <a href="<{$pageNavi->renderSortUrl()}>&sort=-<{$smarty.const.GROUP_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th> + <th><{$smarty.const._AD_USER_LANG_GROUP_DESC}><br /> + <a href="<{$pageNavi->renderSortUrl()}>&sort=<{$smarty.const.GROUP_SORT_KEY_DESCRIPTION}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a> + <a href="<{$pageNavi->renderSortUrl()}>&sort=-<{$smarty.const.GROUP_SORT_KEY_DESCRIPTION}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th> + <th><{$smarty.const._AD_USER_LANG_GROUP_TYPE}><br /> + <a href="<{$pageNavi->renderSortUrl()}>&sort=<{$smarty.const.GROUP_SORT_KEY_GROUP_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a> + <a href="<{$pageNavi->renderSortUrl()}>&sort=-<{$smarty.const.GROUP_SORT_KEY_GROUP_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th> <th><{$smarty.const._AD_USER_LANG_GROUP_AMMO}></th> <th><{$smarty.const._AD_USER_LANG_CONTROL}></th> </tr> <{foreach item=group from=$objects}> <tr class="<{cycle values='odd,even'}>" style="text-align:center;"> <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td> - <td><{$group->getVar('groupid')}></td> - <td><b><{$group->getVar('name')}></b></td> - <td><{$group->getVar('description')}></td> - <td><{$group->getVar('group_type')}></td> - <td><{$group->getVar('user_count')}></td> + <td><{$group->getShow('groupid')}></td> + <td><b><{$group->getShow('name')}></b></td> + <td><{$group->getShow('description')}></td> + <td><{$group->getShow('group_type')}></td> + <td><{$group->getUserCount()|escape}></td> <td> - <a href="index.php?action=GroupEdit&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> - <a href="index.php?action=GroupDelete&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="index.php?action=GroupEdit&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> + <a href="index.php?action=GroupDelete&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> - <a href="index.php?action=GroupProperty&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> - <a href="index.php?action=GroupPerm&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> - <a href="index.php?action=GroupMember&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> + <a href="index.php?action=GroupProperty&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> + <a href="index.php?action=GroupPerm&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> + <a href="index.php?action=GroupMember&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> </td> </tr> <{/foreach}> Index: xoops2jp/html/modules/user/admin/templates/avatar_delete.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.7 --- xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.6 Wed Jun 14 00:41:26 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_delete.html Thu Jul 13 19:53:25 2006 @@ -19,48 +19,49 @@ </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_ID}></td> - <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('avatar_id')}></b></td> + <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('avatar_id')}></b></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_FILE}></td> <td class="<{cycle values="odd,even"}>"> - <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getVar('avatar_file')}>" alt="<{$object->getVar('avatar_name')}>" title="<{$object->getVar('avatar_name')}>" /> - <br /><{$object->getVar('avatar_file')}> + <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getShow('avatar_file')}>" alt="<{$object->getShow('avatar_name')}>" title="<{$object->getShow('avatar_name')}>" /> + <br /><{$object->getShow('avatar_file')}> </td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_NAME}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_name')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_name')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_MIMETYPE}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_mimetype')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_mimetype')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_CREATED}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_created')|xoops_formattimestamp:l}></td> + <td class="<{cycle values="odd,even"}>"><{$object->get('avatar_created')|xoops_formattimestamp:l}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_DISPLAY}></td> <td class="<{cycle values="odd,even"}>"> - <{if $object->getVar('avatar_display') == 1 }> + <{if $object->get('avatar_display') == 1 }> <{$smarty.const._YES}> - <{elseif $object->getVar('avatar_display') == 0 }> + <{elseif $object->get('avatar_display') == 0 }> <{$smarty.const._NO}> <{/if}> </td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_WEIGHT}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_weight')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_weight')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_TYPE}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_type')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_type')}></td> </tr> <tr> <td class="foot" colspan="2"> - <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/avatar_edit.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.6 --- xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.5 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_edit.html Thu Jul 13 19:53:25 2006 @@ -72,6 +72,7 @@ <tr> <td class="foot" colspan="2"> <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/group_property.html diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.9 --- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.8 Thu May 18 01:42:32 2006 +++ xoops2jp/html/modules/user/admin/templates/group_property.html Thu Jul 13 19:53:25 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}> </div> -<h3><{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}> ( <{$group->getVar('name')}> )</h3> +<h3><{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}> ( <{$group->getShow('name')}> )</h3> <table class="outer"> <tr> @@ -18,19 +18,19 @@ </tr> <tr class="odd" style="text-align:center;"> <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td> - <td><{$group->getVar('groupid')}></td> - <td><b><{$group->getVar('name')}></b></td> - <td><{$group->getVar('description')}></td> - <td><{$group->getVar('group_type')}></td> - <td><{$group->getVar('user_count')}></td> + <td><{$group->getShow('groupid')}></td> + <td><b><{$group->getShow('name')}></b></td> + <td><{$group->getShow('description')}></td> + <td><{$group->getShow('group_type')}></td> + <td><{$group->getUserCount()|escape}></td> <td> - <a href="index.php?action=GroupEdit&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> - <a href="index.php?action=GroupDelete&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="index.php?action=GroupEdit&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> + <a href="index.php?action=GroupDelete&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> - <a href="index.php?action=GroupProperty&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> - <a href="index.php?action=GroupPerm&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> - <a href="index.php?action=GroupMember&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> + <a href="index.php?action=GroupProperty&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> + <a href="index.php?action=GroupPerm&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> + <a href="index.php?action=GroupMember&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> </td> </tr> </table> @@ -53,17 +53,17 @@ <{foreach from=$users item=user }> <tr class="<{cycle values="odd,even"}>" style="text-align:center;"> <td><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td> - <td><{$user->getVar('uid')}></td> - <td><b><{$user->getVar('uname')}></b></td> - <td><{$user->getVar('name')}></td> - <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td> - <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td> - <td style="text-align:right;"><{$user->getVar('posts')}></td> - <td style="text-align:right;"><{$user->getVar('level')}></td> + <td><{$user->getShow('uid')}></td> + <td><b><{$user->getShow('uname')}></b></td> + <td><{$user->getShow('name')}></td> + <td><{$user->getShow('user_regdate')|xoops_formattimestamp}></td> + <td><{$user->getShow('last_login')|xoops_formattimestamp:l}></td> + <td style="text-align:right;"><{$user->getShow('posts')}></td> + <td style="text-align:right;"><{$user->getShow('level')}></td> <td> - <a href="./index.php?action=UserEdit&uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $user->getVar('uid') != 1 }> - <a href="index.php?action=UserDelete&uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="./index.php?action=UserEdit&uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $user->get('uid') != 1 }> + <a href="index.php?action=UserDelete&uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> </td> </tr> Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.8 --- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.7 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/user/admin/templates/avatar_list.html Thu Jul 13 19:53:25 2006 @@ -40,18 +40,18 @@ </tr> <{foreach item=obj from=$objects}> <tr class="<{cycle values='odd,even'}>" style="text-align:center;"> - <td><{$obj->getVar('avatar_id')}></td> - <td><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" alt="<{$obj->getVar('avatar_name')}>" title="<{$obj->getVar('avatar_name')}>" /></td> - <td><{$obj->getVar('avatar_name')}></td> - <td><{$obj->getVar('avatar_mimetype')}></td> - <td><{$obj->getVar('avatar_created')|xoops_formattimestamp:l}></td> - <td><{$obj->getVar('avatar_display')}></td> - <td><{$obj->getVar('avatar_weight')}></td> - <td><{$obj->getVar('avatar_type')}></td> - <td><{$obj->getUsingCount()}></td> + <td><{$obj->getShow('avatar_id')}></td> + <td><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('avatar_file')}>" alt="<{$obj->getShow('avatar_name')}>" title="<{$obj->getShow('avatar_name')}>" /></td> + <td><{$obj->getShow('avatar_name')}></td> + <td><{$obj->getShow('avatar_mimetype')}></td> + <td><{$obj->get('avatar_created')|xoops_formattimestamp:l}></td> + <td><{$obj->getShow('avatar_display')}></td> + <td><{$obj->getShow('avatar_weight')}></td> + <td><{$obj->getShow('avatar_type')}></td> + <td><{$obj->getUsingCount()|escape}></td> <td> - <a href="index.php?action=AvatarEdit&avatar_id=<{$obj->getVar('avatar_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <a href="index.php?action=AvatarDelete&avatar_id=<{$obj->getVar('avatar_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="index.php?action=AvatarEdit&avatar_id=<{$obj->getShow('avatar_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <a href="index.php?action=AvatarDelete&avatar_id=<{$obj->getShow('avatar_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> </td> </tr> </tr> Index: xoops2jp/html/modules/user/admin/templates/group_perm.html diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.13 --- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.12 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/group_perm.html Thu Jul 13 19:53:25 2006 @@ -4,7 +4,7 @@ »» <{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}> </div> -<h3><{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}> ( <{$group->getVar('name')}> )</h3> +<h3><{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}> ( <{$group->getShow('name')}> )</h3> <table class="outer"> <tr> @@ -18,19 +18,19 @@ </tr> <tr class="odd" style="text-align:center;"> <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td> - <td><{$group->getVar('groupid')}></td> - <td><b><{$group->getVar('name')}></b></td> - <td><{$group->getVar('description')}></td> - <td><{$group->getVar('group_type')}></td> - <td><{$group->getVar('user_count')}></td> + <td><{$group->getShow('groupid')}></td> + <td><b><{$group->getShow('name')}></b></td> + <td><{$group->getShow('description')}></td> + <td><{$group->getShow('group_type')}></td> + <td><{$group->getUserCount()|escape}></td> <td> - <a href="index.php?action=GroupEdit&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> - <a href="index.php?action=GroupDelete&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="index.php?action=GroupEdit&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }> + <a href="index.php?action=GroupDelete&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> <{/if}> - <a href="index.php?action=GroupProperty&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> - <a href="index.php?action=GroupPerm&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> - <a href="index.php?action=GroupMember&groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> + <a href="index.php?action=GroupProperty&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a> + <a href="index.php?action=GroupPerm&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a> + <a href="index.php?action=GroupMember&groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a> </td> </tr> </table> @@ -125,7 +125,7 @@ <{/foreach}> <div style="text-align:center;"> -<input type="hidden" name="groupid" value="<{$group->getVar('groupid')}>" /> +<{xoops_input type=hidden name=groupid value=$group->get('groupid')}> <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" /> <input type="reset" value="<{$smarty.const._CANCEL}>" class="formButton" /> </div> Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.6 --- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.5 Mon Jun 12 02:03:51 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html Thu Jul 13 19:53:25 2006 @@ -31,11 +31,11 @@ </tr> <{foreach item=obj from=$objects}> <tr class="<{cycle values='odd,even'}>"> - <td><{$obj->getVar('mailjob_id')}></td> - <td><a href="./index.php?action=MailjobSend&mailjob_id=<{$obj->getVar('mailjob_id')}>"><{$obj->getVar('title')}></a></td> - <td><{$obj->getVar('is_pm')}></td> - <td><{$obj->getVar('is_mail')}></td> - <td><{$obj->getVar('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}></td> + <td><{$obj->getShow('mailjob_id')}></td> + <td><a href="./index.php?action=MailjobSend&mailjob_id=<{$obj->getShow('mailjob_id')}>"><{$obj->getShow('title')}></a></td> + <td><{$obj->getShow('is_pm')}></td> + <td><{$obj->getShow('is_mail')}></td> + <td><{$obj->get('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}></td> <td> <{if $obj->mUserCount > 0}> <span style='color:red;'><{$obj->mUserCount|escape}></span> @@ -44,8 +44,8 @@ <{/if}> </td> <td> - <a href="./index.php?action=MailjobEdit&mailjob_id=<{$obj->getVar('mailjob_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> - <a href="./index.php?action=MailjobDelete&mailjob_id=<{$obj->getVar('mailjob_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> + <a href="./index.php?action=MailjobEdit&mailjob_id=<{$obj->getShow('mailjob_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> + <a href="./index.php?action=MailjobDelete&mailjob_id=<{$obj->getShow('mailjob_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a> </td> </tr> <{/foreach}> Index: xoops2jp/html/modules/user/admin/templates/user_edit.html diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.14 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.15 --- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.14 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/user_edit.html Thu Jul 13 19:53:25 2006 @@ -69,9 +69,7 @@ <td class="head"><{$smarty.const._AD_USER_LANG_TIMEZONE_OFFSET}></td> <td class="<{cycle values="odd,even"}>"> <select name="timezone_offset"> - <{foreach item=timezone from=$timezones}> - <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option> - <{/foreach}> + <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}> </select> </td> </tr> @@ -120,7 +118,7 @@ <tr> <td class="head"><{$smarty.const._AD_USER_LANG_USER_SIG}></td> <td class="<{cycle values="odd,even"}>"> - <{xoops_dhtmltarea type=text name=user_sig value=$actionForm->get('user_sig')}> + <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}> <br /> <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}> <{$smarty.const._AD_USER_LANG_ATTACHSIG}> @@ -160,10 +158,8 @@ <td class="head"><{$smarty.const._AD_USER_LANG_RANK}></td> <td class="<{cycle values="odd,even"}>"> <select name="rank"> - <option value="0"><{$smarty.const._AD_USER_LANG_NO_SPECIAL_RANK}></option> - <{foreach item=rank from=$ranks}> - <option value="<{$rank->getVar('rank_id')}>" <{if $rank->get('rank_id') == $actionForm->get('rank')}>selected<{/if}>><{$rank->getVar('rank_title')}></option> - <{/foreach}> + <option value="0"><{$smarty.const._AD_USER_LANG_NO_SPECIAL_RANK}></option> + <{xoops_optionsArray value=rank_id label=rank_title from=$ranks default=$actionForm->get('rank')}> </select> </td> </tr> @@ -211,7 +207,7 @@ <tr> <td colspan="2" class="foot"> <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/mailjob_send.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.3 --- xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.2 Fri May 12 00:26:03 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_send.html Thu Jul 13 19:53:25 2006 @@ -19,31 +19,31 @@ </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_MAILJOB_ID}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('mailjob_id')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('mailjob_id')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_TITLE}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('title')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_BODY}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('body')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('body')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_FROM_NAME}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_name')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_name')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_FROM_EMAIL}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_email')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_email')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_IS_PM}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_pm')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_pm')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_IS_MAIL}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_mail')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_mail')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}></td> @@ -51,8 +51,8 @@ </tr> <tr> <td class="foot" colspan="2"> - <input type="submit" value="<{$smarty.const._SEND}>" class="formButton" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._SEND}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.7 --- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.6 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html Thu Jul 13 19:53:25 2006 @@ -71,8 +71,8 @@ </tr> <tr> <td colspan="2" class="foot"> - <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.8 --- xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.7 Tue Jul 11 12:43:27 2006 +++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html Thu Jul 13 19:53:25 2006 @@ -17,34 +17,34 @@ </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_RANK_ID}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_id')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_id')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_RANK_TITLE}></td> - <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('rank_title')}></b></td> + <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('rank_title')}></b></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_RANK_MIN}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_min')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_min')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_RANK_MAX}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_max')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_max')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_RANK_SPECIAL}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_special')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_special')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_RANK_IMAGE}></td> <td class="odd"> - <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getVar('rank_image')}>" alt="<{$object->getVar('rank_title')}>" title="<{$object->getVar('rank_title')}>" /> + <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getShow('rank_image')}>" alt="<{$object->getShow('rank_title')}>" title="<{$object->getShow('rank_title')}>" /> </td> </tr> <tr> <td class="foot" colspan="2"> - <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/user_search.html diff -u xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.5 --- xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.4 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/user_search.html Thu Jul 13 19:53:25 2006 @@ -142,7 +142,6 @@ <tr> <td colspan="2" class="foot"> <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/user_delete.html diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.9 --- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.8 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/user_delete.html Thu Jul 13 19:53:25 2006 @@ -6,7 +6,7 @@ <h3><{$smarty.const._AD_USER_LANG_USER_DELETE}></h3> -<div class="confirm"><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getVar('uname')}></div> +<div class="confirm"><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getShow('uname')}></div> <{if $actionForm->hasError()}> <div class="error"> @@ -20,43 +20,43 @@ <form action="?action=UserDelete" method="post"> <{xoops_token form=$actionForm}> -<{xoops_input type=hidden name=uid value=$object->getVar('uid')}> +<{xoops_input type=hidden name=uid value=$object->get('uid')}> <table class="outer"> <tr> <th colspan="2"><{$smarty.const._AD_USER_LANG_USER_DELETE}></th> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_UID}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('uid')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('uid')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_UNAME}></td> - <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('uname')}></b></td> + <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('uname')}></b></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_NAME}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('name')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_REGDATE}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('user_regdate')|xoops_formattimestamp}></td> + <td class="<{cycle values="odd,even"}>"><{$object->get('user_regdate')|xoops_formattimestamp}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_LASTLOGIN}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_login')|xoops_formattimestamp:l}></td> + <td class="<{cycle values="odd,even"}>"><{$object->get('last_login')|xoops_formattimestamp:l}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_POSTS}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('posts')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('posts')}></td> </tr> <tr> <td class="head"><{$smarty.const._AD_USER_LANG_LEVEL}></td> - <td class="<{cycle values="odd,even"}>"><{$object->getVar('level')}></td> + <td class="<{cycle values="odd,even"}>"><{$object->getShow('level')}></td> </tr> <tr> <td colspan="2" class="foot"> - <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table> Index: xoops2jp/html/modules/user/admin/templates/mailjob_edit.html diff -u xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.8 --- xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.7 Wed Jun 14 01:12:53 2006 +++ xoops2jp/html/modules/user/admin/templates/mailjob_edit.html Thu Jul 13 19:53:25 2006 @@ -47,7 +47,7 @@ <tr> <td class="head"><{$smarty.const._AD_USER_LANG_BODY}></td> <td class="<{cycle values="odd,even"}>"> - <{xoops_dhtmltarea type=text name=body value=$actionForm->get('body') rows=10}> + <{xoops_dhtmltarea type=text name=body value=$actionForm->get('body') cols=50 rows=10}> <{* <{xoops_textarea type=text name=body value=$actionForm->get('body') cols=50 rows=10}> *}> </td> </tr> @@ -78,7 +78,7 @@ <tr class="foot"> <td colspan="2"> <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" /> - <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" /> + <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" /> </td> </tr> </table>