diff --git a/frontend/widgets/Seo.php b/frontend/widgets/Seo.php index 64b42ec..b77f974 100755 --- a/frontend/widgets/Seo.php +++ b/frontend/widgets/Seo.php @@ -99,51 +99,24 @@ class Seo extends Widget break; case self::H1: - $filter = \Yii::$app->request->get('filters', []); - - - - if (isset($filter['brands']) && count($filter['brands']) == 1) { - - $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one(); - if(!$model instanceof Brand){ - - \Yii::$app->response->redirect(['/site/error'],404); - } else { - if($this->selectSeoData(self::H1) == $this->category_name) { - - return $this->selectSeoData(self::H1) . ' ' . $model->name ; - }else { - - return $this->selectSeoData(self::H1); - - } - } - + $filter = \Yii::$app->request->get('filters', []); - } else if (isset($filter["naznacenie"]) && count($filter["naznacenie"]) == 1) { - - $model = TaxOption::find()->where(['alias' => $filter["naznacenie"]])->one(); - if(!$model instanceof TaxOption){ - - \Yii::$app->response->redirect(['/site/error'],404); - } else { - if($this->selectSeoData(self::H1) == $this->category_name) { - - return $this->selectSeoData(self::H1) . ' ' . $model->value->value; - }else { + $default = $this->selectSeoData(self::H1); - return $this->selectSeoData(self::H1); + if ($default != $this->{self::H1}) { - } + return $default; - } + } else if(!empty($filter) && !$this->checkFilter($filter)){ + $array = $this->arrayBuilder($filter); + return $this->getNameString($array); + } + else { - } else { - return $this->selectSeoData(self::H1); + return $default; } break; case self::TITLE: @@ -437,13 +410,13 @@ class Seo extends Widget if($name == 'category' ){ $row = $field.' '.$row; } else { - $row .= $field['name'] .' '.$field['value'].' ' ; + $row .= $field['value'].' ' ; } } - $row = substr($row, 0,-2 ); + return $row; } @@ -482,7 +455,7 @@ class Seo extends Widget \Yii::$app->response->redirect(['site/error'], 404); } else { - $array[$optionList]['value'] = $model->value; + $array[$optionList]['value'] = $model->value->value; $array[$optionList]['name'] = $name; } -- libgit2 0.21.4