axyr / silverstripe-adminlogin

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

code/model/IpAccess.php

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 '';