|
From: <ma...@us...> - 2012-03-24 18:29:36
|
Revision: 9185
http://xoops.svn.sourceforge.net/xoops/?rev=9185&view=rev
Author: mageg
Date: 2012-03-24 18:29:29 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
fixed a bug on the "System Configuration". Now it appears just the sections that are allowed for admin.
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php 2012-03-24 18:26:23 UTC (rev 9184)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php 2012-03-24 18:29:29 UTC (rev 9185)
@@ -57,7 +57,7 @@
if ( in_array( XOOPS_GROUP_ADMIN, $group) || false != $sysperm_handler->checkRight( 'system_admin', $category, $group, $xoopsModule->getVar('mid') ) ) {
if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/main.php' ) ) {
include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/main.php';
- } else {
+ } else {
$error = true;
}
} else {
@@ -152,47 +152,49 @@
if (!in_array($directory, $inactive_section)) {
$menu['used'] = true;
}
- switch ( $directory ) {
- case 'avatars':
- $avatar_handler = xoops_getHandler('avatar');
- $avatar = $avatar_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_AVATAR_INFO, $avatar);
- break;
- case 'banners':
- $banner_handler =& xoops_getModuleHandler( 'banner', 'system' );
- $banner = $banner_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_BANNER_INFO, $banner);
- break;
- case 'comments':
- $comment_handler =& xoops_gethandler('comment');
- $comment = $comment_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_COMMENT_INFO, $comment);
- break;
- case 'groups':
- $groups_Handler =& xoops_getModuleHandler( 'group', 'system' );
- $groups = $groups_Handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_GROUP_INFO, $groups);
- break;
- case 'images':
- $imgcat_handler = xoops_gethandler('imagecategory');
- $img = $imgcat_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_IMG_INFO, $img);
- break;
- case 'smilies':
- $smilies_Handler =& xoops_getModuleHandler( 'smilies', 'system' );
- $smilies = $smilies_Handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_SMILIES_INFO, $smilies);
- break;
- case 'userrank':
- $userrank_Handler =& xoops_getModuleHandler( 'userrank', 'system' );
- $userrank = $userrank_Handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_RANKS_INFO, $userrank);
- break;
- case 'users':
- $member_handler =& xoops_getModuleHandler('users', 'system');
- $member = $member_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_USERS_INFO, $member);
- break;
+ if ( false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
+ switch ( $directory ) {
+ case 'avatars':
+ $avatar_handler = xoops_getHandler('avatar');
+ $avatar = $avatar_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_AVATAR_INFO, $avatar);
+ break;
+ case 'banners':
+ $banner_handler =& xoops_getModuleHandler( 'banner', 'system' );
+ $banner = $banner_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_BANNER_INFO, $banner);
+ break;
+ case 'comments':
+ $comment_handler =& xoops_gethandler('comment');
+ $comment = $comment_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_COMMENT_INFO, $comment);
+ break;
+ case 'groups':
+ $groups_Handler =& xoops_getModuleHandler( 'group', 'system' );
+ $groups = $groups_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_GROUP_INFO, $groups);
+ break;
+ case 'images':
+ $imgcat_handler = xoops_gethandler('image');
+ $img = $imgcat_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_IMG_INFO, $img);
+ break;
+ case 'smilies':
+ $smilies_Handler =& xoops_getModuleHandler( 'smilies', 'system' );
+ $smilies = $smilies_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_SMILIES_INFO, $smilies);
+ break;
+ case 'userrank':
+ $userrank_Handler =& xoops_getModuleHandler( 'userrank', 'system' );
+ $userrank = $userrank_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_RANKS_INFO, $userrank);
+ break;
+ case 'users':
+ $member_handler =& xoops_getModuleHandler('users', 'system');
+ $member = $member_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_USERS_INFO, $member);
+ break;
+ }
}
$xoopsTpl->append_by_ref( 'menu', $menu );
unset( $menu );
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html 2012-03-24 18:26:23 UTC (rev 9184)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html 2012-03-24 18:29:29 UTC (rev 9185)
@@ -15,6 +15,7 @@
<tbody>
<{foreach item=menu from=$menu}>
+ <{if $menu.title}>
<tr class="<{cycle values='even,odd'}>">
<td class="bold width15">
<a class="tooltip" href="admin.php?fct=<{$menu.file}>" title="<{$smarty.const._AM_SYSTEM_GO}>: <{$menu.title}>">
@@ -26,11 +27,12 @@
<td class="width15"><{$menu.infos}></td>
<td class="xo-actions width2">
<{if $menu.used}>
- <img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
- <img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
+ <img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
<{/if}>
</td>
</tr>
+ <{/if}>
<{/foreach}>
</tbody>
</table>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|