[Wpmu-ldap-commits] SF.net SVN: wpmu-ldap:[102] trunk/ldap/lib

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

Revision: 102
          http://wpmu-ldap.svn.sourceforge.net/wpmu-ldap/?rev=102&view=rev
Author:   axelseaa
Date:     2010-01-31 03:25:19 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
replaced is_site_admin with new is_super_admin function

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

Modified: trunk/ldap/lib/wpmu_ldap.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap.functions.php	2010-01-30 23:03:31 UTC (rev 101)
+++ trunk/ldap/lib/wpmu_ldap.functions.php	2010-01-31 03:25:19 UTC (rev 102)
@@ -154,7 +154,7 @@
 	}
 
 	// Handle blog removal for various reasons
-	if(is_site_admin($username) === false) {
+	if(is_super_admin($username) === false) {
         	if ($primary_blog = get_usermeta($loginObj->ID, "primary_blog")) {
 			$details = get_blog_details( $primary_blog );
 			if( is_object( $details ) && $details->archived == 1 || $details->spam == 1 || $details->deleted == 1 ) {

Modified: trunk/ldap/lib/wpmu_ldap_adduser.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap_adduser.functions.php	2010-01-30 23:03:31 UTC (rev 101)
+++ trunk/ldap/lib/wpmu_ldap_adduser.functions.php	2010-01-31 03:25:19 UTC (rev 102)
@@ -9,7 +9,7 @@
                 //  not blog-specific config, but side-wide
 		$ldapAddUser = get_site_option('ldapAddUser');
 		$ldapBulkAdd = get_site_option('ldapBulkAdd');
-		if (is_site_admin() || 
+		if (is_super_admin() || 
 			($ldapAddUser == 'enabled' || empty($ldapAddUser)) ||
 			($ldapBulkAdd && is_admin($current_user->username))) {
         	        add_submenu_page('wpmu-admin.php', 'LDAP Add User', 'Add User', 9, 'wpmu_ldap_adduser.functions.php', 'ldapAddUserOptions');
@@ -86,7 +86,7 @@
 			if ($result[0]) {
                                 wp_new_user_notification($result[1]);
 				ldapAddUserResult(array('updated' => 'true','action' => 'add','username' => $username));
-			} elseif ($ldapCreateLocalUser || is_site_admin($current_user->username))  {
+			} elseif ($ldapCreateLocalUser || is_super_admin($current_user->username))  {
                 	        ?>
         	                <div id='message' class='updated'>
 	                        <form method='post'>
@@ -113,7 +113,7 @@
 	} elseif ($_POST['addUserBulk']) {
 		// Check Access
 	        $ldapBulkAdd = get_site_option('ldapBulkAdd');
-        	if (is_site_admin($current_user->username) || ($ldapBulkAdd && is_admin($current_user->username))) {
+        	if (is_super_admin($current_user->username) || ($ldapBulkAdd && is_admin($current_user->username))) {
 	 		$user = $_POST['user'];
 			$usernames = array();
 			if ( !empty($user['bulk_username']) ) {
@@ -148,7 +148,7 @@
 	} elseif ($_POST['addLocalUser']) {
                	check_admin_referer('add-local-user');
 		$ldapCreateLocalUser = get_site_option('ldapCreateLocalUser');
-		if ($ldapCreateLocalUser || is_site_admin($current_user->username))  {
+		if ($ldapCreateLocalUser || is_super_admin($current_user->username))  {
                 	$user = $_POST['user'];
                 	if ( empty($user['username']) && empty($user['email']) ) {
                         	wp_die( __("<p>Missing username and email.</p>") );
@@ -184,7 +184,7 @@
 	<?php
 	// Add User
 	$ldapAddUser = get_site_option('ldapAddUser');
-	if (is_site_admin() || ($ldapAddUser == 'enabled' || empty($ldapAddUser))) {
+	if (is_super_admin() || ($ldapAddUser == 'enabled' || empty($ldapAddUser))) {
 	?>
 	<h2><?php _e('Add User') ?></h2>
 	<?php
@@ -222,7 +222,7 @@
 	<!-- Bulk Add User -->
 	<?php
 	$ldapBulkAdd = get_site_option('ldapBulkAdd');
-	if (is_site_admin($current_user->username) || ($ldapBulkAdd && is_admin($current_user->username))) {
+	if (is_super_admin($current_user->username) || ($ldapBulkAdd && is_admin($current_user->username))) {
 	?>
 	<h2><?php _e('Add Bulk Users') ?></h2>
 	<p>Using the below fields, you can bulk add LDAP users.  Separate multiple users by a new line.  Local user creation is not available in bulk.</p>

Modified: trunk/ldap/lib/wpmu_ldap_admin.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap_admin.functions.php	2010-01-30 23:03:31 UTC (rev 101)
+++ trunk/ldap/lib/wpmu_ldap_admin.functions.php	2010-01-31 03:25:19 UTC (rev 102)
@@ -584,7 +584,7 @@
 	$objCurrUser = wp_get_current_user();
 	$objUser = wp_cache_get($objCurrUser->id, 'users');
 
-	if (function_exists('add_submenu_page') && is_site_admin($objUser->user_login)) {
+	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');
@@ -733,7 +733,7 @@
 <tr>
 	<th><?php _e('Account Authentication Type'); ?></th>
 	<td class="regular-text">
-	<?php if (is_site_admin($current_user->username) && $user_id > 1) { ?>
+	<?php if (is_super_admin($current_user->username) && $user_id > 1) { ?>
 		<select name="ldapAccountType">
 			<option<?php if ($ldap_login == 'true') echo ' selected="selected"'; ?> value="LDAP"><?php _e('LDAP'); ?></option>
 			<option<?php if ($ldap_login != 'true') echo ' selected="selected"'; ?> value="Local"><?php _e('Local'); ?></option>
@@ -762,7 +762,7 @@
 function wpmuUserFormLdapOptionUpdate() {
 	global $user_id, $current_user;
 
-	if ($user_id == 1 || !is_site_admin($current_user->username))
+	if ($user_id == 1 || !is_super_admin($current_user->username))
 		return;
 
 	if ($_POST['ldapAccountType'] == 'LDAP')


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