From 4793a4b74c31c94d3b655d457332293c58869d1e Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 11 Feb 2014 11:26:11 +1100 Subject: [PATCH] Minor kodoc updates and fixes --- classes/Kohana/Auth/LDAP.php | 3 +-- classes/Kohana/Database/LDAP.php | 4 ++-- classes/Kohana/Database/LDAP/Result.php | 2 +- classes/Kohana/Database/LDAP/Result/Cached.php | 2 +- classes/Kohana/Database/LDAP/Search.php | 4 ++-- .../Kohana/Database/LDAP/Search/Builder/Query.php | 4 ++-- classes/Kohana/Database/LDAP/Search/Result.php | 4 ++-- classes/Kohana/LDAP.php | 3 +-- classes/Kohana/ORM/LDAP.php | 6 +++--- classes/Model/LDAP.php | 14 ++------------ 10 files changed, 17 insertions(+), 29 deletions(-) diff --git a/classes/Kohana/Auth/LDAP.php b/classes/Kohana/Auth/LDAP.php index 1f37156..178356f 100644 --- a/classes/Kohana/Auth/LDAP.php +++ b/classes/Kohana/Auth/LDAP.php @@ -3,8 +3,7 @@ /** * LDAP Auth driver. * - * @package Auth/LDAP - * @category Helpers + * @package Kohana/Auth * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html diff --git a/classes/Kohana/Database/LDAP.php b/classes/Kohana/Database/LDAP.php index 99b437d..4e155da 100644 --- a/classes/Kohana/Database/LDAP.php +++ b/classes/Kohana/Database/LDAP.php @@ -3,8 +3,8 @@ /** * This class takes care of communicating with LDAP * - * @package Kohana/LDAP - * @category Database/LDAP + * @package Kohana/Database + * @category Drivers * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html diff --git a/classes/Kohana/Database/LDAP/Result.php b/classes/Kohana/Database/LDAP/Result.php index e873ff3..20b6ecd 100644 --- a/classes/Kohana/Database/LDAP/Result.php +++ b/classes/Kohana/Database/LDAP/Result.php @@ -3,7 +3,7 @@ /** * LDAP database result. See [Results](/database/results) for usage and examples. * - * @package Kohana/LDAP + * @package Kohana/Database * @category Query/Result * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team diff --git a/classes/Kohana/Database/LDAP/Result/Cached.php b/classes/Kohana/Database/LDAP/Result/Cached.php index f84f1e4..cfc60cd 100644 --- a/classes/Kohana/Database/LDAP/Result/Cached.php +++ b/classes/Kohana/Database/LDAP/Result/Cached.php @@ -3,7 +3,7 @@ /** * Object used for caching the results of select queries. See [Results](/database/results#select-cached) for usage and examples. * - * @package Kohana/LDAP + * @package Kohana/Database * @category Query/Result * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team diff --git a/classes/Kohana/Database/LDAP/Search.php b/classes/Kohana/Database/LDAP/Search.php index f2a3ef8..530a66f 100644 --- a/classes/Kohana/Database/LDAP/Search.php +++ b/classes/Kohana/Database/LDAP/Search.php @@ -3,8 +3,8 @@ /** * This class takes care of searching within LDAP * - * @package Kohana/LDAP - * @category Helpers + * @package Kohana/Database + * @category Query * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html diff --git a/classes/Kohana/Database/LDAP/Search/Builder/Query.php b/classes/Kohana/Database/LDAP/Search/Builder/Query.php index 87cbff6..1234886 100644 --- a/classes/Kohana/Database/LDAP/Search/Builder/Query.php +++ b/classes/Kohana/Database/LDAP/Search/Builder/Query.php @@ -3,8 +3,8 @@ /** * This class takes care of building an LDAP filter query * - * @package Kohana/LDAP - * @category Helpers + * @package Kohana/Database + * @category Query * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html diff --git a/classes/Kohana/Database/LDAP/Search/Result.php b/classes/Kohana/Database/LDAP/Search/Result.php index 60d9bb3..ec47922 100644 --- a/classes/Kohana/Database/LDAP/Search/Result.php +++ b/classes/Kohana/Database/LDAP/Search/Result.php @@ -3,8 +3,8 @@ /** * Return the query search result. * - * @package Kohana/LDAP - * @category Query + * @package Kohana/Database + * @category Query/Result * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html diff --git a/classes/Kohana/LDAP.php b/classes/Kohana/LDAP.php index b86af8b..fb244f6 100644 --- a/classes/Kohana/LDAP.php +++ b/classes/Kohana/LDAP.php @@ -3,8 +3,7 @@ /** * This class takes care of communicating with LDAP * - * @package Kohana/LDAP - * @category Database/LDAP + * @package Kohana/Database * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html diff --git a/classes/Kohana/ORM/LDAP.php b/classes/Kohana/ORM/LDAP.php index 25cd580..4d44765 100644 --- a/classes/Kohana/ORM/LDAP.php +++ b/classes/Kohana/ORM/LDAP.php @@ -3,8 +3,7 @@ /** * Kohana ORM LDAP Extension * - * @package LDAP/ORM - * @category Helpers + * @package Kohana/ORM * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html @@ -14,6 +13,7 @@ abstract class Kohana_ORM_LDAP extends ORM { protected $_disable_join_table_name = TRUE; protected $_primary_key = 'dn'; protected $_sub_items = array(); +// protected $_db_group = 'default'; public function __construct($id = NULL) { // We'll process our $id @@ -153,7 +153,7 @@ abstract class Kohana_ORM_LDAP extends ORM { } } - if ($col = 'dn' AND $val) + if ($col == 'dn' AND $val) $model->base($val)->find(); else $model->where($col, '=', $val)->find(); diff --git a/classes/Model/LDAP.php b/classes/Model/LDAP.php index c40638b..931a6b1 100644 --- a/classes/Model/LDAP.php +++ b/classes/Model/LDAP.php @@ -3,23 +3,13 @@ /** * This class provides our ORM interaction with LDAP * - * @package Kohana/LDAP - * @category Model/LDAP + * @package Kohana/Database + * @category Models * @author Deon George * @copyright (c) 2013 phpLDAPadmin Development Team * @license http://dev.phpldapadmin.org/license.html */ class Model_LDAP extends ORM_LDAP { public $_reload_on_wakeup = FALSE; - - protected $_has_one = array( - 'bp_manager'=>array('model'=>'LDAP','foreign_key'=>'dn','far_key'=>'manager'), - 'tl_manager'=>array('model'=>'LDAP','foreign_key'=>'dn','far_key'=>'glteamlead'), - ); - - // Unused - by required for page rendering for admin menu items - public function isAdmin() { - return FALSE; - } } ?>