Request 2436 (accepted)

Overview

Request 2436 (accepted)

Release version 1.3.1

Created by vanmeeuwen over 5 years ago
In state accepted

Submit kolab-autoconf

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

kolab-autoconf.spec Changed

@@ -15,24 +15,34 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
+%if 0%{?plesk}
+%global httpd_group roundcube_sysgroup
+%global httpd_name httpd
+%global httpd_user roundcube_sysuser
+%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
+%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:       kolab-autoconf
-Version:    1.3
-Release:    2%{?dist}
+Version:    1.3.1
+Release:    1%{?dist}
 Summary:    Autodiscovery for clients of Kolab Groupware
 
 Group:      Applications/Internet
 License:    GPLv3+
 URL:        https://kolab.org
+
 Source0:    http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 
+%if 0%{?plesk} < 1
 Requires:   php-kolab-net-ldap3
+%endif
+
 Obsoletes:  kolab-autodiscover < %{version}-%{release}
 Provides:   kolab-autodiscover = %{version}-%{release}
 BuildArch:  noarch
@@ -57,20 +67,27 @@
 ln -s ../../..%{_var}/log/%{name} logs
 popd
 
+%if 0%{?plesk} < 1
 %{__install} -pm 644 docs/%{name}.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf
+%endif
 
 %files
 %defattr(-,root,root,-)
 %doc docs/*
+%if 0%{?plesk} < 1
 %dir %{_ap_sysconfdir}
 %dir %{_ap_sysconfdir}/conf.d
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
+%endif
 %{_datadir}/%{name}
 %attr(0750,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
-* Sat Dec  1 2018 Timotheus Pokorra <tp@tbits.net> - 1.3-2
-- require php-kolab-net-ldap3 because it was upgraded in EPEL
+* Mon Mar 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.1-1
+- Release 1.3.1
+
+* Wed Jun 27 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3.0-1
+- Release version 1.3.0
 
 * Mon Oct  9 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3-1
 - Release version 1.3

debian.changelog Changed

debian.control Changed

debian.rules Changed

kolab-autoconf-1.3.tar.gz/lib/Autodiscover.php -> kolab-autoconf-1.3.1.tar.gz/lib/Autodiscover.php Changed

@@ -169,7 +169,16 @@
     protected function get_user($email, $domain)
     {
         // initialize LDAP connection
-        $this->ldap();
+        $result = $this->init_ldap();
+
+        if (!$result) {
+            $this->config = array_merge(
+                $this->config,
+                Array('mail' => $email, 'domain' => $domain)
+            );
+
+            return;
+        }
 
         // find domain
         if (!$this->ldap->find_domain($domain)) {
@@ -186,11 +195,17 @@
     /**
      * Initialize LDAP connection
      */
-    protected function ldap()
+    protected function init_ldap()
     {
-        $uri = parse_url($this->conf->get('ldap_uri'));
+        $ldap_uri = $this->conf->get('ldap_uri', false);
+
+        if (!$ldap_uri) {
+            return false;
+        }
+
+        $uri = parse_url($ldap_uri);
 
-        $this->_ldap_server  = $uri['host'];
+        $this->_ldap_server  = ($uri['scheme'] === 'ldaps' ? 'ldaps://' : '') . $uri['host'];
         $this->_ldap_port    = $uri['port'];
         $this->_ldap_scheme  = $uri['scheme'];
         $this->_ldap_bind_dn = $this->conf->get('ldap', 'service_bind_dn');

kolab-autoconf-1.3.tar.gz/lib/Conf.php -> kolab-autoconf-1.3.1.tar.gz/lib/Conf.php Changed

@@ -54,6 +54,16 @@
     {
         // Do some magic configuration loading here.
         if (!file_exists(self::CONFIG_FILE)) {
+            $this->_conf = Array(
+                'autodiscover' => Array(
+                    'activesync' => '%d',
+                    'imap' => 'ssl://%d:993',
+                    'smtp' => 'ssl://%d:465',
+                    'service_name' => 'Kolab Groupware',
+                    'service_short' => 'Kolab',
+                )
+            );
+
             return;
         }
 
@@ -85,7 +95,7 @@
         return (string) $value;
     }
 
-    public function get_list($key1, $key2 = NULL)
+    public function get_list($key1, $key2 = null)
     {
         $list  = array();
         $value = $this->get($key1, $key2);
@@ -101,7 +111,7 @@
         return $list;
     }
 
-    public function get_raw($key1, $key2 = NULL)
+    public function get_raw($key1, $key2 = null)
     {
         if (isset($this->_conf[$key1])) {
             if ($key2) {
@@ -144,7 +154,7 @@
         return null;
     }
 
-    public function expand($str, $custom = FALSE)
+    public function expand($str, $custom = false)
     {
         if (preg_match_all('/%$(?P<variable>\w+)$s/', $str, $matches)) {
             if (isset($matches['variable']) && !empty($matches['variable'])) {

kolab-autoconf-1.3.tar.gz/lib/Log.php -> kolab-autoconf-1.3.1.tar.gz/lib/Log.php Changed

kolab-autoconf.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2436 0

Request History

vanmeeuwen created request over 5 years ago

Release version 1.3.1

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago