No OneTemporary
Actions

Authored By

Unknown

Size

72 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
	index 72be17ab..ed3d01f6 100644
	--- a/plugins/calendar/calendar.php
	+++ b/plugins/calendar/calendar.php
	@@ -1,831 +1,831 @@
	<?php
	/*
	+-------------------------------------------------------------------------+
	\| Calendar plugin for Roundcube \|
	\| Version 0.3 beta \|
	\| \|
	\| This program is free software; you can redistribute it and/or modify \|
	\| it under the terms of the GNU General Public License version 2 \|
	\| as published by the Free Software Foundation. \|
	\| \|
	\| 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 General Public License for more details. \|
	\| \|
	\| You should have received a copy of the GNU General Public License along \|
	\| with this program; if not, write to the Free Software Foundation, Inc., \|
	\| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \|
	\| \|
	+-------------------------------------------------------------------------+
	\| Author: Lazlo Westerhof <hello@lazlo.me> \|
	\| Thomas Bruederli <roundcube@gmail.com> \|
	+-------------------------------------------------------------------------+
	*/

	class calendar extends rcube_plugin
	{
	public $task = '?(?!login\|logout).*';
	public $rc;
	public $driver;
	public $home; // declare public to be used in other classes

	public $ical;
	public $ui;

	private $default_categories = array(
	'Personal' => 'c0c0c0',
	'Work' => 'ff0000',
	'Family' => '00ff00',
	'Holiday' => 'ff6600',
	);

	/**
	* Plugin initialization.
	*/
	function init()
	{
	$this->rc = rcmail::get_instance();

	$this->register_task('calendar', 'calendar');

	// load calendar configuration
	$this->load_config();

	// load localizations
	$this->add_texts('localization/', !$this->rc->action \|\| $this->rc->task != 'calendar');

	// load Calendar user interface which includes jquery-ui
	$this->require_plugin('jqueryui');

	require($this->home . '/lib/calendar_ui.php');
	$this->ui = new calendar_ui($this);
	$this->ui->init();

	$skin = $this->rc->config->get('skin');
	$this->include_stylesheet('skins/' . $skin . '/calendar.css');

	if ($this->rc->task == 'calendar') {
	$this->load_driver();

	// load iCalendar functions
	require($this->home . '/lib/calendar_ical.php');
	$this->ical = new calendar_ical($this->rc, $this->driver);

	// register calendar actions
	$this->register_action('index', array($this, 'calendar_view'));
	$this->register_action('event', array($this, 'event_action'));
	$this->register_action('calendar', array($this, 'calendar_action'));
	$this->register_action('load_events', array($this, 'load_events'));
	$this->register_action('search_events', array($this, 'search_events'));
	$this->register_action('export_events', array($this, 'export_events'));
	$this->register_action('randomdata', array($this, 'generate_randomdata'));
	$this->add_hook('keep_alive', array($this, 'keep_alive'));

	// set user's timezone
	if ($this->rc->config->get('timezone') === 'auto')
	$this->timezone = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z');
	else
	$this->timezone = ($this->rc->config->get('timezone') + intval($this->rc->config->get('dst_active')));

	$this->gmt_offset = $this->timezone * 3600;
	}
	else if ($this->rc->task == 'settings') {
	$this->load_driver();

	// add hooks for Calendar settings
	$this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
	$this->add_hook('preferences_list', array($this, 'preferences_list'));
	$this->add_hook('preferences_save', array($this, 'preferences_save'));
	}
	}

	private function load_driver()
	{
	$driver_name = $this->rc->config->get('calendar_driver', 'database');
	$driver_class = $driver_name . '_driver';

	require_once($this->home . '/drivers/calendar_driver.php');
	require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');

	switch ($driver_name) {
	case "kolab":
	$this->require_plugin('kolab_core');
	default:
	$this->driver = new $driver_class($this);
	break;
	}
	}

	/**
	* Render the main calendar view from skin template
	*/
	function calendar_view()
	{
	$this->rc->output->set_pagetitle($this->gettext('calendar'));

	// Add CSS stylesheets to the page header
	$this->ui->addCSS();

	// Add JS files to the page header
	$this->ui->addJS();

	$this->register_handler('plugin.calendar_css', array($this->ui, 'calendar_css'));
	$this->register_handler('plugin.calendar_list', array($this->ui, 'calendar_list'));
	$this->register_handler('plugin.calendar_select', array($this->ui, 'calendar_select'));
	$this->register_handler('plugin.category_select', array($this->ui, 'category_select'));
	$this->register_handler('plugin.freebusy_select', array($this->ui, 'freebusy_select'));
	$this->register_handler('plugin.priority_select', array($this->ui, 'priority_select'));
	$this->register_handler('plugin.sensitivity_select', array($this->ui, 'sensitivity_select'));
	$this->register_handler('plugin.alarm_select', array($this->ui, 'alarm_select'));
	$this->register_handler('plugin.snooze_select', array($this->ui, 'snooze_select'));
	$this->register_handler('plugin.recurrence_form', array($this->ui, 'recurrence_form'));
	$this->register_handler('plugin.edit_recurring_warning', array($this->ui, 'recurring_event_warning'));
	$this->register_handler('plugin.searchform', array($this->rc->output, 'search_form')); // use generic method from rcube_template

	$this->rc->output->set_env('calendar_settings', $this->load_settings());
	$this->rc->output->add_label('low','normal','high');

	$this->rc->output->send("calendar.calendar");
	}

	/**
	* Handler for preferences_sections_list hook.
	* Adds Calendar settings sections into preferences sections list.
	*
	* @param array Original parameters
	* @return array Modified parameters
	*/
	function preferences_sections_list($p)
	{
	$p['list']['calendar'] = array(
	'id' => 'calendar', 'section' => $this->gettext('calendar'),
	);

	return $p;
	}

	/**
	* Handler for preferences_list hook.
	* Adds options blocks into Calendar settings sections in Preferences.
	*
	* @param array Original parameters
	* @return array Modified parameters
	*/
	function preferences_list($p)
	{
	if ($p['section'] == 'calendar') {
	$p['blocks']['view']['name'] = $this->gettext('mainoptions');

	$field_id = 'rcmfd_default_view';
	$select = new html_select(array('name' => '_default_view', 'id' => $field_id));
	$select->add($this->gettext('day'), "agendaDay");
	$select->add($this->gettext('week'), "agendaWeek");
	$select->add($this->gettext('month'), "month");
	$select->add($this->gettext('agenda'), "table");
	$p['blocks']['view']['options']['default_view'] = array(
	'title' => html::label($field_id, Q($this->gettext('default_view'))),
	'content' => $select->show($this->rc->config->get('calendar_default_view', "agendaWeek")),
	);
	/*
	$field_id = 'rcmfd_time_format';
	$choices = array('HH:mm', 'H:mm', 'h:mmt');
	$select = new html_select(array('name' => '_time_format', 'id' => $field_id));
	$select->add($choices);
	$p['blocks']['view']['options']['time_format'] = array(
	'title' => html::label($field_id, Q($this->gettext('time_format'))),
	'content' => $select->show($this->rc->config->get('calendar_time_format', "HH:mm")),
	);
	*/
	$field_id = 'rcmfd_timeslot';
	$choices = array('1', '2', '3', '4', '6');
	$select = new html_select(array('name' => '_timeslots', 'id' => $field_id));
	$select->add($choices);
	$p['blocks']['view']['options']['timeslots'] = array(
	'title' => html::label($field_id, Q($this->gettext('timeslots'))),
	'content' => $select->show($this->rc->config->get('calendar_timeslots', 2)),
	);

	$field_id = 'rcmfd_firstday';
	$select = new html_select(array('name' => '_first_day', 'id' => $field_id));
	$select->add(rcube_label('sunday'), '0');
	$select->add(rcube_label('monday'), '1');
	$select->add(rcube_label('tuesday'), '2');
	$select->add(rcube_label('wednesday'), '3');
	$select->add(rcube_label('thursday'), '4');
	$select->add(rcube_label('friday'), '5');
	$select->add(rcube_label('saturday'), '6');
	$p['blocks']['view']['options']['first_day'] = array(
	'title' => html::label($field_id, Q($this->gettext('first_day'))),
	'content' => $select->show($this->rc->config->get('calendar_first_day', 1)),
	);

	$field_id = 'rcmfd_alarm';
	$select_type = new html_select(array('name' => '_alarm_type', 'id' => $field_id));
	$select_type->add($this->gettext('none'), '');
	foreach ($this->driver->alarm_types as $type)
	$select_type->add($this->gettext(strtolower("alarm{$type}option")), $type);

	$input_value = new html_inputfield(array('name' => '_alarm_value', 'id' => $field_id . 'value', 'size' => 3));
	$select_offset = new html_select(array('name' => '_alarm_offset', 'id' => $field_id . 'offset'));
	foreach (array('-M','-H','-D','+M','+H','+D') as $trigger)
	$select_offset->add($this->gettext('trigger' . $trigger), $trigger);

	$p['blocks']['view']['options']['alarmtype'] = array(
	'title' => html::label($field_id, Q($this->gettext('defaultalarmtype'))),
	'content' => $select_type->show($this->rc->config->get('calendar_default_alarm_type', '')),
	);
	$preset = self::parse_alaram_value($this->rc->config->get('calendar_default_alarm_offset', '-15M'));
	$p['blocks']['view']['options']['alarmoffset'] = array(
	'title' => html::label($field_id . 'value', Q($this->gettext('defaultalarmoffset'))),
	'content' => $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1]),
	);

	// default calendar selection
	$field_id = 'rcmfd_default_calendar';
	$select_cal = new html_select(array('name' => '_default_calendar', 'id' => $field_id));
	foreach ((array)$this->driver->list_calendars() as $id => $prop) {
	if (!$prop['readononly'])
	$select_cal->add($prop['name'], strval($id));
	}
	$p['blocks']['view']['options']['defaultcalendar'] = array(
	'title' => html::label($field_id . 'value', Q($this->gettext('defaultcalendar'))),
	'content' => $select_cal->show($this->rc->config->get('calendar_default_calendar', '')),
	);

	// category definitions
	if (!$this->driver->categoriesimmutable) {
	$p['blocks']['categories']['name'] = $this->gettext('categories');

	$categories = (array) $this->rc->config->get('calendar_categories', $this->default_categories);
	$categories_list = '';
	foreach ($categories as $name => $color) {
	$key = md5($name);
	$field_class = 'rcmfd_category_' . str_replace(' ', '_', $name);
	$category_remove = new html_inputfield(array('type' => 'button', 'value' => 'X', 'class' => 'button', 'onclick' => '$(this).parent().remove()', 'title' => $this->gettext('remove_category')));
	$category_name = new html_inputfield(array('name' => "_categories[$key]", 'class' => $field_class, 'size' => 30));
	$category_color = new html_inputfield(array('name' => "_colors[$key]", 'class' => "$field_class colors", 'size' => 6));
	$categories_list .= html::div(null, $category_name->show($name) . ' ' . $category_color->show($color) . ' ' . $category_remove->show());
	}

	$p['blocks']['categories']['options']['category_' . $name] = array(
	'content' => html::div(array('id' => 'calendarcategories'), $categories_list),
	);

	$field_id = 'rcmfd_new_category';
	$new_category = new html_inputfield(array('name' => '_new_category', 'id' => $field_id, 'size' => 30));
	$add_category = new html_inputfield(array('type' => 'button', 'class' => 'button', 'value' => $this->gettext('add_category'), 'onclick' => "rcube_calendar_add_category()"));
	$p['blocks']['categories']['options']['categories'] = array(
	'content' => $new_category->show('') . ' ' . $add_category->show(),
	);

	$this->rc->output->add_script('function rcube_calendar_add_category(){
	var name = $("#rcmfd_new_category").val();
	if (name.length) {
	var input = $("<input>").attr("type", "text").attr("name", "_categories[]").attr("size", 30).val(name);
	var color = $("<input>").attr("type", "text").attr("name", "_colors[]").attr("size", 6).addClass("colors").val("000000");
	var button = $("<input>").attr("type", "button").attr("value", "X").addClass("button").click(function(){ $(this).parent().remove() });
	$("<div>").append(input).append(" ").append(color).append(" ").append(button).appendTo("#calendarcategories");
	color.miniColors();
	}
	}');

	// include color picker
	$this->include_script('lib/js/jquery.miniColors.min.js');
	$this->include_stylesheet('skins/' .$this->rc->config->get('skin') . '/jquery.miniColors.css');
	$this->rc->output->add_script('$("input.colors").miniColors()', 'docready');
	}
	}

	return $p;
	}

	/**
	* Handler for preferences_save hook.
	* Executed on Calendar settings form submit.
	*
	* @param array Original parameters
	* @return array Modified parameters
	*/
	function preferences_save($p)
	{
	if ($p['section'] == 'calendar') {
	// compose default alarm preset value
	$alarm_offset = get_input_value('_alarm_offset', RCUBE_INPUT_POST);
	$default_alam = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];

	$p['prefs'] = array(
	'calendar_default_view' => get_input_value('_default_view', RCUBE_INPUT_POST),
	'calendar_time_format' => get_input_value('_time_format', RCUBE_INPUT_POST),
	'calendar_timeslots' => get_input_value('_timeslots', RCUBE_INPUT_POST),
	'calendar_first_day' => get_input_value('_first_day', RCUBE_INPUT_POST),
	'calendar_default_alarm_type' => get_input_value('_alarm_type', RCUBE_INPUT_POST),
	'calendar_default_alarm_offset' => $default_alam,
	'calendar_default_calendar' => get_input_value('_default_calendar', RCUBE_INPUT_POST),
	);

	// categories
	if (!$this->driver->categoriesimmutable) {
	$old_categories = $new_categories = array();
	foreach ($this->driver->list_categories() as $name => $color) {
	$old_categories[md5($name)] = $name;
	}
	$categories = get_input_value('_categories', RCUBE_INPUT_POST);
	$colors = get_input_value('_colors', RCUBE_INPUT_POST);
	foreach ($categories as $key => $name) {
	$color = preg_replace('/^#/', '', strval($colors[$key]));

	// rename categories in existing events -> driver's job
	if ($oldname = $old_categories[$key]) {
	$this->driver->replace_category($oldname, $name, $color);
	unset($old_categories[$key]);
	}
	else
	$this->driver->add_category($name, $color);

	$new_categories[$name] = $color;
	}

	// these old categories have been removed, alter events accordingly -> driver's job
	foreach ((array)$old_categories[$key] as $key => $name) {
	$this->driver->remove_category($name);
	}

	$p['prefs']['calendar_categories'] = $new_categories;
	}
	}

	return $p;
	}

	/**
	* Dispatcher for calendar actions initiated by the client
	*/
	function calendar_action()
	{
	$action = get_input_value('action', RCUBE_INPUT_POST);
	$cal = get_input_value('c', RCUBE_INPUT_POST);
	$success = $reload = false;

	switch ($action) {
	case "new":
	$success = $this->driver->create_calendar($cal);
	$reload = true;
	break;
	case "edit":
	$success = $this->driver->edit_calendar($cal);
	$reload = true;
	break;
	case "remove":
	if ($success = $this->driver->remove_calendar($cal))
	$this->rc->output->command('plugin.destroy_source', array('id' => $cal['id']));
	break;
	}

	if ($success)
	$this->rc->output->show_message('successfullysaved', 'confirmation');
	else
	$this->rc->output->show_message('calendar.errorsaving', 'error');

	// TODO: keep view and date selection
	if ($success && $reload)
	$this->rc->output->redirect('');
	}

	/**
	* Dispatcher for event actions initiated by the client
	*/
	function event_action()
	{
	$action = get_input_value('action', RCUBE_INPUT_POST);
	$event = get_input_value('e', RCUBE_INPUT_POST);
	$success = $reload = false;

	switch ($action) {
	case "new":
	// create UID for new event
	$event['uid'] = $this->generate_uid();
	$success = $this->driver->new_event($event);
	$reload = true;
	break;
	case "edit":
	$success = $this->driver->edit_event($event);
	$reload = true;
	break;
	case "resize":
	$success = $this->driver->resize_event($event);
	$reload = true;
	break;
	case "move":
	$success = $this->driver->move_event($event);
	$reload = true;
	break;
	case "remove":
	$removed = $this->driver->remove_event($event);
	$reload = true;
	break;
	case "dismiss":
	foreach (explode(',', $event['id']) as $id)
	$success \|= $this->driver->dismiss_alarm($id, $event['snooze']);
	break;
	}

	if ($success)
	$this->rc->output->show_message('successfullysaved', 'confirmation');
	else if ($removed)
	$this->rc->output->show_message('calendar.successremoval', 'confirmation');
	else
	$this->rc->output->show_message('calendar.errorsaving', 'error');

	// FIXME: update a single event object on the client instead of reloading the entire source
	if ($success && $reload \|\| ($removed && $reload))
	$this->rc->output->command('plugin.reload_calendar', array('source' => $event['calendar']));
	}

	/**
	* Handler for load-requests from fullcalendar
	* This will return pure JSON formatted output
	*/
	function load_events()
	{
	$events = $this->driver->load_events(
	get_input_value('start', RCUBE_INPUT_GET),
	get_input_value('end', RCUBE_INPUT_GET),
	get_input_value('source', RCUBE_INPUT_GET)
	);
	echo $this->encode($events);
	exit;
	}

	/**
	* Handler for search-requests from client
	* This will return pure JSON formatted output for fullcalendar
	*/
	function search_events()
	{
	$events = $this->driver->search_events(
	get_input_value('start', RCUBE_INPUT_GET),
	get_input_value('end', RCUBE_INPUT_GET),
	get_input_value('q', RCUBE_INPUT_GET),
	get_input_value('source', RCUBE_INPUT_GET)
	);
	echo $this->encode($events, true);
	exit;
	}

	/**
	* Handler for keep-alive requests
	* This will check for pending notifications and pass them to the client
	*/
	function keep_alive($attr)
	{
	$alarms = $this->driver->pending_alarms(time());
	if ($alarms)
	$this->rc->output->command('plugin.display_alarms', $this->_alarms_output($alarms));
	}

	/**
	*
	*/
	function export_events()
	{
	$start = get_input_value('start', RCUBE_INPUT_GET);
	$end = get_input_value('end', RCUBE_INPUT_GET);
	if (!$start) $start = mktime(0, 0, 0, 1, date('n'), date('Y')-1);
	if (!$end) $end = mktime(0, 0, 0, 31, 12, date('Y')+10);
	$events = $this->driver->load_events($start, $end, get_input_value('source', RCUBE_INPUT_GET));

	header("Content-Type: text/calendar");
	header("Content-Disposition: inline; filename=calendar.ics");

	echo $this->ical->export($events);
	exit;
	}

	/**
	*
	*/
	function load_settings()
	{
	$settings = array();

	// configuration
	$settings['default_calendar'] = $this->rc->config->get('calendar_default_calendar');
	$settings['default_view'] = (string)$this->rc->config->get('calendar_default_view', "agendaWeek");
	$settings['date_format'] = (string)$this->rc->config->get('calendar_date_format', "yyyy/MM/dd");
	$settings['date_short'] = (string)$this->rc->config->get('calendar_date_short', "M/d");
	$settings['date_long'] = (string)$this->rc->config->get('calendar_date_long', "M d yyyy");
	$settings['date_agenda'] = (string)$this->rc->config->get('calendar_date_agenda', "ddd M d");
	$settings['time_format'] = (string)$this->rc->config->get('calendar_time_format', "HH:mm");
	$settings['timeslots'] = (int)$this->rc->config->get('calendar_timeslots', 2);
	$settings['first_day'] = (int)$this->rc->config->get('calendar_first_day', 1);
	$settings['first_hour'] = (int)$this->rc->config->get('calendar_first_hour', 6);
	$settings['timezone'] = $this->timezone;

	// localization
	$settings['days'] = array(
	rcube_label('sunday'), rcube_label('monday'),
	rcube_label('tuesday'), rcube_label('wednesday'),
	rcube_label('thursday'), rcube_label('friday'),
	rcube_label('saturday')
	);
	$settings['days_short'] = array(
	rcube_label('sun'), rcube_label('mon'),
	rcube_label('tue'), rcube_label('wed'),
	rcube_label('thu'), rcube_label('fri'),
	rcube_label('sat')
	);
	$settings['months'] = array(
	$this->rc->gettext('longjan'), $this->rc->gettext('longfeb'),
	$this->rc->gettext('longmar'), $this->rc->gettext('longapr'),
	$this->rc->gettext('longmay'), $this->rc->gettext('longjun'),
	$this->rc->gettext('longjul'), $this->rc->gettext('longaug'),
	$this->rc->gettext('longsep'), $this->rc->gettext('longoct'),
	$this->rc->gettext('longnov'), $this->rc->gettext('longdec')
	);
	$settings['months_short'] = array(
	$this->rc->gettext('jan'), $this->rc->gettext('feb'),
	$this->rc->gettext('mar'), $this->rc->gettext('apr'),
	$this->rc->gettext('may'), $this->rc->gettext('jun'),
	$this->rc->gettext('jul'), $this->rc->gettext('aug'),
	$this->rc->gettext('sep'), $this->rc->gettext('oct'),
	$this->rc->gettext('nov'), $this->rc->gettext('dec')
	);
	$settings['today'] = rcube_label('today');

	// user prefs
	$settings['hidden_calendars'] = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));

	return $settings;
	}

	/**
	* Convert the given time stamp to a GMT date string
	*/
	function toGMT($time, $user_tz = true)
	{
	$tz = $user_tz ? $this->gmt_offset : date('Z');
	return date('Y-m-d H:i:s', $time - $tz);
	}

	/**
	* Shift the given time stamo to a GMT time zone
	*/
	function toGMTTS($time, $user_tz = true)
	{
	$tz = $user_tz ? $this->gmt_offset : date('Z');
	return $time - $tz;
	}

	/**
	* Convert the given date string into a GMT-based time stamp
	*/
	function fromGMT($datetime, $user_tz = true)
	{
	$tz = $user_tz ? $this->gmt_offset : date('Z');
	$ts = is_numeric($datetime) ? $datetime : strtotime($datetime);
	return $ts + $tz;
	}

	/**
	* Encode events as JSON
	*
	* @param array Events as array
	* @return string JSON encoded events
	*/
	function encode($events, $addcss = false)
	{
	$json = array();
	foreach ($events as $event) {
	// compose a human readable strings for alarms_text and recurrence_text
	if ($event['alarms'])
	$event['alarms_text'] = $this->_alarms_text($event['alarms']);
	if ($event['recurrence'])
	$event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);

	$json[] = array(
	'start' => date('c', $event['start']), // ISO 8601 date (added in PHP 5)
	'end' => date('c', $event['end']), // ISO 8601 date (added in PHP 5)
	'description' => strval($event['description']),
	'location' => strval($event['location']),
	'className' => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') . 'cat-' . asciiwords($event['categories'], true),
	- 'allDay' => ($event['all_day'] == 1)?true:false,
	+ 'allDay' => ($event['allday'] == 1)?true:false,
	) + $event;
	}
	return json_encode($json);
	}


	/**
	* Generate reduced and streamlined output for pending alarms
	*/
	private function _alarms_output($alarms)
	{
	$out = array();
	foreach ($alarms as $alarm) {
	$out[] = array(
	'id' => $alarm['id'],
	'start' => $alarm['start'],
	'end' => $alarm['end'],
	- 'allDay' => ($event['all_day'] == 1)?true:false,
	+ 'allDay' => ($event['allday'] == 1)?true:false,
	'title' => $alarm['title'],
	'location' => $alarm['location'],
	'calendar' => $alarm['calendar'],
	);
	}

	return $out;
	}

	/**
	* Render localized text for alarm settings
	*/
	private function _alarms_text($alarm)
	{
	list($trigger, $action) = explode(':', $alarm);

	$text = '';
	switch ($action) {
	case 'EMAIL':
	$text = $this->gettext('alarmemail');
	break;
	case 'DISPLAY':
	$text = $this->gettext('alarmdisplay');
	break;
	}

	if (preg_match('/@(\d+)/', $trigger, $m)) {
	$text .= ' ' . $this->gettext(array('name' => 'alarmat', 'vars' => array('datetime' => format_date($m[1]))));
	}
	else if ($val = self::parse_alaram_value($trigger)) {
	$text .= ' ' . intval($val[0]) . ' ' . $this->gettext('trigger' . $val[1]);
	}
	else
	return false;

	return $text;
	}

	/**
	* Render localized text describing the recurrence rule of an event
	*/
	private function _recurrence_text($rrule)
	{
	// TODO: finish this
	$freq = sprintf('%s %d ', $this->gettext('every'), $rrule['INTERVAL']);
	$details = '';
	switch ($rrule['FREQ']) {
	case 'DAILY':
	$freq .= $this->gettext('days');
	break;
	case 'WEEKLY':
	$freq .= $this->gettext('weeks');
	break;
	case 'MONTHLY':
	$freq .= $this->gettext('months');
	break;
	case 'YEARY':
	$freq .= $this->gettext('years');
	break;
	}

	if ($rrule['INTERVAL'] == 1)
	$freq = $this->gettext(strtolower($rrule['FREQ']));

	if ($rrule['COUNT'])
	$until = $this->gettext(array('name' => 'forntimes', 'vars' => array('nr' => $rrule['COUNT'])));
	else if ($rrule['UNTIL'])
	$until = $this->gettext('recurrencend') . ' ' . format_date($rrule['UNTIL'], self::to_php_date_format($this->rc->config->get('calendar_date_format')));
	else
	$until = $this->gettext('forever');

	return rtrim($freq . $details . ', ' . $until);
	}

	/**
	* Generate a unique identifier for an event
	*/
	public function generate_uid()
	{
	return strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($this->rc->user->get_username()), 0, 16));
	}

	/**
	* Helper function to convert alarm trigger strings
	* into two-field values (e.g. "-45M" => 45, "-M")
	*/
	public static function parse_alaram_value($val)
	{
	if ($val[0] == '@')
	return array(substr($val, 1));
	else if (preg_match('/([+-])(\d+)([HMD])/', $val, $m))
	return array($m[2], $m[1].$m[3]);

	return false;
	}

	/**
	* Convert the internal structured data into a vcalendar rrule 2.0 string
	*/
	public static function to_rrule($recurrence)
	{
	if (is_string($recurrence))
	return $recurrence;

	$rrule = '';
	foreach ((array)$recurrence as $k => $val) {
	$k = strtoupper($k);
	switch ($k) {
	case 'UNTIL':
	$val = gmdate('Ymd\THis', $val);
	break;
	case 'EXDATE':
	foreach ((array)$val as $i => $ex)
	$val[$i] = gmdate('Ymd\THis', $ex);
	$val = join(',', $val);
	break;
	}
	$rrule .= $k . '=' . $val . ';';
	}

	return $rrule;
	}

	/**
	* Convert from fullcalendar date format to PHP date() format string
	*/
	private static function to_php_date_format($from)
	{
	// "dd.MM.yyyy HH:mm:ss" => "d.m.Y H:i:s"
	return strtr($from, array(
	'yyyy' => 'Y',
	'yy' => 'y',
	'MMMM' => 'F',
	'MMM' => 'M',
	'MM' => 'm',
	'M' => 'n',
	'dddd' => 'l',
	'ddd' => 'D',
	'dd' => 'd',
	'HH' => 'H',
	'hh' => 'h',
	'mm' => 'i',
	'ss' => 's',
	'TT' => 'A',
	'tt' => 'a',
	'T' => 'A',
	't' => 'a',
	'u' => 'c',
	));
	}

	/**
	* TEMPORARY: generate random event data for testing
	* Create events by opening http://<roundcubeurl>/?_task=calendar&_action=randomdata&_num=500
	*/
	public function generate_randomdata()
	{
	$cats = array_keys($this->driver->list_categories());
	$cals = $this->driver->list_calendars();
	$num = $_REQUEST['_num'] ? intval($_REQUEST['_num']) : 100;

	while ($count++ < $num) {
	$start = round((time() + rand(-2600, 2600) * 1000) / 300) * 300;
	$duration = round(rand(30, 360) / 30) * 30 * 60;
	$allday = rand(0,20) > 18;
	$alarm = rand(-30,12) * 5;
	$fb = rand(0,2);

	if (date('G', $start) > 23)
	$start -= 3600;

	if ($allday) {
	$start = strtotime(date('Y-m-d 00:00:00', $start));
	$duration = 86399;
	}

	$title = '';
	$len = rand(2, 12);
	$words = explode(" ", "The Hough transform is named after Paul Hough who patented the method in 1962. It is a technique which can be used to isolate features of a particular shape within an image. Because it requires that the desired features be specified in some parametric form, the classical Hough transform is most commonly used for the de- tection of regular curves such as lines, circles, ellipses, etc. A generalized Hough transform can be employed in applications where a simple analytic description of a feature(s) is not possible. Due to the computational complexity of the generalized Hough algorithm, we restrict the main focus of this discussion to the classical Hough transform. Despite its domain restrictions, the classical Hough transform (hereafter referred to without the classical prefix ) retains many applications, as most manufac- tured parts (and many anatomical parts investigated in medical imagery) contain feature boundaries which can be described by regular curves. The main advantage of the Hough transform technique is that it is tolerant of gaps in feature boundary descriptions and is relatively unaffected by image noise.");
	$chars = "!# abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890";
	for ($i = 0; $i < $len; $i++)
	$title .= $words[rand(0,count($words)-1)] . " ";

	$this->driver->new_event(array(
	'uid' => $this->generate_uid(),
	'start' => $start,
	'end' => $start + $duration,
	'allday' => $allday,
	'title' => rtrim($title),
	'free_busy' => $fb == 2 ? 'outofoffice' : ($fb ? 'busy' : 'free'),
	'categories' => $cats[array_rand($cats)],
	'calendar' => array_rand($cals),
	'alarms' => $alarm > 0 ? "-{$alarm}M:DISPLAY" : '',
	'priority' => 1,
	));
	}

	$this->rc->output->redirect('');
	}

	}
	diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
	index 319f859e..52b6cf2d 100644
	--- a/plugins/calendar/drivers/database/database_driver.php
	+++ b/plugins/calendar/drivers/database/database_driver.php
	@@ -1,787 +1,788 @@
	<?php
	/*
	+-------------------------------------------------------------------------+
	\| Database driver for the Calendar Plugin \|
	\| Version 0.3 beta \|
	\| \|
	\| This program is free software; you can redistribute it and/or modify \|
	\| it under the terms of the GNU General Public License version 2 \|
	\| as published by the Free Software Foundation. \|
	\| \|
	\| 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 General Public License for more details. \|
	\| \|
	\| You should have received a copy of the GNU General Public License along \|
	\| with this program; if not, write to the Free Software Foundation, Inc., \|
	\| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \|
	\| \|
	+-------------------------------------------------------------------------+
	\| Author: Lazlo Westerhof <hello@lazlo.me> \|
	\| Thomas Bruederli <roundcube@gmail.com> \|
	+-------------------------------------------------------------------------+
	*/

	class database_driver extends calendar_driver
	{
	// features this backend supports
	public $alarms = true;
	public $attendees = true;
	public $attachments = true;
	public $alarm_types = array('DISPLAY','EMAIL');

	private $rc;
	private $cal;
	private $calendars = array();
	private $calendar_ids = '';
	private $free_busy_map = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);

	private $db_events = 'events';
	private $db_calendars = 'calendars';
	private $db_attachments = 'attachments';
	private $sequence_events = 'event_ids';
	private $sequence_calendars = 'calendar_ids';
	private $sequence_attachments = 'attachment_ids';


	/**
	* Default constructor
	*/
	public function __construct($cal)
	{
	$this->cal = $cal;
	$this->rc = $cal->rc;

	// load library classes
	require_once($this->cal->home . '/lib/Horde_Date_Recurrence.php');

	// read database config
	$this->db_events = $this->rc->config->get('db_table_events', $this->db_events);
	$this->db_calendars = $this->rc->config->get('db_table_calendars', $this->db_calendars);
	$this->db_attachments = $this->rc->config->get('db_table_attachments', $this->db_attachments);
	$this->sequence_events = $this->rc->config->get('db_sequence_events', $this->sequence_events);
	$this->sequence_calendars = $this->rc->config->get('db_sequence_calendars', $this->sequence_calendars);
	$this->sequence_attachments = $this->rc->config->get('db_sequence_attachments', $this->sequence_attachments);

	$this->_read_calendars();
	}

	/**
	* Read available calendars for the current user and store them internally
	*/
	private function _read_calendars()
	{
	if (!empty($this->rc->user->ID)) {
	$calendar_ids = array();
	$result = $this->rc->db->query(
	"SELECT *, calendar_id AS id FROM " . $this->db_calendars . "
	WHERE user_id=?",
	$this->rc->user->ID
	);
	while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
	$this->calendars[$arr['calendar_id']] = $arr;
	$calendar_ids[] = $this->rc->db->quote($arr['calendar_id']);
	}
	$this->calendar_ids = join(',', $calendar_ids);
	}
	}

	/**
	* Get a list of available calendars from this source
	*/
	public function list_calendars()
	{
	// attempt to create a default calendar for this user
	if (empty($this->calendars)) {
	if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000')))
	$this->_read_calendars();
	}

	return $this->calendars;
	}

	/**
	* Create a new calendar assigned to the current user
	*
	* @param array Hash array with calendar properties
	* name: Calendar name
	* color: The color of the calendar
	* @return mixed ID of the calendar on success, False on error
	*/
	public function create_calendar($prop)
	{
	$result = $this->rc->db->query(
	"INSERT INTO " . $this->db_calendars . "
	(user_id, name, color)
	VALUES (?, ?, ?)",
	$this->rc->user->ID,
	$prop['name'],
	$prop['color']
	);

	if ($result)
	return $this->rc->db->insert_id($this->sequence_calendars);

	return false;
	}

	/**
	* Update properties of an existing calendar
	*
	* @see calendar_driver::edit_calendar()
	*/
	public function edit_calendar($prop)
	{
	$query = $this->rc->db->query(
	"UPDATE " . $this->db_calendars . "
	SET name=?, color=?
	WHERE calendar_id=?
	AND user_id=?",
	$prop['name'],
	$prop['color'],
	$prop['id'],
	$this->rc->user->ID
	);

	return $this->rc->db->affected_rows($query);
	}

	/**
	* Delete the given calendar with all its contents
	*
	* @see calendar_driver::remove_calendar()
	*/
	public function remove_calendar($prop)
	{
	if (!$this->calendars[$prop['id']])
	return false;

	// delete all events of this calendar
	$query = $this->rc->db->query(
	"DELETE FROM " . $this->db_events . "
	WHERE calendar_id=?",
	$prop['id']
	);

	// TODO: also delete linked attachments

	$query = $this->rc->db->query(
	"DELETE FROM " . $this->db_calendars . "
	WHERE calendar_id=?",
	$prop['id']
	);

	return $this->rc->db->affected_rows($query);
	}

	/**
	* Add a single event to the database
	*
	* @param array Hash array with event properties
	* @see Driver:new_event()
	*/
	public function new_event($event)
	{
	if (!empty($this->calendars)) {
	if ($event['calendar'] && !$this->calendars[$event['calendar']])
	return false;
	if (!$event['calendar'])
	$event['calendar'] = reset(array_keys($this->calendars));

	$event = $this->_save_preprocess($event);
	$query = $this->rc->db->query(sprintf(
	"INSERT INTO " . $this->db_events . "
	(calendar_id, created, changed, uid, start, end, all_day, recurrence, title, description, location, categories, free_busy, priority, sensitivity, alarms, notifyat)
	VALUES (?, %s, %s, ?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
	$this->rc->db->now(),
	$this->rc->db->now(),
	$this->rc->db->fromunixtime($event['start']),
	$this->rc->db->fromunixtime($event['end'])
	),
	$event['calendar'],
	strval($event['uid']),
	intval($event['all_day']),
	$event['recurrence'],
	strval($event['title']),
	strval($event['description']),
	strval($event['location']),
	strval($event['categories']),
	intval($event['free_busy']),
	intval($event['priority']),
	intval($event['sensitivity']),
	$event['alarms'],
	$event['notifyat']
	);

	if ($success = $this->rc->db->insert_id($this->sequence_events))
	$this->_update_recurring($event);

	return $success;
	}

	return false;
	}

	/**
	* Update an event entry with the given data
	*
	* @param array Hash array with event properties
	* @see Driver:edit_event()
	*/
	public function edit_event($event)
	{
	if (!empty($this->calendars)) {
	$update_master = false;
	$update_recurring = true;
	$old = $this->get_event($event['id']);

	// modify a recurring event, check submitted savemode to do the right things
	if ($old['recurrence'] \|\| $old['recurrence_id']) {
	$master = $old['recurrence_id'] ? $this->get_event($old['recurrence_id']) : $old;

	// keep saved exceptions (not submitted by the client)
	if ($old['recurrence']['EXDATE'])
	$event['recurrence']['EXDATE'] = $old['recurrence']['EXDATE'];

	switch ($event['savemode']) {
	case 'new':
	$event['uid'] = $this->cal->generate_uid();
	return $this->new_event($event);

	case 'current':
	// add exception to master event
	$master['recurrence']['EXDATE'][] = $old['start'];
	$update_master = true;

	// just update this occurence (decouple from master)
	$update_recurring = false;
	$event['recurrence_id'] = 0;
	$event['recurrence'] = array();
	break;

	case 'future':
	if ($master['id'] != $event['id']) {
	// set until-date on master event, then save this instance as new recurring event
	$master['recurrence']['UNTIL'] = $event['start'] - 86400;
	unset($master['recurrence']['COUNT']);
	$update_master = true;

	// if recurrence COUNT, update value to the correct number of future occurences
	if ($event['recurrence']['COUNT']) {
	$sqlresult = $this->rc->db->query(sprintf(
	"SELECT event_id FROM " . $this->db_events . "
	WHERE calendar_id IN (%s)
	AND start >= %s
	AND recurrence_id=?",
	$this->calendar_ids,
	$this->rc->db->fromunixtime($event['start'])
	),
	$master['id']);
	if ($count = $this->rc->db->num_rows($sqlresult))
	$event['recurrence']['COUNT'] = $count;
	}

	$update_recurring = true;
	$event['recurrence_id'] = 0;
	break;
	}
	// else: 'future' == 'all' if modifying the master event

	default: // 'all' is default
	$event['id'] = $master['id'];
	$event['recurrence_id'] = 0;

	// use start date from master but try to be smart on time or duration changes
	$old_start_date = date('Y-m-d', $old['start']);
	$old_start_time = date('H:i:s', $old['start']);
	$old_duration = $old['end'] - $old['start'];

	$new_start_date = date('Y-m-d', $event['start']);
	$new_start_time = date('H:i:s', $event['start']);
	$new_duration = $event['end'] - $event['start'];

	// shifted or resized
	if ($old_start_date == $new_start_date \|\| $old_duration == $new_duration) {
	$event['start'] = $master['start'] + ($event['start'] - $old['start']);
	$event['end'] = $event['start'] + $new_duration;
	}
	break;
	}
	}

	$success = $this->_update_event($event, $update_recurring);
	if ($success && $update_master)
	$this->_update_event($master, true);

	return $success;
	}

	return false;
	}

	/**
	* Convert save data to be used in SQL statements
	*/
	private function _save_preprocess($event)
	{
	// compose vcalendar-style recurrencue rule from structured data
	$rrule = $event['recurrence'] ? calendar::to_rrule($event['recurrence']) : '';
	$event['_exdates'] = (array)$event['recurrence']['EXDATE'];
	$event['recurrence'] = rtrim($rrule, ';');
	$event['free_busy'] = intval($this->free_busy_map[strtolower($event['free_busy'])]);

	if (isset($event['allday']))
	$event['all_day'] = $event['allday'] ? 1 : 0;

	// compute absolute time to notify the user
	$event['notifyat'] = $this->_get_notification($event);

	return $event;
	}

	/**
	* Compute absolute time to notify the user
	*/
	private function _get_notification($event)
	{
	if ($event['alarms']) {
	list($trigger, $action) = explode(':', $event['alarms']);
	$notify = calendar::parse_alaram_value($trigger);
	if (!empty($notify[1])){ // offset
	$mult = 1;
	switch ($notify[1]) {
	case '-M': $mult = -60; break;
	case '+M': $mult = 60; break;
	case '-H': $mult = -3600; break;
	case '+H': $mult = 3600; break;
	case '-D': $mult = -86400; break;
	case '+D': $mult = 86400; break;
	}
	$offset = $notify[0] * $mult;
	$refdate = $mult > 0 ? $event['end'] : $event['start'];
	$notify_at = $refdate + $offset;
	}
	else { // absolute timestamp
	$notify_at = $notify[0];
	}

	if ($event['start'] > time())
	return date('Y-m-d H:i:s', $notify_at);
	}

	return null;
	}

	/**
	* Save the given event record to database
	*
	* @param array Event data, already passed through self::_save_preprocess()
	* @param boolean True if recurring events instances should be updated, too
	*/
	private function _update_event($event, $update_recurring = true)
	{
	$event = $this->_save_preprocess($event);

	$sql_set = array();
	$set_cols = array('all_day', 'recurrence', 'recurrence_id', 'title', 'description', 'location', 'categories', 'free_busy', 'priority', 'sensitivity', 'alarms', 'notifyat');
	foreach ($set_cols as $col) {
	if (isset($event[$col]))
	$sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]);
	}

	$query = $this->rc->db->query(sprintf(
	"UPDATE " . $this->db_events . "
	SET changed=%s, start=%s, end=%s %s
	WHERE event_id=?
	AND calendar_id IN (" . $this->calendar_ids . ")",
	$this->rc->db->now(),
	$this->rc->db->fromunixtime($event['start']),
	$this->rc->db->fromunixtime($event['end']),
	($sql_set ? ', ' . join(', ', $sql_set) : '')
	),
	$event['id']
	);

	$success = $this->rc->db->affected_rows($query);
	if ($success && $update_recurring)
	$this->_update_recurring($event);

	return $success;
	}

	/**
	* Insert "fake" entries for recurring occurences of this event
	*/
	private function _update_recurring($event)
	{
	if (empty($this->calendars))
	return;

	// clear existing recurrence copies
	$this->rc->db->query(
	"DELETE FROM " . $this->db_events . "
	WHERE recurrence_id=?
	AND calendar_id IN (" . $this->calendar_ids . ")",
	$event['id']
	);

	// create new fake entries
	if ($event['recurrence']) {
	// TODO: replace Horde classes with something that has less than 6'000 lines of code
	$recurrence = new Horde_Date_Recurrence($event['start']);
	$recurrence->fromRRule20($event['recurrence']);

	foreach ((array)$event['_exdates'] as $exdate)
	$recurrence->addException(date('Y', $exdate), date('n', $exdate), date('j', $exdate));

	$duration = $event['end'] - $event['start'];
	$next = new Horde_Date($event['start']);
	while ($next = $recurrence->nextActiveRecurrence(array('year' => $next->year, 'month' => $next->month, 'mday' => $next->mday + 1, 'hour' => $next->hour, 'min' => $next->min, 'sec' => $next->sec))) {
	$next_ts = $next->timestamp();
	$notify_at = $this->_get_notification(array('alarms' => $event['alarms'], 'start' => $next_ts, 'end' => $next_ts + $duration));
	$query = $this->rc->db->query(sprintf(
	"INSERT INTO " . $this->db_events . "
	(calendar_id, recurrence_id, created, changed, uid, start, end, all_day, recurrence, title, description, location, categories, free_busy, priority, sensitivity, alarms, notifyat)
	SELECT calendar_id, ?, %s, %s, uid, %s, %s, all_day, recurrence, title, description, location, categories, free_busy, priority, sensitivity, alarms, ?
	FROM " . $this->db_events . " WHERE event_id=? AND calendar_id IN (" . $this->calendar_ids . ")",
	$this->rc->db->now(),
	$this->rc->db->now(),
	$this->rc->db->fromunixtime($next_ts),
	$this->rc->db->fromunixtime($next_ts + $duration)
	),
	$event['id'],
	$notify_at,
	$event['id']
	);

	if (!$this->rc->db->affected_rows($query))
	break;

	// stop adding events for inifinite recurrence after 20 years
	if (++$count > 999 \|\| (!$recurrence->recurEnd && !$recurrence->recurCount && $next->year > date('Y') + 20))
	break;
	}
	}
	}

	/**
	* Move a single event
	*
	* @param array Hash array with event properties
	* @see Driver:move_event()
	*/
	public function move_event($event)
	{
	// let edit_event() do all the magic
	return $this->edit_event($event + (array)$this->get_event($event['id']));
	}

	/**
	* Resize a single event
	*
	* @param array Hash array with event properties
	* @see Driver:resize_event()
	*/
	public function resize_event($event)
	{
	// let edit_event() do all the magic
	return $this->edit_event($event + (array)$this->get_event($event['id']));
	}

	/**
	* Remove a single event from the database
	*
	* @param array Hash array with event properties
	* @see Driver:remove_event()
	*/
	public function remove_event($event)
	{
	if (!empty($this->calendars)) {
	$event += (array)$this->get_event($event['id']);
	$master = $event;
	$update_master = false;
	$savemode = 'all';

	// read master if deleting a recurring event
	if ($event['recurrence'] \|\| $event['recurrence_id']) {
	$master = $event['recurrence_id'] ? $this->get_event($old['recurrence_id']) : $event;
	$savemode = $event['savemode'];
	}

	switch ($savemode) {
	case 'current':
	// add exception to master event
	$master['recurrence']['EXDATE'][] = $event['start'];
	$update_master = true;

	// just delete this single occurence
	$query = $this->rc->db->query(
	"DELETE FROM " . $this->db_events . "
	WHERE calendar_id IN (" . $this->calendar_ids . ")
	AND event_id=?",
	$event['id']
	);
	break;

	case 'future':
	if ($master['id'] != $event['id']) {
	// set until-date on master event
	$master['recurrence']['UNTIL'] = $event['start'] - 86400;
	unset($master['recurrence']['COUNT']);
	$update_master = true;

	// delete this and all future instances
	$query = $this->rc->db->query(
	"DELETE FROM " . $this->db_events . "
	WHERE calendar_id IN (" . $this->calendar_ids . ")
	AND start >= " . $this->rc->db->fromunixtime($old['start']) . "
	AND recurrence_id=?",
	$master['id']
	);
	break;
	}
	// else: future == all if modifying the master event

	default: // 'all' is default
	$query = $this->rc->db->query(
	"DELETE FROM " . $this->db_events . "
	WHERE (event_id=? OR recurrence_id=?)
	AND calendar_id IN (" . $this->calendar_ids . ")",
	$master['id'],
	$master['id']
	);
	break;
	}

	$success = $this->rc->db->affected_rows($query);
	if ($success && $update_master)
	$this->_update_event($master, true);

	return $success;
	}

	return false;
	}

	/**
	* Return data of a specific event
	* @param string Event ID
	* @return array Hash array with event properties
	*/
	public function get_event($id)
	{
	static $cache = array();

	if ($cache[$id])
	return $cache[$id];

	$result = $this->rc->db->query(sprintf(
	"SELECT * FROM " . $this->db_events . "
	WHERE calendar_id IN (%s)
	AND event_id=?",
	$this->calendar_ids
	),
	$id);

	if ($result && ($event = $this->rc->db->fetch_assoc($result))) {
	$cache[$id] = $this->_read_postprocess($event);
	return $cache[$id];
	}

	return false;
	}

	/**
	* Get event data
	*
	* @see Driver:load_events()
	*/
	public function load_events($start, $end, $calendars = null, $sql_add = '')
	{
	if (empty($calendars))
	$calendars = array_keys($this->calendars);
	else if (is_string($calendars))
	$calendars = explode(',', $calendars);

	// only allow to select from calendars of this use
	$calendar_ids = array_intersect($calendars, array_keys($this->calendars));
	array_walk($calendar_ids, array($this->rc->db, 'quote'));

	$events = array();
	if (!empty($calendar_ids)) {
	$result = $this->rc->db->query(sprintf(
	"SELECT * FROM " . $this->db_events . "
	WHERE calendar_id IN (%s)
	AND start <= %s AND end >= %s
	%s",
	join(',', $calendar_ids),
	$this->rc->db->fromunixtime($end),
	$this->rc->db->fromunixtime($start),
	$sql_add
	));

	while ($result && ($event = $this->rc->db->fetch_assoc($result))) {
	$events[] = $this->_read_postprocess($event);
	}
	}

	return $events;
	}

	/**
	* Convert sql record into a rcube style event object
	*/
	private function _read_postprocess($event)
	{
	$free_busy_map = array_flip($this->free_busy_map);

	$event['id'] = $event['event_id'];
	$event['start'] = strtotime($event['start']);
	$event['end'] = strtotime($event['end']);
	+ $event['allday'] = intval($event['all_day']);
	$event['free_busy'] = $free_busy_map[$event['free_busy']];
	$event['calendar'] = $event['calendar_id'];

	// parse recurrence rule
	if ($event['recurrence'] && preg_match_all('/([A-Z]+)=([^;]+);?/', $event['recurrence'], $m, PREG_SET_ORDER)) {
	$event['recurrence'] = array();
	foreach ($m as $rr) {
	if (is_numeric($rr[2]))
	$rr[2] = intval($rr[2]);
	else if ($rr[1] == 'UNTIL')
	$rr[2] = strtotime($rr[2]);
	else if ($rr[1] == 'EXDATE')
	$rr[2] = array_map('strtotime', explode(',', $rr[2]));
	$event['recurrence'][$rr[1]] = $rr[2];
	}
	}

	unset($event['event_id'], $event['calendar_id'], $event['notifyat']);
	return $event;
	}

	/**
	* Search events
	*
	* @see Driver:search_events()
	*/
	public function search_events($start, $end, $query, $calendars = null)
	{
	// compose (slow) SQL query for searching
	// FIXME: improve searching using a dedicated col and normalized values
	foreach (array('title','location','description','categories','attendees') as $col) {
	$sql_query[] = $this->rc->db->ilike($col, '%'.$query.'%');
	}

	return $this->load_events($start, $end, $calendars, 'AND (' . join(' OR ', $sql_query) . ')');
	}

	/**
	* Get a list of pending alarms to be displayed to the user
	*
	* @see Driver:pending_alarms()
	*/
	public function pending_alarms($time, $calendars = null)
	{
	if (empty($calendars))
	$calendars = array_keys($this->calendars);
	else if (is_string($calendars))
	$calendars = explode(',', $calendars);

	// only allow to select from calendars of this use
	$calendar_ids = array_intersect($calendars, array_keys($this->calendars));
	array_walk($calendar_ids, array($this->rc->db, 'quote'));

	$alarms = array();
	if (!empty($calendar_ids)) {
	$result = $this->rc->db->query(sprintf(
	"SELECT * FROM " . $this->db_events . "
	WHERE calendar_id IN (%s)
	AND notifyat <= %s AND end > %s",
	join(',', $calendar_ids),
	$this->rc->db->fromunixtime($time),
	$this->rc->db->fromunixtime($time)
	));

	while ($result && ($event = $this->rc->db->fetch_assoc($result)))
	$alarms[] = $this->_read_postprocess($event);
	}

	return $alarms;
	}

	/**
	* Feedback after showing/sending an alarm notification
	*
	* @see Driver:dismiss_alarm()
	*/
	public function dismiss_alarm($event_id, $snooze = 0)
	{
	// set new notifyat time or unset if not snoozed
	$notify_at = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;

	$query = $this->rc->db->query(sprintf(
	"UPDATE " . $this->db_events . "
	SET changed=%s, notifyat=?
	WHERE event_id=?
	AND calendar_id IN (" . $this->calendar_ids . ")",
	$this->rc->db->now()),
	$notify_at,
	$event_id
	);

	return $this->rc->db->affected_rows($query);
	}

	/**
	* Save an attachment related to the given event
	*/
	public function add_attachment($attachment, $event_id)
	{
	// TBD.
	return false;
	}

	/**
	* Remove a specific attachment from the given event
	*/
	public function remove_attachment($attachment, $event_id)
	{
	// TBD.
	return false;
	}

	/**
	* Remove the given category
	*/
	public function remove_category($name)
	{
	$query = $this->rc->db->query(
	"UPDATE " . $this->db_events . "
	SET categories=''
	WHERE categories=?
	AND calendar_id IN (" . $this->calendar_ids . ")",
	$name
	);

	return $this->rc->db->affected_rows($query);
	}

	/**
	* Update/replace a category
	*/
	public function replace_category($oldname, $name, $color)
	{
	$query = $this->rc->db->query(
	"UPDATE " . $this->db_events . "
	SET categories=?
	WHERE categories=?
	AND calendar_id IN (" . $this->calendar_ids . ")",
	$name,
	$oldname
	);

	return $this->rc->db->affected_rows($query);
	}

	}
	diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
	index d9a78201..5ce3d083 100644
	--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
	+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
	@@ -1,460 +1,463 @@
	<?php
	/*
	+-------------------------------------------------------------------------+
	\| Kolab calendar storage class \|
	\| \|
	\| This program is free software; you can redistribute it and/or modify \|
	\| it under the terms of the GNU General Public License version 2 \|
	\| as published by the Free Software Foundation. \|
	\| \|
	\| PURPOSE: \|
	\| Storage object for a single calendar folder on Kolab \|
	\| \|
	+-------------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-------------------------------------------------------------------------+
	*/

	class kolab_calendar
	{
	public $id;
	public $ready = false;
	public $readonly = true;

	private $storage;
	private $events;
	private $id2uid;
	private $imap_folder = 'INBOX/Calendar';
	private $sensitivity_map = array('public', 'private', 'confidential');
	private $priority_map = array('low', 'normal', 'high');


	private $fieldmap = array(
	// kolab => roundcube
	'summary' => 'title',
	'location'=>'location',
	'body'=>'description',
	'categories'=>'categories',
	'start-date'=>'start',
	'end-date'=>'end',
	'sensitivity'=>'sensitivity',
	'show-time-as' => 'free_busy',
	'alarm','alarms'
	);

	/**
	* Default constructor
	*/
	public function __construct($imap_folder = null)
	{
	if (strlen($imap_folder))
	$this->imap_folder = $imap_folder;

	// ID is derrived from folder name
	$this->id = rcube_kolab::folder_id($this->imap_folder);

	// fetch objects from the given IMAP folder
	$this->storage = rcube_kolab::get_storage($this->imap_folder);

	$this->ready = !PEAR::isError($this->storage);
	}


	/**
	* Getter for a nice and human readable name for this calendar
	* See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference
	*
	* @return string Name of this calendar
	*/
	public function get_name()
	{
	// @TODO: get namespace prefixes from IMAP
	$dispname = preg_replace(array('!INBOX/Calendar/!', '!^INBOX/!', '!^shared/!', '!^user/([^/]+)/!'), array('','','','(\\1) '), $this->imap_folder);
	return rcube_charset_convert(strlen($dispname) ? $dispname : $this->imap_folder, "UTF7-IMAP");
	}

	/**
	* Getter for the top-end calendar folder name (not the entire path)
	*
	* @return string Name of this calendar
	*/
	public function get_foldername()
	{
	$parts = explode('/', $this->imap_folder);
	return end($parts);
	}

	/**
	* Return color to display this calendar
	*/
	public function get_color()
	{
	// TODO: read color from backend (not yet supported)
	return '0000dd';
	}


	/**
	* Getter for a single event object
	*/
	public function get_event($id)
	{
	$this->_fetch_events();
	return $this->events[$id];
	}


	/**
	* @param integer Event's new start (unix timestamp)
	* @param integer Event's new end (unix timestamp)
	* @param string Search query (optional)
	* @return array A list of event records
	*/
	public function list_events($start, $end, $search = null)
	{
	// use Horde classes to compute recurring instances
	require_once 'Horde/Date/Recurrence.php';

	$this->_fetch_events();

	$events = array();
	foreach ($this->events as $id => $event) {
	// TODO: filter events by search query

	if (!empty($search)) {

	}

	// list events in requested time window
	if ($event['start'] <= $end && $event['end'] >= $start) {
	$events[] = $event;
	}

	// resolve recurring events (maybe move to _fetch_events() for general use?)
	if ($event['recurrence']) {
	$recurrence = new Horde_Date_Recurrence($event['start']);
	$recurrence->fromRRule20(calendar::to_rrule($event['recurrence']));

	foreach ((array)$event['recurrence']['EXDATE'] as $exdate)
	$recurrence->addException(date('Y', $exdate), date('n', $exdate), date('j', $exdate));

	$duration = $event['end'] - $event['start'];
	$next = new Horde_Date($event['start']);
	while ($next = $recurrence->nextActiveRecurrence(array('year' => $next->year, 'month' => $next->month, 'mday' => $next->mday + 1, 'hour' => $next->hour, 'min' => $next->min, 'sec' => $next->sec))) {
	$rec_start = $next->timestamp();
	$rec_end = $rec_start + $duration;

	// add to output if in range
	if ($rec_start <= $end && $rec_end >= $start) {
	$rec_event = $event;
	$rec_event['recurrence_id'] = $event['id'];
	$rec_event['start'] = $rec_start;
	$rec_event['end'] = $rec_end;
	$events[] = $rec_event;
	}
	else if ($rec_start > $end) // stop loop if out of range
	break;
	}
	}
	}

	return $events;
	}


	/**
	* Create a new event record
	*
	* @see Driver:new_event()
	* @return mixed The created record ID on success, False on error
	*/
	public function insert_event($event)
	{
	if (!is_array($event))
	return false;



	//generate new event from RC input
	$object = $this->_from_rcube_event($event);

	//generate new UID
	$object['uid'] = $this->storage->generateUID();


	$saved = $this->storage->save($object);

	return $saved;
	}

	/**
	* Update a specific event record
	*
	* @see Driver:new_event()
	* @return boolean True on success, False on error
	*/

	public function update_event($event)
	{
	$updated = false;
	$old = $this->storage->getObject($event['id']);
	$object = array_merge($old, $this->_from_rcube_event($event));
	$saved = $this->storage->save($object, $event['id']);
	if (PEAR::isError($saved)) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving contact object to Kolab server:" . $saved->getMessage()),
	true, false);
	}
	else {
	$updated = true;
	}

	return $updated;
	}

	/**
	* Delete an event record
	*
	* @see Driver:remove_event()
	* @return boolean True on success, False on error
	*/

	public function delete_event($event)
	{

	$deleted = false;
	$deleteme = $this->storage->delete($event['id']);
	if (PEAR::isError($deleteme)) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving contact object to Kolab server:" . $deleteme->getMessage()),
	true, false);
	}
	else {
	$deleted = true;
	}

	return $deleted;
	}


	/**
	* Simply fetch all records and store them in private member vars
	* We thereby rely on cahcing done by the Horde classes
	*/
	private function _fetch_events()
	{
	if (!isset($this->events)) {
	$this->events = array();
	foreach ((array)$this->storage->getObjects() as $record) {
	$event = $this->_to_rcube_event($record);
	$this->events[$event['id']] = $event;
	}
	}
	}

	/**
	* Convert from Kolab_Format to internal representation
	*/
	private function _to_rcube_event($rec)
	{
	$start_time = date('H:i:s', $rec['start-date']);
	$allday = $start_time == '00:00:00' && $start_time == date('H:i:s', $rec['end-date']);
	if ($allday) // in Roundcube all-day events only go until 23:59:59 of the last day
	$rec['end-date']--;
	-
	+
	// convert alarm time into internal format
	if ($rec['alarm']) {
	$alarm_value = $rec['alarm'];
	$alarm_unit = 'M';
	if ($rec['alarm'] % 1440 == 0) {
	$alarm_value /= 1440;
	$alarm_unit = 'D';
	}
	else if ($rec['alarm'] % 60 == 0) {
	$alarm_value /= 60;
	$alarm_unit = 'H';
	}
	$alarm_value *= -1;
	}

	// convert recurrence rules into internal pseudo-vcalendar format
	if ($recurrence = $rec['recurrence']) {
	$rrule = array(
	'FREQ' => strtoupper($recurrence['cycle']),
	'INTERVAL' => intval($recurrence['interval']),
	);

	if ($recurrence['range-type'] == 'number')
	$rrule['COUNT'] = intval($recurrence['range']);
	else if ($recurrence['range-type'] == 'date')
	$rrule['UNTIL'] = $recurrence['range'];

	if ($recurrence['day']) {
	$byday = array();
	$prefix = ($rrule['FREQ'] == 'MONTHLY' \|\| $rrule['FREQ'] == 'YEARLY') ? intval($recurrence['daynumber'] ? $recurrence['daynumber'] : 1) : '';
	foreach ($recurrence['day'] as $day)
	$byday[] = $prefix . substr(strtoupper($day), 0, 2);
	$rrule['BYDAY'] = join(',', $byday);
	}
	if ($recurrence['daynumber']) {
	- if ($recurrence['type'] == 'monthday')
	+ if ($recurrence['type'] == 'monthday' \|\| $recurrence['type'] == 'daynumber')
	$rrule['BYMONTHDAY'] = $recurrence['daynumber'];
	else if ($recurrence['type'] == 'yearday')
	$rrule['BYYEARDAY'] = $recurrence['daynumber'];
	}
	if ($rec['month']) {
	$monthmap = array('january' => 1, 'february' => 2, 'march' => 3, 'april' => 4, 'may' => 5, 'june' => 6, 'july' => 7, 'august' => 8, 'september' => 9, 'october' => 10, 'november' => 11, 'december' => 12);
	$rrule['BYMONTH'] = strtolower($monthmap[$recurrence['month']]);
	}

	if ($recurrence['exclusion']) {
	foreach ((array)$recurrence['exclusion'] as $excl)
	$rrule['EXDATE'][] = strtotime($excl);
	}
	}

	$sensitivity_map = array_flip($this->sensitivity_map);
	$priority_map = array_flip($this->priority_map);

	return array(
	'id' => $rec['uid'],
	'uid' => $rec['uid'],
	'title' => $rec['summary'],
	'location' => $rec['location'],
	'description' => $rec['body'],
	'start' => $rec['start-date'],
	'end' => $rec['end-date'],
	- 'all_day' => $allday,
	+ 'allday' => $allday,
	'recurrence' => $rrule,
	'alarms' => $alarm_value . $alarm_unit,
	'categories' => $rec['categories'],
	'free_busy' => $rec['show-time-as'],
	'priority' => isset($priority_map[$rec['priority']]) ? $priority_map[$rec['priority']] : 1,
	'sensitivity' => $sensitivity_map[$rec['sensitivity']],
	'calendar' => $this->id,
	);
	}

	/**
	* Convert the given event record into a data structure that can be passed to Kolab_Storage backend for saving
	* (opposite of self::_to_rcube_event())
	*/
	private function _from_rcube_event($event)
	{
	$priority_map = $this->priority_map;
	$daymap = array('MO'=>'monday','TU'=>'tuesday','WE'=>'wednesday','TH'=>'thursday','FR'=>'friday','SA'=>'saturday','SU'=>'sunday');


	- $object = array
	- (
	+ $object = array(
	// kolab => roundcube
	'summary' => $event['title'],
	'location'=> $event['location'],
	'body'=> $event['description'],
	'categories'=> $event['categories'],
	'start-date'=>$event['start'],
	'end-date'=>$event['end'],
	'sensitivity'=>$this->sensitivity_map[$event['sensitivity']],
	'show-time-as' => $event['free_busy'],
	'priority' => isset($priority_map[$event['priority']]) ? $priority_map[$event['priority']] : 1

	);

	//handle alarms
	if ($event['alarms']) {

	//get the value
	$alarmbase = explode(":",$event['alarms']);

	//get number only
	$avalue = preg_replace('/[^0-9]/', '', $alarmbase[0]);

	if(preg_match("/H/",$alarmbase[0]))
	{
	$object['alarm'] = $avalue*60;

	}else if (preg_match("/D/",$alarmbase[0]))
	{
	$object['alarm'] = $avalue2460;

	}else
	{
	//minutes
	$object['alarm'] = $avalue;
	}
	}

	//recurr object/array
	if (count($event['recurrence'])>1){

	$ra = $event['recurrence'];

	//Frequency abd interval
	$object['recurrence']['cycle'] = strtolower($ra['FREQ']);
	$object['recurrence']['interval'] = intval($ra['INTERVAL']);

	//Range Type
	if($ra['UNTIL']){
	$object['recurrence']['range-type']='date';
	$object['recurrence']['range']=$ra['UNTIL'];
	}
	if($ra['COUNT']){
	$object['recurrence']['range-type']='number';
	$object['recurrence']['range']=$ra['COUNT'];
	}
	//weekly

	if ($ra['FREQ']=='WEEKLY'){

	$weekdays = split(",",$ra['BYDAY']);
	foreach ($weekdays as $days){
	$weekly[]=$daymap[$days];
	}

	$object['recurrence']['day']=$weekly;
	}

	//monthly (temporary hack to follow current Horde logic)
	if ($ra['FREQ']=='MONTHLY'){

	if($ra['BYDAY']=='NaN'){


	$object['recurrence']['daynumber']=1;
	$object['recurrence']['day']=array(date('L',$event['start']));
	$object['recurrence']['cycle']='monthly';
	$object['recurrence']['type']='weekday';


	}
	else {
	$object['recurrence']['daynumber']=date('j',$event['start']);
	$object['recurrence']['cycle']='monthly';
	$object['recurrence']['type']="daynumber";
	}

	}

	//year




	//exclusion
	$object['recurrence']['type']=array(split(',',$ra['UNTIL']));

	}
	- //whole dday event
	- if($event['allday']==1)
	- $object['_is_all_day']=1;
	+
	+ // whole day event
	+ if ($event['allday']) {
	+ $object['end-date']++;
	+ $object['_is_all_day'] = 1;
	+ }
	+

	return $object;
	}



	}

File Metadata

Mime Type: text/x-diff
Expires: Apr 4 2026, 12:10 AM (4 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 18821638
Default Alt Text: (72 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions