[Improved] Try redirects both with and without the query string

nystudio107 · Sep 1, 2016 · 48e0c47 · 48e0c47
1 parent 3a15e37
commit 48e0c47
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/RetourPlugin.php b/RetourPlugin.php
@@ -36,10 +36,11 @@ public function init()
 /* -- See if we should redirect */
 
                     $url = urldecode(craft()->request->getRequestUri());
-                    $url = UrlHelper::stripQueryString($url);
-                    $redirect = craft()->retour->findRedirectMatch($url);
+                    $noQueryUrl = UrlHelper::stripQueryString($url);
+
+/* -- Redirect if we find a match, otherwise let Craft handle it */
 
-/* -- Redirect if we found a match, otherwise let Craft handle it */
+                    $redirect = craft()->retour->findRedirectMatch($url);
 
                     if (isset($redirect))
                     {
@@ -49,7 +50,22 @@ public function init()
                         craft()->request->redirect($redirect['redirectDestUrl'], true, $redirect['redirectHttpCode']);
                     }
                     else
-                        craft()->retour->incrementStatistics($url, false);
+                    {
+
+/* -- Now try it without the query string, too, otherwise let Craft handle it */
+
+                        $redirect = craft()->retour->findRedirectMatch($noQueryUrl);
+
+                        if (isset($redirect))
+                        {
+                            craft()->retour->incrementStatistics($url, true);
+                            $event->handled = true;
+                            RetourPlugin::log("Redirecting " . $url . " to " . $redirect['redirectDestUrl'], LogLevel::Info, false);
+                            craft()->request->redirect($redirect['redirectDestUrl'], true, $redirect['redirectHttpCode']);
+                        }
+                        else
+                            craft()->retour->incrementStatistics($url, false);
+                    }
                 }
             }
         };