<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14655] trunk/wp-admin/ms-options.php:
Validation and some textarea escaping for ms-options.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14655">14655</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-15 05:58:57 +0000 (Sat, 15 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Validation and some textarea escaping for ms-options. props Utkarsh, see <a href="http://trac.wordpress.org/ticket/13383">#13383</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (14654 => 14655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-05-15 05:38:40 UTC (rev 14654)
+++ trunk/wp-admin/ms-options.php 2010-05-15 05:58:57 UTC (rev 14655)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e( 'Global Terms' ) ?></th>
</span><span class="cx"> <td>
</span><del>- <label><input type="radio" id="global_terms_enabled" name="global_terms_enabled" value="0"<?php checked( get_site_option( 'global_terms_enabled' ), 0 ) ?>/> <?php _e( 'Disabled' ); ?></label><br/>
- <label><input type="radio" id="global_terms_enabled" name="global_terms_enabled" value="1"<?php checked( get_site_option( 'global_terms_enabled' ), 1 ) ?>/> <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></label><br />
</del><ins>+ <label><input type="radio" name="global_terms_enabled" value="0"<?php checked( get_site_option( 'global_terms_enabled' ), 0 ) ?>/> <?php _e( 'Disabled' ); ?></label><br/>
+ <label><input type="radio" name="global_terms_enabled" value="1"<?php checked( get_site_option( 'global_terms_enabled' ), 1 ) ?>/> <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></label><br />
</ins><span class="cx"> <?php if ( ! get_site_option( 'global_terms_enabled') ) { ?>
</span><span class="cx"> <strong><?php _e( 'Warning!' ); ?></strong> <?php _e( 'Enabling global terms will create a new table and synchronize terms across the network.' ); ?>
</span><span class="cx"> <?php } ?></td>
</span><span class="lines">@@ -153,7 +153,8 @@
</span><span class="cx"> <td>
</span><span class="cx"> <?php $limited_email_domains = get_site_option( 'limited_email_domains' );
</span><span class="cx"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
</span><del>- <textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</del><ins>+ <textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5">
+<?php echo wp_htmledit_pre( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -162,7 +163,8 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
</span><span class="cx"> <td>
</span><del>- <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
</del><ins>+ <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5">
+<?php echo wp_htmledit_pre( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -175,7 +177,8 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
</span><span class="cx"> <td>
</span><del>- <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text"><?php echo stripslashes( get_site_option( 'welcome_email' ) ) ?></textarea>
</del><ins>+ <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">
+<?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_email' ) ) ) ?></textarea>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'The welcome email sent to new site owners.' ) ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -183,7 +186,8 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
</span><span class="cx"> <td>
</span><del>- <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text"><?php echo stripslashes( get_site_option( 'welcome_user_email' ) ) ?></textarea>
</del><ins>+ <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
+<?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_user_email' ) ) ) ?></textarea>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'The welcome email sent to new users.' ) ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -191,7 +195,8 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
</span><span class="cx"> <td>
</span><del>- <textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text"><?php echo stripslashes( get_site_option( 'first_post' ) ) ?></textarea>
</del><ins>+ <textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">
+<?php echo wp_htmledit_pre( stripslashes( get_site_option( 'first_post' ) ) ) ?></textarea>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'The first post on a new site.' ) ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -199,7 +204,8 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
</span><span class="cx"> <td>
</span><del>- <textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text"><?php echo stripslashes( get_site_option('first_page') ) ?></textarea>
</del><ins>+ <textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">
+<?php echo wp_htmledit_pre( stripslashes( get_site_option('first_page') ) ) ?></textarea>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'The first page on a new site.' ) ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -207,7 +213,8 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
</span><span class="cx"> <td>
</span><del>- <textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text"><?php echo stripslashes( get_site_option('first_comment') ) ?></textarea>
</del><ins>+ <textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">
+<?php echo wp_htmledit_pre( stripslashes( get_site_option('first_comment') ) ) ?></textarea>
</ins><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'The first comment on a new site.' ) ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -244,6 +251,7 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Site upload space' ) ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <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' ), '<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 />
</span><ins>+ </td>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span></span></pre>
</div>
</div>
</body>
</html>