Request 3190 (accepted)

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

@@ -774,12 +774,12 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.5/roundcubemail-plugins-kolab-latest/plugins/kolab_2fa",
-                "reference": "577ff96c32f87ab3a5801e5e9ad477a66915ad1f"
+                "reference": "f1bbbcb76209b9aca24928ad2e78707284b672a1"
             },
             "require": {
                 "endroid/qr-code": "~1.6.5",
                 "enygma/yubikey": "~3.2",
-                "php": ">=5.3.0",
+                "php": ">=7.2.0",
                 "roundcube/plugin-installer": ">=0.1.3",
                 "spomky-labs/otphp": "~10.0.3"
             },
@@ -2923,16 +2923,16 @@
         },
         {
             "name": "sabre/http",
-            "version": "5.1.6",
+            "version": "5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/http.git",
-                "reference": "9976ac34ced206bd6579b7b37b401de9fac98dae"
+                "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/http/zipball/9976ac34ced206bd6579b7b37b401de9fac98dae",
-                "reference": "9976ac34ced206bd6579b7b37b401de9fac98dae",
+                "url": "https://api.github.com/repos/sabre-io/http/zipball/b6fa04f42f49156eaab3fb890c79f4c43a9559b7",
+                "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7",
                 "shasum": ""
             },
             "require": {
@@ -2982,7 +2982,7 @@
                 "issues": "https://github.com/sabre-io/http/issues",
                 "source": "https://github.com/fruux/sabre-http"
             },
-            "time": "2022-07-15T14:51:14+00:00"
+            "time": "2023-06-26T10:13:00+00:00"
         },
         {
             "name": "sabre/uri",
@@ -3147,16 +3147,16 @@
         },
         {
             "name": "sabre/xml",
-            "version": "2.2.5",
+            "version": "2.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/xml.git",
-                "reference": "a6af111850e7536d200d9637c34885cd3c77a86c"
+                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/xml/zipball/a6af111850e7536d200d9637c34885cd3c77a86c",
-                "reference": "a6af111850e7536d200d9637c34885cd3c77a86c",
+                "url": "https://api.github.com/repos/sabre-io/xml/zipball/9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
+                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
                 "shasum": ""
             },
             "require": {
@@ -3212,7 +3212,7 @@
                 "issues": "https://github.com/sabre-io/xml/issues",
                 "source": "https://github.com/fruux/sabre-xml"
             },
-            "time": "2021-11-04T06:37:27+00:00"
+            "time": "2023-06-28T12:56:05+00:00"
         },
         {
             "name": "smarty/smarty",
@@ -4787,16 +4787,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.19",
+            "version": "1.10.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "af5a296ff02610c1bfb4ddfac9fd4a08657b9046"
+                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/af5a296ff02610c1bfb4ddfac9fd4a08657b9046",
-                "reference": "af5a296ff02610c1bfb4ddfac9fd4a08657b9046",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f",
+                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f",
                 "shasum": ""
             },
             "require": {
@@ -4845,7 +4845,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-06-14T15:26:58+00:00"
+            "time": "2023-07-19T12:44:37+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

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

@@ -273,9 +273,13 @@
 
             $this->itip = new calendar_itip($this);
 
+            $rsvp_actions = 'accepted','tentative','declined','delegated';
+
             if ($this->rc->config->get('kolab_invitation_calendars')) {
-                $this->itip->set_rsvp_actions('accepted','tentative','declined','delegated','needs-action');
+                $rsvp_actions = 'needs-action';
             }
+
+            $this->itip->set_rsvp_actions($this->rc->config->get('calendar_rsvp_actions', $rsvp_actions));
         }
 
         return $this->itip;
@@ -342,6 +346,7 @@
         $this->rc->output->set_env('timezone', $this->timezone->getName());
         $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
         $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
