gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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 18:21:08 +01:00
commit 13bab66b6f
14 changed files with 90 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -77,6 +77,10 @@
- remove some old references to Lucene when indexing a document
uploaded by fast upload
- show workflow state in list of documents instead of just 'in workflow'
- overhaul notification system. Do not send extra notifications to owner
anymore. Send notifications to users/groups watching the old and new
folder if a document/folder is moved.
- drop alternative themes blue, hc, and clean
--------------------------------------------------------------------------------
Changes in version 4.3.30

16
op/op.AddDocument.php
View File

@ -328,8 +328,12 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
// Send notification to subscribers of folder.
if($notifier) {
$notifyList1 = $folder->getNotifyList();
$notifyList2 = $document->getNotifyList();
$fnl = $folder->getNotifyList();
$dnl = $document->getNotifyList();
$nl = array(
'users'=>array_merge($dnl['users'], $fnl['users']),
'groups'=>array_merge($dnl['groups'], $fnl['groups'])
);
$subject = "new_document_email_subject";
$message = "new_document_email_body";
@ -343,12 +347,8 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$notifier->toList($user, $notifyList1["users"], $subject, $message, $params);
foreach ($notifyList1["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
$notifier->toList($user, $notifyList2["users"], $subject, $message, $params);
foreach ($notifyList2["groups"] as $grp) {
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}

24
op/op.ApproveDocument.php
View File

@ -102,18 +102,6 @@ if ($_POST["approvalType"] == "ind") {
else {
// Send an email notification to the document updater.
if($notifier) {
/*
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message = getMLText("approval_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").": ".getApprovalStatusText($_POST["approvalStatus"])."\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";
*/
$subject = "approval_submit_email_subject";
$message = "approval_submit_email_body";
$params = array();
@ -152,18 +140,6 @@ else if ($_POST["approvalType"] == "grp") {
else {
// Send an email notification to the document updater.
if($notifier) {
/*
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message = getMLText("approval_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").": ".getApprovalStatusText($_POST["approvalStatus"])."\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";
*/
$subject = "approval_submit_email_subject";
$message = "approval_submit_email_body";
$params = array();

24
op/op.DocumentAccess.php
View File

@ -144,7 +144,7 @@ if ($action == "setowner") {
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
$notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
// $notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
}
}
@ -207,8 +207,26 @@ else if ($action == "notinherit") {
// Change to inherit-----------------------------------------------------
else if ($action == "inherit") {
$document->clearAccessList();
$document->setInheritAccess(true);
if($document->clearAccessList() && $document->setInheritAccess(true)) {
if($notifier) {
$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'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$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);
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
}
}
}
// Set default permissions ----------------------------------------------

4
op/op.EditAttributes.php
View File

@ -93,8 +93,8 @@ if($attributes) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $document->getOwner()->getID())
$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
// if ($user->getID() != $document->getOwner()->getID())
// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
}
}

8
op/op.EditFolder.php
View File

@ -99,8 +99,8 @@ if($oldname != $name) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $folder->getOwner()->getID())
$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
// if ($user->getID() != $folder->getOwner()->getID())
// $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
}
}
@ -125,8 +125,8 @@ if($oldcomment != $comment) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $folder->getOwner()->getID())
$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
// if ($user->getID() != $folder->getOwner()->getID())
// $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
}
}

2
op/op.FolderAccess.php
View File

@ -144,7 +144,7 @@ if ($action == "setowner") {
foreach ($notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
$notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
// $notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
}
} else {

32
op/op.MoveClipboard.php
View File

@ -56,7 +56,13 @@ foreach($clipboard['docs'] as $documentid) {
if ($document->setFolder($targetFolder)) {
// Send notification to subscribers.
if($notifier) {
$notifyList = $document->getNotifyList();
$nl1 = $oldFolder->getNotifyList();
$nl2 = $document->getNotifyList();
$nl3 = $targetFolder->getNotifyList();
$nl = array(
'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']),
'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups'])
);
$subject = "document_moved_email_subject";
$message = "document_moved_email_body";
$params = array();
@ -67,13 +73,13 @@ foreach($clipboard['docs'] as $documentid) {
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$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);
foreach ($notifyList["groups"] as $grp) {
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $document->getOwner()->getID())
$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
// if ($user->getID() != $document->getOwner()->getID())
// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
}
$session->removeFromClipboard($document);
@ -97,7 +103,13 @@ foreach($clipboard['folders'] as $folderid) {
if ($folder->setParent($targetFolder)) {
// Send notification to subscribers.
if($notifier) {
$notifyList = $folder->getNotifyList();
$nl1 = $oldFolder->getNotifyList();
$nl2 = $folder->getNotifyList();
$nl3 = $targetFolder->getNotifyList();
$nl = array(
'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']),
'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups'])
);
$subject = "folder_moved_email_subject";
$message = "folder_moved_email_body";
$params = array();
@ -108,13 +120,13 @@ foreach($clipboard['folders'] as $folderid) {
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$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);
foreach ($notifyList["groups"] as $grp) {
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $folder->getOwner()->getID())
$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
// if ($user->getID() != $folder->getOwner()->getID())
// $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
}
$session->removeFromClipboard($folder);

16
op/op.MoveDocument.php
View File

@ -66,7 +66,13 @@ if ($targetid != $oldFolder->getID()) {
if ($document->setFolder($targetFolder)) {
// Send notification to subscribers.
if($notifier) {
$notifyList = $document->getNotifyList();
$nl1 = $oldFolder->getNotifyList();
$nl2 = $document->getNotifyList();
$nl3 = $targetFolder->getNotifyList();
$nl = array(
'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']),
'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups'])
);
$subject = "document_moved_email_subject";
$message = "document_moved_email_body";
$params = array();
@ -77,13 +83,13 @@ if ($targetid != $oldFolder->getID()) {
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$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);
foreach ($notifyList["groups"] as $grp) {
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $document->getOwner()->getID())
$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
// if ($user->getID() != $document->getOwner()->getID())
// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
}
} else {

12
op/op.MoveFolder.php
View File

@ -64,7 +64,13 @@ $oldFolder = $folder->getParent();
if ($folder->setParent($targetFolder)) {
// Send notification to subscribers.
if($notifier) {
$notifyList = $folder->getNotifyList();
$nl1 = $oldFolder->getNotifyList();
$nl2 = $folder->getNotifyList();
$nl3 = $targetFolder->getNotifyList();
$nl = array(
'users'=>array_merge($nl1['users'], $nl2['users'], $nl3['users']),
'groups'=>array_merge($nl1['groups'], $nl2['groups'], $nl3['groups'])
);
$subject = "folder_moved_email_subject";
$message = "folder_moved_email_body";
$params = array();
@ -75,8 +81,8 @@ if ($folder->setParent($targetFolder)) {
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$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);
foreach ($notifyList["groups"] as $grp) {
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner

2
op/op.OverrideContentStatus.php
View File

@ -91,7 +91,7 @@ if ($overrideStatus != $overallStatus["status"]) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
}
}
}

6
op/op.ReviewDocument.php
View File

@ -118,7 +118,7 @@ if ($_POST["reviewType"] == "ind") {
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
}
}
}
@ -153,7 +153,7 @@ else if ($_POST["reviewType"] == "grp") {
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
}
}
}
@ -183,7 +183,7 @@ if ($_POST["reviewStatus"]==-1){
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
}
}

4
op/op.UpdateDocument.php
View File

@ -261,8 +261,8 @@ if ($_FILES['userfile']['error'] == 0) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $document->getOwner()->getID())
$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
// if ($user->getID() != $document->getOwner()->getID())
// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
if($workflow && $settings->_enableNotificationWorkflow) {
$subject = "request_workflow_action_email_subject";

4
op/op.UpdateDocument2.php
View File

@ -192,8 +192,8 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
// if user is not owner send notification to owner
if ($user->getID() != $document->getOwner()->getID())
$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
// if ($user->getID() != $document->getOwner()->getID())
// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
}
$expires = ($_POST["expires"] == "true") ? mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]) : false;