Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -197,6 +197,8 @@
 - fix possible csrf attacks due to missing form token
 - show an error msg on the documents detail page if the checksum of version
   mismatch
+- overhaul notifications, type of receiver is now passed to notification
+  service which allows a more fine grained filtering
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.21

SeedDMS_Core/Core/inc.ClassGroup.php

@@ -131,6 +131,13 @@ class SeedDMS_Core_Group { /* {{{ */
 		$this->_dms = $dms;
 	} /* }}} */
 
+	/**
+	 * @return SeedDMS_Core_DMS $dms
+	 */
+	function getDMS() {
+		return $this->_dms;
+	}
+
 	/**
 	 * @return int
 	 */

SeedDMS_Core/Core/inc.ClassUser.php

@@ -504,6 +504,13 @@ class SeedDMS_Core_User { /* {{{ */
 		$this->_dms = $dms;
 	}
 
+	/**
+	 * @return SeedDMS_Core_DMS $dms
+	 */
+	function getDMS() {
+		return $this->_dms;
+	}
+
 	/**
 	 * @return int
 	 */

inc/inc.Authentication.php

@@ -110,7 +110,8 @@ if($settings->_useHomeAsRootFolder && !$user->isAdmin() && $user->getHomeFolder(
 $role = $user->getRole();
 $dms->noReadForStatus = $role->getNoAccess();
 
-$notifier = new SeedDMS_NotificationService();
+global $logger;
+$notifier = new SeedDMS_NotificationService($logger);
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {

inc/inc.ClassEmailNotify.php

@@ -197,6 +197,11 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		}
 	} /* }}} */
 
+	/**
+	 * This method is deprecated!
+	 *
+	 * The dispatching is now done in SeedDMS_NotificationService::toGroup()
+	 */
 	function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) { /* {{{ */
 		if ((!is_object($sender) && strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) ||
 				(!is_object($groupRecipient) || strcasecmp(get_class($groupRecipient), $this->_dms->getClassname('group')))) {
@@ -210,16 +215,22 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		return true;
 	} /* }}} */
 
+	/**
+	 * This method is deprecated!
+	 *
+	 * The dispatching is now done in SeedDMS_NotificationService::toList()
+	 */
 	function toList($sender, $recipients, $subject, $message, $params=array()) { /* {{{ */
 		if ((!is_object($sender) && strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) ||
 				(!is_array($recipients) && count($recipients)==0)) {
 			return false;
 		}
 
+		$ret = true;
 		foreach ($recipients as $recipient) {
-			$this->toIndividual($sender, $recipient, $subject, $message, $params);
+			$ret &= $this->toIndividual($sender, $recipient, $subject, $message, $params);
 		}
 
-		return true;
+		return $ret;
 	} /* }}} */
 }

inc/inc.ClassNotificationService.php

