Request 3173 (accepted)

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

@@ -3186,7 +3186,7 @@
                 . ' - ' . $this->rc->format_date($end, $this->rc->config->get('time_format'));
         }
 
-        return html::div(rtrim('event-row ' . ($class ?: $event'className')),
+        return html::div(rtrim('event-row ' . ($class ?: ($event'className' ?? ''))),
             html::span('event-date', $time)
             . html::span('event-title', rcube::Q($event'title'))
         );
@@ -3561,7 +3561,7 @@
                 }
                 else if (!$existing && ($status != 'declined' || $this->rc->config->get('kolab_invitation_calendars'))) {
                     if ($status == 'declined'
-                        || $event'status' == 'CANCELLED'
+                        || ($event'status' ?? '') == 'CANCELLED'
                         || ($event_attendee && ($event_attendee'role' ?? '') == 'NON-PARTICIPANT')
                     ) {
                         $event'free_busy' = 'free';
@@ -3642,8 +3642,8 @@
         }
 
         // send iTip reply
-        if ($event'_method' == 'REQUEST' && !empty($organizer) && !$noreply
-            && !in_array(strtolower($organizer'email'), $emails) && !$error_msg
+        if ($event'_method' == 'REQUEST' && !empty($organizer) && !$noreply && !$error_msg && !empty($reply_sender)
+            && !in_array(strtolower($organizer'email'), $emails)
         ) {
             $event'comment' = $comment;
             $itip = $this->load_itip();

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

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

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Base.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/Base.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/RcubeUser.php Changed

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

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

roundcubemail-1.5.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php Changed

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

@@ -216,11 +216,11 @@
             $replying_attendee = null;
             $reply_attendees = array();
             foreach ($event'attendees' as $attendee) {
-                if ($attendee'role' == 'ORGANIZER') {
+                if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
                     $reply_attendees = $attendee;
                 }
                 // we accept on behalf of a resource
-                else if (strcasecmp($attendee'email', $event'_resource') == 0) {
+                else if (isset($event'_resource') && strcasecmp($attendee'email', $event'_resource') == 0) {
                     $replying_attendee = $attendee;
                     $replying_attendee'sent-by' = 'mailto:' . $from_utf;
                 }
@@ -242,7 +242,7 @@
                 array_unshift($reply_attendees, $replying_attendee);
                 $event'attendees' = $reply_attendees;
             }
-            if ($event'recurrence') {
+            if (!empty($event'recurrence')) {
                 unset($event'recurrence''EXCEPTIONS');
             }
         }
@@ -488,12 +488,16 @@
                     if ($attendee'role' != 'ORGANIZER' && strcasecmp($attendee'email', $event'attendee') == 0) {
                         $status_lc = strtolower($status);
                         if (in_array($status_lc, $this->rsvp_status)) {
-                            $html = html::div('rsvp-status ' . $status_lc, $this->gettext(array(
-                                'name' => 'attendee' . $status_lc,
-                                'vars' => array(
-                                    'delegatedto' => rcube::Q($event'delegated-to' ?: ($attendee'delegated-to' ?: '?')),
-                                )
-                            )));
+                            $delegatee = !empty($event'delegated-to') ? $event'delegated-to'
+                                : (!empty($attendee'delegated-to') ? $attendee'delegated-to' : '?');
+
+                            $html = html::div(
+                                'rsvp-status ' . $status_lc,
+                                $this->gettext(
+                                    'name' => 'attendee' . $status_lc,
+                                    'vars' => 'delegatedto' => rcube::Q($delegatee)
+                                )
+                            );
                         }
 
                         $action = $attendee'status' == $status || !$latest ? '' : 'update';
@@ -624,6 +628,7 @@
             'method'   => $method,
             'task'     => $task,
             'mime_id'  => $mime_id,
+            'rsvp'     => false,
         );
 
         // create buttons to be activated from async request checking existence of this event in local calendars
@@ -638,7 +643,7 @@
             if ($attendee) {
                 $metadata'attendee' = $attendee'email';
                 $rsvp_status = strtoupper($attendee'status');
-                if ($attendee'delegated-to') {
+                if (!empty($attendee'delegated-to')) {
                     $metadata'delegated-to' = $attendee'delegated-to';
                 }
             }
@@ -1007,7 +1012,7 @@
      */
     public function find_attendee_by_email($attendees, $email_field, $email, $email_utf = null) {
         foreach ($attendees as $_attendee) {
-            if ($attendee'role' == 'ORGANIZER') {
+            if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
                 continue;
             }
             if (!empty($attendee$email_field) && self::compare_email($attendee$email_field, $email, $email_utf)) {

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

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

@@ -60,8 +60,8 @@
         parent::set($object);
 
         // do the hard work of setting object values
-        $this->obj->setStart(self::get_datetime($object'start', null, $object'allday'));
-        $this->obj->setEnd(self::get_datetime($object'end', null, $object'allday'));
+        $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');
 
         $status = kolabformat::StatusUndefined;
@@ -97,7 +97,8 @@
                     $compacted'recurrence_date' = $recurrence_id;
                 }
 
-                $exevent->obj->setRecurrenceID(self::get_datetime($recurrence_id ?: $exception'start', null,  $object'allday'), (bool)$exception'thisandfuture');
+                $ex_dt = self::get_datetime($recurrence_id ?: $exception'start', null,  !empty($object'allday'));
+                $exevent->obj->setRecurrenceID($ex_dt, !empty($exception'thisandfuture'));
 
                 $vexceptions->push($exevent->obj);
 
@@ -272,7 +273,7 @@
         $tags = parent::get_tags($obj);
         $object = $obj ?: $this->data;
 
-        foreach ((array)$object'categories' as $cat) {
+        foreach ((array) ($object'categories' ?? ) as $cat) {
             $tags = rcube_utils::normalize_string($cat);
         }
 
@@ -294,7 +295,7 @@
 
         // preserve this property for date serialization
         if (!isset($exception'allday')) {
-            $exception'allday' = $master'allday';
+            $exception'allday' = !empty($master'allday');
         }
 
         return $exception;

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

@@ -348,7 +348,7 @@
         $this->obj->setSummary($object'title');
         $this->obj->setLocation($object'location' ?? null);
         $this->obj->setDescription($object'description');
-        $this->obj->setPriority($object'priority');
+        $this->obj->setPriority($object'priority' ?? null);
         $this->obj->setCategories(self::array2vector($object'categories' ?? null));
         $this->obj->setUrl(strval($object'url' ?? null));
 
@@ -359,10 +359,13 @@
         // process event attendees
         $attendees = new vectorattendee;
         foreach ((array)($object'attendees' ?? ) as $i => $attendee) {
-            if ($attendee'role' == 'ORGANIZER') {
+            if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
                 $object'organizer' = $attendee;
             }
-            else if ($attendee'email' != $object'organizer''email') {
+            else if (
+                !empty($attendee'email')
+                && (empty($object'organizer''email') || $attendee'email' != $object'organizer''email')
+            ) {
                 $cr = new ContactReference(ContactReference::EmailReference, $attendee'email');
                 $cr->setName($attendee'name');
 
@@ -371,12 +374,16 @@
                     $object'attendees'$i'rsvp' = $attendee'rsvp' = $reschedule;
                 }
 
+                $cutype   = $this->cutype_map$attendee'cutype' ?? -1 ?? null;
+                $partstat = $this->part_status_map$attendee'status' ?? -1 ?? null;
+                $role     = $this->role_map$attendee'role' ?? -1 ?? null;
+
                 $att = new Attendee;
                 $att->setContact($cr);
-                $att->setPartStat($this->part_status_map$attendee'status');
-                $att->setRole($this->role_map$attendee'role' ?: kolabformat::Required);
-                $att->setCutype($this->cutype_map$attendee'cutype' ?: kolabformat::CutypeIndividual);
-                $att->setRSVP((bool)$attendee'rsvp');
+                $att->setPartStat($partstat);
+                $att->setRole($role ?: kolabformat::Required);
+                $att->setCutype($cutype ?: kolabformat::CutypeIndividual);
+                $att->setRSVP(!empty($attendee'rsvp'));
 
                 if (!empty($attendee'delegated-from')) {
                     $vdelegators = new vectorcontactref;
@@ -407,9 +414,9 @@
         }
         $this->obj->setAttendees($attendees);
 
-        if ($object'organizer') {
-            $organizer = new ContactReference(ContactReference::EmailReference, $object'organizer''email');
-            $organizer->setName($object'organizer''name');
+        if (!empty($object'organizer')) {
+            $organizer = new ContactReference(ContactReference::EmailReference, $object'organizer''email' ?? null);
+            $organizer->setName($object'organizer''name' ?? '');
             $this->obj->setOrganizer($organizer);
         }
 
@@ -529,8 +536,8 @@
                         $recipients->push(new ContactReference(ContactReference::EmailReference, $email));
                     }
                     $alarm = new Alarm(
-                        strval($valarm'summary' ?: $object'title'),
-                        strval($valarm'description' ?: $object'description'),
+                        strval(!empty($valarm'summary') ? $valarm'summary' : $object'title'),
+                        strval(!empty($valarm'description') ? $valarm'description' : $object'description'),
                         $recipients
                     );
                 }
@@ -566,15 +573,15 @@
                         continue;
                     }
 
-                    $related = strtoupper($valarm'related') == 'END' ? kolabformat::End : kolabformat::Start;
+                    $related = strtoupper($valarm'related' ?? '') == 'END' ? kolabformat::End : kolabformat::Start;
                     $alarm->setRelativeStart($duration, $related);
                 }
 
-                if ($valarm'duration') {
+                if (!empty($valarm'duration')) {
                     try {
                         $d = new DateInterval($valarm'duration');
                         $duration = new Duration($d->d, $d->h, $d->i, $d->s);
-                        $alarm->setDuration($duration, intval($valarm'repeat'));
+                        $alarm->setDuration($duration, intval($valarm'repeat' ?? 0));
                     }
                     catch (Exception $e) {
                         // ignore

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

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

roundcubemail-1.5.tar.gz/plugins/libkolab/libkolab.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 ComposerAutoloaderInit0ebcf7a3341ea7f2f70637cb5d15e2aa
+class ComposerAutoloaderInit7f4507b951cb5ef5ef8e43e35656bda5
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit0ebcf7a3341ea7f2f70637cb5d15e2aa', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit7f4507b951cb5ef5ef8e43e35656bda5', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit0ebcf7a3341ea7f2f70637cb5d15e2aa', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit7f4507b951cb5ef5ef8e43e35656bda5', '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\ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::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\ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire0ebcf7a3341ea7f2f70637cb5d15e2aa($fileIdentifier, $file);
+            composerRequire7f4507b951cb5ef5ef8e43e35656bda5($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire0ebcf7a3341ea7f2f70637cb5d15e2aa($fileIdentifier, $file)
+function composerRequire7f4507b951cb5ef5ef8e43e35656bda5($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 ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa
+class ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -1029,11 +1029,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit0ebcf7a3341ea7f2f70637cb5d15e2aa::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$classMap;
 
         }, null, ClassLoader::class);
     }

Overview

Request 3173 (accepted)

Request History