Kolab Groupware OBS

kolab-webadmin.spec Changed

@@ -34,8 +34,8 @@
 %global kolabr_group_id 414
 
 Name:           kolab-webadmin
-Version:        3.1.4
-Release:        3%{?dist}
+Version:        3.1.5
+Release:        1%{?dist}
 Summary:        Kolab Groupware Server Web Administration Interface
 License:        AGPLv3+
 Group:          Productivity/Office/Organizers
@@ -43,8 +43,6 @@
 
 Source0:        http://mirror.kolabsys.com/pub/releases/kolab-webadmin-%{version}.tar.gz
 
-Patch0001:      0001-Fix-typos-in-memcache-related-methods.patch
-
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -71,8 +69,6 @@
 %prep
 %setup -q 
 
-%patch0001 -p1
-
 for file in `find . -type f -name "*.enterprise"`; do
     if [ 0%{?kolab_enterprise} -gt 0 ]; then
         mv -v $file $(echo $file | sed -e 's/.enterprise$//g')
@@ -158,6 +154,9 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
+* Mon Feb 17 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.5-1
+- New upstream release
+
 * Wed Jan 15 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.4-3
 - Trigger rebuild for changed project configuration

0001-Fix-typos-in-memcache-related-methods.patch Deleted

@@ -1,36 +0,0 @@
-From 62f17678edda693f0d7cdd929911f118e5c6b0a5 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Wed, 8 Jan 2014 18:32:25 +0100
-Subject: [PATCH] Fix typos in memcache-related methods
-
----
- lib/Auth/LDAP.php | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
-index 5850672..0075166 100644
---- a/lib/Auth/LDAP.php
-+++ b/lib/Auth/LDAP.php
-@@ -1622,7 +1622,7 @@ class LDAP extends Net_LDAP3 {
-     public function get_cache_data($key)
-     {
-         if ($cache = $this->get_cache()) {
--            return $cache->get($ckey);
-+            return $cache->get($key);
-         }
-     }
- 
-@@ -1638,8 +1638,8 @@ class LDAP extends Net_LDAP3 {
-     public function set_cache_data($key, $data, $ttl = 3600)
-     {
-         if ($cache = $this->get_cache()) {
--            if (!$cache->replace($ckey, $data, MEMCACHE_COMPRESSED, $ttl)) {
--                return $cache->set($ckey, $data, MEMCACHE_COMPRESSED, $ttl);
-+            if (!$cache->replace($key, $data, MEMCACHE_COMPRESSED, $ttl)) {
-+                return $cache->set($key, $data, MEMCACHE_COMPRESSED, $ttl);
-             }
-             else {
-                 return true;
--- 
-1.8.3.1
-

debian.changelog Changed

debian.series Changed

kolab-webadmin-3.1.4.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.1.5.tar.gz/lib/Auth/LDAP.php Changed

kolab-webadmin-3.1.4.tar.gz/lib/api/kolab_api_service_user.php -> kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_user.php Changed

@@ -79,11 +79,11 @@
      */
     public function user_add($getdata, $postdata)
     {
-        //console("user_add()", $postdata);
+        Log::trace("user_add()", $postdata);
 
         $user_attributes = $this->parse_input_attributes('user', $postdata);
 
-        //console("user_add()", $user_attributes);
+        Log::trace("user_add()", $user_attributes);
 
         $auth = Auth::get_instance();
         $result = $auth->user_add($user_attributes, $postdata['type_id']);
@@ -123,12 +123,12 @@
 
     public function user_edit($getdata, $postdata)
     {
-        //console("\$postdata to user_edit()", $postdata);
+        Log::trace("\$postdata to user_edit()", $postdata);
 
         $user_attributes = $this->parse_input_attributes('user', $postdata);
         $user            = $postdata['id'];
 
-        //console("\$user_attributes as result from parse_input_attributes", $user_attributes);
+        Log::trace("\$user_attributes as result from parse_input_attributes", $user_attributes);
 
         $auth   = Auth::get_instance();
         $result = $auth->user_edit($user, $user_attributes, $postdata['type_id']);
@@ -166,10 +166,20 @@
         $auth   = Auth::get_instance();
         $result = $auth->user_info($getdata['id']);
 
+        $result_dn = key($result);
+
         Log::trace("user.info on " . $getdata['id'] . " result: " . var_export($result, TRUE));
         // normalize result
         $result = $this->parse_result_attributes('user', $result);
 
+        if (empty($result['ou'])) {
+            $_dn = ldap_explode_dn($result_dn, 0);
+            // pop the count and rdn
+            unset($_dn['count']);
+            unset($_dn[0]);
+            $result['ou'] = implode(',', $_dn);
+        }
+
         Log::trace("user.info on " . $getdata['id'] . " parsed result: " . var_export($result, TRUE));
 
         if ($result) {
@@ -199,8 +209,12 @@
         // find user(s)
         $users = $auth->list_users(null, $attributes, $search, $params);
 
-        if (empty($users) || empty($users['list']) || $users['count'] > 1) {
-            return false;
+        if (empty($users) || empty($users['list'])) {
+            return Array();
+        }
+
+        if ($users['count'] > 1) {
+            throw new Exception("More than a single entry found.", 942);
         }
 
         // get user data

kolab-webadmin-3.1.4.tar.gz/lib/ext/Net/LDAP3.php -> kolab-webadmin-3.1.5.tar.gz/lib/ext/Net/LDAP3.php Changed

@@ -1253,7 +1253,7 @@
                     $_sort2 = false;
                 }
 
-                if (!($new_attrs[$attr] === $old_attr_value) && !($_sort1 === $_sort2)) {
+                if ($new_attrs[$attr] !== $old_attr_value && $_sort1 !== $_sort2) {
                     $this->_debug("Attribute $attr changed from " . var_export($old_attr_value, true) . " to " . var_export($new_attrs[$attr], true));
                     if ($attr === $rdn_attr) {
                         $this->_debug("This attribute is the RDN attribute. Let's see if it is multi-valued, and if the original still exists in the new value.");
@@ -1275,14 +1275,13 @@
 
                                     $this->_debug("Adding to delete attribute $attr values:" . implode(', ', $_attr_to_remove));
 
-                                    $mod_array['delete'][$attr] = $_attr_to_remove;
+                                    $mod_array['del'][$attr] = $_attr_to_remove;
 
                                     if (strtolower($new_attrs[$attr]) !== strtolower($rdn_attr_value)) {
                                         $this->_debug("new attrs is not the same as the old rdn value, issuing a rename");
                                         $mod_array['rename']['dn'] = $subject_dn;
                                         $mod_array['rename']['new_rdn'] = $rdn_attr . '=' . $new_attrs[$attr][0];
                                     }
-
                                 } else {
                                     $this->_debug("new attrs is not the same as any of the old rdn value, issuing a full rename");
                                     $mod_array['rename']['dn'] = $subject_dn;
@@ -1291,13 +1290,13 @@
                             } else {
                                 // TODO: See if the rdn attr. value is still in $new_attrs[$attr]
                                 if (in_array($old_attrs[$attr][0], $new_attrs[$attr])) {
-                                    $this->_debug("Simply replacing attr $attr as rnd attr value is preserved.");
+                                    $this->_debug("Simply replacing attr $attr as rdn attr value is preserved.");
                                     $mod_array['replace'][$attr] = $new_attrs[$attr];
                                 } else {
                                     // TODO: This fails.
                                     $mod_array['rename']['dn'] = $subject_dn;
                                     $mod_array['rename']['new_rdn'] = $rdn_attr . '=' . $new_attrs[$attr][0];
-                                    $mod_array['delete'][$attr] = $old_attrs[$attr][0];
+                                    $mod_array['del'][$attr] = $old_attrs[$attr][0];
                                 }
                             }
                         } else {
@@ -2229,7 +2228,6 @@
             }
         }
 
-
         if (is_array($attributes['add']) && !empty($attributes['add'])) {
             $this->_debug("LDAP: C: Mod-Add $subject_dn: " . json_encode($attributes['add']));

kolab-webadmin-3.1.4.tar.gz/lib/kolab_client_task.php -> kolab-webadmin-3.1.5.tar.gz/lib/kolab_client_task.php Changed

@@ -926,7 +926,7 @@
             $resp = $resp->get($field['name']);
             unset($data['attributes']);
 
-            $default         = $resp['default'];
+            $default         = empty($data[$field['name']]) ? $resp['default'] : $data[$field['name']];
             $field['values'] = $resp['list'];
         }
 
@@ -946,6 +946,14 @@
             }
         }
 
+        if (!empty($default)) {
+            foreach ($options as $key => $value) {
+                if (strtolower($default) == $key) {
+                    $default = strtolower($default);
+                }
+            }
+        }
+
         return array(
             'options' => $options,
             'default' => $default,
@@ -990,9 +998,7 @@
 
         // Mark automatically generated fields as read-only, etc.
         foreach ($auto_fields as $idx => $field) {
-            //console("\$field value for \$auto_fields[\$idx] (idx: $idx)", $auto_fields[$idx]);
             if (!is_array($field)) {
-                //console("not an array... unsetting");
                 unset($auto_fields[$idx]);
                 continue;
             }
@@ -1161,7 +1167,6 @@
                     $data[$fname] = (array) $data[$fname];
                 }
 
-                //console("The data for field $fname at this point is", $data[$fname]);
                 // request parameters
                 $post = array(
                     'list'        => $data[$fname],
@@ -1175,7 +1180,6 @@
                 $result = $result->get('list');
 
                 $data[$fname] = $result;
-                //console("Set \$data['$fname'] to", $result);
             }
         }
 
@@ -1206,19 +1210,14 @@
      */
     protected function form_create($name, $attribs, $sections, $fields, $fields_map, $data, $add_mode)
     {
-        //console("Creating form for $name with data", $data);
-
-        //console("Assign fields to sections", $fields);
         // Assign sections to fields
         foreach ($fields as $idx => $field) {
             if (!$field['section']) {
                 $fields[$idx]['section'] = isset($fields_map[$idx]) ? $fields_map[$idx] : 'other';
-                //console("Assigned field $idx to section " . $fields[$idx]['section']);
+                Log::trace("Assigned field $idx to section " . $fields[$idx]['section']);
             }
         }
 
-        //console("Using fields_map", $fields_map);
-
         // Sort
         foreach ($fields_map as $idx => $val) {
             if (array_key_exists($idx, $fields)) {
@@ -1233,8 +1232,6 @@
             $fields_map = array_merge($fields_map, $fields);
         }
 
-        //console("Using attribs", $attribs);
-
         $form = new kolab_form($attribs);
         $assoc_fields = array();
         $req_fields   = array();
@@ -1242,10 +1239,6 @@
 
         $auto_fields = $this->output->get_env('auto_fields');
 
-        //console("form_create() \$attribs", $attribs);
-        //console("form_create() \$auto_fields", $auto_fields);
-        //console("Going to walk through sections", $sections);
-
         // Parse elements and add them to the form object
         foreach ($sections as $section_idx => $section) {
             $form->add_section($section_idx, kolab_html::escape($this->translate($section)));
@@ -1264,7 +1257,6 @@
                 $field['section']     = $section_idx;
 
                 if (empty($field['value']) && !empty($data[$idx])) {
-                    //console("Using data value", $data[$idx], "for value of field $idx");
                     $value = $data[$idx];
 
                     // Convert data for the list field with autocompletion
@@ -1341,8 +1333,6 @@
                     }
                 }
 
-                //console("Adding field to form", $field);
-
                 $form->add_element($field);
             }
         }

kolab-webadmin.dsc Changed

Changes of Revision 31