@@ -31,9 +31,25 @@ class SeedDMS_NotificationService {
 	 */
 	protected $errors;
 
-	public function __construct() {
+	/*
+	 * Service for logging
+	 */
+	protected $logger;
+
+	/*
+	 * Possible types of receivers
+	 */
+	const RECV_ANY = 0;
+	const RECV_NOTIFICATION = 1;
+	const RECV_OWNER = 2;
+	const RECV_REVIEWER = 3;
+	const RECV_APPROVER = 4;
+	const RECV_WORKFLOW = 5;
+
+	public function __construct($logger = null) {
 		$this->services = array();
 		$this->errors = array();
+		$this->logger = $logger;
 	}
 
 	public function addService($service, $name='') {
@@ -51,14 +67,21 @@ class SeedDMS_NotificationService {
 		return $this->errors;
 	}
 
-	public function toIndividual($sender, $recipient, $subject, $message, $params=array()) {
+	public function toIndividual($sender, $recipient, $subject, $message, $params=array(), $recvtype=0) {
 		$error = true;
 		foreach($this->services as $name => $service) {
-			if(!is_callable([$service, 'filter']) || $service->filter($sender, $recipient, $subject, $message, $params)) {
+			if(!is_callable([$service, 'filter']) || $service->filter($sender, $recipient, $subject, $message, $params, $recvtype)) {
+				if(is_object($recipient) && ($dms = $recipient->getDMS()) && !strcasecmp(get_class($recipient), $dms->getClassname('user')) && !$recipient->isDisabled() && $recipient->getEmail()!="") {
+					$to = $recipient->getEmail();
+				} elseif(is_string($recipient) && trim($recipient) != "") {
+					$to = $recipient;
+				}
 				if(!$service->toIndividual($sender, $recipient, $subject, $message, $params)) {
 					$error = false;
 					$this->errors[$name] = false;
+					$this->logger->log('Notification service: '.$name.'. Sending mail \''.$subject.'\' to user \''.$to.'\' failed.', PEAR_LOG_ERR);
 				} else {
+					$this->logger->log('Notification service: '.$name.'. Sending mail \''.$subject.'\' to user \''.$to.'\' successful.', PEAR_LOG_INFO);
 					$this->errors[$name] = true;
 				}
 			}
@@ -66,31 +89,48 @@ class SeedDMS_NotificationService {
 		return $error;
 	}
 
-	public function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) {
+	/**
+	 * Send a notification to each user of a group
+	 *
+	 */
+	public function toGroup($sender, $groupRecipient, $subject, $message, $params=array(), $recvtype=0) {
 		$error = true;
 		foreach($this->services as $name => $service) {
-			if(!is_callable([$service, 'filter']) || $service->filter($sender, $groupRecipient, $subject, $message, $params)) {
+			$ret = true;
-				if(!$service->toGroup($sender, $groupRecipient, $subject, $message, $params)) {
+			foreach ($groupRecipient->getUsers() as $recipient) {
-					$error = false;
+				$ret &= $this->toIndividual($sender, $recipient, $subject, $message, $params, $recvtype);
-					$this->errors[$name] = false;
+			}
-				} else {
+			$this->errors[$name] = $ret;
-					$this->errors[$name] = true;
+			if(!$ret) {
-				}
+				$error = false;
 			}
 		}
 		return $error;
 	}
 
-	public function toList($sender, $recipients, $subject, $message, $params=array()) {
+	/**
+	 * Send a notification to a list of recipients
+	 *
+	 * The list of recipients may contain both email addresses and users
+	 *
+	 * @param string|object $sender either an email address or a user
+	 * @param array $recipients list of recipients
+	 * @param string $subject key of translatable phrase for the subject
+	 * @param string $message key of translatable phrase for the message body
+	 * @param array $params list of parameters filled into the subject and body
+	 * @param int $recvtype type of receiver
+	 * @return boolean true on success, otherwise false
+	 */
+	public function toList($sender, $recipients, $subject, $message, $params=array(), $recvtype=0) {
 		$error = true;
 		foreach($this->services as $name => $service) {
-			if(!is_callable([$service, 'filter']) || $service->filter($sender, $recipients, $subject, $message, $params)) {
+			$ret = true;
-				if(!$service->toList($sender, $recipients, $subject, $message, $params)) {
+			foreach ($recipients as $recipient) {
-					$error = false;
+				$ret &= $this->toIndividual($sender, $recipients, $subject, $message, $params, $recvtype);
-					$this->errors[$name] = false;
+			}
-				} else {
+			$this->errors[$name] = $ret;
-					$this->errors[$name] = true;
+			if(!$ret) {
-				}
+				$error = false;
 			}
 		}
 		return $error;

op/op.AddDocument.php

@@ -500,9 +500,9 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 
 			if($workflow && $settings->_enableNotificationWorkflow) {
@@ -521,10 +521,10 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 
 				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
 					foreach($ntransition->getUsers() as $tuser) {
-						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 					}
 					foreach($ntransition->getGroups() as $tuser) {
-						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 					}
 				}
 			}
@@ -545,10 +545,10 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 					$params['http_root'] = $settings->_httpRoot;
 
 					foreach($reviewers['i'] as $reviewerid) {
-						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 					}
 					foreach($reviewers['g'] as $reviewergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 					}
 				}
 
@@ -566,10 +566,10 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 					$params['http_root'] = $settings->_httpRoot;
 
 					foreach($approvers['i'] as $approverid) {
-						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					}
 					foreach($approvers['g'] as $approvergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					}
 				}
 			}

op/op.AddFile.php

@@ -123,9 +123,9 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 	}

op/op.AddSubFolder.php

@@ -139,9 +139,9 @@ if(!$subFolder = $controller->run()) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 	}
 }

op/op.Ajax.php

@@ -485,9 +485,9 @@ switch($command) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID();
-								$notifier->toList($user, $nl["users"], $subject, $message, $params);
+								$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 								foreach ($nl["groups"] as $grp) {
-									$notifier->toGroup($user, $grp, $subject, $message, $params);
+									$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 								}
 							}
 							header('Content-Type: application/json');
@@ -541,9 +541,9 @@ switch($command) {
 								$params['username'] = $user->getFullName();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
-								$notifier->toList($user, $nl["users"], $subject, $message, $params);
+								$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 								foreach ($nl["groups"] as $grp) {
-									$notifier->toGroup($user, $grp, $subject, $message, $params);
+									$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 								}
 							}
 
@@ -842,9 +842,9 @@ switch($command) {
 						$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 						$params['sitename'] = $settings->_siteName;
 						$params['http_root'] = $settings->_httpRoot;
-						$notifier->toList($user, $nl["users"], $subject, $message, $params);
+						$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 						foreach ($nl["groups"] as $grp) {
-							$notifier->toGroup($user, $grp, $subject, $message, $params);
+							$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 						}
 
 						if($workflow && $settings->_enableNotificationWorkflow) {
@@ -863,10 +863,10 @@ switch($command) {
 
 							foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
 								foreach($ntransition->getUsers() as $tuser) {
-									$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+									$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 								}
 								foreach($ntransition->getGroups() as $tuser) {
-									$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+									$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 								}
 							}
 						}
@@ -887,10 +887,10 @@ switch($command) {
 								$params['http_root'] = $settings->_httpRoot;
 
 								foreach($reviewers['i'] as $reviewerid) {
-									$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+									$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 								}
 								foreach($reviewers['g'] as $reviewergrpid) {
-									$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+									$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 								}
 							}
 
@@ -908,10 +908,10 @@ switch($command) {
 								$params['http_root'] = $settings->_httpRoot;
 
 								foreach($approvers['i'] as $approverid) {
-									$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+									$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 								}
 								foreach($approvers['g'] as $approvergrpid) {
-									$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+									$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 								}
 							}
 						}

op/op.ApproveDocument.php

@@ -124,13 +124,13 @@ if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") {
 		$params['http_root'] = $settings->_httpRoot;
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 
-		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 
 		// Send notification to subscribers.
 		$nl=$document->getNotifyList();
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 		}
 	}
 }
