diff options
| -rw-r--r-- | includes/pages/user_news.php | 4 | ||||
| -rw-r--r-- | includes/sys_menu.php | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index e035e656..c5791134 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -46,7 +46,7 @@ function user_meetings() { } function display_news($news) { - global $privileges, $p; + global $privileges, $page; $html = ''; $html .= '<div class="panel' . ($news['Treffen'] == 1 ? ' panel-info' : ' panel-default') . '">'; @@ -67,7 +67,7 @@ function display_news($news) { } $html .= User_Nick_render($user_source); - if ($p != "news_comments") { + if ($page != "news_comments") { $html .= ' <a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '"><span class="glyphicon glyphicon-comment"></span> ' . _("Comments") . ' »</a> <span class="badge">' . sql_num_query("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . '</span>'; } $html .= '</div>'; diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 6896194a..2851a240 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -15,7 +15,7 @@ function page_link_to_absolute($page) { * Renders the header toolbar containing search, login/logout, user and settings links. */ function header_toolbar() { - global $p, $privileges, $user, $enable_tshirt_size, $max_freeloadable_shifts; + global $page, $privileges, $user, $enable_tshirt_size, $max_freeloadable_shifts; $toolbar_items = array(); @@ -24,11 +24,11 @@ function header_toolbar() { } if (! isset($user) && in_array('register', $privileges)) { - $toolbar_items[] = toolbar_item_link(page_link_to('register'), 'plus', register_title(), $p == 'register'); + $toolbar_items[] = toolbar_item_link(page_link_to('register'), 'plus', register_title(), $page == 'register'); } if (in_array('login', $privileges)) { - $toolbar_items[] = toolbar_item_link(page_link_to('login'), 'log-in', login_title(), $p == 'login'); + $toolbar_items[] = toolbar_item_link(page_link_to('login'), 'log-in', login_title(), $page == 'login'); } if (isset($user) && in_array('user_messages', $privileges)) { @@ -40,7 +40,7 @@ function header_toolbar() { $hint_class = 'info'; $glyphicon = 'info-sign'; // Erzengel Hinweis für unbeantwortete Fragen - if ($p != "admin_questions") { + if ($page != "admin_questions") { $new_questions = admin_new_questions(); if ($new_questions != "") { $hints[] = $new_questions; @@ -93,15 +93,15 @@ function header_toolbar() { $user_submenu = make_langselect(); $user_submenu[] = toolbar_item_divider(); if (in_array('user_myshifts', $privileges)) { - $toolbar_items[] = toolbar_item_link(page_link_to('users') . '&action=view', ' icon-icon_angel', $user['Nick'], $p == 'users'); + $toolbar_items[] = toolbar_item_link(page_link_to('users') . '&action=view', ' icon-icon_angel', $user['Nick'], $page == 'users'); } if (in_array('user_settings', $privileges)) { - $user_submenu[] = toolbar_item_link(page_link_to('user_settings'), 'list-alt', settings_title(), $p == 'user_settings'); + $user_submenu[] = toolbar_item_link(page_link_to('user_settings'), 'list-alt', settings_title(), $page == 'user_settings'); } if (in_array('logout', $privileges)) { - $user_submenu[] = toolbar_item_link(page_link_to('logout'), 'log-out', logout_title(), $p == 'logout'); + $user_submenu[] = toolbar_item_link(page_link_to('logout'), 'log-out', logout_title(), $page == 'logout'); } if (count($user_submenu) > 0) { @@ -112,7 +112,7 @@ function header_toolbar() { } function make_navigation() { - global $p, $privileges; + global $page, $privileges; $menu = []; $pages = [ @@ -125,7 +125,7 @@ function make_navigation() { foreach ($pages as $page => $title) { if (in_array($page, $privileges)) { - $menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $p); + $menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $page); } } @@ -147,7 +147,7 @@ function make_navigation() { foreach ($admin_pages as $page => $title) { if (in_array($page, $privileges)) { - $admin_menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $p); + $admin_menu[] = toolbar_item_link(page_link_to($page), '', $title, $page == $page); } } |