|
31 | 31 | /** |
32 | 32 | * |
33 | 33 | * 'seo' => [ |
34 | | - 'canUrl' => [ |
35 | | - 'scheme' => 'https', |
36 | | - 'host' => 'skeeks-travel.ru', |
37 | | - ], |
38 | | - ], |
| 34 | + * 'canUrl' => [ |
| 35 | + * 'scheme' => 'https', |
| 36 | + * 'host' => 'skeeks-travel.ru', |
| 37 | + * ], |
| 38 | + * ], |
39 | 39 | * |
40 | 40 | * 'seo' => [ |
41 | | - 'canUrl' => [ |
42 | | - 'scheme' => CmsSeoComponent::CANURL_DATA_FROM_MAIN_DOMAIN, |
43 | | - 'host' => CmsSeoComponent::CANURL_DATA_FROM_MAIN_DOMAIN, |
44 | | - ], |
45 | | - ], |
| 41 | + * 'canUrl' => [ |
| 42 | + * 'scheme' => CmsSeoComponent::CANURL_DATA_FROM_MAIN_DOMAIN, |
| 43 | + * 'host' => CmsSeoComponent::CANURL_DATA_FROM_MAIN_DOMAIN, |
| 44 | + * ], |
| 45 | + * ], |
46 | 46 | * |
47 | 47 | * @property CanUrl $canUrl; |
48 | | - * @property array $utms; |
| 48 | + * @property array $utms; |
49 | 49 | * |
50 | 50 | * @author Semenov Alexander <[email protected]> |
51 | 51 | */ |
@@ -322,7 +322,7 @@ public function bootstrap($application) |
322 | 322 | 'forcePageParam' => $this->forcePageParam, |
323 | 323 | ]); |
324 | 324 |
|
325 | | - |
| 325 | + |
326 | 326 | if (\Yii::$app->request->queryParams) { |
327 | 327 | $utms = []; |
328 | 328 | foreach (\Yii::$app->request->queryParams as $paramName => $paramValue) { |
@@ -419,7 +419,7 @@ public function getUtms() |
419 | 419 | $created_at = ArrayHelper::getValue($utms, 'created_at'); |
420 | 420 |
|
421 | 421 | //Если с момента создания утм прошло более 24 часов то |
422 | | - if (time() - $created_at >= 3600*24) { |
| 422 | + if (time() - $created_at >= 3600 * 24) { |
423 | 423 | $utms = []; |
424 | 424 | } |
425 | 425 | } |
@@ -488,11 +488,7 @@ protected function _initDefaultCanUrl() |
488 | 488 | public function _addCanurlParams(WidgetEvent $e) |
489 | 489 | { |
490 | 490 | //Только для этих действий |
491 | | - if (!in_array(\Yii::$app->controller->uniqueId, [ |
492 | | - 'cms/tree', |
493 | | - 'cms/content-element', |
494 | | - 'savedFilters/saved-filters', |
495 | | - ]) |
| 491 | + if (!in_array(\Yii::$app->controller->uniqueId, $this->canUrlEnableDefaultControllers) |
496 | 492 | ) { |
497 | 493 | return true; |
498 | 494 | } |
@@ -541,13 +537,16 @@ public function _addCanurlParams(WidgetEvent $e) |
541 | 537 |
|
542 | 538 | } |
543 | 539 |
|
| 540 | + public $canUrlEnableDefaultControllers = [ |
| 541 | + 'cms/tree', |
| 542 | + 'cms/content-element', |
| 543 | + 'savedFilters/saved-filters', |
| 544 | + ]; |
| 545 | + |
544 | 546 | public function _isTrigerEventCanUrl() |
545 | 547 | { |
546 | | - if (\Yii::$app->urlManager->enablePrettyUrl && \Yii::$app->controller && in_array(\Yii::$app->controller->uniqueId, [ |
547 | | - 'cms/tree', |
548 | | - 'cms/content-element', |
549 | | - 'savedFilters/saved-filters', |
550 | | - ]) |
| 548 | + if ( |
| 549 | + \Yii::$app->urlManager->enablePrettyUrl && \Yii::$app->controller && in_array(\Yii::$app->controller->uniqueId, $this->canUrlEnableDefaultControllers) |
551 | 550 | ) { |
552 | 551 | return true; |
553 | 552 | } |
|
0 commit comments