[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[23361] trunk

[<se...@us...>]

Revision: 23361
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23361&view=rev
Author:   sept_7
Date:     2009-11-18 16:02:49 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
[FIX] Restore Default behaviour of LDAP Authentication from Tiki3: add
Anonymous Binding to LDAP server

Modified Paths:
--------------
    trunk/lib/auth/ldap.php
    trunk/lib/setup/prefs.php
    trunk/templates/tiki-admin-include-login.tpl

Modified: trunk/lib/auth/ldap.php
===================================================================
--- trunk/lib/auth/ldap.php	2009-11-18 15:55:25 UTC (rev 23360)
+++ trunk/lib/auth/ldap.php	2009-11-18 16:02:49 UTC (rev 23361)
@@ -174,9 +174,12 @@
 				$this->options['binddn'] = $this->user_dn($user);
 				break;
 			case 'ol': // openldap
-			default:
 				$this->options['binddn'] = 'cn='.$user.','.$prefs['auth_ldap_basedn'];
 				break;
+			default:
+				// Anonymous binding
+				unset($this->options['binddn']);
+				unset($this->options['bindpw']);
 		}
 
 			// attributes to fetch

Modified: trunk/lib/setup/prefs.php
===================================================================
--- trunk/lib/setup/prefs.php	2009-11-18 15:55:25 UTC (rev 23360)
+++ trunk/lib/setup/prefs.php	2009-11-18 16:02:49 UTC (rev 23361)
@@ -999,7 +999,7 @@
 		'auth_ldap_debug' => 'n',
 		'auth_ldap_ssl' => 'n',
 		'auth_ldap_starttls' => 'n',
-		'auth_ldap_type' => 'full',
+		'auth_ldap_type' => 'default',
 		'auth_ldap_syncuserattr' => 'uid',
 		'auth_ldap_syncgroupattr' => 'cn',
 		

Modified: trunk/templates/tiki-admin-include-login.tpl
===================================================================
--- trunk/templates/tiki-admin-include-login.tpl	2009-11-18 15:55:25 UTC (rev 23360)
+++ trunk/templates/tiki-admin-include-login.tpl	2009-11-18 16:02:49 UTC (rev 23361)
@@ -362,8 +362,9 @@
                                         <div class="adminoptionbox">
                                                 <div class="adminoptionlabel"><label for="auth_ldap_type">{tr}LDAP Bind Type:{/tr}</label>
                                                         <select name="auth_ldap_type" id="auth_ldap_type">
-                                                                <option value="full" {if $prefs.auth_ldap_type eq "full"} selected="selected"{/if}>{tr}Default: userattr=username,UserDN,BaseDN{/tr}</option>
-                                                                <option value="ol" {if $prefs.auth_ldap_type eq "ol"} selected="selected"{/if}>{tr}userattr=username,BaseDN{/tr}</option>
+                                                                <option value="default" {if $prefs.auth_ldap_type eq "default"} selected="selected"{/if}>{tr}Default: Anonymous Bind{/tr}</option>
+                                                                <option value="full" {if $prefs.auth_ldap_type eq "full"} selected="selected"{/if}>{tr}Full: userattr=username,UserDN,BaseDN{/tr}</option>
+                                                                <option value="ol" {if $prefs.auth_ldap_type eq "ol"} selected="selected"{/if}>{tr}OpenLDAP: userattr=username,BaseDN{/tr}</option>
                                                                 <option value="ad" {if $prefs.auth_ldap_type eq "ad"} selected="selected"{/if}>{tr}Active Directory (username@domain){/tr}</option>
                                                                 <option value="plain" {if $prefs.auth_ldap_type eq "plain"} selected="selected"{/if}>{tr}Plain Username{/tr}</option>
                                                         </select>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.