mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-21 09:52:26 +01:00
Code Issues Releases Wiki Activity

More jumpbox stuff, still not happy with the layout though =(

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@2953 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2002-10-11 02:55:34 +00:00
parent 1e52eafc80
commit fafd167dde
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
phpBB/includes/functions.php
View File

@ -186,7 +186,7 @@ function make_jumpbox($action, $forum_id = false)
{ {
global $auth, $template, $lang, $db, $nav_links, $phpEx; global $auth, $template, $lang, $db, $nav_links, $phpEx;
$boxstring = '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>'; $boxstring = '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option><option value="-1">&nbsp;</option>';
$sql = 'SELECT forum_id, forum_name, forum_status, left_id, right_id $sql = 'SELECT forum_id, forum_name, forum_status, left_id, right_id
FROM ' . FORUMS_TABLE . ' FROM ' . FORUMS_TABLE . '
@ -194,6 +194,7 @@ function make_jumpbox($action, $forum_id = false)
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$right = 0; $right = 0;
$cat_right = 0;
$padding = ''; $padding = '';
$forum_list = ''; $forum_list = '';
while ( $row = $db->sql_fetchrow($result) ) while ( $row = $db->sql_fetchrow($result) )
@ -204,25 +205,31 @@ function make_jumpbox($action, $forum_id = false)
} }
else if ( $row['left_id'] > $right + 1 ) else if ( $row['left_id'] > $right + 1 )
{ {
$padding = substr($subforum, 0, -18 * ( $row['left_id'] - $right + 1 )); $padding = substr($padding, 0, -13 * ( $row['left_id'] - $right + 1 ));
} }
$right = $row['right_id']; $right = $row['right_id'];
$linefeed = TRUE; $linefeed = FALSE;
if ( ( $auth->acl_get('f_list', $forum_id) || $auth->acl_get('a_') )) if ( ( $auth->acl_get('f_list', $forum_id) || $auth->acl_get('a_') ))
{ {
if ($row['forum_status'] == ITEM_CATEGORY) $selected = ( $row['forum_id'] == $forum_id ) ? ' selected="selected"' : '';
if ($row['left_id'] > $cat_right)
{ {
$linefeed = TRUE; $holding = '';
$boxstring .= '<option value="-1">&nbsp;&nbsp;</option>';
} }
elseif ($row['parent_id'] == 0) if ($row['parent_id'] == 0)
{ {
if ($linefeed) if ($row['forum_status'] == ITEM_CATEGORY)
{
$linefeed = TRUE;
$holding = '<option value="-1">&nbsp;</option>';
}
elseif (!empty($linefeed))
{ {
$linefeed = FALSE; $linefeed = FALSE;
$boxstring .= '<option value="-1">&nbsp;&nbsp;</option>'; $boxstring .= '<option value="-1">&nbsp;</option>';
} }
} }
else else
@ -230,14 +237,21 @@ function make_jumpbox($action, $forum_id = false)
$linefeed = TRUE; $linefeed = TRUE;
} }
$selected = ( $row['forum_id'] == $forum_id ) ? ' selected="selected"' : '';
$boxstring .= '<option value="' . (($row['forum_status'] == ITEM_CATEGORY) ? 'c' : '') . $row['forum_id'] . '"' . $selected . '>' . $padding . $row['forum_name'] . '</option>';
if ($row['forum_status'] == ITEM_CATEGORY) if ($row['forum_status'] == ITEM_CATEGORY)
{ {
$boxstring .= '<option value="-1">' . $padding . '----------------</option>'; $cat_right = max($cat_right, $row['right_id']);
$holding .= '<option value="c' . $row['forum_id'] . '"' . $selected . '>' . $padding . $row['forum_name'] . '</option><option value="-1">' . $padding . '----------------</option>';
}
else
{
$boxstring .= $holding . '<option value="' . $row['forum_id'] . '"' . $selected . '>' . $padding . $row['forum_name'] . '</option>';
$holding = '';
} }
//
// TODO: do not add empty categories to nav links
//
$nav_links['chapter forum'][$row['forum_id']] = array ( $nav_links['chapter forum'][$row['forum_id']] = array (
'url' => ($row['forum_status'] == ITEM_CATEGORY) ? "index.$phpEx$SIDc=" : "viewforum.$phpEx$SID&f=" . $row['forum_id'], 'url' => ($row['forum_status'] == ITEM_CATEGORY) ? "index.$phpEx$SIDc=" : "viewforum.$phpEx$SID&f=" . $row['forum_id'],
'title' => $row['forum_name'] 'title' => $row['forum_name']