reduce complexity of user angeltypes controller

7 files changed, 0 insertions, 34 deletions

diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php
index 4226e6ba..553473eb 100644
--- a/includes/pages/admin_news.php
+++ b/includes/pages/admin_news.php
@@ -22,9 +22,6 @@ function admin_news() {
           list($news) = $news;
           
           $user_source = User($news['UID']);
-          if ($user_source === false) {
-            engelsystem_error("Unable to load user.");
-          }
           
           $html .= form([
               form_info(_("Date"), date("Y-m-d H:i", $news['Datum'])),
diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php
index 8e7507da..8c16255c 100644
--- a/includes/pages/admin_questions.php
+++ b/includes/pages/admin_questions.php
@@ -26,9 +26,6 @@ function admin_questions() {
     $questions = sql_select("SELECT * FROM `Questions` WHERE `AID` IS NULL");
     foreach ($questions as $question) {
       $user_source = User($question['UID']);
-      if ($user_source === false) {
-        engelsystem_error("Unable to load user.");
-      }
       
       $unanswered_questions_table[] = [
           'from' => User_Nick_render($user_source),
@@ -45,14 +42,7 @@ function admin_questions() {
     $questions = sql_select("SELECT * FROM `Questions` WHERE NOT `AID` IS NULL");
     foreach ($questions as $question) {
       $user_source = User($question['UID']);
-      if ($user_source === false) {
-        engelsystem_error("Unable to load user.");
-      }
-      
       $answer_user_source = User($question['AID']);
-      if ($answer_user_source === false) {
-        engelsystem_error("Unable to load user.");
-      }
       $answered_questions_table[] = [
           'from' => User_Nick_render($user_source),
           'question' => str_replace("\n", "<br />", $question['Question']),
diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php
index 61c0a2c0..186a676e 100644
--- a/includes/pages/admin_rooms.php
+++ b/includes/pages/admin_rooms.php
@@ -114,9 +114,6 @@ function admin_rooms() {
           $needed_angeltype_info = [];
           foreach ($angeltypes_count as $angeltype_id => $angeltype_count) {
             $angeltype = AngelType($angeltype_id);
-            if ($angeltype === false) {
-              engelsystem_error("Unable to load angeltype.");
-            }
             if ($angeltype != null) {
               NeededAngelType_add(null, $angeltype_id, $room_id, $angeltype_count);
               $needed_angeltype_info[] = $angeltype['name'] . ": " . $angeltype_count;
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 56987e12..ef4eb2de 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -16,9 +16,6 @@ function admin_user() {
   $user_id = $_REQUEST['id'];
   if (! isset($_REQUEST['action'])) {
     $user_source = User($user_id);
-    if ($user_source === false) {
-      engelsystem_error('Unable to load user.');
-    }
     if ($user_source == null) {
       error(_('This user does not exist.'));
       redirect(users_link());
diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php
index 4af2a0cb..eb07deea 100644
--- a/includes/pages/user_messages.php
+++ b/includes/pages/user_messages.php
@@ -47,13 +47,7 @@ function user_messages() {
     
     foreach ($messages as $message) {
       $sender_user_source = User($message['SUID']);
-      if ($sender_user_source === false) {
-        engelsystem_error(_("Unable to load user."));
-      }
       $receiver_user_source = User($message['RUID']);
-      if ($receiver_user_source === false) {
-        engelsystem_error(_("Unable to load user."));
-      }
       
       $messages_table_entry = [
           'new' => $message['isRead'] == 'N' ? '<span class="glyphicon glyphicon-envelope"></span>' : '',
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index c5791134..97f7ec83 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -62,9 +62,6 @@ function display_news($news) {
   $html .= '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $news['Datum']) . '&emsp;';
   
   $user_source = User($news['UID']);
-  if ($user_source === false) {
-    engelsystem_error(_("Unable to load user."));
-  }
   
   $html .= User_Nick_render($user_source);
   if ($page != "news_comments") {
@@ -94,9 +91,6 @@ function user_news_comments() {
     $comments = sql_select("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($nid) . "' ORDER BY 'ID'");
     foreach ($comments as $comment) {
       $user_source = User($comment['UID']);
-      if ($user_source === false) {
-        engelsystem_error(_("Unable to load user."));
-      }
       
       $html .= '<div class="panel panel-default">';
       $html .= '<div class="panel-body">' . nl2br($comment['Text']) . '</div>';
diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php
index 10e8fef6..7acdee78 100644
--- a/includes/pages/user_questions.php
+++ b/includes/pages/user_questions.php
@@ -13,9 +13,6 @@ function user_questions() {
     $answered_questions = sql_select("SELECT * FROM `Questions` WHERE NOT `AID` IS NULL AND `UID`='" . sql_escape($user['UID']) . "'");
     foreach ($answered_questions as &$question) {
       $answer_user_source = User($question['AID']);
-      if ($answer_user_source === false) {
-        engelsystem_error(_("Unable to load user."));
-      }
       $question['answer_user'] = User_Nick_render($answer_user_source);
     }