From 07ddbb0f4c76253b1d888ceab555bdf26992fd01 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Thu, 29 Sep 2016 12:45:06 +0200
Subject: make short variable names longer

---
 includes/pages/admin_groups.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php
index d26e6de7..69b6bf39 100644
--- a/includes/pages/admin_groups.php
+++ b/includes/pages/admin_groups.php
@@ -35,15 +35,15 @@ function admin_groups() {
     switch ($_REQUEST["action"]) {
       case 'edit':
         if (isset($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) {
-          $id = $_REQUEST['id'];
+          $group_id = $_REQUEST['id'];
         } else {
           return error("Incomplete call, missing Groups ID.", true);
         }
         
-        $room = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1");
-        if (count($room) > 0) {
-          list($room) = $room;
-          $privileges = sql_select("SELECT `Privileges`.*, `GroupPrivileges`.`group_id` FROM `Privileges` LEFT OUTER JOIN `GroupPrivileges` ON (`Privileges`.`id` = `GroupPrivileges`.`privilege_id` AND `GroupPrivileges`.`group_id`='" . sql_escape($id) . "') ORDER BY `Privileges`.`name`");
+        $group = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($group_id) . "' LIMIT 1");
+        if (count($group) > 0) {
+          list($group) = $group;
+          $privileges = sql_select("SELECT `Privileges`.*, `GroupPrivileges`.`group_id` FROM `Privileges` LEFT OUTER JOIN `GroupPrivileges` ON (`Privileges`.`id` = `GroupPrivileges`.`privilege_id` AND `GroupPrivileges`.`group_id`='" . sql_escape($group_id) . "') ORDER BY `Privileges`.`name`");
           $privileges_html = "";
           $privileges_form = [];
           foreach ($privileges as $priv) {
@@ -53,7 +53,7 @@ function admin_groups() {
           
           $privileges_form[] = form_submit('submit', _("Save"));
           $html .= page_with_title(_("Edit group"), [
-              form($privileges_form, page_link_to('admin_groups') . '&action=save&id=' . $id) 
+              form($privileges_form, page_link_to('admin_groups') . '&action=save&id=' . $group_id) 
           ]);
         } else {
           return error("No Group found.", true);
@@ -62,29 +62,29 @@ function admin_groups() {
       
       case 'save':
         if (isset($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) {
-          $id = $_REQUEST['id'];
+          $group_id = $_REQUEST['id'];
         } else {
           return error("Incomplete call, missing Groups ID.", true);
         }
         
-        $room = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1");
+        $group = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($group_id) . "' LIMIT 1");
         if (! is_array($_REQUEST['privileges'])) {
           $_REQUEST['privileges'] = [];
         }
-        if (count($room) > 0) {
-          list($room) = $room;
-          sql_query("DELETE FROM `GroupPrivileges` WHERE `group_id`='" . sql_escape($id) . "'");
+        if (count($group) > 0) {
+          list($group) = $group;
+          sql_query("DELETE FROM `GroupPrivileges` WHERE `group_id`='" . sql_escape($group_id) . "'");
           $privilege_names = [];
           foreach ($_REQUEST['privileges'] as $priv) {
             if (preg_match("/^[0-9]{1,}$/", $priv)) {
               $group_privileges_source = sql_select("SELECT * FROM `Privileges` WHERE `id`='" . sql_escape($priv) . "' LIMIT 1");
               if (count($group_privileges_source) > 0) {
-                sql_query("INSERT INTO `GroupPrivileges` SET `group_id`='" . sql_escape($id) . "', `privilege_id`='" . sql_escape($priv) . "'");
+                sql_query("INSERT INTO `GroupPrivileges` SET `group_id`='" . sql_escape($group_id) . "', `privilege_id`='" . sql_escape($priv) . "'");
                 $privilege_names[] = $group_privileges_source[0]['name'];
               }
             }
           }
-          engelsystem_log("Group privileges of group " . $room['Name'] . " edited: " . join(", ", $privilege_names));
+          engelsystem_log("Group privileges of group " . $group['Name'] . " edited: " . join(", ", $privilege_names));
           redirect(page_link_to("admin_groups"));
         } else {
           return error("No Group found.", true);
-- 
cgit v1.2.3-54-g00ecf