davical/davical.patch

Tue, 28 Aug 2012 18:29:00 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 28 Aug 2012 18:29:00 +0200
changeset 532
e5f1af644b30
parent 361
45eaa38991fd
child 585
2dd48c9debd6
permissions
-rw-r--r--

Massively update modules from Drupal 6.x to 7.x, and add diverse OpenID modules.
Unfortunately many modules available to Drupal 6.x installations have not been
since maintained or ported to 7.x causing this package to diminish in both size
and utility.

     1 Index: davical-0.9.9.7/dba/appuser_permissions.txt
     2 --- davical-0.9.9.7/dba/appuser_permissions.txt.orig	2011-10-06 11:14:54.000000000 +0200
     3 +++ davical-0.9.9.7/dba/appuser_permissions.txt	2011-10-25 09:45:26.000000000 +0200
     4 @@ -1,66 +1,69 @@
     5 -#
     6 -# This file is used by update-rscds-database to set the correct
     7 -# permissions for the application user.  In newer installations
     8 -# the application user will probably be called app_davical (and
     9 -# the administrative user will be called dba_davical) but in
    10 -# older installations the application user was called 'general'
    11 -# and the administrative user was probably 'postgres'.
    12 -#
    13 -# See the wiki topic 'Database/Users' for more discussion.
    14 -#
    15 -# This file includes lines like:
    16 -#   GRANT SELECT,...
    17 -# which define what gets granted to the following lines like:
    18 -#   ON table1, table2, sequence1, function 3, view4, ...
    19 -# no user-serviceable parts inside, all whitespace is ignored,
    20 -# your mileage should not vary :-)
    21 -#
    22 +--
    23 +-- This file is used by update-rscds-database to set the correct
    24 +-- permissions for the application user.  In newer installations
    25 +-- the application user will probably be called app_davical (and
    26 +-- the administrative user will be called dba_davical) but in
    27 +-- older installations the application user was called 'general'
    28 +-- and the administrative user was probably 'postgres'.
    29 +--
    30 +-- See the wiki topic 'Database/Users' for more discussion.
    31 +--
    32 +-- This file includes lines like:
    33 +--   GRANT SELECT,...
    34 +-- which define what gets granted to the following lines like:
    35 +--   ON table1, table2, sequence1, function 3, view4, ...
    36 +-- no user-serviceable parts inside, all whitespace is ignored,
    37 +-- your mileage should not vary :-)
    38 +--
    40  GRANT SELECT,INSERT,UPDATE,DELETE
    41 -  ON collection
    42 -  ON caldav_data
    43 -  ON calendar_item
    44 -  ON relationship
    45 -  ON locks
    46 -  ON property
    47 -  ON freebusy_ticket
    48 -  ON usr
    49 -  ON usr_setting
    50 -  ON roles
    51 -  ON role_member
    52 -  ON session
    53 -  ON tmp_password
    54 -  ON group_member
    55 -  ON principal
    56 -  ON relationship_type
    57 -  ON sync_tokens
    58 -  ON sync_changes
    59 -  ON grants
    60 -  ON dav_principal
    61 -  ON access_ticket
    62 -  ON dav_binding
    63 -  ON calendar_alarm
    64 -  ON calendar_attendee
    65 -  ON addressbook_resource
    66 -  ON addressbook_address_adr
    67 -  ON addressbook_address_tel
    68 -  ON addressbook_address_email
    69 -  ON timezones
    70 -  ON tz_aliases
    71 -  ON tz_localnames
    72 +  ON collection,
    73 +     caldav_data,
    74 +     calendar_item,
    75 +     relationship,
    76 +     locks,
    77 +     property,
    78 +     freebusy_ticket,
    79 +     usr,
    80 +     usr_setting,
    81 +     roles,
    82 +     role_member,
    83 +     session,
    84 +     tmp_password,
    85 +     group_member,
    86 +     principal,
    87 +     relationship_type,
    88 +     sync_tokens,
    89 +     sync_changes,
    90 +     grants,
    91 +     dav_principal,
    92 +     access_ticket,
    93 +     dav_binding,
    94 +     calendar_alarm,
    95 +     calendar_attendee,
    96 +     addressbook_resource,
    97 +     addressbook_address_adr,
    98 +     addressbook_address_tel,
    99 +     addressbook_address_email,
   100 +     timezones,
   101 +     tz_aliases,
   102 +     tz_localnames
   103 +  TO davical;
   105  GRANT SELECT,UPDATE
   106    ON relationship_type_rt_id_seq
   107 -  ON dav_id_seq
   108 -  ON usr_user_no_seq
   109 -  ON roles_role_no_seq
   110 -  ON session_session_id_seq
   111 -  ON principal_type_principal_type_id_seq
   112 -  ON sync_tokens_sync_token_seq
   113 -  ON timezones_our_tzno_seq
   114 +     dav_id_seq,
   115 +     usr_user_no_seq,
   116 +     roles_role_no_seq,
   117 +     session_session_id_seq,
   118 +     principal_type_principal_type_id_seq,
   119 +     sync_tokens_sync_token_seq,
   120 +     timezones_our_tzno_seq
   121 +  TO davical;
   123  GRANT SELECT
   124 -  ON supported_locales
   125 -  ON awl_db_revision
   126 -  ON principal_type
   127 +  ON supported_locales,
   128 +     awl_db_revision,
   129 +     principal_type
   130 +  TO davical;
   132 Index: davical-0.9.9.7/dba/views/dav_principal.sql
   133 --- davical-0.9.9.7/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
   134 +++ davical-0.9.9.7/dba/views/dav_principal.sql	2011-10-25 09:38:48.000000000 +0200
   135 @@ -2,7 +2,6 @@
   136  -- record 1:1 with the principal table
   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';
   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 @@
   155  * too early.
   156  */
   157  ob_start( );
   158 -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
   159 -  include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
   160 -}
   161 -else if ( @file_exists('/etc/davical/config.php') ) {
   162 -  include('/etc/davical/config.php');
   163 -}
   164 -else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
   165 -  include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
   166 -}
   167 -else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
   168 -  include('/usr/local/etc/davical/config.php');
   169 -}
   170 -else if ( @file_exists('../config/config.php') ) {
   171 -  include('../config/config.php');
   172 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) {
   173 +  include_once("@l_prefix@/etc/davical/davical-config.php");
   174  }
   175  else if ( @file_exists('config/config.php') ) {
   176    include('config/config.php');

mercurial