second

Administrator
1 parent ecf49b1b
Showing 440 changed files with 45 additions and 285 deletions Show diff stats
backend/assets/AdminLteAsset.php
backend/assets/AppAsset.php
backend/assets/FontAwesomeAsset.php
common/components/LangRequest.php
common/components/LangUrlManager.php
common/components/urlManager/.htaccess
common/components/urlManager/LangRequest.php
common/components/urlManager/LangUrlManager.php
common/components/urlManager/LangUrlRule.php
common/config/main.php
common/models/Bg.php
console/migrations/m160505_202248_bg.php
console/migrations/m160505_235100_page.php
frontend/assets/AppAsset.php
frontend/components/BgWidget.php
frontend/components/HreflangWidget.php
frontend/components/Text.php
frontend/config/main.php
frontend/controllers/ArticlesController.php
frontend/controllers/BasketController.php
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace backend\assets;
-
-use yii\web\AssetBundle;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AdminLteAsset extends AssetBundle
-{
-    public $sourcePath = '@bower/';
-    public $css = [
-        'admin-lte/dist/css/AdminLTE.css',
-        'admin-lte/dist/css/skins/_all-skins.css'
-    ];
-
-    public $js = [
-        'admin-lte/dist/js/app.js',
-
-    ];
-    public $depends = [
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
-        'yii\bootstrap\BootstrapPluginAsset',
-        'backend\assets\FontAwesomeAsset',
-        'common\modules\file\FileUploadAsset'
-    ];
-}
 \ No newline at end of file
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace backend\assets;
-
-use yii\web\AssetBundle;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AppAsset extends AssetBundle
-{
-    public $basePath = '@webroot';
-    public $baseUrl = '@web';
-    public $css = [
-        'css/site.css',
-    ];
-    public $js = [
-        'js/fieldWidget.js',
-    ];
-    public $depends = [
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
-    ];
-}
-<?php
-namespace backend\assets;
-
-use yii\web\AssetBundle;
-
-class FontAwesomeAsset extends AssetBundle
-{
-    // The files are not web directory accessible, therefore we need
-    // to specify the sourcePath property. Notice the @vendor alias used.
-    public $sourcePath = '@vendor/fortawesome/font-awesome';
-    public $css = [
-        'css/font-awesome.css',
-    ];
-}
 \ No newline at end of file
-<?php
-
-namespace common\components;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\web\Request;
-use common\models\Language;
-use common\models\Page;
-use yii\helpers\Url;
-
-class LangRequest extends Request
-{  
-    private $_lang_url;
-
-    public function getBaseUrl()
-    {   
-        return str_replace ((IS_FRONT ? '/frontend/web' : '/backend/web'), '', parent::getBaseUrl()) . (IS_FRONT ? '' : '/admin');
-    }
-
-    public function getLangUrl()
-    {
-        if ($this->_lang_url === null) 
-        {
-	        $this->_lang_url = $this->getUrl();
-	        
-	    	$url_list = explode ('/', $this->_lang_url);
-
-	    	$lang_url = isset ($url_list[1]) ? $url_list[1] : null;
-
-	    	Language::setCurrent($lang_url);
-
-            if ($lang_url !== null && $lang_url === Language::getCurrent()->language_code
-                && strpos($this->_lang_url, Language::getCurrent()->language_code) === 1)
-            {
-                $this->_lang_url = substr ($this->_lang_url, strlen (Language::getCurrent()->language_code) + 1);
-            }
-        }
-
-        return $this->_lang_url;
-    }
-
-    protected function resolvePathInfo()
-    {
-        $pathInfo = $this->getLangUrl();
-
-        if (($pos = strpos ($pathInfo, '?')) !== false) 
-        {
-            $pathInfo = substr ($pathInfo, 0, $pos);
-        }
-
-        $pathInfo = urldecode ($pathInfo);
-
-        // try to encode in UTF8 if not so
-        // http://w3.org/International/questions/qa-forms-utf-8.html
-        if (! preg_match ('%^(?:
-            [\x09\x0A\x0D\x20-\x7E]              # ASCII
-            | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
-            | \xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
-            | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-            | \xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
-            | \xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
-            | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-            | \xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
-            )*$%xs', $pathInfo)
-        ) 
-        {
-            $pathInfo = utf8_encode($pathInfo);
-        }
-
-        $scriptUrl = $this->getScriptUrl();
-        
-        $baseUrl = $this->getBaseUrl();
-
-        if (strpos($pathInfo, $scriptUrl) === 0) 
-        {
-            $pathInfo = substr($pathInfo, strlen($scriptUrl));
-        } 
-        else if ($baseUrl === '' || strpos($pathInfo, $baseUrl) === 0) 
-        {
-            $pathInfo = substr($pathInfo, strlen($baseUrl));
-        } 
-        elseif (isset ($_SERVER['PHP_SELF']) && strpos ($_SERVER['PHP_SELF'], $scriptUrl) === 0) 
-        {
-            $pathInfo = substr($_SERVER['PHP_SELF'], strlen($scriptUrl));
-        } 
-        else 
-        {
-            throw new InvalidConfigException('Unable to determine the path info of the current request.');
-        }
-
-        if ($pathInfo[0] === '/') 
-        {
-            $pathInfo = substr ($pathInfo, 1);
-        }
- 
-        return (string) $pathInfo;
-    }
-}
 \ No newline at end of file
