Merge pull request #328 from MyIgel/master

Changed $_GET, $_POST and $_REQUEST to use the Request object

1 files changed, 7 insertions, 5 deletions

diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php
index 77155dae..ebeccb8c 100644
--- a/includes/pages/admin_arrive.php
+++ b/includes/pages/admin_arrive.php
@@ -17,12 +17,14 @@ function admin_arrive()
 {
     $msg = '';
     $search = '';
-    if (isset($_REQUEST['search'])) {
+    $request = request();
+
+    if ($request->has('search')) {
         $search = strip_request_item('search');
     }
 
-    if (isset($_REQUEST['reset']) && preg_match('/^\d*$/', $_REQUEST['reset'])) {
-        $user_id = $_REQUEST['reset'];
+    if ($request->has('reset') && preg_match('/^\d*$/', $request->input('reset'))) {
+        $user_id = $request->input('reset');
         $user_source = User($user_id);
         if ($user_source != null) {
             DB::update('
@@ -37,8 +39,8 @@ function admin_arrive()
         } else {
             $msg = error(_('Angel not found.'), true);
         }
-    } elseif (isset($_REQUEST['arrived']) && preg_match('/^\d*$/', $_REQUEST['arrived'])) {
-        $user_id = $_REQUEST['arrived'];
+    } elseif ($request->has('arrived') && preg_match('/^\d*$/', $request->input('arrived'))) {
+        $user_id = $request->input('arrived');
         $user_source = User($user_id);
         if ($user_source != null) {
             DB::update('