#53 - modules & studio cleanup

inc/classes/BxDolModuleDb.php

@@ -7,7 +7,6 @@
  * @{
  */
 
-
 /**
  * Base class for all modules DB classes
  */
@@ -24,7 +23,7 @@ class BxDolModuleDb extends BxDolModuleQuery {
 		if (is_a($oConfig,'BxDolModuleConfig'))
             $this->_sPrefix = $oConfig->getDbPrefix();
         else
-            trigger_error ('It is impossible to create BxDolModuleDb class instance without prefix: ' . get_class($this), E_USER_ERROR);  
+            trigger_error ('It is impossible to create BxDolModuleDb class instance without prefix: ' . get_class($this), E_USER_ERROR);
     }
 
 	public function getPrefix() {

modules/boonex/contact/classes/BxContactConfig.php

@@ -25,7 +25,7 @@ class BxContactConfig extends BxDolModuleConfig
      */
     public function __construct($aModule)
     {
-        parent::BxDolModuleConfig($aModule);
+        parent::__construct($aModule);
 
 		$this->_sAlertSystemName = $this->_sName;
 

modules/boonex/contact/classes/BxContactModule.php

@@ -18,7 +18,7 @@ class BxContactModule extends BxDolModule
      */
     function __construct($aModule)
     {
-        parent::BxDolModule($aModule);
+        parent::__construct($aModule);
 
         $this->_oConfig->init($this->_oDb);
     }

modules/boonex/contact/classes/BxContactTemplate.php

@@ -15,7 +15,7 @@ class BxContactTemplate extends BxDolModuleTemplate
 {
     function __construct(&$oConfig, &$oDb)
     {
-        parent::BxDolModuleTemplate($oConfig, $oDb);
+        parent::__construct($oConfig, $oDb);
     }
 }
 

modules/boonex/developer/classes/BxDevBuilderPage.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -407,4 +407,5 @@ class BxDevBuilderPage extends BxTemplStudioBuilderPage {
 		);
     }
 }
-/** @} */
+
+/** @} */

modules/boonex/developer/classes/BxDevConfig.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/

modules/boonex/developer/classes/BxDevDb.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/

modules/boonex/developer/classes/BxDevFormView.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -12,9 +12,9 @@
 bx_import('BxTemplStudioFormView');
 
 class BxDevFormView extends BxTemplStudioFormView {
-    function BxDevFormView($aInfo, $oTemplate = false) {
-        parent::BxTemplStudioFormView($aInfo, $oTemplate);
+    function __construct($aInfo, $oTemplate = false) {
+        parent::__construct($aInfo, $oTemplate);
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevForms.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -22,8 +22,8 @@ class BxDevForms extends BxTemplStudioForms {
         'pre_values' => 'mod_dev_forms_pre_values'
     );
 
-    function BxDevForms($aParams) {
-        parent::BxTemplStudioForms(isset($aParams['page']) ? $aParams['page'] : '');
+    function __construct($aParams) {
+        parent::__construct(isset($aParams['page']) ? $aParams['page'] : '');
 
         $this->aParams = $aParams;
         $this->sSubpageUrl = $this->aParams['url'] . '&form_page=';
@@ -35,4 +35,4 @@ class BxDevForms extends BxTemplStudioForms {
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevFormsDisplays.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -141,4 +141,4 @@ class BxDevFormsDisplays extends BxTemplStudioFormsDisplays {
         $oForm->aInputs['object']['value'] = $this->sObject;
     } 
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevFormsField.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -223,4 +223,4 @@ class BxDevFormsFieldCaptcha extends BxTemplStudioFormsFieldCaptcha {
         BxDevFunctions::changeFormField($this->aParams, $this->aForm['inputs'], $this->oDb);
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevFormsFields.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -44,4 +44,4 @@ class BxDevFormsFields extends BxTemplStudioFormsFields {
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevFormsForms.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -181,4 +181,4 @@ class BxDevFormsForms extends BxTemplStudioFormsForms {
         $this->_echoResultJson(array('popup' => $sContent), true);
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevFormsPreLists.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -163,4 +163,4 @@ class BxDevFormsPreLists extends BxTemplStudioFormsPreLists {
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevFormsPreValues.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -153,4 +153,4 @@ class BxDevFormsPreValues extends BxTemplStudioFormsPreValues {
             $this->oDb->updateList($aList['id'], array('use_for_sets' => $iUseInSets));
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevFunctions.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -85,4 +85,4 @@ class BxDevFunctions {
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevModule.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/

modules/boonex/developer/classes/BxDevNavigation.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -20,8 +20,8 @@ class BxDevNavigation extends BxTemplStudioNavigation {
         'items' => 'mod_dev_nav_items'
     );
 
-    function BxDevNavigation($aParams) {
-        parent::BxTemplStudioNavigation(isset($aParams['page']) ? $aParams['page'] : '');
+    function __construct($aParams) {
+        parent::__construct(isset($aParams['page']) ? $aParams['page'] : '');
 
         $this->aParams = $aParams;
         $this->sSubpageUrl = $this->aParams['url'] . '&nav_page=';
@@ -33,4 +33,4 @@ class BxDevNavigation extends BxTemplStudioNavigation {
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevNavigationItems.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -113,4 +113,4 @@ class BxDevNavigationItems extends BxTemplStudioNavigationItems {
         $aInputs['set_name']['value'] = $this->sSet;
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevNavigationMenus.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -172,4 +172,4 @@ class BxDevNavigationMenus extends BxTemplStudioNavigationMenus {
             $aInputs['template_id']['values'][] = array('key' => $aTemplate['id'], 'value' => _t($aTemplate['title']));
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevNavigationSets.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -110,4 +110,4 @@ class BxDevNavigationSets extends BxTemplStudioNavigationSets {
         return  parent::_getActionDefault($sType, $sKey, $a, false, $isDisabled, $aRow);
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevPermissions.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -14,12 +14,12 @@ bx_import('BxTemplStudioPermissions');
 class BxDevPermissions extends BxTemplStudioPermissions {
     protected $aParams;
 
-    function BxDevPermissions($aParams) {
-        parent::BxTemplStudioPermissions(isset($aParams['page']) ? $aParams['page'] : '');
+    function __construct($aParams) {
+        parent::__construct(isset($aParams['page']) ? $aParams['page'] : '');
 
         $this->aParams = $aParams;
         $this->sSubpageUrl = $this->aParams['url'] . '&prm_page=';
     }
 }
 
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevPolyglot.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -20,9 +20,9 @@ class BxDevPolyglot extends BxTemplStudioPolyglot
         'manage' => 'mod_dev_pgt_manage'
     );
 
-	function BxDevPolyglot($aParams)
+	function __construct($aParams)
 	{
-        parent::BxTemplStudioPolyglot(isset($aParams['page']) ? $aParams['page'] : '');
+        parent::__construct(isset($aParams['page']) ? $aParams['page'] : '');
 
         $this->aParams = $aParams;
         $this->sSubpageUrl = $this->aParams['url'] . '&pgt_page=';
@@ -71,4 +71,4 @@ class BxDevPolyglot extends BxTemplStudioPolyglot
         return $this->getGrid($this->aGridObjects['manage']);
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevPolyglotManage.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -100,4 +100,4 @@ class BxDevPolyglotManage extends BxTemplStudioGrid {
         return array_merge($aData, parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage));
     }
 }
-/** @} */
+/** @} */

modules/boonex/developer/classes/BxDevStudioPage.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -15,8 +15,8 @@ class BxDevStudioPage extends BxTemplStudioModule {
     protected $oModule;
     protected $sUrl;
 
-    function BxDevStudioPage($sModule = "", $sPage = "") {
-        parent::BxTemplStudioModule($sModule, $sPage);
+    function __construct($sModule = "", $sPage = "") {
+        parent::__construct($sModule, $sPage);
 
         bx_import('BxDolModule');
         $this->oModule = BxDolModule::getInstance('bx_developer');

modules/boonex/developer/classes/BxDevTemplate.php

@@ -1,4 +1,4 @@
-<? defined('BX_DOL') or die('hack attempt');
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/

modules/boonex/developer/install/installer.php

@@ -1,28 +1,20 @@
-<?
-/***************************************************************************
-*                            Dolphin Smart Community Builder
-*                              -------------------
-*     begin                : Mon Mar 23 2006
-*     copyright            : (C) 2007 BoonEx Group
-*     website              : http://www.boonex.com
-* This file is part of Dolphin - Smart Community Builder
-*
-* Dolphin is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the
-* License, or  any later version.
-*
-* Dolphin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-* without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-* See the GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License along with Dolphin,
-* see license.txt file; if not, write to marketing@boonex.com
-***************************************************************************/
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * 
+ * @defgroup    Developer Developer
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
 
 bx_import('BxDolStudioInstaller');
 
 class BxDevInstaller extends BxDolStudioInstaller {
-    function BxDevInstaller($aConfig) {
-        parent::BxDolStudioInstaller($aConfig);
+    function __construct($aConfig) {
+        parent::__construct($aConfig);
     }
-}
+}
+
+/** @} */

modules/boonex/developer/request.php

@@ -1,29 +1,22 @@
-<?
-/***************************************************************************
-*                            Dolphin Smart Community Builder
-*                              -------------------
-*     begin                : Mon Mar 23 2006
-*     copyright            : (C) 2007 BoonEx Group
-*     website              : http://www.boonex.com
-* This file is part of Dolphin - Smart Community Builder
-*
-* Dolphin is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the
-* License, or  any later version.
-*
-* Dolphin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-* without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-* See the GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License along with Dolphin,
-* see license.txt file; if not, write to marketing@boonex.com
-***************************************************************************/
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * 
+ * @defgroup    Developer Developer
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
 
 require_once( BX_DIRECTORY_PATH_CLASSES . 'BxDolRequest.php' );
-if(isset($aRequest[0]) && substr($aRequest[0], 0, 4) == 'act_') {
+
+if (isset($aRequest[0]) && 0 == strncmp($aRequest[0], 'act_', 4)) {
     $aRequest[0] = str_replace('act_', '', $aRequest[0]);
+    // TODO: is header with 'utf8' encoding needed here ?
     echo BxDolRequest::processAsAction($aModule, $aRequest);
-}
-else
+} else {
     BxDolRequest::processAsAction($aModule, $aRequest);
-?>
+}
+
+/** @} */

modules/boonex/english/install/config.php

@@ -35,12 +35,17 @@ $aConfig = array(
     'db_prefix' => 'bx_eng_',
     'class_prefix' => 'BxEng',
 
+    /**
+     * Category for language keys.
+     */
+    'language_category' => 'BoonEx English',
+
     /**
      * Installation/Uninstallation Section.
      * NOTE. The sequence of actions is critical. Don't change the order. 
      */
     'install' => array(
-        'execute_sql' => 1,    	
+        'execute_sql' => 1,
         'update_languages' => 1,
     	'install_language' => 1,
         'recompile_global_paramaters' => 1
@@ -62,28 +67,6 @@ $aConfig = array(
      */
     'dependencies' => array(),
 
-    /**
-     * Category for language keys.
-     */
-    'language_category' => 'BoonEx English',
-
-    /**
-     * Permissions Section
-     */
-    'install_permissions' => array(),
-    'uninstall_permissions' => array(),
-    
-    /**
-     * Introduction and Conclusion Section.
-     */
-    'install_info' => array(
-        'introduction' => 'inst_intro.html',
-        'conclusion' => 'inst_concl.html'
-    ),
-    'uninstall_info' => array(
-        'introduction' => 'uninst_intro.html',
-        'conclusion' => 'uninst_concl.html'
-    )
 );
 
 /** @} */

modules/boonex/english/install/info/inst_concl.html

@@ -1,2 +0,0 @@
-Congratulation!!!
-P.S. It's easy to install and easy to use. :)

modules/boonex/english/install/info/inst_intro.html

@@ -1 +0,0 @@
-Follow the instructions carefully!!!

modules/boonex/english/install/info/uninst_concl.html

@@ -1 +0,0 @@
-You don't like our template  :(

modules/boonex/english/install/info/uninst_intro.html

@@ -1 +0,0 @@
-NO, NO, NO... Don't do it.

modules/boonex/english/install/installer.php

@@ -1,28 +1,22 @@
-<?
-/***************************************************************************
-*                            Dolphin Smart Community Builder
-*                              -------------------
-*     begin                : Mon Mar 23 2006
-*     copyright            : (C) 2007 BoonEx Group
-*     website              : http://www.boonex.com
-* This file is part of Dolphin - Smart Community Builder
-*
-* Dolphin is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the
-* License, or  any later version.
-*
-* Dolphin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-* without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-* See the GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License along with Dolphin,
-* see license.txt file; if not, write to marketing@boonex.com
-***************************************************************************/
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * 
+ * @defgroup    English English language
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
 
 bx_import('BxDolStudioInstaller');
 
-class BxEngInstaller extends BxDolStudioInstaller {
-    function BxEngInstaller($aConfig) {
-        parent::BxDolStudioInstaller($aConfig);
+class BxEngInstaller extends BxDolStudioInstaller 
+{
+    function __construct($aConfig) 
+    {
+        parent::__construct($aConfig);
     }
-}
+}
+
+/** @} */

modules/boonex/profiler/classes/BxProfiler.php

@@ -28,29 +28,30 @@ bx_import('Template', $GLOBALS['bx_profiler_module']);
 bx_import('Config', $GLOBALS['bx_profiler_module']);
 
 
-class BxProfiler {
+class BxProfiler extends BxDol {
 
-    var $oConfig, $oTemplate;
+    protected $oConfig, $oTemplate;
 
-    var $aConf = array ();
+    protected $aConf = array ();
 
-    var $_iTimeStart = 0;
+    protected $_iTimeStart = 0;
 
-    var $_aQueries = array();
-    var $_sQueryIndex = 0;
+    protected $_aQueries = array();
+    protected $_sQueryIndex = 0;
 
-    var $_aModules = array();
-    var $_aModulesNames = array();
-    var $_aModulesLevel = 0;
+    protected $_aModules = array();
+    protected $_aModulesNames = array();
+    protected $_aModulesLevel = 0;
 
-    var $_aInjections = array();
-    var $_sInjectionIndex = 0;
+    protected $_aInjections = array();
+    protected $_sInjectionIndex = 0;
 
-    var $_sLogDateFormat = "Y-m-d H:i:s";
-    var $_sLogMaxArgLength = 64;
-    var $_sLogFilename = 64;
+    protected $_sLogDateFormat = "Y-m-d H:i:s";
+    protected $_sLogMaxArgLength = 64;
+    protected $_sLogFilename = 64;
 
-    function BxProfiler($iTimeStart) {
+    function __construct($iTimeStart) {
+        parent::__construct();
 
         $this->oConfig = new BxProfilerConfig ($GLOBALS['bx_profiler_module']);
         $this->oTemplate = new BxProfilerTemplate ($this->oConfig);

modules/boonex/profiler/classes/BxProfilerAlertsResponse.php

@@ -13,12 +13,7 @@
  * alerts handler
  */
 class BxProfilerAlertsResponse extends BxDolAlertsResponse 
-{
-    public function __construct() 
-    {
-        parent::__construct();
-    }
-    
+{   
     public function response($oAlert) 
     {
         if ('system' == $oAlert->sUnit && 'begin' == $oAlert->sAction) {

modules/boonex/profiler/classes/BxProfilerConfig.php

@@ -11,12 +11,11 @@
 
 bx_import('BxDolModuleConfig');
 
-class BxProfilerConfig extends BxDolModuleConfig {
-    /**
-     * Constructor
-     */
-    function BxProfilerConfig($aModule) {
-        parent::BxDolModuleConfig($aModule);
+class BxProfilerConfig extends BxDolModuleConfig 
+{
+    function __construct($aModule) 
+    {
+        parent::__construct($aModule);
     }
 }
 

modules/boonex/profiler/classes/BxProfilerDb.php

@@ -11,20 +11,6 @@
 
 bx_import('BxDolModuleDb');
 
-/*
- * Profiler module data
- */
-class BxProfilerDb extends BxDolModuleDb {
-    var $_oConfig;
-
-    function BxProfilerDb(&$oConfig) {
-        parent::BxDolModuleDb();
-        $this->_oConfig = $oConfig;
-    }
-
-    function getSettingsCategory() {
-        return $this->getOne("SELECT `ID` FROM `sys_options_cats` WHERE `name` = 'Profiler' LIMIT 1");
-    }
-}
+class BxProfilerDb extends BxDolModuleDb {}
 
 /** @} */

modules/boonex/profiler/classes/BxProfilerModule.php

@@ -17,22 +17,20 @@ bx_import('BxDolModule');
  * This module estimate timining, like page openings, mysql queries execution and service calls.
  * Also it can log too long queries, so you can later investigate these bottle necks and speedup whole script.
  */
-class BxProfilerModule extends BxDolModule {
-
-
-    function BxProfilerModule(&$aModule) {
-        parent::BxDolModule($aModule);
+class BxProfilerModule extends BxDolModule 
+{
+    function __construct($aModule) 
+    {
+        parent::__construct($aModule);
     }
 
-    function actionHome () {
+    function actionHome () 
+    {
         $this->_oTemplate->pageStart();
         echo $this->_aModule['title'];
         $this->_oTemplate->pageCode($this->_aModule['title']);
     }
 
-    function isAdmin () {
-        return $GLOBALS['logged']['admin'];
-    }
 }
 
 /** @} */

modules/boonex/profiler/classes/BxProfilerTemplate.php

@@ -11,21 +11,16 @@
 
 bx_import('BxDolModuleTemplate');
 
-if ((int)phpversion() < 5)
-    require_once(BX_DIRECTORY_PATH_MODULES . 'boonex/profiler/inc/fb4.php');
-else
-    require_once(BX_DIRECTORY_PATH_MODULES . 'boonex/profiler/inc/fb5.php');
+require_once(BX_DIRECTORY_PATH_PLUGINS . "firephp/fb.php");
+define('FIREPHP_TABLE', FirePHP::TABLE);
 
 class BxProfilerTemplate extends BxDolModuleTemplate {
 
-    var $_isAjaxOutput = false;
+    protected $_isAjaxOutput = false;
 
-    /**
-     * Constructor
-     */
-    function BxProfilerTemplate(&$oConfig) {
+    function __construct(&$oConfig) {
         $oDb = null;
-        parent::BxDolModuleTemplate($oConfig, $oDb);
+        parent::__construct($oConfig, $oDb);
         $this->_isAjaxOutput = $this->_isAjaxRequest();
     }
 
@@ -93,15 +88,17 @@ class BxProfilerTemplate extends BxDolModuleTemplate {
             return true;
         if (isset($_GET['bx_profiler_ajax_request']))
             return true;
-        if (preg_match('/popup\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
+        if (preg_match('/vote\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
             return true;
-        if (preg_match('/subscription\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
+        if (preg_match('/image_transcoder\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
             return true;
-        if (preg_match('/vote\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
+        if (preg_match('/storage\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
+            return true;
+        if (preg_match('/storage_uploader\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
             return true;
-        if (!empty($_GET['r']) && preg_match('/^poll\//', $_GET['r']))
+        if (preg_match('/searchKeywordContent\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
             return true;
-        if (preg_match('/pageBuilder\.php/', bx_html_attribute($_SERVER['PHP_SELF'])) && $_REQUEST['action'] == 'load')
+        if (preg_match('/menu\.php/', bx_html_attribute($_SERVER['PHP_SELF'])))
             return true;
         return false;
     }

modules/boonex/profiler/inc/fb4.php

@@ -1,4 +0,0 @@
-<?php
-function fb() {}
-define('FIREPHP_TABLE', 0);
-?>

modules/boonex/profiler/inc/fb5.php

@@ -1,4 +0,0 @@
-<?php
-require_once(BX_DIRECTORY_PATH_PLUGINS . "firephp/fb.php");
-define('FIREPHP_TABLE', FirePHP::TABLE);
-?>

modules/boonex/profiler/request.php

@@ -1,29 +1,20 @@
-<?
-/***************************************************************************
-*                            Dolphin Smart Community Builder
-*                              -------------------
-*     begin                : Mon Mar 23 2006
-*     copyright            : (C) 2007 BoonEx Group
-*     website              : http://www.boonex.com
-* This file is part of Dolphin - Smart Community Builder
-*
-* Dolphin is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the
-* License, or  any later version.
-*
-* Dolphin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-* without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-* See the GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License along with Dolphin,
-* see license.txt file; if not, write to marketing@boonex.com
-***************************************************************************/
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ *
+ * @defgroup    Profiler Profiler
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
 
-require_once(BX_DIRECTORY_PATH_INC . 'profiles.inc.php');
+require_once(BX_DIRECTORY_PATH_INC . 'design.inc.php');
 
 check_logged();
 
-require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDolRequest.php');
+bx_import('BxDolRequest');
+
 BxDolRequest::processAsAction($GLOBALS['aModule'], $GLOBALS['aRequest']);
 
-?>
+/** @} */

modules/boonex/russian/install/config.php

@@ -35,6 +35,11 @@ $aConfig = array(
     'db_prefix' => 'bx_rsn_',
     'class_prefix' => 'BxRsn',
 
+    /**
+     * Category for language keys.
+     */
+    'language_category' => 'BoonEx Russian',
+
     /**
      * Installation/Uninstallation Section.
      * NOTE. The sequence of actions is critical. Don't change the order. 
@@ -62,28 +67,6 @@ $aConfig = array(
      */
     'dependencies' => array(),
 
-    /**
-     * Category for language keys.
-     */
-    'language_category' => 'BoonEx Russian',
-
-    /**
-     * Permissions Section
-     */
-    'install_permissions' => array(),
-    'uninstall_permissions' => array(),
-    
-    /**
-     * Introduction and Conclusion Section.
-     */
-    'install_info' => array(
-        'introduction' => 'inst_intro.html',
-        'conclusion' => 'inst_concl.html'
-    ),
-    'uninstall_info' => array(
-        'introduction' => 'uninst_intro.html',
-        'conclusion' => 'uninst_concl.html'
-    )
 );
 
 /** @} */

modules/boonex/russian/install/info/inst_concl.html

@@ -1,2 +0,0 @@
-Congratulation!!!
-P.S. It's easy to install and easy to use. :)

modules/boonex/russian/install/info/inst_intro.html

@@ -1 +0,0 @@
-Follow the instructions carefully!!!

modules/boonex/russian/install/info/uninst_concl.html

@@ -1 +0,0 @@
-You don't like our template  :(

modules/boonex/russian/install/info/uninst_intro.html

@@ -1 +0,0 @@
-NO, NO, NO... Don't do it.

modules/boonex/russian/install/installer.php

@@ -1,28 +1,22 @@
-<?
-/***************************************************************************
-*                            Dolphin Smart Community Builder
-*                              -------------------
-*     begin                : Mon Mar 23 2006
-*     copyright            : (C) 2007 BoonEx Group
-*     website              : http://www.boonex.com
-* This file is part of Dolphin - Smart Community Builder
-*
-* Dolphin is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the
-* License, or  any later version.
-*
-* Dolphin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-* without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-* See the GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License along with Dolphin,
-* see license.txt file; if not, write to marketing@boonex.com
-***************************************************************************/
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * 
+ * @defgroup    Russian Russian language
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
 
 bx_import('BxDolStudioInstaller');
 
-class BxRsnInstaller extends BxDolStudioInstaller {
-    function BxRsnInstaller($aConfig) {
-        parent::BxDolStudioInstaller($aConfig);
+class BxRsnInstaller extends BxDolStudioInstaller 
+{
+    function __construct($aConfig) 
+    {
+        parent::__construct($aConfig);
     }
-}
+}
+
+/** @} */

modules/boonex/sites/classes/BxSitesAccount.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxSitesAccount
+class BxSitesAccount extends BxDol
 {
 	protected $_oModule;
 
@@ -17,8 +17,9 @@ class BxSitesAccount
 	protected $bLogEmail = true;
 	protected $bLogError = true;
 
-    function __construct(&$oModule)
+    function __construct($oModule)
     {
+        parent::__construct();
     	$this->_oModule = $oModule;
     }
 
@@ -251,3 +252,5 @@ class BxSitesAccount
 		$oLog->log($mixedValue);
 	}
 }
+
+/** @} */ 

modules/boonex/sites/classes/BxSitesGridBrowse.php

@@ -1,12 +1,13 @@
-<?php
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  *
- * @defgroup    DolphinStudio Dolphin Studio
+ * @defgroup    Sites Sites
+ * @ingroup     DolphinModules
+ *
  * @{
  */
-defined('BX_DOL') or die('hack attempt');
 
 require_once(BX_DIRECTORY_PATH_INC . 'design.inc.php');
 

modules/boonex/sites/classes/BxSitesGridOverview.php

@@ -1,12 +1,13 @@
-<?php
+<?php defined('BX_DOL') or die('hack attempt');
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  *
- * @defgroup    DolphinStudio Dolphin Studio
+ * @defgroup    Sites Sites
+ * @ingroup     DolphinModules
+ *
  * @{
  */
-defined('BX_DOL') or die('hack attempt');
 
 require_once(BX_DIRECTORY_PATH_INC . 'design.inc.php');
 

modules/boonex/sites/classes/BxSitesLog.php

@@ -1,11 +1,22 @@
-<?php
-class BxSitesLog
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ *
+ * @defgroup    Sites Sites
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
+
+class BxSitesLog extends BxDol
 {
 	protected $sPath;
 	protected $sLogDateFormat;
 
 	function __construct($sPath)
 	{
+        parent::__construct();
 		$this->sLogDateFormat = 'm.d.y H:i:s';
 		$this->sPath = $sPath;
 	}
@@ -31,4 +42,6 @@ class BxSitesLog
 
 		fclose($rHandle);
 	}
-}
+}
+
+/** @} */

modules/boonex/sites/classes/BxSitesMenuViewSite.php

@@ -3,7 +3,7 @@
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  *
- * @defgroup    Notes Notes
+ * @defgroup    Sites Sites
  * @ingroup     DolphinModules
  *
  * @{
@@ -11,9 +11,6 @@
 
 bx_import('BxTemplMenu');
 
-/**
- * 'View Note' menu.
- */
 class BxSitesMenuViewSite extends BxTemplMenu
 {
 	protected $_oModule;

modules/boonex/sites/classes/BxSitesModule.php

@@ -300,4 +300,4 @@ class BxSitesModule extends BxDolModule
     }
 }
 
-/** @} */ 
+/** @} */

modules/boonex/sites/classes/BxSitesPaypal.php

@@ -1,4 +1,14 @@
-<?php
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * 
+ * @defgroup    Sites Sites
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
+
 require_once(BX_SITES_PP_DIRECTORY_PATH_API . 'PPBootStrap.php');
 
 class BxSitesPaypal
@@ -520,3 +530,5 @@ class BxSitesPaypal
 		$oLog->log($mixedValue);
 	}
 }
+
+/** @} */

modules/boonex/sites/classes/BxSitesResponse.php

@@ -3,7 +3,7 @@
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  * 
- * @defgroup    Timeline Timeline
+ * @defgroup    Sites Sites
  * @ingroup     DolphinModules
  *
  * @{

modules/boonex/sites/classes/BxSitesTemplate.php

@@ -11,9 +11,6 @@
 
 bx_import('BxDolModuleTemplate');
 
-/*
- * Notes module representation.
- */
 class BxSitesTemplate extends BxDolModuleTemplate
 {
     /**

modules/boonex/sites/install/config.php

@@ -1,9 +1,9 @@
-<?php 
+<?php
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  * 
- * @defgroup    Notes Notes
+ * @defgroup    Sites Sites
  * @ingroup     DolphinModules
  *
  * @{
@@ -36,6 +36,11 @@ $aConfig = array(
     'db_prefix' => 'bx_sites_',
     'class_prefix' => 'BxSites',
 
+    /**
+     * Category for language keys.
+     */
+    'language_category' => 'Sites',
+
     /**
      * Installation/Uninstallation Section.
      */
@@ -69,23 +74,6 @@ $aConfig = array(
      */
     'dependencies' => array(
     ),
-
-    /**
-     * Category for language keys.
-     */
-    'language_category' => 'Sites',
-
-    /**
-     * Introduction and Conclusion Section.
-     */
-    'install_info' => array(
-        'introduction' => '',
-        'conclusion' => ''
-    ),
-    'uninstall_info' => array(
-        'introduction' => '',
-        'conclusion' => ''
-    )
 );
 
 /** @} */ 

modules/boonex/sites/request.php

@@ -3,7 +3,7 @@
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  * 
- * @defgroup    Notes Notes
+ * @defgroup    Sites Sites
  * @ingroup     DolphinModules
  *
  * @{
@@ -16,14 +16,6 @@ check_logged();
 bx_import('BxDolLanguages');
 bx_import('BxDolRequest');
 
-class BxSitesRequest extends BxDolRequest 
-{
-    function __construct() 
-    {
-        parent::__construct();
-    }
-}
-
-BxSitesRequest::processAsAction($GLOBALS['aModule'], $GLOBALS['aRequest']);
+BxDolRequest::processAsAction($GLOBALS['aModule'], $GLOBALS['aRequest']);
 
 /** @} */ 

modules/boonex/timeline/classes/BxTimelineDb.php

@@ -13,11 +13,11 @@ bx_import('BxDolModuleDb');
 
 class BxTimelineDb extends BxDolModuleDb
 {
-    var $_oConfig;
+    protected $_oConfig;
 
-    var $_sTable;
-    var $_sTableHandlers;
-    var $_sTablesShareTrack;
+    protected $_sTable;
+    protected $_sTableHandlers;
+    protected $_sTablesShareTrack;
 
     /*
      * Constructor.

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -37,17 +37,17 @@ define('BX_TIMELINE_PARSE_TYPE_DEFAULT', BX_TIMELINE_PARSE_TYPE_POST);
 
 class BxTimelineModule extends BxDolModule
 {
-    var $_iOwnerId;
-    var $_sJsPostObject;
-    var $_sJsViewObject;
-    var $_aPostElements;
-    var $_sJsOutlineObject;
-
-    var $_sDividerTemplate;
-    var $_sBalloonTemplate;
-    var $_sCmtPostTemplate;
-    var $_sCmtViewTemplate;
-    var $_sCmtTemplate;
+    protected $_iOwnerId;
+    protected $_sJsPostObject;
+    protected $_sJsViewObject;
+    protected $_aPostElements;
+    protected $_sJsOutlineObject;
+
+    protected $_sDividerTemplate;
+    protected $_sBalloonTemplate;
+    protected $_sCmtPostTemplate;
+    protected $_sCmtViewTemplate;
+    protected $_sCmtTemplate;
 
     /**
      * Constructor

modules/boonex/timeline/install/config.php

@@ -34,6 +34,11 @@ $aConfig = array(
     'db_prefix' => 'bx_timeline_',
     'class_prefix' => 'BxTimeline',
 
+    /**
+     * Category for language keys.
+     */
+    'language_category' => 'Timeline',
+
     /**
      * Installation/Uninstallation Section.
      */
@@ -67,28 +72,6 @@ $aConfig = array(
      */
     'dependencies' => array(),
 
-    /**
-     * Category for language keys.
-     */
-    'language_category' => 'Timeline',
-
-    /**
-     * Permissions Section
-     */
-    'install_permissions' => array(),
-    'uninstall_permissions' => array(),
-
-    /**
-     * Introduction and Conclusion Section.
-     */
-    'install_info' => array(
-        'introduction' => 'inst_intro.html',
-        'conclusion' => 'inst_concl.html'
-    ),
-    'uninstall_info' => array(
-        'introduction' => 'uninst_intro.html',
-        'conclusion' => 'uninst_concl.html'
-    )
 );
 
 /** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioConfig.php

@@ -1,11 +1,13 @@
-<?php defined('BX_DOL') or die('hack attempt');
+<?php
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  *
- * @defgroup    DolphinCore Dolphin Core
+ * @defgroup    DolphinView Dolphin Studio Representation classes
+ * @ingroup     DolphinStudio
  * @{
  */
+defined('BX_DOL') or die('hack attempt');
 
 bx_import('BxBaseStudioConfig');
 

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioDesign.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioDesign');
 
 class BxTemplStudioDesign extends BxBaseStudioDesign { 
-    function BxTemplStudioDesign($sTemplate = "", $sPage = "") {
-        parent::BxBaseStudioDesign($sTemplate, $sPage);
+    function __construct($sTemplate = "", $sPage = "") {
+        parent::__construct($sTemplate, $sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioDesigner.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioDesigner');
 
 class BxTemplStudioDesigner extends BxBaseStudioDesigner { 
-    function BxTemplStudioDesigner($sPage = '') {
-        parent::BxBaseStudioDesigner($sPage);
+    function __construct($sPage = '') {
+        parent::__construct($sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioDesigns.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioDesigns');
 
 class BxTemplStudioDesigns extends BxBaseStudioDesigns { 
-    function BxTemplStudioDesigns() {
-        parent::BxBaseStudioDesigns();
+    function __construct() {
+        parent::__construct();
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioForms.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioForms');
 
 class BxTemplStudioForms extends BxBaseStudioForms { 
-    function BxTemplStudioForms($sPage = '') {
-        parent::BxBaseStudioForms($sPage);
+    function __construct($sPage = '') {
+        parent::__construct($sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioLanguage.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioLanguage');
 
 class BxTemplStudioLanguage extends BxBaseStudioLanguage { 
-    function BxTemplStudioLanguage($sLanguage="", $sPage = "") {
-        parent::BxBaseStudioLanguage($sLanguage, $sPage);
+    function __construct($sLanguage="", $sPage = "") {
+        parent::__construct($sLanguage, $sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioLanguages.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioLanguages');
 
 class BxTemplStudioLanguages extends BxBaseStudioLanguages { 
-    function BxTemplStudioLanguages() {
-        parent::BxBaseStudioLanguages();
+    function __construct() {
+        parent::__construct();
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioLauncher.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioLauncher');
 
 class BxTemplStudioLauncher extends BxBaseStudioLauncher { 
-    function BxTemplStudioLauncher() {
-        parent::BxBaseStudioLauncher();
+    function __construct() {
+        parent::__construct();
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioMenuTop.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioMenuTop');
 
 class BxTemplStudioMenuTop extends BxBaseStudioMenuTop { 
-    function BxTemplStudioMenuTop() {
-        parent::BxBaseStudioMenuTop();
+    function __construct() {
+        parent::__construct();
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioModule.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioModule');
 
 class BxTemplStudioModule extends BxBaseStudioModule { 
-    function BxTemplStudioModule($sModule = "", $sPage = "") {
-        parent::BxBaseStudioModule($sModule, $sPage);
+    function __construct($sModule = "", $sPage = "") {
+        parent::__construct($sModule, $sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioModules.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioModules');
 
 class BxTemplStudioModules extends BxBaseStudioModules { 
-    function BxTemplStudioModules() {
-        parent::BxBaseStudioModules();
+    function __construct() {
+        parent::__construct();
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioNavigation.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioNavigation');
 
 class BxTemplStudioNavigation extends BxBaseStudioNavigation { 
-    function BxTemplStudioNavigation($sPage = '') {
-        parent::BxBaseStudioNavigation($sPage);
+    function __construct($sPage = '') {
+        parent::__construct($sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioPage.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioPage');
 
 class BxTemplStudioPage extends BxBaseStudioPage { 
-    function BxTemplStudioPage($mixedPageName) {
-        parent::BxBaseStudioPage($mixedPageName);
+    function __construct($mixedPageName) {
+        parent::__construct($mixedPageName);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioPermissions.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioPermissions');
 
 class BxTemplStudioPermissions extends BxBaseStudioPermissions { 
-    function BxTemplStudioPermissions($sPage = '') {
-        parent::BxBaseStudioPermissions($sPage);
+    function __construct($sPage = '') {
+        parent::__construct($sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioPolyglot.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioPolyglot');
 
 class BxTemplStudioPolyglot extends BxBaseStudioPolyglot { 
-    function BxTemplStudioPolyglot($sPage = '') {
-        parent::BxBaseStudioPolyglot($sPage);
+    function __construct($sPage = '') {
+        parent::__construct($sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioSettings.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioSettings');
 
 class BxTemplStudioSettings extends BxBaseStudioSettings { 
-    function BxTemplStudioSettings($sType = '', $sCategory = '') {
-        parent::BxBaseStudioSettings($sType, $sCategory);
+    function __construct($sType = '', $sCategory = '') {
+        parent::__construct($sType, $sCategory);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioStore.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioStore');
 
 class BxTemplStudioStore extends BxBaseStudioStore { 
-    function BxTemplStudioStore($sPage = "") {
-        parent::BxBaseStudioStore($sPage);
+    function __construct($sPage = "") {
+        parent::__construct($sPage);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/data/template/studio/scripts/BxTemplStudioWidgets.php

@@ -12,8 +12,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxBaseStudioWidgets');
 
 class BxTemplStudioWidgets extends BxBaseStudioWidgets { 
-    function BxTemplStudioWidgets($mixedPageName) {
-        parent::BxBaseStudioWidgets($mixedPageName);
+    function __construct($mixedPageName) {
+        parent::__construct($mixedPageName);
     }
 }
-/** @} */
+/** @} */

modules/boonex/uni/install/config.php

@@ -35,6 +35,11 @@ $aConfig = array(
     'db_prefix' => 'bx_uni_',
     'class_prefix' => 'BxUni',
 
+    /**
+     * Category for language keys.
+     */
+    'language_category' => 'BoonEx UNI',
+
     /**
      * Installation/Uninstallation Section.
      */
@@ -67,29 +72,6 @@ $aConfig = array(
      * Dependencies Section
      */
     'dependencies' => array(),
-
-    /**
-     * Category for language keys.
-     */
-    'language_category' => 'BoonEx UNI',
-
-    /**
-     * Permissions Section
-     */
-    'install_permissions' => array(),
-    'uninstall_permissions' => array(),
-
-    /**
-     * Introduction and Conclusion Section.
-     */
-    'install_info' => array(
-        'introduction' => 'inst_intro.html',
-        'conclusion' => 'inst_concl.html'
-    ),
-    'uninstall_info' => array(
-        'introduction' => 'uninst_intro.html',
-        'conclusion' => 'uninst_concl.html'
-    )
 );
 
 /** @} */

modules/boonex/uni/install/installer.php

@@ -1,28 +1,20 @@
-<?
-/***************************************************************************
-*                            Dolphin Smart Community Builder
-*                              -------------------
-*     begin                : Mon Mar 23 2006
-*     copyright            : (C) 2007 BoonEx Group
-*     website              : http://www.boonex.com
-* This file is part of Dolphin - Smart Community Builder
-*
-* Dolphin is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the
-* License, or  any later version.
-*
-* Dolphin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-* without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-* See the GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License along with Dolphin,
-* see license.txt file; if not, write to marketing@boonex.com
-***************************************************************************/
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
+ * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * 
+ * @defgroup    Uni Uni template
+ * @ingroup     DolphinModules
+ *
+ * @{
+ */
 
 bx_import('BxDolStudioInstaller');
 
 class BxUniInstaller extends BxDolStudioInstaller {
-    function BxBscInstaller($aConfig) {
-        parent::BxDolStudioInstaller($aConfig);
+    function __construct($aConfig) {
+        parent::__construct($aConfig);
     }
-}
+}
+
+/** @} */

plugins/firephp/fb.php

@@ -1,48 +1,43 @@
 <?php
+// Authors:
+// - cadorn, Christoph Dorn <christoph@christophdorn.com>, Copyright 2007, New BSD License
+// - qbbr, Sokolov Innokenty <sokolov.innokenty@gmail.com>, Copyright 2011, New BSD License
+// - cadorn, Christoph Dorn <christoph@christophdorn.com>, Copyright 2011, MIT License
 
-/* ***** BEGIN LICENSE BLOCK *****
+/**
+ * ***** BEGIN LICENSE BLOCK *****
  *  
- * This file is part of FirePHP (http://www.firephp.org/).
- * 
- * Software License Agreement (New BSD License)
- * 
- * Copyright (c) 2006-2010, Christoph Dorn
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- * 
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
+ * [MIT License](http://www.opensource.org/licenses/mit-license.php)
  * 
- *     * Neither the name of Christoph Dorn nor the names of its
- *       contributors may be used to endorse or promote products derived from this
- *       software without specific prior written permission.
+ * Copyright (c) 2007+ [Christoph Dorn](http://www.christophdorn.com/)
  * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  * 
  * ***** END LICENSE BLOCK *****
  * 
- * @copyright   Copyright (C) 2007-2009 Christoph Dorn
+ * @copyright   Copyright (C) 2007+ Christoph Dorn
  * @author      Christoph Dorn <christoph@christophdorn.com>
- * @license     http://www.opensource.org/licenses/bsd-license.php
+ * @license     [MIT License](http://www.opensource.org/licenses/mit-license.php)
  * @package     FirePHPCore
  */
 
-if(!class_exists('FirePHP')) {
+if (!class_exists('FirePHP', false)) {
     require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'FirePHP.class.php';
 }
 
@@ -61,23 +56,33 @@ function fb()
     $instance = FirePHP::getInstance(true);
   
     $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
+    return call_user_func_array(array($instance, 'fb'), $args);
 }
 
 
 class FB
 {
+    /**
+     * Set an Insight console to direct all logging calls to
+     * 
+     * @param object $console The console object to log to
+     * @return void
+     */
+    public static function setLogToInsightConsole($console)
+    {
+        FirePHP::getInstance(true)->setLogToInsightConsole($console);
+    }
+
     /**
      * Enable and disable logging to Firebug
      * 
      * @see FirePHP->setEnabled()
-     * @param boolean $Enabled TRUE to enable, FALSE to disable
+     * @param boolean $enabled TRUE to enable, FALSE to disable
      * @return void
      */
-    public static function setEnabled($Enabled)
+    public static function setEnabled($enabled)
     {
-        $instance = FirePHP::getInstance(true);
-        $instance->setEnabled($Enabled);
+        FirePHP::getInstance(true)->setEnabled($enabled);
     }
   
     /**
@@ -88,9 +93,8 @@ class FB
      */
     public static function getEnabled()
     {
-        $instance = FirePHP::getInstance(true);
-        return $instance->getEnabled();
-    }  
+        return FirePHP::getInstance(true)->getEnabled();
+    }
   
     /**
      * Specify a filter to be used when encoding an object
@@ -98,27 +102,25 @@ class FB
      * Filters are used to exclude object members.
      * 
      * @see FirePHP->setObjectFilter()
-     * @param string $Class The class name of the object
-     * @param array $Filter An array or members to exclude
+     * @param string $class The class name of the object
+     * @param array $filter An array or members to exclude
      * @return void
      */
-    public static function setObjectFilter($Class, $Filter)
+    public static function setObjectFilter($class, $filter)
     {
-      $instance = FirePHP::getInstance(true);
-      $instance->setObjectFilter($Class, $Filter);
+      FirePHP::getInstance(true)->setObjectFilter($class, $filter);
     }
   
     /**
      * Set some options for the library
      * 
      * @see FirePHP->setOptions()
-     * @param array $Options The options to be set
+     * @param array $options The options to be set
      * @return void
      */
-    public static function setOptions($Options)
+    public static function setOptions($options)
     {
-        $instance = FirePHP::getInstance(true);
-        $instance->setOptions($Options);
+        FirePHP::getInstance(true)->setOptions($options);
     }
 
     /**
@@ -129,23 +131,21 @@ class FB
      */
     public static function getOptions()
     {
-        $instance = FirePHP::getInstance(true);
-        return $instance->getOptions();
+        return FirePHP::getInstance(true)->getOptions();
     }
 
     /**
      * Log object to firebug
      * 
      * @see http://www.firephp.org/Wiki/Reference/Fb
-     * @param mixed $Object
+     * @param mixed $object
      * @return true
      * @throws Exception
      */
     public static function send()
     {
-        $instance = FirePHP::getInstance(true);
         $args = func_get_args();
-        return call_user_func_array(array($instance,'fb'),$args);
+        return call_user_func_array(array(FirePHP::getInstance(true), 'fb'), $args);
     }
 
     /**
@@ -155,14 +155,13 @@ class FB
      *   Collapsed: [true|false]
      *   Color:     [#RRGGBB|ColorName]
      *
-     * @param string $Name
-     * @param array $Options OPTIONAL Instructions on how to log the group
+     * @param string $name
+     * @param array $options OPTIONAL Instructions on how to log the group
      * @return true
      */
-    public static function group($Name, $Options=null)
+    public static function group($name, $options=null)
     {
-        $instance = FirePHP::getInstance(true);
-        return $instance->group($Name, $Options);
+        return FirePHP::getInstance(true)->group($name, $options);
     }
 
     /**
@@ -180,97 +179,97 @@ class FB
      * Log object with label to firebug console
      *
      * @see FirePHP::LOG
-     * @param mixes $Object
-     * @param string $Label
+     * @param mixes $object
+     * @param string $label
      * @return true
      * @throws Exception
      */
-    public static function log($Object, $Label=null)
+    public static function log($object, $label=null)
     {
-        return self::send($Object, $Label, FirePHP::LOG);
-    } 
+        return self::send($object, $label, FirePHP::LOG);
+    }
 
     /**
      * Log object with label to firebug console
      *
      * @see FirePHP::INFO
-     * @param mixes $Object
-     * @param string $Label
+     * @param mixes $object
+     * @param string $label
      * @return true
      * @throws Exception
      */
-    public static function info($Object, $Label=null)
+    public static function info($object, $label=null)
     {
-        return self::send($Object, $Label, FirePHP::INFO);
-    } 
+        return self::send($object, $label, FirePHP::INFO);
+    }
 
     /**
      * Log object with label to firebug console
      *
      * @see FirePHP::WARN
-     * @param mixes $Object
-     * @param string $Label
+     * @param mixes $object
+     * @param string $label
      * @return true
      * @throws Exception
      */
-    public static function warn($Object, $Label=null)
+    public static function warn($object, $label=null)
     {
-        return self::send($Object, $Label, FirePHP::WARN);
-    } 
+        return self::send($object, $label, FirePHP::WARN);
+    }
 
     /**
      * Log object with label to firebug console
      *
      * @see FirePHP::ERROR
-     * @param mixes $Object
-     * @param string $Label
+     * @param mixes $object
+     * @param string $label
      * @return true
      * @throws Exception
      */
-    public static function error($Object, $Label=null)
+    public static function error($object, $label=null)
     {
-        return self::send($Object, $Label, FirePHP::ERROR);
-    } 
+        return self::send($object, $label, FirePHP::ERROR);
+    }
 
     /**
      * Dumps key and variable to firebug server panel
      *
      * @see FirePHP::DUMP
-     * @param string $Key
-     * @param mixed $Variable
+     * @param string $key
+     * @param mixed $variable
      * @return true
      * @throws Exception
      */
-    public static function dump($Key, $Variable)
+    public static function dump($key, $variable)
     {
-        return self::send($Variable, $Key, FirePHP::DUMP);
-    } 
+        return self::send($variable, $key, FirePHP::DUMP);
+    }
 
     /**
      * Log a trace in the firebug console
      *
      * @see FirePHP::TRACE
-     * @param string $Label
+     * @param string $label
      * @return true
      * @throws Exception
      */
-    public static function trace($Label)
+    public static function trace($label)
     {
-        return self::send($Label, FirePHP::TRACE);
-    } 
+        return self::send($label, FirePHP::TRACE);
+    }
 
     /**
      * Log a table in the firebug console
      *
      * @see FirePHP::TABLE
-     * @param string $Label
-     * @param string $Table
+     * @param string $label
+     * @param string $table
      * @return true
      * @throws Exception
      */
-    public static function table($Label, $Table)
+    public static function table($label, $table)
     {
-        return self::send($Table, $Label, FirePHP::TABLE);
-    } 
+        return self::send($table, $label, FirePHP::TABLE);
+    }
 
 }

studio/classes/BxDolStudioBuilderPage.php

@@ -30,7 +30,7 @@ class BxDolStudioBuilderPage extends BxTemplStudioPage {
     protected $aPageRebuild;
 
     function __construct($sType = '', $sPage = '') {
-        parent::BxTemplStudioPage('builder_pages');
+        parent::__construct('builder_pages');
 
         $this->oDb = new BxDolStudioBuilderPageQuery();
 

studio/classes/BxDolStudioDashboard.php

@@ -13,7 +13,7 @@ bx_import('BxDolStudioStoreQuery');
 
 class BxDolStudioDashboard extends BxTemplStudioPage {
 	function __construct() {
-        parent::BxTemplStudioPage('dashboard');
+        parent::__construct('dashboard');
 
 		//--- Check actions ---//
         if(($sAction = bx_get('dbd_action')) !== false) {
@@ -100,4 +100,4 @@ class BxDolStudioDashboard extends BxTemplStudioPage {
 		return $iTotalSize;
 	}
 }
-/** @} */
+/** @} */

studio/classes/BxDolStudioDesign.php

@@ -21,8 +21,8 @@ class BxDolStudioDesign extends BxTemplStudioPage {
 	protected $aTemplate;
 	protected $sPage;
 
-    function BxDolStudioDesign($sTemplate = "", $sPage = "") {
-        parent::BxTemplStudioPage($sTemplate);
+    function __construct($sTemplate = "", $sPage = "") {
+        parent::__construct($sTemplate);
 
         $this->oDb = new BxDolStudioDesignsQuery();
 
@@ -107,4 +107,4 @@ class BxDolStudioDesign extends BxTemplStudioPage {
         return $aResult;
     }
 }
-/** @} */
+/** @} */

studio/classes/BxDolStudioDesigner.php

@@ -21,8 +21,8 @@ define('BX_DOL_STUDIO_DSG_TYPE_DEFAULT', 'general');
 class BxDolStudioDesigner extends BxTemplStudioPage {
     protected $sPage;
 
-    function BxDolStudioDesigner($sPage = "") {
-        parent::BxTemplStudioPage('designer');
+    function __construct($sPage = "") {
+        parent::__construct('designer');
 
         $this->oDb = new BxDolStudioDesignerQuery();
 

studio/classes/BxDolStudioDesigns.php

@@ -14,8 +14,8 @@ bx_import('BxDolStudioTemplate');
 bx_import('BxDolStudioDesignsQuery');
 
 class BxDolStudioDesigns extends BxTemplStudioModules {
-    function BxDolStudioDesigns() {
-        parent::BxTemplStudioModules();
+    function __construct() {
+        parent::__construct();
 
         $this->oDb = new BxDolStudioDesignsQuery();
 
@@ -25,4 +25,4 @@ class BxDolStudioDesigns extends BxTemplStudioModules {
         $this->sParamPrefix = 'dsn';
     }
 }
-/** @} */
+/** @} */

studio/classes/BxDolStudioForms.php

@@ -22,8 +22,8 @@ define('BX_DOL_STUDIO_FORM_TYPE_DEFAULT', BX_DOL_STUDIO_FORM_TYPE_FORMS);
 class BxDolStudioForms extends BxTemplStudioPage {
     protected $sPage;
 
-    function BxDolStudioForms($sPage = "") {
-        parent::BxTemplStudioPage('builder_forms');
+    function __construct($sPage = "") {
+        parent::__construct('builder_forms');
 
         $this->oDb = new BxDolStudioFormsQuery();
 

studio/classes/BxDolStudioInstaller.php

@@ -35,19 +35,19 @@ define("BX_DOL_STUDIO_INSTALLER_FAILED", 1);
  *
  */
 class BxDolStudioInstaller extends BxDolInstallerUtils {
-	var $oDb;
+	protected $oDb;
 
-    var $_aConfig;
-    var $_sBasePath;
-    var $_sHomePath;
-    var $_sModulePath;
+    protected $_aConfig;
+    protected $_sBasePath;
+    protected $_sHomePath;
+    protected $_sModulePath;
 
-    var $_aActions;
-    var $_aNonHashable;
+    protected $_aActions;
+    protected $_aNonHashable;
 
-    var $_bShowOnSuccess = false;
+    protected $_bShowOnSuccess = false;
 
-    function BxDolStudioInstaller($aConfig) {
+    function __construct($aConfig) {
         parent::__construct();
 
         $this->oDb = new BxDolStudioInstallerQuery();

studio/classes/BxDolStudioInstallerUtils.php

@@ -1,4 +1,4 @@
-<?php defined('BX_DOL') or die('hack attempt');
+<?php
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -6,11 +6,12 @@
  * @defgroup    DolphinStudio Dolphin Studio
  * @{
  */
+defined('BX_DOL') or die('hack attempt');
 
 bx_import('BxDolInstallerUtils');
 
 class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSingleton {
-    public function BxDolStudioInstallerUtils() {
+    public function __construct() {
         if (isset($GLOBALS['bxDolClasses'][get_class($this)]))
             trigger_error ('Multiple instances are not allowed for the class: ' . get_class($this), E_USER_ERROR);
 

studio/classes/BxDolStudioJson.php

@@ -1,4 +1,4 @@
-<?php defined('BX_DOL') or die('hack attempt');
+<?php
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -6,6 +6,7 @@
  * @defgroup    DolphinStudio Dolphin Studio
  * @{
  */
+defined('BX_DOL') or die('hack attempt');
 
 class BxDolStudioJson extends BxDol implements iBxDolSingleton {
     public function __construct() {

studio/classes/BxDolStudioLanguage.php

@@ -20,8 +20,8 @@ class BxDolStudioLanguage extends BxTemplStudioPage {
 	protected $sLanguage;
 	protected $aLanguage;
 
-    function BxDolStudioLanguage($sLanguage, $sPage) {
-        parent::BxTemplStudioPage($sLanguage);
+    function __construct($sLanguage, $sPage) {
+        parent::__construct($sLanguage);
 
         $this->oDb = new BxDolStudioLanguagesQuery();
 
@@ -106,4 +106,4 @@ class BxDolStudioLanguage extends BxTemplStudioPage {
         return $aResult;
     }
 }
-/** @} */
+/** @} */

studio/classes/BxDolStudioLanguages.php

@@ -14,8 +14,8 @@ bx_import('BxDolStudioTemplate');
 bx_import('BxDolStudioLanguagesQuery');
 
 class BxDolStudioLanguages extends BxTemplStudioModules {
-    function BxDolStudioLanguages() {
-        parent::BxTemplStudioModules();
+    function __construct() {
+        parent::__construct();
 
         $this->oDb = new BxDolStudioLanguagesQuery();
 
@@ -25,4 +25,4 @@ class BxDolStudioLanguages extends BxTemplStudioModules {
         $this->sParamPrefix = 'lang';
     }
 }
-/** @} */
+/** @} */

studio/classes/BxDolStudioLanguagesQuery.php

@@ -11,8 +11,8 @@ defined('BX_DOL') or die('hack attempt');
 bx_import('BxDolStudioPolyglotQuery');
 
 class BxDolStudioLanguagesQuery extends BxDolStudioPolyglotQuery {
-    function BxDolStudioLanguagesQuery() {
-        parent::BxDolStudioPolyglotQuery();
+    function __construct() {
+        parent::__construct();
     }
 }
-/** @} */
+/** @} */

studio/classes/BxDolStudioLanguagesUtils.php

@@ -1,4 +1,4 @@
-<?php defined('BX_DOL') or die('hack attempt');
+<?php
 /**
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
@@ -6,6 +6,7 @@
  * @defgroup    DolphinStudio Dolphin Studio
  * @{
  */
+defined('BX_DOL') or die('hack attempt');
 
 bx_import('BxDolLanguages');
 bx_import('BxDolXmlParser');

studio/classes/BxDolStudioLauncher.php

@@ -17,8 +17,8 @@ bx_import('BxTemplStudioModules');
 class BxDolStudioLauncher extends BxTemplStudioWidgets {
     protected $aIncludes;
 
-    function BxDolStudioLauncher() {
-        parent::BxTemplStudioWidgets(BX_DOL_STUDIO_PAGE_HOME);
+    function __construct() {
+        parent::__construct(BX_DOL_STUDIO_PAGE_HOME);
 
         $aClasses = array( 
         	'BxTemplStudioModules',
@@ -59,4 +59,4 @@ class BxDolStudioLauncher extends BxTemplStudioWidgets {
         return (int)$aModule['enabled'] == 1;
     }
 }
-/** @} */
+/** @} */

studio/classes/BxDolStudioModule.php

@@ -18,8 +18,8 @@ class BxDolStudioModule extends BxTemplStudioPage {
     protected $aModule;
     protected $sPage;
 
-    function BxDolStudioModule($sModule = "", $sPage = "") {
-        parent::BxTemplStudioPage($sModule);
+    function __construct($sModule = "", $sPage = "") {
+        parent::__construct($sModule);
 
         $this->oDb = new BxDolStudioModulesQuery();
 
@@ -94,4 +94,4 @@ class BxDolStudioModule extends BxTemplStudioPage {
         return $aResult;
     }    
 }
-/** @} */
+/** @} */