@@ -154,9 +154,9 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params['http_root'] = $settings->_httpRoot;
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 	}
 	

op/op.DocumentAccess.php

@@ -160,11 +160,11 @@ if ($action == "setowner") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
-//			$notifier->toIndividual($user, $oldowner, $subject, $message, $params);
+//			$notifier->toIndividual($user, $oldowner, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner')));
 	}
@@ -185,9 +185,9 @@ else if ($action == "notinherit") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 
 		}
@@ -208,9 +208,9 @@ else if ($action == "inherit") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
@@ -230,9 +230,9 @@ else if ($action == "setdefault") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));

op/op.DocumentNotify.php

@@ -112,10 +112,10 @@ if ($action == "delnotify"){
 				$params['http_root'] = $settings->_httpRoot;
 
 				if ($userid > 0) {
-					$notifier->toIndividual($user, $obj, $subject, $message, $params);
+					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 				else {
-					$notifier->toGroup($user, $obj, $subject, $message, $params);
+					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 			break;
@@ -154,7 +154,7 @@ else if ($action == "addnotify") {
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 
-					$notifier->toIndividual($user, $obj, $subject, $message, $params);
+					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 
 				break;
@@ -188,7 +188,7 @@ else if ($action == "addnotify") {
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 
-					$notifier->toGroup($user, $obj, $subject, $message, $params);
+					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 				break;
 		}

op/op.EditAttributes.php

@@ -114,9 +114,9 @@ if($oldattributes) {
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 		}
@@ -142,9 +142,9 @@ if($newattributes) {
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 		}

op/op.EditComment.php

@@ -103,9 +103,9 @@ if (($oldcomment = $version->getComment()) != $comment) {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 
 		}

op/op.EditDocument.php

@@ -167,11 +167,11 @@ if ($oldname != $name) {
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()->getID() &&
 				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifyList['users'][] = $document->getOwner();
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 }
@@ -196,11 +196,11 @@ if ($oldcomment != $comment) {
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()->getID() &&
 				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifyList['users'][] = $document->getOwner();
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 }
@@ -223,11 +223,11 @@ if ($expires != $oldexpires) {
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()->getID() &&
 				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifyList['users'][] = $document->getOwner();
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 }
@@ -254,9 +254,9 @@ if($oldattributes) {
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 		}
@@ -281,9 +281,9 @@ if($newattributes) {
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 		}

op/op.EditFolder.php

@@ -112,13 +112,13 @@ if($oldname != $name) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+		$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 		// if user is not owner send notification to owner
 //		if ($user->getID() != $folder->getOwner()->getID()) 
-//			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
+//			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 
@@ -138,13 +138,13 @@ if($oldcomment != $comment) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+		$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 		// if user is not owner send notification to owner
 //		if ($user->getID() != $folder->getOwner()->getID()) 
-//			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
+//			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 
 	}
 }
@@ -168,9 +168,9 @@ if($oldattributes) {
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 		}
@@ -195,9 +195,9 @@ if($newattributes) {
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 		}

op/op.EditOnline.php

@@ -88,9 +88,9 @@ if($lc->getChecksum() == SeedDMS_Core_File::checksum($tmpfname)) {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 		echo json_encode(array('success'=>true, 'message'=>getMLText('splash_saved_file')));

op/op.FolderAccess.php

@@ -140,9 +140,9 @@ if ($action == "setowner") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner')));
@@ -171,9 +171,9 @@ else if ($action == "notinherit") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
 		}
@@ -194,9 +194,9 @@ else if ($action == "notinherit") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 
 		}
@@ -233,9 +233,9 @@ else if ($action == "inherit") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
@@ -260,9 +260,9 @@ else if ($action == "setdefault") {
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));

