Request 3195 (accepted)

buildroundcubemailtarball.sh Changed

debian.changelog Changed

roundcubemail-1.5.tar.gz/composer.json Changed

roundcubemail-1.5.tar.gz/composer.lock Changed

roundcubemail-1.5.tar.gz/plugins/calendar/calendar.php Changed

@@ -2331,8 +2331,8 @@
     private function write_preprocess(&$event, $action)
     {
         // Remove double timezone specification (T2313)
-        $event'start' = preg_replace('/\s*$.*$/', '', $event'start');
-        $event'end'   = preg_replace('/\s*$.*$/', '', $event'end');
+        $event'start' = preg_replace('/\s*$.*$/', '', $event'start' ?? '');
+        $event'end'   = preg_replace('/\s*$.*$/', '', $event'end' ?? '');
 
         // convert dates into DateTime objects in user's current timezone
         $event'start'  = new DateTime($event'start', $this->timezone);
@@ -2994,7 +2994,7 @@
                 // TODO: skip events with free_busy == 'free' ?
                 if ($event'uid' == $data'uid'
                     || $event'end' < $day_start || $event'start' > $day_end
-                    || $event'status' == 'CANCELLED'
+                    || (!empty($event'status') && $event'status' == 'CANCELLED')
                     || (!empty($event'className') && strpos($event'className', 'declined') !== false)
                 ) {
                     continue;
@@ -3333,6 +3333,7 @@
         $error_msg = $this->gettext('errorimportingevent');
         $success   = false;
         $deleted   = false;
+        $dontsave  = false;
 
         if ($status == 'delegated') {
             $to = rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true);
@@ -3386,7 +3387,7 @@
                 'uid'       => $event'uid',
                 '_instance' => isset($event'_instance') ? $event'_instance' : null,
                 'changed'   => is_object($event'changed') ? $event'changed'->format('U') : 0,
-                'sequence'  => intval($event'sequence'),
+                'sequence'  => intval($event'sequence' ?? 0),
                 'fallback'  => strtoupper((string) $status),
                 'method'    => $event'_method',
                 'task'      => 'calendar',
@@ -3440,6 +3441,11 @@
                     $existing = null;
                 }
 
+                // Use only free_busy values that make sense in this context (T853612)
+                if (!in_array($event'free_busy' ?? '', 'free', 'busy')) {
+                    unset($event'free_busy');
+                }
+
                 $event_attendee   = null;
                 $update_attendees = ;

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_notes/kolab_notes.php Changed

roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -401,8 +401,8 @@
                 $emails = $this->lib->get_user_emails();
 
                 foreach ($existing'attendees' as $attendee) {
-                    if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
-                        $status = strtoupper($attendee'status');
+                    if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
+                        $status = !empty($attendee'status') ? strtoupper($attendee'status') : '';
                         break;
                     }
                 }
@@ -619,12 +619,12 @@
         $rsvp_buttons = '';
 
         // pass some metadata about the event and trigger the asynchronous status check
