From 2e0b6536d578cdbc48ad18b4380be5ec4ffea430 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Mon, 13 Jun 2011 14:38:54 -0600
Subject: [PATCH] Use editname (kolab folder name) for calendar edit form

---
 plugins/calendar/drivers/kolab/kolab_calendar.php | 11 +++++++++++
 plugins/calendar/drivers/kolab/kolab_driver.php   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index a3b33ba8..b2cc1c25 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -71,6 +71,17 @@ class kolab_calendar
     $dispname = preg_replace(array('!INBOX/Calendar/!', '!^INBOX/!', '!^shared/!', '!^user/([^/]+)/!'), array('','','','(\\1) '), $this->imap_folder);
     return strlen($dispname) ? $dispname : $this->imap_folder;
   }
+  
+  /**
+   * 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
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 2269aeb5..cd528ff9 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -70,6 +70,7 @@ class kolab_driver extends calendar_driver
               $this->calendars[$calendar->id] = array(
                 'id' => $calendar->id,
                 'name' => $calendar->get_name(),
+                'editname' => $calendar->get_foldername(),
                 'color' => $calendar->get_color(),
                 'readonly' => $c_folder->_owner != $_SESSION['username'],
               );