1.1 --- a/davical/davical.patch Tue Nov 29 18:44:37 2011 +0100 1.2 +++ b/davical/davical.patch Thu Dec 01 13:24:24 2011 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 -Index: davical-0.9.9.5/dba/appuser_permissions.txt 1.5 ---- davical-0.9.9.5/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 1.6 -+++ davical-0.9.9.5/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 1.7 -@@ -1,65 +1,69 @@ 1.8 +Index: davical-0.9.9.7/dba/appuser_permissions.txt 1.9 +--- davical-0.9.9.7/dba/appuser_permissions.txt.orig 2011-10-06 11:14:54.000000000 +0200 1.10 ++++ davical-0.9.9.7/dba/appuser_permissions.txt 2011-10-25 09:45:26.000000000 +0200 1.11 +@@ -1,66 +1,69 @@ 1.12 -# 1.13 -# This file is used by update-rscds-database to set the correct 1.14 -# permissions for the application user. In newer installations 1.15 @@ -66,6 +66,9 @@ 1.16 - ON addressbook_address_adr 1.17 - ON addressbook_address_tel 1.18 - ON addressbook_address_email 1.19 +- ON timezones 1.20 +- ON tz_aliases 1.21 +- ON tz_localnames 1.22 + ON collection, 1.23 + caldav_data, 1.24 + calendar_item, 1.25 @@ -93,28 +96,28 @@ 1.26 + addressbook_resource, 1.27 + addressbook_address_adr, 1.28 + addressbook_address_tel, 1.29 -+ addressbook_address_email 1.30 ++ addressbook_address_email, 1.31 ++ timezones, 1.32 ++ tz_aliases, 1.33 ++ tz_localnames 1.34 + TO davical; 1.35 1.36 GRANT SELECT,UPDATE 1.37 -- ON relationship_type_rt_id_seq 1.38 + ON relationship_type_rt_id_seq 1.39 - ON dav_id_seq 1.40 - ON usr_user_no_seq 1.41 - ON roles_role_no_seq 1.42 - ON session_session_id_seq 1.43 - ON principal_type_principal_type_id_seq 1.44 - ON sync_tokens_sync_token_seq 1.45 -+ ON relationship_type_rt_id_seq, 1.46 +- ON timezones_our_tzno_seq 1.47 + dav_id_seq, 1.48 + usr_user_no_seq, 1.49 + roles_role_no_seq, 1.50 + session_session_id_seq, 1.51 + principal_type_principal_type_id_seq, 1.52 -+ sync_tokens_sync_token_seq 1.53 -+ TO davical; 1.54 - 1.55 - GRANT SELECT,INSERT 1.56 - ON time_zone 1.57 ++ sync_tokens_sync_token_seq, 1.58 ++ timezones_our_tzno_seq 1.59 + TO davical; 1.60 1.61 GRANT SELECT 1.62 @@ -126,10 +129,29 @@ 1.63 + principal_type 1.64 + TO davical; 1.65 1.66 -Index: davical-0.9.9.5/inc/always.php.in 1.67 ---- davical-0.9.9.5/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 1.68 -+++ davical-0.9.9.5/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 1.69 -@@ -123,20 +123,8 @@ 1.70 +Index: davical-0.9.9.7/dba/views/dav_principal.sql 1.71 +--- davical-0.9.9.7/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 1.72 ++++ davical-0.9.9.7/dba/views/dav_principal.sql 2011-10-25 09:38:48.000000000 +0200 1.73 +@@ -2,7 +2,6 @@ 1.74 + -- record 1:1 with the principal table 1.75 + 1.76 + 1.77 +-DROP VIEW dav_principal CASCADE; 1.78 + CREATE OR REPLACE VIEW dav_principal AS 1.79 + SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, 1.80 + username, password, fullname, email, 1.81 +Index: davical-0.9.9.7/inc/always.php.in 1.82 +--- davical-0.9.9.7/inc/always.php.in.orig 2011-09-25 11:04:29.000000000 +0200 1.83 ++++ davical-0.9.9.7/inc/always.php.in 2011-10-25 09:38:48.000000000 +0200 1.84 +@@ -58,6 +58,7 @@ 1.85 + $c->images = $c->base_url . '/images'; 1.86 + 1.87 + // Add a default for newly created users 1.88 ++date_default_timezone_set("UTC"); 1.89 + $c->template_usr = array( 'active' => true, 1.90 + 'locale' => 'en_GB', 1.91 + 'date_format_type' => 'E', 1.92 +@@ -125,20 +126,8 @@ 1.93 * too early. 1.94 */ 1.95 ob_start( ); 1.96 @@ -152,15 +174,3 @@ 1.97 } 1.98 else if ( @file_exists('config/config.php') ) { 1.99 include('config/config.php'); 1.100 -Index: davical-0.9.9.5/dba/views/dav_principal.sql 1.101 ---- davical-0.9.9.5/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 1.102 -+++ davical-0.9.9.5/dba/views/dav_principal.sql 2010-11-22 14:33:59.832463699 +0100 1.103 -@@ -2,7 +2,7 @@ 1.104 - -- record 1:1 with the principal table 1.105 - 1.106 - 1.107 --DROP VIEW dav_principal CASCADE; 1.108 -+DROP VIEW IF EXISTS dav_principal CASCADE; 1.109 - CREATE OR REPLACE VIEW dav_principal AS 1.110 - SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, 1.111 - username, password, fullname, email,