From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 11 Feb 2009 20:32:20 +0000 (+0000)
Subject: Initial cleanup. Removed CVS id headers, updated PHP version tag and fixed class... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=258eab56344ea73687462e12546964f2ca80d7fa;p=horde.git

Initial cleanup. Removed CVS id headers, updated PHP version tag and fixed class definition style.
---

diff --git a/framework/Kolab_Server/examples/Horde/Kolab/Server/server.php b/framework/Kolab_Server/examples/Horde/Kolab/Server/server.php
index 55c7c3029..da4fd8f0d 100644
--- a/framework/Kolab_Server/examples/Horde/Kolab/Server/server.php
+++ b/framework/Kolab_Server/examples/Horde/Kolab/Server/server.php
@@ -2,7 +2,6 @@
 /**
  * Demonstrates the use of Horde_Kolab_Server::
  *
- * $Horde: framework/Kolab_Server/examples/Horde/Kolab/Server/server.php,v 1.2 2008/08/01 07:49:25 wrobel Exp $
  *
  * @package Kolab_Server
  */
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP.php b/framework/Kolab_Server/lib/Horde/Kolab/IMAP.php
index 9c4bcc52b..23e47f12c 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP.php
@@ -2,14 +2,12 @@
 /**
  * @package Kolab_Storage
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP.php,v 1.2 2009/01/06 17:49:25 jan Exp $
  */
 
 /**
  * The Horde_Kolab_IMAP class provides a wrapper around two different Kolab IMAP
  * connection types.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP.php,v 1.2 2009/01/06 17:49:25 jan Exp $
  *
  * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
@@ -20,7 +18,8 @@
  * @author  Thomas Jarosch <thomas.jarosch@intra2net.com>
  * @package Kolab_Storage
  */
