mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-13 20:28:44 +01:00
Code Issues Releases Wiki Activity

Removed nav_links

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3978 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-05-04 17:15:23 +00:00
parent bd17c362c1
commit 617c49bb8e
5 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/includes/functions.php
View File

@ -261,7 +261,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
function make_jumpbox($action, $forum_id = false, $select_all = false)
{
global $auth, $template, $user, $db, $nav_links, $phpEx, $SID;
global $auth, $template, $user, $db, $phpEx, $SID;
$boxstring = '';
$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
@ -316,11 +316,6 @@ function make_jumpbox($action, $forum_id = false, $select_all = false)
$boxstring .= $holding . '<option value="' . $row['forum_id'] . '"' . $selected . '>' . $padding . $row['forum_name'] . '</option>';
$holding = '';
}
$nav_links['chapter forum'][$row['forum_id']] = array (
'url' => "viewforum.$phpEx$SID&f=" . $row['forum_id'],
'title' => $row['forum_name']
);
}
$db->sql_freeresult($result);
unset($padding_store);
@ -1007,7 +1002,7 @@ function login_forum_box(&$forum_data)
// Error and message handler, call with trigger_error if reqd
function msg_handler($errno, $msg_text, $errfile, $errline)
{
global $cache, $db, $auth, $template, $config, $user, $nav_links;
global $cache, $db, $auth, $template, $config, $user;
global $phpEx, $phpbb_root_path, $starttime;
switch ($errno)
@ -1293,27 +1288,6 @@ function page_header($page_title = '')
}
}
// Generate HTML required for Mozilla Navigation bar
$nav_links_html = '';
/*
$nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
foreach ($nav_links as $nav_item => $nav_array)
{
if (!empty($nav_array['url']))
{
$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nav_array['url'], $nav_array['title']);
}
else
{
// We have a nested array, used for items like <link rel='chapter'> that can occur more than once.
foreach ($nav_array as $key => $nested_array)
{
$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']);
}
}
}
*/
// Which timezone?
$tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone']));
@ -1366,9 +1340,7 @@ function page_header($page_title = '')
'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0,
'T_STYLESHEET_DATA' => $user->theme['css_data'],
'T_STYLESHEET_LINK' => 'templates/' . $user->theme['css_external'],
'NAV_LINKS' => $nav_links_html)
'T_STYLESHEET_LINK' => 'templates/' . $user->theme['css_external'])
);
if (!empty($config['send_encoding']))

9
phpBB/mcp.php
View File

@ -2017,7 +2017,7 @@ function mcp_header($template_name, $jumpbox_acl = FALSE, $forum_nav = FALSE)
function mcp_jumpbox($action, $acl_list = 'f_list', $forum_id = false, $enable_select_all = false)
{
global $auth, $template, $user, $db, $nav_links, $phpEx, $SID;
global $auth, $template, $user, $db, $phpEx, $SID;
$sql = 'SELECT forum_id, forum_name, forum_type, left_id, right_id
FROM ' . FORUMS_TABLE . '
@ -2069,12 +2069,7 @@ function mcp_jumpbox($action, $acl_list = 'f_list', $forum_id = false, $enable_s
$template->assign_block_vars('options', array(
'VALUE' => $row['forum_id'],
'SELECTED' => $selected,
'TEXT' => $padding . $char . $row['forum_name']
));
$nav_links['chapter forum'][$row['forum_id']] = array (
'url' => "viewforum.$phpEx$SID&f=" . $row['forum_id'],
'title' => $row['forum_name']
'TEXT' => $padding . $char . $row['forum_name'])
);
}
$db->sql_freeresult($result);

1
phpBB/templates/subSilver/overall_header.html
View File

@ -4,7 +4,6 @@
<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
<meta http-equiv="Content-Style-Type" content="text/css">
{META}
{NAV_LINKS}
<title>{SITENAME} :: {PAGE_TITLE}</title>
<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css">
<style type="text/css">

8
phpBB/viewforum.php
View File

@ -548,14 +548,6 @@ if ($forum_data['forum_type'] == FORUM_POST)
}
}
/*
// Mozilla navigation links
$nav_links['up'] = array(
'url' => 'index.' . $phpEx . $SID,
'title' => sprintf($user->lang['FORUM_INDEX'], $config['sitename'])
);
*/
// Dump out the page header and load viewforum template
page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name']);

15
phpBB/viewtopic.php
View File

@ -1358,21 +1358,6 @@ if (!preg_match("#&t=$topic_id#", $user->data['session_page']))
}
// Mozilla navigation bar
/*
$nav_links['prev'] = array(
'url' => $view_prev_topic_url,
'title' => $user->lang['View_previous_topic']
);
$nav_links['next'] = array(
'url' => $view_next_topic_url,
'title' => $user->lang['View_next_topic']
);
$nav_links['up'] = array(
'url' => $view_forum_url,
'title' => $forum_name
);
*/
// Mark topics read
markread('topic', $forum_id, $topic_id, $last_post_time);