deon/lnldap
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor kodoc updates and fixes

Browse Source
This commit is contained in:
Deon George 2014-02-11 11:26:11 +11:00
parent 0ee23bf06e
commit 4793a4b74c
10 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/Kohana/Auth/LDAP.php
View File

@ -3,8 +3,7 @@
/** /**
* LDAP Auth driver. * LDAP Auth driver.
* *
* @package Auth/LDAP * @package Kohana/Auth
* @category Helpers
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @license http://dev.phpldapadmin.org/license.html

4
classes/Kohana/Database/LDAP.php
View File

@ -3,8 +3,8 @@
/** /**
* This class takes care of communicating with LDAP * This class takes care of communicating with LDAP
* *
* @package Kohana/LDAP * @package Kohana/Database
* @category Database/LDAP * @category Drivers
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @license http://dev.phpldapadmin.org/license.html

2
classes/Kohana/Database/LDAP/Result.php
View File

@ -3,7 +3,7 @@
/** /**
* LDAP database result. See [Results](/database/results) for usage and examples. * LDAP database result. See [Results](/database/results) for usage and examples.
* *
* @package Kohana/LDAP * @package Kohana/Database
* @category Query/Result * @category Query/Result
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team

2
classes/Kohana/Database/LDAP/Result/Cached.php
View File

@ -3,7 +3,7 @@
/** /**
* Object used for caching the results of select queries. See [Results](/database/results#select-cached) for usage and examples. * 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 * @category Query/Result
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team

4
classes/Kohana/Database/LDAP/Search.php
View File

@ -3,8 +3,8 @@
/** /**
* This class takes care of searching within LDAP * This class takes care of searching within LDAP
* *
* @package Kohana/LDAP * @package Kohana/Database
* @category Helpers * @category Query
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @license http://dev.phpldapadmin.org/license.html

4
classes/Kohana/Database/LDAP/Search/Builder/Query.php
View File

@ -3,8 +3,8 @@
/** /**
* This class takes care of building an LDAP filter query * This class takes care of building an LDAP filter query
* *
* @package Kohana/LDAP * @package Kohana/Database
* @category Helpers * @category Query
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @license http://dev.phpldapadmin.org/license.html

4
classes/Kohana/Database/LDAP/Search/Result.php
View File

@ -3,8 +3,8 @@
/** /**
* Return the query search result. * Return the query search result.
* *
* @package Kohana/LDAP * @package Kohana/Database
* @category Query * @category Query/Result
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @license http://dev.phpldapadmin.org/license.html

3
classes/Kohana/LDAP.php
View File

@ -3,8 +3,7 @@
/** /**
* This class takes care of communicating with LDAP * This class takes care of communicating with LDAP
* *
* @package Kohana/LDAP * @package Kohana/Database
* @category Database/LDAP
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @license http://dev.phpldapadmin.org/license.html

6
classes/Kohana/ORM/LDAP.php
View File

@ -3,8 +3,7 @@
/** /**
* Kohana ORM LDAP Extension * Kohana ORM LDAP Extension
* *
* @package LDAP/ORM * @package Kohana/ORM
* @category Helpers
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @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 $_disable_join_table_name = TRUE;
protected $_primary_key = 'dn'; protected $_primary_key = 'dn';
protected $_sub_items = array(); protected $_sub_items = array();
// protected $_db_group = 'default';
public function __construct($id = NULL) { public function __construct($id = NULL) {
// We'll process our $id // 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(); $model->base($val)->find();
else else
$model->where($col, '=', $val)->find(); $model->where($col, '=', $val)->find();

14
classes/Model/LDAP.php
View File

@ -3,23 +3,13 @@
/** /**
* This class provides our ORM interaction with LDAP * This class provides our ORM interaction with LDAP
* *
* @package Kohana/LDAP * @package Kohana/Database
* @category Model/LDAP * @category Models
* @author Deon George * @author Deon George
* @copyright (c) 2013 phpLDAPadmin Development Team * @copyright (c) 2013 phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html * @license http://dev.phpldapadmin.org/license.html
*/ */
class Model_LDAP extends ORM_LDAP { class Model_LDAP extends ORM_LDAP {
public $_reload_on_wakeup = FALSE; 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;
}
} }
?> ?>