Use class constants rather than global constants.

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
index b9d5db6..e812356 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
@@ -21,10 +21,6 @@ define('KOLAB_SERVER_RESULT_SINGLE', 1);
 define('KOLAB_SERVER_RESULT_STRICT', 2);
 define('KOLAB_SERVER_RESULT_MANY',   3);
 
-/** Define the base types. */
-define('KOLAB_SERVER_USER',  'kolabInetOrgPerson');
-define('KOLAB_SERVER_GROUP', 'kolabGroupOfNames');
-
 /**
  * This class provides methods to deal with Kolab objects stored in
  * the Kolab object db.
@@ -44,6 +40,12 @@ abstract class Horde_Kolab_Server
 {
 
     /**
+     * The object types supported by this module.
+     */
+    const USER  = 'kolabInetOrgPerson';
+    const GROUP = 'kolabGroupOfNames';
+
+    /**
      * Server parameters.
      *
      * @var array
@@ -398,7 +400,7 @@ abstract class Horde_Kolab_Server
                          array(
                              array('field' => 'objectClass',
                                    'op'    => '=',
-                                   'test'  => KOLAB_SERVER_USER),
+                                   'test'  => Horde_Kolab_Server::USER),
                              array('OR' =>
                                    array(
                                        array('field' => 'uid',
@@ -436,7 +438,7 @@ abstract class Horde_Kolab_Server
                          array(
                              array('field' => 'objectClass',
                                    'op'    => '=',
-                                   'test'  => KOLAB_SERVER_USER),
+                                   'test'  => Horde_Kolab_Server::USER),
                              array('OR' =>
                                    array(
                                        array('field' => 'uid',
@@ -461,7 +463,7 @@ abstract class Horde_Kolab_Server
                          array(
                              array('field' => 'objectClass',
                                    'op'    => '=',
-                                   'test'  => KOLAB_SERVER_USER),
+                                   'test'  => Horde_Kolab_Server::USER),
                              array('field' => 'kolabDelegate',
                                    'op'    => '=',
                                    'test'  => $result['mail'][0]),

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
index 78b88f2..89b0cad 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
@@ -329,7 +329,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
     {
         $users = array('field' => 'objectClass',
                        'op'    => '=',
-                       'test'  => KOLAB_SERVER_USER);
+                       'test'  => Horde_Kolab_Server::USER);
         if (!empty($criteria)) {
             $criteria = array('AND' => array($users, $criteria));
         } else {
@@ -356,7 +356,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server
     {
         $groups = array('field' => 'objectClass',
                         'op'    => '=',
-                        'test'  => KOLAB_SERVER_GROUP);
+                        'test'  => Horde_Kolab_Server::GROUP);
         if (!empty($criteria)) {
             $criteria = array('AND' => array($groups, $criteria));
         } else {