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

RELEASE 0.9.7.2

Browse Source
This commit is contained in:
Deon George
2009-06-30 19:41:11 +10:00
parent b443271175
commit 1f7f96122f
6 changed files with 223 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/functions.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.275.2.16 2005/11/01 10:06:53 wurley Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.275.2.17 2005/11/12 04:41:17 wurley Exp $
/**
* A collection of functions used throughout phpLDAPadmin.
@@ -2962,17 +2962,34 @@ function get_default_hash($server_id) {
* @return string The current version as read from the VERSION file.
*/
function pla_version() {
if (DEBUG_ENABLED)
debug_log('pla_version(): Entered with ()',2);
$version_file = realpath('../VERSION');
if (! file_exists($version_file))
return 'unknown version';
$return = 'UNKNOWN';
$f = fopen($version_file,'r');
$version = fread($f, filesize($version_file));
fclose($f);
return trim($version);
else {
$f = fopen($version_file,'r');
$version = trim(fread($f, filesize($version_file)));
fclose($f);
# We use cvs_prefix, because CVS will translate this on checkout otherwise.
$cvs_prefix = '\$Name:';
$return = preg_replace('/^'.$cvs_prefix.' RELEASE-([0-9_]+)\s*\$$/','$1',$version);
$return = preg_replace('/_/','.',$return);
# Check if we are a CVS copy.
if (preg_match('/^'.$cvs_prefix.'?\s*\$$/',$return))
$return = 'CVS';
# If return is still the same as version, then the tag is not one we expect.
elseif ($return == $version)
$return = 'UNKNOWN';
}
if (DEBUG_ENABLED)
debug_log('pla_version(): Entered with (), Returning (%s)',2,$return);
return $return;
}
/**

4
lib/server_functions.php
View File

@@ -1,5 +1,5 @@
<?php
/* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.27.2.7 2005/11/01 10:06:53 wurley Exp $ */
/* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.27.2.8 2005/11/12 02:37:19 wurley Exp $ */
/**
* Classes and functions for LDAP server configuration and capability
@@ -1467,7 +1467,7 @@ class LDAPservers {
$this->default->login['attr'] = array(
'desc'=>'Attribute to use to find the users DN',
'var'=>'login_attr',
'default'=>'uid');
'default'=>'dn');
$this->default->login['class'] = array(
'desc'=>'Strict login to users containing a specific objectClass',

6
lib/template_functions.php
View File

@@ -1,5 +1,5 @@
<?php
/* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.25.2.8 2005/10/25 12:50:29 wurley Exp $ */
/* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.25.2.9 2005/11/12 02:46:18 wurley Exp $ */
/**
* Classes and functions for the template engine.ation and capability
@@ -178,6 +178,10 @@ class Templates {
$this->_template[$template]['attribute'][$attr_details['ID']] = $this->_parseXML($index,$attr_details);
} else {
if (! strcmp($index,'ID'))
continue;
foreach ($attr_details as $key => $values) {
if (is_array($values) && isset($values['ID'])) {