PT-2294593: Bulk emails.

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

PT-2294593: Bulk emails.
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent fd2ac338
Showing 2 changed files with 4 additions and 4 deletions
lib/foldermanagement/compressionArchiveUtil.inc.php
plugins/ktcore/KTBulkActions.php
@@ -668,9 +668,10 @@ class DownloadQueue
      *
      * @param unknown_type $zip
      * @param unknown_type $docId
+     * @param boolean $alerts
      * @return unknown
      */
-    public function addDocument(&$zip, $docId)
+    public function addDocument(&$zip, $docId, $alerts = true)
     {
         $oDocument = Document::get($docId);
@@ -685,7 +686,7 @@ class DownloadQueue
         }
         // fire subscription alerts for the downloaded document - if global config is set
-        if($this->bNotifications){
+        if($this->bNotifications && $alerts){
             $oSubscriptionEvent = new SubscriptionEvent();
             $oFolder = Folder::get($oDocument->getFolderID());
             $oSubscriptionEvent->DownloadDocument($oDocument, $oFolder);
@@ -1197,7 +1197,6 @@ class KTBrowseBulkExportAction extends KTBulkAction {
       *
       */
     function perform_action($oEntity) {
-        // TODO find a way to do bulk email
         $exportCode = $_SESSION['exportcode'];
         $this->oZip = ZipFolder::get($exportCode);
@@ -1216,7 +1215,7 @@ class KTBrowseBulkExportAction extends KTBulkAction {
 	    	if($useQueue){
                 DownloadQueue::addItem($this->sExportCode, $this->oFolder->getId(), $oDocument->iId, 'document');
 	    	}else{
-                $oQueue->addDocument($this->oZip, $oDocument->iId);
+                $oQueue->addDocument($this->oZip, $oDocument->iId, false);
 	    	}