%s
' ), implode( ', ', $subdirectory_reserved_names ) ) );
- }
-
- $email = sanitize_email( $blog['email'] );
- $title = $blog['title'];
-
- if ( empty( $domain ) )
- wp_die( __( 'Missing or invalid site address.' ) );
- if ( empty( $email ) )
- wp_die( __( 'Missing email address.' ) );
- if ( !is_email( $email ) )
- wp_die( __( 'Invalid email address.' ) );
-
- if ( is_subdomain_install() ) {
- $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
- $path = $base;
- } else {
- $newdomain = $current_site->domain;
- $path = $base . $domain . '/';
- }
-
- $password = 'N/A';
- $user_id = email_exists($email);
- if ( !$user_id ) { // Create a new user with a random password
- $password = wp_generate_password();
- $user_id = wpmu_create_user( $domain, $password, $email );
- if ( false == $user_id )
- wp_die( __( 'There was an error creating the user.' ) );
- else
- wp_new_user_notification( $user_id, $password );
- }
-
- $wpdb->hide_errors();
- $id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
- $wpdb->show_errors();
- if ( !is_wp_error( $id ) ) {
- $dashboard_blog = get_dashboard_blog();
- if ( !is_super_admin( $user_id ) && get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id )
- update_user_option( $user_id, 'primary_blog', $id, true );
- $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain . $path, stripslashes( $title ) );
- wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
- wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'add-blog' ), wp_get_referer() ) );
- exit();
- } else {
- wp_die( $id->get_error_message() );
- }
- break;
-
- case 'updateblog':
- check_admin_referer( 'editblog' );
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( empty( $_POST ) )
- wp_die( sprintf( __( 'You probably need to go back to the sites page', esc_url( admin_url( 'ms-sites.php' ) ) ) ) );
-
- switch_to_blog( $id );
-
- // themes
- $allowedthemes = array();
- if ( isset($_POST['theme']) && is_array( $_POST['theme'] ) ) {
- foreach ( $_POST['theme'] as $theme => $val ) {
- if ( 'on' == $val )
- $allowedthemes[$theme] = true;
- }
- }
- update_option( 'allowedthemes', $allowedthemes );
-
- // options
- if ( is_array( $_POST['option'] ) ) {
- $c = 1;
- $count = count( $_POST['option'] );
- $skip_options = array( 'allowedthemes' ); // Don't update these options since they are handled elsewhere in the form.
- foreach ( (array) $_POST['option'] as $key => $val ) {
- if ( $key === 0 || is_array( $val ) || in_array($key, $skip_options) )
- continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options
- if ( $c == $count )
- update_option( $key, stripslashes( $val ) );
- else
- update_option( $key, stripslashes( $val ), false ); // no need to refresh blog details yet
- $c++;
- }
- }
-
- // home and siteurl
- if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) {
- $blog_address = get_blogaddress_by_domain( $_POST['blog']['domain'], $_POST['blog']['path'] );
- if ( get_option( 'siteurl' ) != $blog_address )
- update_option( 'siteurl', $blog_address );
-
- if ( get_option( 'home' ) != $blog_address )
- update_option( 'home', $blog_address );
- }
-
- // rewrite rules can't be flushed during switch to blog
- delete_option( 'rewrite_rules' );
-
- // update blogs table
- $blog_data = stripslashes_deep( $_POST['blog'] );
- update_blog_details( $id, $blog_data );
-
- // get blog prefix
- $blog_prefix = $wpdb->get_blog_prefix( $id );
-
- // user roles
- if ( isset( $_POST['role'] ) && is_array( $_POST['role'] ) == true ) {
- $newroles = $_POST['role'];
-
- reset( $newroles );
- foreach ( (array) $newroles as $userid => $role ) {
- $user = new WP_User( $userid );
- if ( empty( $user->ID ) )
- continue;
- $user->for_blog( $id );
- $user->set_role( $role );
- }
- }
-
- // remove user
- if ( isset( $_POST['blogusers'] ) && is_array( $_POST['blogusers'] ) ) {
- reset( $_POST['blogusers'] );
- foreach ( (array) $_POST['blogusers'] as $key => $val )
- remove_user_from_blog( $key, $id );
- }
-
- // change password
- if ( isset( $_POST['user_password'] ) && is_array( $_POST['user_password'] ) ) {
- reset( $_POST['user_password'] );
- $newroles = $_POST['role'];
- foreach ( (array) $_POST['user_password'] as $userid => $pass ) {
- unset( $_POST['role'] );
- $_POST['role'] = $newroles[ $userid ];
- if ( $pass != '' ) {
- $cap = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = %d AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'", $userid ) );
- $userdata = get_userdata($userid);
- $_POST['pass1'] = $_POST['pass2'] = $pass;
- $_POST['email'] = $userdata->user_email;
- $_POST['rich_editing'] = $userdata->rich_editing;
- edit_user( $userid );
- if ( $cap == null )
- $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->usermeta} WHERE user_id = %d AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'", $userid ) );
- }
- }
- unset( $_POST['role'] );
- $_POST['role'] = $newroles;
- }
-
- // add user
- if ( !empty( $_POST['newuser'] ) ) {
- $newuser = $_POST['newuser'];
- $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
- if ( $userid ) {
- $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" );
- if ( $user == false )
- add_user_to_blog( $id, $userid, $_POST['new_role'] );
- }
- }
- do_action( 'wpmu_update_blog_options' );
- restore_current_blog();
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'editblog', 'id' => $id ), wp_get_referer() ) );
- break;
-
- case 'deleteblog':
- check_admin_referer('deleteblog');
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( $id != '0' && $id != $current_site->blog_id )
- wpmu_delete_blog( $id, true );
-
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'delete' ), wp_get_referer() ) );
- exit();
- break;
-
- case 'allblogs':
- if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
- check_admin_referer( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' );
-
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
- $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
-
-
- foreach ( (array) $_POST['allblogs'] as $key => $val ) {
- if ( $val != '0' && $val != $current_site->blog_id ) {
- switch ( $doaction ) {
- case 'delete':
- $blogfunction = 'all_delete';
- wpmu_delete_blog( $val, true );
- break;
-
- case 'spam':
- $blogfunction = 'all_spam';
- update_blog_status( $val, 'spam', '1', 0 );
- set_time_limit( 60 );
- break;
-
- case 'notspam':
- $blogfunction = 'all_notspam';
- update_blog_status( $val, 'spam', '0', 0 );
- set_time_limit( 60 );
- break;
- }
- } else {
- wp_die( __( 'You are not allowed to change the current site.' ) );
- }
- }
-
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $blogfunction ), wp_get_referer() ) );
- exit();
- } else {
- wp_redirect( admin_url( 'ms-sites.php' ) );
- }
- break;
-
- case 'archiveblog':
- check_admin_referer( 'archiveblog' );
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- update_blog_status( $id, 'archived', '1' );
- do_action( 'archive_blog', $id );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'archive' ), wp_get_referer() ) );
- exit();
- break;
-
- case 'unarchiveblog':
- check_admin_referer( 'unarchiveblog' );
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- do_action( 'unarchive_blog', $id );
- update_blog_status( $id, 'archived', '0' );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unarchive' ), wp_get_referer() ) );
- exit();
- break;
-
- case 'activateblog':
- check_admin_referer( 'activateblog' );
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- update_blog_status( $id, 'deleted', '0' );
- do_action( 'activate_blog', $id );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'activate' ), wp_get_referer() ) );
- exit();
- break;
-
- case 'deactivateblog':
- check_admin_referer( 'deactivateblog' );
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- do_action( 'deactivate_blog', $id );
- update_blog_status( $id, 'deleted', '1' );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'deactivate' ), wp_get_referer() ) );
- exit();
- break;
-
- case 'unspamblog':
- check_admin_referer( 'unspamblog' );
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- update_blog_status( $id, 'spam', '0' );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unspam' ), wp_get_referer() ) );
- exit();
- break;
-
- case 'spamblog':
- check_admin_referer( 'spamblog' );
- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- update_blog_status( $id, 'spam', '1' );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'spam' ), wp_get_referer() ) );
- exit();
- break;
-
- // Themes
- case 'updatethemes':
- if ( ! current_user_can( 'manage_network_themes' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( is_array( $_POST['theme'] ) ) {
- $themes = get_themes();
- reset( $themes );
- $allowed_themes = array();
- foreach ( (array) $themes as $key => $theme ) {
- if ( $_POST['theme'][ esc_html( $theme['Stylesheet'] ) ] == 'enabled' )
- $allowed_themes[ esc_html( $theme['Stylesheet'] ) ] = true;
- }
- update_site_option( 'allowedthemes', $allowed_themes );
- }
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'themes' ), wp_get_referer() ) );
- exit();
- break;
-
- // Common
- case 'confirm':
- if ( !headers_sent() ) {
- nocache_headers();
- header( 'Content-Type: text/html; charset=utf-8' );
- }
- if ( $current_site->blog_id == $id )
- wp_die( __( 'You are not allowed to change the current site.' ) );
- ?>
-
- >
-
-
-
-
-
-
-
-
-
-
-
- ';
- confirm_delete_users( $_POST['allusers'] );
- echo '';
- require_once( 'admin-footer.php' );
- exit();
- } else {
- wp_redirect( admin_url( 'ms-users.php' ) );
- }
- break;
-
- case 'allusers':
- if ( ! current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
- check_admin_referer( 'bulk-ms-users', '_wpnonce_bulk-ms-users' );
-
- if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
- $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
-
- foreach ( (array) $_POST['allusers'] as $key => $val ) {
- if ( !empty( $val ) ) {
- switch ( $doaction ) {
- case 'delete':
- $title = __( 'Users' );
- $parent_file = 'ms-admin.php';
- require_once( 'admin-header.php' );
- echo '';
- confirm_delete_users( $_POST['allusers'] );
- echo '';
- require_once( 'admin-footer.php' );
- exit();
- break;
-
- case 'spam':
- $user = new WP_User( $val );
- if ( in_array( $user->user_login, get_super_admins() ) )
- wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
-
- $userfunction = 'all_spam';
- $blogs = get_blogs_of_user( $val, true );
- foreach ( (array) $blogs as $key => $details ) {
- if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
- update_blog_status( $details->userblog_id, 'spam', '1' );
- }
- update_user_status( $val, 'spam', '1', 1 );
- break;
-
- case 'notspam':
- $userfunction = 'all_notspam';
- $blogs = get_blogs_of_user( $val, true );
- foreach ( (array) $blogs as $key => $details )
- update_blog_status( $details->userblog_id, 'spam', '0' );
-
- update_user_status( $val, 'spam', '0', 1 );
- break;
- }
- }
- }
-
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
- exit();
- } else {
- wp_redirect( admin_url( 'ms-users.php' ) );
- }
- break;
-
- case 'dodelete':
- check_admin_referer( 'ms-users-delete' );
- if ( ! current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
- foreach ( $_POST['blog'] as $id => $users ) {
- foreach ( $users as $blogid => $user_id ) {
- if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] )
- remove_user_from_blog( $id, $blogid, $user_id );
- else
- remove_user_from_blog( $id, $blogid );
- }
- }
- }
- $i = 0;
- if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
- foreach( $_POST['user'] as $id ) {
- wpmu_delete_user( $id );
- $i++;
- }
-
- if ( $i == 1 )
- $deletefunction = 'delete';
- else
- $deletefunction = 'all_delete';
-
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), admin_url( 'ms-users.php' ) ) );
- break;
-
- case 'adduser':
- check_admin_referer( 'add-user', '_wpnonce_add-user' );
- if ( ! current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( is_array( $_POST['user'] ) == false )
- wp_die( __( 'Cannot create an empty user.' ) );
- $user = $_POST['user'];
- if ( empty($user['username']) && empty($user['email']) )
- wp_die( __( 'Missing username and email.' ) );
- elseif ( empty($user['username']) )
- wp_die( __( 'Missing username.' ) );
- elseif ( empty($user['email']) )
- wp_die( __( 'Missing email.' ) );
-
- $password = wp_generate_password();
- $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
-
- if ( false == $user_id )
- wp_die( __( 'Duplicated username or email address.' ) );
- else
- wp_new_user_notification( $user_id, $password );
-
- if ( get_site_option( 'dashboard_blog' ) == false )
- add_user_to_blog( $current_site->blog_id, $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
- else
- add_user_to_blog( get_site_option( 'dashboard_blog' ), $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
-
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'add' ), wp_get_referer() ) );
- exit();
- break;
-
- default:
- wp_redirect( admin_url( 'ms-admin.php' ) );
- break;
-}
-?>
+wp_redirect( network_admin_url() );
\ No newline at end of file
Property changes on: wp-admin/ms-edit.php
___________________________________________________________________
Added: svn:eol-style
+ native
Index: wp-admin/includes/menu.php
===================================================================
--- wp-admin/includes/menu.php (revision 0)
+++ wp-admin/includes/menu.php (revision 0)
@@ -0,0 +1,211 @@
+ $sub) {
+ foreach ($sub as $index => $data) {
+ if ( ! current_user_can($data[1]) ) {
+ unset(${$sub_loop}[$parent][$index]);
+ $_wp_submenu_nopriv[$parent][$data[2]] = true;
+ }
+ }
+ unset($index, $data);
+
+ if ( empty(${$sub_loop}[$parent]) )
+ unset(${$sub_loop}[$parent]);
+ }
+ unset($sub, $parent);
+}
+unset($sub_loop);
+
+// Loop over the top-level menu.
+// Menus for which the original parent is not accessible due to lack of privs will have the next
+// submenu in line be assigned as the new menu parent.
+foreach ( $menu as $id => $data ) {
+ if ( empty($submenu[$data[2]]) )
+ continue;
+ $subs = $submenu[$data[2]];
+ $first_sub = array_shift($subs);
+ $old_parent = $data[2];
+ $new_parent = $first_sub[2];
+ // If the first submenu is not the same as the assigned parent,
+ // make the first submenu the new parent.
+ if ( $new_parent != $old_parent ) {
+ $_wp_real_parent_file[$old_parent] = $new_parent;
+ $menu[$id][2] = $new_parent;
+
+ foreach ($submenu[$old_parent] as $index => $data) {
+ $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
+ unset($submenu[$old_parent][$index]);
+ }
+ unset($submenu[$old_parent], $index);
+
+ if ( isset($_wp_submenu_nopriv[$old_parent]) )
+ $_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+ }
+}
+unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
+
+if ( is_network_admin() )
+ do_action('network_admin_menu', '');
+else
+ do_action('admin_menu', '');
+
+// Remove menus that have no accessible submenus and require privs that the user does not have.
+// Run re-parent loop again.
+foreach ( $menu as $id => $data ) {
+ if ( ! current_user_can($data[1]) )
+ $_wp_menu_nopriv[$data[2]] = true;
+
+ // If submenu is empty...
+ if ( empty($submenu[$data[2]]) ) {
+ // And user doesn't have privs, remove menu.
+ if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
+ unset($menu[$id]);
+ }
+ }
+}
+unset($id, $data);
+
+// Remove any duplicated seperators
+$seperator_found = false;
+foreach ( $menu as $id => $data ) {
+ if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) {
+ if (false == $seperator_found) {
+ $seperator_found = true;
+ } else {
+ unset($menu[$id]);
+ $seperator_found = false;
+ }
+ } else {
+ $seperator_found = false;
+ }
+}
+unset($id, $data);
+
+function add_cssclass($add, $class) {
+ $class = empty($class) ? $add : $class .= ' ' . $add;
+ return $class;
+}
+
+function add_menu_classes($menu) {
+
+ $first = $lastorder = false;
+ $i = 0;
+ $mc = count($menu);
+ foreach ( $menu as $order => $top ) {
+ $i++;
+
+ if ( 0 == $order ) { // dashboard is always shown/single
+ $menu[0][4] = add_cssclass('menu-top-first', $top[4]);
+ $lastorder = 0;
+ continue;
+ }
+
+ if ( 0 === strpos($top[2], 'separator') ) { // if separator
+ $first = true;
+ $c = $menu[$lastorder][4];
+ $menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
+ continue;
+ }
+
+ if ( $first ) {
+ $c = $menu[$order][4];
+ $menu[$order][4] = add_cssclass('menu-top-first', $c);
+ $first = false;
+ }
+
+ if ( $mc == $i ) { // last item
+ $c = $menu[$order][4];
+ $menu[$order][4] = add_cssclass('menu-top-last', $c);
+ }
+
+ $lastorder = $order;
+ }
+
+ return apply_filters( 'add_menu_classes', $menu );
+}
+
+uksort($menu, "strnatcasecmp"); // make it all pretty
+
+if ( apply_filters('custom_menu_order', false) ) {
+ $menu_order = array();
+ foreach ( $menu as $menu_item ) {
+ $menu_order[] = $menu_item[2];
+ }
+ unset($menu_item);
+ $default_menu_order = $menu_order;
+ $menu_order = apply_filters('menu_order', $menu_order);
+ $menu_order = array_flip($menu_order);
+ $default_menu_order = array_flip($default_menu_order);
+
+ function sort_menu($a, $b) {
+ global $menu_order, $default_menu_order;
+ $a = $a[2];
+ $b = $b[2];
+ if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
+ return -1;
+ } elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+ return 1;
+ } elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+ if ( $menu_order[$a] == $menu_order[$b] )
+ return 0;
+ return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
+ } else {
+ return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
+ }
+ }
+
+ usort($menu, 'sort_menu');
+ unset($menu_order, $default_menu_order);
+}
+
+$menu = add_menu_classes($menu);
+
+if ( !user_can_access_admin_page() ) {
+ do_action('admin_page_access_denied');
+ wp_die( __('You do not have sufficient permissions to access this page.') );
+}
+
+?>
\ No newline at end of file
Property changes on: wp-admin/includes/menu.php
___________________________________________________________________
Added: svn:eol-style
+ native
Index: wp-admin/admin.php
===================================================================
--- wp-admin/admin.php (revision 15473)
+++ wp-admin/admin.php (working copy)
@@ -14,6 +14,9 @@
if ( !defined('WP_ADMIN') )
define('WP_ADMIN', TRUE);
+if ( !defined('WP_NETWORK_ADMIN') )
+ define('WP_NETWORK_ADMIN', FALSE);
+
if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
define('WP_LOAD_IMPORTERS', true);
@@ -90,7 +93,10 @@
else
$taxnow = '';
-require(ABSPATH . 'wp-admin/menu.php');
+if ( WP_NETWORK_ADMIN )
+ require(ABSPATH . 'wp-admin/network/menu.php');
+else
+ require(ABSPATH . 'wp-admin/menu.php');
if ( current_user_can( 'manage_options' ) )
@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', '256M' ) );
Index: wp-admin/ms-sites.php
===================================================================
--- wp-admin/ms-sites.php (revision 15473)
+++ wp-admin/ms-sites.php (working copy)
@@ -9,739 +9,4 @@
require_once( './admin.php' );
-if ( ! is_multisite() )
- wp_die( __( 'Multisite support is not enabled.' ) );
-
-if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
-$title = __( 'Sites' );
-$parent_file = 'ms-admin.php';
-
-if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
- add_contextual_help($current_screen,
- '' . __('This extensive list of options has five modules: Site Info, Site Options, allowing Site Themes for this given site, changing user roles and passwords for that site, adding a new user, and Miscellaneous Site Actions (upload size limits).') . '
' .
- '' . __('Note that some fields in Site Options are grayed out and say Serialized Data. These are stored values in the database which you cannot change from here.') . '
' .
- '' . __('For more information:') . '
' .
- '' . __('Documentation on Editing Sites') . '
' .
- '' . __('Support Forums') . '
'
- );
-} else {
- add_contextual_help($current_screen,
- '' . __('Add New takes you farther down on this same page. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '
' .
- '' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '
' .
- '' . __('Hovering over each site reveals seven options (three for the primary site):') . '
' .
- '- ' . __('an Edit link to a separate Edit Site screen.') . '
' .
- '- ' . __('Backend means the Dashboard for that site.') . '
' .
- '- ' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '
' .
- '- ' . __('Delete which is a permanent action after the confirmations screen.') . '
' .
- '- ' . __('Visit to go to the frontend site live.') . '
' .
- '' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '
' .
- '' . __('Clicking on bold settings can re-sort this table. The upper right icons switch between list and excerpt views.') . '
' .
- '' . __("Clicking on Add Site, after filling out the address, title, and admin's email address, adds the site instantly to the network and this table. You may want to then click on the action link to edit options for that site.") . '
' .
- '' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '
' .
- '' . __('For more information:') . '
' .
- '' . __('Documentation on Sites') . '
' .
- '' . __('Support Forums') . '
'
- );
-}
-
-wp_enqueue_script( 'admin-forms' );
-
-require_once( './admin-header.php' );
-
-$id = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : 0;
-
-if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['action'] ) ) {
- ?>
-
-
-
- get_blog_prefix( $id );
- $options = $wpdb->get_results( "SELECT * FROM {$blog_prefix}options WHERE option_name NOT LIKE '\_%' AND option_name NOT LIKE '%user_roles'" );
- $details = get_blog_details( $id );
- if ( $details->site_id != $wpdb->siteid )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
- $is_main_site = is_main_site( $id );
- ?>
-
-
-
-
-
- blogs} WHERE site_id = '{$wpdb->siteid}' ";
-
- if ( isset( $_GET['searchaction'] ) ) {
- if ( 'name' == $_GET['searchaction'] ) {
- $query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$like_s}%' OR {$wpdb->blogs}.path LIKE '%{$like_s}%' ) ";
- } elseif ( 'id' == $_GET['searchaction'] ) {
- $query .= " AND {$wpdb->blogs}.blog_id = '{$like_s}' ";
- } elseif ( 'ip' == $_GET['searchaction'] ) {
- $query = "SELECT *
- FROM {$wpdb->blogs}, {$wpdb->registration_log}
- WHERE site_id = '{$wpdb->siteid}'
- AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
- AND {$wpdb->registration_log}.IP LIKE ('%{$like_s}%')";
- }
- }
-
- $order_by = isset( $_GET['sortby'] ) ? $_GET['sortby'] : 'id';
- if ( $order_by == 'registered' ) {
- $query .= ' ORDER BY registered ';
- } elseif ( $order_by == 'lastupdated' ) {
- $query .= ' ORDER BY last_updated ';
- } elseif ( $order_by == 'blogname' ) {
- $query .= ' ORDER BY domain ';
- } else {
- $order_by = 'id';
- $query .= " ORDER BY {$wpdb->blogs}.blog_id ";
- }
-
- $order = ( isset( $_GET['order'] ) && 'DESC' == $_GET['order'] ) ? "DESC" : "ASC";
- $query .= $order;
-
- $total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT(blog_id)', $query ) );
-
- $query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
- $blog_list = $wpdb->get_results( $query, ARRAY_A );
-
- $num_pages = ceil($total / $per_page);
- $page_links = paginate_links( array(
- 'base' => add_query_arg( 'paged', '%#%' ),
- 'format' => '',
- 'prev_text' => __( '«' ),
- 'next_text' => __( '»' ),
- 'total' => $num_pages,
- 'current' => $pagenum
- ));
-
- if ( empty( $_GET['mode'] ) )
- $mode = 'list';
- else
- $mode = esc_attr( $_GET['mode'] );
- ?>
-
-
-
-
-
-
-
-
-
-
-
+wp_redirect( network_admin_url('sites.php') );
\ No newline at end of file
Property changes on: wp-admin/ms-sites.php
___________________________________________________________________
Added: svn:eol-style
+ native
Index: wp-admin/ms-upgrade-network.php
===================================================================
--- wp-admin/ms-upgrade-network.php (revision 15473)
+++ wp-admin/ms-upgrade-network.php (working copy)
@@ -9,77 +9,4 @@
require_once('admin.php');
-if ( !is_multisite() )
- wp_die( __( 'Multisite support is not enabled.' ) );
-
-require_once( ABSPATH . WPINC . '/http.php' );
-
-$title = __( 'Update Network' );
-$parent_file = 'ms-admin.php';
-
-add_contextual_help($current_screen,
- '' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database upgrades are applied.') . '
' .
- '' . __('If a version update to core has not happened, clicking this button won’t affect anything.') . '
' .
- '' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '
' .
- '' . __('For more information:') . '
' .
- '' . __('Update Network Documentation') . '
' .
- '' . __('Support Forums') . '
'
-);
-
-require_once('admin-header.php');
-
-if ( ! current_user_can( 'manage_network' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
-echo '';
-screen_icon();
-echo '' . __( 'Update Network' ) . '
';
-
-$action = isset($_GET['action']) ? $_GET['action'] : 'show';
-
-switch ( $action ) {
- case "upgrade":
- $n = ( isset($_GET['n']) ) ? intval($_GET['n']) : 0;
-
- if ( $n < 5 ) {
- global $wp_db_version;
- update_site_option( 'wpmu_upgrade_site', $wp_db_version );
- }
-
- $blogs = $wpdb->get_results( "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
- if ( empty( $blogs ) ) {
- echo '' . __( 'All done!' ) . '
';
- break;
- }
- echo "";
- foreach ( (array) $blogs as $details ) {
- $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
- echo "- $siteurl
";
- $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=upgrade_db", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
- if ( is_wp_error( $response ) )
- wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ), $siteurl, $response->get_error_message() ) );
- do_action( 'after_mu_upgrade', $response );
- do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
- }
- echo "
";
- ?>
-
-
-
-
-
+wp_redirect( network_admin_url('upgrade.php') );
\ No newline at end of file
Property changes on: wp-admin/ms-upgrade-network.php
___________________________________________________________________
Added: svn:eol-style
+ native
Index: wp-admin/network/settings.php
===================================================================
--- wp-admin/network/settings.php (revision 0)
+++ wp-admin/network/settings.php (working copy)
@@ -16,7 +16,7 @@
wp_die( __( 'You do not have permission to access this page.' ) );
$title = __( 'Network Options' );
-$parent_file = 'ms-admin.php';
+$parent_file = 'settings.php';
add_contextual_help($current_screen,
'' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site’s options.') . '
' .
@@ -33,7 +33,7 @@
'' . __('Support Forums') . '
'
);
-include( './admin-header.php' );
+include( '../admin-header.php' );
if (isset($_GET['updated'])) {
?>
@@ -45,7 +45,7 @@
-