From dfc0db8bc57aa72ab45be1030fc0971bfbc4d201 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 8 Dec 2016 18:14:54 +0100 Subject: [PATCH] no longer send notif. to owner --- op/op.EditAttributes.php | 4 ++-- op/op.EditFolder.php | 8 ++++---- op/op.FolderAccess.php | 2 +- op/op.OverrideContentStatus.php | 2 +- op/op.ReviewDocument.php | 6 +++--- op/op.UpdateDocument.php | 4 ++-- op/op.UpdateDocument2.php | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php index cd6377999..5983879b0 100644 --- a/op/op.EditAttributes.php +++ b/op/op.EditAttributes.php @@ -100,8 +100,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); } } diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 3d2f4dc1c..325e1e55a 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -79,8 +79,8 @@ if(($oldname = $folder->getName()) != $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); } } else { UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured")); @@ -107,8 +107,8 @@ if(($oldcomment = $folder->getComment()) != $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); } } else { diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php index d69ce8aa4..8650ad4f0 100644 --- a/op/op.FolderAccess.php +++ b/op/op.FolderAccess.php @@ -142,7 +142,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 { diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index 8f120ef7d..56fd772b5 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -89,7 +89,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); } } } diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index 771a64f81..b13b3a7a6 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -115,7 +115,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); } } } @@ -150,7 +150,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); } } } @@ -180,7 +180,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); } } diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 61cf77d86..d9d57555b 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -268,8 +268,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"; diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php index ac8672ee9..9b024fcb2 100644 --- a/op/op.UpdateDocument2.php +++ b/op/op.UpdateDocument2.php @@ -190,8 +190,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;