From 579ab95fb610a026a50297917cbad7bc37a61a01 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Feb 2013 16:54:30 +0100 Subject: [PATCH] fix line endings --- op/op.DocumentAccess.php | 79 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php index 733f85eab..19bf8de85 100644 --- a/op/op.DocumentAccess.php +++ b/op/op.DocumentAccess.php @@ -107,7 +107,7 @@ if (isset($_GET["groupid"])) { } } -//Ändern des Besitzers ---------------------------------------------------------------------------- +//Ändern des Besitzers ---------------------------------------------------------------------------- if ($action == "setowner") { if (!$user->isAdmin()) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); @@ -127,6 +127,8 @@ 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 .= @@ -143,6 +145,24 @@ if ($action == "setowner") { } // Send notification to previous owner. $notifier->toIndividual($user, $oldOwner, $subject, $message); +*/ + + $subject = "ownership_changed_email_subject"; + $message = "ownership_changed_email_body"; + $params = array(); + $params['document'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['username'] = $user->getFullName(); + $params['old_owner'] = $oldOwner->getFullName(); + $params['new_owner'] = $newOwner->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->toList2($user, $notifyList["users"], $subject, $message, $params); + foreach ($notifyList["groups"] as $grp) { + $notifier->toGroup2($user, $grp, $subject, $message, $params); + } + } } } @@ -155,6 +175,8 @@ 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"; @@ -167,12 +189,29 @@ else if ($action == "notinherit") { 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(); + $params['document'] = $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->toList2($user, $notifyList["users"], $subject, $message, $params); + foreach ($notifyList["groups"] as $grp) { + $notifier->toGroup2($user, $grp, $subject, $message, $params); + } + } } if($document->setDefaultAccess($defAccess)) { 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"; @@ -188,6 +227,21 @@ else if ($action == "notinherit") { 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(); + $params['document'] = $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->toList2($user, $notifyList["users"], $subject, $message, $params); + foreach ($notifyList["groups"] as $grp) { + $notifier->toGroup2($user, $grp, $subject, $message, $params); + } + } } @@ -213,6 +267,8 @@ 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"; @@ -225,11 +281,26 @@ else if ($action == "setdefault") { 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(); + $params['document'] = $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->toList2($user, $notifyList["users"], $subject, $message, $params); + foreach ($notifyList["groups"] as $grp) { + $notifier->toGroup2($user, $grp, $subject, $message, $params); + } + } } } -// Bestehende Berechtigung ändern -------------------------------------------- +// Modify permission ------------------------------------------------------ else if ($action == "editaccess") { if (isset($userid)) { $document->changeAccess($mode, $userid, true); @@ -239,7 +310,7 @@ else if ($action == "editaccess") { } } -//Berechtigung löschen ---------------------------------------------------------------------------- +// Delete permission------------------------------------------------------- else if ($action == "delaccess") { if (isset($userid)) { $document->removeAccess($userid, true); @@ -249,7 +320,7 @@ else if ($action == "delaccess") { } } - //Neue Berechtigung hinzufügen -------------------------------------------------------------------- +// Add new permission ----------------------------------------------------- else if ($action == "addaccess") { if (isset($userid) && $userid != -1) { $document->addAccess($mode, $userid, true);