op/op.FolderNotify.php

@@ -107,10 +107,10 @@ if ($action == "delnotify") {
 				$params['http_root'] = $settings->_httpRoot;
 
 				if ($userid > 0) {
-					$notifier->toIndividual($user, $obj, $subject, $message, $params);
+					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 				else {
-					$notifier->toGroup($user, $obj, $subject, $message, $params);
+					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 			break;
@@ -149,7 +149,7 @@ else if ($action == "addnotify") {
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 
-					$notifier->toIndividual($user, $obj, $subject, $message, $params);
+					$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 
 				break;
@@ -184,7 +184,7 @@ else if ($action == "addnotify") {
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 
-					$notifier->toGroup($user, $obj, $subject, $message, $params);
+					$notifier->toGroup($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 				break;
 		}

op/op.ManageNotify.php

@@ -29,7 +29,7 @@ if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
 }
 
-function add_folder_notify($folder,$userid,$recursefolder,$recursedoc) {
+function add_folder_notify($folder,$userid,$recursefolder,$recursedoc) { /* {{{ */
 	global $dms;
 
 	$folder->addNotify($userid, true);
@@ -55,7 +55,7 @@ function add_folder_notify($folder,$userid,$recursefolder,$recursedoc) {
 		foreach($subFolders as $subFolder)
 			add_folder_notify($subFolder,$userid,$recursefolder,$recursedoc);
 	}
-}
+} /* }}} */
 
 if (!isset($_GET["type"])) UI::exitError(getMLText("my_account"),getMLText("error_occured"));
 if (!isset($_GET["action"])) UI::exitError(getMLText("my_account"),getMLText("error_occured"));
@@ -123,7 +123,7 @@ if ($_GET["type"]=="document"){
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
 
-				$notifier->toIndividual($user, $obj, $subject, $message, $params);
+				$notifier->toIndividual($user, $obj, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 	}

op/op.MoveClipboard.php

@@ -73,13 +73,13 @@ foreach($clipboard['docs'] as $documentid) {
 					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
-					$notifier->toList($user, $nl["users"], $subject, $message, $params);
+					$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 					foreach ($nl["groups"] as $grp) {
-						$notifier->toGroup($user, $grp, $subject, $message, $params);
+						$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 					}
 					// if user is not owner send notification to owner
 //					if ($user->getID() != $document->getOwner()->getID()) 
-//						$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
+//						$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 				}
 				$session->removeFromClipboard($document);
 
@@ -120,13 +120,13 @@ foreach($clipboard['folders'] as $folderid) {
 				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
-				$notifier->toList($user, $nl["users"], $subject, $message, $params);
+				$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 				// if user is not owner send notification to owner
 //				if ($user->getID() != $folder->getOwner()->getID()) 
-//					$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
+//					$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 
 			}
 			$session->removeFromClipboard($folder);

op/op.MoveDocument.php

@@ -99,13 +99,13 @@ if ($document->setFolder($targetFolder)) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 		// if user is not owner send notification to owner
 //			if ($user->getID() != $document->getOwner()->getID()) 
-//				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
+//				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 
 } else {

op/op.MoveFolder.php

@@ -98,13 +98,13 @@ if ($folder->setParent($targetFolder)) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 		// if user is not owner send notification to owner
 		//if ($user->getID() != $folder->getOwner()->getID()) 
-		//	$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
+		//	$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 
 	}
 } else {

op/op.OverrideContentStatus.php

@@ -99,12 +99,12 @@ if ($overrideStatus != $overallStatus["status"]) {
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 
-//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 		}
 	}
 }

op/op.RemoveDocument.php

@@ -98,9 +98,9 @@ if ($notifier){
 	$params['sitename'] = $settings->_siteName;
 	$params['http_root'] = $settings->_httpRoot;
 	$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
-	$notifier->toList($user, $nl["users"], $subject, $message, $params);
+	$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	foreach ($nl["groups"] as $grp) {
-		$notifier->toGroup($user, $grp, $subject, $message, $params);
+		$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	}
 }
 

op/op.RemoveDocumentFile.php

@@ -78,9 +78,9 @@ if (!$document->removeDocumentFile($fileid)) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+		$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 	}
 }

op/op.RemoveFolder.php

@@ -94,9 +94,9 @@ if ($notifier) {
 	$params['sitename'] = $settings->_siteName;
 	$params['http_root'] = $settings->_httpRoot;
 	$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID();
-	$notifier->toList($user, $nl["users"], $subject, $message, $params);
+	$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	foreach ($nl["groups"] as $grp) {
-		$notifier->toGroup($user, $grp, $subject, $message, $params);
+		$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	}
 }
 

op/op.RemoveVersion.php

@@ -92,9 +92,9 @@ if (count($document->getContent())==1) {
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 	}
@@ -103,25 +103,27 @@ else {
 	/* Before deleting the content get a list of all users that should
 	 * be informed about the removal.
 	 */
-	$emailUserList = array();
+	$emailUserListR = array();
-	$emailUserList[] = $version->getUser()->getID();
+	$emailUserListA = array();
-	$emailGroupList = array();
+	$oldowner = $version->getUser();
+	$emailGroupListR = array();
+	$emailGroupListA = array();
 	$status = $version->getReviewStatus();
 	foreach ($status as $st) {
 		if ($st["status"]==0 && !in_array($st["required"], $emailUserList)) {
 			if($st['type'] == 0)
-				$emailUserList[] = $st["required"];
+				$emailUserListR[] = $st["required"];
 			else
-				$emailGroupList[] = $st["required"];
+				$emailGroupListR[] = $st["required"];
 		}
 	}
 	$status = $version->getApprovalStatus();
 	foreach ($status as $st) {
 		if ($st["status"]==0 && !in_array($st["required"], $emailUserList)) {
 			if($st['type'] == 0)
-				$emailUserList[] = $st["required"];
+				$emailUserListA[] = $st["required"];
 			else
-				$emailGroupList[] = $st["required"];
+				$emailGroupListA[] = $st["required"];
 		}
 	}
 
@@ -152,15 +154,25 @@ else {
 		// Notify affected users.
 		if ($notifier){
 			$nl=$document->getNotifyList();
-			$userrecipients = array();
+			$userrecipientsR = array();
-			foreach ($emailUserList as $eID) {
+			foreach ($emailUserListR as $eID) {
 				$eU = $version->getDMS()->getUser($eID);
-				$userrecipients[] = $eU;
+				$userrecipientsR[] = $eU;
 			}
-			$grouprecipients = array();
+			$grouprecipientsR = array();
-			foreach ($emailGroupList as $eID) {
+			foreach ($emailGroupListR as $eID) {
 				$eU = $version->getDMS()->getGroup($eID);
-				$grouprecipients[] = $eU;
+				$grouprecipientsR[] = $eU;
+			}
+			$userrecipientsA = array();
+			foreach ($emailUserListA as $eID) {
+				$eU = $version->getDMS()->getUser($eID);
+				$userrecipientsA[] = $eU;
+			}
+			$grouprecipientsA = array();
+			foreach ($emailGroupListA as $eID) {
+				$eU = $version->getDMS()->getGroup($eID);
+				$grouprecipientsA[] = $eU;
 			}
 
 			$subject = "version_deleted_email_subject";
@@ -173,13 +185,18 @@ else {
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$notifier->toList($user, $userrecipients, $subject, $message, $params);
+			$notifier->toIndividual($user, $oldowner, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			$notifier->toList($user, $userrecipientsR, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
-			foreach($grouprecipients as $grp) {
+			$notifier->toList($user, $userrecipientsA, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+			foreach($grouprecipientsR as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
+			}
+			foreach($grouprecipientsA as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 			}
 			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 		}
 	}

op/op.RemoveWorkflowFromDocument.php

@@ -86,9 +86,9 @@ if($version->removeWorkflow($user)) {
 		$params['http_root'] = $settings->_httpRoot;
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		// Send notification to subscribers.
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 	}
 }

op/op.ReturnFromSubWorkflow.php

@@ -100,9 +100,9 @@ if($version->returnFromSubWorkflow($user, $transition, $_POST["comment"])) {
 		$params['http_root'] = $settings->_httpRoot;
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		// Send notification to subscribers.
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 	}
 }

op/op.ReviewDocument.php

@@ -125,9 +125,9 @@ if ($_POST["reviewType"] == "ind" || $_POST["reviewType"] == "grp") {
 		$params['http_root'] = $settings->_httpRoot;
 		$notifier->toList($user, $nl["users"], $subject, $message, $params);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
-//		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+//		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 
@@ -147,11 +147,11 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
-//		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+//		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 
@@ -176,11 +176,11 @@ if ($newdocstatus['status'] == S_DRAFT_APP) {
 					if ($dastat["type"] == 0) {
 
 						$approver = $dms->getUser($dastat["required"]);
-						$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
+						$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					} elseif ($dastat["type"] == 1) {
 					
 						$group = $dms->getGroup($dastat["required"]);
-						$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
+						$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					}
 				}
 			}

op/op.RewindWorkflow.php

@@ -85,9 +85,9 @@ if($version->rewindWorkflow()) {
 		$params['http_root'] = $settings->_httpRoot;
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		// Send notification to subscribers.
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 	}
 }

op/op.RunSubWorkflow.php

@@ -94,9 +94,9 @@ if($version->runSubWorkflow($subworkflow)) {
 		$params['http_root'] = $settings->_httpRoot;
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		// Send notification to subscribers.
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 		}
 	}
 }

op/op.SetReviewersApprovers.php

@@ -156,7 +156,7 @@ foreach ($pIndRev as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
-								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params);
+								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 							}
 						}
 						break;
@@ -222,7 +222,7 @@ if (count($reviewIndex["i"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
-								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params);
+								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 							}
 						}
 						break;
@@ -268,7 +268,7 @@ foreach ($pGrpRev as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
-								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params);
+								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 							}
 						}
 						break;
@@ -326,7 +326,7 @@ if (count($reviewIndex["g"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
-								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params);
+								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 							}
 						}
 						break;
@@ -400,7 +400,7 @@ foreach ($pIndApp as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 
-								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params);
+								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 							}
 						}
 						break;
