Ver Fonte

Ticket #4508 - PHP 8.2 compatibility issues.

AntonLV há 3 anos atrás
pai
commit
625aa9b564
42 ficheiros alterados com 125 adições e 48 exclusões
  1. 16 14
      inc/classes/BxDolAuditGrid.php
  2. 3 0
      inc/classes/BxDolAuditQuery.php
  3. 1 0
      inc/classes/BxDolBadgesQuery.php
  4. 3 1
      inc/classes/BxDolCmts.php
  5. 3 1
      inc/classes/BxDolLogsQuery.php
  6. 3 1
      inc/classes/BxDolRssQuery.php
  7. 4 1
      inc/classes/BxDolUploader.php
  8. 2 0
      modules/base/connect/classes/BxBaseModConnectConfig.php
  9. 1 0
      modules/base/general/classes/BxBaseModGeneralConfig.php
  10. 4 3
      modules/base/general/classes/BxBaseModGeneralMenuManageTools.php
  11. 1 1
      modules/base/general/classes/BxBaseModGeneralMenuViewActions.php
  12. 1 0
      modules/base/general/classes/BxBaseModGeneralSearchResult.php
  13. 4 1
      modules/base/payment/classes/BxBaseModPaymentProvider.php
  14. 1 0
      modules/base/template/classes/BxBaseModTemplateConfig.php
  15. 0 2
      modules/base/text/classes/BxBaseModTextConfig.php
  16. 3 1
      modules/boonex/attendant/classes/BxAttendantDb.php
  17. 1 0
      modules/boonex/files/classes/BxFilesSearchResult.php
  18. 3 1
      modules/boonex/forum/classes/BxForumMenuCategories.php
  19. 3 0
      modules/boonex/massmailer/classes/BxMassMailerGridCampaigns.php
  20. 0 1
      modules/boonex/massmailer/classes/BxMassMailerPageEntry.php
  21. 1 0
      modules/boonex/notifications/classes/BxNtfsDb.php
  22. 0 1
      modules/boonex/payment/classes/BxPaymentConfig.php
  23. 0 3
      modules/boonex/payment/classes/BxPaymentProviderStripeBasic.php
  24. 17 7
      modules/boonex/profiler/classes/BxProfiler.php
  25. 2 3
      modules/boonex/tasks/classes/BxTasksFormListEntry.php
  26. 1 1
      modules/boonex/timeline/classes/BxTimelineConfig.php
  27. 18 0
      modules/boonex/timeline/classes/BxTimelineDb.php
  28. 2 0
      modules/boonex/timeline/classes/BxTimelineMenuView.php
  29. 1 0
      studio/classes/BxDolStudioFormsLabels.php
  30. 3 1
      studio/classes/BxDolStudioRolesUtils.php
  31. 3 1
      studio/template/scripts/BxBaseStudioFormsCategories.php
  32. 3 0
      studio/template/scripts/BxBaseStudioFormsGroupsRoles.php
  33. 2 1
      studio/template/scripts/BxBaseStudioFormsSearchForms.php
  34. 1 1
      template/scripts/BxBaseFormView.php
  35. 1 0
      template/scripts/BxBaseLabel.php
  36. 1 0
      template/scripts/BxBaseMenuCreatePost.php
  37. 1 0
      template/scripts/BxBaseMenuDashboardContentManage.php
  38. 2 0
      template/scripts/BxBaseMenuDashboardReportsManage.php
  39. 1 0
      template/scripts/BxBaseMetatags.php
  40. 5 1
      template/scripts/BxBasePage.php
  41. 1 0
      template/scripts/BxBasePrivacy.php
  42. 2 0
      template/scripts/BxBaseSearchResult.php

+ 16 - 14
inc/classes/BxDolAuditGrid.php

