SEO доработки

Author: skeeks-semenov

src/CmsSeoComponent.php

@@ -373,14 +373,14 @@ public function getConfigFormFields()
                         'class'     => BoolField::class,
                         'allowNull' => false,
                     ],
-                    'activeContentElem' => [
+                    /*'activeContentElem' => [
                         'class'     => BoolField::class,
                         'allowNull' => false,
                     ],
                     'activeTree'        => [
                         'class'     => BoolField::class,
                         'allowNull' => false,
-                    ],
+                    ],*/
                     'contentIds'        => [
                         'class' => SelectField::class,
                         'items' => \skeeks\cms\models\CmsContent::getDataForSelect(),

src/controllers/SitemapController.php

@@ -50,10 +50,45 @@ public function actionOnRequest()
     protected function _addTrees(&$data = [])
     {
         $query = CmsTree::find()->cmsSite();
+        $query->andWhere([
+            'and',
+            [
+                'redirect_tree_id' => null,
+            ],
+            [
+                'redirect_content_element_id' => null,
+            ],
+            [
+                'redirect_saved_filter_id' => null,
+            ],
+            [
+                'or',
+                ['redirect' => null],
+                ['redirect' => ""]
+            ]
+        ]);
 
-        if (\Yii::$app->seo->activeTree) {
-            $query->active();
-        }
+        $query->andWhere([
+            'and',
+            [
+                'canonical_tree_id' => null,
+            ],
+            [
+                'canonical_content_element_id' => null,
+            ],
+            [
+                'canonical_saved_filter_id' => null,
+            ],
+            [
+                'or',
+                ['canonical_link' => null],
+                ['canonical_link' => ""]
+            ]
+        ]);
+        
+        $query->andWhere([
+                'is_index' => 1,
+        ]);
 
         if (\Yii::$app->seo->treeTypeIds) {
             $query->andWhere(['tree_type_id' => \Yii::$app->seo->treeTypeIds]);
@@ -66,7 +101,7 @@ protected function _addTrees(&$data = [])
              * @var Tree $tree
              */
             foreach ($trees as $tree) {
-                if (!$tree->redirect && !$tree->redirect_tree_id) {
+                //if (!$tree->redirect && !$tree->redirect_tree_id) {
                     $tmp = [
                         "loc"     => $tree->absoluteUrl,
                         "lastmod" => $this->_lastMod($tree),
@@ -77,7 +112,7 @@ protected function _addTrees(&$data = [])
                     }
 
                     $data[] = $tmp;
-                }
+                //}
             }
         }
 

src/vendor/CanUrl.php

@@ -119,7 +119,10 @@ public function event_end_page(Event $event)
         /** @var \yii\web\View $view */
         $view = $event->sender;
         if (!\Yii::$app->request->isPjax && !\Yii::$app->request->isAjax) {
-            $view->linkTags['canonical'] = '<link rel="canonical" href="'.$canurl.'"/>';
+            if (!isset($view->linkTags['canonical'])) {
+                $view->linkTags['canonical'] = '<link rel="canonical" href="'.$canurl.'"/>';
+            }
+            
         }