deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RELEASE 1.1.0.7

Browse Source
This commit is contained in:
Deon George
2009-06-30 22:05:31 +10:00
parent 647f86562f
commit 388783fc84
29 changed files with 444 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Entry.php
View File

@@ -1,5 +1,7 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/Entry.php,v 1.2.2.4 2008/11/28 23:26:51 wurley Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/Entry.php,v 1.2.2.5 2009/03/20 07:33:34 wurley Exp $
define('TMPDEBUG',0);
/**
* @package phpLDAPadmin

4
lib/EntryWriter1.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3.2.30 2008/12/19 00:35:09 wurley Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3.2.31 2009/01/30 04:40:03 wurley Exp $
define('IdEntryRefreshMenuItem', '0');
define('IdEntryExportBaseMenuItem', '1');
@@ -2501,7 +2501,7 @@ class EntryWriter1 extends EntryWriter {
$this->draw('Attribute::Values',$attribute,$entry);
} else {
$this->draw('StartValueLine', $attribute);
$this->draw('Value', $attribute, 0);
$this->draw('Value', $attribute, 0,$entry);
$this->draw('Menu', $attribute);
$this->draw('EndValueLine', $attribute);
}

14
lib/Visitor.php
View File

@@ -12,12 +12,15 @@
*/
class Visitor {
public function __call($method,$args) {
$methods = array();
$class = '';
$fnct = '';
$a0 = isset($args[0]) ? $args[0] : '';
for ($i = 0; $i < strlen($a0); $i++) {
if ($class) {
if ($a0[$i] != ':') $fnct .= $a0[$i];
} else {
if ($a0[$i] != ':') {
$fnct .= $a0[$i];
@@ -42,11 +45,20 @@ class Visitor {
$c = $class;
$call = "$method$class$fnct";
while ($class && !method_exists($this,$call)) {
array_push($methods,$call);
while ($class && ! method_exists($this,$call)) {
$class = get_parent_class($class);
$call = "$method$class$fnct";
array_push($methods,$call);
}
if (defined('TMPDEBUG') && TMPDEBUG)
printf('<font size=-2><i>Calling Methods: %s</i></font><br >',join('|',$methods));
if (defined('TMPDEBUG') && TMPDEBUG && method_exists($this,$call))
printf('<font size=-2><b>Invoking Method: %s::%s</b></font><br >',get_class($this),$call);
if ($class) {
$call .= '($obj';
for ($i = 2; $i < count($args); $i++) {

4
lib/createlm.php
View File

@@ -1,6 +1,6 @@
<?php
/*
$Id: createlm.php,v 1.4.2.1 2007/12/21 12:11:55 wurley Exp $
$Id: createlm.php,v 1.4.2.2 2009/01/05 14:35:23 wurley Exp $
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2004 - 2006 Roland Gruber
@@ -327,7 +327,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
* @return string hash value
*/
function nthash($password = "") {
return strtoupper(bin2hex(hash('md4', iconv("UTF-8","UTF-16LE",$password),true)));
return strtoupper(bin2hex(mhash(MHASH_MD4,iconv('UTF-8','UTF-16LE',$password))));
}
/**

23
lib/server_functions.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.51.2.15 2008/12/13 08:57:41 wurley Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.51.2.20 2009/03/20 07:48:45 wurley Exp $
/**
* Classes and functions for LDAP server configuration and capability
@@ -111,7 +111,7 @@ class LDAPserver {
$return = true;
} else {
error(sprintf(_('Error: You have an error in your config file. The only three allowed values for auth_type in the $servers section are \'session\', \'cookie\', and \'config\'. You entered \'%s\', which is not allowed.'),htmlspecialchars($this->auth_type)),'error',null,true);
error(sprintf(_('Error: You have an error in your config file. The only four allowed values for auth_type in the $servers section are \'http\', \'session\', \'cookie\', and \'config\'. You entered \'%s\', which is not allowed.'),htmlspecialchars($this->auth_type)),'error',null,true);
}
if (DEBUG_ENABLED)
@@ -375,7 +375,7 @@ class LDAPserver {
error(sprintf(_('Could not connect to "%s" on port "%s"'),$host,$port),'error');
break;
default:
error(_('Could not bind to the LDAP server (%s).',ldap_err2str($resource),$resource),'error');
error(sprintf(_('Could not bind to the LDAP server (%s).'),ldap_err2str($resource)),'error');
}
} else {
@@ -394,7 +394,10 @@ class LDAPserver {
debug_log('Leaving with Connect [%s], Resource [%s]',16,__FILE__,__LINE__,__METHOD__,
$connect_id,$this->connection[$connect_id]['resource']);
return $this->connection[$connect_id]['resource'];
if (isset($this->connection[$connect_id]['resource']))
return $this->connection[$connect_id]['resource'];
else
return false;
}
/**
@@ -1822,6 +1825,12 @@ class LDAPserver {
# Iterate over the attributes
while ($attr) {
/* It seems that OpenDS complains when you do a ldap_get_values on these attributes - we'll skip them as a workaround */
if (in_array($attr,array('isMemberOf'))) {
$attr = ldap_next_attribute($resource,$entry_id,$attrs);
continue;
}
if ($this->isAttrBinary($attr))
$values = ldap_get_values_len($resource,$entry_id,$attr);
else
@@ -2785,7 +2794,7 @@ class LDAPserver {
$return = $dn;
foreach ($this->getBaseDN() as $base_dn) {
if (preg_match("/${base_dn}$/",$dn)) {
if (preg_match("/${base_dn}$/i",$dn)) {
$return = $base_dn;
break;
}
@@ -3084,7 +3093,7 @@ class LDAPservers {
$this->default->server['port'] = array(
'desc'=>'Port Number',
'var'=>'port',
'default'=>'389');
'default'=>389);
/* Normally PLA will direct all read/write operations to host/port above. However,
* if you specify hostwr/portwr, then write operations will be directed to that host/port.
@@ -3097,7 +3106,7 @@ class LDAPservers {
$this->default->server['portwr'] = array(
'desc'=>'Port Number for write replica',
'var'=>'portwr',
'default'=>'389');
'default'=>389);
$this->default->server['base'] = array(
'desc'=>'Base DN',

7
lib/template_functions.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.43.2.8 2008/12/12 12:20:23 wurley Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.43.2.9 2009/01/09 06:08:21 wurley Exp $
/**
* Classes and functions for the template engine.ation and capability
@@ -265,7 +265,10 @@ class Templates {
break;
default :
$template[$xml_key] = $xml_value['#text'];
if (isset($xml_value['#text']))
$template[$xml_key] = $xml_value['#text'];
else
$template[$xml_key] = $xml_value;
}
}