axyr / silverstripe-adminlogin

code/AdminLoginExtension.php

Indentation +15 added lines, -15 removed lines

@@ -10,19 +10,19 @@
 class AdminLoginExtension extends Extension
 {
 
-    /**
-     * Redirect to AdminSecurity, when we are coming from /admin/*
-     *
-     * @return SS_HTTPResponse|void
-     */
-    public function onBeforeSecurityLogin()
-    {
-        $backUrl = $this->owner->getRequest()->getVar('BackURL');
-        if (strstr($backUrl, '/admin/')) {
-            if (Controller::curr()->class != 'AdminSecurity') {
-                $link = 'AdminSecurity/login' . '?BackURL=' . urlencode($backUrl);
-                return $this->owner->redirect($link);
-            }
-        }
-    }
+	/**
+	 * Redirect to AdminSecurity, when we are coming from /admin/*
+	 *
+	 * @return SS_HTTPResponse|void
+	 */
+	public function onBeforeSecurityLogin()
+	{
+		$backUrl = $this->owner->getRequest()->getVar('BackURL');
+		if (strstr($backUrl, '/admin/')) {
+			if (Controller::curr()->class != 'AdminSecurity') {
+				$link = 'AdminSecurity/login' . '?BackURL=' . urlencode($backUrl);
+				return $this->owner->redirect($link);
+			}
+		}
+	}
 }

code/AdminSecurity.php

Indentation +86 added lines, -86 removed lines

@@ -6,101 +6,101 @@
  */
 class AdminSecurity extends Security
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'passwordsent',
-        'ChangePasswordForm'
-    );
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'passwordsent',
+		'ChangePasswordForm'
+	);
 
-    /**
-     * Template thats used to render the pages.
-     *
-     * @config
-     * @var string
-     */
-    private static $template_main = 'AdminLogin';
+	/**
+	 * Template thats used to render the pages.
+	 *
+	 * @config
+	 * @var string
+	 */
+	private static $template_main = 'AdminLogin';
 
-    /**
-     * @return void
-     */
-    public function init()
-    {
-        parent::init();
+	/**
+	 * @return void
+	 */
+	public function init()
+	{
+		parent::init();
 
-        $access = new IpAccess($this->getRequest()->getIP());
-        if (!$access->hasAccess()) {
-            $access->respondNoAccess($this);
-        }
+		$access = new IpAccess($this->getRequest()->getIP());
+		if (!$access->hasAccess()) {
+			$access->respondNoAccess($this);
+		}
 
-        if (Config::inst()->get('AdminLogin', 'UseTheme') !== true) {
-            // this prevents loading frontend css and javscript files
-            Object::useCustomClass('Page_Controller', 'AdminLoginPage_Controller');
-            Requirements::css('adminlogin/css/style.css');
-        }
+		if (Config::inst()->get('AdminLogin', 'UseTheme') !== true) {
+			// this prevents loading frontend css and javscript files
+			Object::useCustomClass('Page_Controller', 'AdminLoginPage_Controller');
+			Requirements::css('adminlogin/css/style.css');
+		}
 
-        Object::useCustomClass('MemberLoginForm', 'AdminLoginForm');
-    }
+		Object::useCustomClass('MemberLoginForm', 'AdminLoginForm');
+	}
 
-    /**
-     * @param null $action
-     * @return string
-     */
-    public function Link($action = null)
-    {
-        return "AdminSecurity/$action";
-    }
+	/**
+	 * @param null $action
+	 * @return string
+	 */
+	public function Link($action = null)
+	{
+		return "AdminSecurity/$action";
+	}
 
-    /**
-     * @return string
-     */
-    public static function isAdminLogin()
-    {
-        return strstr(self::getBackUrl(), '/admin/');
-    }
+	/**
+	 * @return string
+	 */
+	public static function isAdminLogin()
+	{
+		return strstr(self::getBackUrl(), '/admin/');
+	}
 
-    /**
-     * @return string
-     */
-    public static function getBackUrl()
-    {
-        $request = Controller::curr()->getRequest();
-        if ($url = $request->requestVar('BackURL')) {
-            return $url;
-        }
-        return '';
-    }
+	/**
+	 * @return string
+	 */
+	public static function getBackUrl()
+	{
+		$request = Controller::curr()->getRequest();
+		if ($url = $request->requestVar('BackURL')) {
+			return $url;
+		}
+		return '';
+	}
 
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse|HTMLText
-     */
-    public function passwordsent($request)
-    {
-        return parent::passwordsent($request);
-    }
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse|HTMLText
+	 */
+	public function passwordsent($request)
+	{
+		return parent::passwordsent($request);
+	}
 
