move sending notification emails into notification service

This commit is contained in:
Uwe Steinmann 2021-05-19 21:19:32 +02:00
parent 8de5b0ab15
commit aa8f6250b3
3 changed files with 111 additions and 176 deletions

View File

@ -954,5 +954,90 @@ class SeedDMS_NotificationService {
} /* }}} */ } /* }}} */
public function sendChangedDocumentOwnerMail($document, $user, $oldowner) { /* {{{ */
if($oldowner->getID() != $document->getOwner()->getID()) {
$notifyList = $document->getNotifyList();
$folder = $document->getFolder();
$subject = "ownership_changed_email_subject";
$message = "ownership_changed_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$params['old_owner'] = $oldowner->getFullName();
$params['new_owner'] = $document->getOwner()->getFullName();
$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$params['sitename'] = $this->settings->_siteName;
$params['http_root'] = $this->settings->_httpRoot;
$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
// $notifier->toIndividual($user, $oldowner, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
}
} /* }}} */
public function sendChangedFolderOwnerMail($folder, $user, $oldowner) { /* {{{ */
if($oldowner->getID() != $folder->getOwner()->getID()) {
$notifyList = $folder->getNotifyList();
$subject = "ownership_changed_email_subject";
$message = "ownership_changed_email_body";
$params = array();
$params['name'] = $folder->getName();
if($folder->getParent())
$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
else
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$params['old_owner'] = $oldowner->getFullName();
$params['new_owner'] = $folder->getOwner()->getFullName();
$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
$params['sitename'] = $this->settings->_siteName;
$params['http_root'] = $this->settings->_httpRoot;
$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
}
} /* }}} */
public function sendChangedDocumentAccessMail($document, $user) { /* {{{ */
$notifyList = $document->getNotifyList();
$folder = $document->getFolder();
$subject = "access_permission_changed_email_subject";
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$params['sitename'] = $this->settings->_siteName;
$params['http_root'] = $this->settings->_httpRoot;
$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
} /* }}} */
public function sendChangedFolderAccessMail($folder, $user) { /* {{{ */
$notifyList = $folder->getNotifyList();
$subject = "access_permission_changed_email_subject";
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $folder->getName();
if($folder->getParent())
$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
else
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
$params['sitename'] = $this->settings->_siteName;
$params['http_root'] = $this->settings->_httpRoot;
$this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
} /* }}} */
} }

View File

