").append(input).append(" ").append(color).append(" ").append(button).appendTo("#calendarcategories");
+ $categories = $this->rc->config->get('calendar_categories', array());
+ $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, '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 = $("
").attr("type", "text").attr("name", "_categories[]").attr("size", 30).val(name);
+ var color = $("
").attr("type", "text").attr("name", "_colors[]").attr("size", 6).val("000000");
+ var button = $("
").attr("type", "button").attr("value", "X").addClass("button").click(function(){ $(this).parent().remove() });
+ $("
").append(input).append(" ").append(color).append(" ").append(button).appendTo("#calendarcategories");
+ }
+ }');
+ }
}
return $p;
@@ -281,38 +283,11 @@ class calendar extends rcube_plugin
function preferences_save($p)
{
if ($p['section'] == 'calendar') {
- // categories
- $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);
- }
-
// 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_categories' => $new_categories,
'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),
@@ -320,6 +295,36 @@ class calendar extends rcube_plugin
'calendar_default_alarm_type' => get_input_value('_alarm_type', RCUBE_INPUT_POST),
'calendar_default_alarm_offset' => $default_alam,
);
+
+ // 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;
diff --git a/plugins/calendar/drivers/calendar_driver.php b/plugins/calendar/drivers/calendar_driver.php
index 40f235ba..4064e661 100644
--- a/plugins/calendar/drivers/calendar_driver.php
+++ b/plugins/calendar/drivers/calendar_driver.php
@@ -28,6 +28,7 @@ abstract class calendar_driver
public $alarms = false;
public $attendees = false;
public $attachments = false;
+ public $categoriesimmutable = false;
public $alarm_types = array('DISPLAY');
/**
@@ -135,7 +136,6 @@ abstract class calendar_driver
* @return array A list of alarms, each encoded as hash array:
* id: Event identifier
* uid: Unique identifier of this event
- * calendar: Calendar identifier to add event to (optional)
* start: Event start date/time as unix timestamp
* end: Event end date/time as unix timestamp
* allday: Boolean flag if this is an all-day event
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index a4205bdc..9e8f21af 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -24,6 +24,7 @@ class kolab_driver extends calendar_driver
public $alarms = true;
public $attendees = false;
public $attachments = false;
+ public $categoriesimmutable = true;
private $rc;
private $cal;
@@ -260,28 +261,26 @@ class kolab_driver extends calendar_driver
}
- /**
- * Create a new category
- */
- public function add_category($name, $color)
- {
-
- }
/**
- * Remove the given category
+ * List availabale categories
+ * The default implementation reads them from config/user prefs
*/
- public function remove_category($name)
+ public function list_categories()
{
-
- }
-
- /**
- * Update/replace a category
- */
- public function replace_category($oldname, $name, $color)
- {
-
+ # fixed list according to http://www.kolab.org/doc/kolabformat-2.0rc7-html/c300.html
+ return array(
+ 'important' => 'cc0000',
+ 'business' => '333333',
+ 'personal' => '333333',
+ 'vacation' => '333333',
+ 'must-attend' => '333333',
+ 'travel-required' => '333333',
+ 'needs-preparation' => '333333',
+ 'birthday' => '333333',
+ 'anniversary' => '333333',
+ 'phone-call' => '333333',
+ );
}
/**