#140 - auto-loader in samples and base template

samples/BxCmtsMy.php

@@ -84,8 +84,6 @@ INSERT INTO `sys_objects_privacy`(`object`, `module`, `action`, `title`, `defaul
 
 require_once(BX_DOL_DIR_STUDIO_INC . "utils.inc.php");
 
-bx_import('BxTemplCmts');
-
 class BxCmtsMy extends BxTemplCmts
 {
     function BxCmtsMy( $sSystem, $iId, $iInit = 1 )
@@ -97,7 +95,6 @@ class BxCmtsMy extends BxTemplCmts
     {
         $iCmtId = is_array($mixedCmt) ? (int)$mixedCmt['cmt_id'] : (int)$mixedCmt;
 
-        bx_import('BxDolPrivacy');
         $oPrivacy = BxDolPrivacy::getObjectInstance('comments_view');
         if(!$oPrivacy->check($iCmtId))
             return '';
@@ -109,7 +106,6 @@ class BxCmtsMy extends BxTemplCmts
     {
         $oForm = parent::_getFormObject($sAction, $iId);
 
-        bx_import('BxDolPrivacy');
         $sFieldName = BxDolPrivacy::getFieldName('view');
         $aFieldDescriptor = BxDolPrivacy::getGroupChooser('comments_view');
         $aFieldDescriptor['caption'] = '';

samples/BxGridMy.php

@@ -82,8 +82,6 @@ INSERT INTO `sample_grid_data` VALUES
 
 */
 
-bx_import('BxTemplGrid');
-
 class BxGridMy extends BxTemplGrid
 {
     public function __construct ($aOptions, $oTemplate = false)
@@ -99,7 +97,6 @@ class BxGridMy extends BxTemplGrid
         parent::_addJsCss();
         $this->_oTemplate->addJs('jquery.form.min.js');
 
-        bx_import('BxTemplFormView');
         $oForm = new BxTemplFormView(array());
         $oForm->addCssJs();
     }
@@ -188,7 +185,6 @@ class BxGridMy extends BxTemplGrid
             ),
         );
 
-        bx_import('BxTemplFormView');
         $oForm = new BxTemplFormView($aForm);
         $oForm->initChecker();
 
@@ -204,7 +200,6 @@ class BxGridMy extends BxTemplGrid
 
         } else { // if form is not submitted or some fields are invalid, display popup with form
 
-            bx_import('BxTemplFunctions');
             // we need to use 'transBox' function to properly display 'popup'
             $s = BxTemplFunctions::getInstance()->transBox('', '
                 <div class="bx-def-padding-top bx-def-padding-left bx-def-padding-right bx-def-color-bg-block" style="width:300px;">' . $oForm->getCode() . '</div>

samples/BxSampleForm.php

@@ -129,8 +129,6 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 
 */
 
-bx_import('BxTemplFormView');
-
 class BxSampleForm extends BxTemplFormView
 {
     public function __construct ($aInfo, $oTemplate = false)

samples/ajax.php

@@ -16,8 +16,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
 
 if  (bx_get('ajax') || (isset( $_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest')) {
     sleep(3);

samples/buttons.php

@@ -33,8 +33,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
 
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);

samples/comments.php

@@ -21,10 +21,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolAcl');
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ('Comments');

samples/connections.php

@@ -30,8 +30,6 @@
 require_once('./../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
 
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
@@ -80,7 +78,6 @@ function PageCompMainCode()
         $iProfileId2 = $oDb->getOne($sQueryPrepared);
     }
 
-    bx_import('BxDolConnection');
     $oConnection = BxDolConnection::getObjectInstance($sObject);
     if (!$oConnection)
         die ("'$sObject' object is not defined.");
@@ -177,7 +174,6 @@ function GenerateData($iMutual = 3, $iOneWay = 1, $sTable, $sType, $sObject)
 {
     $oDb = BxDolDb::getInstance();
 
-    bx_import('BxDolConnection');
     $oConnection = BxDolConnection::getObjectInstance($sObject);
     if (!$oConnection)
         die ("'$sObject' object is not defined.");

samples/designbox.php

@@ -16,9 +16,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageContent ('page_main_code', PageCompMainCode());
@@ -43,7 +40,6 @@ function PageCompMainCode()
 
     $s .= DesignBoxContent("Design box - BX_DB_DEF-".BX_DB_DEF, $sContent . ' BX_DB_DEF-'.BX_DB_DEF.' / menu - string', BX_DB_DEF, 'sys_site');
 
-    bx_import('BxTemplMenu');
     $oMenuSite = BxTemplMenu::getObjectInstance('sys_toolbar_member');
     $s .= DesignBoxContent("Design box - BX_DB_DEF-".BX_DB_DEF, $sContent . ' BX_DB_DEF-'.BX_DB_DEF.' / menu - object', BX_DB_DEF, $oMenuSite);
 

samples/editor.php

@@ -16,9 +16,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Visual editor");
@@ -40,7 +37,6 @@ function PageCompMainCode()
     echo '<input type="submit" value="Submit" class="bx-btn bx-def-margin-sec-top" style="float:none;" />';
     echo '</form>';
 
-    bx_import('BxDolEditor'); // import editor class
     $oEditor = BxDolEditor::getObjectInstance(); // get default editor object instance
     if ($oEditor) // check if editor is available for using
         echo $oEditor->attachEditor ('#my_textarea'); // output HTML which will automatically apply editor to textarea element by its id

samples/email.php

@@ -16,9 +16,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Send Email Example");
@@ -32,7 +29,6 @@ function PageCompMainCode()
 {
     ob_start();
 
-    bx_import('BxDolAccount');
     $oAccount = BxDolAccount::getInstance();
     $aAccountInfo = $oAccount ? $oAccount->getInfo() : false;
     if (!$aAccountInfo)

samples/form_objects.php

@@ -20,10 +20,6 @@
 require_once('./../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolForm');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Sample Form Object");

samples/forms.php

@@ -10,9 +10,6 @@
 require_once('./../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Sample form");
@@ -199,7 +196,6 @@ function PageCompMainCode()
         ),
     );
 
-    bx_import('BxTemplFormView');
     $oForm = new BxTemplFormView($aForm);
     $oForm->initChecker();
     if ( $oForm->isSubmittedAndValid() ) {

samples/grid.php

@@ -21,9 +21,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Sample grid");
@@ -37,7 +34,6 @@ function PageCompMainCode()
 {
     ob_start();
 
-    bx_import('BxDolGrid');
     $oGrid = BxDolGrid::getObjectInstance('sample'); // it automatically creates instance of default or custom class by object name
     if ($oGrid)
         echo $oGrid->getCode(); // print grid object

samples/image_resize.php

@@ -16,10 +16,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
-bx_import('BxDolImageResize');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ('Image Resize');

samples/interface.php

@@ -20,9 +20,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
-
 $GLOBALS['SAMPLE_TEXT'] = 'Lorem ipsum dolor sit amet, <b>vitae tractatos philosophia ius ei</b>, per id causae integre voluptatibus. An iusto <a href="javascript:void(0);">rationibus concludaturque vix</a>, ei dicat admodum minimum vix. Vim ne eruditi scripserit. Nonumy dolorem ex eum, <i>te quo aliquid mnesarchum</i>, ea mel dico populo. Accumsan platonem salutandi te mei, nostro epicurei per ea. Sed ut nonumy sapientem, <u>stet postea periculis eu nec</u>, et purto erat facilisis sed.
 ';
 
@@ -142,7 +139,7 @@ function PageCompMainCode()
     }
     $sMenu .= '</ul>';
 
-    return DesignBoxContent("Interface elements", $sMenu . $s, BX_DB_NO_CAPTION);
+    return DesignBoxContent("Interface elements", $sMenu . $s, BX_DB_PADDING_NO_CAPTION);
 }
 
 function Samples_Buttons()

samples/menu.php

@@ -49,9 +49,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Sample menu");
@@ -65,7 +62,6 @@ function PageCompMainCode()
 {
     ob_start();
 
-    bx_import('BxDolMenu');
     $oMenu = BxDolMenu::getObjectInstance('samples'); // it automatically creates instance of default or custom class by object name
     if ($oMenu)
         echo $oMenu->getCode(); // print menu object

samples/page.php

@@ -33,9 +33,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageContent ('page_main_code', PageCompMainCode());
@@ -48,7 +45,6 @@ function PageCompMainCode()
 {
     ob_start();
 
-    bx_import('BxDolPage');
     $oPage = BxDolPage::getObjectInstance('sample'); // it automatically creates instance of default or custom class by object name
     if ($oPage)
         echo $oPage->getCode(); // print page

samples/palette.php

@@ -20,9 +20,6 @@
 require_once('./../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Palette");

samples/permalinks.php

@@ -16,9 +16,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Permalinks");
@@ -32,7 +29,6 @@ function PageCompMainCode()
 {
     ob_start();
 
-    bx_import('BxDolPermalinks');
     $oPermalinks = BxDolPermalinks::getInstance();
 
     $a = array (

samples/popup.php

@@ -16,9 +16,6 @@ $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxTemplFunctions');
-
 if( isset( $_SERVER['HTTP_X_REQUESTED_WITH'] ) and $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' ) {
     sleep(2); // to see AJAX loader
     echo date(DATE_RFC822);

samples/transcoder.php

@@ -48,9 +48,6 @@
 require_once('./../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Sample transcoder");
@@ -65,7 +62,6 @@ function PageCompMainCode()
     ob_start();
 
     $iProfileId = 123;
-    bx_import('BxDolTranscoderImage');
     $oTranscoder = BxDolTranscoderImage::getObjectInstance('sample');
     if (!$oTranscoder)
         die('Transcoder object isn\'t defined');

samples/transcoder_custom.php

@@ -15,10 +15,6 @@
 require_once('./../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-bx_import('BxTemplFunctions');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Custom images transcoder");
@@ -41,7 +37,6 @@ function PageCompMainCode()
         exit;
     }
 
-    bx_import('BxDolTranscoderImage');
     $iPrunedFiles = BxDolTranscoder::pruning();
     if ($iPrunedFiles) {
         echo "iPrunedFiles: $iPrunedFiles";
@@ -54,8 +49,6 @@ function PageCompMainCode()
     }
     //echo "registerHandlers: [" . $oTranscoderObject->registerHandlers() . "] <br />\n";
 
-
-    bx_import('BxDolStorage');
     $oStorageOrig = BxDolStorage::getObjectInstance($sStorageObjectOrig);
     if (!$oStorageOrig) {
         echo "Storage object is not available: " . $sStorageObjectOrig;

samples/transcoder_video.php

@@ -70,10 +70,6 @@ INSERT INTO `sys_transcoder_filters` (`transcoder_object`, `filter`, `filter_par
 require_once('./../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolLanguages');
-bx_import('BxDolTemplate');
-bx_import('BxTemplFunctions');
-
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("Sample video transcoder");
@@ -98,7 +94,6 @@ function PageCompMainCode()
         exit;
     }
 
-    bx_import('BxDolTranscoderVideo');
     $iPrunedFiles = BxDolTranscoder::pruning();
     if ($iPrunedFiles) {
         echo "iPrunedFiles: $iPrunedFiles";
@@ -115,8 +110,6 @@ function PageCompMainCode()
     echo "registerHandlers mp4: [" . $oTranscoderMP4->registerHandlers() . "] <br />\n";
     echo "registerHandlers webm: [" . $oTranscoderWebM->registerHandlers() . "] <hr class='bx-def-hr' />\n";
 
-
-    bx_import('BxDolStorage');
     $oStorageOrig = BxDolStorage::getObjectInstance($sStorageObjectOrig);
     if (!$oStorageOrig) {
         echo "Storage object is not available: " . $sStorageObjectOrig;

template/scripts/BxBaseAccountForms.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxDolProfileForms');
-bx_import('BxDolForm');
-bx_import('BxDolAccount');
-
 /**
  * System profile(account) forms functions
  * @see BxDolProfileForms
@@ -69,7 +65,6 @@ class BxBaseAccountForms extends BxDolProfileForms
             $oAccount->sendConfirmationEmail($iAccountId);
 
         // add account and content association
-        bx_import('BxDolProfile');
         $iProfileId = BxDolProfile::add(BX_PROFILE_ACTION_MANUAL, $iAccountId, $iAccountId, BX_PROFILE_STATUS_PENDING, 'system');
         $oProfile = BxDolProfile::getInstance($iProfileId);
 
@@ -196,7 +191,6 @@ class BxBaseAccountForms extends BxDolProfileForms
         // check if other text info was changed - if auto-appproval is off
         $isAutoApprove = $oForm->isSetPendingApproval() ? false : true;
         if (!$isAutoApprove) {
-            bx_import('BxDolProfile');
             $oProfile = BxDolProfile::getInstanceAccountProfile($aAccountInfo['id']); // get profile associated with account, not current porfile
             $aProfileInfo = $oProfile->getInfo();
             unset($aTrackTextFieldsChanges['changed_fields']['email']); // email confirmation is automatic and separate, don't need to deactivate whole profile if email is changed

template/scripts/BxBaseAcl.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolAcl');
-
 /**
  * Acl representation.
  * @see BxDolAcl

template/scripts/BxBaseAclServices.php

@@ -19,7 +19,6 @@ class BxBaseAclServices extends BxDol
 
     public function serviceGetMemberships($bPurchasableOnly = false, $bActiveOnly = false, $isTranslate = true)
     {
-        bx_import('BxDolAcl');
         return BxDolAcl::getInstance()->getMemberships($bPurchasableOnly, $bActiveOnly, $isTranslate);
     }
 }

template/scripts/BxBaseCaptchaReCAPTCHA.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolCaptcha');
-
 /**
  * reCAPTCHA representation.
  * @see BxDolCaptcha
@@ -43,8 +41,6 @@ class BxBaseCaptchaReCAPTCHA extends BxDolCaptcha
     {
         // TODO: captcha don't display error in javascript mode, try to find the way on how to pass error code in this mode
 
-        bx_import('BxDolLanguages');
-
         $sId = 'sys-captcha-' . time() . rand(0, PHP_INT_MAX);
         $sInit = "
             Recaptcha.create('" . $this->_sKeyPublic . "', '" . $sId . "', {

template/scripts/BxBaseCaptchaReCAPTCHANew.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplCaptchaReCAPTCHA');
-
 /**
  * reCAPTCHA representation.
  * @see BxDolCaptcha
@@ -63,7 +61,6 @@ class BxBaseCaptchaReCAPTCHANew extends BxTemplCaptchaReCAPTCHA
         	$sCode .= '<div class="g-recaptcha" data-sitekey="' . $this->_sKeyPublic . '" data-theme="' . $this->_sSkin . '"></div>';
         }
 
-        bx_import('BxDolLanguages');
         $aApiParams['hl'] = BxDolLanguages::getInstance()->getCurrentLanguage();
         $sCodeJs = $this->_oTemplate->addJs(bx_append_url_params($this->sApiUrl, $aApiParams), $bDynamicMode);
 

template/scripts/BxBaseCmts.php

@@ -7,10 +7,6 @@
  * @{
  */
 
-bx_import('BxDolCmts');
-bx_import('BxDolProfile');
-bx_import('BxTemplPaginate');
-
 /**
  * @see BxDolCmts
  */
@@ -41,7 +37,6 @@ class BxBaseCmts extends BxDolCmts
         $oTemplate->addCss(array('cmts.css'));
         $oTemplate->addJs(array('jquery.anim.js', 'jquery.form.min.js', 'BxDolCmts.js'));
 
-        bx_import('BxDolForm');
         $oForm = BxDolForm::getObjectInstance($this->_sFormObject, $this->_sFormDisplayPost);
         $oForm->addCssJs();
     }
@@ -89,7 +84,6 @@ class BxBaseCmts extends BxDolCmts
 		//add live update
 		$sServiceCall = BxDolService::getSerializedService('system', 'get_live_updates_comments', array($this->_sSystem, $this->_iId, $this->_getAuthorId(), '{count}'), 'TemplCmtsServices');
 
-		bx_import('BxDolLiveUpdates');
 		BxDolLiveUpdates::getInstance()->add($this->_sSystem . '_live_updates_cmts_' . $this->_iId, 1, $sServiceCall);
 		//add live update
 
@@ -225,10 +219,8 @@ class BxBaseCmts extends BxDolCmts
         if($this->isAttachImageEnabled()) {
             $aImages = $this->_oQuery->getImages($this->_aSystem['system_id'], $aCmt['cmt_id']);
             if(!empty($aImages) && is_array($aImages)) {
-                bx_import('BxDolStorage');
         		$oStorage = BxDolStorage::getObjectInstance($this->getStorageObjectName());
 
-            	bx_import('BxDolTranscoderImage');
                 $oTranscoder = BxDolTranscoderImage::getObjectInstance($this->getTranscoderPreviewName());
 
                 foreach($aImages as $aImage)
@@ -389,7 +381,6 @@ class BxBaseCmts extends BxDolCmts
     		}
     	}
 
-    	bx_import('BxDolTemplate');
     	$oTemplate = BxDolTemplate::getInstance();
 
     	$sReloadLinkContent = _t('_cmt_txt_reload_page');
@@ -427,7 +418,6 @@ class BxBaseCmts extends BxDolCmts
                 array('id' => $this->_sSystem . '-threaded', 'name' => $this->_sSystem . '-threaded', 'class' => '', 'title' => '_cmt_display_threaded', 'target' => '_self', 'onclick' => 'javascript:' . $this->_sJsObjName . '.cmtChangeDisplay(this, \'threaded\');')
             );
 
