gunnar: server/patches/horde/3.2-rc3/kronolith HK-GW-notice_fix_kronolith-3.2-rc3.patch, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Sat Apr 5 20:01:51 CEST 2008
- Previous message: gunnar: server/patches/horde/3.2-rc3/framework HK-GW-Freebusy_free_events_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-LDAP_user_alias_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-xfb_correction_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, 1.1, 1.2
- Next message: gunnar: server/patches/horde HK-GW-framework_3.2_RC1-Fbview_xfb_concept.patch, 1.1, NONE HK-GW-framework_3.2_RC1-Fix_Prefs_for_Ingo.patch, 1.1, NONE HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch, 1.1, NONE HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Fix_share_id_change.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch, 1.1, NONE HK-JS-kronolith_2.2_RC1-Fix_library_import.patch, 1.1, NONE HK-JS-nag_2.2_RC1-Fix_library_import.patch, 1.1, NONE HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch, 1.1, NONE HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch, 1.1, NONE README_Fbview_extra_params.patch, 1.1, NONE README_Fbview_relevance.patch, 1.1, NONE README_Fbview_save_attendees.patch, 1.1, NONE README_Fbview_xfb_access.patch, 1.1, NONE README_Fbview_xfb_concept.patch, 1.1, NONE README_Fix_Prefs_for_Ingo.patch, 1.2, NONE README_Fix_editing_contacts.patch, 1.2, NONE README_Fix_library_import.patch, 1.1, NO NE README_Fix_share_id_change.patch, 1.2, NONE README_Ldap_read_only_fix.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/patches/horde/3.2-rc3/kronolith
In directory doto:/tmp/cvs-serv1684/patches/horde/3.2-rc3/kronolith
Modified Files:
HK-GW-notice_fix_kronolith-3.2-rc3.patch
Log Message:
kolab/issue2587 (ifb retrieval does not work for aliases anymore), kolab/issue2588 (whole day event with show-time-as free gets into the pfb)
Index: HK-GW-notice_fix_kronolith-3.2-rc3.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/3.2-rc3/kronolith/HK-GW-notice_fix_kronolith-3.2-rc3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HK-GW-notice_fix_kronolith-3.2-rc3.patch 13 Mar 2008 15:37:25 -0000 1.1
+++ HK-GW-notice_fix_kronolith-3.2-rc3.patch 5 Apr 2008 18:01:49 -0000 1.2
@@ -1,40 +1,21 @@
-diff -r fe6b81992192 kronolith/lib/Driver/kolab.php
---- a/kronolith/lib/Driver/kolab.php Wed Mar 05 08:41:51 2008 +0100
-+++ b/kronolith/lib/Driver/kolab.php Wed Mar 05 08:44:50 2008 +0100
-@@ -1380,19 +1380,23 @@ class Kronolith_Event_kolab_new extends
+diff -r 3a8c7026bef9 kronolith/lib/Driver/kolab.php
+--- a/kronolith/lib/Driver/kolab.php Sat Apr 05 17:30:58 2008 +0200
++++ b/kronolith/lib/Driver/kolab.php Sat Apr 05 17:31:24 2008 +0200
+@@ -1389,7 +1389,8 @@ class Kronolith_Event_kolab_new extends
$this->end = new Horde_Date($event['end-date']);
$this->durMin = ($this->end->timestamp() - $this->start->timestamp()) / 60;
- switch ($event['show-time-as']) {
-- case 'free':
-- $this->status = KRONOLITH_STATUS_CANCELLED;
-- break;
--
-- case 'tentative':
-- $this->status = KRONOLITH_STATUS_TENTATIVE;
-- break;
--
-- case 'busy':
-- case 'outofoffice':
-- default:
-- $this->status = KRONOLITH_STATUS_CONFIRMED;
+ if (isset($event['show-time-as'])) {
+ switch ($event['show-time-as']) {
-+ case 'free':
-+ $this->status = KRONOLITH_STATUS_CANCELLED;
-+ break;
-+
-+ case 'tentative':
-+ $this->status = KRONOLITH_STATUS_TENTATIVE;
-+ break;
-+
-+ case 'busy':
-+ case 'outofoffice':
-+ default:
-+ $this->status = KRONOLITH_STATUS_CONFIRMED;
+ case 'free':
+ $this->status = KRONOLITH_STATUS_CANCELLED;
+ break;
+@@ -1402,6 +1403,7 @@ class Kronolith_Event_kolab_new extends
+ case 'outofoffice':
+ default:
+ $this->status = KRONOLITH_STATUS_CONFIRMED;
+ }
-+ } else {
-+ $this->status = KRONOLITH_STATUS_CONFIRMED;
}
// Recurrence
- Previous message: gunnar: server/patches/horde/3.2-rc3/framework HK-GW-Freebusy_free_events_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-LDAP_user_alias_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-xfb_correction_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, 1.1, 1.2
- Next message: gunnar: server/patches/horde HK-GW-framework_3.2_RC1-Fbview_xfb_concept.patch, 1.1, NONE HK-GW-framework_3.2_RC1-Fix_Prefs_for_Ingo.patch, 1.1, NONE HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch, 1.1, NONE HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Fix_share_id_change.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch, 1.1, NONE HK-JS-kronolith_2.2_RC1-Fix_library_import.patch, 1.1, NONE HK-JS-nag_2.2_RC1-Fix_library_import.patch, 1.1, NONE HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch, 1.1, NONE HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch, 1.1, NONE README_Fbview_extra_params.patch, 1.1, NONE README_Fbview_relevance.patch, 1.1, NONE README_Fbview_save_attendees.patch, 1.1, NONE README_Fbview_xfb_access.patch, 1.1, NONE README_Fbview_xfb_concept.patch, 1.1, NONE README_Fix_Prefs_for_Ingo.patch, 1.2, NONE README_Fix_editing_contacts.patch, 1.2, NONE README_Fix_library_import.patch, 1.1, NO NE README_Fix_share_id_change.patch, 1.2, NONE README_Ldap_read_only_fix.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list