From 91dafb19ec171e747d9976cf738606759bde3aae Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Thu, 29 Sep 2016 10:53:17 +0200
Subject: prohibit inline control structures on pages

---
 includes/pages/admin_arrive.php | 46 +++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'includes/pages/admin_arrive.php')

diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php
index 9dcf8e4e..932929c2 100644
--- a/includes/pages/admin_arrive.php
+++ b/includes/pages/admin_arrive.php
@@ -7,8 +7,9 @@ function admin_arrive_title() {
 function admin_arrive() {
   $msg = "";
   $search = "";
-  if (isset($_REQUEST['search']))
+  if (isset($_REQUEST['search'])) {
     $search = strip_request_item('search');
+  }
   
   if (isset($_REQUEST['reset']) && preg_match("/^[0-9]*$/", $_REQUEST['reset'])) {
     $id = $_REQUEST['reset'];
@@ -18,8 +19,9 @@ function admin_arrive() {
       engelsystem_log("User set to not arrived: " . User_Nick_render($user_source));
       success(_("Reset done. Angel has not arrived."));
       redirect(user_link($user_source));
-    } else
+    } else {
       $msg = error(_("Angel not found."), true);
+    }
   } elseif (isset($_REQUEST['arrived']) && preg_match("/^[0-9]*$/", $_REQUEST['arrived'])) {
     $id = $_REQUEST['arrived'];
     $user_source = User($id);
@@ -28,8 +30,9 @@ function admin_arrive() {
       engelsystem_log("User set has arrived: " . User_Nick_render($user_source));
       success(_("Angel has been marked as arrived."));
       redirect(user_link($user_source));
-    } else
+    } else {
       $msg = error(_("Angel not found."), true);
+    }
   }
   
   $users = sql_select("SELECT * FROM `User` ORDER BY `Nick`");
@@ -37,28 +40,32 @@ function admin_arrive() {
   $planned_arrival_count_at_day = [];
   $planned_departure_count_at_day = [];
   $users_matched = [];
-  if ($search == "")
+  if ($search == "") {
     $tokens = [];
-  else
+  } else {
     $tokens = explode(" ", $search);
+  }
   foreach ($users as $usr) {
     if (count($tokens) > 0) {
       $match = false;
       $index = join(" ", $usr);
-      foreach ($tokens as $t)
+      foreach ($tokens as $t) {
         if (stristr($index, trim($t))) {
           $match = true;
           break;
         }
-      if (! $match)
+      }
+      if (! $match) {
         continue;
+      }
     }
     
     $usr['nick'] = User_Nick_render($usr);
-    if ($usr['planned_departure_date'] != null)
+    if ($usr['planned_departure_date'] != null) {
       $usr['rendered_planned_departure_date'] = date('Y-m-d', $usr['planned_departure_date']);
-    else
+    } else {
       $usr['rendered_planned_departure_date'] = '-';
+    }
     $usr['rendered_planned_arrival_date'] = date('Y-m-d', $usr['planned_arrival_date']);
     $usr['rendered_arrival_date'] = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : "-";
     $usr['arrived'] = $usr['Gekommen'] == 1 ? _("yes") : "";
@@ -66,22 +73,25 @@ function admin_arrive() {
     
     if ($usr['arrival_date'] > 0) {
       $day = date('Y-m-d', $usr['arrival_date']);
-      if (! isset($arrival_count_at_day[$day]))
+      if (! isset($arrival_count_at_day[$day])) {
         $arrival_count_at_day[$day] = 0;
+      }
       $arrival_count_at_day[$day] ++;
     }
     
     if ($usr['planned_arrival_date'] != null) {
       $day = date('Y-m-d', $usr['planned_arrival_date']);
-      if (! isset($planned_arrival_count_at_day[$day]))
+      if (! isset($planned_arrival_count_at_day[$day])) {
         $planned_arrival_count_at_day[$day] = 0;
+      }
       $planned_arrival_count_at_day[$day] ++;
     }
     
     if ($usr['planned_departure_date'] != null && $usr['Gekommen'] == 1) {
       $day = date('Y-m-d', $usr['planned_departure_date']);
-      if (! isset($planned_departure_count_at_day[$day]))
+      if (! isset($planned_departure_count_at_day[$day])) {
         $planned_departure_count_at_day[$day] = 0;
+      }
       $planned_departure_count_at_day[$day] ++;
     }
     
@@ -125,20 +135,20 @@ function admin_arrive() {
     ];
   }
   
-  return page_with_title(admin_arrive_title(), array(
+  return page_with_title(admin_arrive_title(), [
       msg(),
-      form(array(
+      form([
           form_text('search', _("Search"), $search),
           form_submit('submit', _("Search")) 
-      )),
-      table(array(
+      ]),
+      table([
           'nick' => _("Nickname"),
           'rendered_planned_arrival_date' => _("Planned arrival"),
           'arrived' => _("Arrived?"),
           'rendered_arrival_date' => _("Arrival date"),
           'rendered_planned_departure_date' => _("Planned departure"),
           'actions' => "" 
-      ), $users_matched),
+      ], $users_matched),
       div('row', [
           div('col-md-4', [
               heading(_("Planned arrival statistics"), 2),
@@ -186,6 +196,6 @@ function admin_arrive() {
               ], $planned_departure_at_day) 
           ]) 
       ]) 
-  ));
+  ]);
 }
 ?>
-- 
cgit v1.2.3-54-g00ecf