<!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>[14231] trunk/wp-includes/formatting.php: Add basic email/
url validation to General options page.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14231">14231</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-25 08:16:10 +0000 (Sun, 25 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add basic email/url validation to General options page. Prevents users entering a invalid Admin email or WordPress/Site Address which is not in URL form. Props technosailor for initial patch, slightly reworked. See <a href="http://trac.wordpress.org/ticket/12868">#12868</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (14230 => 14231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-04-25 07:42:51 UTC (rev 14230)
+++ trunk/wp-includes/formatting.php 2010-04-25 08:16:10 UTC (rev 14231)
</span><span class="lines">@@ -2196,7 +2196,8 @@
</span><span class="cx"> function esc_url( $url, $protocols = null, $_context = 'display' ) {
</span><span class="cx"> $original_url = $url;
</span><span class="cx">
</span><del>- if ('' == $url) return $url;
</del><ins>+ if ( '' == $url )
+ return $url;
</ins><span class="cx"> $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
</span><span class="cx"> $strip = array('%0d', '%0a', '%0D', '%0A');
</span><span class="cx"> $url = _deep_replace($strip, $url);
</span><span class="lines">@@ -2356,11 +2357,14 @@
</span><span class="cx"> */
</span><span class="cx"> function sanitize_option($option, $value) {
</span><span class="cx">
</span><del>- switch ($option) {
</del><ins>+ switch ( $option ) {
</ins><span class="cx"> case 'admin_email':
</span><span class="cx"> $value = sanitize_email($value);
</span><del>- if ( !$value && function_exists('add_settings_error') )
- add_settings_error('admin_email', 'invalid_admin_email', __('The email address submitted was not in the right format. Please enter a valid email address.'));
</del><ins>+ if ( !is_email($value) ) {
+ $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
+ if ( function_exists('add_settings_error') )
+ add_settings_error('admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.'));
+ }
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'thumbnail_size_w':
</span><span class="lines">@@ -2394,8 +2398,10 @@
</span><span class="cx"> case 'posts_per_page':
</span><span class="cx"> case 'posts_per_rss':
</span><span class="cx"> $value = (int) $value;
</span><del>- if ( empty($value) ) $value = 1;
- if ( $value < -1 ) $value = abs($value);
</del><ins>+ if ( empty($value) )
+ $value = 1;
+ if ( $value < -1 )
+ $value = abs($value);
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'default_ping_status':
</span><span class="lines">@@ -2435,9 +2441,25 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'siteurl':
</span><ins>+ if ( (bool)preg_match( '#http(s?)://(.+)#i', $value) ) {
+ $value = esc_url_raw($value);
+ } else {
+ $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
+ if ( function_exists('add_settings_error') )
+ add_settings_error('siteurl', 'invalid_siteurl', __('The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.'));
+ }
+ break;
+
</ins><span class="cx"> case 'home':
</span><del>- $value = esc_url_raw($value);
</del><ins>+ if ( (bool)preg_match( '#http(s?)://(.+)#i', $value) ) {
+ $value = esc_url_raw($value);
+ } else {
+ $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
+ if ( function_exists('add_settings_error') )
+ add_settings_error('home', 'invalid_home', __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.'));
+ }
</ins><span class="cx"> break;
</span><ins>+
</ins><span class="cx"> default :
</span><span class="cx"> $value = apply_filters("sanitize_option_{$option}", $value, $option);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>