From 75da36fab874259a3886e6090f63e025ef77d2f6 Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 8 Feb 2008 22:00:25 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1366
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 ChangeLog                                     |  5 ++++
 NEWS                                          | 19 +++++++++++++-
 UI/MailPartViewers/UIxMailPartICalViewer.m    | 10 ++++++++
 .../MailPartViewers/UIxMailPartICalViewer.wox | 25 +++++++++++--------
 UI/WebServerResources/SchedulerUI.js          | 13 +++++-----
 5 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8cd7fe1a..f41a8271 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartICalViewer.m
+	([UIxMailPartICalViewer -currentUserAttendee]): new method that
+	returns the current user as an attendee representation in the
+	displayed event, if found.
+
 	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
 	-_urlHostString]): replace "@" with %40 AFTER invoking
 	stringByEscapingURL.
diff --git a/NEWS b/NEWS
index ad2a2597..10f9d8f0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,21 @@
-0.9.0-2008MMDD (1.0 rc4)
+0.9.0-20080208 (1.0 rc5)
+------------------------
+- improved validation in the custom recurrence window
+- improved resiliance when parsing buggy recurrence rules
+- added the ability to authenticate users and to identify their resources with
+  an LDAP field other than the username
+- the monthly view would not switch to the next or previous month if the
+  current day of the new month was already displayed in the current view
+- enabled the instant-messaging entry in the addressbook
+- prevent the user from selecting disabled menu entries
+- added the ability to add/remove and renamed calendars in DAV
+- no longer require a default domain name/imap server to work properly
+- the position of the splitters is now remembered across user sessions
+- improved the email notifications when creating and removing a folder
+- fixed the tab handling in IE7
+- dramatic improvement in the overall stability of SOGo
+
+0.9.0-20080116 (1.0 rc4)
 ------------------------
 - improved the attendees window;
 - added the attendees pulldown menu in the event editor (like in Lightning);
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 737e17d2..66df01d2 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -39,6 +39,7 @@
 
 #import <SoObjects/SOGo/SOGoDateFormatter.h>
 #import <SoObjects/SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/iCalEntityObject+Utilities.h>
 #import <SoObjects/Appointments/iCalEntityObject+SOGo.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #import <SoObjects/Appointments/SOGoAppointmentObject.h>
@@ -349,6 +350,15 @@
   return [attendees objectAtIndex:0];
 }
 
+- (iCalPerson *) currentUserAttendee
+{
+  iCalPerson *currentUser;
+
+  currentUser = [[self storedEvent] findParticipant: [context activeUser]];
+
+  return currentUser;
+}
+
 - (iCalPerson *) storedReplyAttendee
 {
   /*
diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index e6a9771d..d4f58af6 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -39,21 +39,24 @@
       <var:if condition="inCalendar.method.uppercaseString" const:value="REQUEST">
 	<!-- sent to attendees to propose or update a meeting -->
 	<var:if condition="isLoggedInUserAnAttendee">
-	  <var:if condition="$storedReplyAttendee.partStatWithDefault"
-	    const:value="NEEDS-ACTION" const:negate="YES">
-	    <p class="uix_ical_toolbar" id="iCalendarToolbar">
+	  <p class="uix_ical_toolbar" id="iCalendarToolbar">
+	    <var:if condition="currentUserAttendee.partStatWithDefault"
+	      const:value="ACCEPTED" const:negate="YES">
 	      <input id="iCalendarAccept" class="button"
 		type="button" label:value="Accept"/>
+	    </var:if>
+	    <var:if condition="currentUserAttendee.partStatWithDefault"
+	      const:value="DECLINED" const:negate="YES">
 	      <input id="iCalendarDecline" class="button"
 		type="button" label:value="Decline"/>
-	      <!-- <input id="iCalendarTentative" class="button"
-	      type="button" label:value="Tentative"/> -->
-	      <var:if condition="isEventStoredInCalendar" const:negate="YES">
-		| <input id="iCalendarAddToCalendar" class="button"
-		  type="button" label:value="Add to calendar"/>
-	      </var:if>
-	    </p>
-	  </var:if>
+	    </var:if>
+	    <!-- <input id="iCalendarTentative" class="button"
+	    type="button" label:value="Tentative"/> -->
+	    <var:if condition="isEventStoredInCalendar" const:negate="YES">
+	      | <input id="iCalendarAddToCalendar" class="button"
+		type="button" label:value="Add to calendar"/>
+	    </var:if>
+	  </p>
 
 	  <p>
 	    <var:string label:value="Organizer" />
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index c459dc40..d2ccc42b 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -292,12 +292,12 @@ function onCalendarGotoDay(node) {
   var day = node.getAttribute("date");
   var needRefresh = (listFilter == 'view_selectedday'
                      && day != currentDay);
-   
+
   changeDateSelectorDisplay(day);
   changeCalendarDisplay( { "day": day } );
   if (needRefresh)
     refreshEvents();
-  
+
   return false;
 }
 
@@ -510,7 +510,8 @@ function changeDateSelectorDisplay(day, keepCurrentDay) {
 }
 
 function changeCalendarDisplay(data, newView) {
-  var url = ApplicationBaseURL + ((newView) ? newView : currentView);
+  newView = ((newView) ? newView : currentView);
+  var url = ApplicationBaseURL + newView;
   var day = null;
   var scrollEvent = null;
 
@@ -523,17 +524,17 @@ function changeCalendarDisplay(data, newView) {
     day = currentDay;
 
   if (day) {
-    if (data) {
+    if (data && newView != "monthview") {
       var divs = $$('div.day[day='+day+']');
       if (divs.length) {
 	// Don't reload the view if the event is present in current view
-	
+
 	// Deselect previous day
 	var selectedDivs = $$('div.day.selectedDay');
 	selectedDivs.each(function(div) {
 	    div.removeClassName('selectedDay');
 	  });
-	
+
 	// Select new day
 	divs.each(function(div) {
 	    div.addClassName('selectedDay');
-- 
2.39.5