From 914373e4a8b619862832a484389ebc2ee6ff1788 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 10 Feb 2012 20:56:45 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: 3d26091bec393e3abf8d2b6033e0737e09c207b9
Monotone-Revision: 0c045ab1e972ecf31a2d5051abbc0ef141461d10

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-10T20:56:45
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  5 ++++
 UI/WebServerResources/UIxAclEditor.js         | 29 ++++++++++++-------
 .../UIxContactsUserFolders.js                 |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f26a9e25..886119920 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxAclEditor.js (addUser): fixed case when
+	both canSubscribeUsers and isPublicAccessEnabled are disabled.
+
 2012-02-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:):
diff --git a/UI/WebServerResources/UIxAclEditor.js b/UI/WebServerResources/UIxAclEditor.js
index 4d76b8513..82e3b3cf7 100644
--- a/UI/WebServerResources/UIxAclEditor.js
+++ b/UI/WebServerResources/UIxAclEditor.js
@@ -21,16 +21,22 @@ function addUser(userName, userID, type) {
         var nextLi = null;
         while (count > -1 && !nextLi) {
             if ($(lis[count]).hasClassName("normal-user")) {
-                nextLi = lis[count+1];
+                if ((count+1) < lis.length)
+                    ul.insertBefore(newNode, lis[count+1]);
+                else
+                    ul.appendChild(newNode);
+                break;
             }
             else {
                 count--;
             }
         }
         if (!nextLi) {
-            nextLi = lis[0];
+            if (count > 0)
+                ul.insertBefore(newNode, lis[0]);
+            else
+                ul.appendChild(newNode);
         }
-        ul.insertBefore(newNode, nextLi);
 
         var url = window.location.href;
         var elements = url.split("/");
@@ -188,13 +194,16 @@ function onAclLoadHandler() {
     for (var i = 0; i < lis.length; i++)
         setEventsOnUserNode(lis[i]);
 
-    defaultUserID = $("defaultUserID").value;
-    var userNode = nodeForUser(_("Any Authenticated User"),
-                               defaultUserID);
-    userNode.addClassName("any-user");
-    userNode.setAttribute("title",
-                          _("Any user not listed above"));
-    ul.appendChild(userNode);
+    var input = $("defaultUserID");
+    if (input) {
+        defaultUserID = $("defaultUserID").value;
+        var userNode = nodeForUser(_("Any Authenticated User"),
+                                   defaultUserID);
+        userNode.addClassName("any-user");
+        userNode.setAttribute("title",
+                              _("Any user not listed above"));
+        ul.appendChild(userNode);
+    }
     if (isPublicAccessEnabled && CurrentModule() != "Mail") {
         userNode = nodeForUser(_("Public Access"), "anonymous");
         userNode.addClassName("anonymous-user");
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index cc7381448..adc1f8541 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -48,7 +48,7 @@ function addUserLineToTree(tree, parent, line) {
     if (line[4] && !line[4].empty())
         email += ", " + line[4].split("\n").join("; "); // extra contact info
     var icon_card = 'abcard.png';
-    var datatype = 'person';
+    var datatype = 'user';
     if (line[3]) {
         icon_card = 'ablist.png';
         datatype = 'group';