Projects
Kolab:Winterfell
kolab-autoconf
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 11
View file
kolab-autoconf.spec
Changed
@@ -15,15 +15,21 @@ %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 +Version: 1.3.0 Release: 1%{?dist} Summary: Autodiscovery for clients of Kolab Groupware @@ -77,6 +83,9 @@ %attr(0750,%{httpd_user},%{httpd_group}) %{_var}/log/%{name} %changelog +* 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
View file
debian.changelog
Changed
@@ -1,4 +1,4 @@ -kolab-autoconf (1.3-2) unstable; urgency=medium +kolab-autoconf (1.3.0-1) unstable; urgency=medium * Adjust dependencies and build dependencies.
View file
kolab-autoconf-1.3.tar.gz/lib/Autodiscover.php -> kolab-autoconf-1.3.0.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,9 +195,15 @@ /** * 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_port = $uri['port'];
View file
kolab-autoconf-1.3.tar.gz/lib/Conf.php -> kolab-autoconf-1.3.0.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; }
View file
kolab-autoconf.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-autoconf Binary: kolab-autoconf Architecture: all -Version: 1.3-1 +Version: 1.3.0-1 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Tobias Brunner <tobias.brunner@vshn.ch> Homepage: http://www.kolab.org/ @@ -13,5 +13,5 @@ Package-List: kolab-autoconf deb admin extra Files: - 00000000000000000000000000000000 0 kolab-autoconf-1.3.tar.gz + 00000000000000000000000000000000 0 kolab-autoconf-1.3.0.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.