Request 3113 (accepted)

You're not reviewing the full diff of request 3113 , but the diff to the superseded request 3112 (Show full 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-0.4.7.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php Changed

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

@@ -74,7 +74,7 @@
             }
 
             // LDAP server failure... send 503 error
-            if (!empty($auth'kolab_ldap_error')) {
+            if ($auth'kolab_ldap_error') {
                 throw new ServiceUnavailable('The service is temporarily unavailable (LDAP failure)');
             }
         }
@@ -86,8 +86,7 @@
         }
 
         // authenticate user against the IMAP server
-        $error = null;
-        $user_id = !empty($auth'abort') ? 0 : $this->_login($auth'user', $auth'pass', $auth'host', $error);
+        $user_id = $auth'abort' ? 0 : $this->_login($auth'user', $auth'pass', $auth'host', $error);
 
         if ($user_id) {
             self::$current_user = $auth'user';
@@ -98,12 +97,12 @@
             return true;
         }
 
-        if (class_exists('kolab_auth')) {
-            if ($error) {
-                $error_str = rcube::get_instance()->get_storage()->get_error_str();
-            }
+        if ($error) {
+            $error_str = rcube::get_instance()->get_storage()->get_error_str();
+        }
 
-            \kolab_auth::log_login_error($auth'user', $error_str ?? null);
+        if (class_exists('kolab_auth')) {
+            \kolab_auth::log_login_error($auth'user', $error_str ?: $error);
         }
 
         // IMAP server failure... send 503 error
@@ -193,7 +192,7 @@
             }
         }
 
-        if (empty($port)) {
+        if (!$port) {
             $port = $default_port;
         }

iRony-0.4.7.tar.gz/public_html/index.php 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