axyr / silverstripe-adminlogin

code/AdminLogin.php

Doc Comments +4 added lines

@@ -69,6 +69,9 @@ 
 		return strstr(self::getBackUrl(), '/admin/');
 	}
 	
+	/**
+	 * @return string
+	 */
 	public static function getBackUrl() {
 		if(isset($_REQUEST['BackURL'])) {
 			return $_REQUEST['BackURL'];
@@ -84,6 +87,7 @@ 
 	/**
 	 * @see Security::getPasswordResetLink()
 	 * We overload this, so we can add the BackURL to the password resetlink
+	 * @param DataObject $member
 	 */
 	public static function getPasswordResetLink($member, $autologinToken) {
 		$autologinToken = urldecode($autologinToken);		

Spacing +10 added lines, -10 removed lines

@@ -8,8 +8,8 @@ 
 	
 	// redirect to AdminSecurity, when we are coming from /admin/*
 	function onBeforeSecurityLogin() {
-		if(isset($_GET['BackURL']) && strstr($_GET['BackURL'], '/admin/')) {
-			if(Controller::curr()->class != 'AdminSecurity') {
+		if (isset($_GET['BackURL']) && strstr($_GET['BackURL'], '/admin/')) {
+			if (Controller::curr()->class != 'AdminSecurity') {
 				$link = 'AdminSecurity/login' . '?BackURL=' . urlencode($_GET['BackURL']);
 				return $this->owner->redirect($link);
 			}
@@ -41,24 +41,24 @@ 
 	public function init() {
 		parent::init();
 		
-		if(Config::inst()->get('IpAccess', 'enabled')) {
+		if (Config::inst()->get('IpAccess', 'enabled')) {
 			$ipAccess = new IpAccess($this->owner->getRequest()->getIP(), Config::inst()->get('IpAccess', 'allowed_ips'));
-			if(!$ipAccess->hasAccess()) {
+			if (!$ipAccess->hasAccess()) {
 				$reponse = '';
-				if(class_exists('ErrorPage', true)) {
+				if (class_exists('ErrorPage', true)) {
 					$response = ErrorPage::response_for(404);
 				}
 				return $this->owner->httpError(404, $response ? $response : 'The requested page could not be found.');
 			}
 		}
 		
-		if(Config::inst()->get('AdminLogin', 'UseTheme') !== true) {
+		if (Config::inst()->get('AdminLogin', 'UseTheme') !== true) {
 			// this prevents loading frontend css and javscript files
-			Object::useCustomClass('Page_Controller','AdminLoginPage_Controller');
+			Object::useCustomClass('Page_Controller', 'AdminLoginPage_Controller');
 			Requirements::css('adminlogin/css/style.css');
 		}
 
-		Object::useCustomClass('MemberLoginForm','AdminLoginForm');
+		Object::useCustomClass('MemberLoginForm', 'AdminLoginForm');
 	}
 	
 	public function Link($action = null) {
@@ -70,9 +70,9 @@ 
 	}
 	
 	public static function getBackUrl() {
-		if(isset($_REQUEST['BackURL'])) {
+		if (isset($_REQUEST['BackURL'])) {
 			return $_REQUEST['BackURL'];
-		}elseif(isset($_SESSION['BackURL'])) {
+		}elseif (isset($_SESSION['BackURL'])) {
 			return $_SESSION['BackURL'];
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	public static function getBackUrl() {
 		if(isset($_REQUEST['BackURL'])) {
 			return $_REQUEST['BackURL'];
-		}elseif(isset($_SESSION['BackURL'])) {
+		} elseif(isset($_SESSION['BackURL'])) {
 			return $_SESSION['BackURL'];
 		}
 	}

code/model/IpAccess.php

Spacing +25 added lines, -25 removed lines

@@ -13,35 +13,35 @@ 
  */
 class IpAccess {
 	
-	public $allowedIps	= array();
+	public $allowedIps = array();
 	
-	private $ip			= '';
+	private $ip = '';
 	
 	public function __construct($ip = '', $allowedIps = array()) {
-		$this->ip			= $ip;
-		$this->allowedIps	= $allowedIps;
+		$this->ip = $ip;
+		$this->allowedIps = $allowedIps;
 	}
 	
 	public function setIp($ip) {
-		$this->ip			= $ip;
+		$this->ip = $ip;
 	}
 	
 	public function hasAccess() {
-		if(!$this->allowedIps) {
+		if (!$this->allowedIps) {
 			return 'allowed';
-		}elseif($match = $this->matchExact()){
+		}elseif ($match = $this->matchExact()) {
 			return $match;
-		}elseif($match = $this->matchRange()){
+		}elseif ($match = $this->matchRange()) {
 			return $match;
-		}elseif($match = $this->matchCIDR()){
+		}elseif ($match = $this->matchCIDR()) {
 			return $match;
-		}elseif($match = $this->matchWildCard()){
+		}elseif ($match = $this->matchWildCard()) {
 			return $match;
 		}
 	}
 	
 	public function matchExact() {
-		if(in_array($this->ip, $this->allowedIps)) {
+		if (in_array($this->ip, $this->allowedIps)) {
 			return $this->ip;
 		}
 	}
@@ -51,13 +51,13 @@ 
 	 * Example : 192.168.1.50-100
 	 */
 	public function matchRange() {
-		if($ranges = array_filter($this->allowedIps, function($ip) { return strstr($ip, '-'); })) {
-			foreach($ranges as $range) {
-				$first = substr($range, 0, strrpos($range ,'.') + 1);
-				$last = substr(strrchr($range,'.'), 1);
-				list ($start, $end) = explode('-',$last);
-				for($i = $start; $i <= $end; $i++) {
-					if($this->ip === $first . $i) {
+		if ($ranges = array_filter($this->allowedIps, function($ip) { return strstr($ip, '-'); })) {
+			foreach ($ranges as $range) {
+				$first = substr($range, 0, strrpos($range, '.') + 1);
+				$last = substr(strrchr($range, '.'), 1);
+				list ($start, $end) = explode('-', $last);
+				for ($i = $start; $i <= $end; $i++) {
+					if ($this->ip === $first . $i) {
 						return $range;
 					}
 				}
@@ -70,10 +70,10 @@ 
 	 * Example : 192.168.1.0/24
 	 */
 	public function matchCIDR() {
-		if($ranges = array_filter($this->allowedIps, function($ip) { return strstr($ip, '/'); })) {
-			foreach($ranges as $cidr) {
-				list ($net, $mask) = explode ('/', $cidr);
-				if(( ip2long ($this->ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($net)) {
+		if ($ranges = array_filter($this->allowedIps, function($ip) { return strstr($ip, '/'); })) {
+			foreach ($ranges as $cidr) {
+				list ($net, $mask) = explode('/', $cidr);
+				if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
 					return $cidr;
 				}
 			}
@@ -86,9 +86,9 @@ 
 	 * Example : 192.168.*
 	 */
 	public function matchWildCard() {
-		if($ranges = array_filter($this->allowedIps, function($ip) { return substr($ip, -1) === '*'; })) {
-			foreach($ranges as $range) {
-				if(substr($this->ip, 0, strlen(substr($range, 0, -1))) === substr($range, 0, -1)) {
+		if ($ranges = array_filter($this->allowedIps, function($ip) { return substr($ip, -1) === '*'; })) {
+			foreach ($ranges as $range) {
+				if (substr($this->ip, 0, strlen(substr($range, 0, -1))) === substr($range, 0, -1)) {
 					return $range;
 				}
 			}

Braces +4 added lines, -4 removed lines

@@ -29,13 +29,13 @@
 	public function hasAccess() {
 		if(!$this->allowedIps) {
 			return 'allowed';
-		}elseif($match = $this->matchExact()){
+		} elseif($match = $this->matchExact()){
 			return $match;
-		}elseif($match = $this->matchRange()){
+		} elseif($match = $this->matchRange()){
 			return $match;
-		}elseif($match = $this->matchCIDR()){
+		} elseif($match = $this->matchCIDR()){
 			return $match;
-		}elseif($match = $this->matchWildCard()){
+		} elseif($match = $this->matchWildCard()){
 			return $match;
 		}
 	}

code/AdminLoginForm.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 		parent::__construct($controller, $name, $fields, $actions, $checkCurrentUser);
 		
 		
-		if($field = $this->Actions()->fieldByName('forgotPassword')) {
+		if ($field = $this->Actions()->fieldByName('forgotPassword')) {
 			// replaceField won't work, since it's a dataless field
 			$this->Actions()->removeByName('forgotPassword');
 			$this->Actions()->push(new LiteralField(
@@ -36,11 +36,11 @@ 
 		$member = DataObject::get_one('Member', "\"Email\" = '{$SQL_email}'");
 		
 		$backUrlString = '';
-		if(isset($data['BackURL']) && $backURL = $data['BackURL']) {
+		if (isset($data['BackURL']) && $backURL = $data['BackURL']) {
 			$backUrlString = '?BackURL=' . $backURL;
 		}
 		
-		if($member) {
+		if ($member) {
 			$token = $member->generateAutologinTokenAndStoreHash();
 
 			$e = Member_ForgotPasswordEmail::create();
@@ -52,7 +52,7 @@ 
 			$e->send();
 
 			$this->controller->redirect('AdminSecurity/passwordsent/' . urlencode($data['Email']));
-		} elseif($data['Email']) {
+		} elseif ($data['Email']) {
 			// Avoid information disclosure by displaying the same status,
 			// regardless wether the email address actually exists
 			$this->controller->redirect('AdminSecurity/passwordsent/' . urlencode($data['Email']));

code/LimitAdminAccessExtension.php

Spacing +3 added lines, -3 removed lines

@@ -3,11 +3,11 @@
 class LimitAdminAccessExtension extends Extension {
 	
 	function onBeforeInit() {
-		if(Config::inst()->get('IpAccess', 'enabled')) {
+		if (Config::inst()->get('IpAccess', 'enabled')) {
 			$ipAccess = new IpAccess($this->owner->getRequest()->getIP(), Config::inst()->get('IpAccess', 'allowed_ips'));
 				
-			if(!$ipAccess->hasAccess()) {
-				if(class_exists('ErrorPage', true)) {
+			if (!$ipAccess->hasAccess()) {
+				if (class_exists('ErrorPage', true)) {
 					$response = ErrorPage::response_for(403);
 				}