Bläddra i källkod

#5460 Alerts logger: distinct vars passed by reference

Aleksandr Trofimov 6 månader sedan
förälder
incheckning
55544f15e8
36 ändrade filer med 277 tillägg och 44 borttagningar
  1. 1 1
      inc/classes/BxDolAlerts.php
  2. 2 0
      modules/boonex/events/classes/BxEventsModule.php
  3. 2 1
      modules/boonex/google_tagmanager/classes/BxGoogleTagManModule.php
  4. 1 1
      modules/boonex/intercom/classes/BxIntercomModule.php
  5. 1 1
      modules/boonex/mailchimp/classes/BxMailchimpModule.php
  6. 1 1
      modules/boonex/massmailer/classes/BxMassMailerModule.php
  7. 26 1
      modules/boonex/notifications/classes/BxNtfsDb.php
  8. 9 2
      modules/boonex/notifications/classes/BxNtfsModule.php
  9. 8 1
      modules/boonex/notifications/classes/BxNtfsTemplate.php
  10. 4 0
      modules/boonex/payment/classes/BxPaymentCart.php
  11. 24 0
      modules/boonex/payment/classes/BxPaymentModule.php
  12. 9 2
      modules/boonex/payment/classes/BxPaymentProviderChargebeeV3.php
  13. 16 4
      modules/boonex/payment/classes/BxPaymentProviderStripe.php
  14. 9 2
      modules/boonex/payment/classes/BxPaymentProviderStripeBasic.php
  15. 8 2
      modules/boonex/payment/classes/BxPaymentProviderStripeV3.php
  16. 26 2
      modules/boonex/timeline/classes/BxTimelineDb.php
  17. 5 2
      modules/boonex/timeline/classes/BxTimelineModule.php
  18. 7 2
      modules/boonex/timeline/classes/BxTimelineResponse.php
  19. 23 4
      modules/boonex/timeline/classes/BxTimelineTemplate.php
  20. 1 1
      studio/classes/BxDolStudioPermissionsLevels.php
  21. 1 1
      studio/classes/BxDolStudioRolesLevels.php
  22. 7 3
      template/scripts/BxBaseAccountForms.php
  23. 2 1
      template/scripts/BxBaseAcl.php
  24. 11 0
      template/scripts/BxBaseCmts.php
  25. 4 0
      template/scripts/BxBaseCover.php
  26. 1 0
      template/scripts/BxBaseFormAccount.php
  27. 7 1
      template/scripts/BxBaseFormView.php
  28. 4 1
      template/scripts/BxBaseFunctions.php
  29. 4 0
      template/scripts/BxBaseMenuSocialSharing.php
  30. 1 0
      template/scripts/BxBasePage.php
  31. 5 1
      template/scripts/BxBaseSearchExtended.php
  32. 3 1
      template/scripts/BxBaseSearchResult.php
  33. 8 0
      template/scripts/BxBaseServiceAccount.php
  34. 19 2
      template/scripts/BxBaseServiceLogin.php
  35. 9 1
      template/scripts/BxBaseServiceProfiles.php
  36. 8 2
      template/scripts/BxBaseServices.php

+ 1 - 1
inc/classes/BxDolAlerts.php

@@ -215,7 +215,7 @@ class BxDolAlerts extends BxDol
         $oDb = BxDolDb::getInstance();
         $aExtraRefs = [];
         foreach($this->aExtras as $sKey => $mixedValue) {
-            if (preg_match('/^(ref|override|return)_/', $sKey) || preg_match('/_(ref|override|return)$/', $sKey) || $sKey == 'result' || $sKey == 'return' || $sKey == 'ret') {
+            if (preg_match('/^(ref|override|return)_/', $sKey) || preg_match('/_(ref|override|return)$/', $sKey) || $sKey == 'result' || $sKey == 'res' || $sKey == 'return' || $sKey == 'ret' || $sKey == 'check_result') {
                 $aExtraRefs[] = $sKey;
             }
         }

+ 2 - 0
modules/boonex/events/classes/BxEventsModule.php

@@ -283,6 +283,8 @@ class BxEventsModule extends BxBaseModGroupsModule implements iBxDolCalendarServ
             'end' =>  $sEnd,
             'sql_part' => &$aSQLPart,
             'data' => &$aEntries,
+            'sql_part_ref' => &$aSQLPart,
+            'data_ref' => &$aEntries,
         ));
 
         return [

+ 2 - 1
modules/boonex/google_tagmanager/classes/BxGoogleTagManModule.php

@@ -45,7 +45,8 @@ class BxGoogleTagManModule extends BxDolModule
             );
 
             bx_alert($this->getName(), 'get_data_layer', 0, 0, [
-                'data' => &$aDataLayer
+                'data' => &$aDataLayer,
+                'data_ref' => &$aDataLayer
             ]);
 
             $sDataLayer = json_encode($aDataLayer);

+ 1 - 1
modules/boonex/intercom/classes/BxIntercomModule.php

@@ -67,7 +67,7 @@ class BxIntercomModule extends BxDolModule
             $aSettings['all profiles'] = $sProfiles;
         }
 
-        bx_alert('bx_intercom', 'integration', $oProfile ? $oProfile->id() : 0, $oProfile ? $oProfile->id() : 0, array('settings' => &$aSettings));
+        bx_alert('bx_intercom', 'integration', $oProfile ? $oProfile->id() : 0, $oProfile ? $oProfile->id() : 0, array('settings' => &$aSettings, 'settings_ref' => &$aSettings));
         
         $sSettings = json_encode($aSettings);
 

