Projects
Kolab:3.4
kolab-webadmin
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 38
View file
kolab-webadmin.spec
Changed
@@ -34,15 +34,14 @@ %global kolabr_group_id 414 Name: kolab-webadmin -Version: 3.2 -Release: 0.2.dev20140624.gita76268b3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Kolab Groupware Server Web Administration Interface License: AGPLv3+ Group: Productivity/Office/Organizers Url: http://www.kolab.org -# From a76268b3b1bd5b9522301a0b957d27f52ded3dc2 -Source0: http://mirror.kolabsys.com/pub/releases/kolab-webadmin-%{version}.tar.gz +Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,8 +56,13 @@ Requires: mozldap-tools Requires: php-Smarty >= 3.1.7 +Requires: php-pear(HTTP_Request2) +Requires: php-pear(Mail) Requires: php-pear(Net_Socket) Requires: php-pear(Net_LDAP2) +Requires: php-pear(Net_LDAP3) +Requires: php-pear(Net_SMTP) +Requires: php-pear(Net_URL2) Requires: php-gettext Requires: php-ldap Requires: php-mbstring @@ -87,6 +91,9 @@ %{buildroot}/%{_var}/log/%{name} \ %{buildroot}/%{_var}/cache/%{name} +# Remove the lib/'s we can depend on +rm -rf lib/ext/ + cp -a lib/ public_html/ hosted/ %{buildroot}/%{_datadir}/%{name}/. cp -a doc/kolab-webadmin.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/ cp -a doc/hosted-kolab.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +kolab-webadmin (3.2.0-0~kolab1) unstable; urgency=low + + * Release of 3.2.0 + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 14 Aug 2014 22:08:00 +0100 + kolab-webadmin (3.2-0~kolab2) unstable; urgency=low * New git snapshot
View file
debian.control
Changed
@@ -11,15 +11,20 @@ Package: kolab-webadmin Architecture: all -Depends: apache2, - php5, - smarty3 (>= 3.1.7), - php-net-ldap2, - libmozldap-0d, - mozldap-tools, - libapache2-mod-php5, - php5-mysql, - ${misc:Depends} +Depends: apache2, + libapache2-mod-php5, + libmozldap-0d, + mozldap-tools, + php-http-request2, + php-mail, + php-net-ldap2, + php-net-ldap3, + php-net-smtp, + php-net-url2, + php5, + php5-mysql, + smarty3 (>= 3.1.7), + ${misc:Depends} Description: Kolab administration web interface This package contains the web GUI for the administration of the Kolab groupware server.
View file
debian.rules
Changed
@@ -11,6 +11,7 @@ find debian/kolab-webadmin/usr/share/kolab-webadmin/ -type f -name "*.enterprise" -exec rm -v {} \; # Rename the Apache conf file mv debian/kolab-webadmin/etc/kolab-webadmin/kolab-webadmin.conf debian/kolab-webadmin/etc/kolab-webadmin/apache.conf + rm -rf debian/kolab-webadmin/usr/share/kolab-webadmin/lib/ext/ # Some PHP files seem to be executable find debian/kolab-webadmin/usr/share/kolab-webadmin/lib -type f -name "*php" -perm +1 -print0 | xargs -r0 chmod -x
View file
kolab-webadmin-3.2.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.2.0.tar.gz/lib/Auth/LDAP.php
Changed
@@ -556,7 +556,13 @@ public function group_add($attrs, $typeid = null) { - $base_dn = $this->entry_base_dn('group', $typeid); + if (!empty($attrs['ou'])) { + $base_dn = $attrs['ou']; + unset($attrs['ou']); + } + else { + $base_dn = $this->entry_base_dn('group', $typeid); + } // TODO: The rdn is configurable as well. // Use [$type_str . "_"]user_rdn_attr
View file
kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_group.php -> kolab-webadmin-3.2.0.tar.gz/lib/api/kolab_api_service_group.php
Changed
@@ -163,6 +163,14 @@ Log::trace("group_info() result: " . var_export($result, TRUE)); + if (empty($result['ou'])) { + $dn = ldap_explode_dn($result['entrydn'], 0); + // pop the count and rdn + unset($dn['count']); + unset($dn[0]); + $result['ou'] = implode(',', $dn); + } + if ($result) { return $result; }
View file
kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_resource.php -> kolab-webadmin-3.2.0.tar.gz/lib/api/kolab_api_service_resource.php
Changed
@@ -210,6 +210,14 @@ // normalize result $result = $this->parse_result_attributes('resource', $result); + if (empty($result['ou'])) { + $dn = ldap_explode_dn($result['entrydn'], 0); + // pop the count and rdn + unset($dn['count']); + unset($dn[0]); + $result['ou'] = implode(',', $dn); + } + if ($result) { return $result; }
View file
kolab-webadmin.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-webadmin Binary: kolab-webadmin Architecture: all -Version: 3.2-0~kolab1 +Version: 3.2.0-0~kolab1 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.kolab.org/ @@ -13,5 +13,5 @@ Package-List: kolab-webadmin deb admin extra Files: - 00000000000000000000000000000000 0 kolab-webadmin-3.2.tar.gz + 00000000000000000000000000000000 0 kolab-webadmin-3.2.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
.