Patrol 1.4.2

- Adds login  (`/{cpTrigger}/login`) redirect when using `limitCpAccessTo` ( Issue #19 ) 
- Fixes issue #21 where `authorizedIps` was not handled correctly in some cases

Author: selvinortiz

PatrolPlugin.php

@@ -7,7 +7,7 @@
  * Patrol simplifies maintenance and SSL for sites built with Craft
  *
  * @author   Selvin Ortiz <selvin@selvin.co>
- * @version  1.4.1
+ * @version  1.4.2
  * @package  Craft
  * @category Security
  * @since    Craft 1.3
@@ -68,7 +68,7 @@ public function getName($real = false)
      */
     public function getVersion()
     {
-        return '1.4.1';
+        return '1.4.2';
     }
 
     /**

releases.json

@@ -1,4 +1,13 @@
 [
+  {
+    "version": "1.4.2",
+    "downloadUrl": "https://github.com/selvinortiz/craft.patrol/archive/v1.4.2.zip",
+    "date": "2017-01-11T13:13:00-06:00",
+    "notes": [
+      "[Added] Added login (`/{cpTrigger}/login`) redirect when using `limitCpAccessTo`",
+      "[Fixed] Fixed issue where `authorizedIps` was not properly handled in some cases"
+    ]
+  },
   {
     "version": "1.4.1",
     "downloadUrl": "https://github.com/selvinortiz/craft.patrol/archive/v1.4.1.zip",

services/PatrolService.php

@@ -145,8 +145,14 @@ protected function enforceMaintenanceRules()
 
         if ($isCpRequest && is_array($limitCpAccessTo) && count($limitCpAccessTo) && ! $isCpLoginPage)
         {
-            if (craft()->userSession->isLoggedIn())
+            // Redirect to login page
+            if (! craft()->userSession->isLoggedIn())
             {
+                craft()->request->redirect(sprintf('/%s/login', craft()->config->get('cpTrigger')));
+            }
+            else
+            {
+                // Verify
                 $user = craft()->userSession->getUser();
 
                 if (in_array($user->email, $limitCpAccessTo) || in_array($user->username, $limitCpAccessTo))
@@ -250,11 +256,9 @@ protected function getDynamicParams()
      */
     public function parseAuthorizedIps($ips)
     {
-        $ips = trim($ips);
-
-        if (is_string($ips) && ! empty($ips))
+        if (is_string($ips))
         {
-            $ips = explode(PHP_EOL, $ips);
+            $ips = explode(PHP_EOL, trim($ips));
         }
 
         return $this->filterOutArrayValues(