diff --git a/ChangeLog b/ChangeLog
index 3be7dbf50..19f45722e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-01-30  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxCalUserRightsEditor.js (onUpdateACL):
+	ask confirmation when giving access to all authenticated users or
+	when giving public access.
+
+	* UI/WebServerResources/UIxMailUserRightsEditor.js (onUpdateACL): idem.
+
+	* UI/WebServerResources/UIxContactsUserRightsEditor.js (onUpdateACL): idem.
+
+	* UI/WebServerResources/SchedulerUI.js (onViewEventCallback):
+	moved start/end time just under the event name.
+
+	* UI/WebServerResources/generic.js (showConfirmDialog): this
+	function now accepts two additional arguments to change the
+	default "yes" and "no" buttons.
+
 2012-01-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreMailContext.[hm]: removed
diff --git a/NEWS b/NEWS
index 538b59e98..281f441e2 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Enhancements
  - now possible to use memcached over a UNIX socket
  - increase size of content columns
  - improved import of .ics files
+ - new cronjob template with commented out entries
 
 Bug Fixes
  - alarms for tasks now depend on the start date and instead of the due date
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 917bf7cf9..3be18229c 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -1222,7 +1222,7 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
   folder = [[self container] ocsFolder];
   if (!folder)
     {
-      [self errorWithFormat:@"(%s): missing folder for fetch!",
+      [self errorWithFormat:@"(%s): missing folder for update!",
             __PRETTY_FUNCTION__];
       return;
     }
diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings
index 15cac4f48..d9b468202 100644
--- a/UI/Common/English.lproj/Localizable.strings
+++ b/UI/Common/English.lproj/Localizable.strings
@@ -37,6 +37,11 @@
 
 "Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object.";
 
+"Are you sure you want to give rights to all authenticated users?" = "Are you sure you want to give rights to all authenticated users?";
+"Are you sure you want to give rights to everybody?" = "Are you sure you want to give rights to everybody?";
+"Give Access" = "Give Access";
+"Keep Private" = "Keep Private";
+
 /* generic.js */
 "Unable to subscribe to that folder!"
 	= "Unable to subscribe to that folder!";
diff --git a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
index 1993f0f3d..48bd817df 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
@@ -11,7 +11,7 @@
   const:toolbar="none"
   const:popup="YES">
   <form id="userRightsForm" const:href="saveUserRights">
-    <input type="hidden" name="uid" var:value="uid"/>
+    <input id="uid" type="hidden" name="uid" var:value="uid"/>
     <div class="title">
       <var:if condition="userIsDefaultUser">
 	<label><span class="value"
diff --git a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
index d353ff159..379421388 100644
--- a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
@@ -11,7 +11,7 @@
   const:toolbar="none"
   const:popup="YES">
   <form id="userRightsForm" const:href="saveUserRights">
-    <input type="hidden" name="uid" var:value="uid"/>
+    <input id="uid" type="hidden" name="uid" var:value="uid"/>
     <div class="title">
       <var:if condition="userIsDefaultUser">
 	<label><span class="value"><var:string label:value="Default Roles"
diff --git a/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox b/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
index 6ef3d120c..6f141cd79 100644
--- a/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
@@ -11,7 +11,7 @@
   const:toolbar="none"
   const:popup="YES">
   <form id="userRightsForm" const:href="saveUserRights">
-    <input type="hidden" name="uid" var:value="uid"/>
+    <input id="uid" type="hidden" name="uid" var:value="uid"/>
     <div class="title">
       <var:if condition="userIsDefaultUser">
 	<label><span class="value"><var:string label:value="Any Authenticated User"
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 44afeee19..d6c2a0ef9 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -725,6 +725,13 @@ function onViewEventCallback(http) {
 
             var paras = div.getElementsByTagName("p");
             var para = $(paras[0]);
+            if (parseInt(data["isAllDay"]) == 0) {
+                para.down("SPAN").update(data["startTime"] + " - " + data["endTime"]);
+                para.show();
+            } else
+                para.hide();
+
+            para = $(paras[1]);
             if (data["calendar"].length) {
  		// Remove owner email from calendar's name
                 para.down("SPAN", 1).update(data["calendar"].replace(/ \<.*\>/, ""));
@@ -732,20 +739,13 @@ function onViewEventCallback(http) {
             } else
                 para.hide();
 
-            para = $(paras[1]);
+            para = $(paras[2]);
             if (data["location"].length) {
                 para.down("SPAN", 1).update(data["location"]);
                 para.show();
             } else
                 para.hide();
 
-            para = $(paras[2]);
-            if (parseInt(data["isAllDay"]) == 0) {
-                para.down("SPAN").update(data["startTime"] + " - " + data["endTime"]);
-                para.show();
-            } else
-                para.hide();
-
             para = $(paras[3]);
             if (data["description"].length) {
                 para.update(data["description"].replace(/\r?\n/g, "<BR/>"));
diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.css b/UI/WebServerResources/UIxCalUserRightsEditor.css
index af06186d4..7ec24e690 100644
--- a/UI/WebServerResources/UIxCalUserRightsEditor.css
+++ b/UI/WebServerResources/UIxCalUserRightsEditor.css
@@ -27,3 +27,10 @@ DIV.buttons
 { text-align: right;
   margin: 1em;
   margin-top: 0px; }
+
+DIV.dialog.none
+{ position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  margin: 50px auto; }
\ No newline at end of file
diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.js b/UI/WebServerResources/UIxCalUserRightsEditor.js
index 17fc991fb..80a0932c0 100644
--- a/UI/WebServerResources/UIxCalUserRightsEditor.js
+++ b/UI/WebServerResources/UIxCalUserRightsEditor.js
@@ -1,12 +1,57 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 function onUpdateACL(event) {
+    var uid = $('uid').value;
+    if (uid == '<default>' || uid == 'anonymous') {
+        var selects = $$('#userRightsForm select');
+        var enabled = false;
+        for (var i = 0; i < selects.length; i++) {
+            if (selects[i].value != 'None') {
+                enabled = true;
+                break;
+            }
+        }
+        if (!enabled) {
+            var inputs = $$('#userRightsForm input[type="checkbox"]');
+            for (var i = 0; i < inputs.length; i++) {
+                if (inputs[i].checked) {
+                    enabled = true;
+                    break;
+                }
+            }
+        }
+        if (enabled) {
+            showConfirmDialog(_("Confirmation"), _("Are you sure you want to give rights to " + ((uid == "<default>")?"all authenticated users":"everybody") + "?"),
+                              onUpdateACLConfirm, onUpdateACLCancel,
+                              "Give Access", "Keep Private");
+            return false;
+        }
+    }
+
+    return onUpdateACLConfirm(event);
+}
+
+function onUpdateACLConfirm(event) {
+    disposeDialog();
+
     $('userRightsForm').submit();
     Event.stop(event);
     
     return false;
 }
 
+function onUpdateACLCancel(event) {
+    var options = $$('#userRightsForm option');
+    for (var i = 0; i < options.length; i++)
+        options[i].selected = (options[i].value == 'None');
+    var inputs = $$('#userRightsForm input[type="checkbox"]');
+    for (var i = 0; i < inputs.length; i++)
+        if (inputs[i].checked)
+            inputs[i].checked = false;
+    
+    disposeDialog();
+}
+
 function onCancelACL(event) {
     window.close();
 }
diff --git a/UI/WebServerResources/UIxContactsUserRightsEditor.css b/UI/WebServerResources/UIxContactsUserRightsEditor.css
index 3e7b6991b..32088ee47 100644
--- a/UI/WebServerResources/UIxContactsUserRightsEditor.css
+++ b/UI/WebServerResources/UIxContactsUserRightsEditor.css
@@ -47,3 +47,10 @@ DIV.calendarUserRights > TABLE TD
 DIV.buttons
 { text-align: right;
   margin: 1em; }
+
+DIV.dialog.none
+{ position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  margin: 10px auto; }
\ No newline at end of file
diff --git a/UI/WebServerResources/UIxContactsUserRightsEditor.js b/UI/WebServerResources/UIxContactsUserRightsEditor.js
index 17fc991fb..227a7cf0f 100644
--- a/UI/WebServerResources/UIxContactsUserRightsEditor.js
+++ b/UI/WebServerResources/UIxContactsUserRightsEditor.js
@@ -1,12 +1,45 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 function onUpdateACL(event) {
+    var uid = $('uid').value;
+    if (uid == '<default>' || uid == 'anonymous') {
+        var inputs = $$('#userRightsForm input[type="checkbox"]');
+        var enabled = false;
+        for (var i = 0; i < inputs.length; i++) {
+            if (inputs[i].checked) {
+                enabled = true;
+                break;
+            }
+        }
+        if (enabled) {
+            showConfirmDialog(_("Confirmation"), _("Are you sure you want to give rights to " + ((uid == "<default>")?"all authenticated users":"everybody") + "?"),
+                              onUpdateACLConfirm, onUpdateACLCancel,
+                              "Give Access", "Keep Private");
+            return false;
+        }
+    }
+
+    return onUpdateACLConfirm(event);
+}
+
+function onUpdateACLConfirm(event) {
+    disposeDialog();
+
     $('userRightsForm').submit();
     Event.stop(event);
-    
+
     return false;
 }
 
+function onUpdateACLCancel(event) {
+    var inputs = $$('#userRightsForm input[type="checkbox"]');
+    for (var i = 0; i < inputs.length; i++)
+        if (inputs[i].checked)
+            inputs[i].checked = false;
+
+    disposeDialog();
+}
+
 function onCancelACL(event) {
     window.close();
 }
diff --git a/UI/WebServerResources/UIxMailUserRightsEditor.css b/UI/WebServerResources/UIxMailUserRightsEditor.css
index 3e7b6991b..8ce817246 100644
--- a/UI/WebServerResources/UIxMailUserRightsEditor.css
+++ b/UI/WebServerResources/UIxMailUserRightsEditor.css
@@ -47,3 +47,10 @@ DIV.calendarUserRights > TABLE TD
 DIV.buttons
 { text-align: right;
   margin: 1em; }
+
+DIV.dialog.none
+{ position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  margin: 75px auto; }
\ No newline at end of file
diff --git a/UI/WebServerResources/UIxMailUserRightsEditor.js b/UI/WebServerResources/UIxMailUserRightsEditor.js
index 17fc991fb..56b1ddcda 100644
--- a/UI/WebServerResources/UIxMailUserRightsEditor.js
+++ b/UI/WebServerResources/UIxMailUserRightsEditor.js
@@ -1,12 +1,44 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 function onUpdateACL(event) {
+    if ($('uid').value == 'anyone') {
+        var inputs = $$('#userRightsForm input[type="checkbox"]');
+        var enabled = false;
+        for (var i = 0; i < inputs.length; i++) {
+            if (inputs[i].checked) {
+                enabled = true;
+                break;
+            }
+        }
+        if (enabled) {
+            showConfirmDialog(_("Confirmation"), _("Are you sure you want to give rights to all authenticated users?"),
+                              onUpdateACLConfirm, onUpdateACLCancel,
+                              "Give Access", "Keep Private");
+            return false;
+        }
+    }
+
+    return onUpdateACLConfirm(event);
+}
+
+function onUpdateACLConfirm(event) {
+    disposeDialog();
+
     $('userRightsForm').submit();
     Event.stop(event);
-    
+
     return false;
 }
 
+function onUpdateACLCancel(event) {
+    var inputs = $$('#userRightsForm input[type="checkbox"]');
+    for (var i = 0; i < inputs.length; i++)
+        if (inputs[i].checked)
+            inputs[i].checked = false;
+
+    disposeDialog();
+}
+
 function onCancelACL(event) {
     window.close();
 }
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index fc2627bb6..8dd42e05a 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -86,9 +86,11 @@ function prototypeIfyFilters() {
             }
         }
 
-        newFilter.actions = $([]);
-        for (var j = 0; j < filter.actions.length; j++) {
-            newFilter.actions.push($(filter.actions[j]));
+        if (filter.actions) {
+            newFilter.actions = $([]);
+            for (var j = 0; j < filter.actions.length; j++) {
+                newFilter.actions.push($(filter.actions[j]));
+            }
         }
         newFilters.push(newFilter);
     }
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 34de68a60..2aaab1fa3 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -722,7 +722,6 @@ function popupMenu(event, menuId, target) {
                          visibility: "visible" });
 
         document.currentPopupMenu = popup;
-
         $(document.body).observe("mousedown", onBodyClickMenuHandler);
     }
 }
