mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 01:51:31 +02:00
Code Issues Releases Wiki Activity

populate who is online only where required

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9961 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2009-08-12 10:30:37 +00:00
parent 91b91494e2
commit 2d0d35db48
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/faq.php
View File

@@ -77,7 +77,7 @@ $template->assign_vars(array(
'SWITCH_COLUMN_MANUALLY' => (!$found_switch) ? true : false, 'SWITCH_COLUMN_MANUALLY' => (!$found_switch) ? true : false,
)); ));
page_header($l_title); page_header($l_title, false);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'faq_body.html') 'body' => 'faq_body.html')

16
phpBB/includes/functions.php
View File

@@ -3861,7 +3861,7 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum'
/** /**
* Generate page header * Generate page header
*/ */
function page_header($page_title = '', $display_online_list = true) function page_header($page_title = '', $display_online_list = true, $forum_id = 0)
{ {
global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path; global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
@@ -3917,10 +3917,18 @@ function page_header($page_title = '', $display_online_list = true)
* } * }
* </code> * </code>
*/ */
$item_id = max(request_var('f', 0), 0); if ($forum_id)
{
$item_id = max($forum_id, 0);
}
else
{
$item_id = 0;
}
// workaround legacy code
$item = 'forum'; $item = 'forum';
$online_users = obtain_users_online($item_id, $item); $online_users = obtain_users_online($item_id, $item);
$user_online_strings = obtain_users_online_string($online_users, $item_id, $item); $user_online_strings = obtain_users_online_string($online_users, $item_id, $item);

2
phpBB/memberlist.php
View File

@@ -1531,7 +1531,7 @@ switch ($mode)
} }
// Output the page // Output the page
page_header($page_title); page_header($page_title, false);
$template->set_filenames(array( $template->set_filenames(array(
'body' => $template_html) 'body' => $template_html)

4
phpBB/posting.php
View File

@@ -1492,7 +1492,7 @@ $allowed = ($auth->acl_get('f_attach', $forum_id) && $auth->acl_get('u_attach')
posting_gen_attachment_entry($attachment_data, $filename_data, $allowed); posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
// Output page ... // Output page ...
page_header($page_title); page_header($page_title, false);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'posting_body.html') 'body' => 'posting_body.html')
@@ -1520,7 +1520,7 @@ function upload_popup($forum_style = 0)
($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting'); ($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting');
page_header($user->lang['PROGRESS_BAR']); page_header($user->lang['PROGRESS_BAR'], false);
$template->set_filenames(array( $template->set_filenames(array(
'popup' => 'posting_progress_bar.html') 'popup' => 'posting_progress_bar.html')

2
phpBB/viewforum.php
View File

@@ -142,7 +142,7 @@ else
} }
// Dump out the page header and load viewforum template // Dump out the page header and load viewforum template
page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name']); page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name'], true, $forum_id);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'viewforum_body.html') 'body' => 'viewforum_body.html')

2
phpBB/viewtopic.php
View File

@@ -1675,7 +1675,7 @@ if (empty($_REQUEST['f']))
} }
// Output the page // Output the page
page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title']); page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title'], true, $forum_id);
$template->set_filenames(array( $template->set_filenames(array(
'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html') 'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html')