-            bx_import('BxTemplMenuInteractive');
             $oMenu = new BxTemplMenuInteractive(array('template' => 'menu_interactive_vertical.html', 'menu_id'=> $this->_sSystem . '-display', 'menu_items' => $aDisplayLinks));
             $oMenu->setSelected('', $this->_sSystem . '-' . $this->_sDisplayType);
             $sDisplay = $oMenu->getCode();
@@ -442,7 +432,6 @@ class BxBaseCmts extends BxDolCmts
                 array('id' => $this->_sSystem . '-popular', 'name' => $this->_sSystem . '-popular', 'class' => '', 'title' => '_cmt_browse_popular', 'target' => '_self', 'onclick' => 'javascript:' . $this->_sJsObjName . '.cmtChangeBrowse(this, \'popular\');'),
             );
 
-            bx_import('BxTemplMenuInteractive');
             $oMenu = new BxTemplMenuInteractive(array('template' => 'menu_interactive_vertical.html', 'menu_id'=> $this->_sSystem . '-browse', 'menu_items' => $aBrowseLinks));
             $oMenu->setSelected('', $this->_sSystem . '-' . $this->_sBrowseType);
             $sBrowseType = $oMenu->getCode();
@@ -492,7 +481,6 @@ class BxBaseCmts extends BxDolCmts
 
 		if(!$bViewOnly) {
 	        //--- Actions Menu
-	        bx_import('BxDolMenu');
 	        $oMenuActions = BxDolMenu::getObjectInstance($this->_sMenuObjActions);
 	        $oMenuActions->setCmtsData($this, $aCmt['cmt_id']);
 	        $sMenuActions = $oMenuActions->getCode();
@@ -513,7 +501,6 @@ class BxBaseCmts extends BxDolCmts
 	                'content' => $sMenuManage
 	            ));
 	
-	            bx_import('BxTemplFunctions');
 	            $sMenuManage = BxTemplFunctions::getInstance()->transBox($this->_sSystem . '-manage-' . $aCmt['cmt_id'], $sMenuManage, true);
 	        }
 		}
@@ -598,7 +585,6 @@ class BxBaseCmts extends BxDolCmts
                 if($this->isAttachImageEnabled()) {
                     $aImages = $oForm->getCleanValue('cmt_image');
                     if(!empty($aImages) && is_array($aImages)) {
-                        bx_import('BxDolStorage');
                         $oStorage = BxDolStorage::getObjectInstance($this->getStorageObjectName());
 
                         foreach($aImages as $iImageId)
@@ -618,12 +604,10 @@ class BxBaseCmts extends BxDolCmts
                 $this->isPostReplyAllowed(true);
 
                 if ($this->_sMetatagsObj) {
-                    bx_import('BxDolMetatags');
                     $oMetatags = BxDolMetatags::getObjectInstance($this->_sMetatagsObj);
                     $oMetatags->keywordsAdd($this->_oQuery->getUniqId($this->_aSystem['system_id'], $iCmtId), $sCmtText);
                 }
 
-                bx_import('BxDolAlerts');
                 $oZ = new BxDolAlerts($this->_sSystem, 'commentPost', $this->getId(), $iCmtAuthorId, array('comment_id' => $iCmtId, 'comment_author_id' => $iCmtAuthorId));
                 $oZ->alert();
 
@@ -660,12 +644,10 @@ class BxBaseCmts extends BxDolCmts
                 $this->isEditAllowed(true);
 
                 if ($this->_sMetatagsObj) {
-                    bx_import('BxDolMetatags');
                     $oMetatags = BxDolMetatags::getObjectInstance($this->_sMetatagsObj);
                     $oMetatags->keywordsAdd($this->_oQuery->getUniqId($this->_aSystem['system_id'], $iCmtId), $sCmtText);
                 }
 
-                bx_import('BxDolAlerts');
                 $oZ = new BxDolAlerts($this->_sSystem, 'commentUpdated', $this->getId(), $iCmtAuthorId, array('comment_id' => $aCmt['cmt_id'], 'comment_author_id' => $aCmt['cmt_author_id']));
                 $oZ->alert();
 
@@ -776,7 +758,6 @@ class BxBaseCmts extends BxDolCmts
     		'image_url' => ''
     	));
 
-    	bx_import('BxTemplFunctions');
     	return BxTemplFunctions::getInstance()->transBox($sViewImagePopupId, $sViewImagePopupContent, true);
     }
     protected function _echoResultJson($a, $isAutoWrapForFormFileSubmit = false)

template/scripts/BxBaseCmtsForm.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplFormView');
-
 class BxBaseCmtsForm extends BxTemplFormView
 {
 	protected $_sStorageObject;
@@ -32,7 +30,6 @@ class BxBaseCmtsForm extends BxTemplFormView
                 'inputs' => array(),
             );
 
-            bx_import('BxDolFormNested');
             $oFormNested = new BxDolFormNested('cmt_image', $aFormNested, 'cmt_submit');
 
             $this->aInputs['cmt_image']['storage_object'] = $this->_sStorageObject;

