Wordpress 4.6

[autoinstalls/wordpress.git] / wp-admin / network / site-settings.php

diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php
index 35bcb4365c0f47785dc2bbf4b70cb277a646d2c0..550fae96a96a72604cdc06895dcfec84f880f05d 100644 (file)
--- a/wp-admin/network/site-settings.php
+++ b/wp-admin/network/site-settings.php
@@ -8,23 +8,29 @@
  */
 
 /** Load WordPress Administration Bootstrap */
  */
 
 /** Load WordPress Administration Bootstrap */

-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can( 'manage_sites' ) )
 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can( 'manage_sites' ) )

-       wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
-
-add_contextual_help($current_screen,
-       '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
-       '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
-       '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
-       '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
-       '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>' .
+       wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
+
+get_current_screen()->add_help_tab( array(
+       'id'      => 'overview',
+       'title'   => __('Overview'),
+       'content' =>
+               '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
+               '<p>' . __('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
+               '<p>' . __('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
+               '<p>' . sprintf( __('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+               '<p>' . __('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
+) );
+
+get_current_screen()->set_help_sidebar(

        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p><strong>' . __('For more information:') . '</strong></p>' .

-       '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Sites_Screens" target="_blank">Documentation on Site Management</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'

 );
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 );
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;


@@ -33,8 +39,12 @@ if ( ! $id )
        wp_die( __('Invalid site ID.') );
 
 $details = get_blog_details( $id );
        wp_die( __('Invalid site ID.') );
 
 $details = get_blog_details( $id );

+if ( ! $details ) {
+       wp_die( __( 'The requested site does not exist.' ) );
+}
+

 if ( !can_edit_network( $details->site_id ) )
 if ( !can_edit_network( $details->site_id ) )

-       wp_die( __( 'You do not have permission to access this page.' ) );
+       wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );

 
 $is_main_site = is_main_site( $id );
 
 
 $is_main_site = is_main_site( $id );
 


@@ -43,20 +53,25 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_ar
 
        switch_to_blog( $id );
 
 
        switch_to_blog( $id );
 

-       $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 ) {
        $skip_options = array( 'allowedthemes' ); // Don't update these options since they are handled elsewhere in the form.
        foreach ( (array) $_POST['option'] as $key => $val ) {

+               $key = wp_unslash( $key );
+               $val = wp_unslash( $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 ( $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++;
+               update_option( $key, $val );

        }
 
        }
 

-       do_action( 'wpmu_update_blog_options' );
+       /**
+        * Fires after the site options are updated.
+        *
+        * @since 3.0.0
+        * @since 4.4.0 Added `$id` parameter.
+        *
+        * @param int $id The ID of the site being updated.
+        */
+       do_action( 'wpmu_update_blog_options', $id );
+

        restore_current_blog();
        wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-settings.php') );
        exit;
        restore_current_blog();
        wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-settings.php') );
        exit;


@@ -68,38 +83,29 @@ if ( isset($_GET['update']) ) {
                $messages[] = __('Site options updated.');
 }
 
                $messages[] = __('Site options updated.');
 }
 

-$site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
-$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
-$title = sprintf( __('Edit Site: %s'), $site_url_no_http );
+$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );

 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 

-require('../admin-header.php');
+require( ABSPATH . 'wp-admin/admin-header.php' );

 
 ?>
 
 <div class="wrap">
 
 ?>
 
 <div class="wrap">

-<?php screen_icon('ms-admin'); ?>
-<h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
-<h3 class="nav-tab-wrapper">
-<?php
-$tabs = array(
-       'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php'     ),
-       'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php'    ),
-       'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php'   ),
-       'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
-);
-foreach ( $tabs as $tab_id => $tab ) {
-       $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
-       echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>';
-}
-?>
-</h3>
+<h1 id="edit-site"><?php echo $title; ?></h1>
+<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
+

 <?php
 <?php

