diff options
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4e41e1e9fb..ee87251a6d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -120,8 +120,7 @@ function get_userdata($username) { function make_jumpbox() { - global $db; - global $l_jumpto, $l_noforums, $l_nocategories; + global $lang, $db; $sql = "SELECT c.cat_id, c.cat_title, c.cat_order FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f @@ -141,7 +140,7 @@ function make_jumpbox() $limit_forums = ""; $sql = "SELECT * - FROM ".FORUMS_TABLE." + FROM " . FORUMS_TABLE . " ORDER BY cat_id, forum_order"; if(!$q_forums = $db->sql_query($sql)) { @@ -152,11 +151,11 @@ function make_jumpbox() // $is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata); - $boxstring = ''; + $boxstring = '<option value="-1">' . $lang['Select_forum'] . '</option>'; for($i = 0; $i < $total_categories; $i++) { $boxstring .= "<option value=\"-1\"> </option>\n"; - $boxstring .= "<option value=\"-1\">".stripslashes($category_rows[$i]['cat_title'])."</option>\n"; + $boxstring .= "<option value=\"-1\">" . stripslashes($category_rows[$i]['cat_title']) . "</option>\n"; $boxstring .= "<option value=\"-1\">----------------</option>\n"; if($total_forums) @@ -165,8 +164,7 @@ function make_jumpbox() { if( $forum_rows[$y]['cat_id'] == $category_rows[$i]['cat_id'] ) { - $name = stripslashes($forum_rows[$y]['forum_name']); - $boxstring .= "<option value=\"".$forum_rows[$y]['forum_id']."\">$name</option>\n"; + $boxstring .= "<option value=\"" . $forum_rows[$y]['forum_id'] . "\">" . stripslashes($forum_rows[$y]['forum_name']) . "</option>\n"; } } } @@ -191,7 +189,7 @@ function make_forum_box($box_name, $default_forum = -1) $limit_forums = ""; $sql = "SELECT forum_id, forum_name - FROM ".FORUMS_TABLE." + FROM " . FORUMS_TABLE . " ORDER BY cat_id, forum_order"; if(!$q_forums = $db->sql_query($sql)) { @@ -395,7 +393,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add for($i = $this_block_start; $i <= $this_block_end; $i++) { - $page_string .= ($i == $on_page) ? "<b>$i</b>" : "<a href=\"".append_sid($base_url . "&start=" . (($i - 1) * $per_page)) . "\">$i</a>"; + $page_string .= ($i == $on_page) ? "<b>$i</b>" : "<a href=\"".append_sid($base_url . "&start=" . (($i - 1) * $per_page)) . "\">$i</a>"; if($i < $this_block_end) { $page_string .= ", "; @@ -407,7 +405,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add $page_string_prepend = ""; for($i = 0; $i < $this_block_start; $i += 10) { - $page_string_prepend .= "<a href=\"" . append_sid($base_url . "&start=" . ($i * $per_page)) . "\">" . ( ($i == 0) ? ($i + 1) : $i) . " - " . ($i + 9) . "</a>, "; + $page_string_prepend .= "<a href=\"" . append_sid($base_url . "&start=" . ($i * $per_page)) . "\">" . ( ($i == 0) ? ($i + 1) : $i) . " - " . ($i + 9) . "</a>, "; } $page_string = $page_string_prepend . $page_string; @@ -419,7 +417,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add if(!($total_pages%10)) { - $page_url = append_sid($base_url."&start=".( ( ($this_block_end + 1) * $per_page ) - $per_page ) ); + $page_url = append_sid($base_url."&start=".( ( ($this_block_end + 1) * $per_page ) - $per_page ) ); $page_string_append .= "<a href=\"$page_url\">$total_pages</a>"; } else @@ -427,7 +425,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add for($i = $this_block_end + 1; $i < $total_pages; $i += 10) { - $page_string_append .= "<a href=\"" . append_sid($base_url . "&start=" . (($i * $per_page) - $per_page)) . "\">" . ( ($i == 0) ? ($i + 1) : $i) . " - " . ((($i + 9) < $total_pages) ? ($i + 9) : $total_pages) . "</a>"; + $page_string_append .= "<a href=\"" . append_sid($base_url . "&start=" . (($i * $per_page) - $per_page)) . "\">" . ( ($i == 0) ? ($i + 1) : $i) . " - " . ((($i + 9) < $total_pages) ? ($i + 9) : $total_pages) . "</a>"; if($i < $total_pages - 10) { $page_string_append .= ", "; @@ -441,11 +439,11 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add { if($on_page > 1) { - $page_string = " <a href=\"" . append_sid($base_url . "&start=" . (($on_page - 2) * $per_page)) . "\">" . $lang['Previous'] . "</a> " . $page_string; + $page_string = " <a href=\"" . append_sid($base_url . "&start=" . (($on_page - 2) * $per_page)) . "\">" . $lang['Previous'] . "</a> " . $page_string; } if($on_page < $total_pages) { - $page_string .= " <a href=\"" . append_sid($base_url . "&start=" . ($on_page * $per_page)) . "\">" . $lang['Next'] . "</a>"; + $page_string .= " <a href=\"" . append_sid($base_url . "&start=" . ($on_page * $per_page)) . "\">" . $lang['Next'] . "</a>"; } $page_string = $lang['Goto_page'] . ": " . $page_string; |