From 17761f1da211e0bfe7dc2b92d91c503583a250af Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 2 Mar 2009 07:19:10 +0000
Subject: [PATCH] style

---
 framework/Kolab_Server/lib/Horde/Kolab/Server.php    |  2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object.php   |  4 +---
 .../Kolab_Server/lib/Horde/Kolab/Server/ldap.php     | 20 +++++++-------------
 .../Kolab_Server/lib/Horde/Kolab/Server/test.php     |  4 ++--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
index 21bd6f480..74feb4a33 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
@@ -448,7 +448,7 @@ abstract class Horde_Kolab_Server
 
         $result = $this->attrsForSearch($criteria, array('mail', 'alias'),
                                         KOLAB_SERVER_RESULT_STRICT);
-        $addrs = array_merge((array) $result['mail'], (array) $result['alias']);
+        $addrs  = array_merge((array) $result['mail'], (array) $result['alias']);
 
         if (empty($result)) {
             return array();
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
index 70ebf9fde..d14b1c53a 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
@@ -3,7 +3,6 @@
  * The base class representing Kolab objects stored in the server
  * database.
  *
- *
  * PHP version 5
  *
  * @category Kolab
@@ -59,7 +58,6 @@ define('KOLAB_UT_RESOURCE',           3);
  * This class provides methods to deal with Kolab objects stored in
  * the Kolab db.
  *
- *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
@@ -359,7 +357,7 @@ class Horde_Kolab_Server_Object
         }
         $result = array();
         foreach ($attrs as $key) {
-            $value = $this->get($key);
+            $value        = $this->get($key);
             $result[$key] = $value;
         }
 
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
index 22fefe7ee..78b88f277 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
@@ -169,6 +169,8 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
      * @return array An array of Kolab objects.
      *
      * @throws Horde_Kolab_Server_Exception
+     *
+     * @todo Sorting
      */
     public function listObjects($type, $params = null)
     {
@@ -200,7 +202,8 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
         }
 
         if ($sort) {
-/*             $this->sort($result, $sort); */
+            /* FIXME */
+            /*$this->sort($result, $sort); */
         }
 
         if (isset($params['from'])) {
@@ -215,15 +218,6 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
             $to = -1;
         }
 
-/*         $entries = $this->_getDns($result, $from, $to); */
-/*         if (!$entries  && $this->_errno()) { */
-/*             return PEAR::raiseError(sprintf(_("Search failed. Error was: %s"), */
-/*                                             $this->_error())); */
-/*         } */
-/*         if (!$entries) { */
-/*             return false; */
-/*         } */
-
         $entries = array();
         foreach ($result as $entry) {
             $entries[] = $entry['dn'];
@@ -239,7 +233,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
             if (!empty($vars['required_group']) && $required_group->isMember($dn)) {
                 continue;
             }
-            $result = $this->fetch($dn, $type);
+            $result    = $this->fetch($dn, $type);
             $objects[] = $result;
         }
         return $objects;
@@ -342,7 +336,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
             $criteria = array('AND' => array($users));
         }
 
-        $filter  = $this->searchQuery($criteria);
+        $filter = $this->searchQuery($criteria);
         return $this->dnForFilter($filter, $restrict);
     }
 
@@ -369,7 +363,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
             $criteria = array('AND' => array($groups));
         }
 
-        $filter  = $this->searchQuery($criteria);
+        $filter = $this->searchQuery($criteria);
         return $this->dnForFilter($filter, $restrict);
     }
 
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
index dc12047e4..65535430d 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
@@ -477,7 +477,7 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap
                 if (!is_array($value)) {
                     $value = array($value);
                 }
-                $data[$attr]          = $value;
+                $data[$attr] = $value;
             }
             $this->_current_index++;
             return $data;
@@ -521,7 +521,7 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap
     protected function getEntries($result)
     {
         if (is_array($result)) {
-            $data          = array();
+            $data = array();
             foreach ($result as $entry) {
                 $t       = $entry['data'];
                 $t['dn'] = $entry['dn'];
-- 
2.11.0