comparison: davical/davical.patch
davical/davical.patch
- changeset 361
- 45eaa38991fd
- parent 296
- fdacb8355f94
- child 396
- 610cba0674b9
equal
deleted
inserted
replaced
| 2:ac72831dc0fd | 3:df5eaaade880 |
|---|---|
| 1 Index: davical-0.9.9.3/dba/appuser_permissions.txt | 1 Index: davical-0.9.9.5/dba/appuser_permissions.txt |
| 2 --- davical-0.9.9.3/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 | 2 --- davical-0.9.9.5/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 |
| 3 +++ davical-0.9.9.3/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 | 3 +++ davical-0.9.9.5/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 |
| 4 @@ -1,65 +1,69 @@ | 4 @@ -1,65 +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 |
| 124 + ON supported_locales, | 124 + ON supported_locales, |
| 125 + awl_db_revision, | 125 + awl_db_revision, |
| 126 + principal_type | 126 + principal_type |
| 127 + TO davical; | 127 + TO davical; |
| 128 | 128 |
| 129 Index: davical-0.9.9.3/inc/always.php.in | 129 Index: davical-0.9.9.5/inc/always.php.in |
| 130 --- davical-0.9.9.3/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 | 130 --- davical-0.9.9.5/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 |
| 131 +++ davical-0.9.9.3/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 | 131 +++ davical-0.9.9.5/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 |
| 132 @@ -117,20 +117,8 @@ | 132 @@ -123,20 +123,8 @@ |
| 133 * too early. | 133 * too early. |
| 134 */ | 134 */ |
| 135 ob_start( ); | 135 ob_start( ); |
| 136 -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { | 136 -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| 137 - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); | 137 - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| 150 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { | 150 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { |
| 151 + include_once("@l_prefix@/etc/davical/davical-config.php"); | 151 + include_once("@l_prefix@/etc/davical/davical-config.php"); |
| 152 } | 152 } |
| 153 else if ( @file_exists('config/config.php') ) { | 153 else if ( @file_exists('config/config.php') ) { |
| 154 include('config/config.php'); | 154 include('config/config.php'); |
| 155 Index: davical-0.9.9.3/dba/views/dav_principal.sql | 155 Index: davical-0.9.9.5/dba/views/dav_principal.sql |
| 156 --- davical-0.9.9.3/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 | 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.3/dba/views/dav_principal.sql 2010-11-22 14:33:59.832463699 +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 @@ | 158 @@ -2,7 +2,7 @@ |
| 159 -- record 1:1 with the principal table | 159 -- record 1:1 with the principal table |
| 160 | 160 |
| 161 | 161 |
| 162 -DROP VIEW dav_principal CASCADE; | 162 -DROP VIEW dav_principal CASCADE; |