+        $this->rc->output->set_env('calendar_resources_freebusy', !empty($this->rc->config->get('kolab_freebusy_server')));
         $this->rc->output->set_env('identities-selector', $this->ui->identity_select(
                 'id'         => 'edit-identities-list',
                 'aria-label' => $this->gettext('roleorganizer'),
@@ -2115,22 +2120,24 @@
 
         // check for organizer in attendees list
         $organizer = null;
-        foreach ((array) $event'attendees' as $i => $attendee) {
-            if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
-                $organizer = $attendee;
-            }
-            if (!empty($attendee'status') && $attendee'status' == 'DELEGATED' && empty($attendee'rsvp')) {
-                $event'attendees'$i'noreply' = true;
-            }
-            else {
-                unset($event'attendees'$i'noreply');
+        if (!empty($event'attendees')) {
+            foreach ((array) $event'attendees' as $i => $attendee) {
+                if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
+                    $organizer = $attendee;
+                }
+                if (!empty($attendee'status') && $attendee'status' == 'DELEGATED' && empty($attendee'rsvp')) {
+                    $event'attendees'$i'noreply' = true;
+                }
+                else {
+                    unset($event'attendees'$i'noreply');
+                }
             }
         }
 
         if ($organizer === null && !empty($event'organizer')) {
             $organizer = $event'organizer';
             $organizer'role' = 'ORGANIZER';
-            if (!is_array($event'attendees')) {
+            if (!isset($event'attendees') || !is_array($event'attendees')) {
                 $event'attendees' = $organizer;
             }
         }

roundcubemail-1.5.tar.gz/plugins/calendar/calendar_ui.js Changed

@@ -924,13 +924,19 @@
       $('#edit-tab-attachments')(calendar.attachments?'show':'hide')();
       $('#eventedit:not(data-notabs)').tabs('option', 'active', 0); // Larry
 
-      // show/hide tabs according to calendar's feature support and activate first tab (Ellastic)
+      // show/hide tabs according to calendar's feature support and activate first tab (Elastic)
       $('li > ahref="#event-panel-attendees"').parent()(calendar.attendees?'show':'hide')();
       $('li > ahref="#event-panel-resources"').parent()(rcmail.env.calendar_resources?'show':'hide')();
       $('li > ahref="#event-panel-attachments"').parent()(calendar.attachments?'show':'hide')();
       if ($('#eventedit').data('notabs'))
         $('#eventedit li.nav-item:first-child a').tab('show');
 
+      if (!rcmail.env.calendar_resources_freebusy) {
+        // With no freebusy setup, some features needs to be hidden
+        // TODO: Show "Find resources" dialog, but with Availability tab hidden
+        $('#event-panel-resources').find('#edit-resource-find,#edit-attendees-legend,td.availability,th.availability').hide();
+      }
+
       // hack: set task to 'calendar' to make all dialog actions work correctly
       var comm_path_before = rcmail.env.comm_path;
       rcmail.env.comm_path = comm_path_before.replace(/_task=a-z+/, '_task=calendar');
@@ -1182,13 +1188,13 @@
     {
       var $dialog = $('#eventfreebusy'),
         event = me.selected_event;
-      
+
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
-      
+
       if (!event_attendees.length)
         return false;
-      
+
       // set form elements
       var allday = $('#edit-allday').get(0);
       var end = 'toDate' in event.end ? event.end : moment(event.end);
@@ -1199,7 +1205,7 @@
       freebusy_ui.starttime = $('#schedule-starttime').val(format_date(start, settings.time_format)).show();
       freebusy_ui.enddate = $('#schedule-enddate').val(format_date(end, settings.date_format));
       freebusy_ui.endtime = $('#schedule-endtime').val(format_date(end, settings.time_format)).show();
-      
+
       if (allday.checked) {
         freebusy_ui.starttime.val("12:00").hide();
         freebusy_ui.endtime.val("13:00").hide();
@@ -1211,7 +1217,7 @@
       fb_start.setTime(event.start);
       fb_start.setHours(0); fb_start.setMinutes(0); fb_start.setSeconds(0); fb_start.setMilliseconds(0);
       fb_end.setTime(fb_start.getTime() + DAY_MS);
-      
+
       freebusy_data = { required:{}, all:{} };
       freebusy_ui.loading = 1;  // prevent render_freebusy_grid() to load data yet
       freebusy_ui.numdays = Math.max(allday.checked ? 14 : 1, Math.ceil(duration * 2 / 86400));
@@ -1219,7 +1225,7 @@
       freebusy_ui.start = fb_start;
       freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays);
       render_freebusy_grid(0);
-      
+
       // render list of attendees
       freebusy_ui.attendees = {};
       var domid, dispname, data, role_html, list_html = '';
@@ -1229,15 +1235,15 @@
         domid = String(data.email).replace(rcmail.identifier_expr, '');
         role_html = '<a class="attendee-role-toggle" id="rcmlia' + domid + '" title="' + Q(rcmail.gettext('togglerole', 'calendar')) + '">&nbsp;</a>';
         list_html += '<div class="attendee ' + String(data.role).toLowerCase() + '" id="rcmli' + domid + '">' + role_html + dispname + '</div>';
-        
+
         // clone attendees data for local modifications
         freebusy_ui.attendeesi = freebusy_ui.attendeesdomid = $.extend({}, data);
       }
-      
+
       // add total row
       list_html += '<div class="attendee spacer">&nbsp;</div>';
       list_html += '<div class="attendee total">' + rcmail.gettext('reqallattendees','calendar') + '</div>';
-      
+
       $('#schedule-attendees-list').html(list_html)
         .unbind('click.roleicons')
         .bind('click.roleicons', function(e) {
@@ -1251,7 +1257,7 @@
               j = (j+1) % roles.length;
               attendee.role = rolesj;
               $(e.target).parent().attr('class', 'attendee '+String(attendee.role).toLowerCase());
-              
+
               // update total display if required-status changed
               if (req != (rolesj != 'OPT-PARTICIPANT' && rolesj != 'NON-PARTICIPANT')) {
                 compute_freebusy_totals();
@@ -1259,7 +1265,7 @@
               }
             }
           }
-          
+
           return false;
         });
 
@@ -1321,12 +1327,12 @@
         minWidth: 640,
         width: 850
       }).show();
-      
+
       // adjust dialog size to fit grid without scrolling
       var gridw = $('#schedule-freebusy-times').width();
       var overflow = gridw - $('#attendees-freebusy-table td.times').width();
       me.dialog_resize($dialog.get(0), $dialog.height() + (bw.ie ? 20 : 0), 800 + Math.max(0, overflow));
-      
+
       // fetch data from server
       freebusy_ui.loading = 0;
       load_freebusy_data(freebusy_ui.start, freebusy_ui.interval);
@@ -1338,17 +1344,17 @@
       if (delta) {
         freebusy_ui.start.setTime(freebusy_ui.start.getTime() + DAY_MS * delta);
         fix_date(freebusy_ui.start);
-        
+
         // skip weekends if in workinhoursonly-mode
         if (Math.abs(delta) == 1 && freebusy_ui.workinhoursonly) {
           while (is_weekend(freebusy_ui.start))
             freebusy_ui.start.setTime(freebusy_ui.start.getTime() + DAY_MS * delta);
           fix_date(freebusy_ui.start);
         }
-        
+
         freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays);
       }
-      
+
       var dayslots = Math.floor(1440 / freebusy_ui.interval);
       var date_format = 'ddd '+ (dayslots <= 2 ? settings.date_short : settings.date_format);
       var lastdate, datestr, css,
@@ -1368,17 +1374,17 @@
           dates_row += '<th colspan="' + dayslots + '" class="boxtitle date' + format_date(curdate, 'DDMMYYYY') + '">' + Q(datestr) + '</th>';
           lastdate = datestr;
         }
-        
+
         // set css class according to working hours
         css = is_weekend(curdate) || (freebusy_ui.interval <= 60 && !is_workinghour(curdate)) ? 'offhours' : 'workinghours';
         times_row += '<td class="' + times_css + css + '" id="t-' + Math.floor(t/1000) + '">' + Q(allday ? rcmail.gettext('all-day','calendar') : format_date(curdate, settings.time_format)) + '</td>';
         slots_row += '<td class="' + css + '">&nbsp;</td>';