-<?php
-
-namespace common\components;
-
-use yii\web\UrlManager;
-use common\models\Language;
-
-class LangUrlManager extends UrlManager
-{
-    public function createUrl ($params)
-    {
-        if (isset ($params['language_id']))
-        {
-            //Если указан идентификатор языка, то делаем попытку найти язык в БД,
-            //иначе работаем с языком по умолчанию 
-            if (($lang_code = Language::findOne($params['language_id'])) === null)
-            {
-                $lang_code = Language::getDefaultLang();
-            }
-            
-            unset ($params['language_id']);
-
-        } 
-        else 
-        {
-            //Если не указан параметр языка, то работаем с текущим языком
-            $lang_code = Language::getCurrent();
-        }
-        
-        //Получаем сформированный URL(без префикса идентификатора языка)
-        $url = parent::createUrl($params);
- 
-        // Добавляем к URL префикс - буквенный идентификатор языка 
-        
-        return $url == '/' ? '/'.$url : ($lang_code->is_default == 1 ?  $url : '/'.$lang_code->lang_code.$url);
-    }
-}
 \ No newline at end of file
@@ -24,8 +24,6 @@ class LangUrlManager extends UrlManager{
         if(!isset($params[$this->langParam])){ if(Yii::$app->language != $this->lang)$params[$this->langParam]=Yii::$app->language;}
 		else if($params[$this->langParam] == $this->lang)unset($params[$this->langParam]);
-
-		
         return parent::createUrl($params);
     }
     //put your code here
 <?php
 return [
-    'language' => 'ru-RU',
+    'language'      => 'ru',
     'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
     'controllerMap' => [
         'elfinder' => [
@@ -42,50 +42,7 @@ return [
         'cache' => [
             'class' => 'yii\caching\FileCache',
         ],
-        'urlManager'   => [
-            'enablePrettyUrl' => true,
-            'showScriptName'  => false,
-            'rules'           => [
-                ''                                                                 => 'site/index',
-                'login'                                                            => 'login/index',
-                'iam'                                                              => 'iam/index',
-                'text/<translit:\w+>'                                              => 'text/index',
-                '<language:(ru|ua|en)>/text/<translit:\w+>'                        => 'text/index',
-                'catalog'                                                          => 'catalog/all',
-                'catalog/<translit:\w+>'                                           => 'catalog/index',
-                'products/search'                                                  => 'products/search',
-                'products/compare'                                                 => 'products/compare',
-                'products/<translit:\w+>'                                          => 'products/index',
-                'products/<translit_rubric:\w+>/<translit:[\w\-]+>-<id:\d+>'       => 'products/show',
-                'news/<translit:\w+>-<id:\d+>'                                     => 'news/show',
-                'brends/<translit:[\w\-]+>'                                        => 'brends/show',
-                'brends'                                                           => 'brends/index',
-                'blog'                                                             => 'articles/index',
-                'blog/<translit:[\w\-]+>-<id:\d+>'                                 => 'articles/show',
-                '<language:(ru|ua|en)>/<module:\w+>/<controller:\w+>/<action:\w+>' => '<module>/<controller>/<action>',
-                '<language:(ru|ua|en)>/<controller:\w+>/<action:\w+>'              => '<controller>/<action>',
-                '<language:(ru|ua|en)>/admin'                                      => 'admin/default/index',
-                '<language:(ru|ua|en)>/admin/users'                                => 'admin/users/index',
-                'admin'                                                            => 'admin/menu/index',
-                'admin/users'                                                      => 'admin/users/index',
-                'admin/users/save'                                                 => 'admin/users/save',
-                'admin/users/delete'                                               => 'admin/users/delete',
-                'admin/menu'        => 'admin/menu/index',
-                'admin/menu/save'   => 'admin/menu/save',
-                'admin/menu/delete' => 'admin/menu/delete',
-                'admin/text'        => 'admin/text/index',
-                'admin/text/save'   => 'admin/text/save',
-                'admin/text/delete' => 'admin/text/delete',
-                'admin/catalog'        => 'admin/catalog/index',
-                'admin/catalog/save'   => 'admin/catalog/save',
-                'admin/catalog/delete' => 'admin/catalog/delete',
-                'module/<module:\w+>/<controller:\w+>/<action:\w+>' => '<module>/<controller>/<action>',
-            ],
-            'class'           => 'common\components\urlManager\LangUrlManager',
-            'languages'       => ['ru', 'ua', 'en'],
-            'lang'            => 'ru',
-            'langParam'       => 'language',
-        ],
+
         'i18n' => [
             'translations' => [
                 '*' => [
@@ -41,30 +41,49 @@ return [
             'errorAction' => 'site/error',
         ],
-        'urlManager' => [
-            'baseUrl' => '/',
+        'urlManager'   => [
             'enablePrettyUrl' => true,
-            'showScriptName' => false,
-            'rules' => [
-                [
-                    'class' => '\common\modules\product\CatalogUrlManager',
-                    'route_map' => [
-                        'catalog' => 'catalog/category',
-                        'product' => 'catalog/product',
-                        'brand' => 'catalog/brand',
-                    ]
-                ],
-                'page/<translit:[A-Za-z0-9_-]++>'=>'page/show',
-                'event/view/<alias:[A-Za-z0-9_-]+>'=>'event/view',
-                'service/view/<alias:[A-Za-z0-9_-]+>'=>'service/view',
-////                'catalog' => 'catalog/category',
-//                'catalog/<alias:[A-Za-z0-9_-]+>' => 'catalog/category',
-//                'catalog/<alias:[A-Za-z0-9_-]+>/<filter>' => 'catalog/category',
-//                'product/<alias:[A-Za-z0-9_-]+>' => 'catalog/product',
-//                'brand' => 'catalog/brands',
-//                'brand/<alias:[A-Za-z0-9_-]+>' => 'catalog/brand',
-            ]
-        ]
+            'showScriptName'  => false,
+            'rules'           => [
+                ''                                                                 => 'site/index',
+                'login'                                                            => 'login/index',
+                'iam'                                                              => 'iam/index',
+                'text/<translit:\w+>'                                              => 'text/index',
+                '<language:(ru|ua|en)>/text/<translit:\w+>'                        => 'text/index',
+                'catalog'                                                          => 'catalog/all',
+                'catalog/<translit:\w+>'                                           => 'catalog/index',
+                'products/search'                                                  => 'products/search',
+                'products/compare'                                                 => 'products/compare',
+                'products/<translit:\w+>'                                          => 'products/index',
+                'products/<translit_rubric:\w+>/<translit:[\w\-]+>-<id:\d+>'       => 'products/show',
+                'news/<translit:\w+>-<id:\d+>'                                     => 'news/show',
+                'brends/<translit:[\w\-]+>'                                        => 'brends/show',
+                'brends'                                                           => 'brends/index',
+                'blog'                                                             => 'articles/index',
+                'blog/<translit:[\w\-]+>-<id:\d+>'                                 => 'articles/show',
+                '<language:(ru|ua|en)>/<module:\w+>/<controller:\w+>/<action:\w+>' => '<module>/<controller>/<action>',
+                '<language:(ru|ua|en)>/<controller:\w+>/<action:\w+>'              => '<controller>/<action>',
+                '<language:(ru|ua|en)>/admin'                                      => 'admin/default/index',
+                '<language:(ru|ua|en)>/admin/users'                                => 'admin/users/index',
+                'admin'                                                            => 'admin/menu/index',
+                'admin/users'                                                      => 'admin/users/index',
+                'admin/users/save'                                                 => 'admin/users/save',
+                'admin/users/delete'                                               => 'admin/users/delete',
+                'admin/menu'        => 'admin/menu/index',
+                'admin/menu/save'   => 'admin/menu/save',
+                'admin/menu/delete' => 'admin/menu/delete',
+                'admin/text'        => 'admin/text/index',
+                'admin/text/save'   => 'admin/text/save',
+                'admin/text/delete' => 'admin/text/delete',
+                'admin/catalog'        => 'admin/catalog/index',
+                'admin/catalog/save'   => 'admin/catalog/save',
+                'admin/catalog/delete' => 'admin/catalog/delete',
+            ],
+            'class'           => 'common\components\urlManager\LangUrlManager',
+            'languages'       => ['ru', 'ua', 'en'],
+            'lang'            => 'ru',
+            'langParam'       => 'language',
+        ],
     ],
     'params' => $params,