diff options
| author | Philip Häusler <msquare@notrademark.de> | 2014-12-06 21:40:16 +0100 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2014-12-06 21:40:16 +0100 |
| commit | 8261933bec7d6009e392f64aec7371dabb5149a6 (patch) | |
| tree | b25a51c576b7a7a280bd0ecd2f3179f7b92fc45e /public | |
| parent | 30c8b48996c3e898fdeaad48cb5ff1c8c9431272 (diff) | |
try to prevent hint duplication
Diffstat (limited to 'public')
| -rw-r--r-- | public/index.php | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/public/index.php b/public/index.php index f6dca310..03bc3869 100644 --- a/public/index.php +++ b/public/index.php @@ -90,32 +90,30 @@ if (! isset($_REQUEST['p'])) if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (in_array($_REQUEST['p'], $free_pages) || in_array($_REQUEST['p'], $privileges))) { $p = $_REQUEST['p']; + $title = $p; + $content = ""; + if (isset($user)) { - $hints = ""; - if (User_is_freeloader($user)) error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts)); - - // Hinweis für Engel, die noch nicht angekommen sind + + // Hinweis für Engel, die noch nicht angekommen sind if ($user['Gekommen'] == 0) error(_("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already.")); - + if ($enable_tshirt_size && $user['Size'] == "") error(_("You need to specify a tshirt size in your settings!")); - + if ($user['DECT'] == "") error(_("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\".")); - - // Erzengel Hinweis für unbeantwortete Fragen + + // Erzengel Hinweis für unbeantwortete Fragen if ($p != "admin_questions") admin_new_questions(); - + user_angeltypes_unconfirmed_hint(); } - $title = $p; - $content = ""; - if ($p == "api") { require_once realpath(__DIR__ . '/../includes/controller/api.php'); error("Api disabled temporily."); @@ -240,7 +238,7 @@ echo template_render('../templates/layout.html', array( 'title' => $title, 'atom_link' => ($p == 'news' || $p == 'user_meetings') ? '<link href="' . page_link_to('atom') . (($p == 'user_meetings') ? '&meetings=1' : '') . '&key=' . $user['api_key'] . '" type="application/atom+xml" rel="alternate" title="Atom Feed">' : '', 'menu' => make_menu(), - 'content' => $content, + 'content' => msg() . $content, 'header_toolbar' => header_toolbar(), 'faq_url' => $faq_url, 'locale' => $_SESSION['locale'] |