Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

debian.changelog Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/calendar.php Changed

@@ -311,14 +311,14 @@
     $this->rc->output->set_env('mscolors', jqueryui::get_color_values());
     $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list', 'aria-label' => $this->gettext('roleorganizer'))));
 
-    $view = get_input_value('view', RCUBE_INPUT_GPC);
+    $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
     if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
       $this->rc->output->set_env('view', $view);
 
-    if ($date = get_input_value('date', RCUBE_INPUT_GPC))
+    if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('date', $date);
 
-    if ($msgref = get_input_value('itip', RCUBE_INPUT_GPC))
+    if ($msgref = rcube_utils::get_input_value('itip', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('itip_events', $this->itip_events($msgref));
 
     $this->rc->output->send("calendar.calendar");
@@ -687,34 +687,36 @@
       $this->load_driver();
 
       // compose default alarm preset value
-      $alarm_offset = get_input_value('_alarm_offset', RCUBE_INPUT_POST);
-      $default_alarm = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];
-
-      $birthdays_alarm_offset = get_input_value('_birthdays_alarm_offset', RCUBE_INPUT_POST);
-      $birthdays_alarm_value = $birthdays_alarm_offset[0] . intval(get_input_value('_birthdays_alarm_value', RCUBE_INPUT_POST)) . $birthdays_alarm_offset[1];
+      $alarm_offset  = rcube_utils::get_input_value('_alarm_offset', rcube_utils::INPUT_POST);
+      $alarm_value   = rcube_utils::get_input_value('_alarm_value', rcube_utils::INPUT_POST);
+      $default_alarm = $alarm_offset[0] . intval($alarm_value) . $alarm_offset[1];
+
+      $birthdays_alarm_offset = rcube_utils::get_input_value('_birthdays_alarm_offset', rcube_utils::INPUT_POST);
+      $birthdays_alarm_value  = rcube_utils::get_input_value('_birthdays_alarm_value', rcube_utils::INPUT_POST);
+      $birthdays_alarm_value  = $birthdays_alarm_offset[0] . intval($birthdays_alarm_value) . $birthdays_alarm_offset[1];
 
       $p['prefs'] = array(
-        'calendar_default_view' => get_input_value('_default_view', RCUBE_INPUT_POST),
-        'calendar_timeslots'    => intval(get_input_value('_timeslots', RCUBE_INPUT_POST)),
-        'calendar_first_day'    => intval(get_input_value('_first_day', RCUBE_INPUT_POST)),
-        'calendar_first_hour'   => intval(get_input_value('_first_hour', RCUBE_INPUT_POST)),
-        'calendar_work_start'   => intval(get_input_value('_work_start', RCUBE_INPUT_POST)),
-        'calendar_work_end'     => intval(get_input_value('_work_end', RCUBE_INPUT_POST)),
-        'calendar_event_coloring'       => intval(get_input_value('_event_coloring', RCUBE_INPUT_POST)),
-        'calendar_default_alarm_type'   => get_input_value('_alarm_type', RCUBE_INPUT_POST),
+        'calendar_default_view' => rcube_utils::get_input_value('_default_view', rcube_utils::INPUT_POST),
+        'calendar_timeslots'    => intval(rcube_utils::get_input_value('_timeslots', rcube_utils::INPUT_POST)),
+        'calendar_first_day'    => intval(rcube_utils::get_input_value('_first_day', rcube_utils::INPUT_POST)),
+        'calendar_first_hour'   => intval(rcube_utils::get_input_value('_first_hour', rcube_utils::INPUT_POST)),
+        'calendar_work_start'   => intval(rcube_utils::get_input_value('_work_start', rcube_utils::INPUT_POST)),
+        'calendar_work_end'     => intval(rcube_utils::get_input_value('_work_end', rcube_utils::INPUT_POST)),
+        'calendar_event_coloring'       => intval(rcube_utils::get_input_value('_event_coloring', rcube_utils::INPUT_POST)),
+        'calendar_default_alarm_type'   => rcube_utils::get_input_value('_alarm_type', rcube_utils::INPUT_POST),
         'calendar_default_alarm_offset' => $default_alarm,
-        'calendar_default_calendar'     => get_input_value('_default_calendar', RCUBE_INPUT_POST),
+        'calendar_default_calendar'     => rcube_utils::get_input_value('_default_calendar', rcube_utils::INPUT_POST),
         'calendar_date_format' => null,  // clear previously saved values
         'calendar_time_format' => null,
-        'calendar_contact_birthdays'    => get_input_value('_contact_birthdays', RCUBE_INPUT_POST) ? true : false,
-        'calendar_birthday_adressbooks' => (array)get_input_value('_birthday_adressbooks', RCUBE_INPUT_POST),
-        'calendar_birthdays_alarm_type'   => get_input_value('_birthdays_alarm_type', RCUBE_INPUT_POST),
+        'calendar_contact_birthdays'    => rcube_utils::get_input_value('_contact_birthdays', rcube_utils::INPUT_POST) ? true : false,
+        'calendar_birthday_adressbooks' => (array) rcube_utils::get_input_value('_birthday_adressbooks', rcube_utils::INPUT_POST),
+        'calendar_birthdays_alarm_type'   => rcube_utils::get_input_value('_birthdays_alarm_type', rcube_utils::INPUT_POST),
         'calendar_birthdays_alarm_offset' => $birthdays_alarm_value ?: null,
-        'calendar_itip_after_action'      => intval(get_input_value('_after_action', RCUBE_INPUT_POST)),
+        'calendar_itip_after_action'      => intval(rcube_utils::get_input_value('_after_action', rcube_utils::INPUT_POST)),
       );
 
       if ($p['prefs']['calendar_itip_after_action'] == 4) {
-        $p['prefs']['calendar_itip_after_action'] = get_input_value('_after_action_folder', RCUBE_INPUT_POST, true);
+        $p['prefs']['calendar_itip_after_action'] = rcube_utils::get_input_value('_after_action_folder', rcube_utils::INPUT_POST, true);
       }
 
       // categories
@@ -724,8 +726,8 @@
           $old_categories[md5($name)] = $name;
         }
 