template/scripts/BxBaseCmtsMenuActions.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenuCustom');
-
 /**
  * Menu representation.
  * @see BxDolMenu

template/scripts/BxBaseCmtsMenuManage.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Menu representation.
  * @see BxDolMenu

template/scripts/BxBaseCmtsServices.php

@@ -19,7 +19,6 @@ class BxBaseCmtsServices extends BxDol
 
     public function serviceGetMenuItemAddonVote($sSystem, $iId, $iCmtId)
     {
-        bx_import('BxDolCmts');
         $oCmts = BxDolCmts::getObjectInstance($sSystem, $iId);
 
         $oVote = $oCmts->getVoteObject($iCmtId);
@@ -31,7 +30,6 @@ class BxBaseCmtsServices extends BxDol
 
     public function serviceGetLiveUpdatesComments($sSystem, $iContentId, $iProfileId, $iCount = 0)
     {
-    	bx_import('BxDolCmts');
         $oCmts = BxDolCmts::getObjectInstance($sSystem, $iContentId);
         if(!$oCmts || !$oCmts->isEnabled())
             return false;

template/scripts/BxBaseCmtsUploaderSimple.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import ('BxTemplUploaderSimple');
-
 /**
  * Upload files using standard HTML forms.
  * @see BxBaseUploaderSimple, BxDolUploader

template/scripts/BxBaseEditorTinyMCE.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolEditor');
-
 /**
  * TinyMCE editor representation.
  * @see BxDolEditor
@@ -154,7 +152,6 @@ class BxBaseEditorTinyMCE extends BxDolEditor
         }
 
         // detect language
-        bx_import('BxDolLanguages');
         $sLang = BxDolLanguages::getInstance()->detectLanguageFromArray (self::$CONF_LANGS);
 
         // initialize editor

template/scripts/BxBaseFormAccount.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplFormView');
-
 class BxFormAccountCheckerHelper extends BxDolFormCheckerHelper
 {
     /**
@@ -24,8 +22,6 @@ class BxFormAccountCheckerHelper extends BxDolFormCheckerHelper
      */
     function checkPasswordCurrent ($s)
     {
-
-        bx_import('BxDolAccount');
         $oAccount = BxDolAccount::getInstance();
         if (!$oAccount)
             return false;
@@ -43,9 +39,6 @@ class BxFormAccountCheckerHelper extends BxDolFormCheckerHelper
         if (!$this->checkEmail($s))
             return false;
 
-        bx_import('BxDolAccount');
-        bx_import('BxDolPermalinks');
-
         $oAccount = BxDolAccount::getInstance();
         if ($oAccount) { // user is logged in
             $aAccountInfo = $oAccount->getInfo();

template/scripts/BxBaseFormConfirmEmail.php

@@ -16,7 +16,6 @@ class BxFormConfirmEmailCheckerHelper extends BxDolFormCheckerHelper
      */
     function checkCodeExist ($s)
     {
-        bx_import('BxDolKey');
         $oKey = BxDolKey::getInstance();
         return $oKey && $oKey->isKeyExists(trim($s));
     }

template/scripts/BxBaseFormForgotPassword.php

@@ -19,7 +19,6 @@ class BxFormForgotPasswordCheckerHelper extends BxDolFormCheckerHelper
         if (!$this->checkEmail($s))
             return false;
 
-        bx_import('BxDolAccountQuery');
         return BxDolAccountQuery::getInstance()->getIdByEmail($s) ? true : _t('_sys_form_forgot_password_email_not_recognized');
     }
 

template/scripts/BxBaseFormLogin.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplFormView');
-
 /**
  * Login Form.
  */
@@ -50,7 +48,6 @@ class BxBaseFormLogin extends BxTemplFormView
 
     protected function genCustomInputSubmitText ($aInput)
     {
-        bx_import('BxDolPermalinks');
         return '<div class="bx-form-right-line-aligned">
                     <a href="' . BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password') . '">' . _t("_sys_txt_forgot_pasword") . '</a>
                 </div>

template/scripts/BxBaseFormView.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolForm');
-
 class BxBaseFormView extends BxDolForm
 {
     protected static $_isToggleJsAdded = false;
@@ -769,7 +767,6 @@ BLAH;
 
     function addHtmlEditor($iViewMode, &$aInput)
     {
-        bx_import('BxDolEditor');
         $oEditor = BxDolEditor::getObjectInstance();
         if (!$oEditor)
             return false;
@@ -811,8 +808,6 @@ BLAH;
      */
     function genInputFiles(&$aInput, $sInfo = '', $sError = '')
     {
-        bx_import('BxDolUploader');
-
         $sUniqId = genRndPwd (8, false);
         $sUploaders = '';
         $oUploader = null;
@@ -830,13 +825,11 @@ BLAH;
 
             } elseif (isset($aInput['ghost_template']) && is_array($aInput['ghost_template']) && isset($aInput['ghost_template']['inputs'])) { // form is not submitted and ghost template is form array
 
-                bx_import('BxDolFormNested');
                 $oFormNested = new BxDolFormNested($aInput['name'], $aInput['ghost_template'], $this->aParams['db']['submit_name'], $this->oTemplate);
                 $sGhostTemplate = $oFormNested->getCode();
 
             } elseif (isset($aInput['ghost_template']) && is_array($aInput['ghost_template']) && $aInput['ghost_template']) { // form is submitted and ghost template is array of BxDolFormNested objects
 
-                bx_import('BxDolFormNested');
                 $sGhostTemplate = array ();
                 foreach ($aInput['ghost_template'] as $iFileId => $oFormNested)
                     if (is_object($oFormNested) && $oFormNested instanceof BxDolFormNested)
@@ -1056,7 +1049,6 @@ BLAH;
 
         $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-input-{$aInput['type']}");
 
-        bx_import('BxDolCaptcha');
         $oCaptcha = BxDolCaptcha::getObjectInstance();
 
         return "<div $sAttrs>" . ($oCaptcha ? $oCaptcha->display($this->_bDynamicMode) : _t('_sys_txt_captcha_not_available')) . "</div>";
@@ -1199,7 +1191,6 @@ BLAH;
 
             $aCalendarLangs = array ('af' => 1, 'am' => 1, 'bg' => 1, 'ca' => 1, 'cs' => 1, 'da' => 1, 'de' => 1, 'el' => 1, 'es' => 1, 'et' => 1, 'eu' => 1, 'fi' => 1, 'fr' => 1, 'gl' => 1, 'he' => 1, 'hr' => 1, 'hu' => 1, 'id' => 1, 'it' => 1, 'ja' => 1, 'ko' => 1, 'lt' => 1, 'nl' => 1, 'no' => 1, 'pl' => 1, 'pt-BR' => 1, 'pt' => 1, 'ro' => 1, 'ru' => 1, 'sk' => 1, 'sr-RS' => 1, 'sr-YU' => 1, 'sv' => 1, 'th' => 1, 'tr' => 1, 'uk' => 1, 'vi' => 1, 'zh-CN' => 1, 'zh-TW' => 1);
 
-            bx_import('BxDolLanguages');
             $sCalendarLang = BxDolLanguages::getInstance()->detectLanguageFromArray ($aCalendarLangs);
             $sUiLang = BxDolLanguages::getInstance()->detectLanguageFromArray ($aUiLangs);
 
@@ -1223,7 +1214,6 @@ BLAH;
                 if (!isset($aInput['type']) || 'files' != $aInput['type'] || !isset($aInput['uploaders']))
                     continue;
 
-                bx_import('BxDolUploader');
                 foreach ($aInput['uploaders'] as $sUploaderObject) {
                     $oUploader = BxDolUploader::getObjectInstance($sUploaderObject, $aInput['storage_object'], '');
                     if ($oUploader)

template/scripts/BxBaseFunctions.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolTemplate');
-
 class BxBaseFunctions extends BxDol implements iBxDolSingleton
 {
     protected $_oTemplate;
@@ -219,7 +217,6 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
 
             if (is_string($mixedMenu)) {
 
-                bx_import('BxTemplMenu');
                 $oMenu = BxTemplMenu::getObjectInstance($mixedMenu);
                 $sMenu = $oMenu ? $oMenu->getCode () : $mixedMenu;
 
@@ -233,7 +230,7 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
                     $aMenu = $mixedMenu;
                 else
                     $aMenu = array ('template' => 'menu_vertical.html', 'menu_items' => $mixedMenu);
-                bx_import('BxTemplMenu');
+
                 $oMenu = new BxTemplMenu($aMenu, $this->_oTemplate);
                 $sMenu = $oMenu->getCode ();
             }
@@ -284,7 +281,6 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
         if (!$iFileId) 
             return false;
 
-        bx_import('BxDolTranscoder');
         $oStorage = BxDolTranscoder::getObjectInstance('sys_custom_images');
         $sFileUrl = $oStorage->getFileUrl($iFileId);
         if (!$sFileUrl) 
@@ -326,7 +322,6 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
         $sImageUrlFav = $sImageUrlFcb = $sImageUrlApl = '';
 
         if(!empty($iId)) {
-            bx_import('BxDolTranscoderImage');
 
             // favicon icon
             $oTranscoder = BxDolTranscoderImage::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_FAVICON);

template/scripts/BxBaseGrid.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxDolGrid');
-bx_import('BxDolPaginate');
-
 /**
  * Grid representation.
  * @see BxDolGrid
@@ -155,7 +152,6 @@ class BxBaseGrid extends BxDolGrid
                 'page_url' =>  $sPageUrl ? $sPageUrl : "javascript:glGrids." . $this->_sObject . ".reload('{start}'); void(0);",
             );
 
-            bx_import('BxTemplPaginate');
             $oPaginate = new BxTemplPaginate($aPaginateParams, $this->_oTemplate);
             $oPaginate->setNumFromDataArray($aData);
 
@@ -437,7 +433,6 @@ class BxBaseGrid extends BxDolGrid
             isset($aField['width']) ? 'width:' . $aField['width'] : false  // add default styles
         );
 
-        bx_import('BxTemplFormView');
         $oForm = new BxTemplFormView(array(), $this->_oTemplate);
         $oForm->addCssJs();
         $aInput = array(
@@ -545,7 +540,6 @@ class BxBaseGrid extends BxDolGrid
 
     protected function _getFilterControls ()
     {
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView(array());
 
         $aInput = array(
@@ -562,10 +556,8 @@ class BxBaseGrid extends BxDolGrid
 
     protected function _limitMaxLength ($mixedValue, $sKey, $aField, $aRow, $isDisplayPopupOnTextOverflow, $bReturnString = true)
     {
-        if ($aField['chars_limit'] > 0) {
-            bx_import('BxTemplFunctions');
+        if ($aField['chars_limit'] > 0)
             $mixedValue = BxTemplFunctions::getInstance()->getStringWithLimitedLength($mixedValue, $aField['chars_limit'], $isDisplayPopupOnTextOverflow, $bReturnString);
-        }
         return $mixedValue;
     }
 

template/scripts/BxBaseImageServices.php

@@ -19,13 +19,11 @@ class BxBaseImageServices extends BxDol
 
     public function serviceAlertResponseFileDeleteLocal($oAlert, $sObject)
     {
-        bx_import('BxDolTranscoderImage');
         BxDolTranscoderImage::onAlertResponseFileDeleteLocal($oAlert, $sObject);
     }
 
     public function serviceAlertResponseFileDeleteOrig($oAlert, $sObject)
     {
-        bx_import('BxDolTranscoderImage');
         BxDolTranscoderImage::onAlertResponseFileDeleteOrig($oAlert, $sObject);
     }
 }

template/scripts/BxBaseInformer.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolInformer');
-
 /**
  * Informer representation.
  * @see BxDolInformer

template/scripts/BxBaseLanguagesServices.php

@@ -19,7 +19,6 @@ class BxBaseLanguagesServices extends BxDol
 
     public function serviceGetLanguages($bIdAsKey = false, $bActiveOnly = false)
     {
-        bx_import('BxDolLanguages');
         $aValues = BxDolLanguages::getInstance()->getLanguages($bIdAsKey, $bActiveOnly);
 
         $aResult = array();

template/scripts/BxBaseLiveUpdates.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolLiveUpdates');
-
 /**
  * @see BxDolLiveUpdates
  */
@@ -31,7 +29,6 @@ class BxBaseLiveUpdates extends BxDolLiveUpdates
 
 		$sContent = "var " . $this->_sJsObject . " = new " . $this->_sJsClass . "(" . json_encode($aParams) . ");";
 
-		bx_import('BxDolTemplate');
 		$oTemplate = BxDolTemplate::getInstance();
 
 		$oTemplate->addJs(array('BxDolLiveUpdates.js'));

template/scripts/BxBaseLiveUpdatesServices.php

@@ -19,7 +19,6 @@ class BxBaseLiveUpdatesServices extends BxDol
 
     public function serviceInit()
     {
-        bx_import('BxDolLiveUpdates');
         return BxDolLiveUpdates::getInstance()->init();
     }
 }

template/scripts/BxBaseMenu.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxDolMenu');
-bx_import('BxDolPaginate');
-
 /**
  * Menu representation.
  * @see BxDolMenu
@@ -140,7 +137,6 @@ class BxBaseMenu extends BxDolMenu
         $sIconUrl = false;
         if (!empty($a['icon'])) {
             if ((int)$a['icon'] > 0 ) {
-                bx_import('BxDolStorage');
                 $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
                 $sIconUrl = $oStorage ? $oStorage->getFileUrlById((int)$a['icon']) : false;
             } else {

template/scripts/BxBaseMenuAccount.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Menu representation.
  * @see BxDolMenu

template/scripts/BxBaseMenuAccountNotifications.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Menu representation.
  * @see BxDolMenu
@@ -28,7 +26,6 @@ class BxBaseMenuAccountNotifications extends BxTemplMenu
     protected function _isVisible ($a)
     {
         // default visible settings
-        bx_import('BxDolAcl');
         if (!BxDolAcl::getInstance()->isMemberLevelInSet($a['visible_for_levels']))
             return false;
 

template/scripts/BxBaseMenuAccountPopup.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-bx_import('BxDolPermalinks');
-
 /**
  * Menu representation.
  * @see BxDolMenu

template/scripts/BxBaseMenuCustom.php

@@ -8,8 +8,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 class BxBaseMenuCustom extends BxTemplMenu
 {
     public function __construct($aObject, $oTemplate = false)

template/scripts/BxBaseMenuFooter.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Site main menu representation.
  */
@@ -25,7 +23,6 @@ class BxBaseMenuFooter extends BxTemplMenu
         foreach($aItems as $iKey => $aItem)
             switch($aItem['name']) {
                 case 'switch_language':
-                    bx_import('BxDolLanguages');
                     $sLanguage = BxDolLanguages::getInstance()->getCurrentLangName();
 
                     $sIcon = $this->_oTemplate->parseHtmlByName('bx_img.html', array(
@@ -55,7 +52,6 @@ class BxBaseMenuFooter extends BxTemplMenu
         $bResult = true;
         switch ($a['name']) {
             case 'switch_language':
-                bx_import('BxDolLanguagesQuery');
                 $aLanguages = BxDolLanguagesQuery::getInstance()->getLanguages(false, true);
                 if(count($aLanguages) <= 1)
                     $bResult = false;

template/scripts/BxBaseMenuInteractive.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Menu representation.
  * @see BxDolMenu

template/scripts/BxBaseMenuProfileStats.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenuAccountNotifications');
-
 /**
  * Menu representation.
  * @see BxDolMenu

template/scripts/BxBaseMenuSetAclLevel.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Menu to set acl level for profile
  */
@@ -50,7 +48,6 @@ class BxBaseMenuSetAclLevel extends BxTemplMenu
     	if(bx_get('profile_id') !== false)
         	$mixedProfileId = bx_process_input(bx_get('profile_id'), BX_DATA_INT);
 
-        bx_import('BxDolAcl');
         $oAcl = BxDolAcl::getInstance();
         if (!$oAcl)
             return;

template/scripts/BxBaseMenuSite.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Site main menu representation.
  */

template/scripts/BxBaseMenuSubmenu.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Menu representation.
  * @see BxDolMenu
@@ -48,7 +46,6 @@ class BxBaseMenuSubmenu extends BxTemplMenu
         if (!$this->_sObjectSubmenu && $aMenuItemSelected['submenu_object'])
             $this->_sObjectSubmenu = $aMenuItemSelected['submenu_object'];
 
-        bx_import('BxDolPermalinks');
         $oPermalinks = BxDolPermalinks::getInstance();
 
         $aVars = array (

template/scripts/BxBaseMenuSwitchLanguage.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Site main menu representation.
  */
@@ -28,7 +26,6 @@ class BxBaseMenuSwitchLanguage extends BxTemplMenu
 
     protected function loadData()
     {
-        bx_import('BxDolLanguages');
         $sLanguage = BxDolLanguages::getInstance()->getCurrentLangName();
 
         $this->setSelected('', $sLanguage);
@@ -39,7 +36,6 @@ class BxBaseMenuSwitchLanguage extends BxTemplMenu
         if(!empty($aPage[1]))
             parse_str($aPage[1], $aPageParams);
 
-        bx_import('BxDolLanguagesQuery');
         $aLanguages = BxDolLanguagesQuery::getInstance()->getLanguages(false, true);
 
         $aItems = array();

template/scripts/BxBaseMenuSwitchTemplate.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Site main menu representation.
  */

template/scripts/BxBaseMenuToolbar.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-
 /**
  * Menu representation.
  * @see BxDolMenu
@@ -31,7 +29,6 @@ class BxBaseMenuToolbar extends BxTemplMenu
             if ('account' != $r['name'])
                 continue;
 
-            bx_import('BxDolProfile');
             $oProfile = BxDolProfile::getInstance(bx_get_logged_profile_id ());
             $sUrlIcon = $oProfile->getThumb();
             if (!$sUrlIcon)

template/scripts/BxBasePage.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolPage');
-
 /**
  * Page representation.
  * @see BxDolPage
@@ -196,7 +194,6 @@ class BxBasePage extends BxDolPage
      */
     protected function _selectMenu ()
     {
-        bx_import('BxDolMenu');
         BxDolMenu::setSelectedGlobal ($this->_aObject['module'], $this->_aObject['uri']);
     }
 
@@ -241,7 +238,6 @@ class BxBasePage extends BxDolPage
         if (!$iFileId)
             return false;
 
-        bx_import('BxDolStorage');
         $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
         if (!$oStorage)
             return false;
@@ -269,7 +265,6 @@ class BxBasePage extends BxDolPage
         list( $sUrl, $iNum ) = explode('#', $aBlock['content']);
         $iNum = (int)$iNum;
 
-        bx_import('BxDolRss');
         return BxDolRss::getObjectInstance('sys_page_block')->getHolder($aBlock['id'], $iNum);
     }
 
@@ -279,7 +274,6 @@ class BxBasePage extends BxDolPage
      */
     protected function _getBlockMenu ($aBlock)
     {
-        bx_import('BxTemplMenu');
         $oMenu = BxTemplMenu::getObjectInstance($aBlock['content']);
         return $oMenu ? $oMenu->getCode () : '';
     }

template/scripts/BxBasePageAccount.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplPage');
-
 /**
  * Account page.
  */
@@ -23,7 +21,6 @@ class BxBasePageAccount extends BxTemplPage
     {
         parent::__construct($aObject, $oTemplate);
 
-        bx_import('BxDolProfile');
         $oProfile = BxDolProfile::getInstance();
         $aProfileInfo = $oProfile ? $oProfile->getInfo() : false;
 
@@ -35,7 +32,6 @@ class BxBasePageAccount extends BxTemplPage
         ));
 
         // set settings submenu
-        bx_import('BxDolMenu');
         $oMenuSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu');
         if ($oMenuSubmenu) {
             $oMenuSubmenu->setObjectSubmenu('sys_account_settings_submenu', array (
@@ -49,7 +45,6 @@ class BxBasePageAccount extends BxTemplPage
         if ($oProfile) {
             $sStatus = $oProfile->getStatus();
             if (isset($this->_aMapStatus2LangKey[$sStatus])) {
-                bx_import('BxDolInformer');
                 $oInformer = BxDolInformer::getInstance($this->_oTemplate);
                 if ($oInformer)
                     $oInformer->add('sys-account-status-not-active', _t($this->_aMapStatus2LangKey[$sStatus]), BX_INFORMER_ALERT);
@@ -58,13 +53,11 @@ class BxBasePageAccount extends BxTemplPage
 
         // switch profile context
         if ($iSwitchToProfileId = (int)bx_get('switch_to_profile')) {
-            bx_import('BxDolInformer');
             $oInformer = BxDolInformer::getInstance($this->_oTemplate);
             $oProfile = BxDolProfile::getInstance($iSwitchToProfileId);
             $sInformerMsg = '';
 
             if ($oProfile && $oProfile->getAccountId() == getLoggedId()) {
-                bx_import('BxDolProfile');
                 $oAccount = BxDolAccount::getInstance();
                 if ($oAccount->updateProfileContext($iSwitchToProfileId))
                     $sInformerMsg = _t('_sys_txt_account_profile_context_changed_success', $oProfile->getDisplayName());

template/scripts/BxBasePageDashboard.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplPage');
-
 /**
  * Dashboard page.
  */

template/scripts/BxBasePageHome.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxTemplPage');
-
 /**
  * Homepage.
  */

template/scripts/BxBasePaginate.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import("BxDolPaginate");
-
 /**
  * @see BxDolPaginate
  */

template/scripts/BxBasePrivacy.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolPrivacy');
-
 /**
  * Privacy representation.
  * @see BxDolPrivacy

template/scripts/BxBaseRss.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolRss');
-
 /**
  * Privacy representation.
  * @see BxDolPrivacy
@@ -34,12 +32,9 @@ class BxBaseRss extends BxDolRss
     	$aMarkers = array('SiteUrl' => BX_DOL_URL_ROOT);
 
     	if($iUserId) {
-	    	bx_import('BxDolProfile');
 	        $oProfile = BxDolProfile::getInstance($iUserId);
-	        if(!$oProfile) {
-	            bx_import('BxDolProfileUndefined');
+	        if(!$oProfile)
 	            $oProfile = BxDolProfileUndefined::getInstance();
-	        }
 
 	        $aMarkers['NickName'] =  $oProfile->getDisplayName();
 		}

template/scripts/BxBaseSearch.php

@@ -9,8 +9,6 @@
 
 require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
 
-bx_import('BxDolSearch');
-
 class BxBaseSearch extends BxDolSearch
 {
     protected $_oTemplate;
@@ -91,12 +89,10 @@ class BxBaseSearch extends BxDolSearch
             $aForm['inputs']['keyword']['attrs']['onpaste'] = $aForm['inputs']['keyword']['attrs']['onkeypress'];
         }
 
-        bx_import('BxTemplFormView');
         $oForm = new BxTemplFormView($aForm);
         $sForm = $oForm->getCode();
 
         if (!$this->_bLiveSearch) {
-            bx_import('BxTemplPaginate');
             $o = new BxTemplPaginate(array());
             $o->addCssJs();
         }

template/scripts/BxBaseSearchResult.php

@@ -34,12 +34,10 @@ class BxBaseSearchResult extends BxDolSearchResult
     {
         parent::__construct();
 
-        if ($oFunctions) {
+        if ($oFunctions)
             $this->oFunctions = $oFunctions;
-        } else {
-            bx_import('BxTemplFunctions');
+        else
             $this->oFunctions = BxTemplFunctions::getInstance();
-        }
     }
 
     function getMain()
@@ -109,7 +107,6 @@ class BxBaseSearchResult extends BxDolSearchResult
         if (false === ($sLink = $this->getRssPageUrl ()))
             return;
 
-        bx_import('BxDolTemplate');
         if (!($oTemplate = BxDolTemplate::getInstance()))
             return;
 
@@ -121,7 +118,6 @@ class BxBaseSearchResult extends BxDolSearchResult
         if (!isset($this->aCurrent['rss']) || !$this->aCurrent['rss']['link'])
             return false;
 
-        bx_import('BxDolPermalinks');
         $oPermalinks = BxDolPermalinks::getInstance();
         return BX_DOL_URL_ROOT . bx_append_url_params($oPermalinks->permalink($this->aCurrent['rss']['link']), 'rss=1');
     }
@@ -186,7 +182,6 @@ class BxBaseSearchResult extends BxDolSearchResult
         $sPageUrl = $this->getCurrentUrl(array(), false);
         $sOnClick = $this->getCurrentOnclick(array(), false);
 
-        bx_import('BxTemplPaginate');
         $oPaginate = new BxTemplPaginate(array(
             'page_url' => $sPageUrl,
             'on_change_page' => $sOnClick,
@@ -209,7 +204,6 @@ class BxBaseSearchResult extends BxDolSearchResult
         if (BX_DOL_SEARCH_KEYWORD_PAGE === $this->sBrowseUrl || $this->bForceAjaxPaginate)
             return 'javascript:void(0);';
 
-        bx_import('BxDolPermalinks');
         $oPermalinks = BxDolPermalinks::getInstance();
 
         $sUrlStart = BX_DOL_URL_ROOT . $oPermalinks->permalink($this->sBrowseUrl);

template/scripts/BxBaseServiceAccount.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxDolAccountQuery');
-bx_import('BxTemplAccountForms');
-
 /**
  * System service for creating system profile functionality.
  */
@@ -85,7 +82,6 @@ class BxBaseServiceAccount extends BxDol
 
         // validate input params
 
-        bx_import('BxDolAccount');
         $oAccount = BxDolAccount::getInstance($iAccountId);
         if (!$oAccount)
             return MsgBox(_t('_sys_txt_unsubscribe_wrong_link'));
@@ -93,7 +89,6 @@ class BxBaseServiceAccount extends BxDol
         if ($sCode != $oAccount->getEmailHash())
             return MsgBox(_t('_sys_txt_unsubscribe_wrong_link'));
 
-        bx_import('BxDolForm');
         $oForm = BxDolForm::getObjectInstance('sys_unsubscribe', $sDisplay);
         if (!$oForm)
             return MsgBox(_t('_sys_txt_unsubscribe_error_occured'));
@@ -122,7 +117,6 @@ class BxBaseServiceAccount extends BxDol
     {
         // if user is logged in and email is confirmed then just display a message
         if (isLogged()) {
-            bx_import('BxDolAccount');
             $oAccount = BxDolAccount::getInstance();
             if ($oAccount->isConfirmed())
                 return MsgBox(_t("_sys_txt_confirm_email_already_confirmed"));
@@ -134,7 +128,6 @@ class BxBaseServiceAccount extends BxDol
 
         // if user requested to resend verification letter then send letter and display message
         if (bx_process_input(bx_get('resend')) && isLogged()) {
-            bx_import('BxDolAccount');
             $oAccount = BxDolAccount::getInstance();
             if ($oAccount->sendConfirmationEmail())
                 $sMsg = _t('_sys_txt_confirm_email_sent');
@@ -145,7 +138,6 @@ class BxBaseServiceAccount extends BxDol
 
         // show and process code verification form
 
-        bx_import('BxDolForm');
         $oForm = BxDolForm::getObjectInstance('sys_confirm_email', 'sys_confirm_email');
         if (!$oForm)
             return MsgBox(_t("_sys_txt_confirm_email_error_occured"));
@@ -154,7 +146,6 @@ class BxBaseServiceAccount extends BxDol
 
         if ($oForm->isSubmittedAndValid()) {
 
-            bx_import('BxDolKey');
             $oKey = BxDolKey::getInstance();
             if (!$oKey)
                 return MsgBox(_t("_sys_txt_confirm_email_error_occured"));
@@ -172,7 +163,6 @@ class BxBaseServiceAccount extends BxDol
     public function confirmEmail($sKey)
     {
         // check if key exists
-        bx_import('BxDolKey');
         $oKey = BxDolKey::getInstance();
         if (!$oKey || !$oKey->isKeyExists($sKey))
             return MsgBox(_t("_sys_txt_confirm_email_error_occured"));
@@ -198,8 +188,6 @@ class BxBaseServiceAccount extends BxDol
         bx_login($aData['account_id']);
 
         // redirect with success message
-        bx_import('BxDolPermalinks');
-        bx_import('BxDolTemplate');
         $oTemplate = BxDolTemplate::getInstance();
         $oTemplate->setPageNameIndex (BX_PAGE_TRANSITION);
         $oTemplate->setPageHeader (_t('_sys_txt_confirm_email_success'));
@@ -218,7 +206,6 @@ class BxBaseServiceAccount extends BxDol
         if (bx_get('key'))
             return $this->resetPassword();
 
-        bx_import('BxDolForm');
         $oForm = BxDolForm::getObjectInstance('sys_forgot_password', 'sys_forgot_password');
         if (!$oForm)
             return '';
@@ -227,7 +214,6 @@ class BxBaseServiceAccount extends BxDol
 
         if ( $oForm->isSubmittedAndValid() ) {
 
-            bx_import('BxDolKey');
             $oKey = BxDolKey::getInstance();
             if (!$oKey) {
 
@@ -238,11 +224,9 @@ class BxBaseServiceAccount extends BxDol
                 $sEmail = $oForm->getCleanValue('email');
                 $iAccountId = $this->_oAccountQuery->getIdByEmail($sEmail);
 
-                bx_import('BxDolPermalinks');
                 $aPlus['key'] = $oKey->getNewKey(array('email' => $sEmail));
                 $aPlus['forgot_password_url'] = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password') . '&key=' . $aPlus['key'];
 
-                bx_import('BxDolEmailTemplates');
                 $aTemplate = BxDolEmailTemplates::getInstance() -> parseTemplate('t_Forgot', $aPlus, $iAccountId);
 
                 if ($aTemplate && sendMail($sEmail, $aTemplate['Subject'], $aTemplate['Body'], 0, $aPlus, BX_EMAIL_SYSTEM))
@@ -272,11 +256,9 @@ class BxBaseServiceAccount extends BxDol
         $sKey = bx_process_input(bx_get('key'));
 
         // get link to forgot password page for error message
-        bx_import('BxDolPermalinks');
         $sUrlForgotPassword = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password');
 
         // check if key exists
-        bx_import('BxDolKey');
         $oKey = BxDolKey::getInstance();
         if (!$oKey || !$oKey->isKeyExists($sKey))
             return _t("_sys_txt_reset_pasword_error_occured", $sUrlForgotPassword);
@@ -300,7 +282,6 @@ class BxBaseServiceAccount extends BxDol
         // send email with new password and display result message
         $aPlus = array ('password' => $sPassword);
 
-        bx_import('BxDolEmailTemplates');
         $aTemplate = BxDolEmailTemplates::getInstance() -> parseTemplate('t_PasswordReset', $aPlus, $iAccountId);
 
         if ($aTemplate && sendMail($aData['email'], $aTemplate['Subject'], $aTemplate['Body'], 0, $aPlus, BX_EMAIL_SYSTEM))

template/scripts/BxBaseServiceConnections.php

@@ -22,7 +22,6 @@ class BxBaseServiceConnections extends BxDol
      */
     public function serviceConnectionsTable ()
     {
-        bx_import('BxDolGrid');
         $oGrid = BxDolGrid::getObjectInstance('sys_grid_connections');
         if (!$oGrid)
             return false;
@@ -38,7 +37,6 @@ class BxBaseServiceConnections extends BxDol
      */
     public function serviceGetUnconfirmedConnectionsNum ($sConnectionsObject, $mixedId = 0)
     {
-        bx_import('BxDolConnection');
         $oConnection = BxDolConnection::getObjectInstance($sConnectionsObject);
         if (!$oConnection)
             return 0;

template/scripts/BxBaseServiceLogin.php

@@ -54,7 +54,6 @@ class BxBaseServiceLogin extends BxDol
 
         }
 
-        bx_import ('BxDolForm');
         $oForm = BxDolForm::getObjectInstance('sys_login', 'sys_login');
 
         $sCustomHtmlBefore = '';
@@ -70,7 +69,6 @@ class BxBaseServiceLogin extends BxDol
 
         $sJoinText = '';
         if (strpos($sParams, 'no_join_text') === false) {
-            bx_import('BxDolPermalinks');
             $sJoinText = '<hr class="bx-def-hr bx-def-margin-sec-topbottom" /><div>' . _t('_sys_txt_login_description', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-account')) . '</div>';
         }
 

template/scripts/BxBaseServiceMetatags.php

@@ -30,7 +30,6 @@ class BxBaseServiceMetatags extends BxDol
      */
     public function serviceKeywordsCloud ($sObject, $sSection, $iMaxCount = BX_METATAGS_KEYWORDS_IN_CLOUD)
     {
-        bx_import('BxDolMetatags');
         $o = BxDolMetatags::getObjectInstance($sObject);
         $aKeywords = $o->keywordsPopularList($iMaxCount);
         if (!$aKeywords)

template/scripts/BxBaseServiceProfiles.php

@@ -22,10 +22,8 @@ class BxBaseServiceProfiles extends BxDol
         if (!$iProfileId)
             $iProfileId = bx_get_logged_profile_id();
 
-        bx_import('BxDolMenu');
         $oMenu = BxDolMenu::getObjectInstance('sys_profile_stats');
 
-        bx_import('BxDolProfile');
         $oProfile = BxDolProfile::getInstance($iProfileId);
 
         $aVars = array(
@@ -47,7 +45,6 @@ class BxBaseServiceProfiles extends BxDol
         if (!$iProfileId)
             $iProfileId = bx_get_logged_profile_id();
 
-        bx_import('BxDolMenu');
         $oMenu = BxDolMenu::getObjectInstance('sys_account_notifications');
 
         $iNum = 0;
@@ -121,7 +118,6 @@ class BxBaseServiceProfiles extends BxDol
 
     public function serviceProfilesList ($iAccountId = 0)
     {
-        bx_import('BxDolProfileQuery');
         $oProfilesQuery = BxDolProfileQuery::getInstance();
 
         $aProfiles = $oProfilesQuery->getProfilesByAccount($iAccountId ? $iAccountId : getLoggedId());
@@ -141,7 +137,6 @@ class BxBaseServiceProfiles extends BxDol
 
     public function serviceAccountProfileSwitcher ($iAccountId = false)
     {
-        bx_import('BxDolProfileQuery');
         $oProfilesQuery = BxDolProfileQuery::getInstance();
 
         $aProfiles = $oProfilesQuery->getProfilesByAccount($iAccountId ? $iAccountId : getLoggedId());
@@ -170,7 +165,6 @@ class BxBaseServiceProfiles extends BxDol
         }
 
         if (!$aVars['bx_repeat:row']) {
-            bx_import('BxDolMenu');
             $oMenu = BxDolMenu::getObjectInstance('sys_add_profile');
             return array(
                 'content' => $oMenu ? $oMenu->getCode() : MsgBox(_t('_sys_txt_empty')),
@@ -178,7 +172,6 @@ class BxBaseServiceProfiles extends BxDol
             );
         }
 
-        bx_import('BxDolTemplate');
         $oTemplate = BxDolTemplate::getInstance();
         $oTemplate->addCss('account.css');
 
@@ -190,7 +183,6 @@ class BxBaseServiceProfiles extends BxDol
 
     protected function _getLatestModuleTimestamp ()
     {
-        bx_import('BxDolModuleQuery');
         $aModules = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'modules', 'active' => 1, 'order_by' => '`date` ASC'));
         if (empty($aModules))
             return 0;
@@ -201,7 +193,6 @@ class BxBaseServiceProfiles extends BxDol
     protected function _getProfilesModules ()
     {
         $aRet = array();
-        bx_import('BxDolModuleQuery');
         $aModules = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'modules', 'active' => 1));
         foreach ($aModules as $aModule) {
             $oModule = BxDolModule::getInstance($aModule['name']);

template/scripts/BxBaseServices.php

@@ -29,7 +29,6 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
 
     public function serviceProfileEditUrl ($iContentId)
     {
-        bx_import('BxDolPermalinks');
         return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=account-settings-info');
     }
 
@@ -55,7 +54,6 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
 
     public function serviceProfilesSearch ($sTerm, $iLimit)
     {
-        bx_import('BxDolAccountQuery');
         $oDb = BxDolAccountQuery::getInstance();
         $aRet = array();
         $a = $oDb->searchByTerm($sTerm, $iLimit);
@@ -68,7 +66,6 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
     {
         if (!$iContentId)
             return false;
-        bx_import('BxDolAccount');
         if (!($oAccount = BxDolAccount::getInstance($iContentId)))
             return false;
         return $oAccount->$sFunc();

template/scripts/BxBaseSocialSharing.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolSocialSharing');
-
 /**
  * @see BxDolSocialSharing
  */
@@ -28,7 +26,6 @@ class BxBaseSocialSharing extends BxDolSocialSharing
     public function getCode ($sContentId, $sModuleName, $sUrl, $sTitle, $aCustomVars = false)
     {
         // define markers for replacments
-        bx_import('BxDolLanguages');
         $sLang = BxDolLanguages::getInstance()->getCurrentLanguage();
         $aMarkers = array (
             'id' => $sContentId,
@@ -46,7 +43,6 @@ class BxBaseSocialSharing extends BxDolSocialSharing
 
         // alert
         $sOverrideOutput = null;
-        bx_import('BxDolAlerts');
         $oAlert = new BxDolAlerts('system', 'social_sharing_display', '', '', array (
             'buttons' => &$this->_aSocialButtons,
             'markers' => &$aMarkers,

template/scripts/BxBaseUploaderHTML5.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import ('BxDolUploader');
-
 /**
  * Upload files using AJAX uploader with multiple files selection support (without flash),
  * it works in Firefox and WebKit(Safari, Chrome) browsers only, but has fallback for other browsers (IE, Opera).
@@ -72,7 +70,6 @@ class BxBaseUploaderHTML5 extends BxDolUploader
      */
     public function handleUploads ($iProfileId, $mixedFiles, $isMultiple = true, $iContentId = false, $bPrivate = true)
     {
-        bx_import('BxDolStorage');
         $oStorage = BxDolStorage::getObjectInstance($this->_sStorageObject);
 
         $iProfileId = bx_get_logged_profile_id();

template/scripts/BxBaseUploaderSimple.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import ('BxDolUploader');
-
 /**
  * Upload files using standard HTML forms.
  * @see BxDolUploader

template/scripts/BxBaseView.php

@@ -7,8 +7,6 @@
  * @{
  */
 
-bx_import('BxDolView');
-
 /**
  * @see BxDolView
  */

template/scripts/BxBaseVote.php

@@ -7,9 +7,6 @@
  * @{
  */
 
-bx_import('BxDolVote');
-bx_import('BxDolTemplate');
-
 /**
  * @see BxDolVote
  */