comparison: davical/davical.patch
davical/davical.patch
- changeset 506
- ed99728b62ad
- parent 361
- 45eaa38991fd
- child 585
- 2dd48c9debd6
equal
deleted
inserted
replaced
| 3:df5eaaade880 | 4:99df450c77be |
|---|---|
| 1 Index: davical-0.9.9.5/dba/appuser_permissions.txt | 1 Index: davical-0.9.9.7/dba/appuser_permissions.txt |
| 2 --- davical-0.9.9.5/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 | 2 --- davical-0.9.9.7/dba/appuser_permissions.txt.orig 2011-10-06 11:14:54.000000000 +0200 |
| 3 +++ davical-0.9.9.5/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 | 3 +++ davical-0.9.9.7/dba/appuser_permissions.txt 2011-10-25 09:45:26.000000000 +0200 |
| 4 @@ -1,65 +1,69 @@ | 4 @@ -1,66 +1,69 @@ |
| 5 -# | 5 -# |
| 6 -# This file is used by update-rscds-database to set the correct | 6 -# This file is used by update-rscds-database to set the correct |
| 7 -# permissions for the application user. In newer installations | 7 -# permissions for the application user. In newer installations |
| 8 -# the application user will probably be called app_davical (and | 8 -# the application user will probably be called app_davical (and |
| 9 -# the administrative user will be called dba_davical) but in | 9 -# the administrative user will be called dba_davical) but in |
| 64 - ON calendar_attendee | 64 - ON calendar_attendee |
| 65 - ON addressbook_resource | 65 - ON addressbook_resource |
| 66 - ON addressbook_address_adr | 66 - ON addressbook_address_adr |
| 67 - ON addressbook_address_tel | 67 - ON addressbook_address_tel |
| 68 - ON addressbook_address_email | 68 - ON addressbook_address_email |
| 69 - ON timezones | |
| 70 - ON tz_aliases | |
| 71 - ON tz_localnames | |
| 69 + ON collection, | 72 + ON collection, |
| 70 + caldav_data, | 73 + caldav_data, |
| 71 + calendar_item, | 74 + calendar_item, |
| 72 + relationship, | 75 + relationship, |
| 73 + locks, | 76 + locks, |
| 91 + calendar_alarm, | 94 + calendar_alarm, |
| 92 + calendar_attendee, | 95 + calendar_attendee, |
| 93 + addressbook_resource, | 96 + addressbook_resource, |
| 94 + addressbook_address_adr, | 97 + addressbook_address_adr, |
| 95 + addressbook_address_tel, | 98 + addressbook_address_tel, |
| 96 + addressbook_address_email | 99 + addressbook_address_email, |
| 100 + timezones, | |
| 101 + tz_aliases, | |
| 102 + tz_localnames | |
| 97 + TO davical; | 103 + TO davical; |
| 98 | 104 |
| 99 GRANT SELECT,UPDATE | 105 GRANT SELECT,UPDATE |
| 100 - ON relationship_type_rt_id_seq | 106 ON relationship_type_rt_id_seq |
| 101 - ON dav_id_seq | 107 - ON dav_id_seq |
| 102 - ON usr_user_no_seq | 108 - ON usr_user_no_seq |
| 103 - ON roles_role_no_seq | 109 - ON roles_role_no_seq |
| 104 - ON session_session_id_seq | 110 - ON session_session_id_seq |
| 105 - ON principal_type_principal_type_id_seq | 111 - ON principal_type_principal_type_id_seq |
| 106 - ON sync_tokens_sync_token_seq | 112 - ON sync_tokens_sync_token_seq |
| 107 + ON relationship_type_rt_id_seq, | 113 - ON timezones_our_tzno_seq |
| 108 + dav_id_seq, | 114 + dav_id_seq, |
| 109 + usr_user_no_seq, | 115 + usr_user_no_seq, |
| 110 + roles_role_no_seq, | 116 + roles_role_no_seq, |
| 111 + session_session_id_seq, | 117 + session_session_id_seq, |
| 112 + principal_type_principal_type_id_seq, | 118 + principal_type_principal_type_id_seq, |
| 113 + sync_tokens_sync_token_seq | 119 + sync_tokens_sync_token_seq, |
| 114 + TO davical; | 120 + timezones_our_tzno_seq |
| 115 | |
| 116 GRANT SELECT,INSERT | |
| 117 ON time_zone | |
| 118 + TO davical; | 121 + TO davical; |
| 119 | 122 |
| 120 GRANT SELECT | 123 GRANT SELECT |
| 121 - ON supported_locales | 124 - ON supported_locales |
| 122 - ON awl_db_revision | 125 - ON awl_db_revision |
| 124 + ON supported_locales, | 127 + ON supported_locales, |
| 125 + awl_db_revision, | 128 + awl_db_revision, |
| 126 + principal_type | 129 + principal_type |
| 127 + TO davical; | 130 + TO davical; |
| 128 | 131 |
| 129 Index: davical-0.9.9.5/inc/always.php.in | 132 Index: davical-0.9.9.7/dba/views/dav_principal.sql |
| 130 --- davical-0.9.9.5/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 | 133 --- davical-0.9.9.7/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 |
| 131 +++ davical-0.9.9.5/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 | 134 +++ davical-0.9.9.7/dba/views/dav_principal.sql 2011-10-25 09:38:48.000000000 +0200 |
| 132 @@ -123,20 +123,8 @@ | 135 @@ -2,7 +2,6 @@ |
| 136 -- record 1:1 with the principal table | |
| 137 | |
| 138 | |
| 139 -DROP VIEW dav_principal CASCADE; | |
| 140 CREATE OR REPLACE VIEW dav_principal AS | |
| 141 SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, | |
| 142 username, password, fullname, email, | |
| 143 Index: davical-0.9.9.7/inc/always.php.in | |
| 144 --- davical-0.9.9.7/inc/always.php.in.orig 2011-09-25 11:04:29.000000000 +0200 | |
| 145 +++ davical-0.9.9.7/inc/always.php.in 2011-10-25 09:38:48.000000000 +0200 | |
| 146 @@ -58,6 +58,7 @@ | |
| 147 $c->images = $c->base_url . '/images'; | |
| 148 | |
| 149 // Add a default for newly created users | |
| 150 +date_default_timezone_set("UTC"); | |
| 151 $c->template_usr = array( 'active' => true, | |
| 152 'locale' => 'en_GB', | |
| 153 'date_format_type' => 'E', | |
| 154 @@ -125,20 +126,8 @@ | |
| 133 * too early. | 155 * too early. |
| 134 */ | 156 */ |
| 135 ob_start( ); | 157 ob_start( ); |
| 136 -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { | 158 -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| 137 - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); | 159 - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| 150 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { | 172 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { |
| 151 + include_once("@l_prefix@/etc/davical/davical-config.php"); | 173 + include_once("@l_prefix@/etc/davical/davical-config.php"); |
| 152 } | 174 } |
| 153 else if ( @file_exists('config/config.php') ) { | 175 else if ( @file_exists('config/config.php') ) { |
| 154 include('config/config.php'); | 176 include('config/config.php'); |
| 155 Index: davical-0.9.9.5/dba/views/dav_principal.sql | |
| 156 --- davical-0.9.9.5/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 | |
| 157 +++ davical-0.9.9.5/dba/views/dav_principal.sql 2010-11-22 14:33:59.832463699 +0100 | |
| 158 @@ -2,7 +2,7 @@ | |
| 159 -- record 1:1 with the principal table | |
| 160 | |
| 161 | |
| 162 -DROP VIEW dav_principal CASCADE; | |
| 163 +DROP VIEW IF EXISTS dav_principal CASCADE; | |
| 164 CREATE OR REPLACE VIEW dav_principal AS | |
| 165 SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, | |
| 166 username, password, fullname, email, |
