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

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

Revision: 118
          http://wpmu-ldap.svn.sourceforge.net/wpmu-ldap/?rev=118&view=rev
Author:   axelseaa
Date:     2011-02-25 05:31:19 +0000 (Fri, 25 Feb 2011)

Log Message:
-----------
changes for 3.1

Modified Paths:
--------------
    trunk/ldap/lib/wpmu_ldap.functions.php
    trunk/ldap/lib/wpmu_ldap_admin.functions.php
    trunk/ldap_auth.php

Modified: trunk/ldap/lib/wpmu_ldap.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap.functions.php	2010-10-30 13:27:13 UTC (rev 117)
+++ trunk/ldap/lib/wpmu_ldap.functions.php	2011-02-25 05:31:19 UTC (rev 118)
@@ -83,6 +83,9 @@
 
 		do_action('wpmu_activate_blog', $blog_id, $user_id, $newUserPassword, $newUserName . "'s blog", $meta);
 	}
+
+	// Add user as subscriber to blog #1
+	wpmuUpdateBlogAccess($user_id);
 	
 	return new WP_User($user_id);
 }

Modified: trunk/ldap/lib/wpmu_ldap_admin.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap_admin.functions.php	2010-10-30 13:27:13 UTC (rev 117)
+++ trunk/ldap/lib/wpmu_ldap_admin.functions.php	2011-02-25 05:31:19 UTC (rev 118)
@@ -682,7 +682,7 @@
 	if (function_exists('add_submenu_page') && is_super_admin($objUser->user_login)) {
 		// does not use add_options_page, because it is site-wide configuration,
 		//  not blog-specific config, but side-wide
-		add_submenu_page('wpmu-admin.php', 'LDAP Authentication Options', 'LDAP Options', 9, basename(__FILE__), 'ldapOptionsPanel');
+		add_submenu_page('settings.php', 'LDAP Options', 'LDAP Options', '', basename(__FILE__), 'ldapOptionsPanel');
 	}
 }
 

Modified: trunk/ldap_auth.php
===================================================================
--- trunk/ldap_auth.php	2010-10-30 13:27:13 UTC (rev 117)
+++ trunk/ldap_auth.php	2011-02-25 05:31:19 UTC (rev 118)
@@ -4,13 +4,13 @@
 Plugin URI: http://wpmuldap.tuxdocs.net
 Description: A plugin to override the core Wordpress MU authentication method so as to use an LDAP server for authentication.  
 Version: 3.0
-Author: Alistair Young (http://www.weblogs.uhi.ac.uk/sm00ay/), 
-	Patrick Cavit (http://patcavit.com), 
-	Hugo Salgado (http://hugo.vulcano.cl), 
-	Alex Barker (http://www.callutheran.edu), 
-	Dexter Arver, 
-	Sean Wedig (http://www.thecodelife.net), 
-	Aaron Axelsen (http://www.frozenpc.net)
+Author: Aaron Axelsen (http://www.frozenpc.net)
+	Sean Wedig (http://www.thecodelife.net) 
+	Dexter Arver
+	Alex Barker (http://www.callutheran.edu)
+	Hugo Salgado (http://hugo.vulcano.cl)
+	Patrick Cavit (http://patcavit.com)
+	Alistair Young (http://www.weblogs.uhi.ac.uk/sm00ay/)
 */
 
 // Includes
@@ -21,9 +21,11 @@
 require_once("ldap/lib/wpmu_ldap_adduser.functions.php");
 
 add_action('admin_init', 'ldap_addstylesheet');
-add_action('admin_menu', 'ldap_addmenu');
+add_action('network_admin_menu', 'ldap_addmenu');
 add_action('admin_menu', 'ldap_addmenuuser');
+add_action('network_admin_menu', 'ldap_addmenuuser');
 add_action('admin_menu', 'wpmuRemoveAddNewMenu');
+add_action('network_admin_menu', 'wpmuRemoveAddNewMenu');
 
 define('LDAP_DEBUG_MODE',false);
 


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