#140 - System classes auto-loader.

inc/classes/BxDolAlerts.php

@@ -38,6 +38,9 @@
  * no alerts available
  *
  */
+
+bx_import('BxDolDb');
+
 class BxDolAlerts extends BxDol
 {
     public $sUnit;

studio/builder_forms.php

@@ -18,11 +18,9 @@ bx_require_authentication(true);
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioForms');
 $oPage = new BxTemplStudioForms($sPage);
 $oPage->init();
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/builder_menu.php

@@ -18,11 +18,9 @@ bx_require_authentication(true);
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioNavigation');
 $oPage = new BxTemplStudioNavigation($sPage);
 $oPage->init();
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/builder_page.php

@@ -26,11 +26,9 @@ if($sPage === false)
     $sPage = bx_get('bp_page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioBuilderPage');
 $oPage = new BxTemplStudioBuilderPage($sType, $sPage);
 $oPage->init();
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/builder_permissions.php

@@ -18,11 +18,9 @@ bx_require_authentication(true);
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioPermissions');
 $oPage = new BxTemplStudioPermissions($sPage);
 $oPage->init();
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/builders.php

@@ -20,10 +20,8 @@ bx_import('BxDolLanguages');
 
 bx_require_authentication(true);
 
-bx_import('BxTemplStudioWidgets');
 $oPage = new BxTemplStudioWidgets('builders');
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/classes/BxDolStudioBuilderPage.php

@@ -7,11 +7,9 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioBuilderPageQuery');
+bx_import('BxDolStudioUtils');
 
 define('BX_DOL_STUDIO_BP_SKELETONS', 'skeletons');
-
 define('BX_DOL_STUDIO_BP_TYPE_DEFAULT', BX_DOL_STUDIO_MODULE_SYSTEM);
 
 define('BX_DOL_STUDIO_BP_BLOCK_RAW', 'raw');
@@ -102,7 +100,6 @@ class BxDolStudioBuilderPage extends BxTemplStudioPage
 
         //--- Process Lang fields
         if($aBlock['type'] == BX_DOL_STUDIO_BP_BLOCK_LANG && isset($oForm->aInputs['content'])) {
-            bx_import('BxDolStudioLanguagesUtils');
             $oLanguage = BxDolStudioLanguagesUtils::getInstance();
 
             $sContentKey = '';
@@ -147,7 +144,6 @@ class BxDolStudioBuilderPage extends BxTemplStudioPage
 
     protected function addInArray($aInput, $sKey, $aValues)
     {
-        bx_import('BxDolStudioUtils');
         return BxDolStudioUtils::addInArray($aInput, $sKey, $aValues);
     }
 

studio/classes/BxDolStudioBuilderPageQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioPageQuery');
-
 class BxDolStudioBuilderPageQuery extends BxDolStudioPageQuery
 {
     function __construct()

studio/classes/BxDolStudioDashboard.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioDashboardQuery');
-
 class BxDolStudioDashboard extends BxTemplStudioPage
 {
 	protected $aBlocks;
@@ -81,7 +78,6 @@ class BxDolStudioDashboard extends BxTemplStudioPage
 
 					$sValue = bx_process_input($sValue);
 
-					bx_import('BxDolCacheUtilities');
 					$oCacheUtilities = BxDolCacheUtilities::getInstance();
 
 					switch ($sValue) {
@@ -120,7 +116,6 @@ class BxDolStudioDashboard extends BxTemplStudioPage
 					break;
 
 				case 'permissions':                    
-					bx_import('BxDolStudioTools');
                     $oAdmTools = new BxDolStudioTools();
 
                     header( 'Content-type: text/html; charset=utf-8' );
@@ -129,7 +124,6 @@ class BxDolStudioDashboard extends BxTemplStudioPage
                     exit;
 
 				case 'server_audit':
-					bx_import('BxDolStudioToolsAudit');
 					$oAudit = new BxDolStudioToolsAudit();
             
                     header( 'Content-type: text/html; charset=utf-8' );
@@ -138,10 +132,7 @@ class BxDolStudioDashboard extends BxTemplStudioPage
             }
 
             if(!empty($aResult['message'])) {
-                bx_import('BxDolStudioTemplate');
                 $aResult['message'] = BxDolStudioTemplate::getInstance()->parseHtmlByName('page_action_result.html', array('content' => $aResult['message']));
-
-                bx_import('BxTemplStudioFunctions');
                 $aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox('', $aResult['message']);
             }
 
@@ -181,7 +172,6 @@ class BxDolStudioDashboard extends BxTemplStudioPage
 
     protected function getCacheChartData($bAsString = true)
     {
-		bx_import('BxDolCacheUtilities');
 		$oCacheUtilities = BxDolCacheUtilities::getInstance();
 
     	$aChartData = array();

studio/classes/BxDolStudioDashboardQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioPageQuery');
-
 class BxDolStudioDashboardQuery extends BxDolStudioPageQuery
 {
     function __construct()

studio/classes/BxDolStudioDesign.php

@@ -7,14 +7,8 @@
  * @{
  */
 
-bx_import('BxDolModuleQuery');
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioDesignsQuery');
-
 define('BX_DOL_STUDIO_TEMPL_DEFAULT', 'basic');
-
 define('BX_DOL_STUDIO_TEMPL_TYPE_SETTINGS', 'settings');
-
 define('BX_DOL_STUDIO_TEMPL_TYPE_DEFAULT', BX_DOL_STUDIO_TEMPL_TYPE_SETTINGS);
 
 class BxDolStudioDesign extends BxTemplStudioPage
@@ -87,14 +81,12 @@ class BxDolStudioDesign extends BxTemplStudioPage
         if($aTemplate['uri'] == $sTemplateDefault)
             return array('code' => 2, 'message' => _t('_adm_dsg_err_deactivate_default'));
 
-        bx_import('BxDolStudioInstallerUtils');
         $oInstallerUtils = BxDolStudioInstallerUtils::getInstance();
 
         $aResult = (int)$aTemplate['enabled'] == 0 ? $oInstallerUtils->perform($aTemplate['path'], 'enable') : $oInstallerUtils->perform($aTemplate['path'], 'disable');
         if($aResult['code'] != 0)
             return $aResult;
 
-        bx_import('BxDolStudioTemplate');
         $oTemplate = BxDolStudioTemplate::getInstance();
 
         $aResult = array('code' => 0, 'message' => _t('_adm_scs_operation_done'));

studio/classes/BxDolStudioDesigner.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioDesignerQuery');
-
 define('BX_DOL_STUDIO_DSG_TYPE_GENERAL', 'general');
 define('BX_DOL_STUDIO_DSG_TYPE_LOGO', 'logo');
 define('BX_DOL_STUDIO_DSG_TYPE_ICON', 'icon');
@@ -79,8 +76,6 @@ class BxDolStudioDesigner extends BxTemplStudioPage
         $iProfileId = getLoggedId();
 
         if(!empty($_FILES['image']['tmp_name'])) {
-            bx_import('BxDolStorage');
-
             $oStorage = BxDolStorage::getObjectInstance('sys_images_custom');
 
             if(!$this->deleteLogo())
@@ -106,7 +101,6 @@ class BxDolStudioDesigner extends BxTemplStudioPage
     {
         $iProfileId = getLoggedId();
 
-        bx_import('BxDolStorage');
         $oStorage = BxDolStorage::getObjectInstance('sys_images_custom');
 
         $iId = (int)getParam('sys_site_logo');
@@ -121,7 +115,6 @@ class BxDolStudioDesigner extends BxTemplStudioPage
     {
         $iProfileId = getLoggedId();
 
-        bx_import('BxDolStorage');
         $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
 
         $iId = (int)getParam('sys_site_icon');

studio/classes/BxDolStudioDesignerQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioPageQuery');
-
 class BxDolStudioDesignerQuery extends BxDolStudioPageQuery
 {
     function __construct()

studio/classes/BxDolStudioDesigns.php

@@ -7,11 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioModules');
-bx_import('BxTemplStudioFunctions');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioDesignsQuery');
-
 class BxDolStudioDesigns extends BxTemplStudioModules
 {
     function __construct()

studio/classes/BxDolStudioDesignsQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioPageQuery');
-
 class BxDolStudioDesignsQuery extends BxDolStudioPageQuery
 {
     function __construct()

studio/classes/BxDolStudioForm.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxBaseFormView');
-bx_import('BxDolStudioTemplate');
-
 define('BX_DOL_STUDIO_METHOD_DEFAULT', 'post');
 
 class BxDolStudioForm extends BxBaseFormView
@@ -71,7 +68,6 @@ class BxDolStudioForm extends BxBaseFormView
         if(!empty($_FILES[$sName]['tmp_name'])) {
             $iProfileId = getLoggedId();
 
-            bx_import('BxDolStorage');
             $sStorage = isset($aInput['storage_object']) && $aInput['storage_object'] != '' ? $aInput['storage_object'] : BX_DOL_STORAGE_OBJ_IMAGES;
             $oStorage = BxDolStorage::getObjectInstance($sStorage);
 
@@ -106,7 +102,6 @@ class BxDolStudioForm extends BxBaseFormView
             'update' => 'updateLanguageString'
         );
 
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguage = BxDolStudioLanguagesUtils::getInstance();
         $aLanguages = $oLanguage->getLanguagesInfo();
 
@@ -123,7 +118,6 @@ class BxDolStudioForm extends BxBaseFormView
 
     protected function processTranslationsKey($sType = 'insert')
     {
-        bx_import('BxDolStudioLanguagesUtils');
         $sLanguage = BxDolStudioLanguagesUtils::getInstance()->getCurrentLangName(false);
 
         foreach($this->aInputs as $sName => $aInput)
@@ -135,7 +129,6 @@ class BxDolStudioForm extends BxBaseFormView
 
     protected function processTranslationsValue ()
     {
-        bx_import('BxDolStudioLanguagesUtils');
         $aLanguages = BxDolStudioLanguagesUtils::getInstance()->getLanguages();
 
         foreach($this->aInputs as $sName => $aInput)
@@ -154,7 +147,6 @@ class BxDolStudioForm extends BxBaseFormView
         $sResult = '';
         switch($sType) {
             case 'insert':
-                bx_import('BxDolStudioUtils');
                 $sValue = !empty($sValue) ? BxDolStudioUtils::getSystemName($sValue) : $sPrefixDefault;
                 $sResult = $sValue . '_' . $sName . '_' . $iRand;
             break;
@@ -175,7 +167,6 @@ class BxDolStudioFormCheckerHelper extends BxDolFormCheckerHelper
         if(empty($sMethod) || empty($aName))
             return false;
 
-        bx_import('BxDolStudioLanguagesUtils');
         $aLanguages = BxDolStudioLanguagesUtils::getInstance()->getLanguages();
 
         foreach($aLanguages as $sLangName => $sLangTitle) {
@@ -196,7 +187,6 @@ class BxDolStudioFormCheckerHelper extends BxDolFormCheckerHelper
         if(empty($sMethod) || empty($aName))
             return false;
 
-        bx_import('BxDolStudioLanguagesUtils');
         $aLanguages = BxDolStudioLanguagesUtils::getInstance()->getLanguages();
 
         foreach($aLanguages as $sLangName => $sLangTitle) {
@@ -214,7 +204,6 @@ class BxDolStudioFormCheckerHelper extends BxDolFormCheckerHelper
 
     function checkTemplate($sVal)
     {
-        bx_import('BxDolModuleQuery');
         return strlen($sVal) > 0 && BxDolModuleQuery::getInstance()->isEnabled($sVal);
     }
 }

studio/classes/BxDolStudioForms.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioFormsQuery');
-
 define('BX_DOL_STUDIO_FORM_TYPE_FORMS', 'forms');
 define('BX_DOL_STUDIO_FORM_TYPE_DISPLAYS', 'displays');
 define('BX_DOL_STUDIO_FORM_TYPE_FIELDS', 'fields');

studio/classes/BxDolStudioFormsDisplays.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioFormsQuery');
-
 class BxDolStudioFormsDisplays extends BxTemplStudioGrid
 {
     protected $sModule = '';

studio/classes/BxDolStudioFormsField.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxDol');
-bx_import('BxDolGrid');
-bx_import('BxDolStudioFormsQuery');
-
 class BxDolStudioFormsField extends BxDol
 {
     protected $oDb;
@@ -81,19 +77,16 @@ class BxDolStudioFormsField extends BxDol
 
     protected function getSystemName($sValue)
     {
-        bx_import('BxDolStudioUtils');
         return BxDolStudioUtils::getSystemName($sValue);
     }
 
     protected function getClassName($sValue)
     {
-        bx_import('BxDolStudioUtils');
         return BxDolStudioUtils::getClassName($sValue);
     }
 
     protected function addInArray($aInput, $sKey, $aValues)
     {
-        bx_import('BxDolStudioUtils');
         return BxDolStudioUtils::addInArray($aInput, $sKey, $aValues);
     }
 }

studio/classes/BxDolStudioFormsFields.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioFormsQuery');
-
 class BxDolStudioFormsFields extends BxTemplStudioGrid
 {
     protected $sModule = '';

studio/classes/BxDolStudioFormsForms.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioFormsQuery');
-
 class BxDolStudioFormsForms extends BxTemplStudioGrid
 {
     public function __construct ($aOptions, $oTemplate = false)

studio/classes/BxDolStudioFormsPreLists.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioFormsQuery');
-
 class BxDolStudioFormsPreLists extends BxTemplStudioGrid
 {
     public function __construct ($aOptions, $oTemplate = false)

studio/classes/BxDolStudioFormsPreValues.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioFormsQuery');
-
 define('BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX', round(log(BX_DOL_INT_MAX, 2)));
 
 class BxDolStudioFormsPreValues extends BxTemplStudioGrid

studio/classes/BxDolStudioFormsQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolDb');
-
 class BxDolStudioFormsQuery extends BxDolDb
 {
     function __construct()

studio/classes/BxDolStudioGrid.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplGrid');
-bx_import('BxDolStudioUtils');
-
 define('BX_DOL_STUDIO_GRID_PARAMS_DIVIDER', '#-#');
 
 class BxDolStudioGrid extends BxTemplGrid

studio/classes/BxDolStudioInstaller.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolInstallerUtils');
-
 define("BX_DOL_STUDIO_INSTALLER_SUCCESS", 0);
 define("BX_DOL_STUDIO_INSTALLER_FAILED", 1);
 
@@ -201,15 +199,12 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 
             $iModuleId = $this->oDb->insertModule($this->_aConfig);
 
-            bx_import('BxDolModule');
             $sTitleKey = BxDolModule::getTitleKey($this->_aConfig['home_uri']);
 
-            bx_import('BxDolStudioLanguagesUtils');
             $oLanguages = BxDolStudioLanguagesUtils::getInstance();
             $oLanguages->addLanguageString($sTitleKey, $this->_aConfig['title']);
             $oLanguages->compileLanguage();
 
-            bx_import('BxDolStudioInstallerUtils');
             BxDolStudioInstallerUtils::getInstance()->checkModules();
 
             $aFiles = array();
@@ -286,10 +281,8 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
         if($aResult['result']) {
             $iModuleId = $this->oDb->deleteModule($this->_aConfig);
 
-            bx_import('BxDolModule');
             $sTitleKey = BxDolModule::getTitleKey($this->_aConfig['home_uri']);
 
-            bx_import('BxDolStudioLanguagesUtils');
             $oLanguages = BxDolStudioLanguagesUtils::getInstance();
             $oLanguages->deleteLanguageString($sTitleKey);
             $oLanguages->compileLanguage();
@@ -337,7 +330,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 
     public function recompile($aParams)
     {
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguages = BxDolStudioLanguagesUtils::getInstance();
 
         $aResult = array('message' => '', 'result' => false);
@@ -574,7 +566,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
     }
     protected function actionInstallLanguage($sOperation)
     {
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguages = BxDolStudioLanguagesUtils::getInstance();
 
         $sLanguage = isset($this->_aConfig['home_uri']) ? $this->_aConfig['home_uri'] : '';
@@ -590,7 +581,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
         if(!isset($this->_aConfig['language_category']) || empty($this->_aConfig['language_category']))
             return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguages = BxDolStudioLanguagesUtils::getInstance();
 
         $bResult = true;
@@ -652,7 +642,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 		if(!in_array($sOperation, array('uninstall')) || empty($this->_aConfig['connections'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-    	bx_import('BxDolConnection');
 		foreach($this->_aConfig['connections'] as $sObjectConnections => $a) {
 			$o = BxDolConnection::getObjectInstance($sObjectConnections);
 			if(!$o)
@@ -687,7 +676,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 		if(empty($this->_aConfig['menu_triggers'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		bx_import('BxDolMenu');
 		foreach($this->_aConfig['menu_triggers'] as $sMenuTriggerName)
 			BxDolMenu::processMenuTrigger($sMenuTriggerName);
 
@@ -705,7 +693,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
     	if(empty($this->_aConfig['page_triggers'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		bx_import('BxDolPage');
         foreach($this->_aConfig['page_triggers'] as $sPageTriggerName)
 			BxDolPage::processPageTrigger($sPageTriggerName);
 
@@ -717,7 +704,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
         if(!in_array($sOperation, array('install', 'uninstall', 'enable', 'disable'))) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-        bx_import('BxDolProfileQuery');
         $o = BxDolProfileQuery::getInstance();
         $o->processDeletedProfiles();
 
@@ -745,14 +731,12 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 		$bSetModulePendingUninstall = false;
 
         // queue for deletion storage files        
-        bx_import('BxDolStorage');
         foreach($this->_aConfig['storages'] as $s)
 			if(($o = BxDolStorage::getObjectInstance($s)) && $o->queueFilesForDeletionFromObject())
                 $bSetModulePendingUninstall = true;
 
         // delete comments and queue for deletion comments attachments
         $iFiles = 0;
-        bx_import('BxDolCmts');
         BxDolCmts::onModuleUninstall($this->_aConfig['name'], $iFiles);
         if($iFiles)
 			$bSetModulePendingUninstall = true;
@@ -788,7 +772,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
     	if(empty($this->_aConfig['transcoders'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		bx_import('BxDolTranscoderImage');
 		BxDolTranscoderImage::registerHandlersArray($this->_aConfig['transcoders']);
 
 		return BX_DOL_STUDIO_INSTALLER_SUCCESS;
@@ -805,7 +788,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
     	if(empty($this->_aConfig['transcoders'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		bx_import('BxDolTranscoderImage');
 		BxDolTranscoderImage::unregisterHandlersArray($this->_aConfig['transcoders']);
         BxDolTranscoderImage::cleanupObjectsArray($this->_aConfig['transcoders']);
 
@@ -865,7 +847,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 		if(!$bHtmlResponse)
 			return $sTitle . $sContent;
 
-		bx_import('BxDolStudioTemplate');
         return BxDolStudioTemplate::getInstance()->parseHtmlByName('mod_action_result_step.html', array(
         	'color' => $bResult ? 'green' : 'red',
             'title' => $sTitle,
@@ -878,7 +859,6 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
         $oFile = null;
 
         if($this->_bUseFtp) {
-            bx_import('BxDolFtp');
             $oFile = new BxDolFtp(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost', getParam('sys_ftp_login'), getParam('sys_ftp_password'), getParam('sys_ftp_dir'));
 
             if(!$oFile->connect())
@@ -887,10 +867,8 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
             if(!$oFile->isTrident())
                 return null;
         }
-        else {
-            bx_import('BxDolFile');
+        else
             $oFile = BxDolFile::getInstance();
-        }
 
         return $oFile;
     }

studio/classes/BxDolStudioInstallerQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolModuleQuery');
-
 class BxDolStudioInstallerQuery extends BxDolModuleQuery
 {
     function __construct()

studio/classes/BxDolStudioInstallerUtils.php

@@ -8,7 +8,6 @@
  */
 
 bx_import('BxDolLanguages');
-bx_import('BxDolInstallerUtils');
 
 define('BX_DOL_UNITY_URL_ROOT', 'http://www.boonex.com/');
 define('BX_DOL_UNITY_URL_MARKET', BX_DOL_UNITY_URL_ROOT . 'market/');
@@ -139,7 +138,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
     {
         $aUpdates = array();
 
-        bx_import('BxDolStudioTemplate');
         $oTemplate = BxDolStudioTemplate::getInstance();
 
         $aInstalledInfo = $this->getInstalledInfo();
@@ -177,10 +175,8 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
     {
     	$aResult = array();
 
-    	if(!is_array($mixedModule)) {
-    		bx_import('BxDolModuleQuery');
+    	if(!is_array($mixedModule))
 			$mixedModule = BxDolModuleQuery::getInstance()->{is_numeric($mixedModule) ? 'getModuleById' : 'getModuleByName'}($mixedModule); 
-    	}
 
     	if(empty($mixedModule) || !is_array($mixedModule))
     		return $aResult;
@@ -295,7 +291,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
     	else
 			$aProducts = $this->getAccessObject(false)->load(BX_DOL_UNITY_URL_MARKET . 'json_browse_purchased', array('key' => getParam('sys_oauth_key')));
 
-    	bx_import('BxDolModuleQuery');
     	$oModuleDb = BxDolModuleQuery::getInstance();
 
     	$oModuleDb->updateModule(array('hash' => ''));
@@ -308,7 +303,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
     public function checkUpdates($bAuthorizedAccess = false)
     {
-		bx_import('BxDolModuleQuery');
 		$aModules = BxDolModuleQuery::getInstance()->getModules();
 
         $aProducts = array();
@@ -343,7 +337,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
     public function downloadUpdatePublic($sModuleName, $bAutoUpdate = false)
     {
-    	bx_import('BxDolModuleQuery');
 		$aModule = BxDolModuleQuery::getInstance()->getModuleByName($sModuleName);
 
 		$aItem = $this->getAccessObject(false)->load(BX_DOL_UNITY_URL_MARKET . 'json_download_update', array(
@@ -500,7 +493,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 	        if(empty($sLogin) || empty($sPassword) || empty($sPath))
 	            return _t('_adm_str_err_no_ftp_info');
 	
-	        bx_import('BxDolFtp');
 	        $oFile = new BxDolFtp($_SERVER['HTTP_HOST'], $sLogin, $sPassword, $sPath);
 	
 	        if(!$oFile->connect())
@@ -509,10 +501,8 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 	        if(!$oFile->isTrident())
 	            return _t('_adm_str_err_destination_not_valid');
         }
-        else {
-        	bx_import('BxDolFile');
+        else
         	$oFile = BxDolFile::getInstance();
-        }
 
         $aConfig = self::getModuleConfig($sPackagePath . 'install/config.php');
         if(empty($aConfig) || !is_array($aConfig) || empty($aConfig['home_dir']))
@@ -574,7 +564,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
     private function getInstalledInfo()
     {
-        bx_import('BxDolModuleQuery');
         $aModules = BxDolModuleQuery::getInstance()->getModules();
 
         $aInstalledInfo = array();
@@ -586,7 +575,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
     private function addTransientJob($sName, $sAction, $aParams)
     {
-		bx_import('BxDolCronQuery');
 		if(BxDolCronQuery::getInstance()->addTransientJobService($sName, array('system', $sAction, $aParams, 'DolStudioInstallerUtils')))
 			return true;
 
@@ -602,7 +590,6 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
     private function emailNotifyModulesUpgrade($sResult, $aData)
     {
-    	bx_import('BxDolModuleQuery');
 		$oModuleQuery = BxDolModuleQuery::getInstance();
 
     	$sConclusion = '';

studio/classes/BxDolStudioLanguage.php

@@ -7,14 +7,8 @@
  * @{
  */
 
-bx_import('BxDolModuleQuery');
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioLanguagesQuery');
-
 define('BX_DOL_STUDIO_LANG_DEFAULT', BX_DOL_LANGUAGE_DEFAULT);
-
 define('BX_DOL_STUDIO_LANG_TYPE_SETTINGS', 'settings');
-
 define('BX_DOL_STUDIO_LANG_TYPE_DEFAULT', BX_DOL_STUDIO_LANG_TYPE_SETTINGS);
 
 class BxDolStudioLanguage extends BxTemplStudioPage
@@ -87,14 +81,12 @@ class BxDolStudioLanguage extends BxTemplStudioPage
         if($aLanguage['uri'] == $sLanguageDefault)
             return array('code' => 2, 'message' => _t('_adm_pgt_err_deactivate_default'));
 
-        bx_import('BxDolStudioInstallerUtils');
         $oInstallerUtils = BxDolStudioInstallerUtils::getInstance();
 
         $aResult = (int)$aLanguage['enabled'] == 0 ? $oInstallerUtils->perform($aLanguage['path'], 'enable') : $oInstallerUtils->perform($aLanguage['path'], 'disable');
         if($aResult['code'] != 0)
             return $aResult;
 
-        bx_import('BxDolStudioTemplate');
         $oTemplate = BxDolStudioTemplate::getInstance();
 
         $aResult = array('code' => 0, 'message' => _t('_adm_scs_operation_done'));

studio/classes/BxDolStudioLanguages.php

@@ -7,11 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioModules');
-bx_import('BxTemplStudioFunctions');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioLanguagesQuery');
-
 class BxDolStudioLanguages extends BxTemplStudioModules
 {
     function __construct()

studio/classes/BxDolStudioLanguagesQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioPolyglotQuery');
-
 class BxDolStudioLanguagesQuery extends BxDolStudioPolyglotQuery
 {
     function __construct()

studio/classes/BxDolStudioLanguagesUtils.php

@@ -8,8 +8,6 @@
  */
 
 bx_import('BxDolLanguages');
-bx_import('BxDolXmlParser');
-bx_import('BxDolStudioLanguagesUtilsQuery');
 
 class BxDolStudioLanguagesUtils extends BxDolLanguages implements iBxDolSingleton
 {
@@ -48,7 +46,6 @@ class BxDolStudioLanguagesUtils extends BxDolLanguages implements iBxDolSingleto
         $aLanguage = array();
         $this->oDb->getLanguagesBy(array('type' => 'by_name', 'value' => $sName), $aLanguage, false);
 
-        bx_import('BxDolStudioTemplate');
         if(!empty($aLanguage))
             $aLanguage['icon'] = BxDolStudioTemplate::getInstance()->getIconUrl('sys_fl_' . $aLanguage['flag'] . '.gif');
 
@@ -62,7 +59,6 @@ class BxDolStudioLanguagesUtils extends BxDolLanguages implements iBxDolSingleto
         if(!is_array($aLanguages) || empty($aLanguages))
             return $aLanguages;
 
-        bx_import('BxDolStudioTemplate');
         $oTemplate  = BxDolStudioTemplate::getInstance();
         foreach($aLanguages as $iKey => $aLanguage)
             $aLanguages[$iKey]['icon'] = $oTemplate->getIconUrl('sys_fl_' . $aLanguage['flag'] . '.gif');
@@ -131,7 +127,6 @@ class BxDolStudioLanguagesUtils extends BxDolLanguages implements iBxDolSingleto
         if($iLanguages == 0)
             return false;
 
-        bx_import('BxDolFile');
         $oFile = BxDolFile::getInstance();
 
         $sNewLine = "\r\n";
@@ -217,7 +212,6 @@ class BxDolStudioLanguagesUtils extends BxDolLanguages implements iBxDolSingleto
             if(empty($aLanguage) || !is_array($aLanguage))
                 continue;
 
-            bx_import('BxDolModuleQuery');
             $oModuleQuery = BxDolModuleQuery::getInstance();
 
             $aLanguageModule = $oModuleQuery->getModuleByUri($aLanguage['name']);

studio/classes/BxDolStudioLanguagesUtilsQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolLanguagesQuery');
-
 class BxDolStudioLanguagesUtilsQuery extends BxDolLanguagesQuery
 {
     function __construct()

studio/classes/BxDolStudioLauncher.php

@@ -7,12 +7,6 @@
  * @{
  */
 
-bx_import('BxDolModuleQuery');
-bx_import('BxTemplStudioWidgets');
-bx_import('BxTemplStudioDesigns');
-bx_import('BxTemplStudioLanguages');
-bx_import('BxTemplStudioModules');
-
 class BxDolStudioLauncher extends BxTemplStudioWidgets
 {
     protected $aIncludes;

studio/classes/BxDolStudioMenu.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxBaseMenu');
-
 class BxDolStudioMenu extends BxBaseMenu
 {
     public function __construct ($aObject, $oTemplate)

studio/classes/BxDolStudioMenuTop.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxDol');
-bx_import('BxBaseStudioLauncher');
-
 define('BX_DOL_STUDIO_MT_LEFT', 'left');
 define('BX_DOL_STUDIO_MT_CENTER', 'center');
 define('BX_DOL_STUDIO_MT_RIGHT', 'right');

studio/classes/BxDolStudioModule.php

@@ -7,11 +7,7 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioModulesQuery');
-
 define('BX_DOL_STUDIO_MOD_TYPE_SETTINGS', 'settings');
-
 define('BX_DOL_STUDIO_MOD_TYPE_DEFAULT', BX_DOL_STUDIO_MOD_TYPE_SETTINGS);
 
 class BxDolStudioModule extends BxTemplStudioPage
@@ -39,10 +35,8 @@ class BxDolStudioModule extends BxTemplStudioPage
 
 	public static function getObjectInstance($sModule = "", $sPage = "", $bInit = true)
 	{
-	    bx_import('BxDolModuleQuery');
 	    $oModuleDb = BxDolModuleQuery::getInstance();
 
-	    bx_import('BxTemplStudioModule');
         $sClass = 'BxTemplStudioModule';
 	    if($sModule != '' && $oModuleDb->isModuleByName($sModule)) {
 	        $aModule = $oModuleDb->getModuleByName($sModule);
@@ -109,12 +103,10 @@ class BxDolStudioModule extends BxTemplStudioPage
         if(empty($aModule) || !is_array($aModule))
             return array('code' => 1, 'message' => _t('_adm_err_operation_failed'));
 
-        bx_import('BxDolStudioInstallerUtils');
         $aResult = BxDolStudioInstallerUtils::getInstance()->perform($aModule['path'], ((int)$aModule['enabled'] == 0 ? 'enable' : 'disable'), array('html_response' => true));
         if($aResult['code'] != 0)
             return $aResult;
 
-        bx_import('BxDolStudioTemplate');
         $oTemplate = BxDolStudioTemplate::getInstance();
 
         $aResult = array('code' => 0, 'message' => _t('_adm_scs_operation_done'));

studio/classes/BxDolStudioModules.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxDol');
-bx_import('BxDolStudioModulesQuery');
-
 class BxDolStudioModules extends BxDol
 {
     protected $sJsObject;
@@ -51,7 +48,6 @@ class BxDolStudioModules extends BxDol
                     if(empty($sPageName))
                         break;
 
-                    bx_import('BxDolModuleQuery');
                     $aModule = BxDolModuleQuery::getInstance()->getModuleByName($sPageName);
                     if(empty($aModule) || !is_array($aModule))
                         break;
@@ -61,17 +57,14 @@ class BxDolStudioModules extends BxDol
                         break;
                     }
 
-                    bx_import('BxDolStudioInstallerUtils');
                     $aResult = BxDolStudioInstallerUtils::getInstance()->perform($aModule['path'], 'uninstall', array('html_response' => true));
                     if(!empty($aResult['message']))
                         $aResult['message'] = $this->getPopupResult($aResult['message']);
                     break;
             }
 
-            if(!empty($aResult['message'])) {
-                bx_import('BxTemplStudioFunctions');
+            if(!empty($aResult['message']))
                 $aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox('', $aResult['message']);
-            }
 
             echo json_encode($aResult);
             exit;

studio/classes/BxDolStudioModulesQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolModuleQuery');
-
 class BxDolStudioModulesQuery extends BxDolModuleQuery
 {
     function __construct()

studio/classes/BxDolStudioNavigation.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioNavigationQuery');
-
 define('BX_DOL_STUDIO_NAV_TYPE_MENUS', 'menus');
 define('BX_DOL_STUDIO_NAV_TYPE_SETS', 'sets');
 define('BX_DOL_STUDIO_NAV_TYPE_ITEMS', 'items');

studio/classes/BxDolStudioNavigationImport.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGridNavigation');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioNavigationQuery');
-
 class BxDolStudioNavigationImport extends BxTemplStudioGridNavigation
 {
     protected $sSet;

studio/classes/BxDolStudioNavigationItems.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioNavigationQuery');
-
 class BxDolStudioNavigationItems extends BxTemplStudioGrid
 {
     protected $sModule = '';
@@ -50,7 +46,6 @@ class BxDolStudioNavigationItems extends BxTemplStudioGrid
     function deleteByItem(&$aItem)
     {
         if(is_numeric($aItem['icon']) && (int)$aItem['icon'] != 0) {
-            bx_import('BxDolStorage');
             if(!BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES)->deleteFile((int)$aItem['icon'], 0))
                 return false;
         }
@@ -58,7 +53,6 @@ class BxDolStudioNavigationItems extends BxTemplStudioGrid
         if((int)$this->_delete($aItem['id']) <= 0)
             return false;
 
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguage = BxDolStudioLanguagesUtils::getInstance();
         $oLanguage->deleteLanguageString($aItem['title_system']);
         $oLanguage->deleteLanguageString($aItem['title']);

studio/classes/BxDolStudioNavigationMenus.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGridNavigation');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioNavigationQuery');
-
 class BxDolStudioNavigationMenus extends BxTemplStudioGridNavigation
 {
     public function __construct ($aOptions, $oTemplate = false)

studio/classes/BxDolStudioNavigationQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolDb');
-
 class BxDolStudioNavigationQuery extends BxDolDb
 {
     function __construct()

studio/classes/BxDolStudioNavigationSets.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGridNavigation');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioNavigationQuery');
-
 class BxDolStudioNavigationSets extends BxTemplStudioGridNavigation
 {
     public function __construct ($aOptions, $oTemplate = false)

studio/classes/BxDolStudioOAuth.php

@@ -7,7 +7,6 @@
  * @{
  */
 
-bx_import('BxDolSession');
 bx_import('BxDolStudioInstallerUtils');
 
 define('BX_DOL_OAUTH_URL_BASE', BX_DOL_UNITY_URL_ROOT . 'scripts_public/');

studio/classes/BxDolStudioOAuthLib.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioOAuth');
-
 class BxDolStudioOAuthLib extends BxDolStudioOAuth implements iBxDolSingleton
 {
     public function __construct()

studio/classes/BxDolStudioOAuthPlugin.php

@@ -15,8 +15,6 @@ use OAuth\Common\Storage\Session;
 use OAuth\Common\Storage\Exception\TokenNotFoundException;
 use OAuth\Common\Consumer\Credentials;
 
-bx_import('BxDolStudioOAuth');
-
 require_once (BX_DIRECTORY_PATH_PLUGINS . 'OAuth/bootstrap.php');
 
 class BxDolStudioOAuthPlugin extends BxDolStudioOAuth implements iBxDolSingleton

studio/classes/BxDolStudioPage.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxDol');
-bx_import('BxDolStudioUtils');
-bx_import('BxDolStudioPageQuery');
-
 define('BX_DOL_STUDIO_PAGE_HOME', 'home');
 define('BX_DOL_STUDIO_PAGE_JS_OBJECT', 'oBxDolStudioPage');
 
@@ -127,7 +123,6 @@ class BxDolStudioPage extends BxDol
         if(!$bResult)
             return array('code' => 1, 'message' => _t('_adm_err_operation_failed'));
 
-        bx_import('BxDolStudioTemplate');
         $oTemplate = BxDolStudioTemplate::getInstance();
 
         return array('code' => 0, 'message' => _t('_adm_scs_operation_done'));

studio/classes/BxDolStudioPageQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolDb');
-
 class BxDolStudioPageQuery extends BxDolDb
 {
     function __construct()

studio/classes/BxDolStudioPermissions.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioPermissionsQuery');
-
 define('BX_DOL_STUDIO_PRM_TYPE_LEVELS', 'levels');
 define('BX_DOL_STUDIO_PRM_TYPE_ACTIONS', 'actions');
 

studio/classes/BxDolStudioPermissionsActions.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioPermissionsQuery');
-
 class BxDolStudioPermissionsActions extends BxTemplStudioGrid
 {
     protected $iLevel = 0;

studio/classes/BxDolStudioPermissionsLevels.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioPermissionsQuery');
-
 define('BX_DOL_STUDIO_PERMISSIONS_LEVEL_ID_INT_MAX', round(log(BX_DOL_INT_MAX, 2)));
 
 class BxDolStudioPermissionsLevels extends BxTemplStudioGrid
@@ -33,12 +29,10 @@ class BxDolStudioPermissionsLevels extends BxTemplStudioGrid
             return false;
 
         if(is_numeric($aLevel['icon'])) {
-            bx_import('BxDolStorage');
             if(!BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES)->deleteFile((int)$aLevel['icon'], 0))
                 return false;
         }
 
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguage = BxDolStudioLanguagesUtils::getInstance();
         $oLanguage->deleteLanguageString($aLevel['name']);
         $oLanguage->deleteLanguageString($aLevel['description']);

studio/classes/BxDolStudioPermissionsQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolAclQuery');
-
 class BxDolStudioPermissionsQuery extends BxDolAclQuery
 {
     function __construct()

studio/classes/BxDolStudioPolyglot.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioPolyglotQuery');
-
 define('BX_DOL_STUDIO_PGT_TYPE_SETTINGS', 'settings');
 define('BX_DOL_STUDIO_PGT_TYPE_KEYS', 'keys');
 define('BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES', 'etemplates');
@@ -38,7 +35,6 @@ class BxDolStudioPolyglot extends BxTemplStudioPage
 
 		$sAction = bx_process_input($sAction);
 
-		bx_import('BxDolStudioLanguagesUtils');
 		$oLanguages = BxDolStudioLanguagesUtils::getInstance();
 
 		$aResult = array('code' => 1, 'message' => _t('_adm_pgt_err_cannot_process_action'));

studio/classes/BxDolStudioPolyglotEtemplates.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioPolyglotQuery');
-
 class BxDolStudioPolyglotEtemplates extends BxTemplStudioGrid
 {
     public function __construct ($aOptions, $oTemplate = false)

studio/classes/BxDolStudioPolyglotKeys.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioPolyglotQuery');
-
 define('BX_DOL_STUDIO_PK_PREVIEW', 100);
 
 class BxDolStudioPolyglotKeys extends BxTemplStudioGrid
@@ -38,7 +34,6 @@ class BxDolStudioPolyglotKeys extends BxTemplStudioGrid
         foreach($aLanguages as $iLanguageId)
             $aStrings[$iLanguageId] = $oForm->getCleanValue('language_' . $iLanguageId);
 
-        bx_import('BxDolStudioLanguagesUtils');
         $mixedResult = BxDolStudioLanguagesUtils::getInstance()->addLanguageString($sKey, $aStrings, 0, $iCategoryId);
         if($mixedResult === false)
             return _t('_adm_pgt_err_create_key');
@@ -57,7 +52,6 @@ class BxDolStudioPolyglotKeys extends BxTemplStudioGrid
         foreach($aLanguages as $iLanguageId)
             $aStrings[$iLanguageId] = $oForm->getCleanValue('language_' . $iLanguageId);
 
-        bx_import('BxDolStudioLanguagesUtils');
         if(!BxDolStudioLanguagesUtils::getInstance()->updateLanguageStringById($iId, $aStrings))
             return _t('_adm_pgt_err_save');
 

studio/classes/BxDolStudioPolyglotQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioLanguagesUtilsQuery');
-
 class BxDolStudioPolyglotQuery extends BxDolStudioLanguagesUtilsQuery
 {
     function __construct()

studio/classes/BxDolStudioRssModuleHelp.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplRss');
-
 class BxDolStudioRssModuleHelp extends BxTemplRss
 {
     function __construct($aObject)
@@ -18,7 +16,6 @@ class BxDolStudioRssModuleHelp extends BxTemplRss
 
     public function getUrl($mixedId)
     {
-    	bx_import('BxDolStudioModule');
 		return BxDolStudioModule::getObjectInstance($mixedId)->getRssHelpUrl();
     }
 }

studio/classes/BxDolStudioRssPageHelp.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplRss');
-
 class BxDolStudioRssPageHelp extends BxTemplRss
 {
     function __construct($aObject)
@@ -18,7 +16,6 @@ class BxDolStudioRssPageHelp extends BxTemplRss
 
     public function getUrl($mixedId)
     {
-    	bx_import('BxDolStudioPage');
     	$oPage = new BxDolStudioPage($mixedId);
 		return $oPage->getRssHelpUrl();
     }

studio/classes/BxDolStudioSettings.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioSettingsQuery');
-
 define('BX_DOL_STUDIO_STG_TYPE_SYSTEM', 'system');
 define('BX_DOL_STUDIO_STG_TYPE_DEFAULT', BX_DOL_STUDIO_STG_TYPE_SYSTEM);
 

studio/classes/BxDolStudioSettingsQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioPageQuery');
-
 class BxDolStudioSettingsQuery extends BxDolStudioPageQuery
 {
     function __construct()

studio/classes/BxDolStudioStore.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioStoreQuery');
-bx_import('BxDolStudioInstallerUtils');
-
 define('BX_DOL_STUDIO_STR_TYPE_DEFAULT', 'downloaded');
 
 class BxDolStudioStore extends BxTemplStudioPage
@@ -42,7 +38,6 @@ class BxDolStudioStore extends BxTemplStudioPage
         if(is_string($sPage) && !empty($sPage))
             $this->sPage = $sPage;
 
-		bx_import('BxDolStudioOAuth');
         $this->iClient = BxDolStudioOAuth::getAuthorizedClient();
 
         //--- Check actions ---//
@@ -101,7 +96,6 @@ class BxDolStudioStore extends BxTemplStudioPage
                         break;
                     }
 
-                    bx_import('BxDolStudioCart');
                     BxDolStudioCart::getInstance()->add($sVendor, $iItem, $iItemCount);
                     $aResult = array('code' => BX_DOL_STUDIO_IU_RC_SUCCESS, 'message' => _t('_adm_msg_modules_success_added_to_cart'));
                     break;
@@ -115,7 +109,6 @@ class BxDolStudioStore extends BxTemplStudioPage
                         break;
                     }
 
-                    bx_import('BxDolStudioCart');
                     BxDolStudioCart::getInstance()->delete($sVendor, $iItem);
                     $aResult = array('code' => BX_DOL_STUDIO_IU_RC_SUCCESS, 'message' => '');
                     break;
@@ -157,10 +150,7 @@ class BxDolStudioStore extends BxTemplStudioPage
             }
 
             if(!empty($aResult['message'])) {
-                bx_import('BxDolStudioTemplate');
                 $aResult['message'] = BxDolStudioTemplate::getInstance()->parseHtmlByName('mod_action_result.html', array('content' => $aResult['message']));
-
-                bx_import('BxTemplStudioFunctions');
                 $aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox('', $aResult['message']);
             }
 
@@ -175,7 +165,6 @@ class BxDolStudioStore extends BxTemplStudioPage
         $aProducts = array();
         $sJsObject = $this->getPageJsObject();
 
-        bx_import('BxDolStudioJson');
         $oJson = BxDolStudioJson::getInstance();
 
         // Load featured
@@ -220,13 +209,11 @@ class BxDolStudioStore extends BxTemplStudioPage
 
     protected function loadFeatured($iStart, $iPerPage)
     {
-        bx_import('BxDolStudioJson');
         return BxDolStudioJson::getInstance()->load(BX_DOL_UNITY_URL_MARKET . 'json_browse_featured', array('start' => $iStart, 'per_page' => $iPerPage, 'client' => $this->iClient));
     }
 
     protected function loadTag($sTag, $iStart, $iPerPage)
     {
-        bx_import('BxDolStudioJson');
         return BxDolStudioJson::getInstance()->load(BX_DOL_UNITY_URL_MARKET . 'json_browse_by_tag', array('value' => $this->aliasToNameTag($sTag), 'start' => $iStart, 'per_page' => $iPerPage, 'client' => $this->iClient));
     }
 
@@ -242,10 +229,8 @@ class BxDolStudioStore extends BxTemplStudioPage
 
     protected function loadCheckout()
     {
-        bx_import('BxDolStudioJson');
         $oJson = BxDolStudioJson::getInstance();
 
-        bx_import('BxDolStudioCart');
         $aVendors = BxDolStudioCart::getInstance()->parseByVendor();
 
         $aResult = array();
@@ -280,7 +265,6 @@ class BxDolStudioStore extends BxTemplStudioPage
 
     protected function loadProduct($sModuleName)
     {
-        bx_import('BxDolStudioJson');
         $oJson = BxDolStudioJson::getInstance();
 
         return $oJson->load(BX_DOL_UNITY_URL_MARKET . 'json_get_product_by_name', array('value' => $sModuleName, 'client' => $this->iClient));
@@ -304,7 +288,6 @@ class BxDolStudioStore extends BxTemplStudioPage
 
     private function checkoutCart($sVendor)
     {
-        bx_import('BxDolStudioCart');
         $oCart = BxDolStudioCart::getInstance();
 
         $aItems = $oCart->getByVendor($sVendor);

studio/classes/BxDolStudioStoreQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioModulesQuery');
-
 class BxDolStudioStoreQuery extends BxDolStudioModulesQuery
 {
     function __construct()
@@ -18,8 +16,6 @@ class BxDolStudioStoreQuery extends BxDolStudioModulesQuery
 
     public function isQueued($sAction, $sName)
     {
-    	bx_import('BxDolStudioInstallerUtils');
-
     	$sJobName = '';
     	switch($sAction) {
     		case 'download':

studio/classes/BxDolStudioTemplate.php

@@ -8,11 +8,8 @@
  */
 
 define('BX_DOL_STUDIO_TEMPLATE_DEFAULT_CODE', 'uni');
-
 define('BX_PAGE_COLUMN_DUAL', 3); ///< page, with 2 columns
 
-bx_import('BxDolTemplate');
-
 class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
 {
     function __construct()
@@ -79,7 +76,6 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
             'jquery.dolPopup.js',
         ));
 
-        bx_import('BxTemplStudioConfig');
         $this->_oConfigTemplate = BxTemplStudioConfig::getInstance();
     }
 
@@ -103,7 +99,6 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
                 $sRet = $this->_processJsOptions();
                 break;
             case 'menu_top':
-                bx_import('BxTemplStudioMenuTop');
                 $sRet = BxTemplStudioMenuTop::getInstance()->getCode();
                 break;
             case 'copyright':
@@ -166,11 +161,9 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
         $aType2Method = array('image' => 'getImageUrl', 'icon' => 'getIconUrl');
 
         //--- Check in System Storage.
-        if(is_numeric($mixedId) && (int)$mixedId > 0) {
-            bx_import('BxDolStorage');
+        if(is_numeric($mixedId) && (int)$mixedId > 0)
             if(($sResult = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES)->getFileUrlById((int)$mixedId)) !== false)
                 $sUrl = $sResult;
-        }
 
         //--- Check in template folders.
         if($sUrl == "" && is_string($mixedId) && strpos($mixedId, '.') !== false)

studio/classes/BxDolStudioTools.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolIO');
-
 define('BX_DOL_PERM_FILE', 'file');
 define('BX_DOL_PERM_DIR', 'dir');
 define('BX_DOL_PERM_EXE', 'exe');
@@ -197,9 +195,6 @@ EOF;
 
     function GenAuditPage()
     {
-        if (!class_exists('BxDolStudioToolsAudit'))
-            bx_import('BxDolStudioToolsAudit');
-
         $oAudit = new BxDolStudioToolsAudit();
         return $oAudit->generate();
     }
@@ -262,7 +257,6 @@ EOF;
     protected function _checkPermissionsModules(&$aMessages)
     {
         $bRet = true;
-        bx_import('BxDolModuleDb');
         $oDbModules = new BxDolModuleDb();
         $aModules = $oDbModules->getModules();
         foreach ($aModules as $a) {

studio/classes/BxDolStudioToolsAudit.php

@@ -345,7 +345,6 @@ class BxDolStudioToolsAudit extends BxDol
 
         $sEmailToCkeckMailSending = class_exists('BxDolDb') && BxDolDb::getInstance() ? BxDolDb::getInstance()->getParam('site_email') : '';
 
-        bx_import('BxDolUpgrader');
         $oUpgrader = new BxDolUpgrader();
         if (!($sLatestVer = $oUpgrader->getLatestVersionNumber()))
             $sLatestVer = 'undefined';

studio/classes/BxDolStudioUpdater.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioInstaller');
-
 class BxDolStudioUpdater extends BxDolStudioInstaller
 {
     public function __construct($aConfig)
@@ -158,7 +156,6 @@ class BxDolStudioUpdater extends BxDolStudioInstaller
         if(empty($aConfig) || !is_array($aConfig))
             return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-    	bx_import('BxDolStudioLanguagesUtils');
         $oLanguages = BxDolStudioLanguagesUtils::getInstance();
         $aLanguages = $oLanguages->getLanguages();
 
@@ -182,7 +179,6 @@ class BxDolStudioUpdater extends BxDolStudioInstaller
         if(empty($aConfig) || !is_array($aConfig) || empty($aConfig['module_uri']))
             return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		bx_import('BxDolStudioLanguagesUtils');
         $oLanguages = BxDolStudioLanguagesUtils::getInstance();
         $aLanguages = $oLanguages->getLanguages();
 

studio/classes/BxDolStudioUtils.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDol');
-
 define('BX_DOL_STUDIO_MODULE_SYSTEM', 'system');
 define('BX_DOL_STUDIO_MODULE_CUSTOM', 'custom');
 
@@ -62,10 +60,8 @@ class BxDolStudioUtils extends BxDol
     {
         $aType2Prefix = array('menu' => 'mi', 'page' => 'pi', 'store' => 'si');
 
-        if(!is_array($mixedModule)) {
-	        bx_import('BxDolModuleQuery');
+        if(!is_array($mixedModule))
 	        $aModule = BxDolModuleQuery::getInstance()->getModuleByName($mixedModule);
-        }
         else 
         	$aModule = $mixedModule;
 
@@ -90,7 +86,6 @@ class BxDolStudioUtils extends BxDol
         if(in_array($sName, array(BX_DOL_STUDIO_MODULE_SYSTEM, BX_DOL_STUDIO_MODULE_CUSTOM)))
             return _t($sPrefix . $sName);
 
-        bx_import('BxDolModuleQuery');
         $aModule = BxDolModuleQuery::getInstance()->getModuleByName($sName);
         if(!empty($aModule))
             return $aModule['title'];
@@ -108,7 +103,6 @@ class BxDolStudioUtils extends BxDol
         if($bShowCustom)
             $aResult[BX_DOL_STUDIO_MODULE_CUSTOM] = self::getModuleTitle(BX_DOL_STUDIO_MODULE_CUSTOM);
 
-        bx_import('BxDolModuleQuery');
         $aModules = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'modules', 'active' => 1));
         foreach($aModules as $aModule)
             $aResult[$aModule['name']] = $aModule['title'];
@@ -122,7 +116,6 @@ class BxDolStudioUtils extends BxDol
         $sResult = "";
         switch($iCount) {
             case 1:
-                bx_import('BxDolAcl');
                 $aLevel = BxDolAcl::getInstance()->getMembershipInfo(log($iValue, 2) + 1);
                 $sResult = _t($aLevel['name']);
                 break;
@@ -149,7 +142,6 @@ class BxDolStudioUtils extends BxDol
         else if($iValue == BX_DOL_INT_MAX)
             return -1;
 
-        bx_import('BxDolAcl');
         $aLevels = BxDolAcl::getInstance()->getMemberships(false, true);
 
         $iIndex = 1;
@@ -176,7 +168,6 @@ class BxDolStudioUtils extends BxDol
 
     public static function getVisibilityValues($iValue, &$aValuesAll, &$aValuesSelected)
     {
-        bx_import('BxDolAcl');
         $aLevels = BxDolAcl::getInstance()->getMemberships(false, true);
         foreach($aLevels as $iKey => $sValue) {
             if(((int)$iValue & pow(2, (int)$iKey - 1)) != 0)

studio/classes/BxDolStudioWidgets.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioPage');
-bx_import('BxDolStudioWidgetsQuery');
-
 define('BX_DOL_STUDIO_WS_ENABLED', 1);
 define('BX_DOL_STUDIO_WS_DISABLED', 2);
 

studio/classes/BxDolStudioWidgetsQuery.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolStudioPageQuery');
-
 class BxDolStudioWidgetsQuery extends BxDolStudioPageQuery implements iBxDolSingleton
 {
     function __construct()

studio/dashboard.php

@@ -15,10 +15,8 @@ bx_import('BxDolLanguages');
 
 bx_require_authentication(true);
 
-bx_import('BxTemplStudioDashboard');
 $oPage = new BxTemplStudioDashboard();
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/design.php

@@ -27,12 +27,10 @@ $sCustomTemplateClass = BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_' . $sName . '/
 if(file_exists($sCustomTemplateClass)) {
     require_once($sCustomTemplateClass);
     $oPage = new BxTemplDesign($sName, $sPage);
-} else {
-    bx_import('BxTemplStudioDesign');
-    $oPage = new BxTemplStudioDesign($sName, $sPage);
 }
+else
+	$oPage = new BxTemplStudioDesign($sName, $sPage);
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/designer.php

@@ -18,10 +18,8 @@ bx_require_authentication(true);
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioDesigner');
 $oPage = new BxTemplStudioDesigner($sPage);
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/js/page.js

@@ -64,7 +64,7 @@ BxDolStudioPage.prototype.togglePopup = function(sName, oLink) {
 		case 'help':
 			oPopupOptions = $.extend({}, oPopupOptions, {
 				onShow: function() {
-					var oPopup = $(this);
+					var oPopup = $(sId);
 					var oPopupRss = oPopup.find('.RSSAggrCont');
 					if(!oPopupRss.find('.bx-loading-ajax').length)
 						return;

studio/language.php

@@ -23,10 +23,8 @@ $sName = $sName !== false ? bx_process_input($sName) : '';
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioLanguage');
 $oPage = new BxTemplStudioLanguage($sName, $sPage);
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/languages.php

@@ -15,7 +15,6 @@ bx_import('BxDolLanguages');
 
 bx_require_authentication(true);
 
-bx_import('BxTemplStudioLanguages');
 $oLanguages = new BxTemplStudioLanguages();
 $oLanguages->processActions();
 /** @} */

studio/launcher.php

@@ -19,10 +19,8 @@ bx_import('BxTemplStudioMenuTop');
 $oTopMenu = BxTemplStudioMenuTop::getInstance();
 $oTopMenu->setVisibleAll();
 
-bx_import('BxTemplStudioLauncher');
 $oPage = new BxTemplStudioLauncher();
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/module.php

@@ -24,10 +24,8 @@ $sName = $sName !== false ? bx_process_input($sName) : '';
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxDolStudioModule');
 $oPage = BxDolStudioModule::getObjectInstance($sName, $sPage);
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/modules.php

@@ -15,7 +15,6 @@ bx_import('BxDolLanguages');
 
 bx_require_authentication(true);
 
-bx_import('BxTemplStudioModules');
 $oModules = new BxTemplStudioModules();
 $oModules->processActions();
 /** @} */

studio/polyglot.php

@@ -18,11 +18,9 @@ bx_require_authentication(true);
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioPolyglot');
 $oPage = new BxTemplStudioPolyglot($sPage);
 $oPage->init();
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/settings.php

@@ -18,10 +18,8 @@ bx_require_authentication(true);
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioSettings');
 $oPage = new BxTemplStudioSettings($sPage);
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/store.php

@@ -18,10 +18,8 @@ bx_require_authentication(true);
 $sPage = bx_get('page');
 $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
-bx_import('BxTemplStudioStore');
 $oPage = new BxTemplStudioStore($sPage);
 
-bx_import('BxDolStudioTemplate');
 $oTemplate = BxDolStudioTemplate::getInstance();
 $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());

studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -8,10 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioUtils');
-bx_import('BxDolStudioBuilderPage');
-bx_import('BxTemplStudioFormView');
-
 class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
 {
     protected $sParamsDivider = '#';
@@ -98,7 +94,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             )
         );
 
-        bx_import('BxDolModuleQuery');
         $aModulesDb = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'modules'));
         foreach($aModulesDb as $aModuleDb) {
         	$sName = $aModuleDb['name'];
@@ -127,7 +122,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
 
     function getPageCode($bHidden = false)
     {
-        bx_import('BxTemplPage');
         $oPage = BxTemplPage::getObjectInstance($this->sPage);
 
         $oTemplate = BxDolStudioTemplate::getInstance();
@@ -190,7 +184,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             $sContent = $oTemplate->parseHtmlByName($this->aPageRebuild['layout_template'], $aTmplVars);
         }
 
-        bx_import('BxDolStudioLanguagesUtils');
         $aLanguages = BxDolStudioLanguagesUtils::getInstance()->getLanguages();
 
         $aTmplVars = array(
@@ -281,7 +274,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             foreach($this->aPageSettings as $aSetting)
                 $oForm->aInputs = array_merge($oForm->aInputs, $this->{'getSettings' . $this->getClassName($aSetting['name']) . 'Fields'}());
 
-        	bx_import('BxDolStudioLanguagesUtils');
             $sLanguage = BxDolStudioLanguagesUtils::getInstance()->getCurrentLangName(false);
 
             $sObject = BxDolForm::getSubmittedValue('title-' . $sLanguage, $aForm['form_attrs']['method']);
@@ -300,7 +292,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
                 return array('msg' => _t('_adm_bp_err_page_create'));
         }
 
-        bx_import('BxTemplStudioFunctions');
         $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['add_popup_id'], _t('_adm_bp_txt_create_popup'), $oTemplate->parseHtmlByName('bp_add_page.html', array(
             'form_id' => $aForm['form_attrs']['id'],
             'form' => $oForm->getCode(true)
@@ -370,7 +361,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
                 return array('msg' => _t('_adm_bp_err_save'));
         }
 
-        bx_import('BxTemplStudioFunctions');
         $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['edit_popup_id'], _t('_adm_bp_txt_settings_popup'), $oTemplate->parseHtmlByName('bp_edit_page.html', array(
             'form_id' => $aForm['form_attrs']['id'],
             'form' => $oForm->getCode(true)
@@ -384,10 +374,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
         if(empty($this->sPage) || empty($this->aPageRebuild) || !is_array($this->aPageRebuild))
             return array('msg' => _t('_adm_bp_err_page_delete'));
 
-        bx_import('BxDolStudioLanguagesUtils');
         $oLangauge = BxDolStudioLanguagesUtils::getInstance();
-
-        bx_import('BxDolStorage');
         $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
 
         $aBlocks = array();
@@ -474,7 +461,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             )
         );
 
-        bx_import('BxDolModuleQuery');
         $aModules = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'modules'));
         $aModulesWithBlocks = $this->oDb->getModulesWithCopyableBlocks();
         foreach($aModules as $aModule) {
@@ -494,7 +480,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
         foreach($aMenu as $sKey => $aItem)
             $aMenu[$sKey]['onclick'] =  $sJsObject . '.onChangeModule(\'' . $aItem['name'] . '\', this);';
 
-        bx_import('BxTemplStudioMenu');
         $oMenu = new BxTemplStudioMenu(array('template' => 'menu_side.html', 'menu_items' => $aMenu));
 
         $aTmplParams = array(
@@ -514,10 +499,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             $aBlocks = array();
             $this->oDb->getBlocks(array('type' => 'by_ids', 'value' => $aIds), $aBlocks, false);
 
-            bx_import('BxDolStudioLanguagesUtils');
             $oLanguage = BxDolStudioLanguagesUtils::getInstance();
-
-            bx_import('BxDolStorage');
             $oStorege = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
 
             $bResult = true;
@@ -573,7 +555,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
                 return array('msg' => _t('_adm_bp_err_block_added'));
         }
 
-        bx_import('BxTemplStudioFunctions');
         $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['create_block_popup_id'], _t('_adm_bp_txt_new_block_popup'), $oTemplate->parseHtmlByName('bp_add_block.html', array(
         	'action' => 'create',
             'form_id' => $aForm['form_attrs']['id'],
@@ -752,7 +733,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
                 return array('msg' => _t('_adm_bp_err_block_edit'));
         }
 
-        bx_import('BxTemplStudioFunctions');
         $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['edit_block_popup_id'], _t('_adm_bp_txt_edit_block_popup', _t($aBlock['title'])), $oTemplate->parseHtmlByName('bp_add_block.html', array(
         	'action' => 'edit',
             'form_id' => $aForm['form_attrs']['id'],
@@ -797,7 +777,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             list($iImageId, $sImageAlign) = explode($this->sParamsDivider, $aBlock['content']);
 
         if(is_numeric($iImageId) && (int)$iImageId != 0) {
-            bx_import('BxDolStorage');
             if(!BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES)->deleteFile((int)$iImageId, 0))
                 return array('msg' => _t('_adm_bp_err_block_content_image_preview_delete'));
 
@@ -809,7 +788,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
 
     protected function actionUriGet()
     {
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguage = BxDolStudioLanguagesUtils::getInstance();
         $aLanguages = $oLanguage->getLanguages();
 
@@ -838,8 +816,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
                 }
 
         $sUri = $sUri != "" ? uriGenerate($sUri, 'sys_objects_page', 'uri') : "";
-
-        bx_import('BxDolPermalinks');
         $sUrl = BxDolPermalinks::getInstance()->permalink($this->sPageBaseUrl . $sUri);
 
         return array('eval' => $this->getPageJsObject() . '.onGetUri(oData)', 'uri' => $sUri, 'url' => $sUrl);
@@ -847,8 +823,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
 
     protected function getSettingsOptions($aPage = array(), $bCreate = true, $bInputsOnly = false)
     {
-    	bx_import('BxDolPermalinks');
-
         $aForm = array(
             'form_attrs' => array(
                 'id' => 'adm-bp-settings-seo',
@@ -1500,7 +1474,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
     	if($aBlock['module'] != BX_DOL_STUDIO_MODULE_CUSTOM)
     		return;
 
-        bx_import('BxDolStudioLanguagesUtils');
         BxDolStudioLanguagesUtils::getInstance()->deleteLanguageString($aBlock['title']);
 
         //--- Process Lang block
@@ -1512,10 +1485,8 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             $iImageId = $sImageAlign = '';
             list($iImageId, $sImageAlign) = explode($this->sParamsDivider, $aBlock['content']);
 
-            if(is_numeric($iImageId) && (int)$iImageId != 0) {
-                bx_import('BxDolStorage');
+            if(is_numeric($iImageId) && (int)$iImageId != 0)
                 BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES)->deleteFile((int)$iImageId, 0);
-            }
         }
     }
 
@@ -1570,7 +1541,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
     {
         $sJsObject = $this->getPageJsObject();
 
-        bx_import('BxDolPermalinks');
         $oPermalinks = BxDolPermalinks::getInstance();
 
         return array(
@@ -1618,7 +1588,6 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             );
         }
 
-        bx_import('BxTemplStudioMenu');
         $oMenu = new BxTemplStudioMenu(array('template' => 'menu_side.html', 'menu_items' => $aTmplParams['menu']));
         $aTmplParams['menu'] = $oMenu->getCode();
 

studio/template/scripts/BxBaseStudioConfig.php

@@ -8,8 +8,6 @@
  * @{
  */
 
-bx_import('BxTemplConfig');
-
 class BxBaseStudioConfig extends BxTemplConfig
 {
     function __construct()

studio/template/scripts/BxBaseStudioDashboard.php

@@ -8,8 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioDashboard');
-
 class BxBaseStudioDashboard extends BxDolStudioDashboard
 {
     function __construct()
@@ -58,7 +56,6 @@ class BxBaseStudioDashboard extends BxDolStudioDashboard
 
     function getPageCode($bHidden = false)
     {
-    	bx_import('BxDolPage');
     	$oPage = BxDolPage::getObjectInstance('sys_std_dashboard');
     	return $oPage->getCode();
     }
@@ -97,7 +94,6 @@ class BxBaseStudioDashboard extends BxDolStudioDashboard
     		$iResult += 1;
 
     	//--- Check Host Requirements
-    	bx_import('BxDolStudioToolsAudit');
 		$oAudit = new BxDolStudioToolsAudit();
 
     	foreach($this->aItemsHTools as $sTitle => $sFunc) {
@@ -144,7 +140,6 @@ class BxBaseStudioDashboard extends BxDolStudioDashboard
 	    		$aItems[] = array('label' => '_adm_dbd_txt_su_system', 'value' => $iSizeDiskTotal - $iSizeDiskMedia);
 	    	}
 
-	    	bx_import('BxDolModuleQuery');
 	    	$aModules = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'all'));
 	    	foreach($aModules as $aModule) {
 	    		$sName = $aModule['name'];
@@ -207,13 +202,11 @@ class BxBaseStudioDashboard extends BxDolStudioDashboard
 			)
 		);
 
-		bx_import('BxDolStudioToolsAudit');
 		$oAudit = new BxDolStudioToolsAudit();
 
 		$aTmplVarsItems = array();
 		if(!$bDynamic) {
 
-	        bx_import('BxTemplFunctions');
 	        $oFunc = BxTemplFunctions::getInstance();
 
 	        $aLevels = array (BX_DOL_AUDIT_FAIL, BX_DOL_AUDIT_WARN, BX_DOL_AUDIT_UNDEF);

studio/template/scripts/BxBaseStudioDesign.php

@@ -8,9 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioDesign');
-
 class BxBaseStudioDesign extends BxDolStudioDesign
 {
     protected $aMenuItems = array(
@@ -80,15 +77,12 @@ class BxBaseStudioDesign extends BxDolStudioDesign
 
     protected function getSettings()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-
-        bx_import('BxTemplStudioSettings');
         $oPage = new BxTemplStudioSettings($this->sTemplate);
 
         $aTmplVars = array(
             'bx_repeat:blocks' => $oPage->getPageCode(),
         );
-        return $oTemplate->parseHtmlByName('design.html', $aTmplVars);
+        return BxDolStudioTemplate::getInstance()->parseHtmlByName('design.html', $aTmplVars);
     }
 }
 

studio/template/scripts/BxBaseStudioDesigner.php

@@ -8,10 +8,6 @@
  * @{
  */
 
-bx_import('BxTemplPaginate');
-bx_import('BxDolStudioDesigner');
-bx_import('BxTemplStudioFormView');
-
 class BxBaseStudioDesigner extends BxDolStudioDesigner
 {
     protected $sLogoFormId = 'adm-dsg-logo-form';
@@ -239,7 +235,6 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
                 BX_DOL_TRANSCODER_OBJ_ICON_FAVICON => '_adm_dsg_txt_icon_favicon'
             );
 
-            bx_import('BxDolTranscoderImage');
             foreach($aTranscoders as $sTranscoder => $sTitle) {
                 $oTranscoder = BxDolTranscoderImage::getObjectInstance($sTranscoder);
 
@@ -325,9 +320,6 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
 
     protected function getSettings()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-
-        bx_import('BxTemplStudioSettings');
         $oPage = new BxTemplStudioSettings(BX_DOL_STUDIO_STG_TYPE_SYSTEM, BX_DOL_STUDIO_STG_CATEGORY_TEMPLATES);
 
         $aTmplVars = array(
@@ -335,7 +327,7 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
             'bx_repeat:blocks' => $oPage->getPageCode(),
         );
 
-        return $oTemplate->parseHtmlByName('designer.html', $aTmplVars);
+        return BxDolStudioTemplate::getInstance()->parseHtmlByName('designer.html', $aTmplVars);
     }
 }
 

studio/template/scripts/BxBaseStudioDesigns.php

@@ -8,10 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioDesigns');
-bx_import('BxTemplStudioFormView');
-bx_import('BxTemplStudioFunctions');
-
 class BxBaseStudioDesigns extends BxDolStudioDesigns
 {
     function __construct()

studio/template/scripts/BxBaseStudioFormView.php

@@ -8,8 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioForm');
-
 class BxBaseStudioFormView extends BxDolStudioForm
 {
     function __construct($aInfo, $oTemplate)
@@ -78,7 +76,6 @@ class BxBaseStudioFormView extends BxDolStudioForm
 
             $sFileUrl = false;
             if (!empty($aInput['transcoder_object'])) {
-                bx_import('BxDolTranscoderImage');
                 $oTranscoder = BxDolTranscoderImage::getObjectInstance($aInput['transcoder_object']);
                 $sFileUrl = $oTranscoder->getFileUrlNotReady($iId);
                 if (isset($aInput['transcoder_image_width']) && $aInput['transcoder_image_width'] > 0)
@@ -87,7 +84,6 @@ class BxBaseStudioFormView extends BxDolStudioForm
                     $sFileUrl = bx_append_url_params($sFileUrl, array('y' => $aInput['transcoder_image_height']));
             } 
             else {
-                bx_import('BxDolStorage');
                 $sStorage = isset($aInput['storage_object']) && $aInput['storage_object'] != '' ? $aInput['storage_object'] : BX_DOL_STORAGE_OBJ_IMAGES;
                 $oStorage = BxDolStorage::getObjectInstance($sStorage);
                 $sFileUrl = $oStorage->getFileUrlById($iId);
@@ -135,10 +131,8 @@ class BxBaseStudioFormView extends BxDolStudioForm
         $sInputName = $aInput['name'];
         $aInputAttrs = isset($aInput['attrs']) && is_array($aInput['attrs']) ? $aInput['attrs'] : array();
 
-        bx_import('BxTemplStudioFunctions');
         $oFunctions = BxTemplStudioFunctions::getInstance();
 
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguage = BxDolStudioLanguagesUtils::getInstance();
         $sLanguage = $oLanguage->getCurrentLangName(false);
         $aLanguages = $oLanguage->getLanguagesInfo();

studio/template/scripts/BxBaseStudioForms.php

@@ -8,8 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioForms');
-
 class BxBaseStudioForms extends BxDolStudioForms
 {
     protected $sSubpageUrl;
@@ -147,7 +145,6 @@ class BxBaseStudioForms extends BxDolStudioForms
 
     protected function getGridObject($sObjectName)
     {
-        bx_import('BxDolGrid');
         $oGrid = BxDolGrid::getObjectInstance($sObjectName);
         if(!$oGrid)
             return '';
@@ -157,9 +154,6 @@ class BxBaseStudioForms extends BxDolStudioForms
 
     protected function getGrid($sObjectName)
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-
-        bx_import('BxDolGrid');
         $oGrid = BxDolGrid::getObjectInstance($sObjectName);
         if(!$oGrid)
             return '';
@@ -176,7 +170,7 @@ class BxBaseStudioForms extends BxDolStudioForms
             )
         );
 
-        return $oTemplate->parseHtmlByName('forms.html', $aTmplVars);
+        return BxDolStudioTemplate::getInstance()->parseHtmlByName('forms.html', $aTmplVars);
     }
 
     protected function actionValuesList()
@@ -187,7 +181,6 @@ class BxBaseStudioForms extends BxDolStudioForms
         $sList = bx_process_input($sList);
         $bUseForSets = (int)bx_get('form_use_for_sets') == 1;
 
-        bx_import('BxDolForm');
         $aValues = BxDolForm::getDataItems(trim($sList, BX_DATA_LISTS_KEY_PREFIX . ' '), $bUseForSets);
 
         $aTmplVars = array();

studio/template/scripts/BxBaseStudioFormsDisplays.php

@@ -8,9 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioFormsDisplays');
-bx_import('BxTemplStudioFormView');
-
 class BxBaseStudioFormsDisplays extends BxDolStudioFormsDisplays
 {
     protected $sUrlPage;
@@ -121,8 +118,8 @@ class BxBaseStudioFormsDisplays extends BxDolStudioFormsDisplays
                 $aRes = array('msg' => _t('_adm_form_err_displays_edit'));
 
             $this->_echoResultJson($aRes, true);
-        } else {
-            bx_import('BxTemplStudioFunctions');
+        } 
+        else {
             $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-forms-edit-popup', _t('_adm_form_txt_displays_edit_popup', _t($aDisplay['title'])), $this->_oTemplate->parseHtmlByName('form_add_display.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
@@ -141,7 +138,6 @@ class BxBaseStudioFormsDisplays extends BxDolStudioFormsDisplays
 
     function getFormsSelector($sModule = '')
     {
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputForms = array(
@@ -190,7 +186,6 @@ class BxBaseStudioFormsDisplays extends BxDolStudioFormsDisplays
         parent::_addJsCss();
         $this->_oTemplate->addJs(array('jquery.form.min.js', 'forms_displays.js'));
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
         $oForm->addCssJs();
     }
@@ -222,7 +217,6 @@ class BxBaseStudioFormsDisplays extends BxDolStudioFormsDisplays
 
         $sContent = $this->getModulesSelectOne('getDisplays', false) . $this->getFormsSelector($this->sModule);
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputSearch = array(

studio/template/scripts/BxBaseStudioFormsField.php

@@ -8,12 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioTemplate');
-bx_import('BxDolStudioFormsField');
-bx_import('BxDolStudioLanguagesUtils');
-bx_import('BxTemplStudioFormView');
-bx_import('BxTemplStudioFunctions');
-
 class BxBaseStudioFormsField extends BxDolStudioFormsField
 {
     protected $aForm;
@@ -79,7 +73,6 @@ class BxBaseStudioFormsField extends BxDolStudioFormsField
                 'title' => $sTitle
             );
 
-        bx_import('BxTemplStudioMenu');
         $oMenu = new BxTemplStudioMenu(array('template' => 'menu_vertical.html', 'menu_items' => $aMenu));
         $this->aForm['inputs']['type']['content'] = $oMenu->getCode();
     }
@@ -111,7 +104,6 @@ class BxBaseStudioFormsField extends BxDolStudioFormsField
             $sInputObject = $oForm->getCleanValue('object');
 
             //--- Process field name.
-            bx_import('BxDolStudioLanguagesUtils');
             $sLanguage = BxDolStudioLanguagesUtils::getInstance()->getCurrentLangName(false);
             $sCaption = BxDolForm::getSubmittedValue('caption-' . $sLanguage, $aForm['form_attrs']['method']);
 

studio/template/scripts/BxBaseStudioFormsFields.php

@@ -8,7 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioFormsFields');
 bx_import('BxTemplStudioFormsField');
 
 define('BX_DOL_STUDIO_FORMS_FIELDS_JS_OBJECT', 'oBxDolStudioFormsFields');
@@ -128,7 +127,6 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields
 
             $oClass->alterRemove($aField['name']);
 
-            bx_import('BxDolStudioLanguagesUtils');
             $oLanguage = BxDolStudioLanguagesUtils::getInstance();
             if(!empty($aField['caption']))
                 $oLanguage->deleteLanguageString($aField['caption']);
@@ -247,7 +245,6 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields
 
         BxDolStudioUtils::getVisibilityValues($aField['visible_for_levels'], $aForm['inputs']['visible_for_levels']['values'], $aForm['inputs']['visible_for_levels']['value']);
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView($aForm);
         $oForm->initChecker();
 
@@ -258,8 +255,8 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields
                 $aRes = array('msg' => _t('_adm_form_err_field_show_to'));
 
             $this->_echoResultJson($aRes, true);
-        } else {
-            bx_import('BxTemplStudioFunctions');
+        } 
+        else {
             $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-field-show-to-popup', _t('_adm_form_txt_field_show_to_popup', _t($aField['caption_system'])), $this->_oTemplate->parseHtmlByName('form_add_field.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
@@ -278,7 +275,6 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields
 
     function getDisplaysSelector($sModule = '')
     {
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputDisplays = array(
@@ -344,7 +340,6 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields
         $this->_oTemplate->addCss(array('menu.css'));
         $this->_oTemplate->addJs(array('jquery.form.min.js', 'forms_fields.js'));
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
         $oForm->addCssJs();
     }
@@ -427,7 +422,6 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields
 
         $sContent = $this->getModulesSelectOne('getInputs') . $this->getDisplaysSelector($this->sModule);
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputSearch = array(

studio/template/scripts/BxBaseStudioFormsForms.php

@@ -8,9 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioFormsForms');
-bx_import('BxTemplStudioFormView');
-
 class BxBaseStudioFormsForms extends BxDolStudioFormsForms
 {
     protected $sUrlViewDisplays;
@@ -119,8 +116,8 @@ class BxBaseStudioFormsForms extends BxDolStudioFormsForms
                 $aRes = array('msg' => _t('_adm_form_err_forms_edit'));
 
             $this->_echoResultJson($aRes, true);
-        } else {
-            bx_import('BxTemplStudioFunctions');
+        }
+        else {
             $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-forms-edit-popup', _t('_adm_form_txt_forms_edit_popup', _t($aFormData['title'])), $this->_oTemplate->parseHtmlByName('form_add_form.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
@@ -152,7 +149,6 @@ class BxBaseStudioFormsForms extends BxDolStudioFormsForms
         parent::_addJsCss();
         $this->_oTemplate->addJs(array('jquery.form.min.js', 'forms_forms.js'));
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
         $oForm->addCssJs();
     }
@@ -184,7 +180,6 @@ class BxBaseStudioFormsForms extends BxDolStudioFormsForms
 
         $sContent = "";
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputModules = array(

studio/template/scripts/BxBaseStudioFormsPreLists.php

@@ -8,9 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioFormsPreLists');
-bx_import('BxTemplStudioFormView');
-
 class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
 {
     protected $sUrlViewValues;
@@ -102,7 +99,6 @@ class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
         $oForm->initChecker();
 
         if($oForm->isSubmittedAndValid()) {
-            bx_import('BxDolStudioLanguagesUtils');
             $oLanguage = BxDolStudioLanguagesUtils::getInstance();
             $sLanguage = $oLanguage->getCurrentLangName(false);
 
@@ -116,8 +112,8 @@ class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
                 $aRes = array('msg' => _t('_adm_form_err_pre_lists_create'));
 
             $this->_echoResultJson($aRes, true);
-        } else {
-            bx_import('BxTemplStudioFunctions');
+        } 
+        else {
             $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-pre-list-create-popup', _t('_adm_form_txt_pre_lists_create_popup'), $this->_oTemplate->parseHtmlByName('form_add_list.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
@@ -210,8 +206,8 @@ class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
                 $aRes = array('msg' => _t('_adm_form_err_pre_lists_edit'));
 
             $this->_echoResultJson($aRes, true);
-        } else {
-            bx_import('BxTemplStudioFunctions');
+        }
+        else {
             $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-pre-list-edit-popup', _t('_adm_form_txt_pre_lists_edit_popup', _t($aList['title'])), $this->_oTemplate->parseHtmlByName('form_add_list.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
@@ -247,7 +243,6 @@ class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
             if(!$this->oDb->deleteValues(array('type' => 'by_key', 'value' => $aList['key'])) || (int)$this->_delete($iId) <= 0)
                 continue;
 
-            bx_import('BxDolStudioLanguagesUtils');
             BxDolStudioLanguagesUtils::getInstance()->deleteLanguageString($aList['title']);
 
             $aIdsAffected[] = $iId;
@@ -277,7 +272,6 @@ class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
         parent::_addJsCss();
         $this->_oTemplate->addJs(array('jquery.form.min.js', 'forms_lists.js'));
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
         $oForm->addCssJs();
     }
@@ -321,7 +315,6 @@ class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
     {
         $sContent = parent::_getFilterControls();
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputModules = array(

studio/template/scripts/BxBaseStudioFormsPreValues.php

@@ -8,9 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioFormsPreValues');
-bx_import('BxTemplStudioFormView');
-
 class BxBaseStudioFormsPreValues extends BxDolStudioFormsPreValues
 {
     protected $sUrlPage;
@@ -137,8 +134,8 @@ class BxBaseStudioFormsPreValues extends BxDolStudioFormsPreValues
                 $aRes = array('msg' => _t('_adm_form_err_pre_values_create'));
 
             $this->_echoResultJson($aRes, true);
-        } else {
-            bx_import('BxTemplStudioFunctions');
+        }
+        else {
             $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-pre-value-create-popup', _t('_adm_form_txt_pre_values_create_popup'), $this->_oTemplate->parseHtmlByName('form_add_value.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
@@ -264,8 +261,8 @@ class BxBaseStudioFormsPreValues extends BxDolStudioFormsPreValues
                 $aRes = array('msg' => _t('_adm_form_err_pre_values_edit'));
 
             $this->_echoResultJson($aRes, true);
-        } else {
-            bx_import('BxTemplStudioFunctions');
+        } 
+        else {
             $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-pre-value-edit-popup', _t('_adm_form_txt_pre_values_edit_popup', _t($aValue['lkey'])), $this->_oTemplate->parseHtmlByName('form_add_value.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
@@ -288,8 +285,6 @@ class BxBaseStudioFormsPreValues extends BxDolStudioFormsPreValues
             exit;
         }
 
-        bx_import('BxDolForm');
-        bx_import('BxDolStudioLanguagesUtils');
         $oLanguage = BxDolStudioLanguagesUtils::getInstance();
 
         $aList = array();
@@ -335,7 +330,6 @@ class BxBaseStudioFormsPreValues extends BxDolStudioFormsPreValues
 
     function getListsSelector($sModule = '')
     {
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputLists = array(
@@ -385,7 +379,6 @@ class BxBaseStudioFormsPreValues extends BxDolStudioFormsPreValues
         parent::_addJsCss();
         $this->_oTemplate->addJs(array('jquery.form.min.js', 'forms_values.js'));
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
         $oForm->addCssJs();
     }
@@ -404,7 +397,6 @@ class BxBaseStudioFormsPreValues extends BxDolStudioFormsPreValues
 
         $sContent = $this->getModulesSelectOne('getValues') . $this->getListsSelector($this->sModule);
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputSearch = array(

studio/template/scripts/BxBaseStudioFunctions.php

@@ -8,9 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioTemplate');
-bx_import('BxBaseFunctions');
-
 class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton
 {
     function __construct($oTemplate = false)
@@ -87,9 +84,6 @@ class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton
 
     function getLoginForm()
     {
-        bx_import('BxDolPermalinks');
-        bx_import('BxDolForm');
-
         $oTemplate = BxDolStudioTemplate::getInstance();
 
         $sUrlRelocate = bx_get('relocate');

studio/template/scripts/BxBaseStudioGrid.php

@@ -8,8 +8,6 @@
  * @{
  */
 
-bx_import('BxDolStudioGrid');
-
 class BxBaseStudioGrid extends BxDolStudioGrid
 {
     function __construct($aOptions, $oTemplate = false)
@@ -27,7 +25,6 @@ class BxBaseStudioGrid extends BxDolStudioGrid
         if(empty($sGetItemsMethod))
             return '';
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputModules = array(

studio/template/scripts/BxBaseStudioGridNavigation.php

@@ -8,8 +8,6 @@
  * @{
  */
 
-bx_import('BxTemplStudioGrid');
-
 class BxBaseStudioGridNavigation extends BxTemplStudioGrid
 {
     function __construct($aOptions, $oTemplate = false)
@@ -22,7 +20,6 @@ class BxBaseStudioGridNavigation extends BxTemplStudioGrid
         if(empty($sGetItemsMethod))
             return '';
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputModules = array(
@@ -48,7 +45,6 @@ class BxBaseStudioGridNavigation extends BxTemplStudioGrid
 
     public function getSearchInput()
     {
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInputSearch = array(