1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 00:25:19 +02:00

- properly hide items

git-svn-id: file:///svn/phpbb/trunk@5570 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-02-22 11:39:27 +00:00
parent 1a96cc09c1
commit 3da86bb615
2 changed files with 11 additions and 17 deletions

View File

@ -581,14 +581,13 @@ class p_master
/** /**
* Toggle whether this module will be displayed or not * Toggle whether this module will be displayed or not
*/ */
function set_display($id, $display = true) function set_display($id, $mode = false, $display = true)
{ {
foreach ($this->module_ary as $row_id => $itep_ary) foreach ($this->module_ary as $row_id => $itep_ary)
{ {
if ($itep_ary['name'] === $id || $itep_ary['id'] === (int) $id) if (($itep_ary['name'] === $id || $itep_ary['id'] === (int) $id) && (!$mode || $itep_ary['mode'] === $mode))
{ {
$this->module_ary[$row_id]['display'] = (int) $display; $this->module_ary[$row_id]['display'] = (int) $display;
break;
} }
} }
} }

View File

@ -40,12 +40,6 @@ else
$mode = request_var('mode', ''); $mode = request_var('mode', '');
} }
// Make sure we are using the correct module
if ($mode == 'approve' || $mode == 'disapprove')
{
$id = 'queue';
}
// Only Moderators can go beyond this point // Only Moderators can go beyond this point
if (!$user->data['is_registered']) if (!$user->data['is_registered'])
{ {
@ -165,23 +159,24 @@ else
// Hide some of the options if we don't have the relevant information to use them // Hide some of the options if we don't have the relevant information to use them
if (!$post_id) if (!$post_id)
{ {
$module->set_display('post_details', false); $module->set_display('main', 'post_details', false);
$module->set_display('warn_post', false); $module->set_display('queue', 'approve_details', false);
$module->set_display('warn', 'warn_post', false);
} }
if (!$topic_id) if (!$topic_id)
{ {
$module->set_display('topic_view', false); $module->set_display('main', 'topic_view', false);
$module->set_display('topic_logs', false); $module->set_display('logs', 'topic_logs', false);
} }
if (!$forum_id) if (!$forum_id)
{ {
$module->set_display('forum_view', false); $module->set_display('main', 'forum_view', false);
$module->set_display('forum_logs', false); $module->set_display('logs', 'forum_logs', false);
} }
if (!$user_id && $username == '') if (!$user_id && $username == '')
{ {
$module->set_display('user_notes', false); $module->set_display('notes', 'user_notes', false);
$module->set_display('warn_user', false); $module->set_display('warn', 'warn_user', false);
} }
// Load and execute the relevant module // Load and execute the relevant module