summaryrefslogtreecommitdiff
path: root/inc/auth
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2009-11-03 11:40:30 +0100
committerAndreas Gohr <gohr@cosmocode.de>2009-11-03 11:40:30 +0100
commit8bd75eb73c9c204565d17b3657831cbc4a138a48 (patch)
treebb55650bb6716a4a5ff46a02639069abfb0c7806 /inc/auth
parent9daa034061aa74e113fcce1715fdcd076a5de76a (diff)
downloadrpg-8bd75eb73c9c204565d17b3657831cbc4a138a48.tar.gz
rpg-8bd75eb73c9c204565d17b3657831cbc4a138a48.tar.bz2
Fixed bug in the ad auth class
Ignore-this: 3896e395c6b4f5d994a4f0c541da9847 darcs-hash:20091103104030-6e07b-363c2fc2ced21906aac1e1a729ddbbee81d1b286.gz
Diffstat (limited to 'inc/auth')
-rw-r--r--inc/auth/ad.class.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index 15559112f..4365e75dc 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -34,9 +34,9 @@
require_once(DOKU_INC.'inc/adLDAP.php');
-
class auth_ad extends auth_basic {
var $cnf = null;
+ var $opts = null;
var $adldap = null;
/**
@@ -74,17 +74,17 @@ class auth_ad extends auth_basic {
}
// prepare adLDAP standard configuration
- $opts = $this->cnf;
+ $this->opts = $this->cnf;
// add possible domain specific configuration
if($dom && is_array($this->cnf[$dom])) foreach($this->cnf[$dom] as $key => $val){
- $opts[$key] = $val;
+ $this->opts[$key] = $val;
}
// handle multiple AD servers
- $opts['domain_controllers'] = explode(',',$opts['domain_controllers']);
- $opts['domain_controllers'] = array_map('trim',$opts['domain_controllers']);
- $opts['domain_controllers'] = array_filter($opts['domain_controllers']);
+ $this->opts['domain_controllers'] = explode(',',$this->opts['domain_controllers']);
+ $this->opts['domain_controllers'] = array_map('trim',$this->opts['domain_controllers']);
+ $this->opts['domain_controllers'] = array_filter($this->opts['domain_controllers']);
// we currently just handle authentication, so no capabilities are set
}
@@ -181,7 +181,7 @@ class auth_ad extends auth_basic {
// connect
try {
- $this->adldap = new adLDAP($opts);
+ $this->adldap = new adLDAP($this->opts);
return true;
} catch (adLDAPException $e) {
$this->success = false;