<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11853] trunk/wp-includes:
Replace eval usage in request processing with new WP_MatchesMapRegex()
class usage.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11853">11853</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-08-20 20:09:36 +0000 (Thu, 20 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace eval usage in request processing with new WP_MatchesMapRegex() class usage. See <a href="http://trac.wordpress.org/ticket/9602">#9602</a> props hakre.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (11852 => 11853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2009-08-20 19:51:43 UTC (rev 11852)
+++ trunk/wp-includes/classes.php 2009-08-20 20:09:36 UTC (rev 11853)
</span><span class="lines">@@ -214,9 +214,9 @@
</span><span class="cx">
</span><span class="cx"> // Trim the query of everything up to the '?'.
</span><span class="cx"> $query = preg_replace("!^.+\?!", '', $query);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Substitute the substring matches into the query.
</span><del>- eval("@\$query = \"" . addslashes($query) . "\";");
</del><ins>+ $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
</ins><span class="cx">
</span><span class="cx"> $this->matched_query = $query;
</span><span class="cx">
</span><span class="lines">@@ -1592,4 +1592,94 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Helper class to remove the need to use eval to replace $matches[] in query strings.
+ *
+ * @since 2.9.0
+ */
+class WP_MatchesMapRegex {
+ /**
+ * store for matches
+ *
+ * @access private
+ * @var array
+ */
+ var $_matches;
+
+ /**
+ * store for mapping result
+ *
+ * @access public
+ * @var string
+ */
+ var $output;
+
+ /**
+ * subject to perform mapping on (query string containing $matches[] references
+ *
+ * @access private
+ * @var string
+ */
+ var $_subject;
+
+ /**
+ * regexp pattern to match $matches[] references
+ *
+ * @var string
+ */
+ var $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
+
+ /**
+ * constructor
+ *
+ * @param string $subject subject if regex
+ * @param array $matches data to use in map
+ * @return self
+ */
+ function WP_MatchesMapRegex($subject, $matches) {
+ $this->_subject = $subject;
+ $this->_matches = $matches;
+ $this->output = $this->_map();
+ }
+
+ /**
+ * Substitute substring matches in subject.
+ *
+ * static helper function to ease use
+ *
+ * @access public
+ * @param string $subject subject
+ * @param array $matches data used for subsitution
+ * @return string
+ */
+ function apply($subject, $matches) {
+ $oSelf =& new WP_MatchesMapRegex($subject, $matches);
+ return $oSelf->output;
+ }
+
+ /**
+ * do the actual mapping
+ *
+ * @access private
+ * @return string
+ */
+ function _map() {
+ $callback = array(&$this, 'callback');
+ return preg_replace_callback($this->_pattern, $callback, $this->_subject);
+ }
+
+ /**
+ * preg_replace_callback hook
+ *
+ * @access public
+ * @param array $matches preg_replace regexp matches
+ * @return string
+ */
+ function callback($matches) {
+ $index = intval(substr($matches[0], 9, -1));
+ return ( isset( $this->_matches[$index] ) ? $this->_matches[$index] : '' );
+ }
+
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (11852 => 11853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2009-08-20 19:51:43 UTC (rev 11852)
+++ trunk/wp-includes/rewrite.php 2009-08-20 20:09:36 UTC (rev 11853)
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> $query = preg_replace("!^.+\?!", '', $query);
</span><span class="cx">
</span><span class="cx"> // Substitute the substring matches into the query.
</span><del>- eval("\$query = \"" . addslashes($query) . "\";");
</del><ins>+ $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
</ins><span class="cx"> // Filter out non-public query vars
</span><span class="cx"> global $wp;
</span><span class="cx"> parse_str($query, $query_vars);
</span></span></pre>
</div>
</div>
</body>
</html>