From 3a1e4602492cec1c8f3d2aabab2c866022f43bf1 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 18 Jul 2017 21:38:53 +0200
Subject: Changed $_GET, $_POST and $_REQUEST to use the Request object

---
 includes/pages/admin_groups.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

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

diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php
index 4011ccf1..c483a79d 100644
--- a/includes/pages/admin_groups.php
+++ b/includes/pages/admin_groups.php
@@ -16,8 +16,10 @@ function admin_groups_title()
 function admin_groups()
 {
     $html = '';
+    $request = request();
     $groups = DB::select('SELECT * FROM `Groups` ORDER BY `Name`');
-    if (!isset($_REQUEST['action'])) {
+
+    if (!$request->has('action')) {
         $groups_table = [];
         foreach ($groups as $group) {
             $privileges = DB::select('
@@ -51,10 +53,10 @@ function admin_groups()
             ], $groups_table)
         ]);
     } else {
-        switch ($_REQUEST['action']) {
+        switch ($request->input('action')) {
             case 'edit':
-                if (isset($_REQUEST['id']) && preg_match('/^-\d{1,11}$/', $_REQUEST['id'])) {
-                    $group_id = $_REQUEST['id'];
+                if ($request->has('id') && preg_match('/^-\d{1,11}$/', $request->input('id'))) {
+                    $group_id = $request->input('id');
                 } else {
                     return error('Incomplete call, missing Groups ID.', true);
                 }
@@ -99,21 +101,22 @@ function admin_groups()
                 break;
 
             case 'save':
-                if (isset($_REQUEST['id']) && preg_match('/^-\d{1,11}$/', $_REQUEST['id'])) {
-                    $group_id = $_REQUEST['id'];
+                if ($request->has('id') && preg_match('/^-\d{1,11}$/', $request->input('id'))) {
+                    $group_id = $request->input('id');
                 } else {
                     return error('Incomplete call, missing Groups ID.', true);
                 }
 
                 $group = DB::select('SELECT * FROM `Groups` WHERE `UID`=? LIMIT 1', [$group_id]);
-                if (!is_array($_REQUEST['privileges'])) {
-                    $_REQUEST['privileges'] = [];
+                $privileges = $request->get('privileges');
+                if (!is_array($privileges)) {
+                    $privileges = [];
                 }
                 if (!empty($group)) {
                     $group = array_shift($group);
                     DB::delete('DELETE FROM `GroupPrivileges` WHERE `group_id`=?', [$group_id]);
                     $privilege_names = [];
-                    foreach ($_REQUEST['privileges'] as $privilege) {
+                    foreach ($privileges as $privilege) {
                         if (preg_match('/^\d{1,}$/', $privilege)) {
                             $group_privileges_source = DB::select(
                                 'SELECT `name` FROM `Privileges` WHERE `id`=? LIMIT 1',
-- 
cgit v1.2.3-54-g00ecf