-        
+
         t += interval * 60000;
       }
       dates_row += '</tr>';
       times_row += '</tr>';
-      
+
       // render list of attendees
       var domid, data, list_html = '', times_html = '';
       for (var i=0; i < event_attendees.length; i++) {
@@ -1386,15 +1392,15 @@
         domid = String(data.email).replace(rcmail.identifier_expr, '');
         times_html += '<tr id="fbrow' + domid + '" class="fbcontent">' + slots_row + '</tr>';
       }
-      
+
       // add line for all/required attendees
       times_html += '<tr class="spacer"><td colspan="' + (dayslots * freebusy_ui.numdays) + '"></td>';
       times_html += '<tr id="fbrowall" class="fbcontent">' + slots_row + '</tr>';
-      
+
       var table = $('#schedule-freebusy-times');
       table.children('thead').html(dates_row + times_row);
       table.children('tbody').html(times_html);
-      
+
       // initialize event handlers on grid
       if (!freebusy_ui.grid_events) {
         freebusy_ui.grid_events = true;
@@ -1412,7 +1418,7 @@
           }
         });
       }
-      
+
       // if we have loaded free-busy data, show it
       if (!freebusy_ui.loading) {
         if (freebusy_ui.start < freebusy_data.start || freebusy_ui.end > freebusy_data.end || freebusy_ui.interval != freebusy_data.interval) {
@@ -1425,12 +1431,12 @@
           }
         }
       }
-      
+
       // render current event date/time selection over grid table
       // use timeout to let the dom attributes (width/height/offset) be set first
       window.setTimeout(function(){ render_freebusy_overlay(); }, 10);
     };
-    
+
     // render overlay element over the grid to visiualize the current event date/time
     var render_freebusy_overlay = function()
     {
@@ -1549,7 +1555,7 @@
           domid = String(email).replace(rcmail.identifier_expr, '');
           $('#rcmli' + domid).addClass('loading');
           freebusy_ui.loading++;
-          
+
           $.ajax({
             type: 'GET',
             dataType: 'json',
@@ -1557,7 +1563,7 @@
             data: { email:email, start:date2servertime(clone_date(start, 1)), end:date2servertime(clone_date(end, 2)), interval:interval, _remote:1 },
             success: function(data) {
               freebusy_ui.loading--;
-              
+
               // find attendee
               var i, attendee = null;
               for (i=0; i < event_attendees.length; i++) {
@@ -1566,7 +1572,7 @@
                   break;
                 }
               }
-              
+
               // copy data to member var
               var ts, status,
                 req = attendee.role != 'OPT-PARTICIPANT',
@@ -1582,13 +1588,13 @@
                 status = data.slots.charAt(i);
                 freebusy_datadata.emailts = status
                 start = new Date(start.getTime() + data.interval * 60000);
-                
+
                 // set totals
                 if (!freebusy_data.requiredts)
                   freebusy_data.requiredts = 0,0,0,0;
                 if (req)
                   freebusy_data.requiredtsstatus++;
-                
+
                 if (!freebusy_data.allts)
                   freebusy_data.allts = 0,0,0,0;
                 freebusy_data.alltsstatus++;
@@ -1597,44 +1603,44 @@
               // hide loading indicator
               var domid = String(data.email).replace(rcmail.identifier_expr, '');
               $('#rcmli' + domid).removeClass('loading');
-              
+
               // update display
               update_freebusy_display(data.email);
             }
           });
-          
+
           // count required attendees
           if (freebusy_ui.attendeesi.role != 'OPT-PARTICIPANT')
             freebusy_ui.numrequired++;
         }
       }
     };
-    
+
     // re-calculate total status after role change
     var compute_freebusy_totals = function()
     {
       freebusy_ui.numrequired = 0;
       freebusy_data.all = ;
       freebusy_data.required = ;
-      
+
       var email, req, status;
       for (var i=0; i < event_attendees.length; i++) {
         if (!(email = event_attendeesi.email))
           continue;
-        
+
         req = freebusy_ui.attendeesi.role != 'OPT-PARTICIPANT';
         if (req)
           freebusy_ui.numrequired++;
-        
+
         for (var ts in freebusy_dataemail) {
           if (!freebusy_data.requiredts)
             freebusy_data.requiredts = 0,0,0,0;
           if (!freebusy_data.allts)
             freebusy_data.allts = 0,0,0,0;
-          
+
           status = freebusy_dataemailts;
           freebusy_data.alltsstatus++;
-          
+
           if (req)
             freebusy_data.requiredtsstatus++;
         }
@@ -1787,7 +1793,7 @@
             break;
           }
         }
-        
+
         // occupied slot
         if (!candidatestart) {
           slot += Math.max(0, intvlslots - candidatecount - 1) * sinterval * dir;
@@ -1796,9 +1802,9 @@
         }
         else if (dir < 0)
           candidatestart = slot;
-        
+
         candidatecount++;
-        
+
         // if candidate is big enough, this is it!
         if (candidatecount == numslots) {
           'toDate' in event.start ? (event.start = new Date(candidatestart)) : event.start.setTime(candidatestart);
@@ -1859,7 +1865,7 @@
       for (var i=0; i < names.length; i++) {
         email = name = '';
         item = $.trim(namesi);
-        
+
         if (!item.length) {
           continue;
         } // address in brackets without name (do nothing)
@@ -1881,7 +1887,7 @@
           rcmail.alert_dialog(rcmail.gettext('noemailwarning'));
         }
       }
-      
+
       return success;
     };
 
@@ -2006,10 +2012,10 @@
         if (email = icon.attr('data-email'))
           check_freebusy_status(icon, email, event);
       });
-      
+
       freebusy_ui.needsupdate = false;
     };
-    
+
     // load free-busy status from server and update icon accordingly
     var check_freebusy_status = function(icon, email, event)
     {
@@ -2018,9 +2024,9 @@
         $(icon).attr('class', 'availabilityicon unknown');
         return;
       }
-      
+
       icon = $(icon).attr('class', 'availabilityicon loading');