-        $changed = is_object($event'changed') ? $event'changed' : $message_date;
+        $changed = !empty($event'changed') && is_object($event'changed') ? $event'changed' : $message_date;
         $metadata = array(
             'uid'      => $event'uid',
             '_instance' => isset($event'_instance') ? $event'_instance' : null,
             'changed'  => $changed ? $changed->format('U') : 0,
-            'sequence' => intval($event'sequence'),
+            'sequence' => intval($event'sequence' ?? 0),
             'method'   => $method,
             'task'     => $task,
             'mime_id'  => $mime_id,
@@ -683,7 +683,7 @@
         // when receiving iTip REQUEST messages:
         else if ($method == 'REQUEST') {
             $emails = $this->lib->get_user_emails();
-            $title = $event'sequence' > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
+            $title = !empty($event'sequence') ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
             $metadata'rsvp' = true;
 
             if (is_object($event'start')) {
@@ -983,17 +983,17 @@
      */
     public static function get_custom_property($event, $name)
     {
-      $ret = false;
+        $ret = false;
 
-      if (is_array($event'x-custom')) {
-          array_walk($event'x-custom', function($prop, $i) use ($name, &$ret) {
-              if (strcasecmp($prop0, $name) === 0) {
-                  $ret = $prop1;
-              }
-          });
-      }
+        if (is_array($event'x-custom')) {
+            array_walk($event'x-custom', function($prop, $i) use ($name, &$ret) {
+                if (strcasecmp($prop0, $name) === 0) {
+                    $ret = $prop1;
+                }
+            });
+        }
 
-      return $ret;
+        return $ret;
     }
 
     /**
@@ -1010,7 +1010,8 @@
     /**
      * Find an attendee that is not the organizer and has an email matching $email_field
      */
-    public function find_attendee_by_email($attendees, $email_field, $email, $email_utf = null) {
+    public function find_attendee_by_email($attendees, $email_field, $email, $email_utf = null)
+    {
         foreach ($attendees as $_attendee) {
             if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
                 continue;
@@ -1019,16 +1020,19 @@
                 return $attendee;
             }
         }
+
         return null;
     }
 
     /**
      * Find the replying attendee in a REPLY
      */
-    public static function find_reply_attendee($event) {
+    public static function find_reply_attendee($event)
+    {
         // remove the organizer
-        $itip_attendees = array_filter($event'attendees', function($item) { return $item'role' != 'ORGANIZER' && !empty($item'email'); });
-        $attendee = null;
+        $itip_attendees = array_filter($event'attendees', function($item) {
+            return (empty($item'role') || $item'role' != 'ORGANIZER') && !empty($item'email');
+        });
 
         // According to rfc there should only be one attendee for a REPLY
         if (count($itip_attendees) == 1) {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_event.php Changed

@@ -62,15 +62,18 @@
         // do the hard work of setting object values
         $this->obj->setStart(self::get_datetime($object'start', null, !empty($object'allday')));
         $this->obj->setEnd(self::get_datetime($object'end', null, !empty($object'allday')));
-        $this->obj->setTransparency($object'free_busy' == 'free');
+        $this->obj->setTransparency(!empty($object'free_busy') && $object'free_busy' == 'free');
 
         $status = kolabformat::StatusUndefined;
-        if ($object'free_busy' == 'tentative')
+        if (!empty($object'free_busy') && $object'free_busy' == 'tentative') {
             $status = kolabformat::StatusTentative;
-        if (!empty($object'cancelled'))
+        }
+        if (!empty($object'cancelled')) {
             $status = kolabformat::StatusCancelled;
-        else if (!empty($object'status') && array_key_exists($object'status', $this->status_map))
+        }
+        else if (!empty($object'status') && array_key_exists($object'status', $this->status_map)) {
             $status = $this->status_map$object'status';
+        }
         $this->obj->setStatus($status);
 
         // save (recurrence) exceptions

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage.php Changed

roundcubemail-1.5.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit37865e036c35ba82229501ec90486b55
+class ComposerAutoloaderInitcddb700db629f76e1e80fea0f88a03f7
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit37865e036c35ba82229501ec90486b55', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitcddb700db629f76e1e80fea0f88a03f7', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit37865e036c35ba82229501ec90486b55', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitcddb700db629f76e1e80fea0f88a03f7', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit37865e036c35ba82229501ec90486b55::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -57,19 +57,19 @@
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit37865e036c35ba82229501ec90486b55::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire37865e036c35ba82229501ec90486b55($fileIdentifier, $file);
+            composerRequirecddb700db629f76e1e80fea0f88a03f7($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire37865e036c35ba82229501ec90486b55($fileIdentifier, $file)
+function composerRequirecddb700db629f76e1e80fea0f88a03f7($fileIdentifier, $file)
 {
     if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
         require $file;

roundcubemail-1.5.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit37865e036c35ba82229501ec90486b55
+class ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -1145,11 +1145,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit37865e036c35ba82229501ec90486b55::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInitcddb700db629f76e1e80fea0f88a03f7::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.tar.gz/vendor/composer/installed.json Changed

roundcubemail-1.5.tar.gz/vendor/composer/installed.php Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/ORIG_HEAD Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/info/refs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-5a319cf437d75aad564ce7fd076cc5423722868b 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200	checkout: moving from master to master
-5a319cf437d75aad564ce7fd076cc5423722868b 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200	reset: moving to 5a319cf437d75aad564ce7fd076cc5423722868b
+0000000000000000000000000000000000000000 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691049799 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691049799 +0200	checkout: moving from master to master
+bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691049799 +0200	reset: moving to bc02cfe80148b88504627ea0163148f36f49b277

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-341d66f5c0b301581bdd4aa62efcf99542551550.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-341d66f5c0b301581bdd4aa62efcf99542551550.pack Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-341d66f5c0b301581bdd4aa62efcf99542551550.rev Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.idx Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.pack Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.rev Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/packed-refs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/lib/Net/LDAP3.php Changed

@@ -1677,7 +1677,7 @@
             }
 
             $controls = $this->_vlv_set_controls($sort, $this->list_page, $this->page_size,
-                $this->_vlv_search($sort, $props'search'));
+                $this->_vlv_search($sort, $props'search' ?? null));
 
             $this->vlv_active = (bool) $controls;
         }
@@ -1776,7 +1776,7 @@
     {
         $this->_debug("Net_LDAP3::search_entries with search " . var_export($props, true));
 
-        if (is_array($props'search') && array_key_exists('params', $props'search')) {
+        if (!empty($props'search') && is_array($props'search') && array_key_exists('params', $props'search')) {
             $_search = $this->search_filter($props'search');
             $this->_debug("C: Search filter: $_search");
 
@@ -3179,6 +3179,7 @@
 
         // use cache
         $domain_dn = $this->get_cache_data($ckey);
+        $result = false;
 
         if ($domain_dn) {
             $result = $this->get_entry_attributes($domain_dn, $attributes);
@@ -3186,9 +3187,6 @@
             if (!empty($result)) {
                 $result'dn' = $domain_dn;
             }
-            else {
-                $result = false;
-            }
         }
         else if ($domain_base_dn = $this->config_get('domain_base_dn')) {
             $domain_filter  = $this->config_get('domain_filter');
@@ -3209,10 +3207,7 @@
                 $result       = $result->entries(true);
                 $domain_dn    = key($result);
 
-                if (empty($domain_dn)) {
-                    $result = false;
-                }
-                else {
+                if (!empty($domain_dn)) {
                     $result       = $result$domain_dn;
                     $result'dn' = $domain_dn;

roundcubemail.dsc Changed

Overview

Request 3195 (accepted)

Request History