From a16a9c581079516e100c00d24ede77efc3bcc038 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Wed, 1 Aug 2012 15:47:50 +0200
Subject: [PATCH] Small code and style cleanup

---
 plugins/calendar/calendar.php                     | 1 -
 plugins/calendar/drivers/kolab/kolab_calendar.php | 1 -
 plugins/calendar/lib/calendar_ui.php              | 2 +-
 plugins/calendar/skins/classic/calendar.css       | 2 +-
 plugins/calendar/skins/larry/calendar.css         | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 77719c7d..335c6721 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1469,7 +1469,6 @@ class calendar extends rcube_plugin
     }
 
     $event    = get_input_value('_id', RCUBE_INPUT_GPC);
-    $calendar = get_input_value('calendar', RCUBE_INPUT_GPC);
     $uploadid = get_input_value('_uploadid', RCUBE_INPUT_GPC);
 
     $eventid = 'cal:'.$event;
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 91ba5b8c..813b3919 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -462,7 +462,6 @@ class kolab_calendar
     // in kolab_storage attachments are indexed by content-id
     $object['_attachments'] = array();
     if (is_array($event['attachments'])) {
-      $collisions = array();
       foreach ($event['attachments'] as $idx => $attachment) {
         $key = null;
         // Roundcube ID has nothing to do with the storage ID, remove it
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index a063a4df..1cbcf0a9 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -623,7 +623,7 @@ class calendar_ui
 
     return html::div($attrib,
       html::div(null, $input->show()) .
-      html::div('buttons', $button->show(rcube_label('upload'), array('class' => 'button mainaction',
+      html::div('formbuttons', $button->show(rcube_label('upload'), array('class' => 'button mainaction',
         'onclick' => JS_OBJECT_NAME . ".upload_file(this.form)"))) .
       html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
     );
diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css
index 21dcb1b9..e4afea44 100644
--- a/plugins/calendar/skins/classic/calendar.css
+++ b/plugins/calendar/skins/classic/calendar.css
@@ -364,7 +364,7 @@ a.miniColors-trigger {
 	padding-top: 1.2em;
 }
 
-#edit-attachments-form .buttons {
+#edit-attachments-form .formbuttons {
 	margin: 0.5em 0;
 }
 
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index d0d108d6..67652114 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -371,7 +371,7 @@ a.miniColors-trigger {
 	border-top: 2px solid #fafafa;
 }
 
-#edit-attachments-form .buttons {
+#edit-attachments-form .formbuttons {
 	margin: 0.5em 0;
 }