@@ -1963,15 +1962,15 @@ function _showAlertDialog(label) {
     dialog.appear({ duration: 0.2 });
 }
 
-function showConfirmDialog(title, label, callbackYes, callbackNo) {
+function showConfirmDialog(title, label, callbackYes, callbackNo, yesLabel, noLabel) {
     var div = $("bgDialogDiv");
     if (div && div.visible() && div.getOpacity() > 0)
-        dialogsStack.push(_showConfirmDialog.bind(this, title, label, callbackYes, callbackNo));
+        dialogsStack.push(_showConfirmDialog.bind(this, title, label, callbackYes, callbackNo, yesLabel, noLabel));
     else
-        _showConfirmDialog(title, label, callbackYes, callbackNo);
+        _showConfirmDialog(title, label, callbackYes, callbackNo, yesLabel, noLabel);
 }
 
-function _showConfirmDialog(title, label, callbackYes, callbackNo) {
+function _showConfirmDialog(title, label, callbackYes, callbackNo, yesLabel, noLabel) {
     var key = title;
     if (Object.isElement(label)) key += label.allTextContent();
     else key += label;
@@ -1988,8 +1987,8 @@ function _showConfirmDialog(title, label, callbackYes, callbackNo) {
     }
     else {
         var fields = createElement("p");
-        fields.appendChild(createButton(null, _("Yes"), callbackYes));
-        fields.appendChild(createButton(null, _("No"), callbackNo || disposeDialog));
+        fields.appendChild(createButton(null, _(yesLabel || "Yes"), callbackYes));
+        fields.appendChild(createButton(null, _(noLabel || "No"), callbackNo || disposeDialog));
         dialog = createDialog(null,
                               title,
                               label,
@@ -2098,7 +2097,7 @@ function disposeDialog() {
         dialogsStack.splice(0, 1);
         dialogFcn.delay(0.2);
     }
-    else {
+    else if ($('bgDialogDiv')) {
         var bgFade = Effect.Fade('bgDialogDiv', { duration: 0.2 });
         // By the end the background fade out, a new dialog
         // may need to be displayed.
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 428d01926..65b67d9ef 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -215,4 +215,10 @@ TABLE#filtersList
 /* UIxComponentEditor */
 
 .SOGoTimePickerMenu > DIV
-{ width: 310px; }
\ No newline at end of file
+{ width: 310px; }
+
+/* UIx*UserRights */
+BODY.popup DIV.dialog.none
+{ left: 50%;
+  width: 350px;
+  margin-left: -175px; }
\ No newline at end of file