-      
+
       $.ajax({
         type: 'GET',
         dataType: 'html',
@@ -2035,7 +2041,7 @@
         }
       });
     };
-    
+
     // remove an attendee from the list
     var remove_attendee = function(elem, id)
     {
@@ -3369,20 +3375,21 @@
         if (q != '') {
           var id = 'search-'+q;
           var sources = ;
-          
+
           if (me.quickview_active)
             reset_quickview();
-          
+
           if (this._search_message)
             rcmail.hide_message(this._search_message);
-          
+
           $.each(fc.fullCalendar('getEventSources'), function() {
             this.url = this.url.replace(/&q=.+/, '') + '&q=' + urlencode(q);
             me.calendarsthis.id.url = this.url;
             sources.push(this.id);
           });
+
           id += '@'+sources.join(',');
-          
+
           // ignore if query didn't change
           if (this.search_request == id) {
             return;
@@ -3391,10 +3398,10 @@
           else if (!this.search_request) {
             this.default_view = fc.fullCalendar('getView').name;
           }
-          
+
           this.search_request = id;
           this.search_query = q;
-          
+
           // change to list view
           fc.fullCalendar('changeView', 'list');

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

@@ -507,7 +507,7 @@
                 // add to output if in range
                 if (($next_event'start' <= $end && $next_event'end' >= $start)) {
                     $next_event'_instance' = $next_event'start'->format($recurrence_id_format);
-                    $next_event'id' = $next_event'uid' . '-' . $exception'_instance';
+                    $next_event'id' = $next_event'uid' . '-' . $next_event'_instance';
                     $next_event'recurrence_id' = $event'uid';
                     $events = $next_event;
                 }
@@ -647,7 +647,7 @@
         $year2  = $end->format('Y');
 
         $events = ;
-        $search = mb_strtolower($search);
+        $search = mb_strtolower((string) $search);
         $rcmail = rcmail::get_instance();
         $cache  = $rcmail->get_cache('calendar.birthdays', 'db', 3600);
         $cache->expunge();
@@ -786,18 +786,14 @@
         }
 
         try {
-            $bday = $contact'birthday';
-            if (!$bday instanceof DateTimeInterface) {
-                $bday = new DateTime($bday, new DateTimeZone('UTC'));
-            }
-            $bday->_dateonly = true;
+            $bday = libcalendaring_datetime::createFromAny($contact'birthday', true);
         }
         catch (Exception $e) {
             rcube::raise_error(
                     'code' => 600,
                     'file' => __FILE__,
                     'line' => __LINE__,
-                    'message' => 'BIRTHDAY PARSE ERROR: ' . $e->getMessage()
+                    'message' => 'Failed to parse contact birthday: ' . $e->getMessage()
                 ,
                 true, false
             );

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

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/ldap/resources_driver_ldap.php Changed

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

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

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

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

@@ -142,7 +142,7 @@
                 'statusorganizer', 'statusaccepted', 'statusdeclined',
                 'statusdelegated', 'statusunknown', 'statusneeds-action',
                 'statustentative', 'statuscompleted', 'statusin-process',
-                'delegatedto', 'delegatedfrom', 'showmore'
+                'delegatedto', 'delegatedfrom', 'showmore', 'savein'
             );
         }
 
@@ -853,7 +853,7 @@
             return $this->gettext('ondate') . ' ' . join(', ', $rdates) . ($more ? '...' : '');
         }
 
-        $output  = sprintf('%s %d ', $this->gettext('every'), $rrule'INTERVAL' ?: 1);
+        $output  = sprintf('%s %d ', $this->gettext('every'), !empty($rrule'INTERVAL') ? $rrule'INTERVAL' : 1);
 
         switch ($rrule'FREQ') {
         case 'DAILY':
@@ -1139,6 +1139,8 @@
      */
     public function mail_message_load($p)
     {
+        $this->ical_parts = ;
+        $this->mail_ical_parser = null;
         $this->ical_message = $p'object';
         $itip_part          = null;
 
@@ -1545,6 +1547,10 @@
      */
     public static function to_php_date_format($from)
     {
+        if (!is_string($from)) {
+            return '';
+        }
+
         // "dd.MM.yyyy HH:mm:ss" => "d.m.Y H:i:s"
         return strtr(strtr($from, array(
             'YYYY' => 'Y',
@@ -1581,6 +1587,10 @@
      */
     public static function from_php_date_format($from)
     {
+        if (!is_string($from)) {
+            return '';
+        }
+
         // "d.m.Y H:i:s" => "dd.MM.yyyy HH:mm:ss"
         return strtr($from, array(
             'y' => 'YY',

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

@@ -131,12 +131,6 @@
             }
         }
 
-        $roots = 
-            'VEVENT' => 'calendars',
-            'VTODO' => 'calendars',
-            'VCARD' => 'addressbooks',
-        ;
-
         $path = parse_url($this->url, PHP_URL_PATH);
 
         $body = '<?xml version="1.0" encoding="utf-8"?>'
@@ -147,7 +141,7 @@
             . '</d:propfind>';
 
         // Note: Cyrus CardDAV service requires Depth:1 (CalDAV works without it)
-        $response = $this->request('/' . $roots$component, 'PROPFIND', $body, 'Depth' => 1, 'Prefer' => 'return-minimal');
+        $response = $this->request('/', 'PROPFIND', $body, 'Depth' => 1, 'Prefer' => 'return-minimal');
 
         if (empty($response)) {
             return false;
@@ -200,14 +194,12 @@
             }
         }
 
-        if (!empty($root_href)) {
-            if ($path && strpos($root_href, $path) === 0) {
-                $root_href = substr($root_href, strlen($path));
-            }
+        if (empty($root_href)) {
+            return false;
         }
-        else {
-            // Kolab iRony's calendar root
-            $root_href = '/' . $roots$component . '/' . rawurlencode($this->user);
+
+        if ($path && strpos($root_href, $path) === 0) {
+            $root_href = substr($root_href, strlen($path));
         }
 
         if ($cache) {
@@ -264,10 +256,13 @@
         foreach ($response->getElementsByTagName('response') as $element) {
             $folder = $this->getFolderPropertiesFromResponse($element);
 
-            // Note: Addressbooks don't have 'types' specified
-            if (($component == 'VCARD' && in_array('addressbook', $folder'resource_type'))
-                || in_array($component, (array) $folder'types')
-            ) {
+            // Filter out the folders of other type
+            if ($component == 'VCARD') {
+                if (in_array('addressbook', $folder'resource_type')) {
+                    $folders = $folder;
+                }
+            }
+            else if (in_array('calendar', $folder'resource_type') && in_array($component, (array) $folder'types')) {
                 $folders = $folder;
             }
         }

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

@@ -345,9 +345,9 @@
             $reschedule = true;
         }
 
-        $this->obj->setSummary($object'title');
+        $this->obj->setSummary($object'title' ?? null);
         $this->obj->setLocation($object'location' ?? null);
-        $this->obj->setDescription($object'description');
+        $this->obj->setDescription($object'description' ?? null);
         $this->obj->setPriority($object'priority' ?? null);
         $this->obj->setCategories(self::array2vector($object'categories' ?? null));
         $this->obj->setUrl(strval($object'url' ?? null));
@@ -367,7 +367,7 @@
                 && (empty($object'organizer''email') || $attendee'email' != $object'organizer''email')
             ) {
                 $cr = new ContactReference(ContactReference::EmailReference, $attendee'email');
-                $cr->setName($attendee'name');
+                $cr->setName($attendee'name' ?? null);
 
                 // set attendee RSVP if missing
                 if (!isset($attendee'rsvp')) {
@@ -519,6 +519,10 @@
         $valarm_hashes = array();
         if (!empty($object'valarms')) {
             foreach ($object'valarms' as $valarm) {
+                if (empty($valarm'action') || empty($valarm'trigger')) {
+                    continue;
+                }
+
                 if (!array_key_exists($valarm'action', $this->alarm_type_map)) {
                     continue;  // skip unknown alarm types
                 }
@@ -548,10 +552,10 @@
                 }
                 else {
                     // action == DISPLAY
-                    $alarm = new Alarm(strval($valarm'summary' ?: $object'title'));
+                    $alarm = new Alarm(strval(!empty($valarm'summary') ? $valarm'summary' : $object'title'));
                 }
 
-                if (is_object($valarm'trigger') && $valarm'trigger' instanceof DateTimeInterface) {
+                if ($valarm'trigger' instanceof DateTimeInterface) {
                     $alarm->setStart(self::get_datetime($valarm'trigger', new DateTimeZone('UTC')));
                 }
                 else if (preg_match('/^@(0-9+)$/', $valarm'trigger', $m)) {
@@ -584,7 +588,8 @@
                         $alarm->setDuration($duration, intval($valarm'repeat' ?? 0));
                     }
                     catch (Exception $e) {
-                        // ignore
+                        // ignore, but log
+                        rcube::raise_error($e, true);
                     }
                 }
 
@@ -659,8 +664,9 @@
 
             if ($field) {
                 $a = array();
-                foreach ((array) $object$col as $attr)
-                    $a = $attr$field;
+                foreach ((array) $object$col as $attr) {
+                    $a = $attr$field ?? null;
+                }
                 $val = join(' ', $a);
             }
             else {

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

@@ -279,11 +279,12 @@
     {
         $rcmail = rcube::get_instance();
 
-        $url = 'https://' . $_SESSION'imap_host' . '/freebusy';
-        $url = $rcmail->config->get('kolab_freebusy_server', $url);
-        $url = rcube_utils::resolve_url($url);
+        if ($url = $rcmail->config->get('kolab_freebusy_server')) {
+            $url = rcube_utils::resolve_url($url);
+            $url = unslashify($url);
+        }
 
-        return unslashify($url);
+        return $url;
     }
 
     /**
@@ -293,10 +294,16 @@
      * @param object DateTime Start of the query range (optional)
      * @param object DateTime End of the query range (optional)
      *
-     * @return string Fully qualified URL to query free/busy data
+     * @return ?string Fully qualified URL to query free/busy data
      */
     public static function get_freebusy_url($email, $start = null, $end = null)
     {
+        $url = self::get_freebusy_server();
+
+        if (empty($url)) {
+            return null;
+        }
+
         $query = '';
         $param = array();
         $utc = new \DateTimeZone('UTC');
@@ -317,8 +324,6 @@
             $query = '?' . http_build_query($param);
         }
 
-        $url = self::get_freebusy_server();
-
         if (strpos($url, '%u')) {
             // Expected configured full URL, just replace the %u variable
             // Note: Cyrus v3 Free-Busy service does not use .ifb extension

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

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

@@ -1099,13 +1099,14 @@
     {
         $owner = $this->get_owner();
         $result = false;
+        $url = kolab_storage::get_freebusy_server();
 
-        switch($this->type) {
+        switch ($this->type) {
         case 'event':
-            if ($this->get_namespace() == 'personal') {
+            if ($url && $this->get_namespace() == 'personal') {
                 $result = $this->trigger_url(
                     sprintf('%s/trigger/%s/%s.pfb',
-                        kolab_storage::get_freebusy_server(),
+                        $url,
                         urlencode($owner),
                         urlencode($this->imap->mod_folder($this->name))
                     ),
@@ -1119,7 +1120,7 @@
             return true;
         }
 
-        if ($result && is_object($result) && is_a($result, 'PEAR_Error')) {
+        if ($result instanceof PEAR_Error) {
             return PEAR::raiseError(
                 sprintf("Failed triggering folder %s. Error was: %s", $this->name, $result->getMessage())
             );

roundcubemail-1.5.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube_imap.php Changed

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube_mime.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 ComposerAutoloaderInit1e7582f2a9adbc38e8a5ab0990e94496
+class ComposerAutoloaderInit37865e036c35ba82229501ec90486b55
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit1e7582f2a9adbc38e8a5ab0990e94496', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit37865e036c35ba82229501ec90486b55', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit1e7582f2a9adbc38e8a5ab0990e94496', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit37865e036c35ba82229501ec90486b55', '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\ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit37865e036c35ba82229501ec90486b55::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\ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit37865e036c35ba82229501ec90486b55::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire1e7582f2a9adbc38e8a5ab0990e94496($fileIdentifier, $file);
+            composerRequire37865e036c35ba82229501ec90486b55($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire1e7582f2a9adbc38e8a5ab0990e94496($fileIdentifier, $file)
+function composerRequire37865e036c35ba82229501ec90486b55($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 ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496
+class ComposerStaticInit37865e036c35ba82229501ec90486b55
 {
     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 = ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit1e7582f2a9adbc38e8a5ab0990e94496::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit37865e036c35ba82229501ec90486b55::$classMap;
 
         }, null, ClassLoader::class);
     }

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

@@ -875,12 +875,12 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.5/roundcubemail-plugins-kolab-latest/plugins/kolab_2fa",
-                "reference": "577ff96c32f87ab3a5801e5e9ad477a66915ad1f"
+                "reference": "f1bbbcb76209b9aca24928ad2e78707284b672a1"
             },
             "require": {
                 "endroid/qr-code": "~1.6.5",
                 "enygma/yubikey": "~3.2",
-                "php": ">=5.3.0",
+                "php": ">=7.2.0",
                 "roundcube/plugin-installer": ">=0.1.3",
                 "spomky-labs/otphp": "~10.0.3"
             },
@@ -3044,17 +3044,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.19",
-            "version_normalized": "1.10.19.0",
+            "version": "1.10.26",
+            "version_normalized": "1.10.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "af5a296ff02610c1bfb4ddfac9fd4a08657b9046"
+                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/af5a296ff02610c1bfb4ddfac9fd4a08657b9046",
-                "reference": "af5a296ff02610c1bfb4ddfac9fd4a08657b9046",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f",
+                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f",
                 "shasum": ""
             },
             "require": {
@@ -3063,7 +3063,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-06-14T15:26:58+00:00",
+            "time": "2023-07-19T12:44:37+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"
@@ -4033,17 +4033,17 @@
         },
         {
             "name": "sabre/http",
-            "version": "5.1.6",
-            "version_normalized": "5.1.6.0",
+            "version": "5.1.7",
+            "version_normalized": "5.1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/http.git",
-                "reference": "9976ac34ced206bd6579b7b37b401de9fac98dae"
+                "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/http/zipball/9976ac34ced206bd6579b7b37b401de9fac98dae",
-                "reference": "9976ac34ced206bd6579b7b37b401de9fac98dae",
+                "url": "https://api.github.com/repos/sabre-io/http/zipball/b6fa04f42f49156eaab3fb890c79f4c43a9559b7",
+                "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7",
                 "shasum": ""
             },
             "require": {
@@ -4062,7 +4062,7 @@
             "suggest": {
                 "ext-curl": " to make http requests with the Client class"
             },
-            "time": "2022-07-15T14:51:14+00:00",
+            "time": "2023-06-26T10:13:00+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4266,17 +4266,17 @@
         },
         {
             "name": "sabre/xml",
-            "version": "2.2.5",
-            "version_normalized": "2.2.5.0",
+            "version": "2.2.6",
+            "version_normalized": "2.2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/xml.git",
-                "reference": "a6af111850e7536d200d9637c34885cd3c77a86c"
+                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/xml/zipball/a6af111850e7536d200d9637c34885cd3c77a86c",
-                "reference": "a6af111850e7536d200d9637c34885cd3c77a86c",
+                "url": "https://api.github.com/repos/sabre-io/xml/zipball/9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
+                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
                 "shasum": ""
             },
             "require": {
@@ -4292,7 +4292,7 @@
                 "phpstan/phpstan": "^0.12",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
             },
-            "time": "2021-11-04T06:37:27+00:00",
+            "time": "2023-06-28T12:56:05+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {

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

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '581177111fbabcd0438d91648c220437004a2c76',
+        'reference' => '5e2fa3e88c8c57c5dccc374230ef5a4a46354e66',
         'name' => 'roundcube/roundcubemail',
         'dev' => true,
     ),
@@ -126,7 +126,7 @@
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/kolab_2fa',
             'aliases' => array(),
-            'reference' => '577ff96c32f87ab3a5801e5e9ad477a66915ad1f',
+            'reference' => 'f1bbbcb76209b9aca24928ad2e78707284b672a1',
             'dev_requirement' => false,
         ),
         'kolab/kolab_activesync' => array(
@@ -510,12 +510,12 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.19',
-            'version' => '1.10.19.0',
+            'pretty_version' => '1.10.26',
+            'version' => '1.10.26.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
-            'reference' => 'af5a296ff02610c1bfb4ddfac9fd4a08657b9046',
+            'reference' => '5d660cbb7e1b89253a47147ae44044f49832351f',
             'dev_requirement' => true,
         ),
         'phpunit/php-code-coverage' => array(
@@ -644,7 +644,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '581177111fbabcd0438d91648c220437004a2c76',
+            'reference' => '5e2fa3e88c8c57c5dccc374230ef5a4a46354e66',
             'dev_requirement' => false,
         ),
         'roundcube/rtf-html-php' => array(
@@ -681,12 +681,12 @@
             'dev_requirement' => false,
         ),
         'sabre/http' => array(
-            'pretty_version' => '5.1.6',
-            'version' => '5.1.6.0',
+            'pretty_version' => '5.1.7',
+            'version' => '5.1.7.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/http',
             'aliases' => array(),
-            'reference' => '9976ac34ced206bd6579b7b37b401de9fac98dae',
+            'reference' => 'b6fa04f42f49156eaab3fb890c79f4c43a9559b7',
             'dev_requirement' => false,
         ),
         'sabre/uri' => array(
@@ -708,12 +708,12 @@
             'dev_requirement' => false,
         ),
         'sabre/xml' => array(
-            'pretty_version' => '2.2.5',
-            'version' => '2.2.5.0',
+            'pretty_version' => '2.2.6',
+            'version' => '2.2.6.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/xml',
             'aliases' => array(),
-            'reference' => 'a6af111850e7536d200d9637c34885cd3c77a86c',
+            'reference' => '9cde7cdab1e50893cc83b037b40cd47bfde42a2b',
             'dev_requirement' => false,
         ),
         'sebastian/code-unit-reverse-lookup' => array(

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/sendemail-validate.sample Added

@@ -0,0 +1,77 @@
+#!/usr/bin/sh
+
+# An example hook script to validate a patch (and/or patch series) before
+# sending it via email.
+#
+# The hook should exit with non-zero status after issuing an appropriate
+# message if it wants to prevent the email(s) from being sent.
+#
+# To enable this hook, rename this file to "sendemail-validate".
+#
+# By default, it will only check that the patch(es) can be applied on top of
+# the default upstream branch without conflicts in a secondary worktree. After
+# validation (successful or not) of the last patch of a series, the worktree
+# will be deleted.
+#
+# The following config variables can be set to change the default remote and
+# remote ref that are used to apply the patches against:
+#
+#   sendemail.validateRemote (default: origin)
+#   sendemail.validateRemoteRef (default: HEAD)
+#
+# Replace the TODO placeholders with appropriate checks according to your
+# needs.
+
+validate_cover_letter () {
+	file="$1"
+	# TODO: Replace with appropriate checks (e.g. spell checking).
+	true
+}
+
+validate_patch () {
+	file="$1"
+	# Ensure that the patch applies without conflicts.
+	git am -3 "$file" || return
+	# TODO: Replace with appropriate checks for this patch
+	# (e.g. checkpatch.pl).
+	true
+}
+
+validate_series () {
+	# TODO: Replace with appropriate checks for the whole series
+	# (e.g. quick build, coding style checks, etc.).
+	true
+}
+
+# main -------------------------------------------------------------------------
+
+if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1
+then
+	remote=$(git config --default origin --get sendemail.validateRemote) &&
+	ref=$(git config --default HEAD --get sendemail.validateRemoteRef) &&
+	worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) &&
+	git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref" &&
+	git config --replace-all sendemail.validateWorktree "$worktree"
+else
+	worktree=$(git config --get sendemail.validateWorktree)
+fi || {
+	echo "sendemail-validate: error: failed to prepare worktree" >&2
+	exit 1
+}
+
+unset GIT_DIR GIT_WORK_TREE
+cd "$worktree" &&
+
+if grep -q "^diff --git " "$1"
+then
+	validate_patch "$1"
+else
+	validate_cover_letter "$1"
+fi &&
+
+if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL"
+then
+	git config --unset-all sendemail.validateWorktree &&
+	trap 'git worktree remove -ff "$worktree"' EXIT &&
+	validate_series
+fi

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index 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> 1686830832 +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> 1686830833 +0200	checkout: moving from master to master
-5a319cf437d75aad564ce7fd076cc5423722868b 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1686830833 +0200	reset: moving to 5a319cf437d75aad564ce7fd076cc5423722868b
+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

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/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.rev Added

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar.asc Changed

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmSJ3CUACgkQUcZzBf/C
-5cAA1xAAk6e73+tZEVRVuWOE1u/Q6ZgMynL5cU1yOPhuoig09T6wwWubcD8ckdps
-QQc1d2lr5+5I+Yaj2tgoqu5r/CqnbpRa5WTSRSPdpIUkcdp54bJcE4WteH+P9wZQ
-QiCzxPSK4ZPPbVxLSWp7EjGfbcatf2Obx1KzoDlI21khDw7UaB9ZDISNKdBd96BB
-PXsBdqf5+SsWdxH3FiYJbPCHnKTio8gRVF0hH2nV8kFbgp4qolufJRlMdBDYJI0m
-0dGr3AA/Oya5Vv+qJi8Pn9tBUQPE9JJpvuQCTzzONTNJO7xffoVXgD1loVDvjZkX
-3hvgGkK9R3IKX5+JHG6BDJ/og+n+Vf3wg4/OPAZ84iQgl0kVdiR1ujXkJyiTxy1l
-ktr3qvnbnj45krbbYGVIR6XTstoGIVDfQpONoR6iPyfx0LvDWzpFXeE7FUHBooVZ
-rx0xwTLoQkwaCKVSsPXq+xv4+fhL0b9zyoFAoddIvjjtU6OxjIFqAVWAki7MiNml
-Gm8aoM6c9Q40wKNsU/43FtfJJzHrfIHFZS4a2kLCP/vcQiMWx49tOpBjH5XzFXy3
-fYThM7PvSlpgaAObY8Lp4HPST6zHMq0xTThmHOMkyFgheBE85aQwvgWmgE3bFobs
-L9d9EoKceyYA0ozQ+JIn3uDV6c0TZVJ2W97AAqAJBj1MBz64BCI=
-=F5Pi
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmS32poACgkQUcZzBf/C
+5cCvmg/+JJmyX663fa+FHy7ED2SexVuChivpbp82dyLx1gRAl15rtNG4zjxNRfnW
+6GpsysMhKqrN7p6xur18ZkLqdFKAjeNnpTunnh/ADetcrs8wzLNyAy7luQtyXAuj
+SOv5f/Yitg9yvZ2GHrbzchQuSjkbUR2KroBYsRhwVTH7pMIgdvysRBYiENfbz350
+n91WOCApDnVCygzEhBbhkwA/xklJnUxkRJX3AlbbCwES9K64ELyGd0BqJ1Ohy2a7
+4cFjwRJq9/tXf99fyncamN8xyBdvYBXSNRNMPYcjKqKIZCOePlR8Q3b7nt154w+e
+w2qnAevOB4dYzJaSjwJlaVQYR1YIQ7NlYkGboONq/lrtJlEejDdiRmGvgHZ8nSYW
+Ob2JwqgYDfUPfsnXAwXM+whpUNJi30MDB7MSw3SiDlyw690HheT/DCKOJ9yNUiOB
+TSGkbIGW/ASett78gowjwniYdryE5ufUPwZbkSaFC3CDysHfs6Jgc+lxe3wnOHtD
+WyPl1TqDRNuLOZ26TgxI3gGEYqMcVDYQfmuiOakoebHx6j0bpvyEaP51j0/JFpu6
+okKulXgC1DUluKFWMPhobPQRZ8zC29macnU74JvmJIiUhfiP2Pl16D+XcjFW++zH
+EDEghcCdgz0pIF6UI5j02rbNAfu7Oo685pnYeXq0DexgXjqoFOE=
+=NF4z
 -----END PGP SIGNATURE-----

roundcubemail-1.5.tar.gz/vendor/sabre/http/CHANGELOG.md Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Sapi.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Version.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/Auth/AWSTest.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/FunctionsTest.php Changed

@@ -7,6 +7,30 @@
 class FunctionsTest extends \PHPUnit\Framework\TestCase
 {
     /**
+     * @dataProvider getHeaderValuesDataOnValues2
+     */
+    public function testGetHeaderValuesOnValues2($result, $values1, $values2)
+    {
+        $this->assertEquals($result, getHeaderValues($values1, $values2));
+    }
+
+    public function getHeaderValuesDataOnValues2()
+    {
+        return 
+            
+                'a', 'b',
+                'a',
+                'b',
+            ,
+            
+                'a', 'b', 'c', 'd', 'e',
+                'a', 'b', 'c',
+                'd', 'e',
+            ,
+        ;
+    }
+
+    /**
      * @dataProvider getHeaderValuesData
      */
     public function testGetHeaderValues($input, $output)
@@ -174,4 +198,12 @@
             toDate($dt)
         );
     }
+
+    public function testParseMimeTypeOnInvalidMimeType()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Not a valid mime-type: invalid_mime_type');
+
+        parseMimeType('invalid_mime_type');
+    }
 }

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/SapiTest.php Changed

@@ -31,6 +31,34 @@
         $this->assertNull($request->getRawServerValue('FOO'));
     }
 
+    public function testConstructFromServerArrayOnNullUrl()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The _SERVER array must have a REQUEST_URI key');
+
+        $request = Sapi::createFromServerArray(
+            'REQUEST_METHOD' => 'GET',
+            'HTTP_USER_AGENT' => 'Evert',
+            'CONTENT_TYPE' => 'text/xml',
+            'CONTENT_LENGTH' => '400',
+            'SERVER_PROTOCOL' => 'HTTP/1.0',
+        );
+    }
+
+    public function testConstructFromServerArrayOnNullMethod()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The _SERVER array must have a REQUEST_METHOD key');
+
+        $request = Sapi::createFromServerArray(
+            'REQUEST_URI' => '/foo',
+            'HTTP_USER_AGENT' => 'Evert',
+            'CONTENT_TYPE' => 'text/xml',
+            'CONTENT_LENGTH' => '400',
+            'SERVER_PROTOCOL' => 'HTTP/1.0',
+        );
+    }
+
     public function testConstructPHPAuth()
     {
         $request = Sapi::createFromServerArray(
@@ -259,4 +287,35 @@
 
         $this->assertEquals('foo', $result);
     }
+
+    public function testSendConnectionAborted(): void
+    {
+        $baseUrl = getenv('BASEURL');
+        if (!$baseUrl) {
+            $this->markTestSkipped('Set an environment value BASEURL to continue');
+        }
+
+        $url = rtrim($baseUrl, '/').'/connection_aborted.php';
+        $chunk_size = 4 * 1024 * 1024;
+        $fetch_size = 6 * 1024 * 1024;
+
+        $stream = fopen($url, 'r');
+        $size = 0;
+
+        while ($size <= $fetch_size) {
+            $temp = fread($stream, 8192);
+            if (false === $temp) {
+                break;
+            }
+            $size += strlen($temp);
+        }
+
+        fclose($stream);
+
+        sleep(5);
+
+        $bytes_read = file_get_contents(sys_get_temp_dir().'/dummy_stream_read_counter');
+        $this->assertEquals($chunk_size * 2, $bytes_read);
+        $this->assertGreaterThanOrEqual($fetch_size, $bytes_read);
+    }
 }

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/www/connection_aborted.php Added

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+use Sabre\HTTP;
+
+include '../bootstrap.php';
+
+class DummyStream
+{
+    private $position;
+
+    public function stream_open(string $path, string $mode, int $options, ?string &$opened_path): bool
+    {
+        $this->position = 0;
+
+        return true;
+    }
+
+    public function stream_read(int $count): string
+    {
+        $this->position += $count;
+
+        return random_bytes($count);
+    }
+
+    public function stream_tell(): int
+    {
+        return $this->position;
+    }
+
+    public function stream_eof(): bool
+    {
+        return $this->position > 25 * 1024 * 1024;
+    }
+
+    public function stream_close(): void
+    {
+        file_put_contents(sys_get_temp_dir().'/dummy_stream_read_counter', $this->position);
+    }
+}
+
+/*
+ * The DummyStream wrapper has two functions:
+ * - Provide dummy data.
+ * - Count how many bytes have been read.
+ */
+stream_wrapper_register('dummy', DummyStream::class);
+
+/*
+ * Overwrite default connection handling.
+ * The default behaviour is however for your script to be aborted when the remote client disconnects.
+ *
+ * Nextcloud/ownCloud set ignore_user_abort(true) on purpose to work around
+ * some edge cases where the default behavior would end a script too early.
+ *
+ * https://github.com/owncloud/core/issues/22370
+ * https://github.com/owncloud/core/pull/26775
+ */
+ignore_user_abort(true);
+
+$body = fopen('dummy://hello', 'r');
+
+$response = new HTTP\Response();
+$response->setStatus(200);
+$response->addHeader('Content-Length', 25 * 1024 * 1024);
+$response->setBody($body);
+
+HTTP\Sapi::sendResponse($response);

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Deserializer/functions.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Version.php Changed

Overview

Request 3190 (accepted)

Request History