Request 3113 (accepted)

This request supersedes: request 3112 (Show diff)

Overview

Request 3113 (accepted)

New release

Created by mollekopf over 1 year ago
In state accepted
Supersedes 3112
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit iRony

Submit package Kolab:16:Testing / iRony to package Kolab:16 / iRony

iRony.spec Changed

debian.changelog Changed

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

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

@@ -74,7 +74,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 +86,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 +98,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
@@ -192,7 +193,7 @@
             }
         }
 
-        if (!$port) {
+        if (empty($port)) {
             $port = $default_port;
         }

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

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3113 0

Request History

mollekopf created request over 1 year ago

New release

mollekopf accepted request over 1 year ago