-class Horde_Kolab_IMAP {
+class Horde_Kolab_IMAP
+{
 
     /**
      * IMAP server to connect to.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php
index 88d3e9ffe..cab23898a 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php
@@ -2,14 +2,12 @@
 /**
  * @package Kolab_Storage
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php,v 1.3 2009/01/06 17:49:25 jan Exp $
  */
 
 /**
  * The Horde_Kolab_IMAP_Connection_cclient class connects to an IMAP server using
  * the IMAP functionality within PHP.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php,v 1.3 2009/01/06 17:49:25 jan Exp $
  *
  * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
@@ -20,7 +18,8 @@
  * @author  Thomas Jarosch <thomas.jarosch@intra2net.com>
  * @package Kolab_Storage
  */
-class Horde_Kolab_IMAP_cclient extends Horde_Kolab_IMAP {
+class Horde_Kolab_IMAP_cclient extends Horde_Kolab_IMAP
+{
 
     /**
      * Basic IMAP connection string.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php
index 49b911ece..dbb71811a 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php
@@ -2,7 +2,6 @@
 /**
  * @package Kolab_Storage
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php,v 1.2 2009/01/06 17:49:25 jan Exp $
  */
 
 /**
@@ -17,7 +16,6 @@ require_once 'Net/IMAP.php';
  * The Horde_Kolab_IMAP_Connection_pear class connects to an IMAP server using the
  * Net_IMAP PEAR package.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php,v 1.2 2009/01/06 17:49:25 jan Exp $
  *
  * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
@@ -28,7 +26,8 @@ require_once 'Net/IMAP.php';
  * @author  Thomas Jarosch <thomas.jarosch@intra2net.com>
  * @package Kolab_Storage
  */
-class Horde_Kolab_IMAP_pear extends Horde_Kolab_IMAP {
+class Horde_Kolab_IMAP_pear extends Horde_Kolab_IMAP
+{
 
     /**
      * The signature of the current connection
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php
index ee8d0c423..b95fe3968 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php
@@ -2,7 +2,6 @@
 /**
  * @package Kolab_Storage
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php,v 1.3 2009/01/14 23:39:11 wrobel Exp $
  */
 
 /**
@@ -14,7 +13,6 @@ define('KOLAB_IMAP_FLAG_DELETED', 1);
  * The Horde_Kolab_IMAP_Connection_test class simulates an IMAP server for
  * testing purposes.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php,v 1.3 2009/01/14 23:39:11 wrobel Exp $
  *
  * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
@@ -24,7 +22,8 @@ define('KOLAB_IMAP_FLAG_DELETED', 1);
  * @author  Gunnar Wrobel <wrobel@pardus.de>
  * @package Kolab_Storage
  */
-class Horde_Kolab_IMAP_test extends Horde_Kolab_IMAP {
+class Horde_Kolab_IMAP_test extends Horde_Kolab_IMAP
+{
 
     /**
      * If we are supposed to be connected this holds the user
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
index d8089b7e1..6ecaca1e2 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
@@ -2,9 +2,8 @@
 /**
  * A library for accessing the Kolab user database.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server.php,v 1.9 2009/01/08 07:12:43 wrobel Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -28,7 +27,6 @@ define('KOLAB_SERVER_RESULT_MANY',   3);
  * This class provides methods to deal with Kolab objects stored in
  * the Kolab object db.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server.php,v 1.9 2009/01/08 07:12:43 wrobel Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -41,7 +39,8 @@ define('KOLAB_SERVER_RESULT_MANY',   3);
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server {
+class Horde_Kolab_Server
+{
 
     /**
      * Server parameters.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
index ceb1300bf..6e5e9e86d 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
@@ -3,9 +3,8 @@
  * The base class representing Kolab objects stored in the server
  * database.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php,v 1.9 2009/01/08 21:00:07 wrobel Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -71,7 +70,6 @@ define('KOLAB_UT_RESOURCE',           3);
  * This class provides methods to deal with Kolab objects stored in
  * the Kolab db.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php,v 1.9 2009/01/08 21:00:07 wrobel Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -84,7 +82,8 @@ define('KOLAB_UT_RESOURCE',           3);
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object {
+class Horde_Kolab_Server_Object
+{
 
     /**
      * Link into the Kolab server.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php
index ca81da10a..5a1d857a8 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php
@@ -2,9 +2,8 @@
 /**
  * An entry in the global addressbook.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php,v 1.6 2009/01/08 21:00:08 wrobel Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -17,7 +16,6 @@
  * This class provides methods to deal with global address book
  * entries for Kolab.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php,v 1.6 2009/01/08 21:00:08 wrobel Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -30,7 +28,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object {
+class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object
+{
 
     /**
      * The LDAP filter to retrieve this object type
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php
index 33b075015..090321b73 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php
@@ -2,9 +2,8 @@
 /**
  * A system administrator.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -19,7 +18,6 @@ require_once 'Horde/Kolab/Server/Object/adminrole.php';
  * This class provides methods to deal with administrator
  * entries for Kolab.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -32,7 +30,8 @@ require_once 'Horde/Kolab/Server/Object/adminrole.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_administrator extends Horde_Kolab_Server_Object_adminrole {
+class Horde_Kolab_Server_Object_administrator extends Horde_Kolab_Server_Object_adminrole
+{
 
     /**
      * The group the UID must be member of so that this object really
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php
index d87aa7267..58a60443f 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php
@@ -2,9 +2,8 @@
 /**
  * A Kolab object of type administrator.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php,v 1.3 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -16,7 +15,6 @@
 /**
  * This class provides methods to deal with administrator object types.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php,v 1.3 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -29,7 +27,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object {
+class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object
+{
 
     /**
      * The LDAP filter to retrieve this object type
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php
index d41164b61..8923c88f5 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php
@@ -2,9 +2,8 @@
 /**
  * Representation of a Kolab distribution list.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php,v 1.2 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -18,7 +17,6 @@ require_once 'Horde/Kolab/Server/Object/group.php';
 /**
  * This class provides methods to deal with distribution lists for Kolab.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php,v 1.2 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -31,7 +29,8 @@ require_once 'Horde/Kolab/Server/Object/group.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group {
+class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group
+{
 
     /**
      * The LDAP filter to retrieve this object type
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php
index c4517b4a9..13ca62f2c 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php
@@ -2,9 +2,8 @@
 /**
  * A Kolab domain maintainer.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php,v 1.6 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -18,7 +17,6 @@ require_once 'Horde/Kolab/Server/Object/adminrole.php';
 /**
  * This class provides methods associated to Kolab domain maintainers.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php,v 1.6 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -31,7 +29,8 @@ require_once 'Horde/Kolab/Server/Object/adminrole.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_domainmaintainer extends Horde_Kolab_Server_Object_adminrole {
+class Horde_Kolab_Server_Object_domainmaintainer extends Horde_Kolab_Server_Object_adminrole
+{
 
     /**
      * The attributes required when creating an object of this class.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php
index 76e47365d..af3e632b3 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php
@@ -2,9 +2,8 @@
 /**
  * Representation of a Kolab user group.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -16,7 +15,6 @@
 /**
  * This class provides methods to deal with groups for Kolab.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -29,7 +27,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object {
+class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object
+{
 
     /**
      * The LDAP filter to retrieve this object type
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php
index 342bd7bbd..48d1e5902 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php
@@ -2,9 +2,8 @@
 /**
  * A Kolab maintainer.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -19,7 +18,6 @@ require_once 'Horde/Kolab/Server/Object/adminrole.php';
  * This class provides methods to deal with maintainer
  * entries for Kolab.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -32,7 +30,8 @@ require_once 'Horde/Kolab/Server/Object/adminrole.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_maintainer extends Horde_Kolab_Server_Object_adminrole {
+class Horde_Kolab_Server_Object_maintainer extends Horde_Kolab_Server_Object_adminrole
+{
 
     /**
      * The group the UID must be member of so that this object really
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php
index c10dcccc3..d6674fd1b 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php
@@ -2,9 +2,8 @@
 /**
  * The server configuration.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -16,7 +15,6 @@
 /**
  * This class provides methods to deal with Kolab server configuration.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -29,7 +27,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_server extends Horde_Kolab_Server_Object {
+class Horde_Kolab_Server_Object_server extends Horde_Kolab_Server_Object
+{
 
     /**
      * The LDAP filter to retrieve this object type
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php
index 05800bc50..78207fbe8 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php
@@ -2,9 +2,8 @@
 /**
  * A shared IMAP folder.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -17,7 +16,6 @@
  * This class provides methods to deal with shared folders
  * entries for Kolab.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php,v 1.5 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -30,7 +28,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object {
+class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object
+{
 
     /**
      * The LDAP filter to retrieve this object type
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php
index 8b47e9026..e8f0c4840 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php
@@ -2,9 +2,8 @@
 /**
  * A standard Kolab user.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php,v 1.11 2009/01/08 21:00:08 wrobel Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -17,7 +16,6 @@
  * This class provides methods to deal with Kolab users stored in
  * the Kolab db.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php,v 1.11 2009/01/08 21:00:08 wrobel Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -30,7 +28,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object {
+class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object
+{
 
     /**
      * The LDAP filter to retrieve this object type
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
index 3e9d52981..894423651 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
@@ -2,9 +2,8 @@
 /**
  * The driver for accessing the Kolab user database stored in LDAP.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.9 2009/01/08 07:12:44 wrobel Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -20,7 +19,6 @@ require_once 'Horde/LDAP.php';
  * This class provides methods to deal with Kolab objects stored in
  * the standard Kolab LDAP db.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.9 2009/01/08 07:12:44 wrobel Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -33,7 +31,8 @@ require_once 'Horde/LDAP.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
+{
 
     /**
      * LDAP connection handle.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
index 65c7820b0..658f94619 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
@@ -2,9 +2,8 @@
 /**
  * A driver for simulating a Kolab user database stored in LDAP.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/test.php,v 1.8 2009/01/06 17:49:26 jan Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -19,7 +18,6 @@ require_once 'Horde/Kolab/Server/ldap.php';
 /**
  * This class provides a class for testing the Kolab Server DB.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/test.php,v 1.8 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -32,7 +30,8 @@ require_once 'Horde/Kolab/Server/ldap.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
+class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap
+{
 
     /**
      * Array holding the current result set.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Session.php b/framework/Kolab_Server/lib/Horde/Kolab/Session.php
index d72437279..0f8f6a572 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Session.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Session.php
@@ -3,9 +3,8 @@
  * The Horde_Kolab_Session class holds additional user details for the current
  * session.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Session.php,v 1.11 2009/02/07 14:03:32 wrobel Exp $
  *
- * PHP version 4
+ * PHP version 5
  *
  * @category Kolab
  * @package  Kolab_Server
@@ -27,7 +26,6 @@ require_once 'Horde/Auth.php';
  * relevant for the user session should be accessed via the Horde_Kolab_Session
  * class.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Session.php,v 1.11 2009/02/07 14:03:32 wrobel Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -40,7 +38,8 @@ require_once 'Horde/Auth.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Session {
+class Horde_Kolab_Session
+{
 
     /**
      * User ID.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
index d45ddd3db..4da9b74e2 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
@@ -2,7 +2,6 @@
 /**
  * Base for PHPUnit scenarios.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php,v 1.3 2009/01/06 17:49:26 jan Exp $
  *
  * PHP version 5
  *
@@ -28,7 +27,6 @@ require_once 'Horde/Kolab/Server.php';
 /**
  * Base for PHPUnit scenarios.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php,v 1.3 2009/01/06 17:49:26 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -146,7 +144,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
             if (!isset($world['result'])) {
                 $this->fail('Did not receive a result!');
             }
-            foreach ($world['result'] as $result) { 
+            foreach ($world['result'] as $result) {
                 if ($result instanceOf PEAR_Error) {
                     $this->assertEquals('', $result->getMessage());
                 } else {
@@ -158,7 +156,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
             if (!isset($world['result'])) {
                 $this->fail('Did not receive a result!');
             }
-            foreach ($world['result'] as $result) { 
+            foreach ($world['result'] as $result) {
                 if ($result instanceOf PEAR_Error) {
                     $this->assertEquals('', $result->getMessage());
                 } else {
@@ -170,7 +168,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
             if (!isset($world['result'])) {
                 $this->fail('Did not receive a result!');
             }
-            foreach ($world['result'] as $result) { 
+            foreach ($world['result'] as $result) {
                 if ($result instanceOf PEAR_Error) {
                     $this->assertEquals($arguments[0], $result->getMessage());
                 } else {
@@ -273,7 +271,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
         }
     }
 
-    
+  
     /**
      * Prepare an empty Kolab server.
      *
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php
index 2a9f60b56..b5603e643 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php
@@ -2,7 +2,6 @@
 /**
  * Adding objects to the server.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -21,7 +20,6 @@ require_once 'Horde/Kolab/Test/Server.php';
 /**
  * Adding objects to the server.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -34,7 +32,8 @@ require_once 'Horde/Kolab/Test/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_AddingObjectsTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_AddingObjectsTest extends Horde_Kolab_Test_Server
+{
     /**
      * Test adding valid users.
      *
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php
index cf730f210..f42358d1f 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the admin object.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -21,7 +20,6 @@ require_once 'Horde/Kolab/Test/Server.php';
 /**
  * Test the admin object.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -34,7 +32,8 @@ require_once 'Horde/Kolab/Test/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_AdminTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_AdminTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Set up testing.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
index 2463bbbd6..189da7546 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
@@ -2,7 +2,6 @@
 /**
  * All tests for the Horde_Kolab_Server:: package.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php,v 1.5 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -14,7 +13,7 @@
  */
 
 /**
- * Define the main method 
+ * Define the main method
  */
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Horde_Kolab_Server_AllTests::main');
@@ -26,7 +25,6 @@ require_once 'PHPUnit/TextUI/TestRunner.php';
 /**
  * Combine the tests for this package.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php,v 1.5 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
@@ -39,7 +37,8 @@ require_once 'PHPUnit/TextUI/TestRunner.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_AllTests {
+class Horde_Kolab_Server_AllTests
+{
 
     /**
      * Main entry point for running the suite.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php
index 6f3611cb4..3b2aab214 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php
@@ -2,7 +2,6 @@
 /**
  * Handling distribution lists.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -23,7 +22,6 @@ require_once 'Horde/Kolab/Server.php';
 /**
  * Handling distribution lists.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -36,7 +34,8 @@ require_once 'Horde/Kolab/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_DistListHandlingTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_DistListHandlingTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Test adding a distribution list.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php
index ae959cb80..310388743 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php
@@ -2,7 +2,6 @@
 /**
  * Handling groups.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -23,7 +22,6 @@ require_once 'Horde/Kolab/Server.php';
 /**
  * Handling groups.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -36,7 +34,8 @@ require_once 'Horde/Kolab/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server
+{
     /**
      * Test listing groups if there are no groups.
      *
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
index b62c6ac82..fb21f8548 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the group object.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -21,7 +20,6 @@ require_once 'Horde/Kolab/Test/Server.php';
 /**
  * Test the group object.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -34,7 +32,8 @@ require_once 'Horde/Kolab/Test/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Set up testing.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php
index e35a65d4f..f1f12a519 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the object class.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php,v 1.7 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -24,7 +23,6 @@ require_once 'Horde/Kolab/Server/Object.php';
 /**
  * The the handling of objects.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php,v 1.7 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -37,7 +35,8 @@ require_once 'Horde/Kolab/Server/Object.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Set up a dummy db object that will not be used during the
@@ -148,7 +147,6 @@ class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server {
 /**
  * A dummy class for testing.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php,v 1.7 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -161,7 +159,8 @@ class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server {
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class DummyDB {
+class DummyDB
+{
 
 
 }
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php
index 9959a9078..96f28c8d8 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the server class.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php,v 1.6 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -23,7 +22,6 @@ require_once 'Horde/Kolab/Server.php';
 /**
  * Tests for the main server class.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php,v 1.6 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -36,7 +34,8 @@ require_once 'Horde/Kolab/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase {
+class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase
+{
     /**
      * The base class provides no abilities for reading data. So it
      * should mainly return error. But it should be capable of
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php
index 16fbdecac..7596e2101 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the Kolab session handler.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php,v 1.10 2009/01/14 21:46:54 wrobel Exp $
  *
  * PHP version 5
  *
@@ -23,7 +22,6 @@ require_once 'Horde/Kolab/Session.php';
 /**
  * Test the Kolab session handler.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php,v 1.10 2009/01/14 21:46:54 wrobel Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -36,7 +34,8 @@ require_once 'Horde/Kolab/Session.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Test class construction.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/UserHandlingTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/UserHandlingTest.php
index 76c2cef8c..c0013d2cb 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/UserHandlingTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/UserHandlingTest.php
@@ -2,7 +2,6 @@
 /**
  * Handling users.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/UserHandlingTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -21,7 +20,6 @@ require_once 'Horde/Kolab/Test/Server.php';
 /**
  * Handling users.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/UserHandlingTest.php,v 1.3 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -34,7 +32,8 @@ require_once 'Horde/Kolab/Test/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_UserHandlingTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_UserHandlingTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Test listing userss if there are no users.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
index cd918239b..fb29f7a92 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the user object.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php,v 1.5 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -21,7 +20,6 @@ require_once 'Horde/Kolab/Test/Server.php';
 /**
  * Test the user object.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php,v 1.5 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -34,7 +32,8 @@ require_once 'Horde/Kolab/Test/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_UserTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_UserTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Set up testing.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php
index 3aebcb879..cd61abc9c 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the LDAP driver.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php,v 1.7 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -24,7 +23,6 @@ require_once 'Horde/Kolab/Server/ldap.php';
 /**
  * Test the LDAP backend.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php,v 1.7 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -37,7 +35,8 @@ require_once 'Horde/Kolab/Server/ldap.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_ldapTest extends PHPUnit_Framework_TestCase {
+class Horde_Kolab_Server_ldapTest extends PHPUnit_Framework_TestCase
+{
 
     /**
      * Test handling of object classes.
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php
index 992fe282b..9db3f11c0 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php
@@ -2,7 +2,6 @@
 /**
  * Test the test driver.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php,v 1.12 2009/01/06 17:49:27 jan Exp $
  *
  * PHP version 5
  *
@@ -21,7 +20,6 @@ require_once 'Horde/Kolab/Test/Server.php';
 /**
  * Test the test backend.
  *
- * $Horde: framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php,v 1.12 2009/01/06 17:49:27 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -34,7 +32,8 @@ require_once 'Horde/Kolab/Test/Server.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server {
+class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
+{
 
     /**
      * Set up testing.
@@ -56,7 +55,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server {
         $result = $this->ldap->_search('(objectClass=top)', array('objectClass'));
         $this->assertNoError($result);
         $this->assertEquals(12, count($result));
-        
+      
         $result = $this->ldap->_search('(objectClass=top)', array('objectClass'),
                                        'cn=internal,dc=example,dc=org');
         $this->assertNoError($result);