From 542ca945f1c6470c5496731fe4165ba463330cf8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Oct 2018 19:19:05 +0200
Subject: [PATCH] users which are subscribers already cannot be selected
 anymore (Closes #414)

use also the same layout in class.DocumentNotify.php and
class.FolderNotify.php
---
 views/bootstrap/class.DocumentNotify.php |  11 ++-
 views/bootstrap/class.FolderNotify.php   | 100 +++++++++++++----------
 2 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index 13bb11a58..8d7317b0e 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -81,7 +81,13 @@ $(document).ready( function() {
 		$this->contentHeading(getMLText("edit_existing_notify"));
 
 		$userNotifyIDs = array();
+		foreach ($notifyList["users"] as $userNotify) {
+			$userNotifyIDs[] = $userNotify->getID();
+		}
 		$groupNotifyIDs = array();
+		foreach ($notifyList["groups"] as $groupNotify) {
+			$groupNotifyIDs[] = $groupNotify->getID();
+		}
 
 		echo "<div class=\"row-fluid\">\n";
 		echo "<div class=\"span6\">\n";
@@ -114,7 +120,6 @@ $(document).ready( function() {
 				'options'=>$options
 			)
 		);
-
 		$options = array();
 		$options[] = array('-1', getMLText("select_one"));
 		$allGroups = $dms->getAllGroups();
@@ -160,7 +165,6 @@ $(document).ready( function() {
 					print "</form>\n";
 				}else print "<td></td>";
 				print "</tr>";
-				$userNotifyIDs[] = $userNotify->getID();
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
 				print "<tr>";
@@ -174,11 +178,10 @@ $(document).ready( function() {
 					print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
 					print "<td>";
 					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
-					print "</form>\n";
 					print "</td>";
+					print "</form>\n";
 				}else print "<td></td>";
 				print "</tr>";
-				$groupNotifyIDs[] = $groupNotify->getID();
 			}
 		}
 		print "</table>\n";
diff --git a/views/bootstrap/class.FolderNotify.php b/views/bootstrap/class.FolderNotify.php
index 990202377..2ac72d76b 100644
--- a/views/bootstrap/class.FolderNotify.php
+++ b/views/bootstrap/class.FolderNotify.php
@@ -82,55 +82,20 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 
 		$userNotifyIDs = array();
+		foreach ($notifyList["users"] as $userNotify) {
+			$userNotifyIDs[] = $userNotify->getID();
+		}
 		$groupNotifyIDs = array();
-
-		print "<table class=\"table-condensed\">\n";
-		if (empty($notifyList["users"]) && empty($notifyList["groups"])) {
-			print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
+		foreach ($notifyList["groups"] as $groupNotify) {
+			$groupNotifyIDs[] = $groupNotify->getID();
 		}
-		else {
-			foreach ($notifyList["users"] as $userNotify) {
-				print "<tr>";
-				print "<td><i class=\"icon-user\"></i></td>";
-				print "<td>" . htmlspecialchars($userNotify->getFullName()) . "</td>";
-				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
-					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
-					echo createHiddenFieldWithKey('foldernotify')."\n";
-					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
-					print "<input type=\"Hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
-					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
-					print "</td>";
-					print "</form>\n";
-				}else print "<td></td>";
-				print "</tr>";
-				$userNotifyIDs[] = $userNotify->getID();
-			}
 
-			foreach ($notifyList["groups"] as $groupNotify) {
-				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
-				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
-				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
-					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
-					echo createHiddenFieldWithKey('foldernotify')."\n";
-					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
-					print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
-					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
-					print "</td>";
-					print "</form>\n";
-				}else print "<td></td>";
-				print "</tr>";
-				$groupNotifyIDs[] = $groupNotify->getID();
-			}
-		}
-		print "</table>\n";
+		echo "<div class=\"row-fluid\">\n";
+		echo "<div class=\"span6\">\n";
+		$this->contentContainerStart();
 
 ?>
-<br>
+
 <form class="form-horizontal" action="../op/op.FolderNotify.php" method="post" id="form1" name="form1">
 <?php	echo createHiddenFieldWithKey('foldernotify'); ?>
 <input type="hidden" name="folderid" value="<?php print $folder->getID()?>">
@@ -176,9 +141,54 @@ $(document).ready(function() {
 		$this->formSubmit(getMLText('add'));
 ?>
 </form>
-
 <?php
 		$this->contentContainerEnd();
+		echo "</div>\n";
+		echo "<div class=\"span6\">\n";
+		print "<table class=\"table-condensed\">\n";
+		if (empty($notifyList["users"]) && empty($notifyList["groups"])) {
+			print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
+		}
+		else {
+			foreach ($notifyList["users"] as $userNotify) {
+				print "<tr>";
+				print "<td><i class=\"icon-user\"></i></td>";
+				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
+				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
+					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
+					echo createHiddenFieldWithKey('foldernotify')."\n";
+					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
+					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
+					print "<input type=\"Hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
+					print "<td>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "</td>";
+					print "</form>\n";
+				}else print "<td></td>";
+				print "</tr>";
+			}
+			foreach ($notifyList["groups"] as $groupNotify) {
+				print "<tr>";
+				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
+				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
+					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
+					echo createHiddenFieldWithKey('foldernotify')."\n";
+					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
+					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
+					print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
+					print "<td>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "</td>";
+					print "</form>\n";
+				}else print "<td></td>";
+				print "</tr>";
+			}
+		}
+		print "</table>\n";
+
+		echo "</div>\n";
+		echo "</div>\n";
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */