Merge remote-tracking branch 'origin/master'

Yarik
2 parents 1face72c 661cf9fb
Showing 714 changed files with 7759 additions and 724 deletions Show diff stats
.htaccess
LICENSE.md
README.md
backend/assets/AppAsset.php
backend/config/.gitignore
backend/config/bootstrap.php
backend/config/main.php
backend/config/params.php
backend/controllers/AdminMenuController.php
backend/controllers/BlogController.php
backend/controllers/ImportController.php
backend/controllers/LanguageController.php
backend/controllers/MenuController.php
backend/controllers/MenuLocationController.php
backend/controllers/NewOptionsLangController.php
backend/controllers/OptionController.php
backend/controllers/SettingsController.php
backend/controllers/SiteController.php
backend/controllers/TerminController.php
backend/controllers/UserController.php
+<IfModule mod_rewrite.c>
+
+    Options +FollowSymlinks
+
+    RewriteEngine On
+
+</IfModule>
+
+<IfModule mod_rewrite.c>
+
+    RewriteBase /
+    # deal with admin first
+    RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT]
+
+    RewriteCond %{REQUEST_URI} ^/(admin)
+
+
+
+    RewriteRule ^admin/assets/(.*)$ backend/web/assets/$1 [L]
+
+    RewriteRule ^admin/css/(.*)$ backend/web/css/$1 [L]
+
+    RewriteRule ^admin/js/(.*)$ backend/web/js/$1 [L]
+
+    RewriteRule ^admin/images/(.*)$ backend/web/images/$1 [L]
+
+    RewriteRule ^admin/fonts/(.*)$ backend/web/fonts/$1 [L]
+
+
+
+
+
+    RewriteCond %{REQUEST_URI} !^/backend/web/(assets|css|js|images|fonts)/
+
+    RewriteCond %{REQUEST_URI} ^/(admin)
+
+    RewriteRule ^.*$ backend/web/index.php [L]
+
+
+
+    RewriteCond %{REQUEST_URI} ^/(assets|css)
+
+    RewriteRule ^assets/(.*)$ frontend/web/assets/$1 [L]
+
+    RewriteRule ^css/(.*)$ frontend/web/css/$1 [L]
+
+    RewriteRule ^js/(.*)$ frontend/web/js/$1 [L]
+
+    RewriteRule ^images/(.*)$ frontend/web/images/$1 [L]
+
+    RewriteRule ^fonts/(.*)$ frontend/web/fonts/$1 [L]
+
+
+    RewriteCond %{REQUEST_URI} !^/(frontend|backend)/web/(assets|css|js|images|fonts)/
+
+    RewriteCond %{REQUEST_URI} !index.php
+
+    RewriteCond %{REQUEST_FILENAME} !-f [OR]
+
+    RewriteCond %{REQUEST_FILENAME} !-d
+
+    RewriteRule ^.*$ frontend/web/index.php
+
+</IfModule>
+
+#для возможности загрузки файлов парсера
+<IfModule mod_php5.c>
+    php_value upload_max_filesize 20M
+    php_value post_max_size 30M
+</IfModule>
 \ No newline at end of file
@@ -27,6 +27,9 @@ return [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
         ],
+        'request' => [
+            'class' => 'common\components\LangRequest'
+        ],
         'urlManager' => [
             'enablePrettyUrl' => true,
             'showScriptName' => false,