gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-10 02:52:40 +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-04-21 13:34:47 +02:00
commit 6893b26818
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -32,6 +32,7 @@
header to be send to early (Closes: #252, #254) header to be send to early (Closes: #252, #254)
- regular users with sufficient access rights may remove documents via webdav - regular users with sufficient access rights may remove documents via webdav
- fix error in utils/indexer.php when new documents were indexed - fix error in utils/indexer.php when new documents were indexed
- set url in approval request email after reviewing a document (Closes #259)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.25 Changes in version 4.3.25

11
op/op.AddDocument.php
View File

@ -343,7 +343,8 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
// Send notification to subscribers of folder. // Send notification to subscribers of folder.
if($notifier) { if($notifier) {
$notifyList = $folder->getNotifyList(); $notifyList1 = $folder->getNotifyList();
$notifyList2 = $document->getNotifyList();
$subject = "new_document_email_subject"; $subject = "new_document_email_subject";
$message = "new_document_email_body"; $message = "new_document_email_body";
@ -357,8 +358,12 @@ 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['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['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot; $params['http_root'] = $settings->_httpRoot;
$notifier->toList($user, $notifyList["users"], $subject, $message, $params); $notifier->toList($user, $notifyList1["users"], $subject, $message, $params);
foreach ($notifyList["groups"] as $grp) { 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->toGroup($user, $grp, $subject, $message, $params); $notifier->toGroup($user, $grp, $subject, $message, $params);
} }

1
op/op.ReviewDocument.php
View File

@ -344,6 +344,7 @@ if ($_POST["reviewStatus"]==-1){
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName; $params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot; $params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
foreach ($docApprovalStatus as $dastat) { foreach ($docApprovalStatus as $dastat) {
if ($dastat["status"] == 0) { if ($dastat["status"] == 0) {