Differing /etc/roundcubemail/calendar.inc.php files

[Brady, Mike]

I am seeing two quite different /etc/roundcubemail/calendar.inc.php 
files depending if I have done a clean install or an upgrade (yum update 
on a Centos 6.5 system).

On a clean install of both 3.1 and 3.2 I get the following:

<?php
     $config['calendar_driver'] = "kolab";
     $config['calendar_default_view'] = "agendaWeek";
     $config['calendar_timeslots'] = 2;
     $config['calendar_first_day'] = 1;
     $config['calendar_first_hour'] = 6;
     $config['calendar_work_start'] = 6;
     $config['calendar_work_end'] = 18;
     $config['calendar_event_coloring'] = 0;

     if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER["HTTP_HOST"] . '/' 
. basename(__FILE__))) {
         include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER["HTTP_HOST"] . 
'/' . basename(__FILE__));
     }

?>

But when I do an upgrade of 3.1 to 3.2 I get an  
/etc/roundcubemail/calendar.inc.php.rpmnew file with the following 
content:



<?php
/*
  
+-------------------------------------------------------------------------+
  | Configuration for the Calendar plugin                                 
   |
  |                                                                       
   |
  | Copyright (C) 2010, Lazlo Westerhof - Netherlands                     
   |
  | Copyright (C) 2011-2014, Kolab Systems AG                             
   |
  |                                                                       
   |
  | This program is free software: you can redistribute it and/or modify  
   |
  | it under the terms of the GNU Affero General Public License as        
   |
  | published by the Free Software Foundation, either version 3 of the    
   |
  | License, or (at your option) any later version.                       
   |
  |                                                                       
   |
  | This program is distributed in the hope that it will be useful,       
   |
  | but WITHOUT ANY WARRANTY; without even the implied warranty of        
   |
  | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the          
   |
  | GNU Affero General Public License for more details.                   
   |
  |                                                                       
   |
  | You should have received a copy of the GNU Affero General Public 
License|
  | along with this program. If not, see <http://www.gnu.org/licenses/>.  
   |
  |                                                                       
   |
  
+-------------------------------------------------------------------------+
  | Author: Lazlo Westerhof <hello at lazlo.me>                              
   |
  |         Thomas Bruederli <bruederli at kolabsys.com>                     
   |
  
+-------------------------------------------------------------------------+
*/

// backend type (database, google, kolab)
$rcmail_config['calendar_driver'] = "database";

// default calendar view (agendaDay, agendaWeek, month)
$rcmail_config['calendar_default_view'] = "agendaWeek";

// show a birthdays calendar from the user's address book(s)
$rcmail_config['calendar_contact_birthdays'] = false;

// mapping of Roundcube date formats to calendar formats 
(long/short/agenda)
// should be in sync with 'date_formats' in main config
$rcmail_config['calendar_date_format_sets'] = array(
   'yyyy-MM-dd' => array('MMM d yyyy',   'M-d',  'ddd MM-dd'),
   'dd-MM-yyyy' => array('d MMM yyyy',   'd-M',  'ddd dd-MM'),
   'yyyy/MM/dd' => array('MMM d yyyy',   'M/d',  'ddd MM/dd'),
   'MM/dd/yyyy' => array('MMM d yyyy',   'M/d',  'ddd MM/dd'),
   'dd/MM/yyyy' => array('d MMM yyyy',   'd/M',  'ddd dd/MM'),
   'dd.MM.yyyy' => array('dd. MMM yyyy', 'd.M',  'ddd dd.MM.'),
   'd.M.yyyy'   => array('d. MMM yyyy',  'd.M',  'ddd d.MM.'),
);

// general date format (only set if different from default date format 
and not user configurable)
// $rcmail_config['calendar_date_format'] = "yyyy-MM-dd";

// time format  (only set if different from default date format)
// $rcmail_config['calendar_time_format'] = "HH:mm";

// short date format (used for column titles)
// $rcmail_config['calendar_date_short'] = 'M-d';

// long date format (used for calendar title)
// $rcmail_config['calendar_date_long'] = 'MMM d yyyy';

// date format used for agenda view
// $rcmail_config['calendar_date_agenda'] = 'ddd MM-dd';

// timeslots per hour (1, 2, 3, 4, 6)
$rcmail_config['calendar_timeslots'] = 2;

// show this number of days in agenda view
$rcmail_config['calendar_agenda_range'] = 60;

// first day of the week (0-6)
$rcmail_config['calendar_first_day'] = 1;

// first hour of the calendar (0-23)
$rcmail_config['calendar_first_hour'] = 6;

// working hours begin
$rcmail_config['calendar_work_start'] = 6;

// working hours end
$rcmail_config['calendar_work_end'] = 18;

// show line at current time of the day
$rcmail_config['calendar_time_indicator'] = true;

// default alarm settings for new events.
// this is only a preset when a new event dialog opens
// possible values are <empty>, DISPLAY, EMAIL
$rcmail_config['calendar_default_alarm_type'] = '';

// default alarm offset for new events.
// use ical-style offset values like "-1H" (one hour before) or "+30M" 
(30 minutes after)
$rcmail_config['calendar_default_alarm_offset'] = '-15M';

// how to colorize events:
// 0: according to calendar color
// 1: according to category color
// 2: calendar for outer, category for inner color
// 3: category for outer, calendar for inner color
$rcmail_config['calendar_event_coloring'] = 0;

// event categories
$rcmail_config['calendar_categories'] = array(
   'Personal' => 'c0c0c0',
       'Work' => 'ff0000',
     'Family' => '00ff00',
    'Holiday' => 'ff6600',
);

// enable users to invite/edit attendees for shared events organized by 
others
$rcmail_config['calendar_allow_invite_shared'] = false;

// allow users to accecpt iTip invitations who are no explicitly listed 
as attendee.
// this can be the case if invitations are sent to mailing lists or 
alias email addresses.
$rcmail_config['calendar_allow_itip_uninvited'] = true;

// enable asynchronous free-busy triggering after data changed
$rcmail_config['calendar_freebusy_trigger'] = false;

// SMTP server host used to send (anonymous) itip messages.
// Set to '' in order to use PHP's mail() function for email delivery.
// To override the SMTP port or connection method, provide a full URL 
like 'tls://somehost:587'
$rcmail_config['calendar_itip_smtp_server'] = null;

// SMTP username used to send (anonymous) itip messages
$rcmail_config['calendar_itip_smtp_user'] = 'smtpauth';

// SMTP password used to send (anonymous) itip messages
$rcmail_config['calendar_itip_smtp_pass'] = '123456';

// Base URL to build fully qualified URIs to access calendars via CALDAV
// The following replacement variables are supported:
// %h - Current HTTP host
// %u - Current webmail user name
// %n - Calendar name
// %i - Calendar UUID
// $rcmail_config['calendar_caldav_url'] = 
'http://%h/iRony/calendars/%u/%i';

?>

Apart from all the comments:
- I see new options for some new features in 3.2, so I would have 
expected this file to also be used in the new 3.2 install.
- The calendar_driver is wrong for kolab the rpmnew file. It should be 
kolab, not database.
- The configuration array changes from $config to $rcmail_config.  Which 
is correct?

Which file should be used on a 3.2 system?

Thanks

Mike