@@ -458,7 +458,7 @@ if (count($approvalIndex["i"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 
-								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params);
+								$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 							}
 						}
 						break;
@@ -504,7 +504,7 @@ foreach ($pGrpApp as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 
-								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params);
+								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 							}
 						}
 						break;
@@ -562,7 +562,7 @@ if (count($approvalIndex["g"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
-								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params);
+								$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 							}
 						}
 						break;

op/op.SetWorkflow.php

@@ -91,10 +91,10 @@ if ($notifier) {
 
 		foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
 			foreach($ntransition->getUsers() as $tuser) {
-				$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+				$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 			}
 			foreach($ntransition->getGroups() as $tuser) {
-				$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+				$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 			}
 		}
 	}

op/op.TransferDocument.php

@@ -81,9 +81,9 @@ if ($notifier){
 	$params['sitename'] = $settings->_siteName;
 	$params['http_root'] = $settings->_httpRoot;
 	$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-	$notifier->toList($user, $nl["users"], $subject, $message, $params);
+	$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	foreach ($nl["groups"] as $grp) {
-		$notifier->toGroup($user, $grp, $subject, $message, $params);
+		$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 	}
 }
 

op/op.TriggerWorkflow.php

@@ -97,9 +97,9 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 
 		// Send notification to subscribers.
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 
 		if($settings->_enableNotificationWorkflow) {
@@ -122,13 +122,13 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 				foreach($ntransition->getUsers() as $tuser) {
 					if(!in_array($tuser->getUser()->getID(), $usersinformed)) {
 						$usersinformed[] = $tuser->getUser()->getID();
-						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WO▨KFLOW);
 					}
 				}
 				foreach($ntransition->getGroups() as $tuser) {
 					if(!in_array($tuser->getGroup()->getID(), $groupsinformed)) {
 						$groupsinformed[] = $tuser->getGroup()->getID();
-						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 					}
 				}
 			}