+ 1 - 1
modules/boonex/mailchimp/classes/BxMailchimpModule.php

@@ -246,7 +246,7 @@ class BxMailchimpModule extends BxDolModule
         if(($sResetPasswordUrl = bx_get_reset_password_link($sEmail)) !== false)
             $aMarkers['RPASS_URL'] = $sResetPasswordUrl;
 
-        bx_alert($this->_aModule['name'], 'user_fields', $iAccountId, $iProfileId, array('email' => $sEmail, 'markers' => &$aMarkers));	
+        bx_alert($this->_aModule['name'], 'user_fields', $iAccountId, $iProfileId, array('email' => $sEmail, 'markers' => &$aMarkers, 'markers_ref' => &$aMarkers));
 
         return array (
             'email_address' => $oAccount->getEmail(),

+ 1 - 1
modules/boonex/massmailer/classes/BxMassMailerModule.php

@@ -521,7 +521,7 @@ class BxMassMailerModule extends BxBaseModGeneralModule
         $sLetterCode = $this->_oDb->addLetter($iCampaignId, $sEmail);
         
         $aMarkers = $this->addMarkers($iAccountId, $sLetterCode);
-        bx_alert($this->_aModule['name'], 'user_fields', $iCampaignId, $iAccountId, array('email' => $sEmail, 'markers' => &$aMarkers));
+        bx_alert($this->_aModule['name'], 'user_fields', $iCampaignId, $iAccountId, array('email' => $sEmail, 'markers' => &$aMarkers, 'markers_ref' => &$aMarkers));
         if ($bTrackKinks){
             $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
             $aTemplate['Body'] = preg_replace_callback("/$regexp/siU",

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

@@ -103,6 +103,7 @@ class BxNtfsDb extends BxBaseModNotificationsDb
          */
         bx_alert($this->_oConfig->getName(), 'get_events_before', 0, 0, [
             'params' => &$aParams,
+            'params_ref' => &$aParams,
         ]);
 
         if($aParams['browse'] != 'list' || $aParams['type'] != BX_NTFS_TYPE_OBJECT_OWNER_AND_CONNECTIONS)
@@ -193,6 +194,7 @@ class BxNtfsDb extends BxBaseModNotificationsDb
             'browse' => $aParams['browse'],
             'params' => $aAlertParams,
             'table' => $this->_sTable,
+
             'method' => &$sUnionMethod,
             'select_clause' => &$sSelectClause,
             'join_clause_po' => &$sJoinClausePo,
@@ -205,6 +207,19 @@ class BxNtfsDb extends BxBaseModNotificationsDb
             'limit_clause' => &$sUnionLimitClause,
             'query_po' => &$sQueryOwner,
             'query_pc' => &$sQueryConnections,
+
+            'method_ref' => &$sUnionMethod,
+            'select_clause_ref' => &$sSelectClause,
+            'join_clause_po_ref' => &$sJoinClausePo,
+            'join_clause_pc_ref' => &$sJoinClausePc,
+            'where_clause_po_ref' => &$sWhereClausePo,
+            'where_clause_pc_ref' => &$sWhereClausePc,
+            'order_clause_po_ref' => &$sOrderClausePo,
+            'order_clause_pc_ref' => &$sOrderClausePc,
+            'order_clause_ref' => &$sUnionOrderClause,
+            'limit_clause_ref' => &$sUnionLimitClause,
+            'query_po_ref' => &$sQueryOwner,
+            'query_pc_ref' => &$sQueryConnections,
         ]);
 
         $sQuery = "(" . $sQueryOwner . ") UNION (" . $sQueryConnections . ") {order} {limit}";
@@ -413,6 +428,7 @@ class BxNtfsDb extends BxBaseModNotificationsDb
             'owner_id' => $aParams['owner_id'],
             'params' => $aAlertParams,
             'table' => $this->_sTable,
+
             'join_clause' => &$sJoinClause,
             'where_clause' => &$sWhereClause,
             'where_clause_start_from' => &$sWhereClauseStartFrom,
@@ -420,7 +436,16 @@ class BxNtfsDb extends BxBaseModNotificationsDb
             'where_clause_modules' => &$sWhereClauseModules,
             'where_clause_new' => &$sWhereClauseNew,
             'where_clause_settings' => &$sWhereClauseSettings,
-            'where_clause_type' => &$sWhereClauseType
+            'where_clause_type' => &$sWhereClauseType,
+
+            'join_clause_ref' => &$sJoinClause,
+            'where_clause_ref' => &$sWhereClause,
+            'where_clause_start_from_ref' => &$sWhereClauseStartFrom,
+            'where_clause_status_ref' => &$sWhereClauseStatus,
+            'where_clause_modules_ref' => &$sWhereClauseModules,
+            'where_clause_new_ref' => &$sWhereClauseNew,
+            'where_clause_settings_ref' => &$sWhereClauseSettings,
+            'where_clause_type_ref' => &$sWhereClauseType,
         ]);
 
         $sWhereClause .= $sWhereClauseStartFrom;

+ 9 - 2
modules/boonex/notifications/classes/BxNtfsModule.php

@@ -473,7 +473,9 @@ class BxNtfsModule extends BxBaseModNotificationsModule
             bx_alert($sModule, 'is_notification', 0, 0, [
                 'browse_params' => $aBrowseParams,
                 'event' => &$aEvent, 
-                'event_canceled' => &$bEventCanceled
+                'event_canceled' => &$bEventCanceled,
+                'event_ref' => &$aEvent, 
+                'event_canceled_ref' => &$bEventCanceled
             ]);
 
             if($bEventCanceled)
@@ -659,9 +661,14 @@ class BxNtfsModule extends BxBaseModNotificationsModule
          */
         bx_alert($this->_aModule['name'], 'before_send_notification_push', 0, 0, [
             'profile_id' => $iProfile, 
+
             'content' => &$aContent, 
             'setting' => &$aSettings, 
-            'subject' => &$sSubject
+            'subject' => &$sSubject,
+
+            'content_ref' => &$aContent, 
+            'setting_ref' => &$aSettings, 
+            'subject_ref' => &$sSubject,
         ]);
         
         if (!$aContent)

+ 8 - 1
modules/boonex/notifications/classes/BxNtfsTemplate.php

@@ -239,11 +239,18 @@ class BxNtfsTemplate extends BxBaseModNotificationsTemplate
          */
         bx_alert($this->_oConfig->getName(), 'get_notification', 0, 0, [
             'browse_params' => $aBrowseParams,
+
             'event' => &$aEvent, 
             'event_parsed' => &$bEventParsed, 
             'event_canceled' => &$bEventCanceled,
             'owner' => &$oOwner, 
-            'owner_unit' => &$sOwnerUnit
+            'owner_unit' => &$sOwnerUnit,
+
+            'event_ref' => &$aEvent, 
+            'event_parsed_ref' => &$bEventParsed, 
+            'event_canceled_ref' => &$bEventCanceled,
+            'owner_ref' => &$oOwner, 
+            'owner_unit_ref' => &$sOwnerUnit,
         ]);
         
         if ($bEventCanceled)

+ 4 - 0
modules/boonex/payment/classes/BxPaymentCart.php

@@ -208,6 +208,10 @@ class BxPaymentCart extends BxBaseModPaymentCart
 
             'cart' => &$aCart,
             'cart_items' => &$sCartItems,
+
+            'cart_ref' => &$aCart,
+            'cart_items_ref' => &$sCartItems,
+
             'override_result' => &$sCartItemsResult,
         ]);
 

+ 24 - 0
modules/boonex/payment/classes/BxPaymentModule.php

@@ -858,9 +858,14 @@ class BxPaymentModule extends BxBaseModPaymentModule
         $this->alert('before_authorize', 0, $this->_iUserId, array(
             'client_id' => $this->_iUserId,
             'seller_id' => $iSellerId, 
+
             'type' => &$sType,
             'provider' => &$sProvider,
             'cart_info' => &$aInfo,
+
+            'type_ref' => &$sType,
+            'provider_ref' => &$sProvider,
+            'cart_info_ref' => &$aInfo,
         ));
 
         $iPendingId = $this->_oDb->insertOrderPending($this->_iUserId, $sType, $sProvider, $aInfo);
@@ -914,9 +919,14 @@ class BxPaymentModule extends BxBaseModPaymentModule
             'order_auth' => $sOrderAuth,
             'client_id' => $iClientId,
             'seller_id' => $iSellerId, 
+
             'type' => &$sType,
             'provider' => &$sProvider,
             'cart_info' => &$aInfo,
+
+            'type_ref' => &$sType,
+            'provider_ref' => &$sProvider,
+            'cart_info_ref' => &$aInfo,
         ));
 
         $aResult = $oProvider->captureAuthorizedCheckout($sOrderAuth, $aPending, $aInfo, $sRedirect);
@@ -934,8 +944,12 @@ class BxPaymentModule extends BxBaseModPaymentModule
             'pending' => $aPending,
             'transactions' => $this->_oDb->getOrderProcessed(array('type' => 'pending_id', 'pending_id' => (int)$aPending['id'])),
             'provider' => $oProvider,
+
             'message' => &$aResult['message'],
             'result' => &$aResult,
+
+            'message_ref' => &$aResult['message'],
+            'result_ref' => &$aResult,
         ));
 
         if(empty($aResult['redirect']) && $oProvider->needRedirect())
@@ -1047,10 +1061,16 @@ class BxPaymentModule extends BxBaseModPaymentModule
         $this->alert('before_pending', 0, bx_get_logged_profile_id(), array(
             'client_id' => $this->_iUserId,
             'seller_id' => $iSellerId, 
+
             'type' => &$sType,
             'provider' => &$sProvider,
             'cart_info' => &$aInfo,
             'custom' => &$aCustoms,
+
+            'type_ref' => &$sType,
+            'provider_ref' => &$sProvider,
+            'cart_info_ref' => &$aInfo,
+            'custom_ref' => &$aCustoms,
         ));
 
         $iPendingId = $this->_oDb->insertOrderPending($this->_iUserId, $sType, $sProvider, $aInfo, $aCustoms);
@@ -1169,8 +1189,12 @@ class BxPaymentModule extends BxBaseModPaymentModule
             'pending' => $aPending,
             'transactions' => $this->_oDb->getOrderProcessed(array('type' => 'pending_id', 'pending_id' => (int)$aPending['id'])),
             'provider' => $oProvider,
+
             'message' => &$aResult['message'],
             'result' => &$aResult,
+
+            'message_ref' => &$aResult['message'],
+            'result_ref' => &$aResult,
         ));
 
         if($oProvider->needRedirect()) 

+ 9 - 2
modules/boonex/payment/classes/BxPaymentProviderChargebeeV3.php

@@ -308,7 +308,10 @@ class BxPaymentProviderChargebeeV3 extends BxPaymentProviderChargebee
          */
     	bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_get_js_code', 0, 0, [
             'site' => &$sSite,
-            'params' => &$aParams
+            'params' => &$aParams,
+
+            'site_ref' => &$sSite,
+            'param_ref' => &$aParams
     	]);
 
     	return $this->_oModule->_oTemplate->getJsCode($this->_sName, array_merge(array(
@@ -397,7 +400,11 @@ class BxPaymentProviderChargebeeV3 extends BxPaymentProviderChargebee
         bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_get_button', 0, $iClientId, [
             'type' => &$sType, 
             'site' => &$sSite,
-            'params' => &$aParams
+            'params' => &$aParams,
+
+            'type_ref' => &$sType, 
+            'site_ref' => &$sSite,
+            'params_ref' => &$aParams,
         ]);
 
         $sJsMethod = '';

+ 16 - 4
modules/boonex/payment/classes/BxPaymentProviderStripe.php

@@ -309,8 +309,12 @@ class BxPaymentProviderStripe extends BxPaymentProviderStripeBasic implements iB
          */
         bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_create_customer', 0, $aClient['id'], [
             'type' => $sType,
+
             'customer_object' => &$oCustomer, 
-            'customer_params' => &$aCustomer
+            'customer_params' => &$aCustomer,
+
+            'customer_object_ref' => &$oCustomer, 
+            'customer_params_ref' => &$aCustomer,
         ]);
 
         try {
@@ -361,7 +365,8 @@ class BxPaymentProviderStripe extends BxPaymentProviderStripeBasic implements iB
          */
         bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_create_charge', $iPendingId, false, [
             'charge_object' => &$oCharge, 
-            'charge_params' => &$aCharge
+            'charge_params' => &$aCharge,
+            'charge_params_ref' => &$aCharge,
         ]);
 
         try {
@@ -429,8 +434,12 @@ class BxPaymentProviderStripe extends BxPaymentProviderStripeBasic implements iB
          */
         bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_create_subscription', $iPendingId, false, [
             'customer' => &$this->_oCustomer,
+
             'subscription_object' => &$oSubscription, 
-            'subscription_params' => &$aSubscription
+            'subscription_params' => &$aSubscription,
+
+            'subscription_object_ref' => &$oSubscription, 
+            'subscription_params_ref' => &$aSubscription,
         ]);
 
         try {
@@ -516,7 +525,10 @@ class BxPaymentProviderStripe extends BxPaymentProviderStripeBasic implements iB
          */
     	bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_get_button', 0, $iClientId, [
             'type' => &$sType, 
-            'public_key' => &$sPublicKey
+            'public_key' => &$sPublicKey,
+
+            'type_ref' => &$sType, 
+            'public_key_ref' => &$sPublicKey,
         ]);
 
         $sJsMethod = '';

+ 9 - 2
modules/boonex/payment/classes/BxPaymentProviderStripeBasic.php

@@ -372,8 +372,12 @@ class BxPaymentProviderStripeBasic extends BxBaseModPaymentProvider
          */
         bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_retrieve_customer', 0, false, [
             'type' => $sType,
+
             'customer_id' => &$sId,
-            'customer_object' => &$oCustomer
+            'customer_object' => &$oCustomer,
+
+            'customer_id_ref' => &$sId,
+            'customer_object_ref' => &$oCustomer,
         ]);
 
         try {
@@ -412,7 +416,10 @@ class BxPaymentProviderStripeBasic extends BxBaseModPaymentProvider
          */
         bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_retrieve_charge', 0, false, [
             'charge_id' => &$sId,
-            'charge_object' => &$oCharge
+            'charge_object' => &$oCharge,
+
+            'charge_id_ref' => &$sId,
+            'charge_object_ref' => &$oCharge,
         ]);
 
         try {

+ 8 - 2
modules/boonex/payment/classes/BxPaymentProviderStripeV3.php

@@ -453,7 +453,8 @@ class BxPaymentProviderStripeV3 extends BxPaymentProviderStripeBasic implements
          */
         bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_create_tax', 0, false, [
             'tax_object' => &$oTax, 
-            'tax_params' => &$aTax
+            'tax_params' => &$aTax,
+            'tax_params_ref' => &$aTax,
         ]);
 
         try {
@@ -1055,9 +1056,14 @@ class BxPaymentProviderStripeV3 extends BxPaymentProviderStripeBasic implements
     	bx_alert($this->_oModule->_oConfig->getName(), $this->_sName . '_get_button', 0, $iClientId, [
             'client_id' => $iClientId,
             'vendor_id' => $iVendorId,
+
             'type' => &$sType, 
             'public_key' => &$sPublicKey,
-            'connected_account_id' => &$sConnectedAccountId
+            'connected_account_id' => &$sConnectedAccountId,
+
+            'type_ref' => &$sType, 
+            'public_key_ref' => &$sPublicKey,
+            'connected_account_id_ref' => &$sConnectedAccountId,
         ]);
 
         $sJsMethod = '';

+ 26 - 2
modules/boonex/timeline/classes/BxTimelineDb.php

@@ -674,6 +674,7 @@ class BxTimelineDb extends BxBaseModNotificationsDb
          */
         bx_alert($this->_oConfig->getName(), 'get_events_before', 0, 0, [
             'params' => &$aParams,
+            'params_ref' => &$aParams,
         ]);
 
         $sTable = isset($aParams['from_cache']) && $aParams['from_cache'] === true ? $this->_sTableSlice : $this->_sTable;
@@ -717,12 +718,20 @@ class BxTimelineDb extends BxBaseModNotificationsDb
             'params' => $aAlertParams,
             'table' => $sTable,
             'table_alias' => $sTableAlias,
+
             'method' => &$sMethod,
             'select_clause' => &$sSelectClause,
             'join_clause' => &$mixedJoinClause,
             'where_clause' => &$mixedWhereClause,
             'order_clause' => &$sOrderClause,
-            'limit_clause' => &$sLimitClause
+            'limit_clause' => &$sLimitClause,
+
+            'method_ref' => &$sMethod,
+            'select_clause_ref' => &$sSelectClause,
+            'join_clause_ref' => &$mixedJoinClause,
+            'where_clause_ref' => &$mixedWhereClause,
+            'order_clause_ref' => &$sOrderClause,
+            'limit_clause_ref' => &$sLimitClause,
         ]);
 
         $sSqlMask = "SELECT {select}
@@ -1439,6 +1448,7 @@ class BxTimelineDb extends BxBaseModNotificationsDb
             'params' => $aAlertParams,
             'table' => isset($aParams['from_cache']) && $aParams['from_cache'] === true ? $this->_sTableSlice : $this->_sTable,
             'table_alias' => $sTableAlias,
+
             'join_clause' => &$mixedJoinClause,
             'join_subclause' => &$mixedJoinSubclause,
             'where_clause' => &$mixedWhereClause,
@@ -1451,7 +1461,21 @@ class BxTimelineDb extends BxBaseModNotificationsDb
             'where_clause_muted' => &$sWhereClauseMuted,
             'where_clause_unpublished' => &$sWhereClauseUnpublished,
             'where_clause_cf' => &$sWhereClauseCf,
-            'where_subclause' => &$mixedWhereSubclause
+            'where_subclause' => &$mixedWhereSubclause,
+
+            'join_clause_ref' => &$mixedJoinClause,
+            'join_subclause_ref' => &$mixedJoinSubclause,
+            'where_clause_ref' => &$mixedWhereClause,
+            'where_clause_status_ref' => &$sWhereClauseStatus,
+            'where_clause_filter_ref' => &$sWhereClauseFilter,
+            'where_clause_timeline_ref' => &$sWhereClauseTimeline,
+            'where_clause_modules_ref' => &$sWhereClauseModules,
+            'where_clause_hidden_ref' => &$sWhereClauseHidden,
+            'where_clause_medias_ref' => &$sWhereClauseMedias,
+            'where_clause_muted_ref' => &$sWhereClauseMuted,
+            'where_clause_unpublished_ref' => &$sWhereClauseUnpublished,
+            'where_clause_cf_ref' => &$sWhereClauseCf,
+            'where_subclause_ref' => &$mixedWhereSubclause,
         ]);
 
         $mixedWhereClause .= $sWhereClauseStatus;

+ 5 - 2
modules/boonex/timeline/classes/BxTimelineModule.php

@@ -1276,7 +1276,8 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
             'module' => $this->_oConfig->getName(),
             'type' => $sType,
             'params' => $aParams,
-            'form' => &$oForm
+            'form' => &$oForm,
+            'form_inputs_ref' => &$oForm->aInputs,
         ));
 
     	return $oForm;
@@ -4518,7 +4519,7 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
              * @hook @ref hook-bx_base_profile-timeline_post
              */
             bx_alert($oProfileOwner->getModule(), $this->_oConfig->getUri() . '_post', $oProfileOwner->id(), $iUserId, [
-                'check_result' => &$aCheckResult
+                'check_result' => &$aCheckResult,
             ]);
         }
 
@@ -5987,6 +5988,8 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
         bx_alert($oProfileOwner->getModule(), $this->_oConfig->getUri() . '_view', $this->_iOwnerId, $this->getUserId(), [
             'params' => &$aParams,
             'menu' => &$aMenu,
+            'params_ref' => &$aParams,
+            'menu_ref' => &$aMenu,
             'override_content' => &$mixedContent,
         ]);
 

+ 7 - 2
modules/boonex/timeline/classes/BxTimelineResponse.php

@@ -97,7 +97,8 @@ class BxTimelineResponse extends BxBaseModNotificationsResponse
                     'unit' => $oAlert->sUnit,
                     'action' => $oAlert->sAction,
                     'alert' => $oAlert,
-                    'data' => &$aEvent
+                    'data' => &$aEvent,
+                    'data_ref' => &$aEvent,
                 ]);
 
                 $iId = $this->_oModule->_oDb->insertEvent($aEvent);
@@ -166,8 +167,12 @@ class BxTimelineResponse extends BxBaseModNotificationsResponse
                     'unit' => $oAlert->sUnit,
                     'action' => $oAlert->sAction,
                     'alert' => $oAlert,
+
                     'data' => &$aParamsSet,
-                    'data_by_source' => &$aParamsSetBySource
+                    'data_by_source' => &$aParamsSetBySource,
+
+                    'data_ref' => &$aParamsSet,
+                    'data_by_source_ref' => &$aParamsSetBySource,
                 ]);
 
                 $this->_oModule->_oDb->updateEvent($aParamsSet, ['id' => $aEvent[$CNF['FIELD_ID']]]);

+ 23 - 4
modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -698,6 +698,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         bx_alert($sModuleName, 'add_live_update', 0, 0, [
             'browse_params' => $aParams,
             'live_update_params' => &$aLiveUpdateParams,
+            'live_update_params_ref' => &$aLiveUpdateParams,
             'override_result' => &$sLiveUpdateCode,
         ]);
 
@@ -751,13 +752,22 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         bx_alert($sModuleName, 'get_view', 0, 0, [
             'params' => $aParams,
             'event_first' => $iEvent,
+
             'back' => &$sBack,
             'empty' => &$sEmpty,
             'content_before' => &$sContentBefore,
             'content' => &$sContent,
             'content_after' => &$sContentAfter,
             'load_more' => &$sLoadMore,
-            'js_content' => &$sJsContent
+            'js_content' => &$sJsContent,
+
+            'back_ref' => &$sBack,
+            'empty_ref' => &$sEmpty,
+            'content_before_ref' => &$sContentBefore,
+            'content_ref' => &$sContent,
+            'content_after_ref' => &$sContentAfter,
+            'load_more_ref' => &$sLoadMore,
+            'js_content_ref' => &$sJsContent,
         ]);
 
         $sJsObjectFilters = '';
@@ -1577,7 +1587,8 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         bx_alert($this->_oConfig->getName(), 'get_reposted_by', 0, 0, [
             'content_id' => $iId,
             'user_ids' => $aUserIds,
-            'users' => &$aTmplUsers
+            'users' => &$aTmplUsers,
+            'users_ref' => &$aTmplUsers,
         ]);
         
         if(empty($aTmplUsers))
@@ -2251,8 +2262,12 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
             'type' => $sType,
             'event' => $aEvent,
             'browse_params' => $aBrowseParams,
+
             'tmpl_code' => &$sTmplCode,
-            'tmpl_vars' => &$aTmplVars
+            'tmpl_vars' => &$aTmplVars,
+
+            'tmpl_code_ref' => &$sTmplCode,
+            'tmpl_vars_ref' => &$aTmplVars,
         ]);
 
         return $this->parseHtmlByContent($sTmplCode, $aTmplVars);
@@ -2401,8 +2416,12 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
             'type' => $sType,
             'event' => $aEvent,
             'browse_params' => $aBrowseParams,
+
             'tmpl_code' => &$sTmplCode,
-            'tmpl_vars' => &$aTmplVars
+            'tmpl_vars' => &$aTmplVars,
+
+            'tmpl_code_ref' => &$sTmplCode,
+            'tmpl_vars_ref' => &$aTmplVars,
         ]);
 
         return $this->parseHtmlByContent($sTmplCode, $aTmplVars);

+ 1 - 1
studio/classes/BxDolStudioPermissionsLevels.php

@@ -30,7 +30,7 @@ class BxDolStudioPermissionsLevels extends BxTemplStudioGrid
 
         // create system event before deletion
         $isStopDeletion = false;
-        bx_alert('acl', 'before_delete', $aLevel['id'], 0, array('level' => $aLevel, 'stop_deletion' => &$isStopDeletion));
+        bx_alert('acl', 'before_delete', $aLevel['id'], 0, array('level' => $aLevel, 'stop_deletion' => &$isStopDeletion, 'stop_deletion_ref' => &$isStopDeletion));
         if($isStopDeletion)
             return false;
 

+ 1 - 1
studio/classes/BxDolStudioRolesLevels.php

@@ -36,7 +36,7 @@ class BxDolStudioRolesLevels extends BxTemplStudioGrid
             return false;
 
         $isStopDeletion = false;
-        bx_alert('roles', 'before_delete', $iId, 0, array('role' => $aRole, 'stop_deletion' => &$isStopDeletion));
+        bx_alert('roles', 'before_delete', $iId, 0, array('role' => $aRole, 'stop_deletion' => &$isStopDeletion, 'stop_deletion_ref' => &$isStopDeletion));
         if($isStopDeletion)
             return false;
 

+ 7 - 3
template/scripts/BxBaseAccountForms.php

@@ -39,7 +39,8 @@ class BxBaseAccountForms extends BxDolProfileForms
          * @hook @ref hook-account-add_form_get
          */
         bx_alert('account', 'add_form_get', 0, 0, [
-            'form_object' => &$oForm
+            'form_object' => &$oForm,
+            'form_inputs_ref' => &$oForm->aInputs,
         ]);
 
         return $oForm;
@@ -83,7 +84,8 @@ class BxBaseAccountForms extends BxDolProfileForms
          * @hook @ref hook-account-add_form_check
          */
         bx_alert('account', 'add_form_check', 0, 0, array(
-            'form_object' => &$oForm
+            'form_object' => &$oForm,
+            'form_inputs_ref' => &$oForm->aInputs,
         ));
 
         if (!$oForm->isSubmittedAndValid()) {
@@ -104,7 +106,9 @@ class BxBaseAccountForms extends BxDolProfileForms
              */
             bx_alert('account', 'add_form', 0, 0, array(
                     'form_object' => &$oForm,
-                    'form_code' => &$sCode
+                    'form_inputs_ref' => &$oForm->aInputs,
+                    'form_code' => &$sCode,
+                    'form_code_ref' => &$sCode,
             ));
             
             if($bIsApi){

+ 2 - 1
template/scripts/BxBaseAcl.php

@@ -120,7 +120,8 @@ class BxBaseAcl extends BxDolAcl
             'block_owner' => $iProfileId,
             'block_tmpl_name' => $sTmplName,
             'block_tmpl_vars' => $aTmplVars,
-            'block_code' => &$sContent
+            'block_code' => &$sContent,
+            'block_code_ref' => &$sContent,
         ]);
 
         $oTemplate->addCss(['acl.css']);

+ 11 - 0
template/scripts/BxBaseCmts.php

@@ -261,6 +261,7 @@ class BxBaseCmts extends BxDolCmts
             'id' => $this->getId(),
             'params_browse' => $aBp,
             'params_display' => $aDp,
+
             'post_form_top' => &$sPostFormTop,
             'content_before' => &$sContentBefore,
             'comments' => &$sComments,
@@ -270,6 +271,16 @@ class BxBaseCmts extends BxDolCmts
             'js_content' => &$sJsContent,
             'block_title' => &$sBlockTitle,
             'block_menu' => &$sBlockMenu,
+
+            'post_form_top_ref' => &$sPostFormTop,
+            'content_before_ref' => &$sContentBefore,
+            'comments_ref' => &$sComments,
+            'comments_pinned_ref' => &$sCommentsPinned,
+            'content_after_ref' => &$sContentAfter,
+            'post_form_bottom_ref'  => &$sPostFormBottom,
+            'js_content_ref' => &$sJsContent,
+            'block_title_ref' => &$sBlockTitle,
+            'block_menu_ref' => &$sBlockMenu,
         ]);
 
         $sContent = $this->_oTemplate->parseHtmlByName('comments_block.html', [

+ 4 - 0
template/scripts/BxBaseCover.php

@@ -83,8 +83,12 @@ class BxBaseCover extends BxDolCover
          */
         bx_alert('system', 'display_cover', 0, 0, [
             'res' => &$sResult, 
+
             'template_name' => &$this->_sTemplateName, 
             'params' => &$aParams, 
+
+            'template_name_ref' => &$this->_sTemplateName, 
+            'params_ref' => &$aParams, 
         ]);
 
         if ($sResult  != null)

+ 1 - 0
template/scripts/BxBaseFormAccount.php

@@ -69,6 +69,7 @@ class BxFormAccountCheckerHelper extends BxDolFormCheckerHelper
             'info' => $aInfo,
             'pwd' => $s,
             'password' => &$sPassCheck,
+            'password_ref' => &$sPassCheck,
         ]);
 
         return $aInfo['password'] == $sPassCheck;

+ 7 - 1
template/scripts/BxBaseFormView.php

@@ -350,7 +350,11 @@ class BxBaseFormView extends BxDolForm
             'dynamic' => $this->_bDynamicMode,
             'object' => &$this,
             'code' => &$this->sCode,
-            'include' => &$sInclude
+            'include' => &$sInclude,
+
+            'code_ref' => &$this->sCode,
+            'include_ref' => &$sInclude,
+            'form_inputs_ref' => &$this->aInputs,
         ]);
 
         if($this->sCode === false)
@@ -383,6 +387,8 @@ class BxBaseFormView extends BxDolForm
             'dynamic' => $this->_bDynamicMode,
             'object' => &$this,
             'code' => &$this->sCode,
+            'code_ref' => &$this->sCode,
+            'form_inputs_ref' => &$this->aInputs,
         ]);
 
         if($this->sCode === false) {

+ 4 - 1
template/scripts/BxBaseFunctions.php

@@ -671,7 +671,10 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
 
         bx_alert('system', 'get_logo', 0, 0, [
             'tmpl_name' => &$sTmplName,
-            'tmpl_vars' => &$aTmplVars
+            'tmpl_vars' => &$aTmplVars,
+
+            'tmpl_name_ref' => &$sTmplName,
+            'tmpl_vars_ref' => &$aTmplVars,
         ]);
 
         return $this->_oTemplate->parseHtmlByName($sTmplName, $aTmplVars);

+ 4 - 0
template/scripts/BxBaseMenuSocialSharing.php

@@ -48,6 +48,10 @@ class BxBaseMenuSocialSharing extends BxTemplMenu
         $oAlert = new BxDolAlerts('system', 'social_sharing_display', '', '', array (
         	'markers' => &$this->_aMarkers,
             'buttons' => &$this->_aObject['menu_items'],
+
+        	'markers_ref' => &$this->_aMarkers,
+            'buttons_ref' => &$this->_aObject['menu_items'],
+
             'override_output' => &$sOverrideOutput,
         ));
         $oAlert->alert();

+ 1 - 0
template/scripts/BxBasePage.php

@@ -331,6 +331,7 @@ class BxBasePage extends BxDolPage
             'page_object' => $this,
             'page_query' => $this->_oQuery,
             'page_code' => &$sPageCode,
+            'page_code_ref' => &$sPageCode,
             'sub_page' => $this->_bSubPage,
         ]);
 

+ 5 - 1
template/scripts/BxBaseSearchExtended.php

@@ -167,8 +167,12 @@ class BxBaseSearchExtended extends BxDolSearchExtended
          */
         bx_alert('search', 'get_data', 0, false, [
             'object' => $this->_aObject, 
+
             'search_params' => &$aParamsSearch, 
-            'search_results' => &$aResults
+            'search_results' => &$aResults,
+
+            'search_params_ref' => &$aParamsSearch, 
+            'search_results_ref' => &$aResults,
         ]);
 
     	if($aResults === false)

+ 3 - 1
template/scripts/BxBaseSearchResult.php

@@ -97,8 +97,10 @@ class BxBaseSearchResult extends BxDolSearchResult
          */
         bx_alert('simple_search', 'show_data', 0, false, [
             'object' => &$this->aCurrent, 
+            'condition_array_ref' => &$this->aCurrent, 
             'mode' => $this->_sMode, 
-            'search_results' => &$sCode
+            'search_results' => &$sCode,
+            'search_results_ref' => &$sCode
         ]);
 
         return $sCode;

+ 8 - 0
template/scripts/BxBaseServiceAccount.php

@@ -483,6 +483,10 @@ class BxBaseServiceAccount extends BxDol
                     bx_alert('account', 'before_confirm_phone_send_sms', $oAccount->id(), bx_get_logged_profile_id(), [
                         'phone_number' => &$sPhoneNumber, 
                         'sms_text' => &$sActivationText, 
+
+                        'phone_number_ref' => &$sPhoneNumber, 
+                        'sms_text_ref' => &$sActivationText, 
+
                         'override_result' => &$mixedResult
                     ]);
 
@@ -716,6 +720,10 @@ class BxBaseServiceAccount extends BxDol
                 bx_alert('account', 'before_forgot_password_send_sms', $aAccountInfo['id'], false, [
                     'phone_number' => &$sPhone, 
                     'sms_text' => &$sSmsText, 
+
+                    'phone_number_ref' => &$sPhone, 
+                    'sms_text_ref' => &$sSmsText, 
+
                     'override_result' => &$mixedOverrideResult
                 ]);
 

+ 19 - 2
template/scripts/BxBaseServiceLogin.php

@@ -179,7 +179,19 @@ class BxBaseServiceLogin extends BxDol
          *      - `aAuthTypes` - [array] by ref,  Auth Types, can be overridden in hook processing
          * @hook @ref hook-account-show_login_form
          */
-        bx_alert('profile', 'show_login_form', 0, 0, array('oForm' => &$oForm, 'sParams' => &$sParams, 'sCustomHtmlBefore' => &$sCustomHtmlBefore, 'sCustomHtmlAfter' => &$sCustomHtmlAfter, 'aAuthTypes' => &$aAuthTypes));
+        bx_alert('profile', 'show_login_form', 0, 0, array(
+            'oForm' => &$oForm, 
+            'sParams' => &$sParams, 
+            'sCustomHtmlBefore' => &$sCustomHtmlBefore, 
+            'sCustomHtmlAfter' => &$sCustomHtmlAfter, 
+            'aAuthTypes' => &$aAuthTypes,
+
+            'form_inputs_ref' => &$oForm->aInputs, 
+            'sParams_ref' => &$sParams, 
+            'sCustomHtmlBefore_ref' => &$sCustomHtmlBefore, 
+            'sCustomHtmlAfter_ref' => &$sCustomHtmlAfter, 
+            'aAuthTypes_ref' => &$aAuthTypes,
+        ));
 
         if (isset($oForm->aInputs['relocate'])) {
             if ($sForceRelocate && 0 === mb_stripos($sForceRelocate, BX_DOL_URL_ROOT))
@@ -287,6 +299,10 @@ class BxBaseServiceLogin extends BxDol
             bx_alert('account', 'before_2fa_send_sms', $oAccount->id(), false, [
                 'phone_number' => &$sPhoneNumber, 
                 'sms_text' => &$sActivationText, 
+
+                'phone_number_ref' => &$sPhoneNumber, 
+                'sms_text_ref' => &$sActivationText, 
+
                 'override_result' => &$mixedOverrideResult
             ]);
 
@@ -338,7 +354,8 @@ class BxBaseServiceLogin extends BxDol
              */
             bx_alert('account', 'login_after', $oAccount->id(),  false, array(
                 'account' => $aAccount,
-                'url_relocate' => &$sUrlRelocate               
+                'url_relocate' => &$sUrlRelocate,
+                'url_relocate_ref' => &$sUrlRelocate,
             ));
 
             BxDolTemplate::getInstance()->setPageNameIndex (BX_PAGE_TRANSITION);

+ 9 - 1
template/scripts/BxBaseServiceProfiles.php

@@ -1277,12 +1277,20 @@ class BxBaseServiceProfiles extends BxDol
         
         bx_alert('system', 'account_profile_switcher', 0, false, array(
             'account_id' => $iAccountId,
+
             'active_profile_id' => &$iActiveProfileId,
             'url_profile_action' => &$sUrlProfileAction,
             'show_all' => &$bShowAll,
             'button_title' => &$sButtonTitle,
             'profile_template' => &$sProfileTemplate,
-            'profiles' => &$aProfiles
+            'profiles' => &$aProfiles,
+
+            'active_profile_id_ref' => &$iActiveProfileId,
+            'url_profile_action_ref' => &$sUrlProfileAction,
+            'show_all_ref' => &$bShowAll,
+            'button_title_ref' => &$sButtonTitle,
+            'profile_template_ref' => &$sProfileTemplate,
+            'profiles_ref' => &$aProfiles,
         ));
 
         $aProfilesData = [];

+ 8 - 2
template/scripts/BxBaseServices.php

@@ -1614,7 +1614,13 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
              *      - `where` - [string]  equal redirect
              * @hook @ref hook-system-check_spam_url
              */
-            bx_alert('system', 'check_spam_url', 0, getLoggedId(), array('is_spam' => &$bSpam, 'content' => &$sUrl, 'where' => 'redirect'));
+            bx_alert('system', 'check_spam_url', 0, getLoggedId(), array(
+                'is_spam' => &$bSpam, 
+                'content' => &$sUrl, 
+                'is_spam_ref' => &$bSpam, 
+                'content_ref' => &$sUrl, 
+                'where' => 'redirect'
+            ));
 
             $sLangKey = $bSpam ? '_sys_redirect_confirmation_harmful' : '_sys_redirect_confirmation';
             return BxDolTemplate::getInstance()->parseHtmlByName('redirect.html', [
@@ -1720,7 +1726,7 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
          *      - `override_result` - [string] by ref, class name for search, can be overridden in hook processing
          * @hook @ref hook-system-search_keyword
          */
-        bx_alert('system', 'search_keyword', 0, 0, array('class' => &$sClass));
+        bx_alert('system', 'search_keyword', 0, 0, array('class' => &$sClass, 'class_name_ref' => &$sClass));
 
         $oSearch = new $sClass(bx_get('section'));
         $oSearch->setLiveSearch(bx_get('live_search') ? 1 : 0);