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_free.php | 69 ++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 31 deletions(-)

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

diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php
index 227769dc..d3b5b01b 100644
--- a/includes/pages/admin_free.php
+++ b/includes/pages/admin_free.php
@@ -1,4 +1,5 @@
 <?php
+
 function admin_free_title() {
   return _("Free angels");
 }
@@ -7,25 +8,28 @@ function admin_free() {
   global $privileges;
   
   $search = "";
-  if (isset($_REQUEST['search']))
+  if (isset($_REQUEST['search'])) {
     $search = strip_request_item('search');
+  }
   
   $angeltypesearch = "";
-  if (empty($_REQUEST['angeltype']))
+  if (empty($_REQUEST['angeltype'])) {
     $_REQUEST['angeltype'] = '';
-  else {
+  } else {
     $angeltypesearch = " INNER JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id` = '" . sql_escape($_REQUEST['angeltype']) . "' AND `UserAngelTypes`.`user_id` = `User`.`UID`";
-    if (isset($_REQUEST['confirmed_only']))
+    if (isset($_REQUEST['confirmed_only'])) {
       $angeltypesearch .= " AND `UserAngelTypes`.`confirm_user_id`";
+    }
     $angeltypesearch .= ") ";
   }
   
   $angel_types_source = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`");
-  $angel_types = array(
+  $angel_types = [
       '' => 'alle Typen' 
-  );
-  foreach ($angel_types_source as $angel_type)
+  ];
+  foreach ($angel_types_source as $angel_type) {
     $angel_types[$angel_type['id']] = $angel_type['name'];
+  }
   
   $users = sql_select("
       SELECT `User`.* 
@@ -37,58 +41,61 @@ function admin_free() {
       GROUP BY `User`.`UID` 
       ORDER BY `Nick`");
   
-  $free_users_table = array();
-  if ($search == "")
-    $tokens = array();
-  else
+  $free_users_table = [];
+  if ($search == "") {
+    $tokens = [];
+  } 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;
+      }
     }
     
-    $free_users_table[] = array(
+    $free_users_table[] = [
         'name' => User_Nick_render($usr),
         'shift_state' => User_shift_state_render($usr),
         'dect' => $usr['DECT'],
         'jabber' => $usr['jabber'],
         'email' => $usr['email'],
         'actions' => in_array('admin_user', $privileges) ? button(page_link_to('admin_user') . '&amp;id=' . $usr['UID'], _("edit"), 'btn-xs') : '' 
-    );
+    ];
   }
-  return page_with_title(admin_free_title(), array(
-      form(array(
-          div('row', array(
-              div('col-md-4', array(
+  return page_with_title(admin_free_title(), [
+      form([
+          div('row', [
+              div('col-md-4', [
                   form_text('search', _("Search"), $search) 
-              )),
-              div('col-md-4', array(
+              ]),
+              div('col-md-4', [
                   form_select('angeltype', _("Angeltype"), $angel_types, $_REQUEST['angeltype']) 
-              )),
-              div('col-md-2', array(
+              ]),
+              div('col-md-2', [
                   form_checkbox('confirmed_only', _("Only confirmed"), isset($_REQUEST['confirmed_only'])) 
-              )),
-              div('col-md-2', array(
+              ]),
+              div('col-md-2', [
                   form_submit('submit', _("Search")) 
-              )) 
-          )) 
-      )),
-      table(array(
+              ]) 
+          ]) 
+      ]),
+      table([
           'name' => _("Nick"),
           'shift_state' => '',
           'dect' => _("DECT"),
           'jabber' => _("Jabber"),
           'email' => _("E-Mail"),
           'actions' => '' 
-      ), $free_users_table) 
-  ));
+      ], $free_users_table) 
+  ]);
 }
 ?>
-- 
cgit v1.2.3-54-g00ecf