Option canonicalPageParams removed

Author: skeeks-semenov

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 ==============
 
+2.1.3
+-----------------
+ * Fixed bugs
+ * Option canonicalPageParams removed
+ 
 2.1.2
 -----------------
  * New cms option isRedirectNotFoundHttpException 

README.md

@@ -29,6 +29,13 @@ Configuration app
 [
     'seo' => [
         'class'     => 'skeeks\cms\seo\CmsSeoComponent',
+        
+        'canUrl' => [
+            'scheme' => 'https',
+            'host' => 'site.ru',
+        ],
+        
+        
     ],
 
     'i18n' => [

src/CmsSeoComponent.php

@@ -95,11 +95,7 @@ class CmsSeoComponent extends Component implements BootstrapInterface
         //"b"         =>  2,
         //"strong"    =>  2,
     ]; //Учитывать следующие типы разделов
-    /**
-     * Добавлять тег канноникал для постраничной навигации
-     * @var array
-     */
-    public $canonicalPageParams = ['page'];
+
     /**
      * В виджетах ListView registerLinkTags = true по умолчанию
      * @var bool
@@ -115,11 +111,10 @@ class CmsSeoComponent extends Component implements BootstrapInterface
 
 
     /**
+     * false - disable canurl
      * @var bool|array
      */
-    protected $_canUrl = [
-        'class' => 'skeeks\cms\seo\vendor\CanUrl'
-    ];
+    protected $_canUrl = [];
 
     /**
      * @var bool
@@ -243,17 +238,6 @@ public function bootstrap($application)
 
         $application->on(Application::EVENT_BEFORE_REQUEST, function (Event $e) {
 
-            /**
-             * Добавление канноникал для постранички
-             */
-            if ($this->canonicalPageParams && is_array($this->canonicalPageParams)) {
-                foreach ($this->canonicalPageParams as $paramName) {
-                    if (\Yii::$app->request->get($paramName)) {
-                        \Yii::$app->view->registerLinkTag(['rel' => 'canonical', 'href' => \Yii::$app->request->hostInfo . '/' . \Yii::$app->request->pathInfo]);
-                    }
-                }
-            }
-
             /**
              * Добавление метатегов в постраничной навигации
              */
@@ -312,7 +296,7 @@ protected function _initDefaultCanUrl() {
             $this->canUrl->host = \Yii::$app->request->hostName;
         }
 
-        if (!$this->canUrl->port) {
+        if (!$this->canUrl->scheme) {
             $this->canUrl->scheme = \Yii::$app->request->isSecureConnection ? "https" : "http";
         }
 
@@ -348,6 +332,7 @@ public function _isTrigerEventCanUrl()
         if (\Yii::$app->controller && in_array(\Yii::$app->controller->uniqueId, [
             'cms/tree',
             'cms/content-element',
+            'savedFilters/saved-filters',
         ])) {
             return true;
         }
@@ -384,10 +369,18 @@ public function setCanUrl($canUrl)
      */
     public function getCanUrl()
     {
+        if ($this->_canUrl === false) {
+            return $this->_canUrl;
+        }
+
         if (is_array($this->_canUrl)) {
+            $this->_canUrl = ArrayHelper::merge([
+                'class' => 'skeeks\cms\seo\vendor\CanUrl'
+            ], $this->_canUrl);
             $this->_canUrl = \Yii::createObject($this->_canUrl);
         }
 
+        //print_r($this->_canUrl);die;
         return $this->_canUrl;
     }
 

src/vendor/CanUrl.php

@@ -235,10 +235,14 @@ public function is_need_redirect($is_final, $current_url = null)
             throw new InvalidParamException('(!is_string($current_url))');
         }
 
+        \Yii::info("current_url = {$current_url}", self::class);
         $parsed_current_url = parse_url($current_url);
 
+        \Yii::info("parsed_current_url = " . print_r($parsed_current_url, true), self::class);
         $redirurl = $this->GETredirurl($parsed_current_url, $is_final);
 
+        \Yii::info("redirurl = {$redirurl}", self::class);
+        \Yii::info("this = " . print_r($this, true), self::class);
         if ($redirurl === $current_url) {
             return false;
         }
@@ -390,12 +394,6 @@ public function SETscheme($value)
         $this->_scheme = $value;
         return $this;
     }
-    public function SETschema($value)
-    {
-        $this->_scheme = $value;
-        return $this;
-    }
-    public function GETschema() { return $this->_scheme; }
     public function GETuser() { return $this->_user; }
     public function SETuser($value)
     {