[Wpmu-ldap-commits] SF.net SVN: wpmu-ldap:[100] trunk

[<axe...@us...>]

Revision: 100
          http://wpmu-ldap.svn.sourceforge.net/wpmu-ldap/?rev=100&view=rev
Author:   axelseaa
Date:     2010-01-30 23:01:42 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
fix which prevented blog admins from bulk adding when enabled

Modified Paths:
--------------
    trunk/ldap/doc/README
    trunk/ldap/lib/wpmu_ldap_adduser.functions.php
    trunk/ldap_auth.php

Modified: trunk/ldap/doc/README
===================================================================
--- trunk/ldap/doc/README	2009-11-25 15:52:12 UTC (rev 99)
+++ trunk/ldap/doc/README	2010-01-30 23:01:42 UTC (rev 100)
@@ -5,8 +5,8 @@
 License:
 ================================================================================
 
-LDAP-Authentication Plugin, v.2.8.1
-for WPMU 2.8.x
+LDAP-Authentication Plugin, v.2.9
+for WPMU 2.8.x and 2.9.x
 
 Copyright (C) 2009 Alistair Young, Patrick Cavit, Hugo Salgado, Alex Barker, and 
 Sean Wedig, Aaron Axelsen

Modified: trunk/ldap/lib/wpmu_ldap_adduser.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap_adduser.functions.php	2009-11-25 15:52:12 UTC (rev 99)
+++ trunk/ldap/lib/wpmu_ldap_adduser.functions.php	2010-01-30 23:01:42 UTC (rev 100)
@@ -112,9 +112,8 @@
 		}
 	} elseif ($_POST['addUserBulk']) {
 		// Check Access
-		if (!is_site_admin($current_user->username)) {
-			ldapAddUserResult(array('updated' => 'false','action' => 'auth'));
-		} else {
+	        $ldapBulkAdd = get_site_option('ldapBulkAdd');
+        	if (is_site_admin($current_user->username) || ($ldapBulkAdd && is_admin($current_user->username))) {
 	 		$user = $_POST['user'];
 			$usernames = array();
 			if ( !empty($user['bulk_username']) ) {
@@ -143,6 +142,8 @@
 						ldapAddUserResult(array('updated' => 'false','action' => 'exists','username' => $username));
 				}
 			}
+		} else {
+			ldapAddUserResult(array('updated' => 'false','action' => 'auth'));
 		}
 	} elseif ($_POST['addLocalUser']) {
                	check_admin_referer('add-local-user');

Modified: trunk/ldap_auth.php
===================================================================
--- trunk/ldap_auth.php	2009-11-25 15:52:12 UTC (rev 99)
+++ trunk/ldap_auth.php	2010-01-30 23:01:42 UTC (rev 100)
@@ -3,7 +3,7 @@
 Plugin Name: LDAP Authentication Plug-in
 Plugin URI: http://wpmuldap.frozenpc.net
 Description: A plugin to override the core Wordpress MU authentication method so as to use an LDAP server for authentication.  
-Version: 2.8.4
+Version: 2.9
 Author: Alistair Young (http://www.weblogs.uhi.ac.uk/sm00ay/), 
 	Patrick Cavit (http://patcavit.com), 
 	Hugo Salgado (http://hugo.vulcano.cl), 


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