#2 - PHP 5.4 compatibility issues

inc/classes/BxDolCmts.php

@@ -226,7 +226,7 @@ class BxDolCmts extends BxDol
      * @param $iInit perform initialization
      * @return null on error, or ready to use class instance
      */ 
-    static function getObjectInstance($sSys, $iId, $iInit = true) 
+    public static function getObjectInstance($sSys, $iId, $iInit = true) 
     {
     	if(isset($GLOBALS['bxDolClasses']['BxDolCmts!' . $sSys . $iId]))
             return $GLOBALS['bxDolClasses']['BxDolCmts!' . $sSys . $iId];
@@ -249,7 +249,7 @@ class BxDolCmts extends BxDol
         return ($GLOBALS['bxDolClasses']['BxDolCmts!' . $sSys . $iId] = $o);
     }
 
-    function &getSystems ()
+    public static function &getSystems ()
     {
         if (!isset($GLOBALS['bx_dol_cmts_systems'])) {
             $GLOBALS['bx_dol_cmts_systems'] = BxDolDb::getInstance()->fromCache('sys_objects_cmts', 'getAllWithKey', '

inc/classes/BxDolPrivacy.php

@@ -80,7 +80,7 @@ class BxDolPrivacy 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']['BxDolPrivacy!' . $sObject]))
             return $GLOBALS['bxDolClasses']['BxDolPrivacy!' . $sObject];
@@ -113,7 +113,7 @@ class BxDolPrivacy extends BxDol implements iBxDolFactoryObject
      * @param  array $aParams an array of custom selector's params (dynamic_groups - an array of arrays('key' => group_id, 'value' => group_title), title - the title to be used for generated field).
      * @return an array with Select element description.
      */
-    static public function getGroupChooser($sModule, $sAction, $iOwnerId = 0, $aParams = array())
+    public static function getGroupChooser($sModule, $sAction, $iOwnerId = 0, $aParams = array())
     {
         if(empty($sModule) || empty($sAction))
             return array();
@@ -169,7 +169,7 @@ class BxDolPrivacy extends BxDol implements iBxDolFactoryObject
      * @param  string $sAction action name.
      * @return string with field name.
      */
-    static public function getFieldName($sAction)
+    public static function getFieldName($sAction)
     {
         return 'allow_' . strtolower(str_replace(' ', '-', $sAction)) . '_to';
     }

studio/classes/BxDolStudioFormsFields.php

@@ -45,7 +45,7 @@ class BxDolStudioFormsFields extends BxTemplStudioGrid {
         if(empty($this->sObject) || empty($this->sDisplay))
             return array();
 
-        $this->oDb->checkFieldsInDisplays($this->sObject, $this->sDisplay);
+        $this->oDb->checkInputsInDisplays($this->sObject, $this->sDisplay);
 
         $this->_aOptions['source'] = $this->oDb->prepare($this->_aOptions['source'], $this->sObject, $this->sDisplay);
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);

studio/classes/BxDolStudioFormsQuery.php

@@ -147,12 +147,12 @@ class BxDolStudioFormsQuery extends BxDolDb {
         return (int)$this->getOne("SELECT FOUND_ROWS()");
     }
 
-    function isField($sObject, $sName) {
+    function isInput($sObject, $sName) {
         $sSql = $this->prepare("SELECT `id` FROM `sys_form_inputs` WHERE `object`=? AND `name`=? LIMIT 1", $sObject, $sName);
         return (int)$this->getOne($sSql) > 0;
     }
 
-    function getFields($aParams, &$aItems, $bReturnCount = true) {
+    function getInputs($aParams, &$aItems, $bReturnCount = true) {
         $aMethod = array('name' => 'getAll', 'params' => array(0 => 'query'));
         $sSelectClause = $sFromClause = $sJoinClause = $sWhereClause = $sGroupClause = $sOrderClause = $sLimitClause = "";
 
@@ -237,7 +237,7 @@ class BxDolStudioFormsQuery extends BxDolDb {
         return (int)$this->getOne("SELECT FOUND_ROWS()");
     }
 
-    function deleteFieds($aParams) {
+    function deleteInputs($aParams) {
         $sWhereClause = $sLimitClause = "";
 
         switch($aParams['type']) {
@@ -257,7 +257,7 @@ class BxDolStudioFormsQuery extends BxDolDb {
         return (int)$this->query($sSql) > 0;
     }
 
-    function checkFieldsInDisplays($sObject, $sDisplayName) {
+    function checkInputsInDisplays($sObject, $sDisplayName) {
         $aDisplay = array();
         $this->getDisplays(array('type' => 'by_object_display', 'object' => $sObject, 'display' => $sDisplayName), $aDisplay, false);
         if(empty($aDisplay) || !is_array($aDisplay))
@@ -267,7 +267,7 @@ class BxDolStudioFormsQuery extends BxDolDb {
         return (int)$this->query($sSql) > 0;
     }
 
-    function getFieldOrderMax($sDisplayName) {
+    function getInputOrderMax($sDisplayName) {
         $sSql = $this->prepare("SELECT MAX(`order`) FROM `sys_form_display_inputs` WHERE `display_name`=? LIMIT 1", $sDisplayName);
         return (int)$this->getOne($sSql);
     }

studio/template/scripts/BxBaseStudioFormsDisplays.php

@@ -197,7 +197,7 @@ class BxBaseStudioFormsDisplays extends BxDolStudioFormsDisplays {
 
     protected function _getCellFields ($mixedValue, $sKey, $aField, $aRow) {
         $aFields = array();
-        $this->oDb->getFields(array('type' => 'by_object_display', 'object' => $aRow['object'], 'display' => $aRow['display_name']), $aFields, false);
+        $this->oDb->getInputs(array('type' => 'by_object_display', 'object' => $aRow['object'], 'display' => $aRow['display_name']), $aFields, false);
 
         $mixedValue = $this->_oTemplate->parseHtmlByName('bx_a.html', array(
             'href' => sprintf($this->sUrlViewFields, $aRow['module'], $aRow['object'], $aRow['display_name']),

studio/template/scripts/BxBaseStudioFormsField.php

@@ -413,7 +413,7 @@ class BxBaseStudioFormsField extends BxDolStudioFormsField {
 
         $sName = get_mb_replace('/([^\d^\w^\s]+)/u', '', $mixedCaption);
         $sName = $this->getSystemName(trim($sName));
-        if($this->oDb->isField($sObject, $sName))
+        if($this->oDb->isInput($sObject, $sName))
             $sName = $this->genFieldName($sObject, $sName);
 
         return $sName;
@@ -608,7 +608,7 @@ class BxBaseStudioFormsField extends BxDolStudioFormsField {
 
     protected function genFieldName($sObject, $sPrefix = 'field') {
         $aFields = array();
-        $this->oDb->getFields(array('type' => 'by_object_name_filter', 'object' => $sObject, 'name_filter' => $sPrefix . '%'), $aFields, false);
+        $this->oDb->getInputs(array('type' => 'by_object_name_filter', 'object' => $sObject, 'name_filter' => $sPrefix . '%'), $aFields, false);
 
         for($iIndex = 1; true; $iIndex++)
             if(!in_array($sPrefix . $iIndex, $aFields))

studio/template/scripts/BxBaseStudioFormsFields.php

@@ -70,7 +70,7 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields {
         $iId = $aIds[0];
 
         $aField = array();
-        $this->oDb->getFields(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
+        $this->oDb->getInputs(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
         if(empty($aField) || !is_array($aField)) {
             $this->_echoResultJson(array());
             exit;
@@ -109,7 +109,7 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields {
         $aIdsAffected = array ();
         foreach($aIds as $iId) {
             $aField = array();
-            $this->oDb->getFields(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
+            $this->oDb->getInputs(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
             if(empty($aField) || !is_array($aField))
                 continue;
 
@@ -119,7 +119,7 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields {
             $sClass = $this->sClass . $this->getClassName($aField['type']);
             $oClass = new $sClass(array('module' => $this->sModule, 'object' => $this->sObject, 'display' => $this->sDisplay));
 
-            if((int)$this->_delete($iId) <= 0 || !$this->oDb->deleteFieds(array('type' => 'by_id', 'value' => $aField['id'], 'object' => $aField['object'], 'name' => $aField['name'])))
+            if((int)$this->_delete($iId) <= 0 || !$this->oDb->deleteInputs(array('type' => 'by_id', 'value' => $aField['id'], 'object' => $aField['object'], 'name' => $aField['name'])))
                 continue;
 
             $oClass->alterRemove($aField['name']);
@@ -157,7 +157,7 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields {
         $iId = $aIds[0];
                 
         $aField = array();
-        $this->oDb->getFields(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
+        $this->oDb->getInputs(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
         if(empty($aField) || !is_array($aField)) {
             $this->_echoResultJson(array());
             exit;
@@ -300,7 +300,7 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields {
 
         if(!empty($aDisplays)) {
             $aDisplaysGrouped = $aCounter = array();
-            $this->oDb->getFields(array('type' => 'counter_by_displays'), $aCounter, false);
+            $this->oDb->getInputs(array('type' => 'counter_by_displays'), $aCounter, false);
     
             foreach($aDisplays as $aDisplay)
                 $aDisplaysGrouped[_t($aDisplay['form_title'])][] = $aDisplay;
@@ -428,7 +428,7 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields {
         );
 
         $aCounter = array();
-        $this->oDb->getFields(array('type' => 'counter_by_modules'), $aCounter, false);
+        $this->oDb->getInputs(array('type' => 'counter_by_modules'), $aCounter, false);
         foreach($aInputModules['values'] as $sKey => $sValue)
                 $aInputModules['values'][$sKey] = $aInputModules['values'][$sKey] . " (" . (isset($aCounter[$sKey]) ? $aCounter[$sKey] : "0") . ")";
 

studio/template/scripts/BxBaseStudioStore.php

@@ -63,7 +63,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
     }
 
     function getPageCode($bHidden = false) {
-        $sMethod = 'get' . ucfirst($this->sPage);
+        $sMethod = 'get' . ucfirst($this->sPage) . 'List';
         if(!method_exists($this, $sMethod))
             return '';
 
@@ -71,14 +71,14 @@ class BxBaseStudioStore extends BxDolStudioStore {
     }
 
 	function getPageContent() {
-        $sMethod = 'get' . ucfirst($this->sPage);
+        $sMethod = 'get' . ucfirst($this->sPage) . 'List';
         if(!method_exists($this, $sMethod))
             return '';
 
         return $this->$sMethod(false);
     }
 
-    protected function getGoodies() {
+    protected function getGoodiesList() {
         $sJsObject = $this->getPageJsObject();
         $oTemplate = BxDolStudioTemplate::getInstance();
 
@@ -102,7 +102,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
         return $oTemplate->parseHtmlByName('store.html', $aTmplVars);
     }
 
-	protected function getFeatured($bWrapInBlock = true) {
+	protected function getFeaturedList($bWrapInBlock = true) {
         $sJsObject = $this->getPageJsObject();
         $oTemplate = BxDolStudioTemplate::getInstance();
 
@@ -140,15 +140,15 @@ class BxBaseStudioStore extends BxDolStudioStore {
         ));
     }
 
-    protected function getModules($bWrapInBlock = true) {
+    protected function getModulesList($bWrapInBlock = true) {
     	return $this->getTag('modules', $bWrapInBlock);
     }
 
-	protected function getTemplates($bWrapInBlock = true) {
+	protected function getTemplatesList($bWrapInBlock = true) {
     	return $this->getTag('templates', $bWrapInBlock);
     }
 
-	protected function getLanguages($bWrapInBlock = true) {
+	protected function getLanguagesList($bWrapInBlock = true) {
     	return $this->getTag('languages', $bWrapInBlock);
     }
 
@@ -190,7 +190,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
         ));
     }
 
-    protected function getPurchases() {
+    protected function getPurchasesList() {
         $sJsObject = $this->getPageJsObject();
         $oTemplate = BxDolStudioTemplate::getInstance();
 
@@ -209,7 +209,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
         return $oTemplate->parseHtmlByName('store.html', $aTmplVars);
     }
 
-	protected function getUpdates() {
+	protected function getUpdatesList() {
         $sJsObject = $this->getPageJsObject();
         $oTemplate = BxDolStudioTemplate::getInstance();
 
@@ -228,7 +228,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
         return $oTemplate->parseHtmlByName('store.html', $aTmplVars);
     }
 
-	protected function getCheckout() {
+	protected function getCheckoutList() {
         $sJsObject = $this->getPageJsObject();
         $oTemplate = BxDolStudioTemplate::getInstance();
 
@@ -280,7 +280,7 @@ class BxBaseStudioStore extends BxDolStudioStore {
         ));
     }
 
-	protected function getDownloaded() {
+	protected function getDownloadedList() {
         $sJsObject = $this->getPageJsObject();
         $oTemplate = BxDolStudioTemplate::getInstance();