diff --git a/common/behaviors/NotifyBehavior.php b/common/behaviors/NotifyBehavior.php old mode 100644 new mode 100755 index 61dc7a3..61dc7a3 --- a/common/behaviors/NotifyBehavior.php +++ b/common/behaviors/NotifyBehavior.php diff --git a/common/behaviors/RatingBehavior.php b/common/behaviors/RatingBehavior.php old mode 100644 new mode 100755 index 0d999ca..0d999ca --- a/common/behaviors/RatingBehavior.php +++ b/common/behaviors/RatingBehavior.php diff --git a/common/models/ArticleToRating.php b/common/models/ArticleToRating.php old mode 100644 new mode 100755 index 44b3be6..44b3be6 --- a/common/models/ArticleToRating.php +++ b/common/models/ArticleToRating.php diff --git a/common/modules/comment/behaviors/ParentBehavior.php b/common/modules/comment/behaviors/ParentBehavior.php old mode 100644 new mode 100755 index f93dff8..f93dff8 --- a/common/modules/comment/behaviors/ParentBehavior.php +++ b/common/modules/comment/behaviors/ParentBehavior.php diff --git a/common/modules/comment/controllers/DefaultController.php b/common/modules/comment/controllers/DefaultController.php old mode 100644 new mode 100755 index b4b0de0..b4b0de0 --- a/common/modules/comment/controllers/DefaultController.php +++ b/common/modules/comment/controllers/DefaultController.php diff --git a/common/modules/comment/migrations/m160724_162347_artbox_comment.php b/common/modules/comment/migrations/m160724_162347_artbox_comment.php old mode 100644 new mode 100755 index 93028c3..93028c3 --- a/common/modules/comment/migrations/m160724_162347_artbox_comment.php +++ b/common/modules/comment/migrations/m160724_162347_artbox_comment.php diff --git a/common/modules/comment/migrations/m160726_092634_add_entity_fields.php b/common/modules/comment/migrations/m160726_092634_add_entity_fields.php old mode 100644 new mode 100755 index 16d8193..16d8193 --- a/common/modules/comment/migrations/m160726_092634_add_entity_fields.php +++ b/common/modules/comment/migrations/m160726_092634_add_entity_fields.php diff --git a/common/modules/comment/migrations/m160726_211227_create_artbox_comment_rating.php b/common/modules/comment/migrations/m160726_211227_create_artbox_comment_rating.php old mode 100644 new mode 100755 index 2f0848e..2f0848e --- a/common/modules/comment/migrations/m160726_211227_create_artbox_comment_rating.php +++ b/common/modules/comment/migrations/m160726_211227_create_artbox_comment_rating.php diff --git a/common/modules/comment/models/CommentModel.php b/common/modules/comment/models/CommentModel.php old mode 100644 new mode 100755 index d7ca4d6..d7ca4d6 --- a/common/modules/comment/models/CommentModel.php +++ b/common/modules/comment/models/CommentModel.php diff --git a/common/modules/comment/models/CommentModelSearch.php b/common/modules/comment/models/CommentModelSearch.php old mode 100644 new mode 100755 index 7c3b9cb..7c3b9cb --- a/common/modules/comment/models/CommentModelSearch.php +++ b/common/modules/comment/models/CommentModelSearch.php diff --git a/common/modules/comment/models/LikeModel.php b/common/modules/comment/models/LikeModel.php old mode 100644 new mode 100755 index 8ad420e..8ad420e --- a/common/modules/comment/models/LikeModel.php +++ b/common/modules/comment/models/LikeModel.php diff --git a/common/modules/comment/models/interfaces/CommentInterface.php b/common/modules/comment/models/interfaces/CommentInterface.php old mode 100644 new mode 100755 index 4c5bd1d..4c5bd1d --- a/common/modules/comment/models/interfaces/CommentInterface.php +++ b/common/modules/comment/models/interfaces/CommentInterface.php diff --git a/common/modules/comment/resources/artbox_comment.css b/common/modules/comment/resources/artbox_comment.css old mode 100644 new mode 100755 index 7ca9879..7ca9879 --- a/common/modules/comment/resources/artbox_comment.css +++ b/common/modules/comment/resources/artbox_comment.css diff --git a/common/modules/comment/resources/artbox_comment.js b/common/modules/comment/resources/artbox_comment.js old mode 100644 new mode 100755 index c6f9180..c6f9180 --- a/common/modules/comment/resources/artbox_comment.js +++ b/common/modules/comment/resources/artbox_comment.js diff --git a/common/modules/comment/resources/delete.gif b/common/modules/comment/resources/delete.gif old mode 100644 new mode 100755 index 43c6ca8..43c6ca8 Binary files a/common/modules/comment/resources/delete.gif and b/common/modules/comment/resources/delete.gif differ diff --git a/common/modules/comment/resources/jquery.rateit.min.js b/common/modules/comment/resources/jquery.rateit.min.js old mode 100644 new mode 100755 index 08f83d8..08f83d8 --- a/common/modules/comment/resources/jquery.rateit.min.js +++ b/common/modules/comment/resources/jquery.rateit.min.js diff --git a/common/modules/comment/resources/rateit.css b/common/modules/comment/resources/rateit.css old mode 100644 new mode 100755 index d6ca91a..d6ca91a --- a/common/modules/comment/resources/rateit.css +++ b/common/modules/comment/resources/rateit.css diff --git a/common/modules/comment/resources/star.gif b/common/modules/comment/resources/star.gif old mode 100644 new mode 100755 index cd14729..cd14729 Binary files a/common/modules/comment/resources/star.gif and b/common/modules/comment/resources/star.gif differ diff --git a/common/modules/comment/todo b/common/modules/comment/todo old mode 100644 new mode 100755 index cae6e3f..cae6e3f --- a/common/modules/comment/todo +++ b/common/modules/comment/todo diff --git a/common/modules/comment/views/artbox_comment_form.php b/common/modules/comment/views/artbox_comment_form.php old mode 100644 new mode 100755 index 1e8c552..1e8c552 --- a/common/modules/comment/views/artbox_comment_form.php +++ b/common/modules/comment/views/artbox_comment_form.php diff --git a/common/modules/comment/views/artbox_comment_item.php b/common/modules/comment/views/artbox_comment_item.php old mode 100644 new mode 100755 index 7c826ab..7c826ab --- a/common/modules/comment/views/artbox_comment_item.php +++ b/common/modules/comment/views/artbox_comment_item.php diff --git a/common/modules/comment/views/artbox_comment_list.php b/common/modules/comment/views/artbox_comment_list.php old mode 100644 new mode 100755 index 20dc4a9..20dc4a9 --- a/common/modules/comment/views/artbox_comment_list.php +++ b/common/modules/comment/views/artbox_comment_list.php diff --git a/common/modules/comment/views/artbox_comment_reply.php b/common/modules/comment/views/artbox_comment_reply.php old mode 100644 new mode 100755 index 2aed197..2aed197 --- a/common/modules/comment/views/artbox_comment_reply.php +++ b/common/modules/comment/views/artbox_comment_reply.php diff --git a/common/modules/comment/views/manage/index.php b/common/modules/comment/views/manage/index.php old mode 100644 new mode 100755 index dcd3f50..dcd3f50 --- a/common/modules/comment/views/manage/index.php +++ b/common/modules/comment/views/manage/index.php diff --git a/common/modules/comment/views/manage/update.php b/common/modules/comment/views/manage/update.php old mode 100644 new mode 100755 index fa9f3de..fa9f3de --- a/common/modules/comment/views/manage/update.php +++ b/common/modules/comment/views/manage/update.php diff --git a/common/widgets/views/comment_notify.php b/common/widgets/views/comment_notify.php old mode 100644 new mode 100755 index 9ed6242..9ed6242 --- a/common/widgets/views/comment_notify.php +++ b/common/widgets/views/comment_notify.php diff --git a/console/migrations/m160722_150101_remove_product_option_option_fkey.php b/console/migrations/m160722_150101_remove_product_option_option_fkey.php old mode 100644 new mode 100755 index 9f60d86..9f60d86 --- a/console/migrations/m160722_150101_remove_product_option_option_fkey.php +++ b/console/migrations/m160722_150101_remove_product_option_option_fkey.php diff --git a/console/migrations/m160722_150611_remove_product_variant_option_id.php b/console/migrations/m160722_150611_remove_product_variant_option_id.php old mode 100644 new mode 100755 index babf023..babf023 --- a/console/migrations/m160722_150611_remove_product_variant_option_id.php +++ b/console/migrations/m160722_150611_remove_product_variant_option_id.php diff --git a/console/migrations/m160722_150612_remove_option_product_variant_id.php b/console/migrations/m160722_150612_remove_option_product_variant_id.php old mode 100644 new mode 100755 index 213a477..213a477 --- a/console/migrations/m160722_150612_remove_option_product_variant_id.php +++ b/console/migrations/m160722_150612_remove_option_product_variant_id.php diff --git a/console/migrations/m160725_154511_remove_product_option_product_fkey.php b/console/migrations/m160725_154511_remove_product_option_product_fkey.php old mode 100644 new mode 100755 index c59c6bb..c59c6bb --- a/console/migrations/m160725_154511_remove_product_option_product_fkey.php +++ b/console/migrations/m160725_154511_remove_product_option_product_fkey.php diff --git a/console/migrations/m160725_155127_remove_product_stock_product_variant_id_fkey.php b/console/migrations/m160725_155127_remove_product_stock_product_variant_id_fkey.php old mode 100644 new mode 100755 index 40eb68f..40eb68f --- a/console/migrations/m160725_155127_remove_product_stock_product_variant_id_fkey.php +++ b/console/migrations/m160725_155127_remove_product_stock_product_variant_id_fkey.php diff --git a/console/migrations/m160804_100209_create_article_to_rating.php b/console/migrations/m160804_100209_create_article_to_rating.php old mode 100644 new mode 100755 index 7d4ec15..7d4ec15 --- a/console/migrations/m160804_100209_create_article_to_rating.php +++ b/console/migrations/m160804_100209_create_article_to_rating.php diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 537f262..e8f0ef6 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.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(), ]); } diff --git a/frontend/web/css/comments.css b/frontend/web/css/comments.css old mode 100644 new mode 100755 index 7587ab6..7587ab6 --- a/frontend/web/css/comments.css +++ b/frontend/web/css/comments.css diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css old mode 100644 new mode 100755 index b66f416..b66f416 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css diff --git a/frontend/web/css/style.dev.css b/frontend/web/css/style.dev.css old mode 100644 new mode 100755 index 44a3130..44a3130 --- a/frontend/web/css/style.dev.css +++ b/frontend/web/css/style.dev.css diff --git a/frontend/web/img/icon_100_original_01.png b/frontend/web/img/icon_100_original_01.png old mode 100644 new mode 100755 index a06c951..a06c951 Binary files a/frontend/web/img/icon_100_original_01.png and b/frontend/web/img/icon_100_original_01.png differ diff --git a/frontend/web/img/icon_100_quaranty_01.png b/frontend/web/img/icon_100_quaranty_01.png old mode 100644 new mode 100755 index 5a4b121..5a4b121 Binary files a/frontend/web/img/icon_100_quaranty_01.png and b/frontend/web/img/icon_100_quaranty_01.png differ diff --git a/frontend/web/img/user-noimage.png b/frontend/web/img/user-noimage.png old mode 100644 new mode 100755 index e5f6720..e5f6720 Binary files a/frontend/web/img/user-noimage.png and b/frontend/web/img/user-noimage.png differ diff --git a/frontend/widgets/Seo.php b/frontend/widgets/Seo.php index 69b5fff..688651e 100755 --- a/frontend/widgets/Seo.php +++ b/frontend/widgets/Seo.php @@ -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; + } + } -- libgit2 0.21.4