<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18536] trunk/wp-admin/network: Move network/settings.php POST handling out of network/edit.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18536">18536</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-08-11 22:32:35 +0000 (Thu, 11 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move network/settings.php POST handling out of network/edit.php. props PeteMall, see <a href="http://core.trac.wordpress.org/ticket/18379">#18379</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminnetworksettingsphp">trunk/wp-admin/network/settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (18535 => 18536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2011-08-11 20:49:47 UTC (rev 18535)
+++ trunk/wp-admin/network/edit.php 2011-08-11 22:32:35 UTC (rev 18536)
</span><span class="lines">@@ -96,75 +96,6 @@
</span><span class="cx"> $id = intval( $_POST['id'] );
</span><span class="cx">
</span><span class="cx"> switch ( $_GET['action'] ) {
</span><del>- case 'siteoptions':
- check_admin_referer( 'siteoptions' );
- if ( ! current_user_can( 'manage_network_options' ) )
- 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 <a href="%s">options page</a>.' ), esc_url( admin_url( 'settings.php' ) ) ) );
-
- if ( isset($_POST['WPLANG']) && ( '' === $_POST['WPLANG'] || in_array( $_POST['WPLANG'], get_available_languages() ) ) )
- update_site_option( 'WPLANG', $_POST['WPLANG'] );
-
- 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 ) {
- $name = trim( $name );
- if ( $name != '' )
- $names[] = trim( $name );
- }
- update_site_option( 'illegal_names', $names );
-
- if ( $_POST['limited_email_domains'] != '' ) {
- $limited_email_domains = str_replace( ' ', "\n", $_POST['limited_email_domains'] );
- $limited_email_domains = split( "\n", stripslashes( $limited_email_domains ) );
- $limited_email = array();
- foreach ( (array) $limited_email_domains as $domain ) {
- $domain = trim( $domain );
- if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
- $limited_email[] = trim( $domain );
- }
- update_site_option( 'limited_email_domains', $limited_email );
- } else {
- update_site_option( 'limited_email_domains', '' );
- }
-
- if ( $_POST['banned_email_domains'] != '' ) {
- $banned_email_domains = split( "\n", stripslashes( $_POST['banned_email_domains'] ) );
- $banned = array();
- foreach ( (array) $banned_email_domains as $domain ) {
- $domain = trim( $domain );
- if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
- $banned[] = trim( $domain );
- }
- update_site_option( 'banned_email_domains', $banned );
- } else {
- update_site_option( 'banned_email_domains', '' );
- }
-
- $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', 'global_terms_enabled' );
- $checked_options = array( 'mu_media_buttons' => 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;
- }
- foreach ( $options as $option_name ) {
- if ( ! isset($_POST[$option_name]) )
- continue;
- $value = stripslashes_deep( $_POST[$option_name] );
- update_site_option( $option_name, $value );
- }
-
- // Update more options here
- do_action( 'update_wpmu_options' );
-
- wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
- exit();
- break;
-
</del><span class="cx"> case 'updateblog':
</span><span class="cx"> // No longer used.
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpadminnetworksettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/settings.php (18535 => 18536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/settings.php 2011-08-11 20:49:47 UTC (rev 18535)
+++ trunk/wp-admin/network/settings.php 2011-08-11 22:32:35 UTC (rev 18536)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> $title = __( 'Settings' );
</span><span class="cx"> $parent_file = 'settings.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help( $current_screen,
</ins><span class="cx"> '<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>' .
</span><span class="cx"> '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
</span><span class="cx"> '<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>' .
</span><span class="lines">@@ -34,19 +34,83 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+if ( $_POST ) {
+ do_action( 'wpmuadminedit' , '' );
+
+ check_admin_referer( 'siteoptions' );
+
+ if ( isset( $_POST['WPLANG'] ) && ( '' === $_POST['WPLANG'] || in_array( $_POST['WPLANG'], get_available_languages() ) ) )
+ update_site_option( 'WPLANG', $_POST['WPLANG'] );
+
+ 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 ) {
+ $name = trim( $name );
+ if ( $name != '' )
+ $names[] = trim( $name );
+ }
+ update_site_option( 'illegal_names', $names );
+
+ if ( $_POST['limited_email_domains'] != '' ) {
+ $limited_email_domains = str_replace( ' ', "\n", $_POST['limited_email_domains'] );
+ $limited_email_domains = split( "\n", stripslashes( $limited_email_domains ) );
+ $limited_email = array();
+ foreach ( (array) $limited_email_domains as $domain ) {
+ $domain = trim( $domain );
+ if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
+ $limited_email[] = trim( $domain );
+ }
+ update_site_option( 'limited_email_domains', $limited_email );
+ } else {
+ update_site_option( 'limited_email_domains', '' );
+ }
+
+ if ( $_POST['banned_email_domains'] != '' ) {
+ $banned_email_domains = split( "\n", stripslashes( $_POST['banned_email_domains'] ) );
+ $banned = array();
+ foreach ( (array) $banned_email_domains as $domain ) {
+ $domain = trim( $domain );
+ if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
+ $banned[] = trim( $domain );
+ }
+ update_site_option( 'banned_email_domains', $banned );
+ } else {
+ update_site_option( 'banned_email_domains', '' );
+ }
+
+ $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', 'global_terms_enabled' );
+ $checked_options = array( 'mu_media_buttons' => 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;
+ }
+ foreach ( $options as $option_name ) {
+ if ( ! isset($_POST[$option_name]) )
+ continue;
+ $value = stripslashes_deep( $_POST[$option_name] );
+ update_site_option( $option_name, $value );
+ }
+
+ // Update more options here
+ do_action( 'update_wpmu_options' );
+
+ wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
+ exit();
+}
+
</ins><span class="cx"> include( '../admin-header.php' );
</span><span class="cx">
</span><del>-if (isset($_GET['updated'])) {
- ?>
- <div id="message" class="updated"><p><?php _e( 'Options saved.' ) ?></p></div>
- <?php
</del><ins>+if ( isset( $_GET['updated'] ) ) {
+ ?><div id="message" class="updated"><p><?php _e( 'Options saved.' ) ?></p></div><?php
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon('options-general'); ?>
</span><span class="cx"> <h2><?php _e( 'Settings' ) ?></h2>
</span><del>- <form method="post" action="edit.php?action=siteoptions">
</del><ins>+ <form method="post" action="settings.php">
</ins><span class="cx"> <?php wp_nonce_field( 'siteoptions' ); ?>
</span><span class="cx"> <h3><?php _e( 'Operational Settings' ); ?></h3>
</span><span class="cx"> <table class="form-table">
</span></span></pre>
</div>
</div>
</body>
</html>