Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/config/main.php

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/config/main.php
alex
2 parents 2f4c5619 9315e305
Showing 3 changed files with 61 additions and 15 deletions Show diff stats
common/models/SlashRedirect.php
frontend/components/UrlManager.php
frontend/config/main.php
+<?php
+    
+    namespace common\models;
+    
+    use artbox\core\models\interfaces\RedirectInterface;
+    use yii\base\BaseObject;
+    
+    class SlashRedirect extends BaseObject implements RedirectInterface
+    {
+        /**
+         * @var string
+         */
+        protected $link;
+        
+        /**
+         * @param string $url
+         *
+         * @return bool
+         */
+        public function doRedirect(string $url): bool
+        {
+            if (substr($url, -1) === '/') {
+                $this->link = trim($url, '/');
+                return true;
+            }
+            return false;
+        }
+        
+        /**
+         * @return string
+         */
+        public function getLink(): string
+        {
+            return $this->link;
+        }
+    }
 \ No newline at end of file
@@ -3,6 +3,7 @@
     namespace frontend\components;
     use artbox\core\models\Alias;
+    use artbox\core\models\interfaces\RedirectInterface;
     use artbox\core\services\Languages;
     use yii\helpers\Json;
     use yii\web\Request;
@@ -42,6 +43,8 @@
          * @param \artbox\core\services\Languages $languages
          * @param array                           $config
          */
+        
+        public $redirects = [];
         public function __construct(Languages $languages, array $config = [])
         {
             $this->languages = $languages;
@@ -62,7 +65,13 @@
             //            $this->checkRedirect($request->url);
             $request = $this->parseLanguage($request);
-
+            foreach ($this->redirects as $redirectClass) {
+                /**
+                 * @var \artbox\core\models\interfaces\RedirectInterface $redirect
+                 */
+                $redirect = \Yii::createObject($redirectClass);
+                $this->applyRedirect($redirect, $request->pathInfo);
+            }
             /**
              * @var Alias $alias
              */
@@ -210,4 +219,15 @@
             //                                    ->send();
             //            }
         }
+    
+        public function applyRedirect(RedirectInterface $redirect, string $url)
+        {
+            if ($redirect->doRedirect($url)) {
+                //                var_dump($redirect->getLink());die();
+                header("HTTP/1.1 301 Moved Permanently");
+                header("Location: /" . $redirect->getLink());
+                exit();
+            }
+            return 0;
+        }
     }
 \ No newline at end of file
 <?php
+    use common\models\SlashRedirect;
     use frontend\components\UrlManager;
 use yii\helpers\Url;
@@ -10,20 +11,6 @@ use yii\helpers\Url;
     );
     return [
-        'on beforeRequest' => function () {
-	        $pathInfo = Yii::$app->request->pathInfo;
-            $query = Yii::$app->request->queryString;
-	        if (!empty($pathInfo) && substr($pathInfo, -1) === '/' && substr($pathInfo, 0, 1) !== "/") {
-                $url = '/' . substr($pathInfo, 0, -1);
-                if ($query) {
-                    $url .= '?' . $query;
-                }
-                Yii::$app->response->redirect($url, 301);
-            } # редирект с www.siteName.com//////////////////////// на www.siteName.com
-	        elseif (substr($pathInfo, 0, 1) == "/" && substr($pathInfo, 1, 1) == "/") {
-		        Yii::$app->response->redirect('/', 301);
-	        }
-        },
         'id'                  => 'app-frontend',
         'homeUrl'             => '/',
         'basePath'            => dirname(__DIR__),
@@ -397,6 +384,9 @@ use yii\helpers\Url;
                 ],
                 'hideDefaultLanguagePrefix' => true,
+                'redirects'            => [
+                    SlashRedirect::className(),
+                ],
             ],
             'assetsAutoCompress' => [
                 'class'   => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent',