Ticket #3258 - Core changes.

inc/classes/BxDolCmts.php

@@ -1262,87 +1262,41 @@ class BxDolCmts extends BxDolFactory implements iBxDolReplaceable, iBxDolContent
         if(!$this->isRemoveAllowed($aCmt))
             return array('msg' => $aCmt['cmt_author_id'] == $iPerformerId ? strip_tags($this->msgErrRemoveAllowed()) : _t('_Access denied'));
 
-        $iCmtUniqId = $this->getCommentUniqId($iCmtId);
-        if($this->_oQuery->removeComment($iObjId, $iCmtId, $aCmt['cmt_parent_id'])) {
-            $this->_triggerComment();
-
-            $oStorage = BxDolStorage::getObjectInstance($this->getStorageObjectName());
-
-            $aImages = $this->_oQuery->getFiles($this->_aSystem['system_id'], $iCmtId);
-            foreach($aImages as $aImage)
-                $oStorage->deleteFile($aImage['image_id']);
-
-            $this->_oQuery->deleteImages($this->_aSystem['system_id'], $iCmtId);
-
-            $this->isRemoveAllowed($aCmt, true);
-
-            $this->deleteMetaInfo ($iCmtId);
-
-            bx_audit(
-               $this->getId(), 
-               $this->_aSystem['module'], 
-               '_sys_audit_action_delete_comment',  
-               $this->_prepareAuditParams($iCmtId, array('comment_author_id' => $aCmt['cmt_author_id'], 'comment_text' => $aCmt['cmt_text']))
-            );
-
-            bx_alert($this->_sSystem, 'commentRemoved', $iObjId, $iPerformerId, array(
-                'object_author_id' => $iObjAthrId,
-
-                'comment_id' => $iCmtId, 
-                'comment_uniq_id' => $iCmtUniqId,
-                'comment_author_id' => $aCmt['cmt_author_id'],
-
-                'privacy_view' => $iObjAthrPrivacyView,
-            ));
-
-            bx_alert('comment', 'deleted', $iCmtId, $iPerformerId, array(
-                'object_system' => $this->_sSystem, 
-                'object_id' => $iObjId, 
-                'object_author_id' => $iObjAthrId,
+        $iCmtPrntId = (int)$aCmt['cmt_parent_id'];
+        if(!$this->_oQuery->removeComment($iObjId, $iCmtId, $iCmtPrntId)) 
+            return array('msg' => _t('_cmt_err_cannot_perform_action'));
 
-                'comment_uniq_id' => $iCmtUniqId,
-                'comment_author_id' => $aCmt['cmt_author_id'],
-                    
-                'privacy_view' => $iObjAthrPrivacyView,
-            ));
+        $this->_triggerComment();
 
-            if(!empty($aCmt['cmt_parent_id'])) {
-                $iCmtPrntId = (int)$aCmt['cmt_parent_id'];
-                $aCmtPrnt = $this->_oQuery->getCommentSimple($iObjId, $iCmtPrntId);
-                if(!empty($aCmtPrnt) && is_array($aCmtPrnt)) {
-                    $iCmtPrntUniqId = $this->getCommentUniqId($iCmtPrntId);
+        $oStorage = BxDolStorage::getObjectInstance($this->getStorageObjectName());
 
-                    bx_alert($this->_sSystem, 'replyRemoved', $iCmtPrntId, $iPerformerId, array(
-                        'object_id' => $iObjId, 
-                        'object_author_id' => $iObjAthrId,
+        $aImages = $this->_oQuery->getFiles($this->_aSystem['system_id'], $iCmtId);
+        foreach($aImages as $aImage)
+            $oStorage->deleteFile($aImage['image_id']);
 
-                        'parent_uniq_id' => $iCmtPrntUniqId,
-                        'parent_author_id' => $aCmtPrnt['cmt_author_id'],
-                        
-                        'comment_id' => $iCmtId, 
-                        'comment_author_id' => $aCmt['cmt_author_id'],
+        $this->_oQuery->deleteImages($this->_aSystem['system_id'], $iCmtId);
 
-                        'privacy_view' => $iObjAthrPrivacyView,
-                    ));
+        $this->isRemoveAllowed($aCmt, true);
 
-                    bx_alert('reply', 'deleted', $iCmtId, $iPerformerId, array(
-                        'object_system' => $this->_sSystem, 
-                        'object_id' => $iObjId, 
-                        'object_author_id' => $iObjAthrId,
+        $this->deleteMetaInfo($iCmtId);
 
-                        'parent_id' => $iCmtPrntId,
-                        'parent_uniq_id' => $iCmtPrntUniqId,
-                        'parent_author_id' => $aCmtPrnt['cmt_author_id'],
+        $aAuditParams = $this->_prepareAuditParams($iCmtId, array('comment_author_id' => $aCmt['cmt_author_id'], 'comment_text' => $aCmt['cmt_text']));
+        bx_audit($iObjId, $this->_aSystem['module'], '_sys_audit_action_delete_comment', $aAuditParams);
 
-                        'comment_author_id' => $aCmt['cmt_author_id'], 
+        $aAlertParams = $this->_prepareAlertParams($aCmt);
+        bx_alert($this->_sSystem, 'commentRemoved', $iObjId, $iPerformerId, $aAlertParams);
+        bx_alert('comment', 'deleted', $iCmtId, $iPerformerId, $aAlertParams);
 
-                        'privacy_view' => $iObjAthrPrivacyView,
-                    ));
-                }
+        if(!empty($iCmtPrntId)) {
+            $aCmtPrnt = $this->_oQuery->getCommentSimple($iObjId, $iCmtPrntId);
+            if(!empty($aCmtPrnt) && is_array($aCmtPrnt)) {
+                $aAlertParamsReply = $this->_prepareAlertParamsReply($aCmt, $aCmtPrnt);
+                bx_alert($this->_sSystem, 'replyRemoved', $iCmtPrntId, $iPerformerId, $aAlertParamsReply);
+                bx_alert('reply', 'deleted', $iCmtId, $iPerformerId, $aAlertParamsReply);
             }
-            return array('id' => $iCmtId);
         }
-        return array('msg' => _t('_cmt_err_cannot_perform_action'));
+
+        return array('id' => $iCmtId);
     }
 
     public function add($aValues)
@@ -1369,81 +1323,27 @@ class BxDolCmts extends BxDolFactory implements iBxDolReplaceable, iBxDolContent
     public function onPostAfter($iCmtId)
     {
         $iObjId = (int)$this->getId();
-        $iObjAthrId = $this->getObjectAuthorId($iObjId);
-        $iObjAthrPrivacyView = $this->getObjectPrivacyView($iObjId);
 
         $aCmt = $this->_oQuery->getCommentSimple($iObjId, $iCmtId);
         if(empty($aCmt) || !is_array($aCmt))
             return false;
 
-        $iCmtUniqId = $this->getCommentUniqId($iCmtId);
         $iCmtPrntId = (int)$aCmt['cmt_parent_id'];
         $iPerformerId = (int)$aCmt['cmt_author_id'];
-        bx_alert($this->_sSystem, 'commentPost', $iObjId, $iPerformerId, array(
-            'object_author_id' => $iObjAthrId,
-
-            'comment_id' => $iCmtId, 
-            'comment_uniq_id' => $iCmtUniqId,
-            'comment_author_id' => $aCmt['cmt_author_id'], 
-            'comment_text' => $aCmt['cmt_text'],
-
-            'privacy_view' => $iObjAthrPrivacyView,
-        ));
 
-        bx_audit(
-            $this->getId(), 
-            $this->_aSystem['module'], 
-            '_sys_audit_action_add_comment',  
-            $this->_prepareAuditParams($iCmtId, array('comment_author_id' => $aCmt['cmt_author_id'], 'comment_text' => $aCmt['cmt_text']))
-        );
+        $aAlertParams = $this->_prepareAlertParams($aCmt);
+        bx_alert($this->_sSystem, 'commentPost', $iObjId, $iPerformerId, $aAlertParams);
+        bx_alert('comment', 'added', $iCmtId, $iPerformerId, $aAlertParams);
 
-        bx_alert('comment', 'added', $iCmtId, $iPerformerId, array(
-            'object_system' => $this->_sSystem, 
-            'object_id' => $iObjId, 
-            'object_author_id' => $iObjAthrId,
-
-            'comment_uniq_id' => $iCmtUniqId,
-            'comment_author_id' => $aCmt['cmt_author_id'], 
-            'comment_text' => $aCmt['cmt_text'],
-
-            'privacy_view' => $iObjAthrPrivacyView,
-        ));
+        $aAuditParams = $this->_prepareAuditParams($iCmtId, array('comment_author_id' => $aCmt['cmt_author_id'], 'comment_text' => $aCmt['cmt_text']));
+        bx_audit($iObjId, $this->_aSystem['module'], '_sys_audit_action_add_comment', $aAuditParams);
 
         if(!empty($iCmtPrntId)) {
             $aCmtPrnt = $this->_oQuery->getCommentSimple($iObjId, $iCmtPrntId);
             if(!empty($aCmtPrnt) && is_array($aCmtPrnt)) {
-                $iCmtPrntUniqId = $this->getCommentUniqId($iCmtPrntId);
-
-                bx_alert($this->_sSystem, 'replyPost', $iCmtPrntId, $iPerformerId, array(
-                    'object_id' => $iObjId, 
-                    'object_author_id' => $iObjAthrId,
-
-                    'parent_uniq_id' => $iCmtPrntUniqId,
-                    'parent_author_id' => $aCmtPrnt['cmt_author_id'],
-
-                    'comment_id' => $iCmtId,
-                    'comment_uniq_id' => $iCmtUniqId,
-                    'comment_author_id' => $aCmt['cmt_author_id'], 
-                    'comment_text' => $aCmt['cmt_text'],
-
-                    'privacy_view' => $iObjAthrPrivacyView,
-                ));
-
-                bx_alert('comment', 'replied', $iCmtId, $iPerformerId, array(
-                    'object_system' => $this->_sSystem, 
-                    'object_id' => $iObjId, 
-                    'object_author_id' => $iObjAthrId,
-
-                    'parent_id' => $iCmtPrntId,
-                    'parent_uniq_id' => $iCmtPrntUniqId,
-                    'parent_author_id' => $aCmtPrnt['cmt_author_id'],
-
-                    'comment_uniq_id' => $iCmtUniqId,
-                    'comment_author_id' => $aCmt['cmt_author_id'],  
-                    'comment_text' => $aCmt['cmt_text'],
-
-                    'privacy_view' => $iObjAthrPrivacyView,
-                ));
+                $aAlertParamsReply = $this->_prepareAlertParamsReply($aCmt, $aCmtPrnt);
+                bx_alert($this->_sSystem, 'replyPost', $iCmtPrntId, $iPerformerId, $aAlertParamsReply);
+                bx_alert('comment', 'replied', $iCmtId, $iPerformerId, $aAlertParamsReply);
             }
         }
 
@@ -1452,45 +1352,19 @@ class BxDolCmts extends BxDolFactory implements iBxDolReplaceable, iBxDolContent
 
     public function onEditAfter($iCmtId)
     {
-        $iObjId = (int)$this->getId();
-    	$iObjAthrId = $this->getObjectAuthorId($iObjId);
-        $iObjAthrPrivacyView = $this->getObjectPrivacyView($iObjId);
-
     	$aCmt = $this->getCommentRow($iCmtId);
         if(empty($aCmt) || !is_array($aCmt))
             return false;
 
-        $iCmtUniqId = $this->getCommentUniqId($iCmtId);
+        $iObjId = (int)$this->getId();
         $iPerformerId = $this->_getAuthorId();
-        bx_alert($this->_sSystem, 'commentUpdated', $iObjId, $iPerformerId, array(
-            'object_author_id' => $iObjAthrId,
-
-            'comment_id' => $iCmtId, 
-            'comment_uniq_id' => $iCmtUniqId,
-            'comment_author_id' => $aCmt['cmt_author_id'], 
-            'comment_text' => $aCmt['cmt_text'],
-
-            'privacy_view' => $iObjAthrPrivacyView,
-        ));
 
-        bx_audit(
-            $this->getId(), 
-            $this->_aSystem['module'], 
-            '_sys_audit_action_edit_comment',  
-            $this->_prepareAuditParams($iCmtId, array('comment_author_id' => $aCmt['cmt_author_id'], 'comment_text' => $aCmt['cmt_text']))
-        );
+        $aAlertParams = $this->_prepareAlertParams($aCmt);
+        bx_alert($this->_sSystem, 'commentUpdated', $iObjId, $iPerformerId, $aAlertParams);
+        bx_alert('comment', 'edited', $iCmtId, $iPerformerId, $aAlertParams);
 
-        bx_alert('comment', 'edited', $iCmtId, $iPerformerId, array(
-            'object_system' => $this->_sSystem, 
-            'object_id' => $iObjId, 
-            'object_author_id' => $iObjAthrId,
-
-            'comment_uniq_id' => $iCmtUniqId,
-            'comment_author_id' => $aCmt['cmt_author_id'],
-            'comment_text' => $aCmt['cmt_text'],
-
-            'privacy_view' => $iObjAthrPrivacyView,
-        ));
+        $aAuditParams = $this->_prepareAuditParams($iCmtId, array('comment_author_id' => $aCmt['cmt_author_id'], 'comment_text' => $aCmt['cmt_text']));
+        bx_audit($iObjId, $this->_aSystem['module'], '_sys_audit_action_edit_comment', $aAuditParams);
 
         return array('id' => $iCmtId, 'content' => $this->_getContent($aCmt));
     }
@@ -1740,7 +1614,60 @@ class BxDolCmts extends BxDolFactory implements iBxDolReplaceable, iBxDolContent
         $aDp['dynamic_mode'] = isset($aDp['dynamic_mode']) ? (bool)$aDp['dynamic_mode'] : false;
         $aDp['show_empty'] = isset($aDp['show_empty']) ? (bool)$aDp['show_empty'] : false;
     }
-    
+
+    protected function _prepareAlertParams($aCmt)
+    {
+        $iObjId = (int)$this->getId();
+        $iObjAthrId = $this->getObjectAuthorId($iObjId);
+        $iObjAthrPrivacyView = $this->getObjectPrivacyView($iObjId);
+
+        $iCmtId = (int)$aCmt['cmt_id'];
+        $iCmtUniqId = $this->getCommentUniqId($iCmtId);
+
+        return array(
+            'object_system' => $this->_sSystem, 
+            'object_id' => $iObjId, 
+            'object_author_id' => $iObjAthrId,
+
+            'comment_id' => $iCmtId, 
+            'comment_uniq_id' => $iCmtUniqId,
+            'comment_author_id' => $aCmt['cmt_author_id'], 
+            'comment_text' => $aCmt['cmt_text'],
+
+            'privacy_view' => $iObjAthrPrivacyView,
+        );
+    }
+
+    protected function _prepareAlertParamsReply($aCmt, $aCmtPrnt)
+    {
+        $iObjId = (int)$this->getId();
+        $iObjAthrId = $this->getObjectAuthorId($iObjId);
+        $iObjAthrPrivacyView = $this->getObjectPrivacyView($iObjId);
+
+        $iCmtPrntId = (int)$aCmt['cmt_parent_id'];
+        $iCmtPrntUniqId = $this->getCommentUniqId($iCmtPrntId);
+
+        $iCmtId = (int)$aCmt['cmt_id'];
+        $iCmtUniqId = $this->getCommentUniqId($iCmtId);
+
+        return array(
+            'object_system' => $this->_sSystem, 
+            'object_id' => $iObjId, 
+            'object_author_id' => $iObjAthrId,
+
+            'parent_id' => $iCmtPrntId,
+            'parent_uniq_id' => $iCmtPrntUniqId,
+            'parent_author_id' => $aCmtPrnt['cmt_author_id'],
+
+            'comment_id' => $iCmtId,
+            'comment_uniq_id' => $iCmtUniqId,
+            'comment_author_id' => $aCmt['cmt_author_id'],  
+            'comment_text' => $aCmt['cmt_text'],
+
+            'privacy_view' => $iObjAthrPrivacyView,
+        );
+    }
+
     protected function _prepareAuditParams($iId, $aData)
     {
         $sModule = $this->_aSystem['module'];

modules/base/notifications/classes/BxBaseModNotificationsModule.php

@@ -9,6 +9,18 @@
  * @{
  */
 
+/**
+ * SLTMODE - Silent mode:
+ * It is needed for alert sending module to tell that the alert should be ignored 
+ * with Notifications module completely or partially. Available values: 
+ * 1. disabled (value = 0) - all notifications are available;
+ * 2. absolute (value = 1) - alert isn't registered which means that there is no notifications at all;
+ * 
+ * @see BxBaseModNotificationsResponse::response - 'silent_mode' parameter in Alerts Extras array.
+ */
+define('BX_BASE_MOD_NTFS_SLTMODE_DISABLED', 0);
+define('BX_BASE_MOD_NTFS_SLTMODE_ABSOLUTE', 1);
+
 define('BX_BASE_MOD_NTFS_HANDLER_TYPE_INSERT', 'insert');
 define('BX_BASE_MOD_NTFS_HANDLER_TYPE_UPDATE', 'update');
 define('BX_BASE_MOD_NTFS_HANDLER_TYPE_DELETE', 'delete');
@@ -157,7 +169,7 @@ class BxBaseModNotificationsModule extends BxBaseModGeneralModule
 
     public function isAllowedView($aEvent, $bPerform = false)
     {
-		return true;
+        return true;
     }
 
     public function getOwnerId()
@@ -165,6 +177,14 @@ class BxBaseModNotificationsModule extends BxBaseModGeneralModule
     	return $this->_iOwnerId;
     }
 
+    public function getSilentMode($aExtras)
+    {
+        if(isset($aExtras['silent_mode']))
+            return (int)$aExtras['silent_mode'];
+
+        return BX_BASE_MOD_NTFS_SLTMODE_DISABLED;
+    }
+
     /*
      * Retrieve the Privacy from an array (Alert's Extras or Content field from DB) 
      */