Ticket #14385: 14385.patch

wp-admin/ms-edit.php

@@ -143 +143 @@
                         wp_die( __( 'You do not have permission to access this page.' ) );
 
                 if ( is_array( $_POST['blog'] ) == false )
-                        wp_die(  __( 'Can’t create an empty site.' ) );
+                        wp_die( __( 'Can’t create an empty site.' ) );
                 $blog = $_POST['blog'];
                 $domain = '';
                 if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
@@ -193 +193 @@
                         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' ) . '>' );
+                        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();
@@ -220 +220 @@
                                         $allowedthemes[$theme] = true;
                         }
                 }
-                update_option( 'allowedthemes',  $allowedthemes );
+                update_option( 'allowedthemes', $allowedthemes );
 
                 // options
                 if ( is_array( $_POST['option'] ) ) {
@@ -241 +241 @@
                 // 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 )
+                        if ( get_option( 'siteurl' ) != $blog_address )
                                 update_option( 'siteurl', $blog_address );
 
                         if ( get_option( 'home' ) != $blog_address )
@@ -435 +435 @@
                 exit();
         break;
 
+        case 'unmatureblog':
+                check_admin_referer( 'unmatureblog' );
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __( 'You do not have permission to access this page.' ) );
+
+                update_blog_status( $id, 'mature', '0' );
+                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unmature' ), wp_get_referer() ) );
+                exit();
+        break;
+
+        case 'matureblog':
+                check_admin_referer( 'matureblog' );
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __( 'You do not have permission to access this page.' ) );
+
+                update_blog_status( $id, 'mature', '1' );
+                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'mature' ), wp_get_referer() ) );
+                exit();
+        break;
+
         // Themes
-    case 'updatethemes':
+        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'] ) ) {
+                if ( is_array( $_POST['theme'] ) ) {
                         $themes = get_themes();
                         reset( $themes );
                         $allowed_themes = array();
@@ -450 +470 @@
                         }
                         update_site_option( 'allowedthemes', $allowed_themes );
                 }
-                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'themes' ),  wp_get_referer() ) );
+                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'themes' ), wp_get_referer() ) );
                 exit();
         break;
 
@@ -504 +524 @@
                         echo '<div class="wrap">';
                         confirm_delete_users( $_POST['allusers'] );
                         echo '</div>';
-            require_once( 'admin-footer.php' );
-            exit();
+                        require_once( 'admin-footer.php' );
+                        exit();
                 } else {
                         wp_redirect( admin_url( 'ms-users.php' ) );
                 }
@@ -531 +551 @@
                                                         echo '<div class="wrap">';
                                                         confirm_delete_users( $_POST['allusers'] );
                                                         echo '</div>';
-                                            require_once( 'admin-footer.php' );
-                                            exit();
-                                        break;
+                                                        require_once( 'admin-footer.php' );
+                                                        exit();
+                                                break;
 
                                                 case 'spam':
                                                         $user = new WP_User( $val );
@@ -617 +637 @@
                 $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.' ) );
+                        wp_die( __( 'Duplicated username or email address.' ) );
                 else
                         wp_new_user_notification( $user_id, $password );