@@ -35,10 +35,9 @@

 %endif

 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}

-%global upstream_version 0.4.8

 Name:           iRony

-Version: 0.4.8.2

+Version:        0.4.8

 Release:       1%{?dist}

 Summary:        DAV for Kolab Groupware

@@ -47,7 +46,7 @@

 URL:            http://kolab.org

 # From 7ebe1adc8b7c0f818d837d682b2b85202aac9303

-Source0:        iRony-%{upstream_version}.tar.gz

+Source0:        iRony-%{version}.tar.gz

 Source1:        iRony.conf

 Source2:        iRony.logrotate

​

@@ -1,6 +1,6 @@

-irony (0.4.8.2-1~kolab1) unstable; urgency=low

+irony (0.4.8-1~kolab1) unstable; urgency=low

-  * New release

+  * PHP 8 fixes

  -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 24 Feb 2023 12:12:13 +0100

​

@@ -423,7 +423,7 @@

         }

         // map attachments attribute

-        $object'_attachments' = !empty($object'attachments') ? $object'attachments' : array();

+        $object'_attachments' = $object'attachments';

         unset($object'attachments');

         // remove categories from object data (only for tasks yet)

​

@@ -62,7 +62,7 @@

         $this->addressBookInfo = array(

             'id' => self::DIRECTORY_NAME,

             'uri' => self::DIRECTORY_NAME,

-            '{DAV:}displayname' => !empty($config'name') ? $config'name' : "LDAP Directory",

+            '{DAV:}displayname' => $config'name' ?: "LDAP Directory",

             '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Xml\Property\SupportedAddressData(),

             'principaluri' => $principalUri,

         );

@@ -85,12 +85,12 @@

     private function connect()

     {

-        if (!isset($this->ldap)) {

-            $this->ldap = new rcube_ldap($this->config, $this->config'debug');

-            $this->ldap->set_pagesize(!empty($this->config'sizelimit') ? $this->config'sizelimit' : 10000);

-        }

+      if (!isset($this->ldap)) {

+        $this->ldap = new rcube_ldap($this->config, $this->config'debug');

+        $this->ldap->set_pagesize($this->config'sizelimit' ?: 10000);

+      }

-        return $this->ldap->ready ? $this->ldap : null;

+      return $this->ldap->ready ? $this->ldap : null;

     }

     /**

@@ -199,7 +199,7 @@

         $children = array();

         // return cached index

-        if (!$this->query && empty($this->config'searchonly') && $this->cache && ($cached_index = $this->cache->get('index'))) {

+        if (!$this->query && !$this->config'searchonly' && $this->cache && ($cached_index = $this->cache->get('index'))) {

             foreach ($cached_index as $uid => $c) {

                 $obj = array(

                     'id'   => $uid,

@@ -214,7 +214,7 @@

         }

         // query LDAP if we have a search query or listing is allowed

-        if (($this->query || empty($this->config'searchonly')) && ($ldap = $this->connect())) {

+        if (($this->query || !$this->config'searchonly') && ($ldap = $this->connect())) {

             // set pagesize from query limit attribute

             if ($this->query && $this->query->limit) {

                 $this->ldap->set_pagesize(intval($this->query->limit));

​

@@ -2,7 +2,7 @@

 Source: irony

 Binary: irony

 Architecture: all

-Version: 1:0.4.8.2-1~kolab1

+Version: 0.4.8-1~kolab1

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

 Homepage: http://www.kolab.org/

​