<!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>[1115] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Remove bundled trac class.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/1115">1115</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1115","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-09 03:53:03 +0000 (Fri, 09 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Theme Directory: Remove bundled trac class.
There is an IXR class on dotorg that is the same as the one in core, except
that it was modified to handle SSL connections. The Trac class was originally
written with this dotorg IXR class in mind. Here, we're switching to that class
and add support for WP_IXR_HTTP_Client, which is what WordPress uses when it
uses the IXR class, so we can connect to Trac installs that are SSL.
Soon, this Trac library will be placed in a common includes directory; for now,
we update it to use what is already on dotorg elsewhere.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasstracphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-trac.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasstracphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-trac.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-trac.php 2015-01-09 03:43:04 UTC (rev 1114)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-trac.php 2015-01-09 03:53:03 UTC (rev 1115)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,115 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-if ( ! class_exists( 'IXR_Client' ) ) {
- include_once ABSPATH . WPINC . '/class-IXR.php';
-}
-
-/**
- * Class Trac
- */
-class Trac {
-
- /**
- * Client to talk to a passed Trac setup.
- *
- * @var IXR_Client
- */
- public $rpc;
-
- /**
- * Array key for the value containing ticket attributes.
- */
- const attributes = 3;
-
- /**
- * @param string $username
- * @param string $password
- * @param string $host
- * @param string $path
- * @param string $port
- * @param bool $ssl
- */
- function __construct( $username, $password, $host, $path, $port, $ssl = false ) {
- $this->rpc = new IXR_Client( $host, $path, $port );
-
- $this->rpc->headers['Authorization'] = 'Basic ' . base64_encode( $username . ':' . $password );
- $this->rpc->ssl = $ssl;
- }
-
- /**
- * Creates a new Trac ticket.
- *
- * @param string $subj
- * @param string $desc
- * @param array $attr
- * @return bool
- */
- function ticket_create( $subj, $desc, $attr = array() ) {
- if ( empty( $attr ) ) {
- $attr = new IXR_Value( array(), 'struct' );
- }
- $ok = $this->rpc->query( 'ticket.create', $subj, $desc, $attr );
- if ( ! $ok ) {
- // print_r( $this->rpc );
- return false;
- }
-
- return $this->rpc->getResponse();
- }
-
- /**
- * Updates a Trac ticket.
- *
- * @param int $id Ticket ID.
- * @param string $comment Comment text.
- * @param array $attr Optional. Ticket attributes. Default: Empty array.
- * @param bool $notify Optional. Whether to notify the author. Default: false.
- * @return bool
- */
- function ticket_update( $id, $comment, $attr = array(), $notify = false ) {
- if ( empty( $attr['_ts'] ) ) {
- $get = $this->ticket_get( $id );
- $attr['_ts'] = $get[ self::attributes ]['_ts'];
- }
- if ( empty( $attr['action'] ) ) {
- $attr['action'] = 'leave';
- }
-
- $ok = $this->rpc->query( 'ticket.update', $id, $comment, $attr, $notify );
- if ( ! $ok ) {
- return false;
- }
-
- return $this->rpc->getResponse();
- }
-
- /**
- * Searches for a Trac ticket.
- *
- * @param string $search
- * @return bool
- */
- function ticket_query( $search ) {
- $ok = $this->rpc->query( 'ticket.query', $search );
- if ( ! $ok ) {
- return false;
- }
-
- return $this->rpc->getResponse();
- }
-
- /**
- * Gets a Trac ticket.
- *
- * @param int $id Ticket ID.
- * @return array|bool [id, time_created, time_changed, attributes] or false on failure.
- */
- function ticket_get( $id ) {
- $ok = $this->rpc->query( 'ticket.get', $id );
- if ( ! $ok ) {
- return false;
- }
-
- return $this->rpc->getResponse();
- }
-}
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2015-01-09 03:43:04 UTC (rev 1114)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2015-01-09 03:53:03 UTC (rev 1115)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,10 +490,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up a way to communicate with Trac.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->trac ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'Trac' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- include_once plugin_dir_path( __FILE__ ) . 'class-trac.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once ABSPATH . WPINC . '/class-IXR.php';
+ require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+ require_once WPORGPATH . 'bb-theme/themes/lib/class-trac.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->trac = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'themes.trac.wordpress.org', '/login/xmlrpc', 443, true /* is_ssl() */ );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->trac = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'https://themes.trac.wordpress.org/login/xmlrpc' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there's a previous version, and the most current version's status is either `new` or `pending`, we update.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2015-01-09 03:43:04 UTC (rev 1114)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2015-01-09 03:53:03 UTC (rev 1115)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,10 +126,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'Trac' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- include_once plugin_dir_path( __FILE__ ) . 'class-trac.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once ABSPATH . WPINC . '/class-IXR.php';
+ require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+ require_once WPORGPATH . 'bb-theme/themes/lib/class-trac.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $trac = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'themes.trac.wordpress.org', '/login/xmlrpc', 443, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $trac = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'https://themes.trac.wordpress.org/login/xmlrpc' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_request = get_option( 'wporg-themes-last-trac-sync', strtotime( '-2 days' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'live', 'not-approved' ) as $resolution ) {
</span></span></pre>
</div>
</div>
</body>
</html>