From 821df34e91a69532e199a307927626fc68b8a482 Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 27 Nov 2007 23:55:29 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1280
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 NEWS                                          | 21 +++++++++++++++++--
 .../Appointments/SOGoAppointmentFolder.m      |  8 ++++---
 SoObjects/Appointments/product.plist          |  2 --
 UI/MailerUI/UIxMailFolderActions.m            |  2 +-
 UI/MailerUI/UIxMailUserRightsEditor.m         |  6 +++---
 .../MailerUI/UIxMailUserRightsEditor.wox      |  5 -----
 .../UIxMailUserRightsEditor.js                |  2 +-
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index 58483631..4d2cdc06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,22 @@
-0.9.0-200710XX
---------------
+0.9.0-20071127 (1.0 rc2)
+------------------------
+- the user password is no longer transmitted in the url when logging in;
+- SOGo will no longer redirect the browser to the default page when a
+  specific location is submitted before login;
+- it is now possible to specify a sequence of LDAP attributes/values pairs
+  required in a user record to enable or prevent access to the Calendar and/or Mail
+  module;
+- many messages can be moved or copied at the same time;
+- replying to mails in the Sent folder will take the recipients of the
+  original mails into account;
+- complete review of the ACLs wrt to the address books, both in the Web UI and
+  through DAV access;
+- invitation from Google calendar are now correctly parsed;
+- it is now possible to search events by title in the Calendar module;
+- all the writable calendars are now listed in the event edition dialog;
+
+0.9.0-20071119 (1.0 rc1)
+------------------------
 - the user can now configure his folders as drafts, trash or sent folder;
 - added the ability the move and copy message across mail folders;
 - added the ability to label messages;
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index cafd2173..48c9478c 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -838,7 +838,7 @@ static NSNumber   *sharedYes = nil;
   NSMutableDictionary *currentRecord;
   NSString *roles[] = {nil, nil, nil};
   iCalAccessClass accessClass;
-  NSString *role;
+  NSString *fullRole, *role;
 
   if (!stripFields)
     [self _buildStripFieldsFromFields: fields];
@@ -851,8 +851,10 @@ static NSNumber   *sharedYes = nil;
       role = roles[accessClass];
       if (!role)
 	{
-	  role = [[self roleForComponentsWithAccessClass: accessClass
-			forUser: uid] substringFromIndex: 9];
+	  fullRole = [self roleForComponentsWithAccessClass: accessClass
+			   forUser: uid];
+	  if ([fullRole length] > 9)
+	    role = [fullRole substringFromIndex: 9];
 	  roles[accessClass] = role;
 	}
       if ([role isEqualToString: @"DAndTViewer"])
diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist
index f2a5b7fe..6b2ecb32 100644
--- a/SoObjects/Appointments/product.plist
+++ b/SoObjects/Appointments/product.plist
@@ -27,8 +27,6 @@
 	"ViewDAndTOfConfidentialRecords" = ( "Owner", "ConfidentialDAndTViewer" );
 	"ModifyConfidentialRecords" = ( "Owner", "ConfidentialModifier" );
 	"RespondToConfidentialRecords" = ( "Owner", "ConfidentialModifier", "ConfidentialResponder" );
-	"Access Contents Information" = ( "Owner", "AuthorizedSubscriber" );
-	"Access Object" = ( "Owner", "AuthorizedSubscriber" );
       };
     };
     SOGoGroupAppointmentFolder = {
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index c80cc99b..dcdfa6e6 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -299,7 +299,7 @@
       mailInvitationURL
 	= [[clientObject soURLToBaseContainerForCurrentUser]
 	    absoluteString];
-      [response setStatus: 302];
+      response = [self responseWithStatus: 302];
       [response setHeader: mailInvitationURL
 		forKey: @"location"];
     }
diff --git a/UI/MailerUI/UIxMailUserRightsEditor.m b/UI/MailerUI/UIxMailUserRightsEditor.m
index c9d3853c..1965eec7 100644
--- a/UI/MailerUI/UIxMailUserRightsEditor.m
+++ b/UI/MailerUI/UIxMailUserRightsEditor.m
@@ -29,15 +29,15 @@
 
 @implementation UIxMailUserRightsEditor
 
-- (void) setUserCanSeeFolder: (BOOL) userCanSeeFolder
+- (void) setUserCanReadMails: (BOOL) userCanReadMails
 {
-  if (userCanSeeFolder)
+  if (userCanReadMails)
     [self appendRight: SOGoRole_ObjectViewer];
   else
     [self removeRight: SOGoRole_ObjectViewer];
 }
 
-- (BOOL) userCanSeeFolder
+- (BOOL) userCanReadMails
 {
   return [userRights containsObject: SOGoRole_ObjectViewer];
 }
diff --git a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
index 998f5b6f..6664a621 100644
--- a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
@@ -24,11 +24,6 @@
     <div class="calendarUserRights">
       <label><input type="checkbox" class="checkBox"
 	  const:name="ObjectViewer"
-	  var:checked="userCanSeeFolder"/><var:string
-	  label:value="List and see this folder"/></label>
-      <br/>
-      <label><input type="checkbox" class="checkBox"
-	  const:name="ObjectReader"
 	  var:checked="userCanReadMails"/><var:string
 	  label:value="Read mails from this folder"/></label>
       <br/>
diff --git a/UI/WebServerResources/UIxMailUserRightsEditor.js b/UI/WebServerResources/UIxMailUserRightsEditor.js
index 65d471b6..7f08ba5c 100644
--- a/UI/WebServerResources/UIxMailUserRightsEditor.js
+++ b/UI/WebServerResources/UIxMailUserRightsEditor.js
@@ -3,7 +3,7 @@ function onCancelClick(event) {
 }
 
 function initACLButtons() {
-   $("cancelButton").addEventListener("click", onCancelClick, false);
+   $("cancelButton").observe("click", onCancelClick)
 }
 
 FastInit.addOnLoad(initACLButtons);
-- 
2.39.5