op/op.UpdateDocument.php

@@ -382,13 +382,13 @@ default:
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 			// if user is not owner send notification to owner
 //			if ($user->getID() != $document->getOwner()->getID()) 
-//				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
+//				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 
 			if($workflow && $settings->_enableNotificationWorkflow) {
 				$subject = "request_workflow_action_email_subject";
@@ -406,10 +406,10 @@ default:
 
 				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
 					foreach($ntransition->getUsers() as $tuser) {
-						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 					}
 					foreach($ntransition->getGroups() as $tuser) {
-						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 					}
 				}
 			}
@@ -430,10 +430,10 @@ default:
 					$params['http_root'] = $settings->_httpRoot;
 
 					foreach($reviewers['i'] as $reviewerid) {
-						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 					}
 					foreach($reviewers['g'] as $reviewergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 					}
 				}
 
@@ -451,10 +451,10 @@ default:
 					$params['http_root'] = $settings->_httpRoot;
 
 					foreach($approvers['i'] as $approverid) {
-						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					}
 					foreach($approvers['g'] as $approvergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					}
 				}
 			}
@@ -470,9 +470,9 @@ default:
 				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
-				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				foreach ($notifyList["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
+					$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 				}
 			}
 		}

op/op.UsrMgr.php

@@ -317,7 +317,7 @@ else if ($action == "sendlogindata" && $settings->_enableEmail) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php";
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toIndividual($user, $newuser, $subject, $message, $params);
+		$notifier->toIndividual($user, $newuser, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 	add_log_line(".php&action=sendlogindata&userid=".$userid);
 		

webdav/index.php

@@ -27,7 +27,7 @@ if($settings->_logFileEnable) {
 	$log = null;
 }
 
-$notifier = new SeedDMS_NotificationService();
+$notifier = new SeedDMS_NotificationService($log);
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {