fix line endings

This commit is contained in:
Uwe Steinmann 2013-02-28 16:54:30 +01:00
parent f7c5b1dde6
commit 579ab95fb6

View File

@ -107,7 +107,7 @@ if (isset($_GET["groupid"])) {
} }
} }
//Ändern des Besitzers ---------------------------------------------------------------------------- //Ändern des Besitzers ----------------------------------------------------------------------------
if ($action == "setowner") { if ($action == "setowner") {
if (!$user->isAdmin()) { if (!$user->isAdmin()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
@ -127,6 +127,8 @@ if ($action == "setowner") {
if($notifier) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifyList = $document->getNotifyList();
$folder = $document->getFolder(); $folder = $document->getFolder();
/*
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("ownership_changed_email"); $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("ownership_changed_email");
$message = getMLText("ownership_changed_email")."\r\n"; $message = getMLText("ownership_changed_email")."\r\n";
$message .= $message .=
@ -143,6 +145,24 @@ if ($action == "setowner") {
} }
// Send notification to previous owner. // Send notification to previous owner.
$notifier->toIndividual($user, $oldOwner, $subject, $message); $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) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifyList = $document->getNotifyList();
$folder = $document->getFolder(); $folder = $document->getFolder();
/*
// Send notification to subscribers. // Send notification to subscribers.
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n"; $message = getMLText("access_permission_changed_email")."\r\n";
@ -167,12 +189,29 @@ else if ($action == "notinherit") {
foreach ($document->_notifyList["groups"] as $grp) { foreach ($document->_notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message); $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($document->setDefaultAccess($defAccess)) {
if($notifier) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifyList = $document->getNotifyList();
$folder = $document->getFolder(); $folder = $document->getFolder();
/*
// Send notification to subscribers. // Send notification to subscribers.
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n"; $message = getMLText("access_permission_changed_email")."\r\n";
@ -188,6 +227,21 @@ else if ($action == "notinherit") {
foreach ($document->_notifyList["groups"] as $grp) { foreach ($document->_notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message); $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) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifyList = $document->getNotifyList();
$folder = $document->getFolder(); $folder = $document->getFolder();
/*
// Send notification to subscribers. // Send notification to subscribers.
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email"); $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("access_permission_changed_email");
$message = getMLText("access_permission_changed_email")."\r\n"; $message = getMLText("access_permission_changed_email")."\r\n";
@ -225,11 +281,26 @@ else if ($action == "setdefault") {
foreach ($document->_notifyList["groups"] as $grp) { foreach ($document->_notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message); $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") { else if ($action == "editaccess") {
if (isset($userid)) { if (isset($userid)) {
$document->changeAccess($mode, $userid, true); $document->changeAccess($mode, $userid, true);
@ -239,7 +310,7 @@ else if ($action == "editaccess") {
} }
} }
//Berechtigung löschen ---------------------------------------------------------------------------- // Delete permission-------------------------------------------------------
else if ($action == "delaccess") { else if ($action == "delaccess") {
if (isset($userid)) { if (isset($userid)) {
$document->removeAccess($userid, true); $document->removeAccess($userid, true);
@ -249,7 +320,7 @@ else if ($action == "delaccess") {
} }
} }
//Neue Berechtigung hinzufügen -------------------------------------------------------------------- // Add new permission -----------------------------------------------------
else if ($action == "addaccess") { else if ($action == "addaccess") {
if (isset($userid) && $userid != -1) { if (isset($userid) && $userid != -1) {
$document->addAccess($mode, $userid, true); $document->addAccess($mode, $userid, true);