More work on permissions from web interface.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk/src/plugins/gateway@6368 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/gateway/PermissionManager.java

@@ -152,12 +152,14 @@ public class PermissionManager {
         Connection con = null;
         PreparedStatement pstmt = null;
         try {
+            Log.warn("clearing users for "+transportType.toString());
             con = DbConnectionManager.getConnection();
             pstmt = con.prepareStatement(DELETE_ALL_USERS);
             pstmt.setString(1, transportType.toString());
             pstmt.executeUpdate();
 
             for (User user : users) {
+                Log.warn("saving user "+user.getUsername());
                 pstmt = con.prepareStatement(ADD_NEW_USER);
                 pstmt.setString(1, transportType.toString());
                 pstmt.setString(2, user.getUsername());

src/java/org/jivesoftware/wildfire/gateway/web/ConfigManager.java

@@ -150,9 +150,11 @@ public class ConfigManager {
     public void savePermissions(String transportName, Integer overallSetting, ArrayList<String> users, ArrayList<String> groups) {
         JiveGlobals.setProperty("plugin.gateway."+transportName+".registration", overallSetting.toString());
         PermissionManager permissionManager = new PermissionManager(TransportType.valueOf(transportName));
+
         ArrayList<User> userList = new ArrayList<User>();
         UserManager userManager = UserManager.getInstance();
         for (String username : users) {
+            if (username.matches("\\s+")) { continue; }
             try {
                 User user = userManager.getUser(username);
                 userList.add(user);
@@ -162,9 +164,11 @@ public class ConfigManager {
             }
         }
         permissionManager.storeUserList(userList);
+        
         ArrayList<Group> groupList = new ArrayList<Group>();
         GroupManager groupManager = GroupManager.getInstance();
         for (String grpname : groups) {
+            if (grpname.matches("\\s+")) { continue; }
             try {
                 Group group = groupManager.getGroup(grpname);
                 groupList.add(group);

src/web/gateway-settings.jsp

@@ -318,12 +318,12 @@
                             <td align="left">
                                 <span style="font-weight: bold">Users</span> <a href="javascript:noop()" onClick="activateModifyUsers('<%= this.gatewayType.toString() %>'); return false">(Modify Users)</a><br />
                                 <span id="<%= this.gatewayType.toString() %>userpermtext"><%= this.userPermText %></span>
-                                <div id="<%= this.gatewayType.toString() %>userpermentrydiv" style="display:none"><textarea class='permissionListTextArea' rows="5" cols="20" id="<%= this.gatewayType.toString() %>userpermentry" name="<%= this.gatewayType.toString() %>userpermentry"><%= this.userPermEntry %></textarea></div>
+                                <div id="<%= this.gatewayType.toString() %>userpermentrydiv" style="display:none" class='permissionListDiv'><textarea class='permissionListTextArea' rows="5" cols="20" id="<%= this.gatewayType.toString() %>userpermentry" name="<%= this.gatewayType.toString() %>userpermentry"><%= this.userPermEntry %></textarea></div>
                             </td>
                             <td align="left" style="padding-left: 30.0px">
                                 <span style="font-weight: bold">Groups</span> <a href="javascript:noop()" onClick="activateModifyGroups('<%= this.gatewayType.toString() %>'); return false">(Modify Groups)</a><br />
                                 <span id="<%= this.gatewayType.toString() %>grouppermtext"><%= this.groupPermText %></span>
-                                <div id="<%= this.gatewayType.toString() %>grouppermentrydiv" style="display:none"><textarea class='permissionListTextArea' rows="5" cols="20" id="<%= this.gatewayType.toString() %>grouppermentry" name="<%= this.gatewayType.toString() %>grouppermentry"><%= this.groupPermEntry %></textarea></div>
+                                <div id="<%= this.gatewayType.toString() %>grouppermentrydiv" style="display:none" class='permissionListDiv'><textarea class='permissionListTextArea' rows="5" cols="20" id="<%= this.gatewayType.toString() %>grouppermentry" name="<%= this.gatewayType.toString() %>grouppermentry"><%= this.groupPermEntry %></textarea></div>
                             </td>
                         </tr>
                     </table>
@@ -466,7 +466,7 @@
 
     function activateModifyUsers(transportID) {
         document.getElementById(transportID+"userpermtext").style.display = "none";
-        document.getElementById(transportID+"userpermentrydiv").style.display = "block";
+        document.getElementById(transportID+"userpermentrydiv").style.display = "inline";
     }
 
     function deactivateModifyUsers(transportID) {
@@ -476,7 +476,7 @@
 
     function activateModifyGroups(transportID) {
         document.getElementById(transportID+"grouppermtext").style.display = "none";
-        document.getElementById(transportID+"grouppermentrydiv").style.display = "block";
+        document.getElementById(transportID+"grouppermentrydiv").style.display = "inline";
     }
 
     function deactivateModifyGroups(transportID) {

src/web/style/gateways.css

@@ -137,6 +137,12 @@ a.jive-gatewayButtonOn {
 }
 .permissionListTextArea {
     font-size: 70%;
+    margin: 0px;
+    padding: 1px;
+}
+.permissionListDiv {
+    padding: 0px;
+    margin: 0px;
 }
 
 
@@ -396,13 +402,13 @@ tr.jive-registrations-edit, tr.jive-registrations-editVisible td {
 .jive-gateway-addregBtn a {
 	display: block;
 	float: left;
-	background: url('/images/add-16x16.gif') no-repeat left;
+	background: url('../images/add-16x16.gif') no-repeat left;
 	padding-left: 20px;
 	color: #34679a;
 	font-weight: bold;
 	}
 .jive-gateway-cancelAdd a {
-	background: url('/images/forbidden-16x16.gif') no-repeat left;
+	background: url('../images/forbidden-16x16.gif') no-repeat left;
 	}
 
 .jive-gateway-addreg {