Request 3115 (accepted)

Overview

Request 3115 (accepted)

New release

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

Submit kolab-autoconf

Submit package Kolab:16:Testing / kolab-autoconf to package Kolab:16 / kolab-autoconf

kolab-autoconf.spec Changed

@@ -29,7 +29,7 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:       kolab-autoconf
-Version:    1.3.4
+Version:    1.3.5
 Release:    1%{?dist}
 Summary:    Autodiscovery for clients of Kolab Groupware
 
@@ -39,9 +39,8 @@
 
 Source0:    http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 
-%if 0%{?plesk} < 1
-Requires:   php-kolab-net-ldap3
-%endif
+Requires:       roundcubemail(core) >= 1.5
+BuildRequires:  roundcubemail(core) >= 1.5
 
 Obsoletes:  kolab-autodiscover < %{version}-%{release}
 Provides:   kolab-autodiscover = %{version}-%{release}
@@ -67,10 +66,20 @@
 ln -s ../../..%{_var}/log/%{name} logs
 popd
 
+
+rm -rf vendor
+ln -s ../roundcubemail/vendor vendor
+
 %if 0%{?plesk} < 1
 %{__install} -pm 644 docs/%{name}.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf
 %endif
 
+%pretrans
+# upgrade path for `vendor` directory -> symlink change. Is just a vendor directory, so we don't do the rpmmoved dance.
+if  -d "/usr/share/kolab-autoconf/vendor" -a ! -L "/usr/share/kolab-autoconf/vendor" ; then
+    rm -rf /usr/share/kolab-autoconf/vendor
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc docs/*

debian.changelog Changed

debian.rules Changed

debian.tar.gz/links Changed

kolab-autoconf-1.3.5.tar.gz/composer.json Added

kolab-autoconf-1.3.4.tar.gz/lib/Autodiscover.php -> kolab-autoconf-1.3.5.tar.gz/lib/Autodiscover.php Changed

@@ -156,7 +156,7 @@
             if ($value = $this->conf->get('autodiscover', $type)) {
                 $params = explode(';', $value);
 
-                $pass_secure = in_array($params1, array('CRAM-MD5', 'DIGEST-MD5'));
+                $pass_secure = in_array($params1 ?? null, array('CRAM-MD5', 'DIGEST-MD5'));
 
                 $host = $params0;
                 $host = str_replace('%d', $this->config'domain', $host);
@@ -165,8 +165,8 @@
                 $this->config$type = array(
                     'hostname'        => $url'host',
                     'port'            => $url'port',
-                    'socketType'      => $proto_map$url'scheme' ?: 'plain',
-                    'username'        => $this->config'login' ?: $this->config'email',
+                    'socketType'      => ($proto_map$url'scheme' ?? false) ?: 'plain',
+                    'username'        => ($this->config'login' ?? false) ?:  $this->config'email',
                     'authentication'  => 'password-' . ($pass_secure ? 'encrypted' : 'cleartext'),
                 );
             }
@@ -233,8 +233,6 @@
             $this->_ldap_port = $this->_ldap_scheme == 'ldaps' ? 636 : 389;
         }
 
-        require_once 'Net/LDAP3.php';
-
         $this->ldap = new Net_LDAP3(array(
             'debug'           => in_array(strtolower($this->conf->get('autodiscover', 'debug_mode')), array('trace', 'debug')),
             'log_hook'        => array($this, 'ldap_log'),

kolab-autoconf-1.3.4.tar.gz/lib/AutodiscoverMicrosoft.php -> kolab-autoconf-1.3.5.tar.gz/lib/AutodiscoverMicrosoft.php Changed

@@ -159,11 +159,11 @@
 
         $dispname = $xml->createElement('DisplayName');
         $dispname = $user->appendChild($dispname);
-        $dispname->appendChild($xml->createTextNode($this->config'username'));
+        $dispname->appendChild($xml->createTextNode($this->config'username' ?? null));
 
         $email = $xml->createElement('EMailAddress');
         $email = $user->appendChild($email);
-        $email->appendChild($xml->createTextNode($this->config'login' ?: $this->config'email'));
+        $email->appendChild($xml->createTextNode(($this->config'login' ?? false) ?: $this->config'email'));
 
         $element = $xml->createElement('Type');
         $element = $server->appendChild($element);
@@ -212,11 +212,11 @@
 
         $dispname = $xml->createElement('DisplayName');
         $dispname = $user->appendChild($dispname);
-        $dispname->appendChild($xml->createTextNode($this->config'username'));
+        $dispname->appendChild($xml->createTextNode($this->config'username' ?? null));
 
         $email = $xml->createElement('AutoDiscoverSMTPAddress');
         $email = $user->appendChild($email);
-        $email->appendChild($xml->createTextNode($this->config'login' ?: $this->config'email'));
+        $email->appendChild($xml->createTextNode(($this->config'login' ?? false) ?: $this->config'email'));
 
         // @TODO: Microsoft supports also DAV protocol here
         foreach (array('imap', 'pop3', 'smtp') as $type) {

kolab-autoconf-1.3.4.tar.gz/lib/Conf.php -> kolab-autoconf-1.3.5.tar.gz/lib/Conf.php Changed

@@ -139,16 +139,18 @@
 
         // Fall back to whatever is the equivalent of auth_mechanism as the
         // section (i.e. 'ldap', or 'sql')
-        $auth_mech = $this->_conf'kolab''auth_mechanism';
-        if (isset($this->_conf$auth_mech)) {
-            if (isset($this->_conf$auth_mech$key1)) {
-                return $this->_conf$auth_mech$key1;
+        if (isset($this->_conf'kolab')) {
+            $auth_mech = $this->_conf'kolab''auth_mechanism' ?? null;
+            if ($auth_mech && isset($this->_conf$auth_mech)) {
+                if (isset($this->_conf$auth_mech$key1)) {
+                    return $this->_conf$auth_mech$key1;
+                }
             }
-        }
 
-        // Fall back to global settings in the 'kolab' section.
-        if (isset($this->_conf'kolab'$key1)) {
-            return $this->_conf'kolab'$key1;
+            // Fall back to global settings in the 'kolab' section.
+            if (isset($this->_conf'kolab'$key1)) {
+                return $this->_conf'kolab'$key1;
+            }
         }
 
         return null;

kolab-autoconf-1.3.4.tar.gz/public_html/index.php -> kolab-autoconf-1.3.5.tar.gz/public_html/index.php Changed

kolab-autoconf.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3115 0

Request History

mollekopf created request over 1 year ago

New release

mollekopf accepted request over 1 year ago