Request 3222 (accepted)

This request supersedes: request 3221 (Show diff)

Overview

Request 3222 (accepted)

New release 1.1.2.6

Created by mollekopf 9 months ago
In state accepted
Supersedes 3221
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
+Version: 1.1.2.6
 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/install 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

@@ -49,7 +49,7 @@
 			'hosts'     => array($config'host'),
 			'port'      => $host'port' ?: 389,
 			'use_tls'   => $host'scheme' == 'tls',
-			'root_dn'   => $config'root_dn' ?: $config'base_dn',
+			'root_dn'   => ($config'root_dn' ?? null) ?: ($config'base_dn' ?? null),
 			'log_hook'  => array($this, 'log'),
 		) + $config;
 
@@ -113,10 +113,10 @@
 
 			// result attributes
 			$attribs = array_unique(array_merge(
-					Config::convert($this->config'mail_attributes', Config::ARR),
-					Config::convert($this->config'attributes', Config::ARR), // deprecated
-					Config::convert($this->config'resolve_dn', Config::ARR),
-					Config::convert($this->config'resolve_attribute', Config::ARR)
+					Config::convert($this->config'mail_attributes' ?? null, Config::ARR),
+					Config::convert($this->config'attributes' ?? null, Config::ARR), // deprecated
+					Config::convert($this->config'resolve_dn' ?? null, Config::ARR),
+					Config::convert($this->config'resolve_attribute' ?? null, Config::ARR)
 			));
 
 			// search with configured base_dn and filter

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 (!empty($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);
 			}
@@ -346,13 +347,14 @@
 	 */
 	private function check_participation($event, $user_email, &$status = null)
 	{
+        $is_organizer = false;
 		if (is_array($event'organizer') && !empty($event'organizer''email')) {
 			if (in_array($event'organizer''email', $user_email)) {
 				$is_organizer = true;
 			}
 		}
 
-		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';
@@ -361,7 +363,7 @@
 			}
 		}
 
-		if ($is_organizer || $event'namespace' == 'personal') {
+		if ($is_organizer || ($event'namespace' ?? null) == 'personal') {
 			$status = 'ACCEPTED';
 			if ($event'free_busy' == 'tentative') {
 				$status = 'TENTATIVE';

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

release.sh Added

Build Results
RPM Lint

Refresh

Comments for request 3222 0

Request History

mollekopf created request 9 months ago

New release 1.1.2.6

mollekopf accepted request 9 months ago