davical/davical.patch@731574048d85
davical/davical.patch
Mon, 22 Nov 2010 12:39:58 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 22 Nov 2010 12:39:58 +0100
- changeset 290
- 731574048d85
- child 294
- 88d9122d2641
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
1 Index: davical-0.9.9.3/dba/appuser_permissions.txt
2 --- davical-0.9.9.3/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
4 @@ -17,49 +17,53 @@
5 #
7 GRANT SELECT,INSERT,UPDATE,DELETE
8 - ON collection
9 - ON caldav_data
10 - ON calendar_item
11 - ON relationship
12 - ON locks
13 - ON property
14 - ON freebusy_ticket
15 - ON usr
16 - ON usr_setting
17 - ON roles
18 - ON role_member
19 - ON session
20 - ON tmp_password
21 - ON group_member
22 - ON principal
23 - ON relationship_type
24 - ON sync_tokens
25 - ON sync_changes
26 - ON grants
27 - ON dav_principal
28 - ON access_ticket
29 - ON dav_binding
30 - ON calendar_alarm
31 - ON calendar_attendee
32 - ON addressbook_resource
33 - ON addressbook_address_adr
34 - ON addressbook_address_tel
35 - ON addressbook_address_email
36 + ON collection,
37 + caldav_data,
38 + calendar_item,
39 + relationship,
40 + locks,
41 + property,
42 + freebusy_ticket,
43 + usr,
44 + usr_setting,
45 + roles,
46 + role_member,
47 + session,
48 + tmp_password,
49 + group_member,
50 + principal,
51 + relationship_type,
52 + sync_tokens,
53 + sync_changes,
54 + grants,
55 + dav_principal,
56 + access_ticket,
57 + dav_binding,
58 + calendar_alarm,
59 + calendar_attendee,
60 + addressbook_resource,
61 + addressbook_address_adr,
62 + addressbook_address_tel,
63 + addressbook_address_email
64 + TO davical;
66 GRANT SELECT,UPDATE
67 - ON relationship_type_rt_id_seq
68 - ON dav_id_seq
69 - ON usr_user_no_seq
70 - ON roles_role_no_seq
71 - ON session_session_id_seq
72 - ON principal_type_principal_type_id_seq
73 - ON sync_tokens_sync_token_seq
74 + ON relationship_type_rt_id_seq,
75 + dav_id_seq,
76 + usr_user_no_seq,
77 + roles_role_no_seq,
78 + session_session_id_seq,
79 + principal_type_principal_type_id_seq,
80 + sync_tokens_sync_token_seq
81 + TO davical;
83 GRANT SELECT,INSERT
84 ON time_zone
85 + TO davical;
87 GRANT SELECT
88 - ON supported_locales
89 - ON awl_db_revision
90 - ON principal_type
91 + ON supported_locales,
92 + awl_db_revision,
93 + principal_type
94 + TO davical;
96 Index: davical-0.9.9.3/inc/always.php.in
97 --- davical-0.9.9.3/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200
98 +++ davical-0.9.9.3/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200
99 @@ -117,20 +117,8 @@
100 * too early.
101 */
102 ob_start( );
103 -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
104 - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
105 -}
106 -else if ( @file_exists('/etc/davical/config.php') ) {
107 - include('/etc/davical/config.php');
108 -}
109 -else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
110 - include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
111 -}
112 -else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
113 - include('/usr/local/etc/davical/config.php');
114 -}
115 -else if ( @file_exists('../config/config.php') ) {
116 - include('../config/config.php');
117 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) {
118 + include_once("@l_prefix@/etc/davical/davical-config.php");
119 }
120 else if ( @file_exists('config/config.php') ) {
121 include('config/config.php');
