Request 3218 (superseded)

This request is superseded by request 3219 (Show diff)

You're not reviewing the full diff of request 3218 , but the diff to the superseded request 3217 (Show full diff)

Overview

Request 3218 (superseded)

New release 1.1.2.3

Created by mollekopf over 1 year ago
In state superseded
Supersedes 3217
Superseded by 3219
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-freebusy

Submit package Kolab:16:Testing / kolab-freebusy to package Kolab:16 / kolab-freebusy

kolab-freebusy.spec Changed

@@ -21,16 +21,17 @@
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
+%global upstream_version 1.1.2
 
 Name:           kolab-freebusy
-Version: 1.1.2.2
+Version: 1.1.2.3
 Release:        1%{?dist}
 Summary:        Kolab Free/Busy Web Presentation Layer
 
 Group:          Applications/Internet
 License:        AGPLv3+
 URL:            http://kolab.org/about/kolab-freebusy
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-%{upstream_version}.tar.gz
 Source1:        kolab-freebusy.logrotate
 
 BuildArch:      noarch
@@ -57,7 +58,7 @@
 for its users.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{upstream_version}
 
 %install
 mkdir -p \
@@ -85,8 +86,6 @@
 popd
 
 cp -a public_html %{buildroot}/%{_datadir}/%{name}/public_html
-ln -s ../roundcubemail/vendor vendor
-
 cp -a config/config.ini.sample %{buildroot}/%{_sysconfdir}/%{name}/config.ini
 
 pushd %{buildroot}/%{_datadir}/%{name}/config
@@ -96,6 +95,7 @@
 popd
 
 pushd %{buildroot}/%{_datadir}/%{name}/
+ln -s ../roundcubemail/vendor vendor
 ln -s ../../..%{_localstatedir}/log/%{name} logs
 popd

debian.changelog Changed

debian.rules Changed

debian.tar.gz/links Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/Config.php Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/Directory.php Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/DirectoryLDAP.php Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/SourceIMAP.php Changed

@@ -139,7 +139,7 @@
 				}
 
 				// set ACL (temporarily)
-				if ($config'acl') {
+				if ($config'acl' ?? null) {
 					$folder->_old_acl = $folder->get_myrights();
 					$imap->set_acl($folder->name, $config'user', $config'acl');
 				}
@@ -147,7 +147,7 @@
 				foreach ($folder->select($query) as $event) {
 					//$log->debug('Processing event', $event);
 
-					if ($event'cancelled') {
+					if ($event'cancelled' ?? null) {
 						continue;
 					}
 
@@ -178,15 +178,16 @@
 
 					// avoid duplicate entries
 					$key = $event'start'->format('c') . '/' . $event'end'->format('c');
-					if ($seen$key++) {
+					if ($seen$key) {
 						$log->debug('Skipping duplicate event at ' . $key, array($event'uid', $event'title'));
 						continue;
 					}
+                    $seen$key = true;
 
 					// copied from libvcalendar::_to_ical()
 					$ve = $this->to_vevent($event, $calendar, $user_email);
 
-					if ($event'recurrence') {
+					if ($event'recurrence' ?? null) {
 						if ($exdates = $event'recurrence''EXDATE')
 							unset($event'recurrence''EXDATE');
 						if ($rdates = $event'recurrence''RDATE')
@@ -308,7 +309,7 @@
 	private function imap_disconnect($imap, $config, $folders)
 	{
 		// reset ACL
-		if ($config'acl' && !empty($folders)) {
+		if (($config'acl' ?? null) && !empty($folders)) {
 			foreach ($folders as $folder) {
 				$imap->set_acl($folder->name, $config'user', $folder->_old_acl);
 			}
@@ -352,7 +353,7 @@
 			}
 		}
 
-		if (!$is_organizer && is_array($event'attendees')) {
+		if (!$is_organizer && is_array($event'attendees' ?? null)) {
 			foreach ($event'attendees' as $attendee) {
 				if (in_array($attendee'email', $user_email)) {
 					$status = $attendee'status';

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/Utils.php Changed

kolab-freebusy-1.1.2.tar.gz/public_html/index.php Changed

kolab-freebusy.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3218 0

Request History

mollekopf created request over 1 year ago

New release 1.1.2.3

mollekopf superseded request over 1 year ago

superseded by 3219