diff -r 41738a0e98d1 -r 610cba0674b9 davical/davical.patch --- a/davical/davical.patch Tue Nov 29 18:44:37 2011 +0100 +++ b/davical/davical.patch Thu Dec 01 13:24:24 2011 +0100 @@ -1,7 +1,7 @@ -Index: davical-0.9.9.5/dba/appuser_permissions.txt ---- davical-0.9.9.5/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 -+++ davical-0.9.9.5/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 -@@ -1,65 +1,69 @@ +Index: davical-0.9.9.7/dba/appuser_permissions.txt +--- davical-0.9.9.7/dba/appuser_permissions.txt.orig 2011-10-06 11:14:54.000000000 +0200 ++++ davical-0.9.9.7/dba/appuser_permissions.txt 2011-10-25 09:45:26.000000000 +0200 +@@ -1,66 +1,69 @@ -# -# This file is used by update-rscds-database to set the correct -# permissions for the application user. In newer installations @@ -66,6 +66,9 @@ - ON addressbook_address_adr - ON addressbook_address_tel - ON addressbook_address_email +- ON timezones +- ON tz_aliases +- ON tz_localnames + ON collection, + caldav_data, + calendar_item, @@ -93,28 +96,28 @@ + addressbook_resource, + addressbook_address_adr, + addressbook_address_tel, -+ addressbook_address_email ++ addressbook_address_email, ++ timezones, ++ tz_aliases, ++ tz_localnames + TO davical; GRANT SELECT,UPDATE -- ON relationship_type_rt_id_seq + ON relationship_type_rt_id_seq - ON dav_id_seq - ON usr_user_no_seq - ON roles_role_no_seq - ON session_session_id_seq - ON principal_type_principal_type_id_seq - ON sync_tokens_sync_token_seq -+ ON relationship_type_rt_id_seq, +- ON timezones_our_tzno_seq + dav_id_seq, + usr_user_no_seq, + roles_role_no_seq, + session_session_id_seq, + principal_type_principal_type_id_seq, -+ sync_tokens_sync_token_seq -+ TO davical; - - GRANT SELECT,INSERT - ON time_zone ++ sync_tokens_sync_token_seq, ++ timezones_our_tzno_seq + TO davical; GRANT SELECT @@ -126,10 +129,29 @@ + principal_type + TO davical; -Index: davical-0.9.9.5/inc/always.php.in ---- davical-0.9.9.5/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 -+++ davical-0.9.9.5/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 -@@ -123,20 +123,8 @@ +Index: davical-0.9.9.7/dba/views/dav_principal.sql +--- davical-0.9.9.7/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 ++++ davical-0.9.9.7/dba/views/dav_principal.sql 2011-10-25 09:38:48.000000000 +0200 +@@ -2,7 +2,6 @@ + -- record 1:1 with the principal table + + +-DROP VIEW dav_principal CASCADE; + CREATE OR REPLACE VIEW dav_principal AS + SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, + username, password, fullname, email, +Index: davical-0.9.9.7/inc/always.php.in +--- davical-0.9.9.7/inc/always.php.in.orig 2011-09-25 11:04:29.000000000 +0200 ++++ davical-0.9.9.7/inc/always.php.in 2011-10-25 09:38:48.000000000 +0200 +@@ -58,6 +58,7 @@ + $c->images = $c->base_url . '/images'; + + // Add a default for newly created users ++date_default_timezone_set("UTC"); + $c->template_usr = array( 'active' => true, + 'locale' => 'en_GB', + 'date_format_type' => 'E', +@@ -125,20 +126,8 @@ * too early. */ ob_start( ); @@ -152,15 +174,3 @@ } else if ( @file_exists('config/config.php') ) { include('config/config.php'); -Index: davical-0.9.9.5/dba/views/dav_principal.sql ---- davical-0.9.9.5/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 -+++ davical-0.9.9.5/dba/views/dav_principal.sql 2010-11-22 14:33:59.832463699 +0100 -@@ -2,7 +2,7 @@ - -- record 1:1 with the principal table - - --DROP VIEW dav_principal CASCADE; -+DROP VIEW IF EXISTS dav_principal CASCADE; - CREATE OR REPLACE VIEW dav_principal AS - SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, - username, password, fullname, email,