#2 - PHP 5.4 compatibility issues.

inc/classes/BxDolFile.php

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

inc/classes/BxDolForm.php

@@ -801,7 +801,7 @@ class BxDolForm extends BxDol {
      * @param $sUseValues use default(BX_DATA_VALUES_DEFAULT) or additional(BX_DATA_VALUES_ADDITIONAL) value titles, if additinal value title is missing default title is used
      * @return data items array
      */
-    static public function getDataItems($sKey, $isUseForSet = false, $sUseValues = BX_DATA_VALUES_DEFAULT) {
+    public static function getDataItems($sKey, $isUseForSet = false, $sUseValues = BX_DATA_VALUES_DEFAULT) {
         bx_import('BxDolFormQuery');
         return BxDolFormQuery::getDataItems($sKey, $isUseForSet, $sUseValues);
     }
@@ -939,7 +939,7 @@ class BxDolForm extends BxDol {
     }
 
     // Static Methods related to CSRF Tocken
-    function genCsrfToken($bReturn = false) {
+	public static function genCsrfToken($bReturn = false) {
         $oDb = BxDolDb::getInstance();
         if ($oDb->getParam('sys_security_form_token_enable') != 'on')
             return false;

inc/classes/BxDolGrid.php

@@ -267,7 +267,7 @@ class BxDolGrid extends BxDol implements iBxDolFactoryObject {
      * @param $sObject object name
      * @return object instance or false on error
      */
-    static public function getObjectInstance($sObject) {
+    public static function getObjectInstance($sObject) {
 
         if (isset($GLOBALS['bxDolClasses']['BxDolGrid!'.$sObject]))
             return $GLOBALS['bxDolClasses']['BxDolGrid!'.$sObject];

inc/classes/BxDolIO.php

@@ -12,7 +12,7 @@ class BxDolIO extends BxDol {
         parent::BxDol();
     }
 
-    function isExecutable($sFile) {
+    public static function isExecutable($sFile) {
         clearstatcache();
 
         $aPathInfo = pathinfo(__FILE__);
@@ -21,7 +21,7 @@ class BxDolIO extends BxDol {
         return (is_file($sFile) && is_executable($sFile));
     }
 
-    function isWritable($sFile, $sPrePath = '/../../') {
+    public static function isWritable($sFile, $sPrePath = '/../../') {
         clearstatcache();
 
         $aPathInfo = pathinfo(__FILE__);
@@ -30,7 +30,7 @@ class BxDolIO extends BxDol {
         return is_readable($sFile) && is_writable($sFile);
     }
 
-    function getPermissions($sFileName) {
+    public static function getPermissions($sFileName) {
         $sPath = isset($GLOBALS['logged']['admin']) && $GLOBALS['logged']['admin'] ? BX_DIRECTORY_PATH_ROOT : '../';
 
         clearstatcache();

inc/classes/BxDolImageTranscoder.php

@@ -102,7 +102,7 @@ class BxDolImageTranscoder extends BxDol implements iBxDolFactoryObject {
      * @param $sObject - name of trancode object.
      * @return false on error or instance of BxDolImageTranscoder class.
      */
-    static public function getObjectInstance($sObject) {
+    public static function getObjectInstance($sObject) {
 
         if (isset($GLOBALS['bxDolClasses']['BxDolImageTranscoder!'.$sObject]))
             return $GLOBALS['bxDolClasses']['BxDolImageTranscoder!'.$sObject];

inc/classes/BxDolInformer.php

@@ -61,7 +61,7 @@ class BxDolInformer extends BxDol {
      * Get Informer object instance 
      * @return object instance or false on error
      */
-    static public function getInstance($oTemplate = false) {
+    public static function getInstance($oTemplate = false) {
         if (isset($GLOBALS['bxDolClasses']['BxDolInformer']))
             return $GLOBALS['bxDolClasses']['BxDolInformer'];
     

inc/classes/BxDolPermalinks.php

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

inc/classes/BxDolStorage.php

@@ -220,7 +220,7 @@ abstract class BxDolStorage extends BxDol implements iBxDolFactoryObject {
      * @param $sObject object name
      * @return object instance or false on error
      */
-    static public function getObjectInstance($sObject) {
+    public static function getObjectInstance($sObject) {
 
         if (isset($GLOBALS['bxDolClasses']['BxDolStorage!'.$sObject]))
             return $GLOBALS['bxDolClasses']['BxDolStorage!'.$sObject];
@@ -244,7 +244,7 @@ abstract class BxDolStorage extends BxDol implements iBxDolFactoryObject {
      * It is alutomatically called upin cron execution, usually once in a day.
      * @return number of deleted records
      */
-    static public function pruning() {
+    public static function pruning() {
         $iDeleted = 0;
         $a = BxDolStorageQuery::getStorageObjects();
         foreach ($a as $aObject) {

inc/classes/BxDolTemplate.php

@@ -956,7 +956,7 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton {
                 $sRet = ($sTemplAdd = BxTemplFunctions::getInstance()->TemplPageAddComponent($sKey)) !== false ? $sTemplAdd : $aKeyWrappers['left'] . $sKey . $aKeyWrappers['right'];
             }
 
-        $sRet = BxDolTemplate::processInjection(isset($this->aPage['name_index']) ? (int)$this->aPage['name_index'] : 0, $sKey, $sRet);
+        $sRet = $this->processInjection(isset($this->aPage['name_index']) ? (int)$this->aPage['name_index'] : 0, $sKey, $sRet);
         return $sRet;
     }
     /**
@@ -1222,13 +1222,13 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton {
     }
 
     /**
-     * Private callback function for CSS compiler.
+     * Static callback function for CSS compiler.
      *
      * @param string $sPath CSS file absolute path.
      * @param array $aMatches matched parts of image's URL.
      * @return string converted image's URL.
      */
-    function _callbackParseUrl($sPath, $aMatches) {
+    public static function _callbackParseUrl($sPath, $aMatches) {
         $sFile = basename($aMatches[1]);
         $sDirectory = dirname($aMatches[1]);
 

inc/classes/BxDolXmlParser.php

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

studio/classes/BxDolStudioCart.php

@@ -25,7 +25,7 @@ class BxDolStudioCart extends BxDol implements iBxDolSingleton {
             trigger_error('Clone is not allowed for the class: ' . get_class($this), E_USER_ERROR);
     }
 
-	static function getInstance() {
+	public static function getInstance() {
         if (!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
         	$sClass = __CLASS__;
             $GLOBALS['bxDolClasses'][__CLASS__] = new $sClass();
@@ -40,7 +40,7 @@ class BxDolStudioCart extends BxDol implements iBxDolSingleton {
      * @param string/array $mixed - string with cart items divided with (:) or an array of cart items.
      * @return array with items.
      */
-    static function items2array($mixed) {
+    public static function items2array($mixed) {
         $aResult = array();
         if(empty($mixed))
         	return $aResult;

studio/classes/BxDolStudioInstallerUtils.php

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

studio/classes/BxDolStudioIpBlockList.php

@@ -126,7 +126,7 @@ EOF;
 
         $sRows = '';
         $aIPsList = BxDolDb::getInstance()->getALl("SELECT *, FROM_UNIXTIME(`LastDT`) AS `LastDT_U` FROM `sys_ip_list` ORDER BY `From` ASC");
-        while ($aIPsList as $aIPList) {
+        foreach ($aIPsList as $aIPList) {
             $iID = (int)$aIPList['ID'];
             $sFrom = long2ip($aIPList['From']);
 

studio/classes/BxDolStudioJson.php

@@ -20,7 +20,7 @@ class BxDolStudioJson extends BxDol implements iBxDolSingleton {
             trigger_error('Clone is not allowed for the class: ' . get_class($this), E_USER_ERROR);
     }
 
-	static function getInstance() {
+	public static function getInstance() {
         if (!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolStudioJson();
         }

studio/classes/BxDolStudioLanguagesUtils.php

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

studio/classes/BxDolStudioOAuth.php

@@ -37,7 +37,7 @@ class BxDolStudioOAuth extends BxDol implements iBxDolSingleton {
             trigger_error('Clone is not allowed for the class: ' . get_class($this), E_USER_ERROR);
     }
 
-	static function getInstance() {
+	public static function getInstance() {
         if (!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
         	$sClass = __CLASS__;
             $GLOBALS['bxDolClasses'][__CLASS__] = new $sClass();

studio/classes/BxDolStudioTemplate.php

@@ -151,7 +151,7 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton {
                 break;
             }
 
-        $sRet = BxDolTemplate::processInjection($this->getPageNameIndex(), $sKey, $sRet);
+        $sRet = $this->processInjection($this->getPageNameIndex(), $sKey, $sRet);
         return $sRet;
     }
 

studio/classes/BxDolStudioTools.php

@@ -278,11 +278,11 @@ EOF;
             $sAwaitedPerm = ($iCurType==1) ? $sWritableC : $sWritableC;
 
             $sElemCntStyle = ($i%2==0) ? 'even' : 'odd' ;
-            $bAccessible = ($iCurType==1) ? $this->isWritable($sCurElement) : $this->isWritable($sCurElement);
+            $bAccessible = ($iCurType==1) ? self::isWritable($sCurElement) : self::isWritable($sCurElement);
 
             if ($sCurElement == 'flash/modules/global/app/ffmpeg.exe') {
                 $sAwaitedPerm = $sExecutableC;
-                $bAccessible = $this->isExecutable($sCurElement);
+                $bAccessible = self::isExecutable($sCurElement);
             }
 
             if ($bAccessible) {
@@ -304,7 +304,7 @@ EOF;
 </tr>
 EOF;
             } else {
-                $sPerm = $this->getPermissions($sCurElement);
+                $sPerm = self::getPermissions($sCurElement);
                 $sResultPerm = '';
                 if ($sPerm==false) {
                     $sResultPerm = $sNotExistsC;

studio/template/scripts/BxBaseStudioPolyglotEtemplates.php

@@ -147,8 +147,8 @@ class BxBaseStudioPolyglotEtemplates extends BxDolStudioPolyglotEtemplates {
             $this->_echoResultJson($aRes, true);
         }
         else {
-            bx_import('BxTemplFunctions');
-            $sContent = BxTemplFunctions::getInstance()->popupBox('adm-pgt-etemplate-edit-popup', _t('_adm_pgt_txt_etemplates_edit_popup', _t($aEtemplate['name_system'])), $this->_oTemplate->parseHtmlByName('pgt_new_etemplate.html', array(
+            bx_import('BxTemplStudioFunctions');
+            $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-pgt-etemplate-edit-popup', _t('_adm_pgt_txt_etemplates_edit_popup', _t($aEtemplate['name_system'])), $this->_oTemplate->parseHtmlByName('pgt_new_etemplate.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
                 'object' => $this->_sObject,

studio/template/scripts/BxBaseStudioPolyglotKeys.php

@@ -121,8 +121,8 @@ class BxBaseStudioPolyglotKeys extends BxDolStudioPolyglotKeys {
             $this->_echoResultJson($aRes, true);
         }
         else {
-            bx_import('BxTemplFunctions');
-            $sContent = BxTemplFunctions::getInstance()->popupBox('adm-lang-new-key-popup', _t('_adm_pgt_txt_nkp_add_popup'), $this->_oTemplate->parseHtmlByName('pgt_new_key.html', array(
+            bx_import('BxTemplStudioFunctions');
+            $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-lang-new-key-popup', _t('_adm_pgt_txt_nkp_add_popup'), $this->_oTemplate->parseHtmlByName('pgt_new_key.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
                 'object' => $this->_sObject,
@@ -238,8 +238,8 @@ class BxBaseStudioPolyglotKeys extends BxDolStudioPolyglotKeys {
             $this->_echoResultJson($aRes, true);
         }
         else {
-            bx_import('BxTemplFunctions');
-            $sContent = BxTemplFunctions::getInstance()->popupBox('adm-lang-edit-key-popup', _t('_adm_pgt_txt_nkp_edit_popup', $aKey['key']), $this->_oTemplate->parseHtmlByName('pgt_new_key.html', array(
+            bx_import('BxTemplStudioFunctions');
+            $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-lang-edit-key-popup', _t('_adm_pgt_txt_nkp_edit_popup', $aKey['key']), $this->_oTemplate->parseHtmlByName('pgt_new_key.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(true),
                 'object' => $this->_sObject,