Wordpress 3.7

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

diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 49440dd7326dedcb06989f7e00465f1270f9b8ce..de39b26be264e90035c3d41fb8833c345cfeb22c 100644 (file)
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -8,7 +8,7 @@
  */
 
 /** 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 ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );


@@ -16,37 +16,72 @@ if ( ! is_multisite() )
 if ( ! current_user_can( 'manage_network_options' ) )
        wp_die( __( 'You do not have permission to access this page.' ) );
 
 if ( ! current_user_can( 'manage_network_options' ) )
        wp_die( __( 'You do not have permission to access this page.' ) );
 

-$title = __( 'Settings' );
+$title = __( 'Network Settings' );

 $parent_file = 'settings.php';
 
 $parent_file = 'settings.php';
 

-add_contextual_help($current_screen,
-       '<p>' . __('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&#8217;s options.') . '</p>' .
-       '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
-       '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
-       '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
-       '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
-       '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
-       '<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' .
-       '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
-       '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Super Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>' .
+get_current_screen()->add_help_tab( array(
+               'id'      => 'overview',
+               'title'   => __('Overview'),
+               'content' =>
+                       '<p>' . __('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&#8217;s options.') . '</p>' .
+                       '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
+                       '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
+                       '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
+                       '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
+                       '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
+                       '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
+) );
+
+get_current_screen()->set_help_sidebar(

        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>') . '</p>' .
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>') . '</p>' .
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 

-include( '../admin-header.php' );
+if ( $_POST ) {
+       do_action( 'wpmuadminedit' , '' );
+
+       check_admin_referer( 'siteoptions' );
+
+       $checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
+       foreach ( $checked_options as $option_name => $option_unchecked_value ) {
+               if ( ! isset( $_POST[$option_name] ) )
+                       $_POST[$option_name] = $option_unchecked_value;
+       }
+
+       $options = array(
+               'registrationnotification', 'registration', 'add_new_users', 'menu_items',
+               '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', 'global_terms_enabled',
+               'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
+       );
+
+       foreach ( $options as $option_name ) {
+               if ( ! isset($_POST[$option_name]) )
+                       continue;
+               $value = wp_unslash( $_POST[$option_name] );
+               update_site_option( $option_name, $value );
+       }
+
+       // Update more options here
+       do_action( 'update_wpmu_options' );

 
 

-if (isset($_GET['updated'])) {
-       ?>
-       <div id="message" class="updated"><p><?php _e( 'Options saved.' ) ?></p></div>
-       <?php
+       wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
+       exit();
+}
+
+include( ABSPATH . 'wp-admin/admin-header.php' );
+
+if ( isset( $_GET['updated'] ) ) {
+       ?><div id="message" class="updated"><p><?php _e( 'Options saved.' ) ?></p></div><?php

 }
 ?>
 
 <div class="wrap">
        <?php screen_icon('options-general'); ?>
 }
 ?>
 
 <div class="wrap">
        <?php screen_icon('options-general'); ?>

-       <h2><?php _e( 'Settings' ) ?></h2>
-       <form method="post" action="edit.php?action=siteoptions">
+       <h2><?php echo esc_html( $title ); ?></h2>
+       <form method="post" action="settings.php">

                <?php wp_nonce_field( 'siteoptions' ); ?>
                <h3><?php _e( 'Operational Settings' ); ?></h3>
                <table class="form-table">
                <?php wp_nonce_field( 'siteoptions' ); ?>
                <h3><?php _e( 'Operational Settings' ); ?></h3>
                <table class="form-table">


@@ -55,7 +90,7 @@ if (isset($_GET['updated'])) {
                                <td>
                                        <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
                                        <br />
                                <td>
                                        <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
                                        <br />

-                                       <?php _e( 'What you would like to call this website.' ) ?>
+                                       <?php _e( 'What you would like to call this network.' ) ?>

                                </td>
                        </tr>
 
                                </td>
                        </tr>
 


@@ -145,7 +180,7 @@ if (isset($_GET['updated'])) {
                                <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
                                <td>
                                        <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">
                                <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
                                <td>
                                        <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">

-<?php echo esc_textarea( stripslashes( get_site_option( 'welcome_email' ) ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>

                                        <br />
                                        <?php _e( 'The welcome email sent to new site owners.' ) ?>
                                </td>
                                        <br />
                                        <?php _e( 'The welcome email sent to new site owners.' ) ?>
                                </td>


@@ -154,7 +189,7 @@ if (isset($_GET['updated'])) {
                                <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
                                <td>
                                        <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
                                <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
                                <td>
                                        <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">

-<?php echo esc_textarea( stripslashes( get_site_option( 'welcome_user_email' ) ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>

                                        <br />
                                        <?php _e( 'The welcome email sent to new users.' ) ?>
                                </td>
                                        <br />
                                        <?php _e( 'The welcome email sent to new users.' ) ?>
                                </td>


@@ -163,7 +198,7 @@ if (isset($_GET['updated'])) {
                                <th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
                                <td>
                                        <textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">
                                <th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
                                <td>
                                        <textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">

-<?php echo esc_textarea( stripslashes( get_site_option( 'first_post' ) ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>

                                        <br />
                                        <?php _e( 'The first post on a new site.' ) ?>
                                </td>
                                        <br />
                                        <?php _e( 'The first post on a new site.' ) ?>
                                </td>


@@ -172,7 +207,7 @@ if (isset($_GET['updated'])) {
                                <th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
                                <td>
                                        <textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">
                                <th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
                                <td>
                                        <textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">

-<?php echo esc_textarea( stripslashes( get_site_option('first_page') ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>

                                        <br />
                                        <?php _e( 'The first page on a new site.' ) ?>
                                </td>
                                        <br />
                                        <?php _e( 'The first page on a new site.' ) ?>
                                </td>


@@ -181,7 +216,7 @@ if (isset($_GET['updated'])) {
                                <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
                                <td>
                                        <textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">
                                <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
                                <td>
                                        <textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">

-<?php echo esc_textarea( stripslashes( get_site_option('first_comment') ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>

                                        <br />
                                        <?php _e( 'The first comment on a new site.' ) ?>
                                </td>
                                        <br />
                                        <?php _e( 'The first comment on a new site.' ) ?>
                                </td>


@@ -205,19 +240,10 @@ if (isset($_GET['updated'])) {
                </table>
                <h3><?php _e( 'Upload Settings' ); ?></h3>
                <table class="form-table">
                </table>
                <h3><?php _e( 'Upload Settings' ); ?></h3>
                <table class="form-table">

-                       <tr valign="top">
-                               <th scope="row"><?php _e( 'Media upload buttons' ) ?></th>
-                               <?php $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ); ?>
-                               <td><label><input type="checkbox" id="mu_media_buttons_image" name="mu_media_buttons[image]" value="1"<?php checked( ! empty( $mu_media_buttons['image'] ) ) ?>/> <?php _e( 'Images' ); ?></label><br />
-                               <label><input type="checkbox" id="mu_media_buttons_video" name="mu_media_buttons[video]" value="1"<?php checked( ! empty( $mu_media_buttons['video'] ) ) ?>/> <?php _e( 'Videos' ); ?></label><br />
-                               <label><input type="checkbox" id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value="1"<?php checked( ! empty( $mu_media_buttons['audio'] ) ) ?>/> <?php _e( 'Music' ); ?></label><br />
-                               <?php _e( 'The media upload buttons to display on the &#8220;Write Post&#8221; page. Make sure you update the allowed upload file types below as well.' ); ?></td>
-                       </tr>
-

                        <tr valign="top">
                                <th scope="row"><?php _e( 'Site upload space' ) ?></th>
                                <td>
                        <tr valign="top">
                                <th scope="row"><?php _e( 'Site upload space' ) ?></th>
                                <td>

-                               <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="text" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 10) ) . '" size="3" />' ); ?></label><br />
+                               <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />

                                </td>
                        </tr>
 
                                </td>
                        </tr>
 


@@ -228,7 +254,7 @@ if (isset($_GET['updated'])) {
 
                        <tr valign="top">
                                <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
 
                        <tr valign="top">
                                <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>

-                               <td><?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="text" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" size="5" />' ); ?></td>
+                               <td><?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?></td>

                        </tr>
                </table>
 
                        </tr>
                </table>
 


@@ -261,7 +287,7 @@ if (isset($_GET['updated'])) {
                        $menu_perms = get_site_option( 'menu_items' );
                        $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
                        foreach ( (array) $menu_items as $key => $val ) {
                        $menu_perms = get_site_option( 'menu_items' );
                        $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
                        foreach ( (array) $menu_items as $key => $val ) {

-                               echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" .  ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
+                               echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";

                        }
                        ?>
                                </td>
                        }
                        ?>
                                </td>


@@ -274,4 +300,4 @@ if (isset($_GET['updated'])) {
        </form>
 </div>
 
        </form>
 </div>
 

-<?php include( '../admin-footer.php' ); ?>
+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>