diff --git a/.htaccess b/.htaccess index 9539f04..a08ebbb 100755 --- a/.htaccess +++ b/.htaccess @@ -166,3 +166,4 @@ RewriteRule ^(.*)$ $1.gz [QSA,L] BrowserMatch "MSIE" force-no-vary BrowserMatch "Mozilla/4.[0-9]{2}" force-no-vary + diff --git a/.htpasswd b/.htpasswd new file mode 100644 index 0000000..2b049e5 --- /dev/null +++ b/.htpasswd @@ -0,0 +1 @@ +root:$apr1$yVolX6PS$4ga2ZthXEzR1Ii1Ru39iX0 \ No newline at end of file diff --git a/backend/controllers/EventController.php b/backend/controllers/EventController.php index edc71fe..31d4f6f 100755 --- a/backend/controllers/EventController.php +++ b/backend/controllers/EventController.php @@ -80,10 +80,11 @@ class EventController extends Controller { $model = new Event(); - if ($model->load(Yii::$app->request->post())) { + if ($model->load(Yii::$app->request->post()) && $model->save()) { if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) { $model->image = $image->name; + $image->saveAs(Yii::getAlias('@imagesDir/event/' . $image->name)); } if ( ($banner = UploadedFile::getInstance($model, 'banner')) ) { @@ -91,9 +92,6 @@ class EventController extends Controller $image->saveAs(Yii::getAlias('@imagesDir/event/' . $banner->name)); } - if ($model->save() && $image) { - $image->saveAs(Yii::getAlias('@imagesDir/event/' . $image->name)); - } return $this->redirect(['view', 'id' => $model->event_id]); } else { diff --git a/backend/views/feedback/index.php b/backend/views/feedback/index.php old mode 100644 new mode 100755 index fbe1921..fbe1921 --- a/backend/views/feedback/index.php +++ b/backend/views/feedback/index.php diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php index 95aef0e..079eb84 100755 --- a/backend/views/layouts/header.php +++ b/backend/views/layouts/header.php @@ -8,7 +8,7 @@ use yii\bootstrap\Nav; use yii\bootstrap\NavBar; use yii\helpers\Url; use yii\widgets\Breadcrumbs; -use frontend\assets\AppAsset; +use backend\assets\AppAsset; use common\widgets\Alert; use yii\widgets\Menu; diff --git a/common/behaviors/SaveImgBehavior.php b/common/behaviors/SaveImgBehavior.php old mode 100644 new mode 100755 index 5f05708..eaa5389 --- a/common/behaviors/SaveImgBehavior.php +++ b/common/behaviors/SaveImgBehavior.php @@ -58,7 +58,7 @@ class SaveImgBehavior extends Behavior foreach($this->fields as $field){ if ( ($image = UploadedFile::getInstance($this->owner, $field['name'])) ) { - $this->owner->image = $image->name; + $this->owner->$field['name'] = $image->name; } diff --git a/common/models/Customer.php b/common/models/Customer.php old mode 100644 new mode 100755 index d64fd12..d64fd12 --- a/common/models/Customer.php +++ b/common/models/Customer.php diff --git a/common/models/EventsToProducts.php b/common/models/EventsToProducts.php old mode 100644 new mode 100755 index c3cb5cb..c3cb5cb --- a/common/models/EventsToProducts.php +++ b/common/models/EventsToProducts.php diff --git a/common/models/Feedback.php b/common/models/Feedback.php old mode 100644 new mode 100755 index 7b190d6..7b190d6 --- a/common/models/Feedback.php +++ b/common/models/Feedback.php diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php old mode 100644 new mode 100755 index 35004c9..35004c9 --- a/common/models/LoginForm.php +++ b/common/models/LoginForm.php diff --git a/common/modules/product/controllers/ManageController.php b/common/modules/product/controllers/ManageController.php index a799a6b..0f5b159 100755 --- a/common/modules/product/controllers/ManageController.php +++ b/common/modules/product/controllers/ManageController.php @@ -202,8 +202,10 @@ class ManageController extends Controller if ($model->load(Yii::$app->request->post())) { $file = UploadedFile::getInstances($model, 'file'); + $method = 'go'. ucfirst($model->type); $target = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFile'. ucfirst($model->type)); + if (empty($file)) { $model->errors[] = 'File not upload'; } elseif ($method == 'goPrices' && $file[0]->name != 'file_1.csv') { diff --git a/common/modules/product/models/Export.php b/common/modules/product/models/Export.php index 79d3878..93d2372 100755 --- a/common/modules/product/models/Export.php +++ b/common/modules/product/models/Export.php @@ -12,6 +12,7 @@ class Export extends Model { public function process($dirName, $filename = null, $use_not_enables = false) { set_time_limit(0); + ini_set('max_execution_time', 900); if (is_null($filename)) { $filename = 'products_'. date('d_m_Y_H_i') .'.csv'; } diff --git a/common/modules/product/models/Import.php b/common/modules/product/models/Import.php index c38ab00..8383642 100755 --- a/common/modules/product/models/Import.php +++ b/common/modules/product/models/Import.php @@ -75,8 +75,14 @@ class Import extends Model { $is_utf = (preg_match('//u', file_get_contents(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'), null, null, null, 1000000))); - while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE && (empty($limit) || $j++ < $limit)) + while (empty($limit) || $j++ < $limit) { + + + if(!(($data = fgetcsv ($handle, 10000, ";")) !== FALSE)){ + break; + } + foreach ($data as &$value) { if (!$is_utf) { @@ -214,10 +220,14 @@ class Import extends Model { $result_items = []; - while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE && (empty($limit) || $j++ < $limit)) - { + while ( empty($limit) || $j++ < $limit) + { + if(!(($data = fgetcsv ($handle, 10000, ";")) !== FALSE)){ + break; + } + foreach ($data as &$value) { if (!$is_utf) { diff --git a/console/controllers/SiteMapController.php b/console/controllers/SiteMapController.php old mode 100644 new mode 100755 index 08048a7..08048a7 --- a/console/controllers/SiteMapController.php +++ b/console/controllers/SiteMapController.php diff --git a/console/migrations/m160905_154051_create_table_feedback.php b/console/migrations/m160905_154051_create_table_feedback.php old mode 100644 new mode 100755 index 1d07e1f..1d07e1f --- a/console/migrations/m160905_154051_create_table_feedback.php +++ b/console/migrations/m160905_154051_create_table_feedback.php diff --git a/console/migrations/m160907_101042_events_to_products.php b/console/migrations/m160907_101042_events_to_products.php old mode 100644 new mode 100755 index 462a141..462a141 --- a/console/migrations/m160907_101042_events_to_products.php +++ b/console/migrations/m160907_101042_events_to_products.php diff --git a/console/migrations/m160907_161750_event_add_status.php b/console/migrations/m160907_161750_event_add_status.php old mode 100644 new mode 100755 index e13e505..e13e505 --- a/console/migrations/m160907_161750_event_add_status.php +++ b/console/migrations/m160907_161750_event_add_status.php diff --git a/console/migrations/m160908_162057_add_banner_to_event.php b/console/migrations/m160908_162057_add_banner_to_event.php old mode 100644 new mode 100755 index 3b5c1fc..3b5c1fc --- a/console/migrations/m160908_162057_add_banner_to_event.php +++ b/console/migrations/m160908_162057_add_banner_to_event.php diff --git a/console/migrations/m160912_212751_slider_image_add_end_at.php b/console/migrations/m160912_212751_slider_image_add_end_at.php old mode 100644 new mode 100755 index 0a0d482..0a0d482 --- a/console/migrations/m160912_212751_slider_image_add_end_at.php +++ b/console/migrations/m160912_212751_slider_image_add_end_at.php diff --git a/console/migrations/m160920_193159_add_sale_percent_to_event.php b/console/migrations/m160920_193159_add_sale_percent_to_event.php old mode 100644 new mode 100755 index 0ec3a68..0ec3a68 --- a/console/migrations/m160920_193159_add_sale_percent_to_event.php +++ b/console/migrations/m160920_193159_add_sale_percent_to_event.php diff --git a/frontend/models/ContactForm.php b/frontend/models/ContactForm.php old mode 100644 new mode 100755 index 613abb5..613abb5 --- a/frontend/models/ContactForm.php +++ b/frontend/models/ContactForm.php diff --git a/frontend/models/PasswordResetRequestForm.php b/frontend/models/PasswordResetRequestForm.php old mode 100644 new mode 100755 index c09f6f7..c09f6f7 --- a/frontend/models/PasswordResetRequestForm.php +++ b/frontend/models/PasswordResetRequestForm.php diff --git a/frontend/models/ResetPasswordForm.php b/frontend/models/ResetPasswordForm.php old mode 100644 new mode 100755 index dd48f52..dd48f52 --- a/frontend/models/ResetPasswordForm.php +++ b/frontend/models/ResetPasswordForm.php diff --git a/frontend/views/catalog/brand.php b/frontend/views/catalog/brand.php old mode 100644 new mode 100755 index acb0f2b..acb0f2b --- a/frontend/views/catalog/brand.php +++ b/frontend/views/catalog/brand.php diff --git a/frontend/views/layouts/cabinet.php b/frontend/views/layouts/cabinet.php old mode 100644 new mode 100755 index e4014fc..e4014fc --- a/frontend/views/layouts/cabinet.php +++ b/frontend/views/layouts/cabinet.php diff --git a/frontend/views/layouts/main-menu.php b/frontend/views/layouts/main-menu.php old mode 100644 new mode 100755 index 14d6742..14d6742 --- a/frontend/views/layouts/main-menu.php +++ b/frontend/views/layouts/main-menu.php diff --git a/frontend/views/modal/forgot_password_form_model_window.php b/frontend/views/modal/forgot_password_form_model_window.php old mode 100644 new mode 100755 index 6b5c79a..6b5c79a --- a/frontend/views/modal/forgot_password_form_model_window.php +++ b/frontend/views/modal/forgot_password_form_model_window.php diff --git a/frontend/views/modal/login_window_model_window.php b/frontend/views/modal/login_window_model_window.php old mode 100644 new mode 100755 index 496e6f7..496e6f7 --- a/frontend/views/modal/login_window_model_window.php +++ b/frontend/views/modal/login_window_model_window.php diff --git a/frontend/views/modal/my_callback_modal_window.php b/frontend/views/modal/my_callback_modal_window.php old mode 100644 new mode 100755 index 79aa26b..79aa26b --- a/frontend/views/modal/my_callback_modal_window.php +++ b/frontend/views/modal/my_callback_modal_window.php diff --git a/frontend/views/modal/registration_window_model_window.php b/frontend/views/modal/registration_window_model_window.php old mode 100644 new mode 100755 index 4150c79..4150c79 --- a/frontend/views/modal/registration_window_model_window.php +++ b/frontend/views/modal/registration_window_model_window.php diff --git a/frontend/views/partial/brand_list.php b/frontend/views/partial/brand_list.php old mode 100644 new mode 100755 index de29663..de29663 --- a/frontend/views/partial/brand_list.php +++ b/frontend/views/partial/brand_list.php diff --git a/frontend/views/partial/main-menu.php b/frontend/views/partial/main-menu.php old mode 100644 new mode 100755 index 71fb504..71fb504 --- a/frontend/views/partial/main-menu.php +++ b/frontend/views/partial/main-menu.php diff --git a/frontend/web/css/owl.carousel.css b/frontend/web/css/owl.carousel.css old mode 100644 new mode 100755 index ecc8071..ecc8071 --- a/frontend/web/css/owl.carousel.css +++ b/frontend/web/css/owl.carousel.css diff --git a/frontend/web/js/js_head.js b/frontend/web/js/js_head.js old mode 100644 new mode 100755 index e69de29..e69de29 --- a/frontend/web/js/js_head.js +++ b/frontend/web/js/js_head.js diff --git a/frontend/web/js/new_script.js b/frontend/web/js/new_script.js old mode 100644 new mode 100755 index 4d671c8..4d671c8 --- a/frontend/web/js/new_script.js +++ b/frontend/web/js/new_script.js diff --git a/frontend/web/js/owl.carousel.js b/frontend/web/js/owl.carousel.js old mode 100644 new mode 100755 index f6ef78b..f6ef78b --- a/frontend/web/js/owl.carousel.js +++ b/frontend/web/js/owl.carousel.js diff --git a/frontend/widgets/views/slider.php b/frontend/widgets/views/slider.php index 088c131..4d8c56d 100755 --- a/frontend/widgets/views/slider.php +++ b/frontend/widgets/views/slider.php @@ -11,7 +11,7 @@ FlipclockAsset::register($this); duration ? $slider->duration : 5000; -- libgit2 0.21.4