axyr / silverstripe-adminlogin

code/model/IpAccess.php

Indentation +157 added lines, -157 removed lines

@@ -13,162 +13,162 @@
  */
 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 (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() || empty($this->getAllowedIps())) {
-            return true;
-        }
-
-        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, '-');
-        });
-
-        $ipFirstPart = substr($this->ip, 0, strrpos($this->ip, '.') + 1);
-        $ipLastpart  = substr(strrchr($this->ip, '.'), 1);
-
-        if (!empty($ranges)) foreach ($ranges as $range) {
-            $rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
-            list ($start, $end) = explode('-', substr(strrchr($range, '.'), 1));
-            if ($ipFirstPart === $rangeFirstPart && $ipLastpart >= $start && $ipLastpart <= $end) {
-                return $range;
-            }
-        }
-        return '';
-    }
-
-    /**
-     * 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('/', $cidr);
-            if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
-                return $cidr;
-            }
-        }
-        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 (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() || empty($this->getAllowedIps())) {
+			return true;
+		}
+
+		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, '-');
+		});
+
+		$ipFirstPart = substr($this->ip, 0, strrpos($this->ip, '.') + 1);
+		$ipLastpart  = substr(strrchr($this->ip, '.'), 1);
+
+		if (!empty($ranges)) foreach ($ranges as $range) {
+			$rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
+			list ($start, $end) = explode('-', substr(strrchr($range, '.'), 1));
+			if ($ipFirstPart === $rangeFirstPart && $ipLastpart >= $start && $ipLastpart <= $end) {
+				return $range;
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * 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('/', $cidr);
+			if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
+				return $cidr;
+			}
+		}
+		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 +5 added lines, -5 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 (array)self::config()->allowed_ips;
+        return (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');
     }
 
     /**
@@ -112,7 +112,7 @@ 
      */
     public function matchRange()
     {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
             return strstr($ip, '-');
         });
 
@@ -137,7 +137,7 @@ 
      */
     public function matchCIDR()
     {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
             return strstr($ip, '/');
         });
 
@@ -159,7 +159,7 @@ 
      */
     public function matchWildCard()
     {
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
             return substr($ip, -1) === '*';
         });
 

Braces +9 added lines, -3 removed lines

@@ -119,8 +119,10 @@ 
         $ipFirstPart = substr($this->ip, 0, strrpos($this->ip, '.') + 1);
         $ipLastpart  = substr(strrchr($this->ip, '.'), 1);
 
-        if (!empty($ranges)) foreach ($ranges as $range) {
+        if (!empty($ranges)) {
+        	foreach ($ranges as $range) {
             $rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
+        }
             list ($start, $end) = explode('-', substr(strrchr($range, '.'), 1));
             if ($ipFirstPart === $rangeFirstPart && $ipLastpart >= $start && $ipLastpart <= $end) {
                 return $range;
@@ -141,8 +143,10 @@ 
             return strstr($ip, '/');
         });
 
-        if (!empty($ranges)) foreach ($ranges as $range) {
+        if (!empty($ranges)) {
+        	foreach ($ranges as $range) {
             list ($net, $mask) = explode('/', $cidr);
+        }
             if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
                 return $cidr;
             }
@@ -163,9 +167,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 '';

code/AdminLoginForm.php

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();
+	}
 
 }