@@ -11,26 +11,28 @@ define('BX_DOL_MANAGE_TOOLS_ADMINISTRATION', 'administration');
 
 class BxDolAuditGrid extends BxTemplGrid
 {
+    protected $oDb;
+
     protected $_sParamsDivider;
-    
+
     protected $_sFilter1Name;
-	protected $_sFilter1Value;
-	protected $_aFilter1Values;
-    
+    protected $_sFilter1Value;
+    protected $_aFilter1Values;
+
     protected $_sFilterProfileName;
-	protected $_sFilterProfileValue;
-	protected $_aFilterProfileValues;
-    
+    protected $_sFilterProfileValue;
+    protected $_aFilterProfileValues;
+
     protected $_sFilterActionName;
-	protected $_sFilterActionValue;
-	protected $_aFilterActionValues;
-    
+    protected $_sFilterActionValue;
+    protected $_aFilterActionValues;
+
     protected $_sFilterFromDateName;
-	protected $_sFilterFromDateValue;
-    
+    protected $_sFilterFromDateValue;
+
     protected $_sFilterToDateName;
-	protected $_sFilterToDateValue;
-    
+    protected $_sFilterToDateValue;
+
     public function __construct ($aOptions, $oTemplate = false)
     {
         $this->_sFilter1Name = 'module';

+ 3 - 0
inc/classes/BxDolAuditQuery.php

@@ -12,12 +12,15 @@
  */
 class BxDolAuditQuery extends BxDolDb implements iBxDolSingleton
 {
+    protected $_sTable;
+
     protected 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);
 
         parent::__construct();
+
         $this->_sTable = 'sys_audit';
     }
     /**

+ 1 - 0
inc/classes/BxDolBadgesQuery.php

@@ -12,6 +12,7 @@
  */
 class BxDolBadgesQuery extends BxDolDb
 {
+    protected $_sTableBadges;
     protected $_sTableCategories;
 
     public function __construct()

+ 3 - 1
inc/classes/BxDolCmts.php

@@ -184,8 +184,10 @@ class BxDolCmts extends BxDolFactory implements iBxDolReplaceable, iBxDolContent
     protected $_sListAnchor = '';
     protected $_sItemAnchor = '';
 
+    protected $_aSystems = [];
+
     protected $_sSystem = 'profile'; ///< current comment system name
-    protected $_aSystem = array (); ///< current comments system array
+    protected $_aSystem = []; ///< current comments system array
     protected $_iId = 0; ///< obect id to be commented
     protected $_iAuthorId = 0; ///< currently logged in user who browse, post, etc.
 

+ 3 - 1
inc/classes/BxDolLogsQuery.php

@@ -9,10 +9,12 @@
 
 class BxDolLogsQuery extends BxDolDb
 {
+    protected $_aObject;
 
-    public function __construct($aObject = array())
+    public function __construct($aObject = [])
     {
         parent::__construct();
+
         $this->_aObject = $aObject;
     }
 

+ 3 - 1
inc/classes/BxDolRssQuery.php

@@ -9,10 +9,12 @@
 
 class BxDolRssQuery extends BxDolDb
 {
+    protected $_aObject;
 
-    public function __construct($aObject = array())
+    public function __construct($aObject = [])
     {
         parent::__construct();
+
         $this->_aObject = $aObject;
     }
 

+ 4 - 1
inc/classes/BxDolUploader.php

@@ -108,9 +108,12 @@ abstract class BxDolUploader extends BxDolFactory
 
     protected $_sUniqId; ///< uniq id used to generate UploaderJsInstance, ResultContainerId, UploadInProgressContainerId and PopupContainerId
     protected $_sUploaderJsInstance; ///< uplooader js object instance name
-    protected $_sResultContainerId; ///< uploading/uploaded objects container id
     protected $_sUploadInProgressContainerId; ///< container id where upload in progress element resides
     protected $_sPopupContainerId; ///< popup container id
+    
+    protected $_sResultContainerId; ///< uploading/uploaded objects container id
+    protected $_sErrorsContainerId;
+    protected $_sFormContainerId;
 
     protected $_sUploadErrorMessages; ///< upload error message
 

+ 2 - 0
modules/base/connect/classes/BxBaseModConnectConfig.php

@@ -17,6 +17,8 @@ class BxBaseModConnectConfig extends BxBaseModGeneralConfig
     public $isAlwaysConfirmEmail = false;
     public $isAlwaysAutoApprove = false;
 
+    public $bAutoFriends = false;
+
     public $sSessionKey;
     public $sSessionUid;
     public $sSessionProfile;

+ 1 - 0
modules/base/general/classes/BxBaseModGeneralConfig.php

@@ -17,6 +17,7 @@ class BxBaseModGeneralConfig extends BxDolModuleConfig
     protected $_aPrefixes;
     protected $_aJsClasses;
     protected $_aJsObjects;
+    protected $_aHtmlIds;
     protected $_aGridObjects;
 
     /**

+ 4 - 3
modules/base/general/classes/BxBaseModGeneralMenuManageTools.php

@@ -14,9 +14,10 @@
  */
 class BxBaseModGeneralMenuManageTools extends BxTemplMenu
 {
-	protected $_oModule;
-	protected $_iContentId;
-	protected $_aContentInfo;
+    protected $MODULE;
+    protected $_oModule;
+    protected $_iContentId;
+    protected $_aContentInfo;
 
     public function __construct($aObject, $oTemplate = false)
     {

+ 1 - 1
modules/base/general/classes/BxBaseModGeneralMenuViewActions.php

@@ -19,7 +19,7 @@ class BxBaseModGeneralMenuViewActions extends BxTemplMenuCustom
     protected $_sModule;
     protected $_oModule;
 
-    protected $_oMenuAction;
+    protected $_oMenuActions;
     protected $_oMenuActionsMore;
     protected $_oMenuSocialSharing;
 

+ 1 - 0
modules/base/general/classes/BxBaseModGeneralSearchResult.php

@@ -14,6 +14,7 @@ define('BX_SYS_PER_PAGE_BROWSE_SHOWCASE', 32);
 class BxBaseModGeneralSearchResult extends BxTemplSearchResult
 {
     protected $oModule;
+    protected $sFilterName;
     protected $bShowcaseView = false;
     protected $aUnitViews = array();
     protected $sUnitViewDefault = 'gallery';

+ 4 - 1
modules/base/payment/classes/BxBaseModPaymentProvider.php

@@ -39,8 +39,11 @@ class BxBaseModPaymentProvider extends BxDol
      * to internal one. 
      */
     protected $_aSbsStatuses;
+    
+    protected $_aIncludeJs;
+    protected $_aIncludeCss;
 
-    function __construct($aConfig)
+    public function __construct($aConfig)
     {
         parent::__construct();
 

+ 1 - 0
modules/base/template/classes/BxBaseModTemplateConfig.php

@@ -23,6 +23,7 @@ class BxBaseModTemplateConfig extends BxBaseModGeneralConfig
     protected $_fLogoAspectRatio;
     protected $_fLogoAspectRatioDefault;
     
+    protected $_iMark;
     protected $_iMarkWidth;
     protected $_iMarkHeight;
     protected $_fMarkAspectRatio;

+ 0 - 2
modules/base/text/classes/BxBaseModTextConfig.php

@@ -13,8 +13,6 @@ bx_import('BxDolInformer');
 
 class BxBaseModTextConfig extends BxBaseModGeneralConfig
 {
-    protected $_aHtmlIds;
-
     /**
      * Determine whether Timeline post will use common content (header image + text)
      * or content received from attachments (header image + text + images + videos + polls).

+ 3 - 1
modules/boonex/attendant/classes/BxAttendantDb.php

@@ -13,7 +13,9 @@ bx_import('BxDolModuleDb');
 
 class BxAttendantDb extends BxBaseModGeneralDb
 {
-    function __construct(&$oConfig)
+    protected $_sTableEntries;
+
+    public function __construct(&$oConfig)
     {
         parent::__construct($oConfig);
 

+ 1 - 0
modules/boonex/files/classes/BxFilesSearchResult.php

@@ -16,6 +16,7 @@ class BxFilesSearchResult extends BxBaseModTextSearchResult
     protected $sSortingParamName = 'sorting';
     protected $sCurrentFolderParamName = 'folder';
     protected $sCurrentView;
+    protected $aSortingOptions;
     protected $bFileManagerMode = false;
     protected $iFileManagerUploadTo = 0;
     protected $sMode = '';

+ 3 - 1
modules/boonex/forum/classes/BxForumMenuCategories.php

@@ -13,9 +13,11 @@
  */
 class BxForumMenuCategories extends BxTemplMenu
 {
-    protected $_iMenuItemsMin;
+    protected $_sModule;
     protected $_oModule;
 
+    protected $_iMenuItemsMin;
+
     public function __construct ($aObject, $oTemplate)
     {
         parent::__construct ($aObject, $oTemplate);

+ 3 - 0
modules/boonex/massmailer/classes/BxMassMailerGridCampaigns.php

@@ -11,6 +11,9 @@
 
 class BxMassMailerGridCampaigns extends BxTemplGrid
 {
+    protected $MODULE;
+    protected $_oModule;
+
     public function __construct ($aOptions, $oTemplate = false)
     {
         $this->MODULE = 'bx_massmailer';

+ 0 - 1
modules/boonex/massmailer/classes/BxMassMailerPageEntry.php

@@ -16,7 +16,6 @@ class BxMassMailerPageEntry extends BxTemplPage
 {
     public function __construct($aObject, $oTemplate = false)
     {
-        $this->MODULE = 'bx_massmailer';
         parent::__construct($aObject, $oTemplate);
     }
 }

+ 1 - 0
modules/boonex/notifications/classes/BxNtfsDb.php

@@ -13,6 +13,7 @@ class BxNtfsDb extends BxBaseModNotificationsDb
 {
     protected $_sTableEvt2Usr;
     protected $_sTableQueue;
+    protected $_sTableRead;
 
     /*
      * Constructor.

+ 0 - 1
modules/boonex/payment/classes/BxPaymentConfig.php

@@ -125,7 +125,6 @@ class BxPaymentConfig extends BxBaseModPaymentConfig
             'orders' => 10,
             'history' => 10
         );
-        $this->_aHandlers = array();
 
         $this->_aJsClasses = array(
             'cart' => 'BxPaymentCart',

+ 0 - 3
modules/boonex/payment/classes/BxPaymentProviderStripeBasic.php

@@ -14,9 +14,6 @@ define('STRP_MODE_TEST', 2);
 
 class BxPaymentProviderStripeBasic extends BxBaseModPaymentProvider
 {
-    protected $_aIncludeJs;
-    protected $_aIncludeCss;
-
     protected $_sFormDetails;
     protected $_sFormDisplayDetailsEdit;
 

+ 17 - 7
modules/boonex/profiler/classes/BxProfiler.php

@@ -29,29 +29,39 @@ bx_import('Config', $GLOBALS['bx_profiler_module']);
 
 class BxProfiler extends BxDol
 {
-    protected $oConfig, $oTemplate;
+    protected $oConfig, $oTemplate, $oTemplateAdmin;
 
-    protected $aConf = array ();
+    protected $aConf = [];
 
     protected $_iTimeStart = 0;
 
-    protected $_aQueries = array();
+    protected $_aQueries = [];
     protected $_sQueryIndex = 0;
 
-    protected $_aModules = array();
-    protected $_aModulesNames = array();
+    protected $_aModules = [];
+    protected $_aModulesNames = [];
     protected $_aModulesLevel = 0;
 
-    protected $_aAlerts = array();
+    protected $_aAlerts = [];
     protected $_iAlertsLevel = 0;
 
-    protected $_aInjections = array();
+    protected $_aInjections = [];
     protected $_sInjectionIndex = 0;
 
     protected $_sLogDateFormat = "Y-m-d H:i:s";
     protected $_sLogMaxArgLength = 64;
     protected $_sLogFilename = 64;
 
+    protected $_aTemplates = [];
+    protected $_aTemplateIndexes = [];
+
+    protected $_aPages = [];
+    protected $_sPageIndex = '';
+    protected $_sPageBlockIndex = 0;
+    protected $_aPagesBlocks = [];
+    
+    protected $_aMenus = [];   
+
     function __construct($iTimeStart)
     {
         parent::__construct();

+ 2 - 3
modules/boonex/tasks/classes/BxTasksFormListEntry.php

@@ -12,12 +12,11 @@
  * Create/Edit list entry form
  */
 class BxTasksFormListEntry extends BxTemplFormView
-{	
+{
     public function __construct($aInfo, $oTemplate = false)
     {
-        $this->MODULE = 'bx_tasks';
         parent::__construct($aInfo, $oTemplate);
-	}
+    }
 }
 
 /** @} */

+ 1 - 1
modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -70,6 +70,7 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
     protected $_sTranscoderObjectView;
     protected $_aPhotoUploaders;
     protected $_aVideoUploaders;
+    protected $_aFilesUploaders;
     protected $_aItemToUploader;
 
     protected $_sMenuItemManage;
@@ -292,7 +293,6 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
             'add-file-html5' => $this->CNF['OBJECT_UPLOADER_FILE_HTML5'],
         );
 
-        $this->_bJsMode = false;
         $this->_aJsClasses = array(
             'main' => 'BxTimelineMain',
             'view' => 'BxTimelineView',

+ 18 - 0
modules/boonex/timeline/classes/BxTimelineDb.php

@@ -1396,6 +1396,24 @@ class BxTimelineDb extends BxBaseModNotificationsDb
             'name' => $sName
         ]);
     }
+    
+    
+    /**
+     * TEMPORARY: to find the source of Duplicates.
+     */
+    public function insertEvent($aParamsSet)
+    {
+        if(!empty($aParamsSet['date']) && $aParamsSet['date'] < (time() - 86400)) {
+            $sTracks = '';
+            $aTracks = debug_backtrace();
+            foreach($aTracks as $aTrack)
+                $sTracks .= "{$aTrack['file']} ({$aTrack['line']})\n";
+
+            bx_log('bx_timeline_custom', $sTracks);
+        }
+            
+        return parent::insertEvent($aParamsSet);
+    }
 }
 
 /** @} */

+ 2 - 0
modules/boonex/timeline/classes/BxTimelineMenuView.php

@@ -16,6 +16,8 @@ class BxTimelineMenuView extends BxTemplMenuCustom
 {
     protected $_oModule;
 
+    protected $_bShowDivider;
+
     public function __construct($aObject, $oTemplate = false)
     {
         $this->_oModule = BxDolModule::getInstance('bx_timeline');

+ 1 - 0
studio/classes/BxDolStudioFormsLabels.php

@@ -12,6 +12,7 @@ class BxDolStudioFormsLabels extends BxTemplStudioGrid
     protected $_oLabel;
 
     protected $_iParent;
+    protected $_aParent;
 
     public function __construct ($aOptions, $oTemplate = false)
     {

+ 3 - 1
studio/classes/BxDolStudioRolesUtils.php

@@ -15,7 +15,9 @@ define('BX_SRA_MANAGE_APPS', 'manage apps');
 
 class BxDolStudioRolesUtils extends BxDol implements iBxDolSingleton
 {
-    function __construct()
+    protected $oDb;
+
+    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);

+ 3 - 1
studio/template/scripts/BxBaseStudioFormsCategories.php

@@ -36,7 +36,9 @@ class BxStudioFormsCategoriesCheckerHelper extends BxDolFormCheckerHelper
 }
 
 class BxBaseStudioFormsCategories extends BxDolStudioFormsCategories
-{    
+{
+    protected $sUrlPage;
+
     public function __construct ($aOptions, $oTemplate = false)
     {
         parent::__construct ($aOptions, $oTemplate);

+ 3 - 0
studio/template/scripts/BxBaseStudioFormsGroupsRoles.php

@@ -18,9 +18,12 @@ define('BX_DOL_MOD_GROUPS_ROLE_MODERATOR', 2);
 
 class BxBaseStudioFormsGroupsRoles extends BxDolStudioFormsGroupsRoles
 {
+    protected $sUrlPage;
+
     public function __construct ($aOptions, $oTemplate = false)
     {
         parent::__construct ($aOptions, $oTemplate);
+
         $this->sUrlPage = BX_DOL_URL_STUDIO . 'builder_forms.php?page=groups_roles';
     }
     

+ 2 - 1
studio/template/scripts/BxBaseStudioFormsSearchForms.php

@@ -11,8 +11,9 @@
 class BxBaseStudioFormsSearchForms extends BxDolStudioFormsSearchForms
 {
     protected $sUrlViewFields;
+    protected $sUrlViewSortableFields;
 
-    function __construct($aOptions, $oTemplate = false)
+    public function __construct($aOptions, $oTemplate = false)
     {
         parent::__construct($aOptions, $oTemplate);
 

+ 1 - 1
template/scripts/BxBaseFormView.php

@@ -1921,7 +1921,7 @@ BLAH;
                         'condition' => true,
                         'content' => [
                             'opt_title' => bx_process_output($sOptTitle),
-                            'opt_value' => bx_html_attribute($sOptValue),
+                            'opt_value' => !empty($sOptValue) ? bx_html_attribute($sOptValue) : '',
                             'opt_attrs' => $sOptAttrs,
                             'bx_if:show_selected' => [
                                 'condition' => $this->$sIsSelectedFunc($sOptValue, $mixedCurrentVal),

+ 1 - 0
template/scripts/BxBaseLabel.php

@@ -18,6 +18,7 @@ class BxBaseLabel extends BxDolLabel
 
     protected $_sJsObjClass;
     protected $_sJsObjName;
+    protected $_aHtmlIds;
 
     public function __construct($oTemplate = false)
     {

+ 1 - 0
template/scripts/BxBaseMenuCreatePost.php

@@ -13,6 +13,7 @@
  */
 class BxBaseMenuCreatePost extends BxTemplMenuCustom
 {
+    protected $_bShowDivider;
     protected $_sJsObject;
 
     protected $_mixedContextId;

+ 1 - 0
template/scripts/BxBaseMenuDashboardContentManage.php

@@ -14,6 +14,7 @@
 class BxBaseMenuDashboardContentManage extends BxTemplMenuCustom
 {
     protected $_aModulesList;
+    protected $_bShowDivider;
 
     public function __construct ($aObject, $oTemplate)
     {

+ 2 - 0
template/scripts/BxBaseMenuDashboardReportsManage.php

@@ -13,6 +13,8 @@
  */
 class BxBaseMenuDashboardReportsManage extends BxTemplMenuCustom
 {
+    protected $_bShowDivider;
+
     public function __construct ($aObject, $oTemplate)
     {
         parent::__construct ($aObject);

+ 1 - 0
template/scripts/BxBaseMetatags.php

@@ -15,6 +15,7 @@
 class BxBaseMetatags extends BxDolMetatags
 {
     protected $_oTemplate;
+    protected $_sBrowseUrl;
 
     protected $_iKeywordsCloudFontSizeMin = 14;
     protected $_iKeywordsCloudFontSizeMax = 32;

+ 5 - 1
template/scripts/BxBasePage.php

@@ -21,6 +21,10 @@ class BxBasePage extends BxDolPage
     protected $_oPageCacheObject = null;
     protected $_oBlockCacheObject = null;
     
+    protected $_sJsClassName = '';
+    protected $_sJsObjectName = '';
+    protected $_aHtmlIds = [];
+
     protected $_bStickyColumns = false;
 
     protected $_bSubPage = false;
@@ -34,7 +38,7 @@ class BxBasePage extends BxDolPage
         else
             $this->_oTemplate = BxDolTemplate::getInstance();
 
-		$this->_sStorage = 'sys_images';
+        $this->_sStorage = 'sys_images';
         
         $this->_sJsClassName = 'BxDolPage';
         $this->_sJsObjectName = 'oBxDolPage';

+ 1 - 0
template/scripts/BxBasePrivacy.php

@@ -17,6 +17,7 @@ class BxBasePrivacy extends BxDolPrivacy
 
     protected $_sJsObjClass;
     protected $_sJsObjName;
+    protected $_aHtmlIds;
 
     public function __construct ($aOptions, $oTemplate)
     {

+ 2 - 0
template/scripts/BxBaseSearchResult.php

@@ -13,6 +13,8 @@ class BxBaseSearchResult extends BxDolSearchResult
 {
     public $isError;
 
+    protected $oFunctions;
+
     protected $sBrowseUrl; ///< currect browse url, used for paginate and other links in browsing
 
     protected $sUnitTemplate = 'unit.html'; ///< common template to try to use for displaying one item