+
+network_edit_site_nav( array(
+       'blog_id'  => $id,
+       'selected' => 'site-settings'
+) );
+

 if ( ! empty( $messages ) ) {
        foreach ( $messages as $msg )
 if ( ! empty( $messages ) ) {
        foreach ( $messages as $msg )

-               echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
+               echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';

 } ?>
 <form method="post" action="site-settings.php?action=update-site">
        <?php wp_nonce_field( 'edit-site' ); ?>
 } ?>
 <form method="post" action="site-settings.php?action=update-site">
        <?php wp_nonce_field( 'edit-site' ); ?>


@@ -107,7 +113,14 @@ if ( ! empty( $messages ) ) {
        <table class="form-table">
                <?php
                $blog_prefix = $wpdb->get_blog_prefix( $id );
        <table class="form-table">
                <?php
                $blog_prefix = $wpdb->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'" );
+               $sql = "SELECT * FROM {$blog_prefix}options
+                       WHERE option_name NOT LIKE %s
+                       AND option_name NOT LIKE %s";
+               $query = $wpdb->prepare( $sql,
+                       $wpdb->esc_like( '_' ) . '%',
+                       '%' . $wpdb->esc_like( 'user_roles' )
+               );
+               $options = $wpdb->get_results( $query );

                foreach ( $options as $option ) {
                        if ( $option->option_name == 'default_role' )
                                $editblog_default_role = $option->option_value;
                foreach ( $options as $option ) {
                        if ( $option->option_name == 'default_role' )
                                $editblog_default_role = $option->option_value;


@@ -115,7 +128,7 @@ if ( ! empty( $messages ) ) {
                        $class = 'all-options';
                        if ( is_serialized( $option->option_value ) ) {
                                if ( is_serialized_string( $option->option_value ) ) {
                        $class = 'all-options';
                        if ( is_serialized( $option->option_value ) ) {
                                if ( is_serialized_string( $option->option_value ) ) {

-                                       $option->option_value = esc_html( maybe_unserialize( $option->option_value ), 'single' );
+                                       $option->option_value = esc_html( maybe_unserialize( $option->option_value ) );

                                } else {
                                        $option->option_value = 'SERIALIZED DATA';
                                        $disabled = true;
                                } else {
                                        $option->option_value = 'SERIALIZED DATA';
                                        $disabled = true;


@@ -125,14 +138,14 @@ if ( ! empty( $messages ) ) {
                        if ( strpos( $option->option_value, "\n" ) !== false ) {
                        ?>
                                <tr class="form-field">
                        if ( strpos( $option->option_value, "\n" ) !== false ) {
                        ?>
                                <tr class="form-field">

-                                       <th scope="row"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></th>
+                                       <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></label></th>

                                        <td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
                                </tr>
                        <?php
                        } else {
                        ?>
                                <tr class="form-field">
                                        <td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
                                </tr>
                        <?php
                        } else {
                        ?>
                                <tr class="form-field">

-                                       <th scope="row"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></th>
+                                       <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></label></th>

                                        <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
                                        <td><code><?php echo esc_html( $option->option_value ) ?></code></td>
                                        <?php } else { ?>
                                        <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
                                        <td><code><?php echo esc_html( $option->option_value ) ?></code></td>
                                        <?php } else { ?>


@@ -142,6 +155,13 @@ if ( ! empty( $messages ) ) {
                        <?php
                        }
                } // End foreach
                        <?php
                        }
                } // End foreach

+               /**
+                * Fires at the end of the Edit Site form, before the submit button.
+                *
+                * @since 3.0.0
+                *
+                * @param int $id Site ID.
+                */

                do_action( 'wpmueditblogaction', $id );
                ?>
        </table>
                do_action( 'wpmueditblogaction', $id );
                ?>
        </table>


@@ -150,4 +170,4 @@ if ( ! empty( $messages ) ) {
 
 </div>
 <?php
 
 </div>
 <?php

-require('../admin-footer.php');
+require( ABSPATH . 'wp-admin/admin-footer.php' );