Move methods getIpAddress() and getUserAgent() to the Request class

2 files changed, 2 insertions, 57 deletions

diff --git a/app/Model/Authentication.php b/app/Model/Authentication.php
index 6efc5687..b9ebcfe2 100644
--- a/app/Model/Authentication.php
+++ b/app/Model/Authentication.php
@@ -2,6 +2,7 @@
 
 namespace Model;
 
+use Core\Request;
 use Auth\Database;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
@@ -117,7 +118,7 @@ class Authentication extends Base
                 if (! empty($values['remember_me'])) {
 
                     $credentials = $this->backend('rememberMe')
-                                        ->create($this->acl->getUserId(), $this->user->getIpAddress(), $this->user->getUserAgent());
+                                        ->create($this->acl->getUserId(), Request::getIpAddress(), Request::getUserAgent());
 
                     $this->backend('rememberMe')->writeCookie($credentials['token'], $credentials['sequence'], $credentials['expiration']);
                 }
diff --git a/app/Model/User.php b/app/Model/User.php
index 8add9722..b54f6309 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -370,60 +370,4 @@ class User extends Base
 
         return array(false, $v->getErrors());
     }
-
-    /**
-     * Get the user agent of the connected user
-     *
-     * @access public
-     * @return string
-     */
-    public function getUserAgent()
-    {
-        return empty($_SERVER['HTTP_USER_AGENT']) ? t('Unknown') : $_SERVER['HTTP_USER_AGENT'];
-    }
-
-    /**
-     * Get the real IP address of the connected user
-     *
-     * @access public
-     * @param  bool    $only_public   Return only public IP address
-     * @return string
-     */
-    public function getIpAddress($only_public = false)
-    {
-        $keys = array(
-            'HTTP_CLIENT_IP',
-            'HTTP_X_FORWARDED_FOR',
-            'HTTP_X_FORWARDED',
-            'HTTP_X_CLUSTER_CLIENT_IP',
-            'HTTP_FORWARDED_FOR',
-            'HTTP_FORWARDED',
-            'REMOTE_ADDR'
-        );
-
-        foreach ($keys as $key) {
-
-            if (isset($_SERVER[$key])) {
-
-                foreach (explode(',', $_SERVER[$key]) as $ip_address) {
-
-                    $ip_address = trim($ip_address);
-
-                    if ($only_public) {
-
-                        // Return only public IP address
-                        if (filter_var($ip_address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false) {
-                            return $ip_address;
-                        }
-                    }
-                    else {
-
-                        return $ip_address;
-                    }
-                }
-            }
-        }
-
-        return t('Unknown');
-    }
 }