-        $categories = (array) get_input_value('_categories', RCUBE_INPUT_POST);
-        $colors     = (array) get_input_value('_colors', RCUBE_INPUT_POST);
+        $categories = (array) rcube_utils::get_input_value('_categories', rcube_utils::INPUT_POST);
+        $colors     = (array) rcube_utils::get_input_value('_colors', rcube_utils::INPUT_POST);
 
         foreach ($categories as $key => $name) {
           $color = preg_replace('/^#/', '', strval($colors[$key]));
@@ -758,8 +760,8 @@
    */
   function calendar_action()
   {
-    $action = get_input_value('action', RCUBE_INPUT_GPC);
-    $cal = get_input_value('c', RCUBE_INPUT_GPC);
+    $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
+    $cal    = rcube_utils::get_input_value('c', rcube_utils::INPUT_GPC);
     $success = $reload = false;
 
     if (isset($cal['showalarms']))
@@ -787,9 +789,12 @@
           $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
         return;
       case "search":
-        $results = array();
+        $results    = array();
         $color_mode = $this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring']);
-        foreach ((array)$this->driver->search_calendars(get_input_value('q', RCUBE_INPUT_GPC), get_input_value('source', RCUBE_INPUT_GPC)) as $id => $prop) {
+        $query      = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+        $source     = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+
+        foreach ((array) $this->driver->search_calendars($query, $source) as $id => $prop) {
           $editname = $prop['editname'];
           unset($prop['editname']);  // force full name to be displayed
           $prop['active'] = false;
@@ -808,7 +813,7 @@
         if ($this->driver->search_more_results)
           $this->rc->output->show_message('autocompletemore', 'info');
 
-        $this->rc->output->command('multi_thread_http_response', $results, get_input_value('_reqid', RCUBE_INPUT_GPC));
+        $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
         return;
     }
     
@@ -831,8 +836,8 @@
    */
   function event_action()
   {
-    $action = get_input_value('action', RCUBE_INPUT_GPC);
-    $event  = get_input_value('e', RCUBE_INPUT_POST, true);
+    $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
+    $event  = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
     $success = $reload = $got_msg = false;
     
     // don't notify if modifying a recurring instance (really?)
@@ -945,18 +950,21 @@
         break;
 
       case "rsvp":
-        $itip_sending = $this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
-        $status = get_input_value('status', RCUBE_INPUT_GPC);
+        $itip_sending  = $this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
+        $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC);
         $reply_comment = $event['comment'];
+
         $ev = $this->driver->get_event($event);
         $ev['attendees'] = $event['attendees'];
         $event = $ev;
 
         if ($success = $this->driver->edit_rsvp($event, $status)) {
-          $noreply = intval(get_input_value('noreply', RCUBE_INPUT_GPC)) || $status == 'needs-action' || $itip_sending === 0;
-          $reload = $event['calendar'] != $ev['calendar'] ? 2 : 1;
+          $noreply = rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC);
+          $noreply = intval($noreply) || $status == 'needs-action' || $itip_sending === 0;
+          $reload  = $event['calendar'] != $ev['calendar'] ? 2 : 1;
           $organizer = null;
           $emails = $this->get_user_emails();
+
           foreach ($event['attendees'] as $i => $attendee) {
             if ($attendee['role'] == 'ORGANIZER') {
               $organizer = $attendee;
@@ -1121,10 +1129,10 @@
   function load_events()
   {
     $events = $this->driver->load_events(
-      get_input_value('start', RCUBE_INPUT_GET),
-      get_input_value('end', RCUBE_INPUT_GET),
-      ($query = get_input_value('q', RCUBE_INPUT_GET)),
-      get_input_value('source', RCUBE_INPUT_GET)
+      rcube_utils::get_input_value('start', rcube_utils::INPUT_GET),
+      rcube_utils::get_input_value('end', rcube_utils::INPUT_GET),
+      ($query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET)),
+      rcube_utils::get_input_value('source', rcube_utils::INPUT_GET)
     );
     echo $this->encode($events, !empty($query));
     exit;
@@ -1181,9 +1189,9 @@
 
     foreach ($this->driver->list_calendars(true) as $cal) {
       $events = $this->driver->load_events(
-        get_input_value('start', RCUBE_INPUT_GPC),
-        get_input_value('end', RCUBE_INPUT_GPC),
-        get_input_value('q', RCUBE_INPUT_GPC),
+        rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC),
+        rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC),
+        rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC),
         $cal['id'],
         1,
         $attr['last']
@@ -1289,7 +1297,7 @@
     $err = $_FILES['_data']['error'];
 
     if (!$err && $_FILES['_data']['tmp_name']) {
-      $calendar = get_input_value('calendar', RCUBE_INPUT_GPC);
+      $calendar   = rcube_utils::get_input_value('calendar', rcube_utils::INPUT_GPC);
       $rangestart = $_REQUEST['_range'] ? date_create("now -" . intval($_REQUEST['_range']) . " months") : 0;
 
       // extract zip file
@@ -1399,8 +1407,9 @@
    */
   function export_events($terminate = true)
   {
-    $start = get_input_value('start', RCUBE_INPUT_GET);
-    $end = get_input_value('end', RCUBE_INPUT_GET);
+    $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
+    $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET);
+
     if (!isset($start))
       $start = 'today -1 year';
     if (!is_numeric($start))
@@ -1410,9 +1419,9 @@
     if (!is_numeric($end))
       $end = strtotime($end . ' 23:59:59');
 
-    $event_id = get_input_value('id', RCUBE_INPUT_GET);
-    $attachments = get_input_value('attachments', RCUBE_INPUT_GET);
-    $calid = $filename = get_input_value('source', RCUBE_INPUT_GET);
+    $event_id    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GET);
+    $attachments = rcube_utils::get_input_value('attachments', rcube_utils::INPUT_GET);
+    $calid = $filename = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
 
     $calendars = $this->driver->list_calendars();
     $events = array();
@@ -1473,7 +1482,7 @@
 
     // decode calendar feed hash
     $format = 'ics';
-    $calhash = get_input_value('_cal', RCUBE_INPUT_GET);
+    $calhash = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GET);
     if (preg_match(($suff_regex = '/\.([a-z0-9]{3,5})$/i'), $calhash, $m)) {
       $format = strtolower($m[1]);
       $calhash = preg_replace($suff_regex, '', $calhash);
@@ -1693,9 +1702,9 @@
         return $this->lib->attachment_loading_page();
     }
 
-    $event_id = get_input_value('_event', RCUBE_INPUT_GPC);
-    $calendar = get_input_value('_cal', RCUBE_INPUT_GPC);
-    $id       = get_input_value('_id', RCUBE_INPUT_GPC);
+    $event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC);
+    $calendar = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GPC);
+    $id       = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
 
     $event = array('id' => $event_id, 'calendar' => $calendar);
     $attachment = $this->driver->get_attachment($id, $event);
@@ -1888,10 +1897,10 @@
    */
   public function freebusy_status()
   {
-    $email = get_input_value('email', RCUBE_INPUT_GPC);
-    $start = get_input_value('start', RCUBE_INPUT_GPC);
-    $end = get_input_value('end', RCUBE_INPUT_GPC);
-    
+    $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
+    $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC);
+    $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC);
+
     // convert dates into unix timestamps
     if (!empty($start) && !is_numeric($start)) {
       $dts = new DateTime($start, $this->timezone);
@@ -1935,10 +1944,10 @@
    */
   public function freebusy_times()
   {
-    $email = get_input_value('email', RCUBE_INPUT_GPC);
-    $start = get_input_value('start', RCUBE_INPUT_GPC);
-    $end = get_input_value('end', RCUBE_INPUT_GPC);
-    $interval = intval(get_input_value('interval', RCUBE_INPUT_GPC));
+    $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
+    $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC);
+    $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC);
+    $interval  = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC));
     $strformat = $interval > 60 ? 'Ymd' : 'YmdHis';
 
     // convert dates into unix timestamps
@@ -2012,34 +2021,34 @@
     ));
     exit;
   }
-  
+
   /**
    * Handler for printing calendars
    */
   public function print_view()
   {
     $title = $this->gettext('print');
-    
-    $view = get_input_value('view', RCUBE_INPUT_GPC);
+
+    $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
     if (!in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
       $view = 'agendaDay';
-    
+
     $this->rc->output->set_env('view',$view);
-    
-    if ($date = get_input_value('date', RCUBE_INPUT_GPC))
+
+    if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('date', $date);
 
-    if ($range = get_input_value('range', RCUBE_INPUT_GPC))
+    if ($range = rcube_utils::get_input_value('range', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('listRange', intval($range));
 
     if (isset($_REQUEST['sections']))
-      $this->rc->output->set_env('listSections', get_input_value('sections', RCUBE_INPUT_GPC));
-    
-    if ($search = get_input_value('search', RCUBE_INPUT_GPC)) {
+      $this->rc->output->set_env('listSections', rcube_utils::get_input_value('sections', rcube_utils::INPUT_GPC));
+
+    if ($search = rcube_utils::get_input_value('search', rcube_utils::INPUT_GPC)) {
       $this->rc->output->set_env('search', $search);
       $title .= ' "' . $search . '"';
     }
-    
+
     // Add CSS stylesheets to the page header
     $skin_path = $this->local_skin_path();
     $this->include_stylesheet($skin_path . '/fullcalendar.css');
@@ -2192,8 +2201,8 @@
     if ($directory = $this->resources_directory()) {
       $events = $directory->get_resource_calendar(
         rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC),
-        rcube_utils::get_input_value('start', RCUBE_INPUT_GET),
-        rcube_utils::get_input_value('end', RCUBE_INPUT_GET));
+        rcube_utils::get_input_value('start', rcube_utils::INPUT_GET),
+        rcube_utils::get_input_value('end', rcube_utils::INPUT_GET));
     }
 
     echo $this->encode($events);
@@ -2208,7 +2217,7 @@
    */
   function event_itip_status()
   {
-    $data = get_input_value('data', RCUBE_INPUT_POST, true);
+    $data = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
 
     // find local copy of the referenced event
     $this->load_driver();
@@ -2282,12 +2291,13 @@
   function event_itip_remove()
   {
     $success = false;
+    $uid     = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
 
     // search for event if only UID is given
-    if ($event = $this->driver->get_event(array('uid' => get_input_value('uid', RCUBE_INPUT_POST)), true)) {
+    if ($event = $this->driver->get_event(array('uid' => $uid), true)) {
       $success = $this->driver->remove_event($event, true);
     }
-    
+
     if ($success) {
       $this->rc->output->show_message('calendar.successremoval', 'confirmation');
     }
@@ -2308,9 +2318,9 @@
       $this->rc->output->set_env('refresh_interval', 0);
       $this->rc->output->set_pagetitle($this->gettext('calendar'));
 
-      $itip = $this->load_itip();
-      $token = get_input_value('_t', RCUBE_INPUT_GPC);
-      
+      $itip  = $this->load_itip();
+      $token = rcube_utils::get_input_value('_t', rcube_utils::INPUT_GPC);
+
       // read event info stored under the given token
       if ($invitation = $itip->get_invitation($token)) {
         $this->token = $token;
@@ -2502,12 +2512,13 @@
   {
     $itip_sending = $this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
 
-    $uid     = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox    = get_input_value('_mbox', RCUBE_INPUT_POST);
-    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
-    $status  = get_input_value('_status', RCUBE_INPUT_POST);
-    $delete  = intval(get_input_value('_del', RCUBE_INPUT_POST));
-    $noreply = intval(get_input_value('_noreply', RCUBE_INPUT_POST)) || $status == 'needs-action' || $itip_sending === 0;
+    $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+    $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+    $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
+    $status  = rcube_utils::get_input_value('_status', rcube_utils::INPUT_POST);
+    $delete  = intval(rcube_utils::get_input_value('_del', rcube_utils::INPUT_POST));
+    $noreply = intval(rcube_utils::get_input_value('_noreply', rcube_utils::INPUT_POST));
+    $noreply = $noreply || $status == 'needs-action' || $itip_sending === 0;
 
     $error_msg = $this->gettext('errorimportingevent');
     $success = false;
@@ -2515,7 +2526,7 @@
     // successfully parsed events?
     if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
       // find writeable calendar to store event
-      $cal_id = !empty($_REQUEST['_folder']) ? get_input_value('_folder', RCUBE_INPUT_POST) : null;
+      $cal_id = !empty($_REQUEST['_folder']) ? rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST) : null;
       $dontsave = ($_REQUEST['_folder'] === '' && $event['_method'] == 'REQUEST');
       $calendars = $this->driver->list_calendars(false, true);
       $calendar = $calendars[$cal_id];
@@ -2681,7 +2692,7 @@
 
     // send iTip reply
     if ($event['_method'] == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) {
-      $event['comment'] = get_input_value('_comment', RCUBE_INPUT_POST);
+      $event['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
       $itip = $this->load_itip();
       $itip->set_sender_email($reply_sender);
       if ($itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
@@ -2699,12 +2710,12 @@
    */
   function mail_itip_decline_reply()
   {
-    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
+    $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+    $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+    $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
 
     if (($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) && $event['_method'] == 'REPLY') {
-      $event['comment'] = get_input_value('_comment', RCUBE_INPUT_POST);
+      $event['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
 
       foreach ($event['attendees'] as $_attendee) {
         if ($_attendee['role'] != 'ORGANIZER') {
@@ -2729,9 +2740,9 @@
    */
   public function mail_import_attachment()
   {
-    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
+    $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+    $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+    $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
     $charset = RCMAIL_CHARSET;
 
     // establish imap connection
@@ -2752,7 +2763,7 @@
     $success = $existing = 0;
     if (!empty($events)) {
       // find writeable calendar to store event
-      $cal_id = !empty($_REQUEST['_calendar']) ? get_input_value('_calendar', RCUBE_INPUT_POST) : null;
+      $cal_id = !empty($_REQUEST['_calendar']) ? rcube_utils::get_input_value('_calendar', rcube_utils::INPUT_POST) : null;
       $calendars = $this->driver->list_calendars(false, true);
 
       foreach ($events as $event) {
@@ -2790,10 +2801,10 @@
    */
   public function mail_message2event()
   {
-    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+    $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+    $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
     $event = array();
-    
+
     // establish imap connection
     $imap = $this->rc->get_storage();
     $imap->set_mailbox($mbox);

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/calendar_ui.js Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/config.inc.php.dist Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/SQL/mysql.initial.sql Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/kolab_user_calendar.php Changed

@@ -211,17 +211,16 @@
 
     // aggregate all calendar folders the user shares (but are not subscribed)
     foreach (kolab_storage::list_user_folders($this->userdata, 'event', false) as $foldername) {
-      if (!empty($_REQUEST['_quickview']) || !kolab_storage::folder_is_active($foldername)) {
-        $cal = new kolab_calendar($foldername, $this->cal);
-        foreach ($cal->list_events($start, $end, $search, 1) as $event) {
-          $this->events[$event['id']] = $event;
-          $this->timeindex[$this->time_key($event)] = $event['id'];
-        }
+      $cal = new kolab_calendar($foldername, $this->cal);
+      foreach ($cal->list_events($start, $end, $search, 1) as $event) {
+        $this->events[$event['id']] = $event;
+        $this->timeindex[$this->time_key($event)] = $event['id'];
       }
     }
 
     // get events from the user's free/busy feed (for quickview only)
-    if (!empty($_REQUEST['_quickview']) && empty($search)) {
+    $fbview = $this->cal->rc->config->get('calendar_include_freebusy_data', 1);
+    if ($fbview && ($fbview == 1 || !empty($_REQUEST['_quickview'])) && empty($search)) {
       $this->fetch_freebusy($limit_changed);
     }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/calendar.css Changed

@@ -1763,9 +1763,9 @@
 
 .fc-event-hori.fc-type-freebusy,
 .fc-event-vert.fc-type-freebusy {
-	opacity: 0.55;
+	opacity: 0.60;
+/*
 	color: #fff !important;
-
 	background: rgba(80,80,80,0.85) !important;
 	background: -moz-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.9) 100%) !important;
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(80,80,80,0.85)), color-stop(100%,rgba(48,48,48,0.9))) !important;
@@ -1773,14 +1773,13 @@
 	background: -o-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	background: -ms-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	background: linear-gradient(to bottom, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
-
+	border-color: #444 !important;
+	cursor: default !important;
+*/
 	-moz-box-shadow: inset 0px 1px 0 0px #888;
 	-webkit-box-shadow: inset 0px 1px 0 0px #888;
 	-o-box-shadow: inset 0px 1px 0 0px #888;
 	box-shadow: inset 0px 1px 0 0px #888;
-
-	border-color: #444 !important;
-	cursor: default !important;
 }
 
 .fc-event-row.fc-type-freebusy td {
@@ -1791,10 +1790,12 @@
 .fc-event-hori.fc-type-freebusy .fc-event-inner,
 .fc-event-vert.fc-type-freebusy .fc-event-skin,
 .fc-event-vert.fc-type-freebusy .fc-event-inner {
+/*
 	background-color: transparent !important;
 	border-color: #444 !important;
 	color: #fff !important;
 	text-shadow: 0 1px 1px #000;
+*/
 }
 
 .fc-event-hori.fc-type-freebusy .fc-event-title,

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/attendee-status.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/badge_cancelled.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/badge_confidential.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/badge_private.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/calendar.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/calendars.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/eventicons.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/focusview.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/freebusy-colors.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/ical-attachment.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/invitation.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/sendinvitation.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/toolbar.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/kolab_activesync.php Changed

@@ -123,15 +123,15 @@
      */
     public function json_command()
     {
-        $cmd  = get_input_value('cmd', RCUBE_INPUT_POST);
-        $imei = get_input_value('id', RCUBE_INPUT_POST);
+        $cmd  = rcube_utils::get_input_value('cmd', rcube_utils::INPUT_POST);
+        $imei = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
 
         switch ($cmd) {
         case 'save':
             $devices       = $this->list_devices();
             $device        = $devices[$imei];
-            $subscriptions = (array) get_input_value('subscribed', RCUBE_INPUT_POST);
-            $devicealias   = get_input_value('devicealias', RCUBE_INPUT_POST, true);
+            $subscriptions = (array) rcube_utils::get_input_value('subscribed', rcube_utils::INPUT_POST);
+            $devicealias   = rcube_utils::get_input_value('devicealias', rcube_utils::INPUT_POST, true);
             $device['ALIAS'] = $devicealias;
 
             $err = !$this->device_update($device, $imei);
@@ -173,8 +173,8 @@
             break;
 
         case 'update':
-            $subscription = (int) get_input_value('flag', RCUBE_INPUT_POST);
-            $folder       = get_input_value('folder', RCUBE_INPUT_POST);
+            $subscription = (int) rcube_utils::get_input_value('flag', rcube_utils::INPUT_POST);
+            $folder       = rcube_utils::get_input_value('folder', rcube_utils::INPUT_POST);
 
             $err = !$this->folder_set($folder, $imei, $subscription);
 
@@ -233,7 +233,7 @@
         $this->register_handler('plugin.deviceconfigform', array($this->ui, 'device_config_form'));
         $this->register_handler('plugin.foldersubscriptions', array($this->ui, 'folder_subscriptions'));
 
-        $imei    = get_input_value('_id', RCUBE_INPUT_GPC);
+        $imei    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $devices = $this->list_devices();
 
         if ($device = $devices[$imei]) {

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php Changed

@@ -239,7 +239,7 @@
      */
     protected function addressbook_list_item($id, $source, &$jsdata, $search_mode = false)
     {
-        $folder = $this->folders[$id];
+        $folder  = $this->folders[$id];
         $current = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
 
         if (!$source['virtual']) {
@@ -564,7 +564,7 @@
         $key           = 'kolab_addressbook_prio';
 
         if (!in_array('kolab_addressbook_prio', $dont_override) || !isset($_POST['_'.$key])) {
-            $args['prefs'][$key] = (int) get_input_value('_'.$key, RCUBE_INPUT_POST);
+            $args['prefs'][$key] = (int) rcube_utils::get_input_value('_'.$key, rcube_utils::INPUT_POST);
         }
 
         return $args;
@@ -576,7 +576,7 @@
      */
     public function book_actions()
     {
-        $action = trim(get_input_value('_act', RCUBE_INPUT_GPC));
+        $action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));
 
         if ($action == 'create') {
             $this->ui->book_edit();
@@ -596,9 +596,9 @@
     public function book_save()
     {
         $prop = array(
-            'name'    => trim(get_input_value('_name', RCUBE_INPUT_POST)),
-            'oldname' => trim(get_input_value('_oldname', RCUBE_INPUT_POST, true)), // UTF7-IMAP
-            'parent'  => trim(get_input_value('_parent', RCUBE_INPUT_POST, true)), // UTF7-IMAP
+            'name'    => trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST)),
+            'oldname' => trim(rcube_utils::get_input_value('_oldname', rcube_utils::INPUT_POST, true)), // UTF7-IMAP
+            'parent'  => trim(rcube_utils::get_input_value('_parent', rcube_utils::INPUT_POST, true)), // UTF7-IMAP
             'type'    => 'contact',
             'subscribed' => true,
         );
@@ -649,14 +649,14 @@
     public function book_search()
     {
         $results = array();
-        $query = rcube_utils::get_input_value('q', RCUBE_INPUT_GPC);
-        $source = rcube_utils::get_input_value('source', RCUBE_INPUT_GPC);
+        $query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
 
         kolab_storage::$encode_ids = true;
         $search_more_results = false;
         $this->sources = array();
         $this->folders = array();
-    
+
         // find unsubscribed IMAP folders that have "event" type
         if ($source == 'folders') {
             foreach ((array)kolab_storage::search_folders('contact', $query, array('other')) as $folder) {
@@ -728,7 +728,7 @@
             $this->rc->output->show_message('autocompletemore', 'info');
         }
 
-        $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', RCUBE_INPUT_GPC));
+        $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
     }
 
     /**
@@ -737,7 +737,7 @@
     public function book_subscribe()
     {
         $success = false;
-        $id = rcube_utils::get_input_value('_source', RCUBE_INPUT_GPC);
+        $id = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
 
         if ($id && ($folder = kolab_storage::get_folder(kolab_storage::id_decode($id)))) {
             if (isset($_POST['_permanent']))
@@ -773,7 +773,7 @@
      */
     private function book_delete()
     {
-        $folder = trim(get_input_value('_source', RCUBE_INPUT_GPC, true, 'UTF7-IMAP'));
+        $folder = trim(rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC, true, 'UTF7-IMAP'));
 
         if (kolab_storage::folder_delete($folder)) {
             $storage = $this->rc->get_storage();

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php Changed

@@ -133,8 +133,8 @@
      */
     public function book_form($attrib)
     {
-        $action = trim(get_input_value('_act', RCUBE_INPUT_GPC));
-        $folder = trim(get_input_value('_source', RCUBE_INPUT_GPC, true)); // UTF8
+        $action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));
+        $folder = trim(rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC, true)); // UTF8
 
         $hidden_fields[] = array('name' => '_source', 'value' => $folder);
 
@@ -144,9 +144,9 @@
 
         if ($this->rc->action == 'plugin.book-save') {
             // save error
-            $name      = trim(get_input_value('_name', RCUBE_INPUT_GPC, true)); // UTF8
-            $old       = trim(get_input_value('_oldname', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
-            $path_imap = trim(get_input_value('_parent', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
+            $name      = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_GPC, true)); // UTF8
+            $old       = trim(rcube_utils::get_input_value('_oldname', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
+            $path_imap = trim(rcube_utils::get_input_value('_parent', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
 
             $hidden_fields[] = array('name' => '_oldname', 'value' => $old);

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/kolab_delegation.php Changed

@@ -327,8 +327,8 @@
 
         // Delegate delete
         if ($this->rc->action == 'plugin.delegation-delete') {
-            $id      = get_input_value('id', RCUBE_INPUT_GPC);
-            $success = $engine->delegate_delete($id, (bool) get_input_value('acl', RCUBE_INPUT_GPC));
+            $id      = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
+            $success = $engine->delegate_delete($id, (bool) rcube_utils::get_input_value('acl', rcube_utils::INPUT_GPC));
 
             if ($success) {
                 $this->rc->output->show_message($this->gettext('deletesuccess'), 'confirmation');
@@ -340,8 +340,8 @@
         }
         // Delegate add/update
         else if ($this->rc->action == 'plugin.delegation-save') {
-            $id  = get_input_value('id', RCUBE_INPUT_GPC);
-            $acl = get_input_value('folders', RCUBE_INPUT_GPC);
+            $id  = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
+            $acl = rcube_utils::get_input_value('folders', rcube_utils::INPUT_GPC);
 
             // update
             if ($id) {
@@ -358,7 +358,7 @@
             }
             // new
             else {
-                $login    = get_input_value('newid', RCUBE_INPUT_GPC);
+                $login    = rcube_utils::get_input_value('newid', rcube_utils::INPUT_GPC);
                 $delegate = $engine->delegate_get_by_name($login);
                 $success  = $engine->delegate_add($delegate, $acl);
 
@@ -376,8 +376,8 @@
         }
         // Delegate autocompletion
         else if ($this->rc->action == 'plugin.delegation-autocomplete') {
-            $search = get_input_value('_search', RCUBE_INPUT_GPC, true);
-            $reqid  = get_input_value('_reqid', RCUBE_INPUT_GPC);
+            $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+            $reqid  = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
             $users  = $engine->list_users($search);
 
             $this->rc->output->command('ksearch_query_results', $users, $search, $reqid);
@@ -418,7 +418,7 @@
     {
         $engine   = $this->engine();
         $table    = new html_table(array('cols' => 2));
-        $id       = get_input_value('_id', RCUBE_INPUT_GPC);
+        $id       = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $field_id = 'delegate';
 
         if ($id) {
@@ -457,7 +457,7 @@
         }
 
         $engine = $this->engine();
-        $id     = get_input_value('_id', RCUBE_INPUT_GPC);
+        $id     = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
 
         if ($id) {
             $delegate = $engine->delegate_get($id);

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/larry/delegation.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/larry/foldertypes.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/larry/read.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/larry/write.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/skins/larry/images/buttons.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/skins/larry/images/folders.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/skins/larry/images/unknown.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/kolab_folders.php Changed

@@ -212,8 +212,8 @@
         $mbox = strlen($args['name']) ? $args['name'] : $args['parent_name'];
 
         if (isset($_POST['_ctype'])) {
-            $new_ctype   = trim(get_input_value('_ctype', RCUBE_INPUT_POST));
-            $new_subtype = trim(get_input_value('_subtype', RCUBE_INPUT_POST));
+            $new_ctype   = trim(rcube_utils::get_input_value('_ctype', rcube_utils::INPUT_POST));
+            $new_subtype = trim(rcube_utils::get_input_value('_subtype', rcube_utils::INPUT_POST));
         }
 
         // Get type of the folder or the parent
@@ -301,8 +301,8 @@
         }
 
         // Folder create/update with form
-        $ctype     = trim(get_input_value('_ctype', RCUBE_INPUT_POST));
-        $subtype   = trim(get_input_value('_subtype', RCUBE_INPUT_POST));
+        $ctype     = trim(rcube_utils::get_input_value('_ctype', rcube_utils::INPUT_POST));
+        $subtype   = trim(rcube_utils::get_input_value('_subtype', rcube_utils::INPUT_POST));
         $mbox      = $args['record']['name'];
         $old_mbox  = $args['record']['oldname'];
         $subscribe = $args['record']['subscribe'];
@@ -540,8 +540,7 @@
 
         // get configured defaults
         foreach ($this->types as $type) {
-            $subtypes = $type == 'mail' ? $this->mail_types : array('default');
-            foreach ($subtypes as $subtype) {
+            foreach ((array)$this->subtypes[$type] as $subtype) {
                 $opt_name = 'kolab_folders_' . $type . '_' . $subtype;
                 if ($folder = $this->rc->config->get($opt_name)) {
                     // convert configuration value to UTF7-IMAP charset

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/kolab_notes.php Changed

@@ -387,7 +387,7 @@
     public function dialog_view()
     {
         // resolve message reference
-        if ($msgref = rcube_utils::get_input_value('_msg', RCUBE_INPUT_GPC, true)) {
+        if ($msgref = rcube_utils::get_input_value('_msg', rcube_utils::INPUT_GPC, true)) {
             $storage = $this->rc->get_storage();
             list($uid, $folder) = explode('-', $msgref, 2);
             if ($message = $storage->get_message_headers($msgref)) {
@@ -408,8 +408,8 @@
      */
     public function notes_fetch()
     {
-        $search = rcube_utils::get_input_value('_q', RCUBE_INPUT_GPC, true);
-        $list   = rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC);
+        $search = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GPC, true);
+        $list   = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC);
 
         $data = $this->notes_data($this->list_notes($list, $search), $tags);
 
@@ -492,8 +492,8 @@
     public function note_record()
     {
         $data = $this->get_note(array(
-            'uid'  => rcube_utils::get_input_value('_id', RCUBE_INPUT_GPC),
-            'list' => rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC),
+            'uid'  => rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC),
+            'list' => rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC),
         ));
 
         // encode for client use
@@ -586,8 +586,8 @@
      */
     public function note_action()
     {
-        $action = rcube_utils::get_input_value('_do', RCUBE_INPUT_POST);
-        $note   = rcube_utils::get_input_value('_data', RCUBE_INPUT_POST, true);
+        $action = rcube_utils::get_input_value('_do', rcube_utils::INPUT_POST);
+        $note   = rcube_utils::get_input_value('_data', rcube_utils::INPUT_POST, true);
 
         $success = false;
         switch ($action) {
@@ -759,12 +759,12 @@
      */
     public function list_action()
     {
-        $action  = rcube_utils::get_input_value('_do', RCUBE_INPUT_GPC);
-        $list    = rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC, true);
+        $action  = rcube_utils::get_input_value('_do', rcube_utils::INPUT_GPC);
+        $list    = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC, true);
         $success = $update_cmd = false;
 
         if (empty($action)) {
-            $action = rcube_utils::get_input_value('action', RCUBE_INPUT_GPC);
+            $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
         }
 
         switch ($action) {
@@ -828,7 +828,7 @@
             case 'search':
                 $this->load_ui();
                 $results = array();
-                foreach ((array)$this->search_lists(rcube_utils::get_input_value('q', RCUBE_INPUT_GPC), rcube_utils::get_input_value('source', RCUBE_INPUT_GPC)) as $id => $prop) {
+                foreach ((array)$this->search_lists(rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC), rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC)) as $id => $prop) {
                     $editname = $prop['editname'];
                     unset($prop['editname']);  // force full name to be displayed
 
@@ -845,7 +845,7 @@
                     $this->rc->output->show_message('autocompletemore', 'info');
                 }
 
-                $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', RCUBE_INPUT_GPC));
+                $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
                 return;
 
             case 'subscribe':

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/kolab_notes_ui.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/sprites.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins/larry/images/icons.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_zpush/kolab_zpush.php Changed

@@ -90,8 +90,8 @@
     public function json_command()
     {
         $storage = $this->rc->get_storage();
-        $cmd     = get_input_value('cmd', RCUBE_INPUT_GPC);
-        $imei    = get_input_value('id', RCUBE_INPUT_GPC);
+        $cmd     = rcube_utils::get_input_value('cmd', rcube_utils::INPUT_GPC);
+        $imei    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
 
         switch ($cmd) {
         case 'load':
@@ -117,12 +117,12 @@
             break;
 
         case 'save':
+            $syncmode     = intval(rcube_utils::get_input_value('syncmode', rcube_utils::INPUT_POST));
+            $laxpic       = intval(rcube_utils::get_input_value('laxpic', rcube_utils::INPUT_POST));
+            $devicealias  = rcube_utils::get_input_value('devicealias', rcube_utils::INPUT_POST, true);
+            $subsciptions = rcube_utils::get_input_value('subscribed', rcube_utils::INPUT_POST);
             $devices = $this->list_devices();
-            $syncmode = intval(get_input_value('syncmode', RCUBE_INPUT_POST));
-            $devicealias = get_input_value('devicealias', RCUBE_INPUT_POST, true);
-            $laxpic = intval(get_input_value('laxpic', RCUBE_INPUT_POST));
-            $subsciptions = get_input_value('subscribed', RCUBE_INPUT_POST);
-            $err = false;
+            $err     = false;
 
             if ($device = $devices[$imei]) {
                 // update device config if changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/libvcalendar.php Changed

@@ -436,15 +436,17 @@
                 if (!$params['INTERVAL'])
                     $params['INTERVAL'] = 1;
 
-                $event['recurrence'] = $params;
+                $event['recurrence'] = array_filter($params);
                 break;
 
             case 'EXDATE':
-                $event['recurrence']['EXDATE'] = array_merge((array)$event['recurrence']['EXDATE'], self::convert_datetime($prop, true));
+                if (!empty($prop->value))
+                    $event['recurrence']['EXDATE'] = array_merge((array)$event['recurrence']['EXDATE'], self::convert_datetime($prop, true));
                 break;
 
             case 'RDATE':
-                $event['recurrence']['RDATE'] = array_merge((array)$event['recurrence']['RDATE'], self::convert_datetime($prop, true));
+                if (!empty($prop->value))
+                    $event['recurrence']['RDATE'] = array_merge((array)$event['recurrence']['RDATE'], self::convert_datetime($prop, true));
                 break;
 
             case 'RECURRENCE-ID':

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_format.php Changed

@@ -47,6 +47,117 @@
     const KTYPE_PREFIX = 'application/x-vnd.kolab.';
     const PRODUCT_ID   = 'Roundcube-libkolab-1.1';
 
+    // mapping table for valid PHP timezones not supported by libkolabxml
+    // basically the entire list of ftp://ftp.iana.org/tz/data/backward
+    protected static $timezone_map = array(
+        'Africa/Asmera' => 'Africa/Asmara',
+        'Africa/Timbuktu' => 'Africa/Abidjan',
+        'America/Argentina/ComodRivadavia' => 'America/Argentina/Catamarca',
+        'America/Atka' => 'America/Adak',
+        'America/Buenos_Aires' => 'America/Argentina/Buenos_Aires',
+        'America/Catamarca' => 'America/Argentina/Catamarca',
+        'America/Coral_Harbour' => 'America/Atikokan',
+        'America/Cordoba' => 'America/Argentina/Cordoba',
+        'America/Ensenada' => 'America/Tijuana',
+        'America/Fort_Wayne' => 'America/Indiana/Indianapolis',
+        'America/Indianapolis' => 'America/Indiana/Indianapolis',
+        'America/Jujuy' => 'America/Argentina/Jujuy',
+        'America/Knox_IN' => 'America/Indiana/Knox',
+        'America/Louisville' => 'America/Kentucky/Louisville',
+        'America/Mendoza' => 'America/Argentina/Mendoza',
+        'America/Porto_Acre' => 'America/Rio_Branco',
+        'America/Rosario' => 'America/Argentina/Cordoba',
+        'America/Virgin' => 'America/Port_of_Spain',
+        'Asia/Ashkhabad' => 'Asia/Ashgabat',
+        'Asia/Calcutta' => 'Asia/Kolkata',
+        'Asia/Chungking' => 'Asia/Shanghai',
+        'Asia/Dacca' => 'Asia/Dhaka',
+        'Asia/Katmandu' => 'Asia/Kathmandu',
+        'Asia/Macao' => 'Asia/Macau',
+        'Asia/Saigon' => 'Asia/Ho_Chi_Minh',
+        'Asia/Tel_Aviv' => 'Asia/Jerusalem',
+        'Asia/Thimbu' => 'Asia/Thimphu',
+        'Asia/Ujung_Pandang' => 'Asia/Makassar',
+        'Asia/Ulan_Bator' => 'Asia/Ulaanbaatar',
+        'Atlantic/Faeroe' => 'Atlantic/Faroe',
+        'Atlantic/Jan_Mayen' => 'Europe/Oslo',
+        'Australia/ACT' => 'Australia/Sydney',
+        'Australia/Canberra' => 'Australia/Sydney',
+        'Australia/LHI' => 'Australia/Lord_Howe',
+        'Australia/NSW' => 'Australia/Sydney',
+        'Australia/North' => 'Australia/Darwin',
+        'Australia/Queensland' => 'Australia/Brisbane',
+        'Australia/South' => 'Australia/Adelaide',
+        'Australia/Tasmania' => 'Australia/Hobart',
+        'Australia/Victoria' => 'Australia/Melbourne',
+        'Australia/West' => 'Australia/Perth',
+        'Australia/Yancowinna' => 'Australia/Broken_Hill',
+        'Brazil/Acre' => 'America/Rio_Branco',
+        'Brazil/DeNoronha' => 'America/Noronha',
+        'Brazil/East' => 'America/Sao_Paulo',
+        'Brazil/West' => 'America/Manaus',
+        'Canada/Atlantic' => 'America/Halifax',
+        'Canada/Central' => 'America/Winnipeg',
+        'Canada/East-Saskatchewan' => 'America/Regina',
+        'Canada/Eastern' => 'America/Toronto',
+        'Canada/Mountain' => 'America/Edmonton',
+        'Canada/Newfoundland' => 'America/St_Johns',
+        'Canada/Pacific' => 'America/Vancouver',
+        'Canada/Saskatchewan' => 'America/Regina',
+        'Canada/Yukon' => 'America/Whitehorse',
+        'Chile/Continental' => 'America/Santiago',
+        'Chile/EasterIsland' => 'Pacific/Easter',
+        'Cuba' => 'America/Havana',
+        'Egypt' => 'Africa/Cairo',
+        'Eire' => 'Europe/Dublin',
+        'Europe/Belfast' => 'Europe/London',
+        'Europe/Tiraspol' => 'Europe/Chisinau',
+        'GB' => 'Europe/London',
+        'GB-Eire' => 'Europe/London',
+        'Greenwich' => 'Etc/GMT',
+        'Hongkong' => 'Asia/Hong_Kong',
+        'Iceland' => 'Atlantic/Reykjavik',
+        'Iran' => 'Asia/Tehran',
+        'Israel' => 'Asia/Jerusalem',
+        'Jamaica' => 'America/Jamaica',
+        'Japan' => 'Asia/Tokyo',
+        'Kwajalein' => 'Pacific/Kwajalein',
+        'Libya' => 'Africa/Tripoli',
+        'Mexico/BajaNorte' => 'America/Tijuana',
+        'Mexico/BajaSur' => 'America/Mazatlan',
+        'Mexico/General' => 'America/Mexico_City',
+        'NZ' => 'Pacific/Auckland',
+        'NZ-CHAT' => 'Pacific/Chatham',
+        'Navajo' => 'America/Denver',
+        'PRC' => 'Asia/Shanghai',
+        'Pacific/Ponape' => 'Pacific/Pohnpei',
+        'Pacific/Samoa' => 'Pacific/Pago_Pago',
+        'Pacific/Truk' => 'Pacific/Chuuk',
+        'Pacific/Yap' => 'Pacific/Chuuk',
+        'Poland' => 'Europe/Warsaw',
+        'Portugal' => 'Europe/Lisbon',
+        'ROC' => 'Asia/Taipei',
+        'ROK' => 'Asia/Seoul',
+        'Singapore' => 'Asia/Singapore',
+        'Turkey' => 'Europe/Istanbul',
+        'UCT' => 'Etc/UCT',
+        'US/Alaska' => 'America/Anchorage',
+        'US/Aleutian' => 'America/Adak',
+        'US/Arizona' => 'America/Phoenix',
+        'US/Central' => 'America/Chicago',
+        'US/East-Indiana' => 'America/Indiana/Indianapolis',
+        'US/Eastern' => 'America/New_York',
+        'US/Hawaii' => 'Pacific/Honolulu',
+        'US/Indiana-Starke' => 'America/Indiana/Knox',
+        'US/Michigan' => 'America/Detroit',
+        'US/Mountain' => 'America/Denver',
+        'US/Pacific' => 'America/Los_Angeles',
+        'US/Samoa' => 'Pacific/Pago_Pago',
+        'Universal' => 'Etc/UTC',
+        'W-SU' => 'Europe/Moscow',
+        'Zulu' => 'Etc/UTC',
+    );
+
     /**
      * Factory method to instantiate a kolab_format object of the given type and version
      *
@@ -123,10 +234,15 @@
             if (!$dateonly)
                 $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
 
-            if ($tz && in_array($tz->getName(), array('UTC', 'GMT', '+00:00', 'Z')))
+            if ($tz && in_array($tz->getName(), array('UTC', 'GMT', '+00:00', 'Z'))) {
                 $result->setUTC(true);
-            else if ($tz !== false)
-                $result->setTimezone($tz->getName());
+            }
+            else if ($tz !== false) {
+                $tzid = $tz->getName();
+                if (array_key_exists($tzid, self::$timezone_map))
+                    $tzid = self::$timezone_map[$tzid];
+                $result->setTimezone($tzid);
+            }
         }
 
         return $result;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_storage_folder.php Changed

@@ -119,9 +119,12 @@
 
         // generate a folder UID and set it to IMAP
         $uid = rtrim(chunk_split(md5($this->name . $this->get_owner() . uniqid('-', true)), 12, '-'), '-');
-        $this->set_uid($uid);
+        if ($this->set_uid($uid)) {
+            return $uid;
+        }
 
-        return $uid;
+        // create hash from folder name if we can't write the UID metadata
+        return md5($this->name . $this->get_owner());
     }
 
     /**
@@ -796,9 +799,12 @@
      */
     public function move($uid, $target_folder)
     {
+        if (is_string($target_folder))
+            $target_folder = kolab_storage::get_folder($target_folder);
+
         if ($msguid = $this->cache->uid2msguid($uid)) {
             $this->cache->bypass(true);
-            $result = $this->imap->move_message($msguid, $target_folder, $this->name);
+            $result = $this->imap->move_message($msguid, $target_folder->name, $this->name);
             $this->cache->bypass(false);
 
             if ($result) {

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/buttons.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/attendee-status.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/badge_cancelled.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/focusview.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/ical-attachment.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/sendinvitation.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/tasklist.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/sprites.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/tasklist.php Changed

@@ -197,9 +197,9 @@
      */
     public function task_action()
     {
-        $filter = intval(get_input_value('filter', RCUBE_INPUT_GPC));
-        $action = get_input_value('action', RCUBE_INPUT_GPC);
-        $rec    = get_input_value('t', RCUBE_INPUT_POST, true);
+        $filter = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
+        $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
+        $rec    = rcube_utils::get_input_value('t', rcube_utils::INPUT_POST, true);
         $oldrec = $rec;
         $success = $refresh = false;
 
@@ -272,7 +272,7 @@
               break;
 
         case 'delete':
-            $mode  = intval(get_input_value('mode', RCUBE_INPUT_POST));
+            $mode  = intval(rcube_utils::get_input_value('mode', rcube_utils::INPUT_POST));
             $oldrec = $this->driver->get_task($rec);
             if ($success = $this->driver->delete_task($rec, false)) {
                 // delete/modify all childs
@@ -315,7 +315,7 @@
 
         case 'collapse':
             foreach (explode(',', $rec['id']) as $rec_id) {
-                if (intval(get_input_value('collapsed', RCUBE_INPUT_GPC))) {
+                if (intval(rcube_utils::get_input_value('collapsed', rcube_utils::INPUT_GPC))) {
                     $this->collapsed_tasks[] = $rec_id;
                 }
                 else {
@@ -329,13 +329,13 @@
             return;  // avoid further actions
 
         case 'rsvp':
-            $status = get_input_value('status', RCUBE_INPUT_GPC);
+            $status = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC);
             $task = $this->driver->get_task($rec);
             $task['attendees'] = $rec['attendees'];
             $rec = $task;
 
             if ($success = $this->driver->edit_task($rec)) {
-                $noreply = intval(get_input_value('noreply', RCUBE_INPUT_GPC)) || $status == 'needs-action';
+                $noreply = intval(rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC)) || $status == 'needs-action';
 
                 if (!$noreply) {
                     // let the reply clause further down send the iTip message
@@ -377,7 +377,7 @@
                 $status = strtolower($sender['status']);
 
                 if (!empty($_POST['comment']))
-                    $task['comment'] = get_input_value('comment', RCUBE_INPUT_POST);
+                    $task['comment'] = rcube_utils::get_input_value('comment', rcube_utils::INPUT_POST);
 
                 $itip = $this->load_itip();
                 $itip->set_sender_email($sender['email']);
@@ -797,8 +797,8 @@
      */
     public function tasklist_action()
     {
-        $action = get_input_value('action', RCUBE_INPUT_GPC);
-        $list  = get_input_value('l', RCUBE_INPUT_GPC, true);
+        $action  = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
+        $list    = rcube_utils::get_input_value('l', rcube_utils::INPUT_GPC, true);
         $success = false;
 
         if (isset($list['showalarms']))
@@ -845,7 +845,10 @@
         case 'search':
             $this->load_ui();
             $results = array();
-            foreach ((array)$this->driver->search_lists(get_input_value('q', RCUBE_INPUT_GPC), get_input_value('source', RCUBE_INPUT_GPC)) as $id => $prop) {
+            $query   = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+            $source  = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+
+            foreach ((array)$this->driver->search_lists($query, $source) as $id => $prop) {
                 $editname = $prop['editname'];
                 unset($prop['editname']);  // force full name to be displayed
                 $prop['active'] = false;
@@ -863,7 +866,7 @@
                 $this->rc->output->show_message('autocompletemore', 'info');
             }
 
-            $this->rc->output->command('multi_thread_http_response', $results, get_input_value('_reqid', RCUBE_INPUT_GPC));
+            $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
             return;
         }
 
@@ -881,7 +884,7 @@
     public function fetch_counts()
     {
         if (isset($_REQUEST['lists'])) {
-            $lists = get_input_value('lists', RCUBE_INPUT_GPC);
+            $lists = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
         }
         else {
             foreach ($this->driver->get_lists() as $list) {
@@ -909,10 +912,10 @@
      */
     public function fetch_tasks()
     {
-        $f = intval(get_input_value('filter', RCUBE_INPUT_GPC));
-        $search = get_input_value('q', RCUBE_INPUT_GPC);
+        $f = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
+        $search = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+        $lists  = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
         $filter = array('mask' => $f, 'search' => $search);
-        $lists = get_input_value('lists', RCUBE_INPUT_GPC);;
 /*
         // convert magic date filters into a real date range
         switch ($f) {
@@ -1214,10 +1217,10 @@
 
         $filter = array(
             'since'  => $attr['last'],
-            'search' => get_input_value('q', RCUBE_INPUT_GPC),
-            'mask'   => intval(get_input_value('filter', RCUBE_INPUT_GPC)) & self::FILTER_MASK_COMPLETE,
+            'search' => rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC),
+            'mask'   => intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC)) & self::FILTER_MASK_COMPLETE,
         );
-        $lists = get_input_value('lists', RCUBE_INPUT_GPC);;
+        $lists = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);;
 
         $updates = $this->driver->list_tasks($filter, $lists);
         if (!empty($updates)) {
@@ -1286,9 +1289,9 @@
             return $this->lib->attachment_loading_page();
         }
 
-        $task = get_input_value('_t', RCUBE_INPUT_GPC);
-        $list = get_input_value('_list', RCUBE_INPUT_GPC);
-        $id   = get_input_value('_id', RCUBE_INPUT_GPC);
+        $task = rcube_utils::get_input_value('_t', rcube_utils::INPUT_GPC);
+        $list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC);
+        $id   = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
 
         $task = array('id' => $task, 'list' => $list);
         $attachment = $this->driver->get_attachment($id, $task);
@@ -1316,8 +1319,8 @@
 
     public function mail_message2task()
     {
-        $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-        $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
         $task = array();
 
         // establish imap connection

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 78