-    /**
-     * @see Security::getPasswordResetLink()
-     * We overload this, so we can add the BackURL to the password resetlink
-     * @param Member $member
-     * @param string $autologinToken
-     * @return string
-     */
-    public static function getPasswordResetLink($member, $autologinToken)
-    {
-        $autologinToken      = urldecode($autologinToken);
-        $selfControllerClass = __CLASS__;
-        $selfController      = new $selfControllerClass();
-        return $selfController->Link('changepassword') . "?m={$member->ID}&t=$autologinToken";
-    }
+	/**
+	 * @see Security::getPasswordResetLink()
+	 * We overload this, so we can add the BackURL to the password resetlink
+	 * @param Member $member
+	 * @param string $autologinToken
+	 * @return string
+	 */
+	public static function getPasswordResetLink($member, $autologinToken)
+	{
+		$autologinToken      = urldecode($autologinToken);
+		$selfControllerClass = __CLASS__;
+		$selfController      = new $selfControllerClass();
+		return $selfController->Link('changepassword') . "?m={$member->ID}&t=$autologinToken";
+	}
 
-    /**
-     * @return ChangePasswordForm
-     */
-    public function ChangePasswordForm()
-    {
-        return new ChangePasswordForm($this, 'ChangePasswordForm');
-    }
+	/**
+	 * @return ChangePasswordForm
+	 */
+	public function ChangePasswordForm()
+	{
+		return new ChangePasswordForm($this, 'ChangePasswordForm');
+	}
 }

code/LimitAdminAccessExtension.php

Indentation +10 added lines, -10 removed lines

@@ -7,14 +7,14 @@
  */
 class LimitAdminAccessExtension extends Extension
 {
-    /**
-     * @return mixed
-     */
-    public function onBeforeInit()
-    {
-        $access = new IpAccess($this->owner->getRequest()->getIP());
-        if (!$access->hasAccess()) {
-            $access->respondNoAccess($this->owner);
-        }
-    }
+	/**
+	 * @return mixed
+	 */
+	public function onBeforeInit()
+	{
+		$access = new IpAccess($this->owner->getRequest()->getIP());
+		if (!$access->hasAccess()) {
+			$access->respondNoAccess($this->owner);
+		}
+	}
 }

