Projects
Kolab:16:TestingLinked
kolab-webadmin
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
kolab-webadmin.spec
Changed
@@ -35,13 +35,13 @@ Name: kolab-webadmin Version: 3.2.11 -Release: 0.20151020.git%{?dist} +Release: 0.20160627.git%{?dist} Summary: Kolab Groupware Server Web Administration Interface License: AGPLv3+ Group: Productivity/Office/Organizers Url: http://www.kolab.org -Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz +Source0: kolab-webadmin-3.2.11.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build
View file
debian.changelog
Changed
@@ -1,4 +1,10 @@ -kolab-webadmin (3.2.11~dev20151020-0~kolab1) unstable; urgency=low +kolab-webadmin (3.2.11~dev20160627-0~kolab2) unstable; urgency=low + + * Adjust dependencies for Debian Stretch / Ubuntu Xenial + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Mon, 8 May 2017 22:08:00 +0100 + +kolab-webadmin (3.2.11~dev20160627-0~kolab1) unstable; urgency=low * New upstream release 3.2.7
View file
debian.control
Changed
@@ -12,7 +12,7 @@ Package: kolab-webadmin Architecture: all Depends: apache2, - libapache2-mod-php5, + libapache2-mod-php | libapache2-mod-php5, libmozldap-0d, mozldap-tools, php-http-request2, @@ -21,8 +21,8 @@ php-net-ldap3, php-net-smtp, php-net-url2, - php5, - php5-mysql, + php | php5, + php-mysql | php5-mysql, smarty3 (>= 3.1.7), ${misc:Depends} Description: Kolab administration web interface
View file
kolab-webadmin-3.2.11.tar.gz/bin/purge-deleted-domains
Changed
@@ -34,6 +34,7 @@ $username = $CONF->get('ldap', 'bind_dn'); $password = $CONF->get('ldap', 'bind_pw'); $domain = $CONF->get('kolab', 'primary_domain'); +$dry_run = in_array('--dry-run', $argv); // see https://cgit.kolab.org/webadmin/tree/lib/kolab_api_controller.php#n292 session_start(); @@ -49,7 +50,7 @@ // delete domains foreach ($domains as $dn => $domain) { - delete_domain($dn, $domain); + delete_domain($dn, $domain, $dry_run); } @@ -81,7 +82,7 @@ return $result'list'; } -function delete_domain($domain_dn, $domain) +function delete_domain($domain_dn, $domain, $dry_run = false) { global $LDAP, $CONF; @@ -106,27 +107,33 @@ $inetdomainbasedn = "dc=" . implode(',dc=', explode('.', $domain_name)); } - // only deletes associateddomain=domain.tld,cn=kolab,cn=config - if (!$LDAP->delete_entry($domain_dn)) { - echo "Error: Failed to delete $domain_dn.\n"; - return; - } - $entries = array(); $entries = $inetdomainbasedn; - $cn = str_replace('.', '_', $domain_name); + $cn = str_replace('.', '_', $domain_name); if ($LDAP->get_entry_attribute("cn={$cn},cn=ldbm database,cn=plugins,cn=config", 'nsuniqueid')) { $entries = "cn={$cn},cn=ldbm database,cn=plugins,cn=config"; } - $cn = str_replace(array(',', '='), array('\2C', '\3D'), $inetdomainbasedn); + $cn = str_replace(array(',', '='), array('\2C', '\3D'), $inetdomainbasedn); if ($LDAP->get_entry_attribute("cn={$cn},cn=mapping tree,cn=config", 'nsuniqueid')) { $entries = "cn={$cn},cn=mapping tree,cn=config"; } + if ($dry_run) { + echo "Deleting $domain_dn\n"; + } + // only deletes associateddomain=domain.tld,cn=kolab,cn=config + else if (!$LDAP->delete_entry($domain_dn)) { + echo "Error: Failed to delete $domain_dn.\n"; + return; + } + foreach ($entries as $dn) { - if (!$LDAP->delete_entry_recursive($dn)) { + if ($dry_run) { + echo "Deleting $dn\n"; + } + else if (!$LDAP->delete_entry_recursive($dn)) { echo "Error: Failed to delete $dn.\n"; return; }
View file
kolab-webadmin-3.2.11.tar.gz/lib/client/kolab_client_task_settings.php
Changed
@@ -661,7 +661,7 @@ $value . ': ' . kolab_html::escape($_data); } - if (empty($data'attributes''form_fields'$attr)) { + if (!array_key_exists($attr, (array) $data'attributes''form_fields')) { $valtype = 'auto-readonly'; }
View file
kolab-webadmin-3.2.11.tar.gz/lib/kolab_api_service.php
Changed
@@ -118,7 +118,7 @@ $type_score = null; $type_id = null; - Log::trace("kolab_api_service::object_type_id objectClasses: " . implode(", ", $object_class)); + Log::trace("kolab_api_service::object_type_id objectclasses: " . implode(", ", $object_class)); foreach ($object_types as $idx => $elem) { $ref_class = $elem'attributes''fields''objectclass'; @@ -161,6 +161,11 @@ continue; } + if (!array_key_exists($attr, $attributes)) { + // There's no point in comparing NULL with anything. + continue; + } + $v = $attributes$attr; if (is_array($value)) { @@ -173,7 +178,7 @@ } $value = implode('', $value); - } else { + } else if (is_string($value)) { $value = $this->conf->expand($_value, $custom = Array('base_dn' => $this->base_dn())); } @@ -181,7 +186,11 @@ $v = implode('', $v); } - $elem_values_score += intval($v == $value); + if ($v == $value) { + $elem_values_score += 1; + } else { + $elem_values_score -= 1; + } } // Position in tree score
View file
kolab-webadmin-3.2.11.tar.gz/lib/kolab_client_task.php
Changed
@@ -204,7 +204,7 @@ private function auth() { if (isset($_POST'login')) { - $login = $this->get_input('login', 'POST'); + $login = $this->get_input('login', 'POST', true); if ($login'username') { $login'username' = trim($login'username'); @@ -791,7 +791,7 @@ */ public function login_form() { - $post = $this->get_input('login', 'POST'); + $post = $this->get_input('login', 'POST', true); $username = kolab_html::label(array( 'for' => 'login_name',
View file
kolab-webadmin-3.2.11.tar.gz/public_html/js/kolab_admin.js
Changed
@@ -534,7 +534,8 @@ this.ac_insert(this.ac_selected); this.ac_stop(); - return e.stopPropagation(); + e.stopPropagation(); + return false; case 27: // escape this.ac_stop();
View file
kolab-webadmin.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-webadmin Binary: kolab-webadmin Architecture: all -Version: 3.2.11~dev20151020-0~kolab1 +Version: 3.2.11~dev20160627-0~kolab2 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.kolab.org/ @@ -10,8 +10,8 @@ Vcs-Browser: http://git.kolabsys.com/apt/kolab-webadmin/ Vcs-Git: git://git.kolabsys.com/git/apt/kolab-webadmin Build-Depends: debhelper (>= 8) -Package-List: +Package-List: kolab-webadmin deb admin extra -Files: +Files: 00000000000000000000000000000000 0 kolab-webadmin-3.2.11.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
.