gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-14 17:19:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

send mail to notifier of folder too, remove old code

Browse Source
This commit is contained in:
Uwe Steinmann 2015-11-25 21:39:51 +01:00
parent 8d88844190
commit a8dbe05346
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
op/op.RemoveDocument.php
View File

@ -53,7 +53,12 @@ if($document->isLocked()) {
$folder = $document->getFolder(); $folder = $document->getFolder();
/* Get the notify list before removing the document */ /* Get the notify list before removing the document */
$nl = $document->getNotifyList(); $dnl = $document->getNotifyList();
$fnl = $folder->getNotifyList();
$nl = array(
'users'=>array_merge($dnl['users'], $fnl['users']),
'groups'=>array_merge($dnl['groups'], $fnl['groups'])
);
$docname = $document->getName(); $docname = $document->getName();
if (!$document->remove()) { if (!$document->remove()) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("error_occured")); UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("error_occured"));
@ -72,29 +77,6 @@ if (!$document->remove()) {
} }
if ($notifier){ if ($notifier){
/*
$path = "";
$folderPath = $folder->getPath();
for ($i = 0; $i < count($folderPath); $i++) {
$path .= $folderPath[$i]->getName();
if ($i +1 < count($folderPath))
$path .= " / ";
}
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_deleted_email");
$message = getMLText("document_deleted_email")."\r\n";
$message .=
getMLText("document").": ".$document->getName()."\r\n".
getMLText("folder").": ".$path."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".
getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> ";
// Send notification to subscribers.
$notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
}
*/
$subject = "document_deleted_email_subject"; $subject = "document_deleted_email_subject";
$message = "document_deleted_email_body"; $message = "document_deleted_email_body";
$params = array(); $params = array();