Inject Alertify only if Response has a body, don't have a meta refre…

…sh and is not a RedirectResponse (#51) Inject Alertify only if Response has a body, don't have a meta refresh and is not a RedirectResponse
Troopers · Oct 28, 2016 · 9f8942d · 9f8942d
1 parent 79f047a
commit 9f8942d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/EventListener/AlertifyListener.php b/EventListener/AlertifyListener.php
@@ -63,11 +63,14 @@ protected function injectAlertify(Response $response, Request $request)
         }
 
         $content = $response->getContent();
-        $pos = strripos($content, '</body>');
+        $endBodyPos = strripos($content, '</body>');
+        $hasBody = false !== $endBodyPos;
+        $hasMetaRefresh = false !== strripos($content, 'http-equiv="refresh"');
+        $isRedirectResponse = $response instanceof RedirectResponse;
 
-        if (false !== $pos) {
+        if ($hasBody && !$hasMetaRefresh && !$isRedirectResponse) {
             $alertify = $this->alertifySessionHandler->handle($this->session);
-            $content = substr($content, 0, $pos).$alertify.substr($content, $pos);
+            $content = substr($content, 0, $endBodyPos).$alertify.substr($content, $endBodyPos);
             $response->setContent($content);
         }
     }