code/AdminLoginForm.php

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
      */
     public function forgotPassword($data)
     {
-        if($data['Email']) {
+        if ($data['Email']) {
             /* @var $member Member */
-            if ($member = Member::get()->where("Email = '".Convert::raw2sql($data['Email'])."'")->first()) {
+            if ($member = Member::get()->where("Email = '" . Convert::raw2sql($data['Email']) . "'")->first()) {
                 $token = $member->generateAutologinTokenAndStoreHash();
                 $this->sendPasswordResetLinkEmail($member, $token);
             }

Indentation +50 added lines, -50 removed lines

@@ -6,67 +6,67 @@
 class AdminLoginForm extends MemberLoginForm
 {
 
-    public function __construct($controller, $name, $fields = null, $actions = null, $checkCurrentUser = true)
-    {
-        parent::__construct($controller, $name, $fields, $actions, $checkCurrentUser);
+	public function __construct($controller, $name, $fields = null, $actions = null, $checkCurrentUser = true)
+	{
+		parent::__construct($controller, $name, $fields, $actions, $checkCurrentUser);
 
-        if ($this->Actions()->fieldByName('forgotPassword')) {
-            // replaceField won't work, since it's a dataless field
-            $this->Actions()->removeByName('forgotPassword');
-            $this->Actions()->push(new LiteralField(
-                'forgotPassword',
-                '<p id="ForgotPassword"><a href="AdminSecurity/lostpassword">'
-                . _t('Member.BUTTONLOSTPASSWORD', "I've lost my password") . '</a></p>'
-            ));
-        }
+		if ($this->Actions()->fieldByName('forgotPassword')) {
+			// replaceField won't work, since it's a dataless field
+			$this->Actions()->removeByName('forgotPassword');
+			$this->Actions()->push(new LiteralField(
+				'forgotPassword',
+				'<p id="ForgotPassword"><a href="AdminSecurity/lostpassword">'
+				. _t('Member.BUTTONLOSTPASSWORD', "I've lost my password") . '</a></p>'
+			));
+		}
 
-        Requirements::customScript(<<<JS
+		Requirements::customScript(<<<JS
 			(function() {
 				var el = document.getElementById("AdminLoginForm_LoginForm_Email");
 				if(el && el.focus) el.focus();
 			})();
 JS
-        );
-    }
+		);
+	}
 
-    /**
-     * @param array $data
-     * @return SS_HTTPResponse
-     */
-    public function forgotPassword($data)
-    {
-        if($data['Email']) {
-            /* @var $member Member */
-            if ($member = Member::get()->where("Email = '".Convert::raw2sql($data['Email'])."'")->first()) {
-                $token = $member->generateAutologinTokenAndStoreHash();
-                $this->sendPasswordResetLinkEmail($member, $token);
-            }
+	/**
+	 * @param array $data
+	 * @return SS_HTTPResponse
+	 */
+	public function forgotPassword($data)
+	{
+		if($data['Email']) {
+			/* @var $member Member */
+			if ($member = Member::get()->where("Email = '".Convert::raw2sql($data['Email'])."'")->first()) {
+				$token = $member->generateAutologinTokenAndStoreHash();
+				$this->sendPasswordResetLinkEmail($member, $token);
+			}
 
-            return $this->controller->redirect('AdminSecurity/passwordsent/' . urlencode($data['Email']));
-        }
+			return $this->controller->redirect('AdminSecurity/passwordsent/' . urlencode($data['Email']));
+		}
 
-        $this->sessionMessage(
-            _t('Member.ENTEREMAIL', 'Please enter an email address to get a password reset link.'),
-            'bad'
-        );
+		$this->sessionMessage(
+			_t('Member.ENTEREMAIL', 'Please enter an email address to get a password reset link.'),
+			'bad'
+		);
 
-        return $this->controller->redirect('AdminSecurity/lostpassword');
-    }
+		return $this->controller->redirect('AdminSecurity/lostpassword');
+	}
 
-    /**
-     * @param Member $member
-     * @param string $token
-     */
-    protected function sendPasswordResetLinkEmail($member, $token)
-    {
-        /* @var $email Member_ForgotPasswordEmail */
-        $email = Member_ForgotPasswordEmail::create();
-        $email->populateTemplate($member);
-        $email->populateTemplate(array(
-            'PasswordResetLink' => AdminSecurity::getPasswordResetLink($member, $token)
-        ));
-        $email->setTo($member->Email);
-        $email->send();
-    }
+	/**
+	 * @param Member $member
+	 * @param string $token
+	 */
+	protected function sendPasswordResetLinkEmail($member, $token)
+	{
+		/* @var $email Member_ForgotPasswordEmail */
+		$email = Member_ForgotPasswordEmail::create();
+		$email->populateTemplate($member);
+		$email->populateTemplate(array(
+			'PasswordResetLink' => AdminSecurity::getPasswordResetLink($member, $token)
+		));
+		$email->setTo($member->Email);
+		$email->send();
+	}
 
 }

code/model/IpAccess.php

Indentation +167 added lines, -167 removed lines

@@ -13,172 +13,172 @@
  */
 class IpAccess extends Object
 {
-    /**
-     * @var array
-     */
-    public $allowedIps = array();
-
-    /**
-     * @config
-     * @var array
-     */
-    private static $allowed_ips = array();
-
-    /**
-     * @var string
-     */
-    private $ip = '';
-
-    /**
-     * IpAccess constructor.
-     *
-     * @param string $ip
-     * @param array $allowedIps
-     */
-    public function __construct($ip = '', $allowedIps = array())
-    {
-        parent::__construct();
-        $this->ip = $ip;
-
-        self::config()->allowed_ips = $allowedIps;
-    }
-
-    /**
-     * @param $ip
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAllowedIps()
-    {
-        if (!empty($this->allowedIps)) {
-            Deprecation::notice('1.1', 'Use the "IpAccess.allowed_ips" config setting instead');
-            self::config()->allowed_ips = $this->allowedIps;
-        }
-        return self::$allowed_ips ? self::$allowed_ips : (array)self::config()->allowed_ips;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return (bool)Config::inst()->get('IpAccess', 'enabled');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasAccess()
-    {
-        if (!$this->isEnabled() || !(bool)$this->getAllowedIps()) {
-            return true;
-        }
-
-        return $this->matchIp();
-    }
-
-    /**
-     * @return bool
-     */
-    public function matchIp()
-    {
-        return ($this->matchExact() || $this->matchRange() || $this->matchCIDR() || $this->matchWildCard());
-    }
-
-    /**
-     * @param Controller $controller
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function respondNoAccess(Controller $controller)
-    {
-        $response = null;
-        if (class_exists('ErrorPage', true)) {
-            $response = ErrorPage::response_for(403);
-        }
-        $controller->httpError(403, $response ? $response : 'The requested page could not be found.');
-    }
-
-    /**
-     * @return string
-     */
-    public function matchExact()
-    {
-        return in_array($this->ip, $this->getAllowedIps()) ? $this->ip : '';
-    }
-
-    /**
-     * Try to match against a ip range
-     * Example : 192.168.1.50-100
-     *
-     * @return string
-     */
-    public function matchRange()
-    {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
-            return strstr($ip, '-');
-        });
-
-        $ip = $this->ip;
-
-        $matches = array_filter($ranges, function ($range) use ($ip) {
-            $ipFirstPart    = substr($ip, 0, strrpos($ip, '.') + 1);
-            $ipLastPart     = substr(strrchr($ip, '.'), 1);
-            $rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
-
-            list ($start, $end) = explode('-', substr(strrchr($range, '.'), 1));
-
-            return $ipFirstPart === $rangeFirstPart && $ipLastPart >= $start && $ipLastPart <= $end;
-        });
-
-        return array_shift($matches);
-    }
-
-    /**
-     * Try to match cidr range
-     * Example : 192.168.1.0/24
-     *
-     * @return string
-     */
-    public function matchCIDR()
-    {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
-            return strstr($ip, '/');
-        });
-
-        if (!empty($ranges)) foreach ($ranges as $range) {
-            list ($net, $mask) = explode('/', $range);
-            if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
-                return $range;
-            }
-        }
-        return '';
-    }
-
-    /**
-     * Try to match against a range that ends with a wildcard *
-     * Example : 192.168.1.*
-     * Example : 192.168.*
-     *
-     * @return string
-     */
-    public function matchWildCard()
-    {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
-            return substr($ip, -1) === '*';
-        });
-
-        if (!empty($ranges)) foreach ($ranges as $range) {
-            if (substr($this->ip, 0, strlen(substr($range, 0, -1))) === substr($range, 0, -1)) {
-                return $range;
-            }
-        }
-        return '';
-    }
+	/**
+	 * @var array
+	 */
+	public $allowedIps = array();
+
+	/**
+	 * @config
+	 * @var array
+	 */
+	private static $allowed_ips = array();
+
+	/**
+	 * @var string
+	 */
+	private $ip = '';
+
+	/**
+	 * IpAccess constructor.
+	 *
+	 * @param string $ip
+	 * @param array $allowedIps
+	 */
+	public function __construct($ip = '', $allowedIps = array())
+	{
+		parent::__construct();
+		$this->ip = $ip;
+
+		self::config()->allowed_ips = $allowedIps;
+	}
+
+	/**
+	 * @param $ip
+	 */
+	public function setIp($ip)
+	{
+		$this->ip = $ip;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAllowedIps()
+	{
+		if (!empty($this->allowedIps)) {
+			Deprecation::notice('1.1', 'Use the "IpAccess.allowed_ips" config setting instead');
+			self::config()->allowed_ips = $this->allowedIps;
+		}
+		return self::$allowed_ips ? self::$allowed_ips : (array)self::config()->allowed_ips;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isEnabled()
+	{
+		return (bool)Config::inst()->get('IpAccess', 'enabled');
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasAccess()
+	{
+		if (!$this->isEnabled() || !(bool)$this->getAllowedIps()) {
+			return true;
+		}
+
+		return $this->matchIp();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function matchIp()
+	{
+		return ($this->matchExact() || $this->matchRange() || $this->matchCIDR() || $this->matchWildCard());
+	}
+
+	/**
+	 * @param Controller $controller
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function respondNoAccess(Controller $controller)
+	{
+		$response = null;
+		if (class_exists('ErrorPage', true)) {
+			$response = ErrorPage::response_for(403);
+		}
+		$controller->httpError(403, $response ? $response : 'The requested page could not be found.');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function matchExact()
+	{
+		return in_array($this->ip, $this->getAllowedIps()) ? $this->ip : '';
+	}
+
+	/**
+	 * Try to match against a ip range
+	 * Example : 192.168.1.50-100
+	 *
+	 * @return string
+	 */
+	public function matchRange()
+	{
+		$ranges = array_filter($this->getAllowedIps(), function ($ip) {
+			return strstr($ip, '-');
+		});
+
+		$ip = $this->ip;
+
+		$matches = array_filter($ranges, function ($range) use ($ip) {
+			$ipFirstPart    = substr($ip, 0, strrpos($ip, '.') + 1);
+			$ipLastPart     = substr(strrchr($ip, '.'), 1);
+			$rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
+
+			list ($start, $end) = explode('-', substr(strrchr($range, '.'), 1));
+
+			return $ipFirstPart === $rangeFirstPart && $ipLastPart >= $start && $ipLastPart <= $end;
+		});
+
+		return array_shift($matches);
+	}
+
+	/**
+	 * Try to match cidr range
+	 * Example : 192.168.1.0/24
+	 *
+	 * @return string
+	 */
+	public function matchCIDR()
+	{
+		$ranges = array_filter($this->getAllowedIps(), function ($ip) {
+			return strstr($ip, '/');
+		});
+
+		if (!empty($ranges)) foreach ($ranges as $range) {
+			list ($net, $mask) = explode('/', $range);
+			if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
+				return $range;
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * Try to match against a range that ends with a wildcard *
+	 * Example : 192.168.1.*
+	 * Example : 192.168.*
+	 *
+	 * @return string
+	 */
+	public function matchWildCard()
+	{
+		$ranges = array_filter($this->getAllowedIps(), function ($ip) {
+			return substr($ip, -1) === '*';
+		});
+
+		if (!empty($ranges)) foreach ($ranges as $range) {
+			if (substr($this->ip, 0, strlen(substr($range, 0, -1))) === substr($range, 0, -1)) {
+				return $range;
+			}
+		}
+		return '';
+	}
 
 }

Spacing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
             Deprecation::notice('1.1', 'Use the "IpAccess.allowed_ips" config setting instead');
             self::config()->allowed_ips = $this->allowedIps;
         }
-        return self::$allowed_ips ? self::$allowed_ips : (array)self::config()->allowed_ips;
+        return self::$allowed_ips ? self::$allowed_ips : (array) self::config()->allowed_ips;
     }
 
     /**
@@ -68,7 +68,7 @@ 
      */
     public function isEnabled()
     {
-        return (bool)Config::inst()->get('IpAccess', 'enabled');
+        return (bool) Config::inst()->get('IpAccess', 'enabled');
     }
 
     /**
@@ -76,7 +76,7 @@ 
      */
     public function hasAccess()
     {
-        if (!$this->isEnabled() || !(bool)$this->getAllowedIps()) {
+        if (!$this->isEnabled() || !(bool) $this->getAllowedIps()) {
             return true;
         }
 
@@ -120,13 +120,13 @@ 
      */
     public function matchRange()
     {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
             return strstr($ip, '-');
         });
 
         $ip = $this->ip;
 
-        $matches = array_filter($ranges, function ($range) use ($ip) {
+        $matches = array_filter($ranges, function($range) use ($ip) {
             $ipFirstPart    = substr($ip, 0, strrpos($ip, '.') + 1);
             $ipLastPart     = substr(strrchr($ip, '.'), 1);
             $rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
@@ -147,7 +147,7 @@ 
      */
     public function matchCIDR()
     {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
             return strstr($ip, '/');
         });
 
@@ -169,7 +169,7 @@ 
      */
     public function matchWildCard()
     {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
             return substr($ip, -1) === '*';
         });
 

Braces +6 added lines, -2 removed lines

@@ -151,8 +151,10 @@ 
             return strstr($ip, '/');
         });
 
-        if (!empty($ranges)) foreach ($ranges as $range) {
+        if (!empty($ranges)) {
+        	foreach ($ranges as $range) {
             list ($net, $mask) = explode('/', $range);
+        }
             if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
                 return $range;
             }
@@ -173,9 +175,11 @@ 
             return substr($ip, -1) === '*';
         });
 
-        if (!empty($ranges)) foreach ($ranges as $range) {
+        if (!empty($ranges)) {
+        	foreach ($ranges as $range) {
             if (substr($this->ip, 0, strlen(substr($range, 0, -1))) === substr($range, 0, -1)) {
                 return $range;
+        }
             }
         }
         return '';