#15 - Require usage improvements.

modules/boonex/developer/classes/BxDevBuilderPage.php

@@ -180,7 +180,7 @@ class BxDevBuilderPage extends BxTemplStudioBuilderPage
         return array('eval' => $sJsObject . '.onDeleteBlock(' . $iId . ', oData)');
     }
 
-    protected function getSettingsOptions($aPage, $bCreate = true, $bInputsOnly = false)
+    protected function getSettingsOptions($aPage = array(), $bCreate = true, $bInputsOnly = false)
     {
         $aForm = array(
             'form_attrs' => array(

modules/boonex/developer/classes/BxDevDb.php

@@ -20,8 +20,6 @@ class BxDevDb extends BxDolModuleDb
 
     function getQueryInsert($sTable, $aItems, $mixedComment = false, $aExclude = array('id'))
     {
-        bx_import('BxDevFunctions');
-
         $bFirst = true;
         $sContent = $sComment = "";
         foreach($aItems as $aItem) {
@@ -33,7 +31,6 @@ class BxDevDb extends BxDolModuleDb
             $aValues = array_values($aItem);
             $iValues = count($aValues);
 
-            bx_import('BxDevFunctions');
             foreach ($aValues as $iKey => $sValue)
                 $aValues[$iKey] = BxDevFunctions::dbAddSlashes($sValue, true);
 

modules/boonex/developer/classes/BxDevModule.php

@@ -11,12 +11,7 @@
 
 bx_import('BxDolModule');
 
-require_once('BxDevForms.php');
 require_once('BxDevFunctions.php');
-require_once('BxDevBuilderPage.php');
-require_once('BxDevNavigation.php');
-require_once('BxDevPolyglot.php');
-require_once('BxDevPermissions.php');
 
 define('BX_DEV_TOOLS_SETTINGS', 'settings');
 define('BX_DEV_TOOLS_FORMS', 'forms');

modules/boonex/developer/classes/BxDevStudioPage.php

@@ -21,7 +21,7 @@ class BxDevStudioPage extends BxTemplStudioModule
         parent::__construct($sModule, $sPage);
 
         bx_import('BxDolModule');
-        $this->oModule = BxDolModule::getInstance('bx_developer');
+        $this->oModule = BxDolModule::getInstance($this->sModule);
 
         $this->sUrl = BX_DOL_URL_STUDIO . 'module.php?name=%s&page=%s';
     }
@@ -56,6 +56,7 @@ class BxDevStudioPage extends BxTemplStudioModule
         $sPage = bx_get('form_page');
         $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
+		bx_import('Forms', $this->aModule);
         $oContent = new BxDevForms(array(
             'page' => $sPage,
             'url' => sprintf($this->sUrl, $this->sModule, BX_DEV_TOOLS_FORMS),
@@ -68,6 +69,7 @@ class BxDevStudioPage extends BxTemplStudioModule
         $sPage = bx_get('nav_page');
         $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
+        bx_import('Navigation', $this->aModule);
         $oContent = new BxDevNavigation(array(
             'page' => $sPage,
             'url' => sprintf($this->sUrl, $this->sModule, BX_DEV_TOOLS_NAVIGATION),
@@ -83,6 +85,7 @@ class BxDevStudioPage extends BxTemplStudioModule
         $sPage = bx_get('bp_page');
         $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
+        bx_import('BuilderPage', $this->aModule);
         $oContent = new BxDevBuilderPage(array(
             'type' => $sType,
             'page' => $sPage,
@@ -100,6 +103,7 @@ class BxDevStudioPage extends BxTemplStudioModule
         $sPage = bx_get('pgt_page');
         $sPage = $sPage !== false ? bx_process_input($sPage) : 'manager';
 
+        bx_import('Polyglot', $this->aModule);
         $oContent = new BxDevPolyglot(array(
             'page' => $sPage,
             'url' => sprintf($this->sUrl, $this->sModule, BX_DEV_TOOLS_POLYGLOT),
@@ -112,6 +116,7 @@ class BxDevStudioPage extends BxTemplStudioModule
         $sPage = bx_get('prm_page');
         $sPage = $sPage !== false ? bx_process_input($sPage) : '';
 
+        bx_import('Permissions', $this->aModule);
         $oContent = new BxDevPermissions(array(
             'page' => $sPage,
             'url' => sprintf($this->sUrl, $this->sModule, BX_DEV_TOOLS_PERMISSIONS),

studio/js/module.js

@@ -39,7 +39,7 @@ BxDolStudioModule.prototype.activate = function(sName, oChecbox) {
 			}
 			else
 				oContent.bx_anim('hide', $this.sAnimationEffect, $this.iAnimationSpeed, function() {
-					$(this).html(oData.content)
+					$(this).html(oData.content);
 					oBg.addClass('bx-std-page-bg-empty');
 				});
 		},

studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -840,7 +840,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
         return array('eval' => $this->getPageJsObject() . '.onGetUri(oData)', 'uri' => $sUri, 'url' => $sUrl);
     }
 
-    protected function getSettingsOptions($aPage, $bCreate = true, $bInputsOnly = false)
+    protected function getSettingsOptions($aPage = array(), $bCreate = true, $bInputsOnly = false)
     {
     	bx_import('BxDolPermalinks');