Completed
Pull Request — master (#12)
by Martijn van
02:33
created
code/AdminLoginForm.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
             $this->Actions()->push(new LiteralField(
16 16
                 'forgotPassword',
17 17
                 '<p id="ForgotPassword"><a href="AdminSecurity/lostpassword">'
18
-                ._t('Member.BUTTONLOSTPASSWORD', "I've lost my password").'</a></p>'
18
+                ._t('Member.BUTTONLOSTPASSWORD', "I've lost my password") . '</a></p>'
19 19
             ));
20 20
         }
21 21
 
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
     {
38 38
         if ($data['Email']) {
39 39
             /* @var $member Member */
40
-            if ($member = Member::get()->where("Email = '".Convert::raw2sql($data['Email'])."'")->first()) {
40
+            if ($member = Member::get()->where("Email = '" . Convert::raw2sql($data['Email']) . "'")->first()) {
41 41
                 $token = $member->generateAutologinTokenAndStoreHash();
42 42
                 $this->sendPasswordResetLinkEmail($member, $token);
43 43
             }
44 44
 
45
-            return $this->controller->redirect('AdminSecurity/passwordsent/'.urlencode($data['Email']));
45
+            return $this->controller->redirect('AdminSecurity/passwordsent/' . urlencode($data['Email']));
46 46
         }
47 47
 
48 48
         $this->sessionMessage(
Please login to merge, or discard this patch.
code/AdminSecurity.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
         $selfControllerClass = __CLASS__;
101 101
         $selfController = new $selfControllerClass();
102 102
 
103
-        return $selfController->Link('changepassword')."?m={$member->ID}&t=$autologinToken";
103
+        return $selfController->Link('changepassword') . "?m={$member->ID}&t=$autologinToken";
104 104
     }
105 105
 
106 106
     /**
Please login to merge, or discard this patch.
code/AdminLoginExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
         $backUrl = $this->owner->getRequest()->getVar('BackURL');
20 20
         if (strstr($backUrl, '/admin/')) {
21 21
             if (Controller::curr()->class != 'AdminSecurity') {
22
-                $link = 'AdminSecurity/login'.'?BackURL='.urlencode($backUrl);
22
+                $link = 'AdminSecurity/login' . '?BackURL=' . urlencode($backUrl);
23 23
 
24 24
                 return $this->owner->redirect($link);
25 25
             }
Please login to merge, or discard this patch.
code/model/IpAccess.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -124,13 +124,13 @@  discard block
 block discarded – undo
124 124
      */
125 125
     public function matchRange()
126 126
     {
127
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
127
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
128 128
             return strstr($ip, '-');
129 129
         });
130 130
 
131 131
         $ip = $this->ip;
132 132
 
133
-        $matches = array_filter($ranges, function ($range) use ($ip) {
133
+        $matches = array_filter($ranges, function($range) use ($ip) {
134 134
             $ipFirstPart = substr($ip, 0, strrpos($ip, '.') + 1);
135 135
             $ipLastPart = substr(strrchr($ip, '.'), 1);
136 136
             $rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
      */
152 152
     public function matchCIDR()
153 153
     {
154
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
154
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
155 155
             return strstr($ip, '/');
156 156
         });
157 157
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
      */
177 177
     public function matchWildCard()
178 178
     {
179
-        $ranges = array_filter($this->getAllowedIps(), function ($ip) {
179
+        $ranges = array_filter($this->getAllowedIps(), function($ip) {
180 180
             return substr($ip, -1) === '*';
181 181
         });
182 182
 
Please login to merge, or discard this patch.