Merge branch 'master' of github.com:engelsystem/engelsystem

1 files changed, 1 insertions, 24 deletions

diff --git a/public/index.php b/public/index.php
index f6dca310..a64ec237 100644
--- a/public/index.php
+++ b/public/index.php
@@ -90,29 +90,6 @@ 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'];
   
-  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
-    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
-    if ($p != "admin_questions")
-      admin_new_questions();
-    
-    user_angeltypes_unconfirmed_hint();
-  }
-  
   $title = $p;
   $content = "";
   
@@ -240,7 +217,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') ? '&amp;meetings=1' : '') . '&amp;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']