gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-12-08 15:43:07 +01:00
commit 70a1a20070
14 changed files with 3 additions and 456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -12,7 +12,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:

22
op/op.ApproveDocument.php
View File

@ -200,17 +200,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();
@ -258,17 +247,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();

68
op/op.DocumentAccess.php
View File

@ -129,26 +129,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();
@ -178,21 +158,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();
@ -213,24 +178,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();
@ -270,21 +217,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();

54
op/op.DocumentNotify.php
View File

@ -97,22 +97,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();
@ -156,25 +140,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();
@ -209,25 +174,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();

38
op/op.EditDocument.php
View File

@ -79,25 +79,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();
@ -132,25 +113,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();

72
op/op.FolderAccess.php
View File

@ -126,23 +126,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();
@ -177,19 +160,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();
@ -213,19 +183,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();
@ -265,21 +222,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();
@ -307,20 +249,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();

52
op/op.FolderNotify.php
View File

@ -96,22 +96,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();
@ -155,24 +139,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();
@ -208,24 +174,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();

19
op/op.ManageNotify.php
View File

@ -113,25 +113,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();

18
op/op.MoveDocument.php
View File

@ -67,24 +67,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();

14
op/op.MoveFolder.php
View File

@ -65,20 +65,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();

15
op/op.OverrideContentStatus.php
View File

@ -76,21 +76,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();

80
op/op.ReviewDocument.php
View File

@ -102,26 +102,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();
@ -158,25 +138,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();
@ -209,21 +170,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();
@ -288,23 +234,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();
@ -327,15 +256,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();

1
op/op.TriggerWorkflow.php
View File

@ -80,7 +80,6 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
if ($notifier) {
$nl = $document->getNotifyList();
$folder = $document->getFolder();
$subject = "transition_triggered_email_subject";
$message = "transition_triggered_email_body";
$params = array();

4
views/bootstrap/class.Settings.php
View File

@ -699,8 +699,8 @@ if(!is_writeable($settings->_configFilePath)) {
}
?>
<tr title="">
<td><?php $this->showTextField("converters_newmimetype", ""); ?></td>
<td><?php $this->showTextField("converters_newcmd", ""); ?></td>
<td><?php $this->showTextField("converters_newmimetype", "", '', getMLText('mimetype')); ?></td>
<td><?php $this->showTextField("converters_newcmd", "", '', getMLText('command')); ?></td>
</tr>
</table>
<?php $this->contentContainerEnd(); ?>