Ticket #3566

grid.php

@@ -17,7 +17,11 @@ $sObject = bx_process_input(bx_get('o'));
 if (!$sObject)
     exit;
 
-$oGrid = BxDolGrid::getObjectInstance($sObject);
+$oTemplate = null;
+if(bx_get(BX_DOL_STUDIO_TEMPLATE_CODE_KEY) !== false)
+    $oTemplate = BxDolStudioTemplate::getInstance();
+
+$oGrid = BxDolGrid::getObjectInstance($sObject, $oTemplate);
 if (!$oGrid) {
     // no such grid object available
     exit;

inc/classes/BxDolTemplate.php

@@ -9,11 +9,6 @@
 
 ini_set('pcre.backtrack_limit', 1000000);
 
-define('BX_DOL_TEMPLATE_CODE_KEY', 'skin');
-define('BX_DOL_TEMPLATE_MIX_KEY', 'mix');
-define('BX_DOL_TEMPLATE_DEFAULT_CODE', 'protean');
-define('BX_DOL_TEMPLATE_FOLDER_ROOT', 'template');
-
 define('BX_DOL_TEMPLATE_INJECTIONS_CACHE', 'sys_injections.inc');
 
 define('BX_DOL_TEMPLATE_CHECK_IN_BOTH', 'both');
@@ -838,6 +833,16 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         return $this->_sCode;
     }
 
+    /**
+     * Get code key.
+     *
+     * @return string template's code key.
+     */
+    function getCodeKey()
+    {
+        return $this->_sCodeKey;
+    }
+
     /**
      * Get currently active template mix.
      *

inc/params.inc.php

@@ -92,6 +92,15 @@ define('BX_ACCOUNT_CONFIRMATION_PHONE', 'phone');
 define('BX_ACCOUNT_CONFIRMATION_EMAIL_PHONE', 'email_and_phone');
 define('BX_ACCOUNT_CONFIRMATION_EMAIL_OR_PHONE', 'email_or_phone');
 
+//--- Template settings ---//
+define('BX_DOL_TEMPLATE_CODE_KEY', 'skin');
+define('BX_DOL_TEMPLATE_MIX_KEY', 'mix');
+define('BX_DOL_TEMPLATE_DEFAULT_CODE', 'protean');
+define('BX_DOL_TEMPLATE_FOLDER_ROOT', 'template');
+
+define('BX_DOL_STUDIO_TEMPLATE_CODE_KEY', 'sskin');
+define('BX_DOL_STUDIO_TEMPLATE_DEFAULT_CODE', 'protean');
+
 //--- Include files needed for basic functionality ---//
 require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDol.php');
 require_once(BX_DIRECTORY_PATH_INC . 'utils.inc.php');

modules/boonex/ads/install/config.php

@@ -75,7 +75,8 @@ $aConfig = array(
         'bx_ads_cover',
 
         'bx_ads_preview_photos',
-        'bx_ads_gallery_photos', 
+        'bx_ads_gallery_photos',
+        'bx_ads_view_photos',
 
         'bx_ads_videos_poster',
         'bx_ads_videos_poster_preview',

modules/boonex/classes/install/sql/enable.sql

@@ -350,7 +350,7 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_classes_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_classes_common', 'switcher', '_bx_classes_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_classes_common', 'title', '_bx_classes_grid_column_title_adm_title', '40%', 0, '35', '', 3),
-('bx_classes_common', 'added', '_bx_classes_grid_column_title_adm_added', '150%', 1, '25', '', 4),
+('bx_classes_common', 'added', '_bx_classes_grid_column_title_adm_added', '15%', 1, '25', '', 4),
 ('bx_classes_common', 'status_admin', '_bx_classes_grid_column_title_adm_status_admin', '15%', 0, '16', '', 5),
 ('bx_classes_common', 'actions', '', '20%', 0, '', '', 6);
 

modules/boonex/forum/install/config.php

@@ -63,14 +63,27 @@ $aConfig = array(
     	'bx_forum_files'
     ),
 
-	/**
+    /**
      * Transcoders.
      */
     'transcoders' => array(
-		'bx_forum_preview',
-        'bx_forum_preview_cmts',
+        'bx_forum_preview',
         'bx_forum_gallery',
-        'bx_forum_cover'
+        'bx_forum_cover',
+        
+        'bx_forum_preview_photos',
+        'bx_forum_gallery_photos',
+        'bx_forum_view_photos',
+
+        'bx_forum_videos_poster',
+        'bx_forum_videos_poster_preview',
+        'bx_forum_videos_mp4',
+        'bx_forum_videos_mp4_hd',
+        
+        'bx_forum_preview_files',
+        'bx_forum_gallery_files',
+        
+        'bx_forum_preview_cmts',
     ),
 
     /**

studio/classes/BxDolStudioTemplate.php

@@ -7,7 +7,6 @@
  * @{
  */
 
-define('BX_DOL_STUDIO_TEMPLATE_DEFAULT_CODE', 'protean');
 define('BX_PAGE_COLUMN_DUAL', 3); ///< page, with 2 columns
 
 class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
@@ -25,7 +24,7 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
         $this->_sInjectionsTable = 'sys_injections_admin';
         $this->_sInjectionsCache = 'sys_injections_admin.inc';
 
-        $this->_sCodeKey = 'sskin';
+        $this->_sCodeKey = BX_DOL_STUDIO_TEMPLATE_CODE_KEY;
         $this->_sCode = isset($_COOKIE[$this->_sCodeKey]) && preg_match('/^[A-Za-z0-9_-]+$/', $_COOKIE[$this->_sCodeKey]) ? $_COOKIE[$this->_sCodeKey] : BX_DOL_STUDIO_TEMPLATE_DEFAULT_CODE;
         $this->_sCode = isset($_GET[$this->_sCodeKey]) && preg_match('/^[A-Za-z0-9_-]+$/', $_GET[$this->_sCodeKey]) ? $_GET[$this->_sCodeKey] : $this->_sCode;
 

template/scripts/BxBaseGrid.php

@@ -31,7 +31,9 @@ class BxBaseGrid extends BxDolGrid
         else
             $this->_oTemplate = BxDolTemplate::getInstance();
 
-        $this->_aQueryAppend = array();
+        $this->_aQueryAppend = array(
+            $this->_oTemplate->getCodeKey() => $this->_oTemplate->getCode()
+        );
         $this->_aQueryAppendExclude = array();
 
         $this->_aQueryReset = array($this->_aOptions['filter_get'], $this->_aOptions['order_get_field'], $this->_aOptions['order_get_dir'], $this->_aOptions['paginate_get_start'], $this->_aOptions['paginate_get_per_page']);