1 files changed, 0 insertions, 78 deletions
diff --git a/app/Model/User.php b/app/Model/User.php
index d0e33fd0..5f6b8a3a 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -312,84 +312,6 @@ class User extends Base
     }
 
     /**
-     * Validate user login
-     *
-     * @access public
-     * @param  array   $values           Form values
-     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
-     */
-    public function validateLogin(array $values)
-    {
-        $v = new Validator($values, array(
-            new Validators\Required('username', t('The username is required')),
-            new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50),
-            new Validators\Required('password', t('The password is required')),
-        ));
-
-        $result = $v->execute();
-        $errors = $v->getErrors();
-
-        if ($result) {
-
-            list($authenticated, $method) = $this->authenticate($values['username'], $values['password']);
-
-            if ($authenticated === true) {
-
-                // Create the user session
-                $user = $this->getByUsername($values['username']);
-                $this->updateSession($user);
-
-                // Update login history
-                $this->lastLogin->create(
-                    $method,
-                    $user['id'],
-                    $this->getIpAddress(),
-                    $this->getUserAgent()
-                );
-
-                // Setup the remember me feature
-                if (! empty($values['remember_me'])) {
-                    $credentials = $this->rememberMe->create($user['id'], $this->getIpAddress(), $this->getUserAgent());
-                    $this->rememberMe->writeCookie($credentials['token'], $credentials['sequence'], $credentials['expiration']);
-                }
-            }
-            else {
-                $result = false;
-                $errors['login'] = t('Bad username or password');
-            }
-        }
-
-        return array(
-            $result,
-            $errors
-        );
-    }
-
-    /**
-     * Authenticate a user
-     *
-     * @access public
-     * @param  string  $username  Username
-     * @param  string  $password  Password
-     * @return array
-     */
-    public function authenticate($username, $password)
-    {
-        // Database authentication
-        $user = $this->db->table(self::TABLE)->eq('username', $username)->eq('is_ldap_user', 0)->findOne();
-        $authenticated = $user && \password_verify($password, $user['password']);
-        $method = LastLogin::AUTH_DATABASE;
-
-        // LDAP authentication
-        if (! $authenticated && LDAP_AUTH) {
-            $authenticated = $this->ldap->authenticate($username, $password);
-            $method = LastLogin::AUTH_LDAP;
-        }
-
-        return array($authenticated, $method);
-    }
-
-    /**
      * Get the user agent of the connected user
      *
      * @access public