diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 424130f729..a2ee9c0286 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -910,7 +910,7 @@ case 'autosave' : // The name of this action is hardcoded in edit_post() global $current_user; $_POST['post_category'] = explode(",", $_POST['catslist']); - if($_POST['post_type'] == 'page' || empty($_POST['post_category'])) + if ( $_POST['post_type'] == 'page' || empty($_POST['post_category']) ) unset($_POST['post_category']); $do_autosave = (bool) $_POST['autosave']; @@ -926,7 +926,7 @@ case 'autosave' : // The name of this action is hardcoded in edit_post() $supplemental['session_expired'] = add_query_arg( 'interim-login', 1, wp_login_url() ); $id = $revision_id = 0; - if($_POST['post_ID'] < 0) { + if ( $_POST['post_ID'] < 0 ) { $_POST['post_status'] = 'draft'; $_POST['temp_ID'] = $_POST['post_ID']; if ( $do_autosave ) { diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 8be52f9fec..601dad76cc 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -83,7 +83,7 @@ require(ABSPATH . 'wp-admin/menu.php'); do_action('admin_init'); if (isset($plugin_page) ) { - if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) { + if ( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) { $page_hook = get_plugin_page_hook($plugin_page, $plugin_page); // backwards compatibility for plugins using add_management_page if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) { diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index ab48ca3357..701b35489e 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -92,7 +92,7 @@ endif; ?> $pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( ! isset( $catsperpage ) || $catsperpage < 0 ) +if ( ! isset( $catsperpage ) || $catsperpage < 0 ) $catsperpage = 20; $page_links = paginate_links( array( diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index 043a5824d9..3f22cb9c68 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -9,39 +9,37 @@ if ( !is_super_admin() ) do_action('wpmuadminedit', ''); -if( isset($_GET[ 'id' ]) ) { +if ( isset($_GET[ 'id' ]) ) $id = intval( $_GET[ 'id' ] ); -} elseif( isset($_POST[ 'id' ]) ) { +elseif ( isset($_POST[ 'id' ]) ) $id = intval( $_POST[ 'id' ] ); -} -if( isset( $_POST['ref'] ) == false && !empty($_SERVER['HTTP_REFERER']) ) { +if ( isset( $_POST['ref'] ) == false && !empty($_SERVER['HTTP_REFERER']) ) $_POST['ref'] = $_SERVER['HTTP_REFERER']; -} -switch( $_GET['action'] ) { +switch ( $_GET['action'] ) { case "siteoptions": check_admin_referer('siteoptions'); - if( empty( $_POST ) ) + if ( empty( $_POST ) ) wp_die( __("You probably need to go back to the options page") ); update_site_option( "WPLANG", $_POST['WPLANG'] ); - if( is_email( $_POST['admin_email'] ) ) + if ( is_email( $_POST['admin_email'] ) ) update_site_option( "admin_email", $_POST['admin_email'] ); $illegal_names = split( ' ', $_POST['illegal_names'] ); - foreach( (array) $illegal_names as $name ) { + foreach ( (array) $illegal_names as $name ) { $name = trim( $name ); - if( $name != '' ) + if ( $name != '' ) $names[] = trim( $name ); } update_site_option( "illegal_names", $names ); - if( $_POST['limited_email_domains'] != '' ) { + if ( $_POST['limited_email_domains'] != '' ) { $limited_email_domains = str_replace( ' ', "\n", $_POST[ 'limited_email_domains' ] ); $limited_email_domains = split( "\n", stripslashes( $limited_email_domains ) ); - foreach( (array) $limited_email_domains as $domain ) { + foreach ( (array) $limited_email_domains as $domain ) { $limited_email[] = trim( $domain ); } update_site_option( "limited_email_domains", $limited_email ); @@ -49,9 +47,9 @@ switch( $_GET['action'] ) { update_site_option( "limited_email_domains", '' ); } - if( $_POST['banned_email_domains'] != '' ) { + if ( $_POST['banned_email_domains'] != '' ) { $banned_email_domains = split( "\n", stripslashes( $_POST[ 'banned_email_domains' ] ) ); - foreach( (array) $banned_email_domains as $domain ) { + foreach ( (array) $banned_email_domains as $domain ) { $banned[] = trim( $domain ); } update_site_option( "banned_email_domains", $banned ); @@ -59,9 +57,9 @@ switch( $_GET['action'] ) { update_site_option( "banned_email_domains", '' ); } update_site_option( 'default_user_role', $_POST[ 'default_user_role' ] ); - if( trim( $_POST[ 'dashboard_blog_orig' ] ) == '' ) + if ( trim( $_POST[ 'dashboard_blog_orig' ] ) == '' ) $_POST[ 'dashboard_blog_orig' ] = $current_site->blog_id; - if( trim( $_POST[ 'dashboard_blog' ] ) == '' ) { + if ( trim( $_POST[ 'dashboard_blog' ] ) == '' ) { $_POST[ 'dashboard_blog' ] = $current_site->blog_id; $dashboard_blog_id = $current_site->blog_id; } else { @@ -84,14 +82,13 @@ switch( $_GET['action'] ) { $dashboard_blog_id = $blog_details->blog_id; } } - if ( is_wp_error( $dashboard_blog_id ) ) { + if ( is_wp_error( $dashboard_blog_id ) ) wp_die( __( 'Problem creating dashboard blog: ' ) . $dashboard_blog_id->get_error_message() ); - } - if( $_POST[ 'dashboard_blog_orig' ] != $_POST[ 'dashboard_blog' ] ) { + if ( $_POST[ 'dashboard_blog_orig' ] != $_POST[ 'dashboard_blog' ] ) { $users = get_users_of_blog( get_site_option( 'dashboard_blog' ) ); $move_users = array(); foreach ( (array)$users as $user ) { - if( array_pop( array_keys( unserialize( $user->meta_value ) ) ) == 'subscriber' ) + if ( array_pop( array_keys( unserialize( $user->meta_value ) ) ) == 'subscriber' ) $move_users[] = $user->user_id; } if ( false == empty( $move_users ) ) { @@ -104,7 +101,7 @@ switch( $_GET['action'] ) { } update_site_option( "dashboard_blog", $dashboard_blog_id ); $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed' ); - foreach( $options as $option_name ) { + foreach ( $options as $option_name ) { $value = stripslashes_deep( $_POST[ $option_name ] ); update_site_option( $option_name, $value ); } @@ -112,11 +109,11 @@ switch( $_GET['action'] ) { $site_admins = explode( ' ', str_replace( ",", " ", $_POST['site_admins'] ) ); if ( is_array( $site_admins ) ) { $mainblog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" ); - if( $mainblog_id ) { + if ( $mainblog_id ) { reset( $site_admins ); - foreach( (array) $site_admins as $site_admin ) { + foreach ( (array) $site_admins as $site_admin ) { $uid = $wpdb->get_var( "SELECT ID FROM {$wpdb->users} WHERE user_login='{$site_admin}'" ); - if( $uid ) + if ( $uid ) add_user_to_blog( $mainblog_id, $uid, 'administrator' ); } } @@ -132,20 +129,19 @@ switch( $_GET['action'] ) { case "addblog": check_admin_referer('add-blog'); - if( is_array( $_POST[ 'blog' ] ) == false ) { + if ( is_array( $_POST[ 'blog' ] ) == false ) wp_die( "Can't create an empty blog." ); - } $blog = $_POST['blog']; $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) ); $email = sanitize_email( $blog[ 'email' ] ); $title = $blog[ 'title' ]; - if ( empty($domain) || empty($email)) + if ( empty($domain) || empty($email) ) wp_die( __('Missing blog address or email address.') ); - if( !is_email( $email ) ) + if ( !is_email( $email ) ) wp_die( __('Invalid email address') ); - if( is_subdomain_install() ) { + if ( is_subdomain_install() ) { $newdomain = $domain.".".$current_site->domain; $path = $base; } else { @@ -155,22 +151,21 @@ switch( $_GET['action'] ) { $password = 'N/A'; $user_id = email_exists($email); - if( !$user_id ) { // Create a new user with a random password + 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) { + if ( false == $user_id ) wp_die( __('There was an error creating the user') ); - } else { + 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) ) { + if ( !is_wp_error($id) ) { $dashboard_blog = get_dashboard_blog(); - if( get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id ) + if ( get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id ) update_user_option( $user_id, 'primary_blog', $id, true ); $content_mail = sprintf( __( "New blog 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 Blog Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); @@ -184,33 +179,31 @@ switch( $_GET['action'] ) { case "updateblog": check_admin_referer('editblog'); - if( empty( $_POST ) ) + if ( empty( $_POST ) ) wp_die( __('You probably need to go back to the sites page') ); // themes - if( is_array( $_POST[ 'theme' ] ) ) { + if ( is_array( $_POST[ 'theme' ] ) ) $_POST[ 'option' ][ 'allowedthemes' ] = $_POST[ 'theme' ]; - } else { + else $_POST[ 'option' ][ 'allowedthemes' ] = ''; - } switch_to_blog( $id ); - if( is_array( $_POST[ 'option' ] ) ) { + if ( is_array( $_POST[ 'option' ] ) ) { $c = 1; $count = count( $_POST[ 'option' ] ); foreach ( (array) $_POST['option'] as $key => $val ) { - if( $key === 0 ) + if ( $key === 0 ) continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options - if( $c == $count ) { + if ( $c == $count ) update_option( $key, $val ); - } else { + else update_option( $key, $val, false ); // no need to refresh blog details yet - } $c++; } } - if( $_POST['update_home_url'] == 'update' ) { + if ( $_POST['update_home_url'] == 'update' ) { if( get_option( 'siteurl' ) != 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] ) update_option( 'siteurl', 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] ); @@ -238,18 +231,16 @@ switch( $_GET['action'] ) { // get blog prefix $blog_prefix = $wpdb->get_blog_prefix( $id ); // user roles - if( is_array( $_POST[ 'role' ] ) == true ) { + if ( is_array( $_POST[ 'role' ] ) == true ) { $newroles = $_POST[ 'role' ]; reset( $newroles ); foreach ( (array) $newroles as $userid => $role ) { $role_len = strlen( $role ); $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid' AND meta_key = '" . $blog_prefix. "capabilities'" ); - if( false == $existing_role ) { + if ( false == $existing_role ) $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $blog_prefix . "capabilities', 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}')" ); - } elseif( $existing_role != "a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}" ) { + elseif ( $existing_role != "a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}" ) $wpdb->query( "UPDATE $wpdb->usermeta SET meta_value = 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}' WHERE user_id = '$userid' AND meta_key = '" . $blog_prefix . "capabilities'" ); - } - } } @@ -261,20 +252,20 @@ switch( $_GET['action'] ) { } // change password - if( is_array( $_POST[ 'user_password' ] ) ) { + if ( 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 != '' ) { + if ( $pass != '' ) { $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" ); $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 ) + if ( $cap == null ) $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" ); } } @@ -283,12 +274,12 @@ switch( $_GET['action'] ) { } // add user? - if( $_POST[ 'newuser' ] != '' ) { + if ( $_POST[ 'newuser' ] != '' ) { $newuser = $_POST[ 'newuser' ]; $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) ); - if( $userid ) { + if ( $userid ) { $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='wp_" . $id . "_capabilities'" ); - if( $user == false ) + if ( $user == false ) add_user_to_blog($id, $userid, $_POST[ 'new_role' ]); } } @@ -299,7 +290,7 @@ switch( $_GET['action'] ) { case "deleteblog": check_admin_referer('deleteblog'); - if( $id != '0' && $id != $current_site->blog_id ) + if ( $id != '0' && $id != $current_site->blog_id ) wpmu_delete_blog( $id, true ); wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'delete'), $_POST[ 'ref' ] ) ); @@ -309,7 +300,7 @@ switch( $_GET['action'] ) { case "allblogs": check_admin_referer('allblogs'); foreach ( (array) $_POST[ 'allblogs' ] as $key => $val ) { - if( $val != '0' && $val != $current_site->blog_id ) { + if ( $val != '0' && $val != $current_site->blog_id ) { if ( isset($_POST['allblog_delete']) ) { $blogfunction = 'all_delete'; wpmu_delete_blog( $val, true ); @@ -392,11 +383,11 @@ switch( $_GET['action'] ) { // Themes case "updatethemes": - if( is_array( $_POST['theme'] ) ) { + if ( is_array( $_POST['theme'] ) ) { $themes = get_themes(); reset( $themes ); - foreach( (array) $themes as $key => $theme ) { - if( $_POST['theme'][ wp_specialchars( $theme['Stylesheet'] ) ] == 'enabled' ) + foreach ( (array) $themes as $key => $theme ) { + if ( $_POST['theme'][ wp_specialchars( $theme['Stylesheet'] ) ] == 'enabled' ) $allowed_themes[ wp_specialchars( $theme['Stylesheet'] ) ] = true; } update_site_option( 'allowedthemes', $allowed_themes ); @@ -409,7 +400,7 @@ switch( $_GET['action'] ) { case "confirm": $referrer = ( isset($_GET['ref']) ) ? stripslashes($_GET['ref']) : $_SERVER['HTTP_REFERER']; $referrer = clean_url($referrer); - if( !headers_sent() ){ + if ( !headers_sent() ) { nocache_headers(); header( 'Content-Type: text/html; charset=utf-8' ); } @@ -440,7 +431,7 @@ switch( $_GET['action'] ) { // Users (not used any more) case "deleteuser": check_admin_referer('deleteuser'); - if( $id != '0' && $id != '1' ) + if ( $id != '0' && $id != '1' ) wpmu_delete_user($id); wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'delete'), $_POST['ref'] ) ); @@ -454,28 +445,26 @@ switch( $_GET['action'] ) { echo '
'; confirm_delete_users( $_POST['allusers'] ); echo '
'; - } elseif( isset( $_POST[ 'alluser_transfer_delete' ] ) ) { - if( is_array( $_POST[ 'blog' ] ) && !empty( $_POST[ 'blog' ] ) ) { - foreach( $_POST[ 'blog' ] as $id => $users ) { - foreach( $users as $blogid => $user_id ) { + } elseif ( isset( $_POST[ 'alluser_transfer_delete' ] ) ) { + if ( is_array( $_POST[ 'blog' ] ) && !empty( $_POST[ 'blog' ] ) ) { + foreach ( $_POST[ 'blog' ] as $id => $users ) { + foreach ( $users as $blogid => $user_id ) { remove_user_from_blog( $id, $blogid, $user_id ); } } } - if( is_array( $_POST[ 'user' ] ) && !empty( $_POST[ 'user' ] ) ) + if ( is_array( $_POST[ 'user' ] ) && !empty( $_POST[ 'user' ] ) ) foreach( $_POST[ 'user' ] as $id ) wpmu_delete_user( $id ); wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'ms-users.php' ) ); } else { foreach ( (array) $_POST['allusers'] as $key => $val ) { - if( $val == '' || $val == '0' ) { + if ( $val == '' || $val == '0' ) continue; - } $user = new WP_User( $val ); - if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) { + if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a site admnistrator.' ), $user->user_login ) ); - } if ( isset($_POST['alluser_spam']) ) { $userfunction = 'all_spam'; $blogs = get_blogs_of_user( $val, true ); @@ -501,31 +490,28 @@ switch( $_GET['action'] ) { case "adduser": check_admin_referer('add-user'); - if( is_array( $_POST[ 'user' ] ) == false ) { + if ( is_array( $_POST[ 'user' ] ) == false ) wp_die( __( "Cannot create an empty user." ) ); - } $user = $_POST['user']; - if ( empty($user['username']) && empty($user['email']) ) { + if ( empty($user['username']) && empty($user['email']) ) wp_die( __('Missing username and email.') ); - } elseif ( empty($user['username']) ) { + elseif ( empty($user['username']) ) wp_die( __('Missing username.') ); - } elseif ( empty($user['email']) ) { + elseif ( empty($user['email']) ) wp_die( __('Missing email.') ); - } $password = generate_random_password(); $user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, wp_specialchars( $user['email'] ) ); - if( false == $user_id ) { + if ( false == $user_id ) wp_die( __('Duplicated username or email address.') ); - } else { + else wp_new_user_notification($user_id, $password); - } - if ( get_site_option( 'dashboard_blog' ) == false ) { + + 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 { + 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'), $_SERVER['HTTP_REFERER'] ) ); exit();