From e126518f6023ea307d979c5947d0f8096d5b9e6b Mon Sep 17 00:00:00 2001
From: Deon George <wurley@users.sf.net>
Date: Tue, 30 Jun 2009 19:25:05 +1000
Subject: [PATCH] RELEASE 0.9.6a

---
 VERSION                | 2 +-
 hooks.php              | 4 ++--
 lang/recoded/zh-cn.php | 2 +-
 lang/recoded/zh-tw.php | 2 +-
 lang/zh-tw.php         | 2 +-
 login.php              | 8 +++++---
 server_functions.php   | 4 ++--
 syslog.php             | 4 ++--
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/VERSION b/VERSION
index 85b7c69..83d5275 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.6
+0.9.6a
diff --git a/hooks.php b/hooks.php
index f4b0711..14fdf56 100644
--- a/hooks.php
+++ b/hooks.php
@@ -1,5 +1,5 @@
-<?
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/hooks.php,v 1.4 2005/03/05 09:38:46 wurley Exp $
+<?php
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/hooks.php,v 1.5 2005/04/05 07:34:24 wurley Exp $
 
 /**
  * Functions related to hooks management.
diff --git a/lang/recoded/zh-cn.php b/lang/recoded/zh-cn.php
index 601f3e4..5d9f7be 100644
--- a/lang/recoded/zh-cn.php
+++ b/lang/recoded/zh-cn.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lang/recoded/zh-cn.php,v 1.2 2005/03/25 01:21:31 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lang/recoded/zh-cn.php,v 1.3 2005/04/05 07:33:23 wurley Exp $
 // Translate to Simplified Chinese, by ÕÅѩƽ(heromyth), from zxpmyth@yahoo.com.cn
 // Based on en.php,v 1.119 2005/03/16 20:57:45
 
diff --git a/lang/recoded/zh-tw.php b/lang/recoded/zh-tw.php
index 57d7180..c5cb810 100644
--- a/lang/recoded/zh-tw.php
+++ b/lang/recoded/zh-tw.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*        ---   INSTRUCTIONS FOR TRANSLATORS   ---
  *
diff --git a/lang/zh-tw.php b/lang/zh-tw.php
index 57d7180..c5cb810 100644
--- a/lang/zh-tw.php
+++ b/lang/zh-tw.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*        ---   INSTRUCTIONS FOR TRANSLATORS   ---
  *
diff --git a/login.php b/login.php
index 0bf59e7..ad090f6 100644
--- a/login.php
+++ b/login.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/login.php,v 1.40 2005/03/16 11:20:25 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/login.php,v 1.41 2005/04/03 09:24:41 wurley Exp $
 
 /**
  * For servers whose auth_type is set to 'cookie' or 'session'. Pass me the login info
@@ -58,9 +58,11 @@ elseif ( $ldapserver->isLoginAttrEnabled() ) {
 		// the DN to use when searching for the login_attr user.
 		$ldapserver->auth_type = 'config';
 
-		// search for the "uid" first, this will be an anonymous bind.
 		set_error_handler( 'temp_login_error_handler' );
-		$ldapserver->connect(true,true);
+		if ($ldapserver->login_dn)
+			$ldapserver->connect(true,false);
+		else
+			$ldapserver->connect(true,true);
 		restore_error_handler();
 
 		if (!empty($servers[$ldapserver->server_id]['login_class'])) {
diff --git a/server_functions.php b/server_functions.php
index cce0274..005aad4 100644
--- a/server_functions.php
+++ b/server_functions.php
@@ -1,5 +1,5 @@
 <?php
-/* $Header: /cvsroot/phpldapadmin/phpldapadmin/server_functions.php,v 1.9 2005/03/25 15:45:01 wurley Exp $ */
+/* $Header: /cvsroot/phpldapadmin/phpldapadmin/server_functions.php,v 1.10 2005/04/05 07:46:24 wurley Exp $ */
 
 /**
  * Classes and functions for LDAP server configuration and capability
@@ -780,7 +780,7 @@ class LDAPServer
 	 *
 	 * @return string|false
 	 */
-	function getLoginString( $server_id )
+	function getLoginString()
 	{
 		global $servers;
 
diff --git a/syslog.php b/syslog.php
index 5205688..4b16dd2 100644
--- a/syslog.php
+++ b/syslog.php
@@ -1,5 +1,5 @@
-<?
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/syslog.php,v 1.4 2005/03/05 09:38:46 wurley Exp $
+<?php
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/syslog.php,v 1.5 2005/04/05 07:34:23 wurley Exp $
 
 /**
  * Functions related to syslog logging.