#2 - PHP 5.4 compatibility problems

inc/classes/BxDolConfig.php

@@ -48,7 +48,7 @@ class BxDolConfig extends BxDol {
     /**
      * Get singleton instance of the class
      */
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolConfig();
             $GLOBALS['bxDolClasses'][__CLASS__]->init();

inc/classes/BxDolForm.php

@@ -903,7 +903,7 @@ class BxDolForm extends BxDol {
         return ($this->isSubmitted() && $this->isValid());
     }
 
-    function getSubmittedValue($sKey, $sMethod, &$aSpecificValues = false) {
+    public static function getSubmittedValue($sKey, $sMethod, &$aSpecificValues = false) {
         $aData = array();
         if($sMethod == BX_DOL_FORM_METHOD_GET) {
             $aData = &$_GET;
@@ -949,11 +949,11 @@ class BxDolForm extends BxDol {
         if($bReturn)
             return $sToken;
     }
-    function getCsrfToken() {
+    public static function getCsrfToken() {
         $oSession = BxDolSession::getInstance();
         return $oSession->getValue('csrf_token');
     }
-    function getCsrfTokenTime() {
+    public static function getCsrfTokenTime() {
         $oSession = BxDolSession::getInstance();
         return $oSession->getValue('csrf_token_time');
     }

inc/classes/BxDolImageResize.php

@@ -60,7 +60,7 @@ class BxDolImageResize extends BxDol {
     /**
      * Get singleton instance of the class
      */
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolImageResize();
 

inc/classes/BxDolKey.php

@@ -67,7 +67,7 @@ class BxDolKey extends BxDol {
     /**
      * Get singleton instance of the class
      */
-    function getInstance() {
+    public static function getInstance() {
         if (!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolKey();
         return $GLOBALS['bxDolClasses'][__CLASS__];

inc/classes/BxDolModuleQuery.php

@@ -69,6 +69,8 @@ class BxDolModuleQuery extends BxDolDb {
         $sSql = "SELECT `id`, `type`, `name`, `title`, `vendor`, `version`, `product_url`, `update_url`, `path`, `uri`, `class_prefix`, `db_prefix`, `lang_category`, `date`, `enabled` FROM `sys_modules` ORDER BY `title`";
         return $this->fromMemory('sys_modules', 'getAll', $sSql);
     }
+
+/*    
     function getModulesBy($aParams = array()) {
         $sPostfix = $sWhereClause = "";
 
@@ -113,6 +115,8 @@ class BxDolModuleQuery extends BxDolDb {
         	ORDER BY `title`";
         return $this->fromMemory('sys_modules' . $sPostfix, 'getAll', $sSql);
     }
+*/
+
     function getModulesUri() {
         $sSql = "SELECT `uri` FROM `sys_modules` ORDER BY `uri`";
         return $this->fromMemory('sys_modules_uri', 'getColumn', $sSql);
@@ -121,4 +125,4 @@ class BxDolModuleQuery extends BxDolDb {
         $sSql = "SELECT `id`, `title` FROM `sys_modules` WHERE `dependencies` LIKE '%" . $this->escape($sUri) . "%'";
         return $this->getAll($sSql);
     }
-}
+}

inc/classes/BxDolParams.php

@@ -44,7 +44,7 @@ class BxDolParams extends BxDol {
     /**
      * Get singleton instance of the class
      */
-    function getInstance($oDb) {
+    public static function getInstance($oDb) {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolParams($oDb);
 

inc/classes/BxDolRequest.php

@@ -15,7 +15,7 @@ class BxDolRequest extends BxDol {
     function BxDolRequest() {
         parent::BxDol();
     }
-    function processAsFile($aModule, &$aRequest) {
+    public static function processAsFile($aModule, &$aRequest) {
         if(empty($aRequest) || ($sFileName = array_shift($aRequest)) == "")
             $sFileName = 'index';
 
@@ -28,7 +28,7 @@ class BxDolRequest extends BxDol {
             if (isset($GLOBALS['bx_profiler'])) $GLOBALS['bx_profiler']->endModule('file', $sPrHash);
         }
     }
-    static function processAsAction($aModule, &$aRequest, $sClass = "Module") {
+    public static function processAsAction($aModule, &$aRequest, $sClass = "Module") {
         $sAction = empty($aRequest) || (isset($aRequest[0]) && empty($aRequest[0])) ? 'Home' : array_shift($aRequest);
         $sMethod = 'action' . str_replace(' ', '', ucwords(str_replace('_', ' ', $sAction)));
 
@@ -42,7 +42,7 @@ class BxDolRequest extends BxDol {
 
         return $mixedRet;
     }
-    function processAsService($aModule, $sMethod, $aParams, $sClass = "Module") {
+    public static function processAsService($aModule, $sMethod, $aParams, $sClass = "Module") {
         if (isset($aModule['name']) && 'system' == $aModule['name'] && 'Module' == $sClass) 
             $sClass = 'BaseServices';
 
@@ -58,23 +58,23 @@ class BxDolRequest extends BxDol {
 
         return $mixedRet;
     }
-    function serviceExists($mixedModule, $sMethod, $sClass = "Module") {
+    public static function serviceExists($mixedModule, $sMethod, $sClass = "Module") {
         return BxDolRequest::_methodExists($mixedModule, 'service', $sMethod, $sClass);
     }
-    function actionExists($mixedModule, $sMethod, $sClass = "Module") {
+    public static function actionExists($mixedModule, $sMethod, $sClass = "Module") {
         return BxDolRequest::_methodExists($mixedModule, 'action', $sMethod, $sClass);
     }
-    function moduleNotFound($sModule) {
+    public static function moduleNotFound($sModule) {
         BxDolRequest::_error('module', $sModule);
     }
-    function pageNotFound($sPage, $sModule) {
+    public static function pageNotFound($sPage, $sModule) {
         BxDolRequest::_error('page', $sPage, $sModule);
     }
-    function methodNotFound($sMethod, $sModule) {
+    public static function methodNotFound($sMethod, $sModule) {
         BxDolRequest::_error('method', $sMethod, $sModule);
     }
 
-    function _perform($aModule, $sClass, $sMethod, $aParams, $bTerminateOnError = true) {
+    protected static function _perform($aModule, $sClass, $sMethod, $aParams, $bTerminateOnError = true) {
         $sClass = $aModule['class_prefix'] . $sClass;        
 
         $oModule = BxDolRequest::_require($aModule, $sClass);
@@ -91,7 +91,7 @@ class BxDolRequest extends BxDol {
         else if(!$bMethod && !$bTerminateOnError)
             return false;
     }
-    function _require($aModule, $sClass) {
+    protected static function _require($aModule, $sClass) {
         if(!isset($GLOBALS['bxDolClasses'][$sClass])) {
             if ($aModule['path']) {
                 $sFile = BX_DIRECTORY_PATH_MODULES . $aModule['path'] . 'classes/' . $sClass . '.php';
@@ -109,7 +109,7 @@ class BxDolRequest extends BxDol {
 
         return $oModule;
     }
-    function _methodExists($mixedModule, $sMethodType, $sMethodName, $sClass = "Module"){
+    protected static function _methodExists($mixedModule, $sMethodType, $sMethodName, $sClass = "Module"){
         $aModule = $mixedModule;
         if(is_string($mixedModule)) {
             bx_import('BxDolModuleQuery');
@@ -126,7 +126,7 @@ class BxDolRequest extends BxDol {
         $sMethod = $sMethodType . str_replace(' ', '', ucwords(str_replace('_', ' ', $sMethodName)));
         return method_exists($oModule, $sMethod);
     }
-    function _error($sType, $sParam1 = '', $sParam2 = '') {
+    protected static function _error($sType, $sParam1 = '', $sParam2 = '') {
         header('Status: 404 Not Found');
         header('HTTP/1.0 404 Not Found');
 

inc/classes/BxDolSearch.php

@@ -341,7 +341,7 @@ class BxDolSearchResult {
     /**
      * Get html code of pagination
      */
-    function showPagination () {
+    function showPagination ($bAdmin = false, $bChangePage = true, $bPageReload = true) {
 
     }
 

inc/classes/BxDolService.php

@@ -35,7 +35,7 @@ class BxDolService extends BxDol {
         parent::BxDol();
     }
 
-    function call($mixed, $sMethod, $aParams = array(), $sClass = 'Module') {
+    public static function call($mixed, $sMethod, $aParams = array(), $sClass = 'Module') {
         bx_import('BxDolModuleQuery');
         $oDb = BxDolModuleQuery::getInstance();
 

inc/classes/BxDolSession.php

@@ -41,7 +41,7 @@ class BxDolSession extends BxDol {
     /**
      * Get singleton instance of the class
      */
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolSession();
 

inc/classes/BxDolTemplate.php

@@ -248,7 +248,7 @@ class BxDolTemplate extends BxDol {
     /**
      * Get singleton instance of the class
      */
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolTemplate();
             $GLOBALS['bxDolClasses'][__CLASS__]->init();

inc/classes/BxDolTwigSearchResult.php

@@ -50,7 +50,7 @@ class BxDolTwigSearchResult extends BxTemplSearchResult  {
         return $oMain->_oTemplate->unit($aData, $this->sUnitTemplate);
     }
 
-    function showPagination($bAdmin = false) {
+    function showPagination($bAdmin = false, $bChangePage = true, $bPageReload = true) {
 
         $oMain = $this->getMain();
         $oConfig = $oMain->_oConfig;

inc/classes/BxDolTwigTemplate.php

@@ -36,7 +36,7 @@ class BxDolTwigTemplate extends BxDolModuleTemplate {
         BxDolStudioTemplate::getInstance()->addJs ($sName);
     }
 
-    function parseHtmlByName ($sName, &$aVars) {
+    function parseHtmlByName ($sName, $aVars, $mixedKeyWrapperHtml = null, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH) {
         return parent::parseHtmlByName (strlen($sName) > 5 && strpos($sName, '.html', strlen($sName) - 5) ? $sName : $sName.'.html', $aVars);
     }
 

modules/boonex/developer/classes/BxDevStudioPage.php

@@ -24,7 +24,7 @@ class BxDevStudioPage extends BxTemplStudioModule {
         $this->sUrl = BX_DOL_URL_STUDIO . 'module.php?name=%s&page=%s';
     }
 
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $this->aMenuItems = array();
         foreach($this->oModule->aTools as $aTool)
             $this->aMenuItems[] = array(
@@ -40,7 +40,7 @@ class BxDevStudioPage extends BxTemplStudioModule {
         return $oMenu->getCode();
     }
 
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         if(in_array($this->sPage, array('general')) || (int)$this->aModule['enabled'] == 0)
             $this->oModule->_oTemplate->addStudioInjection('injection_body_style', 'text', ' bx-dev-page-body-single');
         else
@@ -99,4 +99,4 @@ class BxDevStudioPage extends BxTemplStudioModule {
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/notes/classes/BxNotesFormNote.php

@@ -113,7 +113,7 @@ class BxNotesFormNote extends BxTemplFormView {
         return $iRet;
     }
 
-    function delete ($iContentId, $aContentInfo) {
+    function delete ($iContentId) {
 
         // delete associated files
 
@@ -122,7 +122,7 @@ class BxNotesFormNote extends BxTemplFormView {
         if (!$oStorage)
             return false;
 
-        $aGhostFiles = $oStorage->getGhosts (bx_get_logged_profile_id(), $aContentInfo['id']);
+        $aGhostFiles = $oStorage->getGhosts (bx_get_logged_profile_id(), $iContentId);
         if ($aGhostFiles)
             foreach ($aGhostFiles as $aFile)
                 $this->_deleteFile($aFile['id']);

modules/boonex/notes/classes/BxNotesNoteForms.php

@@ -148,7 +148,7 @@ class BxNotesNoteForms extends BxDolProfileForms {
         if (!$oForm->isSubmittedAndValid())
             return $oForm->getCode();
 
-        if (!$oForm->delete ($aContentInfo['id'], $aContentInfo)) {
+        if (!$oForm->delete ($aContentInfo['id'])) {
             if (!$oForm->isValid())
                 return $oForm->getCode();
             else

splash.php

@@ -39,7 +39,7 @@ class BxDolSplashMenuTop extends BxTemplStudioMenuTop
         );
 	}
 
-	function getInstance() {
+	public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses']['BxDolSplashMenuTop']))
             $GLOBALS['bxDolClasses']['BxDolSplashMenuTop'] = new BxDolSplashMenuTop();
 

studio/classes/BxDolStudioForm.php

@@ -38,11 +38,11 @@ class BxDolStudioForm extends BxBaseFormView {
         return $mixedResult;
     }
 
-    function update($val, $aValsToAdd = array()) {
+    function update($val, $aValsToAdd = array(), &$aTrackTextFieldsChanges = null) {
         $sAction = 'update';
         $this->processTranslationsKey($sAction);
 
-        $mixedResult = parent::update($val, $aValsToAdd);
+        $mixedResult = parent::update($val, $aValsToAdd, $aTrackTextFieldsChanges);
         if($mixedResult !== false)
             $this->processTranslations($sAction);
 

studio/classes/BxDolStudioTemplate.php

@@ -15,6 +15,7 @@ define('BX_PAGE_COLUMN_DUAL', 3); ///< page, with 2 columns
 bx_import('BxDolTemplate');
 
 class BxDolStudioTemplate extends BxDolTemplate {
+
     function BxDolStudioTemplate() {
         if(isset($GLOBALS['bxDolClasses'][get_class($this)]))
             trigger_error ('Multiple instances are not allowed for the class: ' . get_class($this), E_USER_ERROR);
@@ -46,7 +47,7 @@ class BxDolStudioTemplate extends BxDolTemplate {
     /**
      * Get singleton instance of the class
      */
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolStudioTemplate();
             $GLOBALS['bxDolClasses'][__CLASS__]->init();
@@ -235,4 +236,4 @@ class BxDolStudioTemplate extends BxDolTemplate {
         exit;
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -71,7 +71,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage {
         return 'oBxDolStudioBuilderPage';
     }
 
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $aMenuItems = array(
             BX_DOL_STUDIO_MODULE_SYSTEM => array( 
             	'name' => BX_DOL_STUDIO_MODULE_SYSTEM,
@@ -105,7 +105,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage {
         return parent::getPageMenu($aMenu);
     }
 
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         bx_import('BxTemplPage');
         $oPage = BxTemplPage::getObjectInstance($this->sPage);
 
@@ -1520,4 +1520,4 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage {
     	return $aBlocks;
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioDesign.php

@@ -44,7 +44,7 @@ class BxBaseStudioDesign extends BxDolStudioDesign {
 
         return parent::getPageAttributes();
     }
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();            
@@ -59,7 +59,7 @@ class BxBaseStudioDesign extends BxDolStudioDesign {
 
         return parent::getPageMenu($aMenu);
     }
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -82,4 +82,4 @@ class BxBaseStudioDesign extends BxDolStudioDesign {
         return $oTemplate->parseHtmlByName('design.html', $aTmplVars);
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioDesigner.php

@@ -31,7 +31,7 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner {
     function getPageJsObject() {
         return 'oBxDolStudioDesigner';
     }
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();
@@ -51,7 +51,7 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner {
 
         return parent::getPageMenu($aMenu);
     }
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -253,4 +253,4 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner {
         return $oTemplate->parseHtmlByName('designer.html', $aTmplVars);
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioForms.php

@@ -35,7 +35,7 @@ class BxBaseStudioForms extends BxDolStudioForms {
     function getPageJsObject() {
         return '';
     }
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();
@@ -57,7 +57,7 @@ class BxBaseStudioForms extends BxDolStudioForms {
 
         return parent::getPageMenu($aMenu);
     }
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' .  $this->getClassName($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -174,4 +174,4 @@ class BxBaseStudioForms extends BxDolStudioForms {
         return array('content' => BxDolStudioTemplate::getInstance()->parseHtmlByName('forms_select.html', array('bx_repeat:options' => $aTmplVars)));
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioFunctions.php

@@ -21,7 +21,7 @@ class BxBaseStudioFunctions extends BxBaseFunctions {
         parent::BxBaseFunctions($oTemplate ? $oTemplate : BxDolStudioTemplate::getInstance());
     }
 
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses']['BxBaseStudioFunctions']))
             $GLOBALS['bxDolClasses']['BxBaseStudioFunctions'] = new BxTemplStudioFunctions();
 

studio/template/scripts/BxBaseStudioLanguage.php

@@ -45,7 +45,7 @@ class BxBaseStudioLanguage extends BxDolStudioLanguage {
         return parent::getPageAttributes();
     }
 
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();
@@ -61,7 +61,7 @@ class BxBaseStudioLanguage extends BxDolStudioLanguage {
         return parent::getPageMenu($aMenu);
     }
 
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -84,4 +84,4 @@ class BxBaseStudioLanguage extends BxDolStudioLanguage {
         return $oTemplate->parseHtmlByName('language.html', $aTmplVars);
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioMenuTop.php

@@ -19,7 +19,7 @@ class BxBaseStudioMenuTop extends BxDolStudioMenuTop {
         parent::BxDolStudioMenuTop();
     }
 
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses']['BxBaseStudioMenuTop']))
             $GLOBALS['bxDolClasses']['BxBaseStudioMenuTop'] = new BxTemplStudioMenuTop();
 
@@ -69,4 +69,4 @@ class BxBaseStudioMenuTop extends BxDolStudioMenuTop {
     	return $oTemplate->parseHtmlByName('menu_top.html', array('bx_repeat:menus' => $aTmplVars));
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioModule.php

@@ -49,7 +49,7 @@ class BxBaseStudioModule extends BxDolStudioModule {
         return parent::getPageAttributes();
     }
 
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();
@@ -64,7 +64,7 @@ class BxBaseStudioModule extends BxDolStudioModule {
 
         return parent::getPageMenu($aMenu);
     }
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -87,4 +87,4 @@ class BxBaseStudioModule extends BxDolStudioModule {
         return $oTemplate->parseHtmlByName('design.html', $aTmplVars);
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioNavigation.php

@@ -33,7 +33,7 @@ class BxBaseStudioNavigation extends BxDolStudioNavigation {
     function getPageJsObject() {
         return '';
     }
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();
@@ -53,7 +53,7 @@ class BxBaseStudioNavigation extends BxDolStudioNavigation {
 
         return parent::getPageMenu($aMenu);
     }
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -117,4 +117,4 @@ class BxBaseStudioNavigation extends BxDolStudioNavigation {
         return $oTemplate->parseHtmlByName('navigation.html', $aTmplVars);
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioPermissions.php

@@ -28,7 +28,7 @@ class BxBaseStudioPermissions extends BxDolStudioPermissions {
     function getPageJsObject() {
         return 'oBxDolStudioPermissions';
     }
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();
@@ -48,7 +48,7 @@ class BxBaseStudioPermissions extends BxDolStudioPermissions {
 
         return parent::getPageMenu($aMenu);
     }
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -91,4 +91,4 @@ class BxBaseStudioPermissions extends BxDolStudioPermissions {
         return $oTemplate->parseHtmlByName('permissions.html', $aTmplVars);
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioPolyglot.php

@@ -24,7 +24,7 @@ class BxBaseStudioPolyglot extends BxDolStudioPolyglot {
     function getPageJsObject() {
         return 'oBxDolStudioPolyglot';
     }
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
 
         $aMenu = array();
@@ -45,7 +45,7 @@ class BxBaseStudioPolyglot extends BxDolStudioPolyglot {
         return parent::getPageMenu($aMenu);
     }
 
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -102,4 +102,4 @@ class BxBaseStudioPolyglot extends BxDolStudioPolyglot {
         return $oTemplate->parseHtmlByName('polyglot.html', $aTmplVars);
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioSettings.php

@@ -26,7 +26,7 @@ class BxBaseStudioSettings extends BxDolStudioSettings {
     function getPageJsObject() {
         return 'oBxDolStudioSettings';
     }
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $aTypes = $aMenu = array();
         if($this->oDb->getTypes(array('type' => 'all'), $aTypes) > 0 ) {
             $aTypesGrouped = array();
@@ -250,4 +250,4 @@ class BxBaseStudioSettings extends BxDolStudioSettings {
         return $aType['icon'];
     }
 }
-/** @} */
+/** @} */

studio/template/scripts/BxBaseStudioStore.php

@@ -31,7 +31,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
         return 'oBxDolStudioStore';
     }
 
-    function getPageMenu() {
+    function getPageMenu($aMenu = array(), $aMarkers = array()) {
         $sJsObject = $this->getPageJsObject();
         $oTemplate = BxDolStudioTemplate::getInstance();
 
@@ -62,7 +62,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
         return parent::getPageMenu($aMenu, $aMarkers);
     }
 
-    function getPageCode() {
+    function getPageCode($bHidden = false) {
         $sMethod = 'get' . ucfirst($this->sPage);
         if(!method_exists($this, $sMethod))
             return '';
@@ -578,4 +578,4 @@ class BxBaseStudioStore extends BxDolStudioStore {
         return $sResult;
     }
 }
-/** @} */
+/** @} */

template/scripts/BxBaseConfig.php

@@ -67,7 +67,7 @@ class BxBaseConfig extends BxDol {
         $this -> bAnonymousMode = getParam('anon_mode');;
     }
 
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxTemplConfig();
 

template/scripts/BxBaseFormView.php

@@ -711,7 +711,7 @@ BLAH;
      */
     function genInputSwitcher(&$aInput) {
         $aInput['type'] = 'checkbox';
-        $sCheckbox = $this->genInputStandard(&$aInput);
+        $sCheckbox = $this->genInputStandard($aInput);
         $aInput['type'] = 'switcher';
 
         $sClass = 'off';
@@ -884,7 +884,7 @@ BLAH;
      */
     function genInputSelect(&$aInput) {
         $sCurValue = isset($aInput['value']) ? $aInput['value'] : '';
-        return $this->_genInputSelect(&$aInput, false, $sCurValue, '_isSelected');
+        return $this->_genInputSelect($aInput, false, $sCurValue, '_isSelected');
     }
 
     /**
@@ -897,7 +897,7 @@ BLAH;
         $aCurValues = array();
         if (isset($aInput['value']) && $aInput['value'])
             $aCurValues = is_array($aInput['value']) ? $aInput['value'] : array(); 
-        return $this->_genInputSelect(&$aInput, true, $aCurValues, '_isSelectedMultiple');
+        return $this->_genInputSelect($aInput, true, $aCurValues, '_isSelectedMultiple');
     }
 
     /**

template/scripts/BxBaseFunctions.php

@@ -36,7 +36,7 @@ class BxBaseFunctions extends BxDol {
             trigger_error('Clone is not allowed for the class: ' . get_class($this), E_USER_ERROR);
     }
 
-    function getInstance() {
+    public static function getInstance() {
         if(!isset($GLOBALS['bxDolClasses']['BxTemplFunctions']))
             $GLOBALS['bxDolClasses']['BxTemplFunctions'] = new BxTemplFunctions();
 
@@ -153,7 +153,7 @@ class BxBaseFunctions extends BxDol {
     }
 
     function msgBox($sText, $iTimer = 0, $sOnClose = "") {    	
-        $iId = mktime() . mt_rand(1, 1000);
+        $iId = time() . mt_rand(1, 1000);
 
         return $this->_oTemplate->parseHtmlByName('messageBox.html', array(
             'id' => $iId,
@@ -184,7 +184,7 @@ class BxBaseFunctions extends BxDol {
      */
     function popupBox($sName, $sTitle, $sContent, $isHiddenByDefault = false) {
 
-        $iId = !empty($sName) ? $sName : mktime();
+        $iId = !empty($sName) ? $sName : time();
 
         return $this->_oTemplate->parseHtmlByName('popup_box.html', array(
             'id' => $iId,