@ -121,7 +121,7 @@ if($action == 'setowner') {
if (!$user->isAdmin()) { if (!$user->isAdmin()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
} }
if (empty($_GET["ownerid"])) { if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group")); UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
} }
if (!($newowner = $dms->getUser($_GET["ownerid"]))) { if (!($newowner = $dms->getUser($_GET["ownerid"]))) {
@ -130,7 +130,6 @@ if($action == 'setowner') {
$oldowner = $document->getOwner(); $oldowner = $document->getOwner();
} }
$controller->setParam('document', $document); $controller->setParam('document', $document);
$controller->setParam('folder', $folder); $controller->setParam('folder', $folder);
$controller->setParam('settings', $settings); $controller->setParam('settings', $settings);
@ -145,27 +144,10 @@ if(!$controller->run()) {
// Change owner ----------------------------------------------------------- // Change owner -----------------------------------------------------------
if ($action == "setowner") { if ($action == "setowner") {
if($notifier) {
$notifier->sendChangedDocumentOwnerMail($document, $user, $oldowner);
}
if($oldowner->getID() != $newowner->getID()) { if($oldowner->getID() != $newowner->getID()) {
if($notifier) {
$notifyList = $document->getNotifyList();
$folder = $document->getFolder();
$subject = "ownership_changed_email_subject";
$message = "ownership_changed_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$params['old_owner'] = $oldowner->getFullName();
$params['new_owner'] = $newowner->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
// $notifier->toIndividual($user, $oldowner, $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner')));
} }
} }
@ -173,69 +155,26 @@ if ($action == "setowner") {
// Change to not inherit --------------------------------------------------- // Change to not inherit ---------------------------------------------------
else if ($action == "notinherit") { else if ($action == "notinherit") {
if($notifier) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifier->sendChangedDocumentAccessMail($document, $user);
$folder = $document->getFolder(); }
$subject = "access_permission_changed_email_subject"; $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
} }
// Change to inherit----------------------------------------------------- // Change to inherit-----------------------------------------------------
else if ($action == "inherit") { else if ($action == "inherit") {
if($notifier) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifier->sendChangedDocumentAccessMail($document, $user);
$folder = $document->getFolder(); }
$subject = "access_permission_changed_email_subject"; $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
} }
// Set default permissions ---------------------------------------------- // Set default permissions ----------------------------------------------
else if ($action == "setdefault") { else if ($action == "setdefault") {
if($notifier) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifier->sendChangedDocumentAccessMail($document, $user);
$folder = $document->getFolder(); }
$subject = "access_permission_changed_email_subject"; $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));
} elseif($action == "delaccess") { } elseif($action == "delaccess") {
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_delete_access'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_delete_access')));
} elseif($action == "addaccess") { } elseif($action == "addaccess") {

View File

@ -110,40 +110,20 @@ if (isset($_GET["groupid"])) {
// Change owner ----------------------------------------------------------- // Change owner -----------------------------------------------------------
if ($action == "setowner") { if ($action == "setowner") {
if (!$user->isAdmin()) { if (!$user->isAdmin()) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
} }
if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) { if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
} }
$newOwner = $dms->getUser($_GET["ownerid"]); if (!($newowner = $dms->getUser($_GET["ownerid"]))) {
if (!is_object($newOwner)) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
} }
$oldOwner = $folder->getOwner(); $oldOwner = $folder->getOwner();
if($folder->setOwner($newOwner)) { if($folder->setOwner($newowner)) {
if($notifier) { if($notifier) {
// Send notification to subscribers. // Send notification to subscribers.
$notifyList = $folder->getNotifyList(); $notifier->sendChangedFolderOwnerMail($folder, $user, $oldOwner);
$subject = "ownership_changed_email_subject";
$message = "ownership_changed_email_body";
$params = array();
$params['name'] = $folder->getName();
if($folder->getParent())
$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
else
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$params['old_owner'] = $oldOwner->getFullName();
$params['new_owner'] = $newOwner->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
} }
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_setowner')));
} else { } else {
@ -156,49 +136,12 @@ else if ($action == "notinherit") {
$defAccess = $folder->getDefaultAccess(); $defAccess = $folder->getDefaultAccess();
if($folder->setInheritAccess(false)) { if($folder->setInheritAccess(false)) {
if($notifier) { if($folder->setDefaultAccess($defAccess)) {
// Send notification to subscribers. if($notifier) {
$notifyList = $folder->getNotifyList(); // Send notification to subscribers.
$subject = "access_permission_changed_email_subject"; $notifier->sendChangedFolderAccessMail($folder, $user);
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $folder->getName();
if($folder->getParent())
$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
else
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
} }
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_notinherit_access')));
}
}
if($folder->setDefaultAccess($defAccess)) {
if($notifier) {
// Send notification to subscribers.
$notifyList = $folder->getNotifyList();
$subject = "access_permission_changed_email_subject";
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $folder->getName();
if($folder->getParent())
$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
else
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
} }
} }
if ($mode == "copy") { if ($mode == "copy") {
@ -220,23 +163,7 @@ else if ($action == "inherit") {
if($folder->setInheritAccess(true)) { if($folder->setInheritAccess(true)) {
if($notifier) { if($notifier) {
// Send notification to subscribers. // Send notification to subscribers.
$notifyList = $folder->getNotifyList(); $notifier->sendChangedFolderAccessMail($folder, $user);
$subject = "access_permission_changed_email_subject";
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $folder->getName();
if($folder->getParent())
$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
else
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
} }
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_inherit_access')));
} }
@ -247,23 +174,7 @@ else if ($action == "setdefault") {
if($folder->setDefaultAccess($mode)) { if($folder->setDefaultAccess($mode)) {
if($notifier) { if($notifier) {
// Send notification to subscribers. // Send notification to subscribers.
$notifyList = $folder->getNotifyList(); $notifier->sendChangedFolderAccessMail($folder, $user);
$subject = "access_permission_changed_email_subject";
$message = "access_permission_changed_email_body";
$params = array();
$params['name'] = $folder->getName();
if($folder->getParent())
$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
else
$params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName();
$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, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
} }
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_set_default_access')));
} }