Kolab Groupware OBS

iRony.spec Changed

@@ -35,10 +35,11 @@
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
+%global upstream_version 0.4.8
 
 Name:           iRony
-Version:        0.4.6
-Release:	    4%{?dist}
+Version: 0.4.8.2
+Release:	    1%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
@@ -46,12 +47,10 @@
 URL:            http://kolab.org
 
 # From 7ebe1adc8b7c0f818d837d682b2b85202aac9303
-Source0:        iRony-%{version}.tar.gz
+Source0:        iRony-%{upstream_version}.tar.gz
 Source1:        iRony.conf
 Source2:        iRony.logrotate
 
-Patch0:         0001-Remove-type-declaration-from-property.patch
-
 BuildArch:      noarch
 
 Requires:       chwala >= 0.5.2
@@ -75,7 +74,7 @@
 Kolab Groupware solution.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{upstream_version}
 
 %build
 
@@ -161,9 +160,6 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
-* Wed Dec 28 2022 Christoph Erhardt <kolab@sicherha.de> - 0.4.6-4
-- Fix compatibility with PHP < 7.4.0 (T7097)
-
 * Mon Dec 19 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.4.6-3
 - Updated tarball

0001-Remove-type-declaration-from-property.patch Deleted

@@ -1,33 +0,0 @@
-From d0e899c9373eeadc9896117338ba072e579c6b00 Mon Sep 17 00:00:00 2001
-Message-Id: <d0e899c9373eeadc9896117338ba072e579c6b00.1672257858.git.christoph.erhardt@sicherha.de>
-From: Christoph Erhardt <kolab@sicherha.de>
-Date: Wed, 28 Dec 2022 18:22:50 +0100
-Subject: PATCH Remove type declaration from property
-
-Summary: This syntax is not compatible with PHP < 7.4.0. Fixes T7097.
-
-Reviewers: mollekopf
-
-Maniphest Tasks: T7097
-
-Differential Revision: https://git.kolab.org/D3968
----
- lib/Kolab/CardDAV/LDAPDirectory.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Kolab/CardDAV/LDAPDirectory.php b/lib/Kolab/CardDAV/LDAPDirectory.php
-index 022eb6a..08c1d60 100644
---- a/lib/Kolab/CardDAV/LDAPDirectory.php
-+++ b/lib/Kolab/CardDAV/LDAPDirectory.php
-@@ -48,7 +48,7 @@ class LDAPDirectory extends DAV\Collection implements \Sabre\CardDAV\IDirectory,
-     protected $principalUri;
-     protected $addressBookInfo = array();
-     protected $cache;
--    protected CardDAV\Xml\Request\AddressBookQueryReport $query;
-+    protected $query;
-     protected $filter;
- 
-     /**
--- 
-2.38.1
-

_link Changed

buildtarball.sh Added

debian.changelog Changed

iRony-0.4.6.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php -> iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php Changed

@@ -112,11 +112,11 @@
     public function get_storage_folder($id)
     {
         // resolve alias name
-        if ($this->aliases$id) {
+        if (!empty($this->aliases$id)) {
             $id = $this->aliases$id;
         }
 
-        if ($this->folders$id) {
+        if (!empty($this->folders$id)) {
             DAVBackend::check_storage_folder($this->folders$id);
             return $this->folders$id;
         }
@@ -180,11 +180,11 @@
         $id = $calendarUri;
 
         // resolve aliases (calendar by folder name)
-        if ($this->aliases$calendarUri) {
+        if (!empty($this->aliases$calendarUri)) {
             $id = $this->aliases$calendarUri;
         }
 
-        if ($this->calendars$id && empty($this->calendars$id'principaluri')) {
+        if (!empty($this->calendars$id) && empty($this->calendars$id'principaluri')) {
             $this->calendars$id'principaluri' = 'principals/' . HTTPBasic::$current_user;
         }
 
@@ -347,7 +347,7 @@
 
         if ($storage && ($event = $storage->get_object($uid))) {
             // deliver attachment content directly
-            if ($part && !empty($event'_attachments')) {
+            if (!empty($part) && !empty($event'_attachments')) {
                 foreach ($event'_attachments' as $attachment) {
                     if ($attachment'id' == $part) {
                         header('Content-Type: ' . $attachment'mimetype');
@@ -423,7 +423,7 @@
         }
 
         // map attachments attribute
-        $object'_attachments' = $object'attachments';
+        $object'_attachments' = !empty($object'attachments') ? $object'attachments' : array();
         unset($object'attachments');
 
         // remove categories from object data (only for tasks yet)
@@ -1156,10 +1156,11 @@
         if (is_array($event'attendees')) {
             foreach ($event'attendees' as $attendee) {
                 if (in_array($attendee'email', $user_emails)) {
-                    if ($attendee'status' == 'DECLINED') {
+                    $status = !empty($attendee'status') ? $attendee'status' : null;
+                    if ($status == 'DECLINED') {
                         return false;
                     }
-                    else if ($inbox && $attendee'status' == 'NEEDS-ACTION') {
+                    else if ($inbox && $status == 'NEEDS-ACTION') {
                         return true;
                     }
                 }

iRony-0.4.6.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php -> iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php Changed

iRony-0.4.6.tar.gz/lib/Kolab/CardDAV/LDAPDirectory.php -> iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/LDAPDirectory.php Changed

@@ -62,7 +62,7 @@
         $this->addressBookInfo = array(
             'id' => self::DIRECTORY_NAME,
             'uri' => self::DIRECTORY_NAME,
-            '{DAV:}displayname' => $config'name' ?: "LDAP Directory",
+            '{DAV:}displayname' => !empty($config'name') ? $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($this->config'sizelimit' ?: 10000);
-      }
+        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);
+        }
 
-      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 && !$this->config'searchonly' && $this->cache && ($cached_index = $this->cache->get('index'))) {
+        if (!$this->query && empty($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 || !$this->config'searchonly') && ($ldap = $this->connect())) {
+        if (($this->query || empty($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));

iRony-0.4.6.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php -> iRony-0.4.8.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php Changed

@@ -28,6 +28,8 @@
 use \rcube_user;
 use \rcube_utils;
 use Sabre\DAV;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 
 /**
  *
@@ -74,7 +76,7 @@
             }
 
             // LDAP server failure... send 503 error
-            if ($auth'kolab_ldap_error') {
+            if (!empty($auth'kolab_ldap_error')) {
                 throw new ServiceUnavailable('The service is temporarily unavailable (LDAP failure)');
             }
         }
@@ -86,7 +88,8 @@
         }
 
         // authenticate user against the IMAP server
-        $user_id = $auth'abort' ? 0 : $this->_login($auth'user', $auth'pass', $auth'host', $error);
+        $error = null;
+        $user_id = !empty($auth'abort') ? 0 : $this->_login($auth'user', $auth'pass', $auth'host', $error);
 
         if ($user_id) {
             self::$current_user = $auth'user';
@@ -97,12 +100,12 @@
             return true;
         }
 
-        if ($error) {
-            $error_str = rcube::get_instance()->get_storage()->get_error_str();
-        }
-
         if (class_exists('kolab_auth')) {
-            \kolab_auth::log_login_error($auth'user', $error_str ?: $error);
+            if ($error) {
+                $error_str = rcube::get_instance()->get_storage()->get_error_str();
+            }
+
+            \kolab_auth::log_login_error($auth'user', $error_str ?? null);
         }
 
         // IMAP server failure... send 503 error
@@ -127,6 +130,28 @@
     }
 
     /**
+     * When this method is called, the backend must check if authentication was
+     * successful.
+     *
+     * The returned value must be one of the following
+     *
+     * true, "principals/username"
+     * false, "reason for failure"
+     *
+     * @return array
+     */
+    public function check(RequestInterface $request, ResponseInterface $response)
+    {
+        $result = parent::check($request, $response);
+    
+        if ($result0) {
+            $result1 = $this->principalPrefix . $this->getCurrentUser();
+        }
+    
+        return $result;
+    }
+
+    /**
      * Storage host selection
      */
     protected function _select_host($username)
@@ -192,7 +217,7 @@
             }
         }
 
-        if (!$port) {
+        if (empty($port)) {
             $port = $default_port;
         }

iRony-0.4.6.tar.gz/lib/Kolab/DAV/Node.php -> iRony-0.4.8.tar.gz/lib/Kolab/DAV/Node.php Changed

iRony-0.4.6.tar.gz/public_html/index.php -> iRony-0.4.8.tar.gz/public_html/index.php Changed

iRony.dsc Changed

Changes of Revision 12