From 88857ee0ab1ee3008e5289f66efa9ff2f0603808 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Thu, 12 Mar 2009 17:46:29 +0000 Subject: [PATCH] Use class constants rather than global constants. --- framework/Kolab_Server/lib/Horde/Kolab/Server.php | 16 +++++++++------- framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php index b9d5db681..e812356af 100644 --- 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 78b88f277..89b0cadd5 100644 --- 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 { -- 2.11.0