20.07.16

Administrator
1 parent 114c7fb3
Showing 40 changed files with 38 additions and 13 deletions Show diff stats
common/behaviors/NotifyBehavior.php
common/behaviors/RatingBehavior.php
common/models/ArticleToRating.php
common/modules/comment/behaviors/ParentBehavior.php
common/modules/comment/controllers/DefaultController.php
common/modules/comment/migrations/m160724_162347_artbox_comment.php
common/modules/comment/migrations/m160726_092634_add_entity_fields.php
common/modules/comment/migrations/m160726_211227_create_artbox_comment_rating.php
common/modules/comment/models/CommentModel.php
common/modules/comment/models/CommentModelSearch.php
common/modules/comment/models/LikeModel.php
common/modules/comment/models/interfaces/CommentInterface.php
common/modules/comment/resources/artbox_comment.css
common/modules/comment/resources/artbox_comment.js
common/modules/comment/resources/delete.gif
common/modules/comment/resources/jquery.rateit.min.js
common/modules/comment/resources/rateit.css
common/modules/comment/resources/star.gif
common/modules/comment/todo
common/modules/comment/views/artbox_comment_form.php
@@ -49,8 +49,8 @@ class SiteController extends Controller
     public function actionError(){
         return $this->render('error', [
-            'code'=>Yii::$app->errorHandler->exception->statusCode,
-            'message'=>Yii::$app->errorHandler->exception->getMessage(),
+            'code'=>'404',
+//            'message'=>Yii::$app->errorHandler->exception->getMessage(),
         ]);
     }
@@ -2,13 +2,15 @@
 namespace frontend\widgets;
 use common\models\SeoDynamic;
-
+use Yii;
 use common\modules\product\models\Brand;
 use common\modules\rubrication\models\TaxGroup;
 use common\modules\rubrication\models\TaxOption;
 use yii\base\Widget;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
+use yii\helpers\Url;
+use yii\web\HttpException;
 class Seo extends Widget
 {
@@ -101,25 +103,37 @@ class Seo extends Widget
                 if (isset($filter['brands']) && count($filter['brands']) == 1) {
                     $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one();
+                    if(!$model instanceof Brand){
-                    if($this->selectSeoData(self::H1) == $this->category_name) {
+                        \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) . ' ' . $model->name;
+                        }else {
-                        return $this->selectSeoData(self::H1);
+                            return $this->selectSeoData(self::H1);
+                        }
                     }
+
+
                 } else  if (isset($filter["naznacenie"]) && count($filter["naznacenie"]) == 1) {
                 $model = TaxOption::find()->where(['alias' => $filter["naznacenie"]])->one();
-                    if($this->selectSeoData(self::H1) == $this->category_name) {
+                    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 {
+                            return $this->selectSeoData(self::H1) . ' ' . $model->value->value;
+                        }else {
-                        return $this->selectSeoData(self::H1);
+                            return $this->selectSeoData(self::H1);
+
+                        }
                     }
@@ -146,8 +160,13 @@ class Seo extends Widget
                     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 {
+                            $array['brand'] = $model->name;
+                        }
-                        $array['brand'] = $model->name;
                     }
@@ -160,7 +179,13 @@ class Seo extends Widget
                         if (isset($filter[$optionList]) && count($filter[$optionList]) == 1) {
                             $model = TaxOption::find()->where(['alias' =>$filter[$optionList]])->one();
-                            $array[$optionList] = $model->value->value;
+                            if(!$model instanceof TaxOption){
+
+                                \Yii::$app->response->redirect(['site/error'],404);
+                            } else {
+                                $array[$optionList] = $model->value->value;
+                            }
+
                         }