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

do not use internal variables of LetoDMS_Core_xxx classes

Browse Source
This commit is contained in:
steinm 2013-01-24 10:12:15 +00:00
parent c7ee6d9b4a
commit 8432ce207b
18 changed files with 443 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
op/op.AddFile.php
View File

@ -72,7 +72,7 @@ if (is_bool($res) && !$res) {
$document->getNotifyList();
// Send notification to subscribers.
if($notifier) {
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("new_file_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("new_file_email");
$message = getMLText("new_file_email")."\r\n";
$message .=
getMLText("name").": ".$name."\r\n".

2
op/op.AddFile2.php
View File

@ -80,7 +80,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
$document->getNotifyList();
// Send notification to subscribers.
if($notifier) {
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("new_file_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("new_file_email");
$message = getMLText("new_file_email")."\r\n";
$message .=
getMLText("name").": ".$name."\r\n".

2
op/op.AddMultiDocument.php
View File

@ -195,7 +195,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
// Send notification to subscribers.
if($notifier) {
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("new_document_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_document_email");
$message = getMLText("new_document_email")."\r\n";
$message .=
getMLText("name").": ".$name."\r\n".

2
op/op.AddSubFolder.php
View File

@ -63,7 +63,7 @@ if (is_object($subFolder)) {
// Send notification to subscribers.
if($notifier) {
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("new_subfolder_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_subfolder_email");
$message = getMLText("new_subfolder_email")."\r\n";
$message .=
getMLText("name").": ".$name."\r\n".

8
op/op.ApproveDocument.php
View File

@ -155,10 +155,10 @@ if ($_POST["approvalStatus"]==-1){
// Send notification to subscribers.
if($notifier) {
$folder = $document->getFolder();
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("document_status_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
$message = getMLText("document_status_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
getMLText("document").": ".$document->getName()."\r\n".
getMLText("status").": ".getOverallStatusText($status)."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".
@ -202,10 +202,10 @@ if ($_POST["approvalStatus"]==-1){
// Send notification to subscribers.
if($notifier) {
$folder = $document->getFolder();
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("document_status_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
$message = getMLText("document_status_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
getMLText("document").": ".$document->getName()."\r\n".
getMLText("status").": ".getOverallStatusText($newStatus)."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".

26
op/op.DocumentAccess.php
View File

@ -127,15 +127,15 @@ if ($action == "setowner") {
// Send notification to subscribers.
if($notifier) {
$folder = $document->getFolder();
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("ownership_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("ownership_changed_email");
$message = getMLText("ownership_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
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->_comment."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->_id."\r\n";
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -159,12 +159,12 @@ else if ($action == "notinherit") {
if($notifier) {
$folder = $document->getFolder();
// Send notification to subscribers.
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("access_permission_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
getMLText("document").": ".$document->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -180,12 +180,12 @@ else if ($action == "notinherit") {
if($notifier) {
$folder = $document->getFolder();
// Send notification to subscribers.
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("access_permission_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
getMLText("document").": ".$document->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -220,12 +220,12 @@ else if ($action == "setdefault") {
if($notifier) {
$folder = $document->getFolder();
// Send notification to subscribers.
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("access_permission_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
getMLText("document").": ".$document->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);

6
op/op.DocumentNotify.php
View File

@ -111,7 +111,7 @@ if ($action == "delnotify"){
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -165,7 +165,7 @@ else if ($action == "addnotify") {
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -208,7 +208,7 @@ else if ($action == "addnotify") {
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);

12
op/op.EditFolder.php
View File

@ -64,14 +64,14 @@ if(($oldname = $folder->getName()) != $name) {
// Send notification to subscribers.
if($notifier) {
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("folder_renamed_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_renamed_email");
$message = getMLText("folder_renamed_email")."\r\n";
$message .=
getMLText("old").": ".$oldname."\r\n".
getMLText("new").": ".$folder->_name."\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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -90,13 +90,13 @@ if(($oldcomment = $folder->getComment()) != $comment) {
// Send notification to subscribers.
if($notifier) {
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("comment_changed_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("comment_changed_email");
$message = getMLText("comment_changed_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);

32
op/op.FolderAccess.php
View File

@ -124,15 +124,15 @@ if ($action == "setowner") {
if($notifier) {
// Send notification to subscribers.
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("ownership_changed_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("ownership_changed_email");
$message = getMLText("ownership_changed_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
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->_comment."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->_id."\r\n";
getMLText("comment").": ".$folder->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -155,12 +155,12 @@ else if ($action == "notinherit") {
if($notifier) {
// Send notification to subscribers.
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("access_permission_changed_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
getMLText("name").": ".$folder->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -175,12 +175,12 @@ else if ($action == "notinherit") {
if($notifier) {
// Send notification to subscribers.
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("access_permission_changed_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
getMLText("name").": ".$folder->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -211,12 +211,12 @@ else if ($action == "inherit") {
if($notifier) {
// Send notification to subscribers.
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("access_permission_changed_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
getMLText("name").": ".$folder->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -235,12 +235,12 @@ else if ($action == "setdefault") {
if($notifier) {
// Send notification to subscribers.
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("access_permission_changed_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
getMLText("name").": ".$folder->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);

10
op/op.FolderNotify.php
View File

@ -67,7 +67,7 @@ if ($folder->getAccessMode($user) < M_READ) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
}
//Benachrichtigung löschen ------------------------------------------------------------------------
// Delete notification -------------------------------------------------------
if ($action == "delnotify") {
if ($userid > 0) {
@ -108,7 +108,7 @@ if ($action == "delnotify") {
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -124,7 +124,7 @@ if ($action == "delnotify") {
}
}
//Benachrichtigung hinzufügen ---------------------------------------------------------------------
//Benachrichtigung hinzufügen ---------------------------------------------------------------------
else if ($action == "addnotify") {
if ($userid != -1) {
@ -159,7 +159,7 @@ else if ($action == "addnotify") {
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
@ -202,7 +202,7 @@ else if ($action == "addnotify") {
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);

2
op/op.ManageNotify.php
View File

@ -125,7 +125,7 @@ if ($_GET["type"]=="document"){
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->_id."\r\n";
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);

4
op/op.MoveDocument.php
View File

@ -58,10 +58,10 @@ if ($targetid != $oldFolder->getID()) {
$document->getNotifyList();
// Send notification to subscribers.
if($notifier) {
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("document_moved_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_moved_email");
$message = getMLText("document_moved_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
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";

8
op/op.MoveFolder.php
View File

@ -58,13 +58,13 @@ if ($folder->setParent($targetFolder)) {
// Send notification to subscribers.
if($notifier) {
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("folder_moved_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_moved_email");
$message = getMLText("folder_moved_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
getMLText("name").": ".$folder->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$folder->_comment."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->_id."\r\n";
getMLText("comment").": ".$folder->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);

4
op/op.OverrideContentStatus.php
View File

@ -76,10 +76,10 @@ if ($overrideStatus != $overallStatus["status"]) {
// Send notification to subscribers.
if($notifier) {
$folder = $document->getFolder();
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("document_status_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
$message = getMLText("document_status_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
getMLText("document").": ".$document->getName()."\r\n".
getMLText("status").": ".getOverallStatusText($overrideStatus)."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".

30
op/op.RemoveFolder.php
View File

@ -50,17 +50,39 @@ if ($folder->getAccessMode($user) < M_ALL) {
$parent=$folder->getParent();
/* Register a callback which removes each document from the fulltext index
* The callback must return true other the removal will be canceled.
*/
if($settings->_enableFullSearch) {
if(!empty($settings->_luceneClassDir))
require_once($settings->_luceneClassDir.'/Lucene.php');
else
require_once('LetoDMS/Lucene.php');
$index = LetoDMS_Lucene_Indexer::open($settings->_luceneDir);
function removeFromIndex($index, $document) {
if($hits = $index->find('document_id:'.$document->getId())) {
$hit = $hits[0];
echo $hit->id;
$index->delete($hit->id);
$index->commit();
}
return true;
}
$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', $index);
}
if ($folder->remove()) {
// Send notification to subscribers.
if ($notifier) {
$folder->getNotifyList();
$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("folder_deleted_email");
$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_deleted_email");
$message = getMLText("folder_deleted_email")."\r\n";
$message .=
getMLText("name").": ".$folder->_name."\r\n".
getMLText("name").": ".$folder->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$folder->_comment."\r\n".
"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->_id."\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) {

8
op/op.ReviewDocument.php
View File

@ -154,10 +154,10 @@ if ($_POST["reviewStatus"]==-1){
// Send notification to subscribers.
if($notifier) {
$folder = $document->getFolder();
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("document_status_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
$message = getMLText("document_status_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
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".
@ -222,10 +222,10 @@ if ($_POST["reviewStatus"]==-1){
$nl=$document->getNotifyList();
if($notifier) {
$folder = $document->getFolder();
$subject = "###SITENAME###: ".$document->_name." - ".getMLText("document_status_changed_email");
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
$message = getMLText("document_status_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->_name."\r\n".
getMLText("document").": ".$document->getName()."\r\n".
getMLText("status").": ".getOverallStatusText($newStatus)."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".

2
op/op.SetExpires.php
View File

@ -42,7 +42,7 @@ if ($document->getAccessMode($user) < M_READWRITE) {
}
$expires = false;
if ($_POST["expires"] != "false") {
if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
if($_POST["expdate"]) {
$tmp = explode('-', $_POST["expdate"]);
$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);