Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

Browse source
This commit is contained in:
Thomas 2011-07-06 19:32:21 +02:00
commit 7ec74047fb
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/calendar.php
View file

@ -111,14 +111,12 @@ class calendar extends rcube_plugin
$this->register_action('randomdata', array($this, 'generate_randomdata')); $this->register_action('randomdata', array($this, 'generate_randomdata'));
} }
else if ($this->rc->task == 'settings') { else if ($this->rc->task == 'settings') {
$this->load_driver();
// add hooks for Calendar settings // add hooks for Calendar settings
$this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list')); $this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
$this->add_hook('preferences_list', array($this, 'preferences_list')); $this->add_hook('preferences_list', array($this, 'preferences_list'));
$this->add_hook('preferences_save', array($this, 'preferences_save')); $this->add_hook('preferences_save', array($this, 'preferences_save'));
} }
// add hook to display alarms // add hook to display alarms
$this->add_hook('keep_alive', array($this, 'keep_alive')); $this->add_hook('keep_alive', array($this, 'keep_alive'));
} }
@ -205,8 +203,10 @@ class calendar extends rcube_plugin
function preferences_list($p) function preferences_list($p)
{ {
if ($p['section'] == 'calendar') { if ($p['section'] == 'calendar') {
$this->load_driver();
$p['blocks']['view']['name'] = $this->gettext('mainoptions'); $p['blocks']['view']['name'] = $this->gettext('mainoptions');
$field_id = 'rcmfd_default_view'; $field_id = 'rcmfd_default_view';
$select = new html_select(array('name' => '_default_view', 'id' => $field_id)); $select = new html_select(array('name' => '_default_view', 'id' => $field_id));
$select->add($this->gettext('day'), "agendaDay"); $select->add($this->gettext('day'), "agendaDay");
@ -340,6 +340,8 @@ class calendar extends rcube_plugin
function preferences_save($p) function preferences_save($p)
{ {
if ($p['section'] == 'calendar') { if ($p['section'] == 'calendar') {
$this->load_driver();
// compose default alarm preset value // compose default alarm preset value
$alarm_offset = get_input_value('_alarm_offset', RCUBE_INPUT_POST); $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]; $default_alam = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];