From 5bdfb9b2e7ae100dbed5301fa04b965ede8da670 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 8 Dec 2016 06:28:09 +0100 Subject: [PATCH 1/3] add placeholder for newmimetype and newcommand fields --- views/bootstrap/class.Settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 20eb6566b..39ecd58ff 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -666,8 +666,8 @@ if(!is_writeable($settings->_configFilePath)) { } ?> - showTextField("converters_newmimetype", ""); ?> - showTextField("converters_newcmd", ""); ?> + showTextField("converters_newmimetype", "", '', getMLText('mimetype')); ?> + showTextField("converters_newcmd", "", '', getMLText('command')); ?> contentContainerEnd(); ?> From 3ae469fd2b5ca8b315afc8693e720bea735c6f98 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 8 Dec 2016 15:37:12 +0100 Subject: [PATCH 2/3] remove old notification code --- op/op.ApproveDocument.php | 22 --------- op/op.DocumentAccess.php | 68 ---------------------------- op/op.DocumentNotify.php | 54 ---------------------- op/op.EditDocument.php | 38 ---------------- op/op.EditFolder.php | 37 --------------- op/op.FolderAccess.php | 72 ----------------------------- op/op.FolderNotify.php | 52 --------------------- op/op.ManageNotify.php | 19 -------- op/op.MoveDocument.php | 18 -------- op/op.MoveFolder.php | 14 ------ op/op.OverrideContentStatus.php | 15 ------- op/op.ReviewDocument.php | 80 --------------------------------- op/op.TriggerWorkflow.php | 13 ------ 13 files changed, 502 deletions(-) diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php index 5557e76b2..b6fcadf1a 100644 --- a/op/op.ApproveDocument.php +++ b/op/op.ApproveDocument.php @@ -198,17 +198,6 @@ if ($_POST["approvalStatus"]==-1){ if($notifier) { $nl=$document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email"); - $message = getMLText("document_status_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("status").": ".getOverallStatusText($status)."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; -*/ - $subject = "document_status_changed_email_subject"; $message = "document_status_changed_email_body"; $params = array(); @@ -256,17 +245,6 @@ if ($_POST["approvalStatus"]==-1){ if($notifier) { $nl=$document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email"); - $message = getMLText("document_status_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("status").": ".getOverallStatusText($newStatus)."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; - -*/ $subject = "document_status_changed_email_subject"; $message = "document_status_changed_email_body"; $params = array(); diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php index 4a04a8bfb..eccd807dd 100644 --- a/op/op.DocumentAccess.php +++ b/op/op.DocumentAccess.php @@ -127,26 +127,6 @@ if ($action == "setowner") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("ownership_changed_email"); - $message = getMLText("ownership_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("old").": ".$oldOwner->getFullName()."\r\n". - getMLText("new").": ".$newOwner->getFullName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - // Send notification to previous owner. - $notifier->toIndividual($user, $oldOwner, $subject, $message); -*/ - $subject = "ownership_changed_email_subject"; $message = "ownership_changed_email_body"; $params = array(); @@ -176,21 +156,6 @@ else if ($action == "notinherit") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - // Send notification to subscribers. - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -211,24 +176,6 @@ else if ($action == "notinherit") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - // Send notification to subscribers. - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - -// $subject=mydmsDecodeString($subject); -// $message=mydmsDecodeString($message); - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -268,21 +215,6 @@ else if ($action == "setdefault") { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - // Send notification to subscribers. - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php index aa141e2c4..9973ad0ea 100644 --- a/op/op.DocumentNotify.php +++ b/op/op.DocumentNotify.php @@ -95,22 +95,6 @@ if ($action == "delnotify"){ case 0: // Email user / group, informing them of subscription change. if($notifier) { -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("notify_deleted_email"); - $message = getMLText("notify_deleted_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - if (isset($userid)) { - $notifier->toIndividual($user, $obj, $subject, $message); - } - else if (isset($groupid)) { - $notifier->toGroup($user, $obj, $subject, $message); - } -*/ $subject = "notify_deleted_email_subject"; $message = "notify_deleted_email_body"; $params = array(); @@ -154,25 +138,6 @@ else if ($action == "addnotify") { // Email user / group, informing them of subscription. if ($notifier){ $obj = $dms->getUser($userid); -/* - $path=""; - $folder = $document->getFolder(); - $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("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toIndividual($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); @@ -207,25 +172,6 @@ else if ($action == "addnotify") { case 0: if ($notifier){ $obj = $dms->getGroup($groupid); -/* - $path=""; - $folder = $document->getFolder(); - $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("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toGroup($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index 331a35ddf..e59881509 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -77,25 +77,6 @@ if (($oldname = $document->getName()) != $name) { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$oldname." - ".getMLText("document_renamed_email"); - $message = getMLText("document_renamed_email")."\r\n"; - $message .= - getMLText("old").": ".$oldname."\r\n". - getMLText("new").": ".$name."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ $subject = "document_renamed_email_subject"; $message = "document_renamed_email_body"; $params = array(); @@ -130,25 +111,6 @@ if (($oldcomment = $document->getComment()) != $comment) { if($notifier) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("comment_changed_email"); - $message = getMLText("document_comment_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$comment."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID() != $document->getOwner()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ $subject = "document_comment_changed_email_subject"; $message = "document_comment_changed_email_body"; $params = array(); diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 65afbe67f..3d2f4dc1c 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -64,25 +64,6 @@ if(($oldname = $folder->getName()) != $name) { // Send notification to subscribers. if($notifier) { $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_renamed_email"); - $message = getMLText("folder_renamed_email")."\r\n"; - $message .= - getMLText("old").": ".$oldname."\r\n". - getMLText("new").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$comment."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - -// $subject=mydmsDecodeString($subject); -// $message=mydmsDecodeString($message); - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "folder_renamed_email_subject"; $message = "folder_renamed_email_body"; $params = array(); @@ -110,24 +91,6 @@ if(($oldcomment = $folder->getComment()) != $comment) { // Send notification to subscribers. if($notifier) { $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("comment_changed_email"); - $message = getMLText("folder_comment_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$comment."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - -// $subject=mydmsDecodeString($subject); -// $message=mydmsDecodeString($message); - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "folder_comment_changed_email_subject"; $message = "folder_comment_changed_email_body"; $params = array(); diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php index e3aad918f..d69ce8aa4 100644 --- a/op/op.FolderAccess.php +++ b/op/op.FolderAccess.php @@ -124,23 +124,6 @@ if ($action == "setowner") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("ownership_changed_email"); - $message = getMLText("ownership_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("old").": ".$oldOwner->getFullName()."\r\n". - getMLText("new").": ".$newOwner->getFullName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "ownership_changed_email_subject"; $message = "ownership_changed_email_body"; $params = array(); @@ -175,19 +158,6 @@ else if ($action == "notinherit") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -211,19 +181,6 @@ else if ($action == "notinherit") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -263,21 +220,6 @@ else if ($action == "inherit") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); - -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); @@ -305,20 +247,6 @@ else if ($action == "setdefault") { if($notifier) { // Send notification to subscribers. $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email"); - $message = getMLText("access_permission_changed_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "access_permission_changed_email_subject"; $message = "access_permission_changed_email_body"; $params = array(); diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php index 8515fbd7a..5e7c36bbf 100644 --- a/op/op.FolderNotify.php +++ b/op/op.FolderNotify.php @@ -94,22 +94,6 @@ if ($action == "delnotify") { case 0: if($notifier) { // Email user / group, informing them of subscription. -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_deleted_email"); - $message = getMLText("notify_deleted_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - if ($userid > 0) { - $notifier->toIndividual($user, $obj, $subject, $message); - } - else { - $notifier->toGroup($user, $obj, $subject, $message); - } -*/ $subject = "notify_deleted_email_subject"; $message = "notify_deleted_email_body"; $params = array(); @@ -153,24 +137,6 @@ else if ($action == "addnotify") { if($notifier) { $obj = $dms->getUser($userid); // Email user / group, informing them of subscription. -/* - $path=""; - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toIndividual($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); @@ -206,24 +172,6 @@ else if ($action == "addnotify") { if($notifier) { $obj = $dms->getGroup($groupid); // Email user / group, informing them of subscription. -/* - $path=""; - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_added_email"); - $message = getMLText("notify_added_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toGroup($user, $obj, $subject, $message); -*/ $subject = "notify_added_email_subject"; $message = "notify_added_email_body"; $params = array(); diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php index 2dccbf1e7..dc6d050e5 100644 --- a/op/op.ManageNotify.php +++ b/op/op.ManageNotify.php @@ -111,25 +111,6 @@ if ($_GET["type"]=="document"){ if($notifier) { $obj = $dms->getUser($userid); // Email user / group, informing them of subscription. -/* - $path=""; - $folderPath = $folder->getPath(); - for ($i = 0; $i < count($folderPath); $i++) { - $path .= $folderPath[$i]->getName(); - if ($i +1 < count($folderPath)) - $path .= " / "; - } - - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_deleted_email"); - $message = getMLText("notify_deleted_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$path."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toIndividual($user, $obj, $subject, $message); -*/ $subject = "notify_deleted_email_subject"; $message = "notify_deleted_email_body"; $params = array(); diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php index a76d3b128..184926527 100644 --- a/op/op.MoveDocument.php +++ b/op/op.MoveDocument.php @@ -65,24 +65,6 @@ if ($targetid != $oldFolder->getID()) { // Send notification to subscribers. if($notifier) { $notifyList = $document->getNotifyList(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_moved_email"); - $message = getMLText("document_moved_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$oldFolder->getFolderPathPlain()."\r\n". - getMLText("new_folder").": ".$targetFolder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID()!= $document->getOwner()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ $subject = "document_moved_email_subject"; $message = "document_moved_email_body"; $params = array(); diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index 5d8b4b299..a3106c9c8 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -63,20 +63,6 @@ if ($folder->setParent($targetFolder)) { // Send notification to subscribers. if($notifier) { $notifyList = $folder->getNotifyList(); -/* - $subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_moved_email"); - $message = getMLText("folder_moved_email")."\r\n"; - $message .= - getMLText("name").": ".$folder->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$folder->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n"; - - $notifier->toList($user, $folder->_notifyList["users"], $subject, $message); - foreach ($folder->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "folder_moved_email_subject"; $message = "folder_moved_email_body"; $params = array(); diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index 8a428dbe0..8f120ef7d 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -74,21 +74,6 @@ if ($overrideStatus != $overallStatus["status"]) { if($notifier) { $nl = $document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email"); - $message = getMLText("document_status_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("status").": ".getOverallStatusText($overrideStatus)."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; - - $notifier->toList($user, $nl["users"], $subject, $message); - foreach ($nl["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "document_status_changed_email_subject"; $message = "document_status_changed_email_body"; $params = array(); diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index 593e3c809..771a64f81 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -99,26 +99,6 @@ if ($_POST["reviewType"] == "ind") { if($notifier) { $nl=$document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email"); - $message = getMLText("review_submit_email")."\r\n"; - $message .= - getMLText("name").": ".$document->getName()."\r\n". - getMLText("version").": ".$version."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n". - getMLText("comment").": ".$comment."\r\n". - "URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n"; - - $notifier->toIndividual($user, $content->getUser(), $subject, $message); - - // Send notification to subscribers. - $notifier->toList($user, $nl["users"], $subject, $message); - foreach ($nl["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ - $subject = "review_submit_email_subject"; $message = "review_submit_email_body"; $params = array(); @@ -155,25 +135,6 @@ else if ($_POST["reviewType"] == "grp") { if($notifier) { $nl=$document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email"); - $message = getMLText("review_submit_email")."\r\n"; - $message .= - getMLText("name").": ".$document->getName()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - getMLText("version").": ".$version."\r\n". - getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n". - getMLText("comment").": ".$comment."\r\n". - "URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n"; - - $notifier->toIndividual($user, $content->getUser(), $subject, $message); - - // Send notification to subscribers. - $notifier->toList($user, $nl["users"], $subject, $message); - foreach ($nl["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "review_submit_email_subject"; $message = "review_submit_email_body"; $params = array(); @@ -206,21 +167,6 @@ if ($_POST["reviewStatus"]==-1){ if($notifier) { $nl=$document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email"); - $message = getMLText("document_status_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("status").": ".getOverallStatusText(S_REJECTED)."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; - - $notifier->toList($user, $nl["users"], $subject, $message); - foreach ($nl["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "document_status_changed_email_subject"; $message = "document_status_changed_email_body"; $params = array(); @@ -285,23 +231,6 @@ if ($_POST["reviewStatus"]==-1){ if($notifier) { $nl=$document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email"); - $message = getMLText("document_status_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("status").": ".getOverallStatusText($newStatus)."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; - -// $subject=mydmsDecodeString($subject); -// $message=mydmsDecodeString($message); - - $notifier->toList($user, $nl["users"], $subject, $message); - foreach ($nl["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "document_status_changed_email_subject"; $message = "document_status_changed_email_body"; $params = array(); @@ -324,15 +253,6 @@ if ($_POST["reviewStatus"]==-1){ $requestUser = $document->getOwner(); if($notifier) { -/* - $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email"); - $message = getMLText("approval_request_email")."\r\n"; - $message .= - getMLText("name").": ".$content->getOriginalFileName()."\r\n". - getMLText("version").": ".$version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - "URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."&version=".$version."\r\n"; -*/ $subject = "approval_request_email_subject"; $message = "approval_request_email_body"; $params = array(); diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php index 679a517aa..0dff22efc 100644 --- a/op/op.TriggerWorkflow.php +++ b/op/op.TriggerWorkflow.php @@ -70,19 +70,6 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { if ($notifier) { $nl = $document->getNotifyList(); $folder = $document->getFolder(); - -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("transition_triggered_email"); - $message = getMLText("transition_triggered_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("workflow").": ".$workflow->getName()."\r\n". - getMLText("action").": ".$transition->getAction()->getName()."\r\n". - getMLText("comment").": ".$_POST["comment"]."\r\n". - getMLText("previous_state").": ".$transition->getState()->getName()."\r\n". - getMLText("current_state").": ".$transition->getNextState()->getName()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> "; -*/ $subject = "transition_triggered_email_subject"; $message = "transition_triggered_email_body"; $params = array(); From 50e920b63ed4d54a7e5dfbf8ab195756ad182a11 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 8 Dec 2016 15:41:18 +0100 Subject: [PATCH 3/3] take out themes blue, hc, clean from distribution --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50e756db2..9b7398819 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc dist: mkdir -p tmp/seeddms-$(VERSION) cp -a $(SRC) tmp/seeddms-$(VERSION) - (cd tmp; tar --exclude=.svn -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION)) + (cd tmp; tar --exclude=.svn --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION)) rm -rf tmp pear: