Merge branch '1.1' of https://github.com/merdiano/orient-site into 1.1

config/app.php

@@ -81,7 +81,7 @@ return [
     |
     */
 
-    'locale' => 'ru',
+    'locale' => 'en',
 
     /*
     |--------------------------------------------------------------------------

plugins/janvince/smallcontactform/models/Message.php

@@ -93,10 +93,10 @@ class Message extends Model
             foreach( $formFields as $field) {
                 if( $field['name'] == $key) {
                     $fieldDefined = true;
-                    
+
                     if($field['type'] == 'file') {
                         $fieldUpload = true;
-                        
+
                         if(!empty(Input::file($key))) {
                             $file = new File;
                             $file->data = (Input::file($key));
@@ -105,7 +105,7 @@ class Message extends Model
                             $uploads[] = $file;
                         }
                     }
-                    
+
                 }
             }
 
@@ -150,7 +150,7 @@ class Message extends Model
 
         // Add files
         if($uploads) {
-        
+
             foreach($uploads as $upload) {
                 $this->uploads()->add($upload);
             }
@@ -179,7 +179,7 @@ class Message extends Model
 
         /**
         *	Extract and test email field value
-        */        
+        */
         $sendTo = '';
 
         foreach($postData as $key => $field) {
@@ -257,7 +257,7 @@ class Message extends Model
         } elseif ( !empty($componentProperties[ ('autoreply_template_'.App::getLocale())]) and empty( MailTemplate::listAllTemplates()[ $componentProperties[ ('autoreply_template_'.App::getLocale())] ] ) ) {
             Log::error('SMALL CONTACT FORM: Missing defined email template: ' . $componentProperties[ ('autoreply_template_'.App::getLocale())] . '. ' . $template . ' template will be used!');
         }
-        
+
         if(!empty($messageObject->uploads))
         {
             $uploads = $messageObject->uploads;
@@ -272,7 +272,7 @@ class Message extends Model
 
             if (!empty($componentProperties['autoreply_subject'])) {
                 $message->subject(Twig::parse($componentProperties['autoreply_subject'],['fields' => $output]));
-                
+
                 \App::forgetInstance('parse.twig');
                 \App::forgetInstance('twig.environment');
 
@@ -361,13 +361,13 @@ class Message extends Model
 
         $sendTo =  (!empty($componentProperties['notification_address_to']) ? $componentProperties['notification_address_to'] : Settings::getTranslated('notification_address_to') );
 
-        $sendToAddresses = explode(',', $sendTo);        
+        $sendToAddresses = explode(',', $sendTo);
         $sendToAddressesValidated = [];
 
         foreach($sendToAddresses as $sendToAddress) {
 
             $validator = Validator::make(['email' => trim($sendToAddress)], ['email' => 'required|email']);
-    
+
             if($validator->fails()){
                 Log::error('SMALL CONTACT FORM ERROR: Notification email address (' .trim($sendToAddress). ') is invalid! No notification will be delivered!');
             } else {
@@ -454,7 +454,7 @@ class Message extends Model
         } elseif ( !empty($componentProperties[ ('notification_template_'.App::getLocale())]) and empty( MailTemplate::listAllTemplates()[ $componentProperties[ ('notification_template_'.App::getLocale())] ] ) ) {
             Log::error('SMALL CONTACT FORM: Missing defined email template: ' . $componentProperties[ ('notification_template_'.App::getLocale())] . '. ' . $template . ' template will be used!');
         }
-        
+
         if(!empty($messageObject->uploads))
         {
             $uploads = $messageObject->uploads;
@@ -467,7 +467,7 @@ class Message extends Model
         Mail::{$method}($template, ['messageObject' => $messageObject, 'uploads' => $uploads, 'fields' => $output, 'fieldsDetails' => $outputFull, 'url' => url()->full()], function($message) use($sendToAddressesValidated, $replyToAddress, $replyToName, $componentProperties, $output){
 
             if( count($sendToAddressesValidated)>1 ) {
-                
+
                 foreach($sendToAddressesValidated as $address) {
                     $message->bcc($address);
                 }

plugins/rainlab/translate/components/LocalePicker.php

@@ -1,5 +1,5 @@
 <?php namespace RainLab\Translate\Components;
-
+use Log;
 use Event;
 use Config;
 use Request;
@@ -64,6 +64,7 @@ class LocalePicker extends ComponentBase
     public function onRun()
     {
         if ($redirect = $this->redirectForceUrl()) {
+            
             return $redirect;
         }
 
@@ -75,6 +76,7 @@ class LocalePicker extends ComponentBase
     public function onSwitchLocale()
     {
         if (!$locale = post('locale')) {
+            
             return;
         }
 
@@ -88,6 +90,8 @@ class LocalePicker extends ComponentBase
             return Redirect::to($this->translator->getPathInLocale($pageUrl, $locale));
         }
 
+        //Log::error($pageUrl);
+        //return $pageUrl;
         return Redirect::to($pageUrl);
     }
 

plugins/serenitynow/cacheroute/classes/RouteCacheMiddleware.php

@@ -15,7 +15,7 @@ class RouteCacheMiddleware
         $cacheRow = $this->shouldBeCached($request);
         $ajaxRequest = $request->ajax();
 //dd($cacheRow);
-        if (!$hasTable || !$cacheRow || $ajaxRequest) {
+        if (!$hasTable || !$cacheRow || $ajaxRequest ||$request->post()) {
             return $next($request);
         }
 

plugins/tps/reklama/components/Advertisement.php

@@ -11,7 +11,7 @@ use Tps\Reklama\Models\Statistika;
 
 class Advertisement extends ComponentBase
 {
-    public $group;
+    public $group, $css_class;
     public function componentDetails()
     {
         return [
@@ -68,13 +68,8 @@ class Advertisement extends ComponentBase
         ];
     }
 
-    public function onRun()
-    {
-        parent::onRun(); // TODO: Change the autogenerated stub
-    }
-
     public function onDisplay(){
-        $random = $this->property('random');
+        $random = input('random');
         $this->page['group'] = $group = Group::where('code',$this->property('code'))
             ->with(['adds' => function ($query) use ($random){
                 if($random)
@@ -83,7 +78,7 @@ class Advertisement extends ComponentBase
                     $query->orderBy('order');
             }])
             ->first();
-
+        $this->page['css_class'] = input('css_class','blat');
         if ($group && $group->adds){
             try {
                 DB::beginTransaction();

plugins/tps/reklama/components/advertisement/default.htm

@@ -1,7 +1,11 @@
 
-<div id="{{__SELF__}}"></div>
+<div id="{{__SELF__}}" class="{{__SELF__.property('css_class')}}"></div>
 {% put scripts %}
 <script>
-    $.request('{{__SELF__}}::onDisplay')
+    $.request('{{__SELF__}}::onDisplay',{
+        data:{random:{{__SELF__.property('random')}}
+    {% if __SELF__.property('css_class') %},css_class:'{{__SELF__.property('css_class')}}' {% endif %}
+        }
+    });
 </script>
 {% endput %}

plugins/tps/reklama/components/advertisement/single.htm

@@ -1,9 +1,16 @@
+
 {% set reklama = group.adds.first %}
 <a
-   {% if reklama.enable_stats and reklama.url !="#" %}
+   {% if reklama.url  %}
-   data-request="{{__SELF__}}::onRedirect"
+        {% if reklama.enable_stats  %}
-   data-request-data = '[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
+           data-request="{{__SELF__}}::onRedirect"
+           data-request-data = '[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
+        {% else %}
+            href="{{reklama.url}}"
+            target="_blank"
+        {% endif %}
    {% endif %}
+   class="{{ css_class }}"
 >
     <img src="{{reklama.media|media_cdn}}" alt="{{reklama.title}}">
 </a>

scripts/category.sql

@@ -30,6 +30,7 @@ SELECT rb.id, bt.id FROM orient_wordpress.`iatm_orient_2_term_relationships` rl
                   Inner JOIN  orient.rainlab_blog_categories bt on bt.id = rl.term_taxonomy_id
                   INNER JOIN orient.rainlab_blog_posts rb on rl.object_id = rb.id_en
 
+
 update iatm_orient_term_relationships SET term_taxonomy_id = 9 where term_taxonomy_id = 2;
 update iatm_orient_term_relationships SET term_taxonomy_id = 5 where term_taxonomy_id = 3;
 update iatm_orient_term_relationships SET term_taxonomy_id = 8 where term_taxonomy_id = 5;
@@ -40,7 +41,11 @@ update iatm_orient_term_relationships SET term_taxonomy_id = 6 where term_taxono
 update iatm_orient_term_relationships SET term_taxonomy_id = 7 where term_taxonomy_id = 26;
 update iatm_orient_term_relationships SET term_taxonomy_id = 14 where term_taxonomy_id = 29;
 update iatm_orient_term_relationships SET term_taxonomy_id = 12 where term_taxonomy_id = 41;
-update iatm_orient_term_relationships SET term_taxonomy_id = 793 where term_taxonomy_id = 41;
+update iatm_orient_term_relationships SET term_taxonomy_id = 793 where term_taxonomy_id = 101;
 update iatm_orient_term_relationships SET term_taxonomy_id = 621 where term_taxonomy_id = 696;
 
 
+INSERT INTO rainlab_blog_posts_categories (post_id,category_id)
+SELECT rb.id, bt.id FROM `iatm_orient_term_relationships` rl
+                             Inner JOIN  rainlab_blog_categories bt on bt.id = rl.term_taxonomy_id
+                             INNER JOIN rainlab_blog_posts rb on rl.object_id = rb.id_ru and rb.locale='ru'

scripts/post.sql

@@ -1,10 +1,16 @@
 DELETE from orient_wordpress.arient_ru_posts where post_type not in ('post','attachment');
 DELETE from orient_wordpress.arient_ru_posts where post_status in ('draft','auto-draft');
 
-ALTER TABLE `rainlab_blog_posts` CHANGE `title` `title` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, CHANGE `slug` `slug` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
+ALTER TABLE `rainlab_blog_posts` CHANGE `title` `title` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
+    CHANGE `slug` `slug` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
 
-INSERT INTO orient.rainlab_blog_posts (user_id,title,slug,excerpt,content_html,published_at,published,created_at,updated_at,locale,id_en)
+INSERT INTO orient.rainlab_blog_posts (user_id,title,slug,excerpt,content,content_html,published_at,published,
-SELECT post_author,post_title,post_name,post_excerpt,post_content,post_date,1,post_date,post_modified,'en',id from orient_wordpress.arient_2_posts;
+                                       created_at,updated_at,locale,id_en,powerseo_title,powerseo_description,
+                                       powerseo_robot_index,powerseo_robot_follow)
+SELECT post_author,post_title,post_name,post_excerpt,post_content,post_content,post_date,1,post_date,post_modified,'en',
+       id, post_title, post_excerpt,  'index', 'nofollow'
+from orient_wordpress.arient_2_posts
+where post_type='post' and post_status='publish';
 
 INSERT INTO orient.rainlab_blog_posts (user_id,title,slug,excerpt,content,content_html,published_at,published,created_at,updated_at,locale,id_en)
 SELECT post_author,post_title,post_name,post_excerpt,post_content,post_content,post_date,1,post_date,post_modified,'ru',id
@@ -17,26 +23,33 @@ Delete FROM arient_2_posts_temp WHERE post_date <'2019-01-01'
 
 ////////////////////////////////insert featured images
 UPDATE rainlab_blog_posts rb
-inner join iatm_2_postmeta ip on rb.id_en = ip.post_id and ip.meta_key='_thumbnail_id'
+    inner join iatm_orient_2_postmeta ip on rb.id_en = ip.post_id and ip.meta_key='_thumbnail_id'
-inner join arient_2_posts_temp wp on wp.ID = ip.meta_value
+    inner join iatm_orient_2_posts wp on wp.ID = ip.meta_value
-set rb.featerd_image = wp.guid
+    set rb.featured_image = REPLACE(wp.guid,'https://orient.tm/en/wp-content/uploads/sites/2/','/en/')
 
 ALTER TABLE `rainlab_blog_posts` CHANGE `featured_image` `featured_image` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL;
 
 UPDATE rainlab_blog_posts rb
-    inner join orient_wordpress.iatm_orient_postmeta ip on rb.id_ru = ip.post_id and ip.meta_key='_thumbnail_id'
+    inner join iatm_orient_postmeta ip on rb.id_ru = ip.post_id and ip.meta_key='_thumbnail_id'
-    inner join orient_wordpress.arient_ru_posts wp on wp.ID = ip.meta_value
+    inner join iatm_orient_posts wp on wp.ID = ip.meta_value
-    set rb.featured_image = REPLACE(wp.guid,'https://orient.tm/en/wp-content/','')
+    set rb.featured_image = REPLACE(REPLACE(wp.guid,'https://orient.tm/wp-content/uploads/','/ru/'),'http://orient.tm/wp-content/uploads/','/ru/')
+where rb.locale = 'ru'
 
 ////////////// replace image address
 UPDATE rainlab_blog_posts set featured_image = REPLACE(featured_image,'https://orient.tm/en/wp-content/','') where featured_image !=''
 
 ///////////////////////post views//////
-INSERT INTO orient.vdomah_blogviews_views (views,post_id)
-select pp.pageviews,rb.id FROM orient_wordpress.iatm_orient_2_popularpostsdata pp
-INNER join orient.rainlab_blog_posts rb on rb.id_en = pp.postid
 
-INSERT INTO orient.vdomah_blogviews_views (views,post_id)
+INSERT INTO vdomah_blogviews_views (views,post_id)
-select pp.pageviews,rb.id FROM orient_wordpress.iatm_orient_popularpostsdata pp
+select pp.meta_value,rb.id FROM iatm_orient_2_postmeta pp
-                                   INNER join orient.rainlab_blog_posts rb on rb.id_ru = pp.postid AND rb.locale = 'ru'
+                                    INNER join rainlab_blog_posts rb on rb.id_en = pp.post_id AND rb.locale = 'en' and pp.meta_key = 'views';
+INSERT IGNORE INTO vdomah_blogviews_views (views,post_id)
+select pp.meta_value,rb.id FROM iatm_orient_postmeta pp
+                                    INNER join rainlab_blog_posts rb on rb.id_ru = pp.post_id AND rb.locale = 'ru' and pp.meta_key = 'views';
+////post inside image
+UPDATE rainlab_blog_posts set content = replace(content,'http://orient.tm/wp-content/uploads/','storage/app/media/ru/')
 
+UPDATE rainlab_blog_posts set content = replace(content,'https://orient.tm/wp-content/uploads/','storage/app/media/ru/'), content_html = REPLACE(content_html,'https://orient.tm/wp-content/uploads/','storage/app/media/ru/')
+
+UPDATE rainlab_blog_posts set content = replace(content,'https://orient.tm/en/wp-content/uploads/sites/2/','storage/app/media/en/'), content_html = REPLACE(content_html,'https://orient.tm/en/wp-content/uploads/sites/2/','storage/app/media/en/')
+where content_html LIKE '%https://orient.tm/en/wp-content/uploads/sites/2/%'

scripts/tags.sql

@@ -5,9 +5,11 @@ LEFT JOIN orient_wordpress.iatm_orient_2_terms tm ON ta.`term_id` = tm.term_id
 WHERE ta.taxonomy = 'post_tag';
 
 
-INSERT INTO orient.bedard_blogtags_post_tag (tag_id,post_id)
+INSERT INTO bedard_blogtags_post_tag (tag_id,post_id)
 SELECT bt.id, rb.id FROM `iatm_orient_2_term_relationships`  rl
-LEFT JOIN iatm_orient_2_term_taxonomy tx ON  rl.term_taxonomy_id = tx.term_taxonomy_id
+                             LEFT JOIN iatm_orient_2_term_taxonomy tx ON  rl.term_taxonomy_id = tx.term_taxonomy_id
-LEFT JOIN orient.rainlab_blog_posts rb on rl.object_id = rb.id_en
+                             LEFT JOIN rainlab_blog_posts rb on rl.object_id = rb.id_en
-LEFT JOIN  orient.bedard_blogtags_tags bt on bt.id_en = rl.term_taxonomy_id
+                             LEFT JOIN  bedard_blogtags_tags bt on bt.id_en = rl.term_taxonomy_id
-WHERE tx.taxonomy = 'post_tag'
+where tx.taxonomy = 'post_tag' and bt.locale ='en'
+
+ALTER TABLE `bedard_blogtags_tags` ADD UNIQUE `unique_index`(`name`, `locale`);

storage/framework/classes.php

@@ -253,4 +253,192 @@
   'Tps\\Reklama\\Widgets\\Stats' => 'plugins/tps/reklama/widgets/Stats.php',
   'indikator\\devtools\\Plugin' => 'plugins/indikator/devtools/Plugin.php',
   'Indikator\\DevTools\\Models\\Settings' => 'plugins/indikator/devtools/models/Settings.php',
+  'System\\Classes\\PluginManager' => 'modules/system/classes/PluginManager.php',
+  'System\\Classes\\PluginBase' => 'modules/system/classes/PluginBase.php',
+  'System\\Classes\\ComposerManager' => 'modules/system/classes/ComposerManager.php',
+  'System\\Classes\\CombineAssets' => 'modules/system/classes/CombineAssets.php',
+  'Cms\\Contracts\\CmsObject' => 'modules/cms/contracts/CmsObject.php',
+  'Cms\\Classes\\CmsObject' => 'modules/cms/classes/CmsObject.php',
+  'Cms\\Classes\\CmsCompoundObject' => 'modules/cms/classes/CmsCompoundObject.php',
+  'Cms\\Classes\\Page' => 'modules/cms/classes/Page.php',
+  'System\\Models\\File' => 'modules/system/models/File.php',
+  'Cms\\Models\\ThemeData' => 'modules/cms/models/ThemeData.php',
+  'System\\Classes\\MailManager' => 'modules/system/classes/MailManager.php',
+  'System\\Classes\\MarkupManager' => 'modules/system/classes/MarkupManager.php',
+  'Cms\\Classes\\ComponentManager' => 'modules/cms/classes/ComponentManager.php',
+  'Backend\\Facades\\BackendMenu' => 'modules/backend/facades/BackendMenu.php',
+  'Backend\\Classes\\NavigationManager' => 'modules/backend/classes/NavigationManager.php',
+  'System\\Classes\\ModelBehavior' => 'modules/system/classes/ModelBehavior.php',
+  'System\\Traits\\ConfigMaker' => 'modules/system/traits/ConfigMaker.php',
+  'System\\Behaviors\\SettingsModel' => 'modules/system/behaviors/SettingsModel.php',
+  'Cms\\Classes\\CmsController' => 'modules/cms/classes/CmsController.php',
+  'System\\Traits\\AssetMaker' => 'modules/system/traits/AssetMaker.php',
+  'System\\Traits\\EventEmitter' => 'modules/system/traits/EventEmitter.php',
+  'System\\Traits\\PropertyContainer' => 'modules/system/traits/PropertyContainer.php',
+  'Cms\\Classes\\ComponentBase' => 'modules/cms/classes/ComponentBase.php',
+  'System\\Traits\\ViewMaker' => 'modules/system/traits/ViewMaker.php',
+  'System\\Traits\\ResponseMaker' => 'modules/system/traits/ResponseMaker.php',
+  'System\\Traits\\SecurityController' => 'modules/system/traits/SecurityController.php',
+  'Backend\\Traits\\ErrorMaker' => 'modules/backend/traits/ErrorMaker.php',
+  'Backend\\Traits\\WidgetMaker' => 'modules/backend/traits/WidgetMaker.php',
+  'Backend\\Classes\\Controller' => 'modules/backend/classes/Controller.php',
+  'Backend\\Traits\\SessionMaker' => 'modules/backend/traits/SessionMaker.php',
+  'Backend\\Classes\\ControllerBehavior' => 'modules/backend/classes/ControllerBehavior.php',
+  'Backend\\Traits\\FormModelSaver' => 'modules/backend/traits/FormModelSaver.php',
+  'Backend\\Behaviors\\FormController' => 'modules/backend/behaviors/FormController.php',
+  'Backend\\Behaviors\\ListController' => 'modules/backend/behaviors/ListController.php',
+  'Backend\\Behaviors\\ImportExportController' => 'modules/backend/behaviors/ImportExportController.php',
+  'Cms\\Classes\\Controller' => 'modules/cms/classes/Controller.php',
+  'Cms\\Classes\\Theme' => 'modules/cms/classes/Theme.php',
+  'Cms\\Classes\\Router' => 'modules/cms/classes/Router.php',
+  'Cms\\Classes\\PartialStack' => 'modules/cms/classes/PartialStack.php',
+  'System\\Twig\\Loader' => 'modules/system/twig/Loader.php',
+  'Cms\\Twig\\Loader' => 'modules/cms/twig/Loader.php',
+  'Cms\\Twig\\Extension' => 'modules/cms/twig/Extension.php',
+  'System\\Twig\\Extension' => 'modules/system/twig/Extension.php',
+  'System\\Twig\\SecurityPolicy' => 'modules/system/twig/SecurityPolicy.php',
+  'Cms\\Twig\\DebugExtension' => 'modules/cms/twig/DebugExtension.php',
+  'Cms\\Classes\\Content' => 'modules/cms/classes/Content.php',
+  'Cms\\Models\\ThemeLog' => 'modules/cms/models/ThemeLog.php',
+  'Cms\\Components\\ViewBag' => 'modules/cms/components/ViewBag.php',
+  'Cms\\Classes\\CodeBase' => 'modules/cms/classes/CodeBase.php',
+  'Cms\\Classes\\CmsObjectCollection' => 'modules/cms/classes/CmsObjectCollection.php',
+  'Cms\\Models\\MaintenanceSetting' => 'modules/cms/models/MaintenanceSetting.php',
+  'Cms\\Classes\\Layout' => 'modules/cms/classes/Layout.php',
+  'Cms\\Classes\\CmsException' => 'modules/cms/classes/CmsException.php',
+  'Cms\\Classes\\CodeParser' => 'modules/cms/classes/CodeParser.php',
+  'Cms\\Classes\\LayoutCode' => 'modules/cms/classes/LayoutCode.php',
+  'Cms\\Classes\\PageCode' => 'modules/cms/classes/PageCode.php',
+  'Cms\\Classes\\MediaViewHelper' => 'modules/cms/classes/MediaViewHelper.php',
+  'Backend\\Classes\\WidgetManager' => 'modules/backend/classes/WidgetManager.php',
+  'Backend\\Facades\\BackendAuth' => 'modules/backend/facades/BackendAuth.php',
+  'Backend\\Classes\\AuthManager' => 'modules/backend/classes/AuthManager.php',
+  'System\\Classes\\SettingsManager' => 'modules/system/classes/SettingsManager.php',
+  'Backend\\Classes\\BackendController' => 'modules/backend/classes/BackendController.php',
+  'Backend\\Classes\\Skin' => 'modules/backend/classes/Skin.php',
+  'Backend\\Skins\\Standard' => 'modules/backend/skins/Standard.php',
+  'Backend\\Models\\Preference' => 'modules/backend/models/Preference.php',
+  'Backend\\Models\\BrandSetting' => 'modules/backend/models/BrandSetting.php',
+  'Backend\\Facades\\Backend' => 'modules/backend/facades/Backend.php',
+  'Backend\\Helpers\\Backend' => 'modules/backend/helpers/Backend.php',
+  'System\\Models\\Parameter' => 'modules/system/models/Parameter.php',
+  'Backend\\Models\\EditorSetting' => 'modules/backend/models/EditorSetting.php',
+  'Backend\\Models\\User' => 'modules/backend/models/User.php',
+  'System\\Classes\\SystemController' => 'modules/system/classes/SystemController.php',
+  'System\\Models\\RequestLog' => 'modules/system/models/RequestLog.php',
+  'System\\Models\\LogSetting' => 'modules/system/models/LogSetting.php',
+  'Cms\\Classes\\ComponentPartial' => 'modules/cms/classes/ComponentPartial.php',
+  'Cms\\Classes\\Partial' => 'modules/cms/classes/Partial.php',
+  'Cms\\Helpers\\File' => 'modules/cms/helpers/File.php',
+  'Cms\\Twig\\PageTokenParser' => 'modules/cms/twig/PageTokenParser.php',
+  'Cms\\Twig\\PartialTokenParser' => 'modules/cms/twig/PartialTokenParser.php',
+  'Cms\\Twig\\ContentTokenParser' => 'modules/cms/twig/ContentTokenParser.php',
+  'Cms\\Twig\\PutTokenParser' => 'modules/cms/twig/PutTokenParser.php',
+  'Cms\\Twig\\PlaceholderTokenParser' => 'modules/cms/twig/PlaceholderTokenParser.php',
+  'Cms\\Twig\\DefaultTokenParser' => 'modules/cms/twig/DefaultTokenParser.php',
+  'Cms\\Twig\\FrameworkTokenParser' => 'modules/cms/twig/FrameworkTokenParser.php',
+  'Cms\\Twig\\ComponentTokenParser' => 'modules/cms/twig/ComponentTokenParser.php',
+  'Cms\\Twig\\FlashTokenParser' => 'modules/cms/twig/FlashTokenParser.php',
+  'Cms\\Twig\\ScriptsTokenParser' => 'modules/cms/twig/ScriptsTokenParser.php',
+  'Cms\\Twig\\StylesTokenParser' => 'modules/cms/twig/StylesTokenParser.php',
+  'System\\Helpers\\DateTime' => 'modules/system/helpers/DateTime.php',
+  'Cms\\Classes\\PartialCode' => 'modules/cms/classes/PartialCode.php',
+  'Cms\\Classes\\Meta' => 'modules/cms/classes/Meta.php',
+  'Cms\\Facades\\Cms' => 'modules/cms/facades/Cms.php',
+  'Cms\\Helpers\\Cms' => 'modules/cms/helpers/Cms.php',
+  'Cms\\Twig\\PartialNode' => 'modules/cms/twig/PartialNode.php',
+  'Cms\\Twig\\ComponentNode' => 'modules/cms/twig/ComponentNode.php',
+  'Cms\\Twig\\PutNode' => 'modules/cms/twig/PutNode.php',
+  'System\\Classes\\MediaLibrary' => 'modules/system/classes/MediaLibrary.php',
+  'System\\Models\\EventLog' => 'modules/system/models/EventLog.php',
+  'System\\Classes\\ErrorHandler' => 'modules/system/classes/ErrorHandler.php',
+  'Backend\\Traits\\InspectableContainer' => 'modules/backend/traits/InspectableContainer.php',
+  'Backend\\Models\\UserThrottle' => 'modules/backend/models/UserThrottle.php',
+  'Backend\\Classes\\WidgetBase' => 'modules/backend/classes/WidgetBase.php',
+  'Backend\\Traits\\UploadableWidget' => 'modules/backend/traits/UploadableWidget.php',
+  'Backend\\Widgets\\MediaManager' => 'modules/backend/widgets/MediaManager.php',
+  'Backend\\Widgets\\ReportContainer' => 'modules/backend/widgets/ReportContainer.php',
+  'Backend\\Models\\UserPreference' => 'modules/backend/models/UserPreference.php',
+  'Backend\\Classes\\ReportWidgetBase' => 'modules/backend/classes/ReportWidgetBase.php',
+  'System\\ReportWidgets\\Status' => 'modules/system/reportwidgets/Status.php',
+  'System\\Classes\\UpdateManager' => 'modules/system/classes/UpdateManager.php',
+  'Cms\\Classes\\ThemeManager' => 'modules/cms/classes/ThemeManager.php',
+  'System\\Classes\\VersionManager' => 'modules/system/classes/VersionManager.php',
+  'System\\Models\\PluginVersion' => 'modules/system/models/PluginVersion.php',
+  'Backend\\Models\\ExportModel' => 'modules/backend/models/ExportModel.php',
+  'Backend\\Widgets\\Form' => 'modules/backend/widgets/Form.php',
+  'Backend\\Classes\\FormTabs' => 'modules/backend/classes/FormTabs.php',
+  'Backend\\Classes\\FormField' => 'modules/backend/classes/FormField.php',
+  'Backend\\Traits\\PreferenceMaker' => 'modules/backend/traits/PreferenceMaker.php',
+  'Backend\\Widgets\\Lists' => 'modules/backend/widgets/Lists.php',
+  'Backend\\Widgets\\Toolbar' => 'modules/backend/widgets/Toolbar.php',
+  'Backend\\Widgets\\Search' => 'modules/backend/widgets/Search.php',
+  'Backend\\Widgets\\Filter' => 'modules/backend/widgets/Filter.php',
+  'Backend\\Classes\\FilterScope' => 'modules/backend/classes/FilterScope.php',
+  'Backend\\Classes\\ListColumn' => 'modules/backend/classes/ListColumn.php',
+  'Backend\\Behaviors\\UserPreferencesModel' => 'modules/backend/behaviors/UserPreferencesModel.php',
+  'Backend\\Classes\\MainMenuItem' => 'modules/backend/classes/MainMenuItem.php',
+  'Backend\\Classes\\SideMenuItem' => 'modules/backend/classes/SideMenuItem.php',
+  'Backend\\Classes\\FormWidgetBase' => 'modules/backend/classes/FormWidgetBase.php',
+  'Backend\\FormWidgets\\ColorPicker' => 'modules/backend/formwidgets/ColorPicker.php',
+  'Backend\\FormWidgets\\MediaFinder' => 'modules/backend/formwidgets/MediaFinder.php',
+  'Backend\\FormWidgets\\Repeater' => 'modules/backend/formwidgets/Repeater.php',
+  'System\\Classes\\MediaLibraryItem' => 'modules/system/classes/MediaLibraryItem.php',
+  'Cms\\Twig\\PageNode' => 'modules/cms/twig/PageNode.php',
+  'Cms\\Twig\\FrameworkNode' => 'modules/cms/twig/FrameworkNode.php',
+  'Cms\\Twig\\ScriptsNode' => 'modules/cms/twig/ScriptsNode.php',
+  'Cms\\Twig\\PlaceholderNode' => 'modules/cms/twig/PlaceholderNode.php',
+  'Cms\\Twig\\StylesNode' => 'modules/cms/twig/StylesNode.php',
+  'Backend\\Traits\\FormModelWidget' => 'modules/backend/traits/FormModelWidget.php',
+  'Backend\\FormWidgets\\Relation' => 'modules/backend/formwidgets/Relation.php',
+  'Backend\\FormWidgets\\DatePicker' => 'modules/backend/formwidgets/DatePicker.php',
+  'Backend\\Behaviors\\ReorderController' => 'modules/backend/behaviors/ReorderController.php',
+  'Cms\\Classes\\MediaLibrary' => 'modules/cms/classes/MediaLibrary.php',
+  'Backend\\FormWidgets\\CodeEditor' => 'modules/backend/formwidgets/CodeEditor.php',
+  'Backend\\FormWidgets\\RichEditor' => 'modules/backend/formwidgets/RichEditor.php',
+  'Backend\\Models\\UserRole' => 'modules/backend/models/UserRole.php',
+  'Backend\\Models\\UserGroup' => 'modules/backend/models/UserGroup.php',
+  'Backend\\FormWidgets\\FileUpload' => 'modules/backend/formwidgets/FileUpload.php',
+  'Backend\\FormWidgets\\PermissionEditor' => 'modules/backend/formwidgets/PermissionEditor.php',
+  'System\\Helpers\\Cache' => 'modules/system/helpers/Cache.php',
+  'Backend\\Models\\AccessLog' => 'modules/backend/models/AccessLog.php',
+  'Backend\\Models\\ImportModel' => 'modules/backend/models/ImportModel.php',
+  'System\\Helpers\\View' => 'modules/system/helpers/View.php',
+  'Cms\\Classes\\ComponentHelpers' => 'modules/cms/classes/ComponentHelpers.php',
+  'Cms\\Twig\\FlashNode' => 'modules/cms/twig/FlashNode.php',
+  'Backend\\Traits\\SelectableWidget' => 'modules/backend/traits/SelectableWidget.php',
+  'Backend\\Traits\\CollapsableWidget' => 'modules/backend/traits/CollapsableWidget.php',
+  'Cms\\Widgets\\TemplateList' => 'modules/cms/widgets/TemplateList.php',
+  'Cms\\Widgets\\ComponentList' => 'modules/cms/widgets/ComponentList.php',
+  'Cms\\Widgets\\AssetList' => 'modules/cms/widgets/AssetList.php',
+  'Cms\\Classes\\Asset' => 'modules/cms/classes/Asset.php',
+  'System\\Console\\OctoberUp' => 'modules/system/console/OctoberUp.php',
+  'System\\Console\\OctoberDown' => 'modules/system/console/OctoberDown.php',
+  'System\\Console\\OctoberUpdate' => 'modules/system/console/OctoberUpdate.php',
+  'System\\Console\\OctoberUtil' => 'modules/system/console/OctoberUtil.php',
+  'System\\Console\\OctoberMirror' => 'modules/system/console/OctoberMirror.php',
+  'System\\Console\\OctoberFresh' => 'modules/system/console/OctoberFresh.php',
+  'System\\Console\\OctoberEnv' => 'modules/system/console/OctoberEnv.php',
+  'System\\Console\\OctoberInstall' => 'modules/system/console/OctoberInstall.php',
+  'System\\Console\\OctoberPasswd' => 'modules/system/console/OctoberPasswd.php',
+  'System\\Console\\PluginInstall' => 'modules/system/console/PluginInstall.php',
+  'System\\Console\\PluginRemove' => 'modules/system/console/PluginRemove.php',
+  'System\\Console\\PluginDisable' => 'modules/system/console/PluginDisable.php',
+  'System\\Console\\PluginEnable' => 'modules/system/console/PluginEnable.php',
+  'System\\Console\\PluginRefresh' => 'modules/system/console/PluginRefresh.php',
+  'System\\Console\\PluginRollback' => 'modules/system/console/PluginRollback.php',
+  'System\\Console\\PluginList' => 'modules/system/console/PluginList.php',
+  'System\\Console\\ThemeInstall' => 'modules/system/console/ThemeInstall.php',
+  'System\\Console\\ThemeRemove' => 'modules/system/console/ThemeRemove.php',
+  'System\\Console\\ThemeList' => 'modules/system/console/ThemeList.php',
+  'System\\Console\\ThemeUse' => 'modules/system/console/ThemeUse.php',
+  'System\\Console\\ThemeSync' => 'modules/system/console/ThemeSync.php',
+  'Indikator\\DevTools\\Widgets\\AssetList' => 'plugins/indikator/devtools/widgets/AssetList.php',
+  'Indikator\\DevTools\\Classes\\Asset' => 'plugins/indikator/devtools/classes/Asset.php',
+  'Backend\\FormWidgets\\DataTable' => 'modules/backend/formwidgets/DataTable.php',
+  'Cms\\FormWidgets\\Components' => 'modules/cms/formwidgets/Components.php',
+  'Backend\\Widgets\\Table' => 'modules/backend/widgets/Table.php',
+  'Backend\\Widgets\\Table\\DataSourceBase' => 'modules/backend/widgets/table/DataSourceBase.php',
+  'Backend\\Widgets\\Table\\ClientMemoryDataSource' => 'modules/backend/widgets/table/ClientMemoryDataSource.php',
+  'Indikator\\DevTools\\FormWidgets\\Help' => 'plugins/indikator/devtools/formwidgets/Help.php',
 );

storage/framework/config.php

@@ -2,12 +2,13 @@
   '*::app' => 
   array (
     'debug' => true,
-    'name' => 'October CMS',
+    'name' => 'Orient news',
     'url' => 'http://localhost',
-    'timezone' => 'UTC',
+    'cdn' => 'https://cdn.orient.tm',
-    'locale' => 'en',
+    'timezone' => 'Asia/Ashgabat',
+    'locale' => 'ru',
     'fallback_locale' => 'en',
-    'key' => '8o4ZwITaMYnMsYh2c4UCGvcgLLBzdODg',
+    'key' => 'eewJAqF0bRZuyNoSULErcjKkZWZKFeK6',
     'cipher' => 'AES-256-CBC',
     'providers' => 
     array (
@@ -21,23 +22,23 @@
       7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
       8 => 'Illuminate\\Pipeline\\PipelineServiceProvider',
       9 => 'Illuminate\\Queue\\QueueServiceProvider',
-      10 => 'Illuminate\\Session\\SessionServiceProvider',
+      10 => 'Illuminate\\Redis\\RedisServiceProvider',
-      11 => 'Illuminate\\View\\ViewServiceProvider',
+      11 => 'Illuminate\\Session\\SessionServiceProvider',
-      12 => 'Laravel\\Tinker\\TinkerServiceProvider',
+      12 => 'Illuminate\\Validation\\ValidationServiceProvider',
-      13 => 'October\\Rain\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+      13 => 'Illuminate\\View\\ViewServiceProvider',
-      14 => 'October\\Rain\\Database\\DatabaseServiceProvider',
+      14 => 'Laravel\\Tinker\\TinkerServiceProvider',
-      15 => 'October\\Rain\\Halcyon\\HalcyonServiceProvider',
+      15 => 'October\\Rain\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-      16 => 'October\\Rain\\Filesystem\\FilesystemServiceProvider',
+      16 => 'October\\Rain\\Database\\DatabaseServiceProvider',
-      17 => 'October\\Rain\\Parse\\ParseServiceProvider',
+      17 => 'October\\Rain\\Halcyon\\HalcyonServiceProvider',
-      18 => 'October\\Rain\\Html\\HtmlServiceProvider',
+      18 => 'October\\Rain\\Filesystem\\FilesystemServiceProvider',
-      19 => 'October\\Rain\\Html\\UrlServiceProvider',
+      19 => 'October\\Rain\\Parse\\ParseServiceProvider',
-      20 => 'October\\Rain\\Network\\NetworkServiceProvider',
+      20 => 'October\\Rain\\Html\\HtmlServiceProvider',
-      21 => 'October\\Rain\\Scaffold\\ScaffoldServiceProvider',
+      21 => 'October\\Rain\\Html\\UrlServiceProvider',
-      22 => 'October\\Rain\\Flash\\FlashServiceProvider',
+      22 => 'October\\Rain\\Network\\NetworkServiceProvider',
-      23 => 'October\\Rain\\Mail\\MailServiceProvider',
+      23 => 'October\\Rain\\Scaffold\\ScaffoldServiceProvider',
-      24 => 'October\\Rain\\Argon\\ArgonServiceProvider',
+      24 => 'October\\Rain\\Flash\\FlashServiceProvider',
-      25 => 'October\\Rain\\Redis\\RedisServiceProvider',
+      25 => 'October\\Rain\\Mail\\MailServiceProvider',
-      26 => 'October\\Rain\\Validation\\ValidationServiceProvider',
+      26 => 'October\\Rain\\Argon\\ArgonServiceProvider',
       27 => 'System\\ServiceProvider',
     ),
     'loadDiscoveredPackages' => false,
@@ -54,6 +55,7 @@
       'Eloquent' => 'Illuminate\\Database\\Eloquent\\Model',
       'Event' => 'Illuminate\\Support\\Facades\\Event',
       'Hash' => 'Illuminate\\Support\\Facades\\Hash',
+      'Input' => 'Illuminate\\Support\\Facades\\Input',
       'Lang' => 'Illuminate\\Support\\Facades\\Lang',
       'Log' => 'Illuminate\\Support\\Facades\\Log',
       'Mail' => 'Illuminate\\Support\\Facades\\Mail',
@@ -67,6 +69,7 @@
       'Storage' => 'Illuminate\\Support\\Facades\\Storage',
       'Url' => 'Illuminate\\Support\\Facades\\URL',
       'URL' => 'Illuminate\\Support\\Facades\\URL',
+      'Validator' => 'Illuminate\\Support\\Facades\\Validator',
       'View' => 'Illuminate\\Support\\Facades\\View',
       'Model' => 'October\\Rain\\Database\\Model',
       'Block' => 'October\\Rain\\Support\\Facades\\Block',
@@ -74,7 +77,6 @@
       'Config' => 'October\\Rain\\Support\\Facades\\Config',
       'Seeder' => 'October\\Rain\\Database\\Updates\\Seeder',
       'Flash' => 'October\\Rain\\Support\\Facades\\Flash',
-      'Input' => 'October\\Rain\\Support\\Facades\\Input',
       'Form' => 'October\\Rain\\Support\\Facades\\Form',
       'Html' => 'October\\Rain\\Support\\Facades\\Html',
       'Http' => 'October\\Rain\\Support\\Facades\\Http',
@@ -85,7 +87,6 @@
       'Twig' => 'October\\Rain\\Support\\Facades\\Twig',
       'DbDongle' => 'October\\Rain\\Support\\Facades\\DbDongle',
       'Schema' => 'October\\Rain\\Support\\Facades\\Schema',
-      'Validator' => 'October\\Rain\\Support\\Facades\\Validator',
       'Cms' => 'Cms\\Facades\\Cms',
       'Backend' => 'Backend\\Facades\\Backend',
       'BackendMenu' => 'Backend\\Facades\\BackendMenu',
@@ -94,8 +95,6 @@
       'SystemException' => 'October\\Rain\\Exception\\SystemException',
       'ApplicationException' => 'October\\Rain\\Exception\\ApplicationException',
       'ValidationException' => 'October\\Rain\\Exception\\ValidationException',
-      'Illuminate\\Support\\Facades\\Input' => 'October\\Rain\\Support\\Facades\\Input',
-      'Illuminate\\Support\\Debug\\HtmlDumper' => 'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper',
     ),
   ),
   '*::cms' => 
@@ -105,7 +104,7 @@
     'backendUri' => 'howpsuzlyk',
     'backendForceSecure' => false,
     'backendForceRemember' => true,
-    'backendTimezone' => 'UTC',
+    'backendTimezone' => 'Asia/Ashgabat',
     'backendSkin' => 'Backend\\Skins\\Standard',
     'runMigrationsOnLogin' => NULL,
     'loadModules' => 
@@ -157,7 +156,7 @@
       'folder' => '755',
     ),
     'enableSafeMode' => NULL,
-    'enableCsrfProtection' => true,
+    'enableCsrfProtection' => false,
     'forceBytecodeInvalidation' => true,
     'enableTwigStrictVariables' => false,
     'restrictBaseDir' => true,
@@ -185,7 +184,7 @@
       'file' => 
       array (
         'driver' => 'file',
-        'path' => '/Users/tmstore/PhpstormProjects/orient/storage/framework/cache',
+        'path' => '/var/www/orient-site/storage/framework/cache',
       ),
       'memcached' => 
       array (
@@ -215,75 +214,7 @@
     'paths' => 
     array (
     ),
-    'compiled' => '/Users/tmstore/PhpstormProjects/orient/storage/framework/views',
+    'compiled' => '/var/www/orient-site/storage/framework/views',
-  ),
-  '*::logging' => 
-  array (
-    'default' => 'single',
-    'channels' => 
-    array (
-      'stack' => 
-      array (
-        'driver' => 'stack',
-        'channels' => 
-        array (
-          0 => 'daily',
-        ),
-        'ignore_exceptions' => false,
-      ),
-      'single' => 
-      array (
-        'driver' => 'single',
-        'path' => '/Users/tmstore/PhpstormProjects/orient/storage/logs/system.log',
-        'level' => 'debug',
-      ),
-      'daily' => 
-      array (
-        'driver' => 'daily',
-        'path' => '/Users/tmstore/PhpstormProjects/orient/storage/logs/system.log',
-        'level' => 'debug',
-        'days' => 14,
-      ),
-      'slack' => 
-      array (
-        'driver' => 'slack',
-        'url' => NULL,
-        'username' => 'October CMS Log',
-        'emoji' => ':boom:',
-        'level' => 'critical',
-      ),
-      'papertrail' => 
-      array (
-        'driver' => 'monolog',
-        'level' => 'debug',
-        'handler' => 'Monolog\\Handler\\SyslogUdpHandler',
-        'handler_with' => 
-        array (
-          'host' => NULL,
-          'port' => NULL,
-        ),
-      ),
-      'stderr' => 
-      array (
-        'driver' => 'monolog',
-        'handler' => 'Monolog\\Handler\\StreamHandler',
-        'formatter' => NULL,
-        'with' => 
-        array (
-          'stream' => 'php://stderr',
-        ),
-      ),
-      'syslog' => 
-      array (
-        'driver' => 'syslog',
-        'level' => 'debug',
-      ),
-      'errorlog' => 
-      array (
-        'driver' => 'errorlog',
-        'level' => 'debug',
-      ),
-    ),
   ),
   '*::database' => 
   array (
@@ -294,18 +225,18 @@
       'sqlite' => 
       array (
         'driver' => 'sqlite',
-        'database' => 'storage/database.sqlite',
+        'database' => 'oc_orient',
         'prefix' => '',
       ),
       'mysql' => 
       array (
         'driver' => 'mysql',
         'engine' => 'InnoDB',
-        'host' => '192.168.1.2',
+        'host' => 'localhost',
         'port' => '3306',
-        'database' => 'orient',
+        'database' => 'oc_orient',
-        'username' => 'orient',
+        'username' => 'merdan',
-        'password' => 'orient',
+        'password' => 'QAZwsx@12',
         'charset' => 'utf8mb4',
         'collation' => 'utf8mb4_unicode_ci',
         'prefix' => '',
@@ -315,10 +246,10 @@
       array (
         'driver' => 'pgsql',
         'host' => 'localhost',
-        'port' => 5432,
+        'port' => '3306',
-        'database' => 'database',
+        'database' => 'oc_orient',
-        'username' => 'root',
+        'username' => 'merdan',
-        'password' => '',
+        'password' => 'QAZwsx@12',
         'charset' => 'utf8',
         'prefix' => '',
         'schema' => 'public',
@@ -327,10 +258,10 @@
       array (
         'driver' => 'sqlsrv',
         'host' => 'localhost',
-        'port' => 1433,
+        'port' => '3306',
-        'database' => 'database',
+        'database' => 'oc_orient',
-        'username' => 'root',
+        'username' => 'merdan',
-        'password' => '',
+        'password' => 'QAZwsx@12',
         'prefix' => '',
       ),
     ),
@@ -343,7 +274,7 @@
       array (
         'host' => '127.0.0.1',
         'password' => NULL,
-        'port' => 6379,
+        'port' => '6379',
         'database' => 0,
       ),
     ),
@@ -358,7 +289,7 @@
       'local' => 
       array (
         'driver' => 'local',
-        'root' => '/Users/tmstore/PhpstormProjects/orient/storage/app',
+        'root' => '/var/www/orient-site/storage/app',
         'url' => '/storage/app',
       ),
       's3' => 
@@ -380,35 +311,11 @@
       ),
     ),
   ),
-  '*::session' => 
-  array (
-    'driver' => 'file',
-    'lifetime' => 120,
-    'expire_on_close' => false,
-    'encrypt' => false,
-    'files' => '/Users/tmstore/PhpstormProjects/orient/storage/framework/sessions',
-    'connection' => NULL,
-    'table' => 'sessions',
-    'lottery' => 
-    array (
-      0 => 2,
-      1 => 100,
-    ),
-    'cookie' => 'october_session',
-    'path' => '/',
-    'domain' => NULL,
-    'http_only' => true,
-    'secure' => false,
-    'same_site' => 'Lax',
-  ),
   '*::tinker' => 
   array (
     'commands' => 
     array (
     ),
-    'alias' => 
-    array (
-    ),
     'dont_alias' => 
     array (
       0 => 'App\\Nova',

themes/modern/pages/index.htm

@@ -32,6 +32,31 @@ random = 0
 code = "bottom"
 type = "slider"
 random = 0
+
+[adverts adv_bottom_2]
+code = "cnpc"
+type = "slider"
+random = 0
+
+[adverts adv_bottom_3]
+code = "china-daily"
+type = "single"
+random = 0
+
+[adverts right_top]
+code = "right-top"
+type = "single"
+random = 0
+
+[adverts right_middle]
+code = "right-middle"
+type = "single"
+random = 0
+
+[adverts right_bottom]
+code = "right-bottom"
+type = "single"
+random = 0
 ==
 {% partial 'slider' %}
 
@@ -77,7 +102,7 @@ random = 0
                     </div>
                 </div>
                 <div class="main__banner">
-<!--                    {% component 'slider' %}-->
+                    {% component 'adv_bottom_2' %}
                 </div>
                 <div class="main__body">
                     <div class="main__body-row">
@@ -86,7 +111,7 @@ random = 0
                     </div>
                 </div>
                 <div class="main__banner">
-<!--                    {% component 'adv_bottom' %}-->
+                    {% component 'adv_bottom_3' %}
                 </div>
                 {% partial 'index/partner_news'%}
             </div>
@@ -94,15 +119,9 @@ random = 0
                 <div class="main__sidebar-title">
                     ИНТЕРЕСНЫЕ ССЫЛКИ
                 </div>
-                <a href="{{'assets/images/sideExample.svg'|theme}}" class=" primary progressive replace">
+                {% component 'right_top' css_class = 'primary progressive replace' %}
-                    <img class="preview" src="{{'assets/images/sideExample.svg'|theme}}" alt="">
+                {% component 'right_middle' css_class = 'primary progressive replace' %}
-                </a>
+                {% component 'right_bottom' css_class = 'primary progressive replace' %}
-                <a href="{{'assets/images/sideExample.svg'|theme}}" class=" primary progressive replace">
-                    <img class="preview" src="{{'assets/images/sideExample.svg'|theme}}" alt="">
-                </a>
-                <a href="{{'assets/images/sideExample.svg'|theme}}" class=" primary progressive replace">
-                    <img class="preview" src="{{'assets/images/sideExample.svg'|theme}}" alt="">
-                </a>
                 {% partial 'tags' %}
                 {% partial 'calendar' %}
             </div>

themes/modern/pages/post.htm

@@ -48,7 +48,7 @@ slug = "{{ :slug }}"
         </h1>
         {% if post.featured_image %}
         <picture class="news__image">
-            <img src="{{post.featured_image|media_cdn|modify({filter:'post'})}}" alt="{{post.title}}">
+            <img src="{{post.featured_image|media_cdn}}" alt="{{post.title}}">
         </picture>
         {% endif %}
     </header>
@@ -97,4 +97,4 @@ slug = "{{ :slug }}"
         }
     });
 </script>
-{% endput %}
+{% endput %}

themes/modern/partials/index/category_posts.htm

@@ -1,3 +1,5 @@
+[viewBag]
+==
 {% set posts = category.take_posts(3) %}
 <div class="main__body-column">
     <div class="main__body-header">
@@ -8,7 +10,7 @@
             {{'page.more'|_}}
         </a>
     </div>
-    <a href="{{posts.first.featured_image|media_cdn| modify({ filter: 'thumb-medium' })}}" class="primary progressive replace">
+    <a href="{{posts.first.featured_image|media_cdn}}" class="primary progressive replace">
         <img class="preview" src="{{'assets/images/news/1.jpg'|theme}}" alt="{{posts.first.title}}">
     </a>
     <div class="main__body-card">
@@ -35,4 +37,4 @@
     {% partial 'index/category_post_item' post = posts.first %}
     {% partial 'index/category_post_item' post = posts.last %}
     </div>
-</div>
+</div>

themes/modern/partials/index/partner_news.htm

@@ -1,7 +1,7 @@
+[viewBag]
+
 [rssItems]
 maxItems = 6
-
-[viewBag]
 ==
 {% if rssItems.items %}
 <div class="main__body">
@@ -35,4 +35,4 @@ maxItems = 6
         {% endfor %}
     </div>
 </div>
-{% endif %}
+{% endif %}

themes/modern/partials/index/top_section.htm

@@ -1,3 +1,5 @@
+[viewBag]
+==
 {% set firstPost = category.posts_filtered.shift %}
 <section class="event">
     <div class="auto__container">
@@ -13,7 +15,7 @@
             <div class="event__body">
                 <div class="event__body-row">
                     <div class="event__body-image">
-                        <a href="{{firstPost.featured_image|media_cdn| modify({ filter: 'thumb-large' })}}" class="primary progressive replace">
+                        <a href="{{firstPost.featured_image|media_cdn}}" class="primary progressive replace">
                             <img class="preview" src="{{'assets/images/news/1.jpg'|theme}}" alt="{{firstPost.title}}">
                         </a>
                         <div class="event__body-card">
@@ -34,4 +36,4 @@
             </div>
         </div>
     </div>
-</section>
+</section>

themes/modern/partials/slider.htm

@@ -1,3 +1,5 @@
+[viewBag]
+
 [blogPosts]
 pageNumber = "{{ :page }}"
 postsPerPage = 4
@@ -5,8 +7,6 @@ noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = "category"
 postPage = "post"
-
-[viewBag]
 ==
 <section class="hero">
     <div class="auto__container">
@@ -15,7 +15,7 @@ postPage = "post"
                 <div class="slider__inner">
                     {% for post in posts %}
                     <div class="slider__item">
-                        <img src="{{post.featured_image|media_cdn| modify({ filter: 'slider' })}}" alt="{{post.title}}">
+                        <img src="{{post.featured_image|media_cdn}}" alt="{{post.title}}">
                         {% if post.categories.count()>0%}
                         <div class="slider__item-category">
                            {{post.categories.implode('name', ', ')}}
@@ -36,4 +36,4 @@ postPage = "post"
             </div>
         </div>
     </div>
-</section>
+</section>

vendor/composer/ClassLoader.php

@@ -37,11 +37,13 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    private $vendorDir;
+
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -57,10 +59,17 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
+    private static $registeredLoaders = array();
+
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();
@@ -300,6 +309,17 @@ class ClassLoader
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
@@ -308,6 +328,10 @@ class ClassLoader
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
@@ -367,6 +391,16 @@ class ClassLoader
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

vendor/composer/autoload_classmap.php

@@ -6,7 +6,12 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'JSMin' => $vendorDir . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
     'JSMinException' => $vendorDir . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
     'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+    'October\\Tests\\Concerns\\InteractsWithAuthentication' => $baseDir . '/tests/concerns/InteractsWithAuthentication.php',
+    'October\\Tests\\Fixtures\\Backend\\Models\\UserFixture' => $baseDir . '/tests/fixtures/backend/models/UserFixture.php',
+    'PluginTestCase' => $baseDir . '/tests/PluginTestCase.php',
+    'TestCase' => $baseDir . '/tests/TestCase.php',
 );

vendor/composer/autoload_psr4.php

@@ -38,7 +38,6 @@ return array(
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'October\\Rain\\' => array($vendorDir . '/october/rain/src'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
-    'League\\MimeTypeDetection\\' => array($vendorDir . '/league/mime-type-detection/src'),
     'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
     'League\\Csv\\' => array($vendorDir . '/league/csv/src'),
     'Leafo\\ScssPhp\\' => array($vendorDir . '/leafo/scssphp/src'),

vendor/composer/autoload_real.php

@@ -13,19 +13,24 @@ class ComposerAutoloaderInitce290a037d2cbd6fc6b8d537449d0ac2
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
             return self::$loader;
         }
 
+        require __DIR__ . '/platform_check.php';
+
         spl_autoload_register(array('ComposerAutoloaderInitce290a037d2cbd6fc6b8d537449d0ac2', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInitce290a037d2cbd6fc6b8d537449d0ac2', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2::getInitializer($loader));
         } else {

vendor/composer/autoload_static.php

@@ -81,7 +81,6 @@ class ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2
         ),
         'L' => 
         array (
-            'League\\MimeTypeDetection\\' => 25,
             'League\\Flysystem\\' => 17,
             'League\\Csv\\' => 11,
             'Leafo\\ScssPhp\\' => 14,
@@ -253,10 +252,6 @@ class ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2
         array (
             0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
         ),
-        'League\\MimeTypeDetection\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/league/mime-type-detection/src',
-        ),
         'League\\Flysystem\\' => 
         array (
             0 => __DIR__ . '/..' . '/league/flysystem/src',
@@ -397,9 +392,14 @@ class ComposerStaticInitce290a037d2cbd6fc6b8d537449d0ac2
     );
 
     public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'JSMin' => __DIR__ . '/..' . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
         'JSMinException' => __DIR__ . '/..' . '/linkorb/jsmin-php/src/jsmin-1.1.1.php',
         'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+        'October\\Tests\\Concerns\\InteractsWithAuthentication' => __DIR__ . '/../..' . '/tests/concerns/InteractsWithAuthentication.php',
+        'October\\Tests\\Fixtures\\Backend\\Models\\UserFixture' => __DIR__ . '/../..' . '/tests/fixtures/backend/models/UserFixture.php',
+        'PluginTestCase' => __DIR__ . '/../..' . '/tests/PluginTestCase.php',
+        'TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

vendor/composer/platform_check.php

@@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 70205)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.5". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}