<!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>[6704] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css: WordCamp Remote CSS: Apply coding standards.</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/6704">6704</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/6704","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-21 00:10:49 +0000 (Wed, 21 Feb 2018)</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'>WordCamp Remote CSS: Apply coding standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappcommonphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/common.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappoutputcachedcssphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/output-cached-css.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappsynchronizeremotecssphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/synchronize-remote-css.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappuserinterfacephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappwebhookhandlerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/webhook-handler.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssbootstrapphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/bootstrap.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssplatformsgithubphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/platforms/github.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecsstestsbootstrapphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/bootstrap.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssteststestsynchronizeremotecssphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-synchronize-remote-css.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssteststestuserinterfacephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-user-interface.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpautomatedsynchronizationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpbasicsetupphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpoverviewphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelptipsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewspageremotecssphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewstemplatediscoverynoticephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/template-discovery-notice.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappcommonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/common.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/common.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/common.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,14 +5,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_Customize_Manager;
</span><span class="cx" style="display: block; padding: 0 10px"> use Exception;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const POST_TYPE = 'wc_remote_css';
</span><span class="cx" style="display: block; padding: 0 10px"> const SAFE_CSS_POST_SLUG = 'wcrcss_safe_cached_version';
</span><span class="cx" style="display: block; padding: 0 10px"> const OPTION_LAST_UPDATE = 'wcrcss_last_update';
</span><span class="cx" style="display: block; padding: 0 10px"> const AJAX_ACTION = 'wcrcss_webhook';
</span><span class="cx" style="display: block; padding: 0 10px"> const SYNCHRONIZE_ACTION = 'wcrcss_synchronize';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const WEBHOOK_RATE_LIMIT = 30; // seconds
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const WEBHOOK_RATE_LIMIT = 30; // seconds.
</ins><span class="cx" style="display: block; padding: 0 10px"> const OPTION_REMOTE_CSS_URL = 'wcrcss_remote_css_url';
</span><span class="cx" style="display: block; padding: 0 10px"> const CSS_HANDLE = 'wordcamp_remote_css';
</span><span class="cx" style="display: block; padding: 0 10px"> const GITHUB_API_HOSTNAME = 'api.github.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,8 +152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s is an email address
- __( "Could not migrate Jetpack post. Please notify us at %s.", 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is an email address.
+ __( 'Could not migrate Jetpack post. Please notify us at %s.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> EMAIL_CENTRAL_SUPPORT
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => SAFE_CSS_POST_SLUG,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'private',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_content' => $content
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_content' => $content,
</ins><span class="cx" style="display: block; padding: 0 10px"> ), true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $post ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,8 +184,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_a( $post, 'WP_Post' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s is an email address
- __( "Could not create CSS post. Please notify us at %s.", 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is an email address.
+ __( 'Could not create CSS post. Please notify us at %s.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> EMAIL_CENTRAL_SUPPORT
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_output_mode() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = 'add-on';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = 'add-on';
</ins><span class="cx" style="display: block; padding: 0 10px"> $jetpack_settings = (array) get_theme_mod( 'jetpack_custom_css' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $jetpack_settings['replace'] ) && $jetpack_settings['replace'] ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappoutputcachedcssphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/output-cached-css.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/output-cached-css.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/output-cached-css.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,10 +4,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use Jetpack;
</span><span class="cx" style="display: block; padding: 0 10px"> use Exception;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_configured() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_cached_css', 11 ); // after the theme's stylesheet, but before Core's Custom CSS stylesheet
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_cached_css', 11 ); // after the theme's stylesheet, but before Core's Custom CSS stylesheet.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'stylesheet_uri', __NAMESPACE__ . '\skip_theme_stylesheet' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_' . CSS_HANDLE, __NAMESPACE__ . '\output_cached_css' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_nopriv_' . CSS_HANDLE, __NAMESPACE__ . '\output_cached_css' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_latest_revision_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $safe_css = get_safe_css_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $safe_css = get_safe_css_post();
</ins><span class="cx" style="display: block; padding: 0 10px"> $latest_revision = wp_get_post_revisions( $safe_css->ID, array( 'posts_per_page' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $latest_revision ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_headers = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Cache-Control' => 'maxage=' . $expiration_period,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ETag' => '"' . md5( $last_modified ) . '"',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Last-Modified' => $last_modified, // Currently Core always strips this out, but we want to send it, and maybe Core will allow that in the future
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Last-Modified' => $last_modified, // Currently Core always strips this out, but we want to send it, and maybe Core will allow that in the future.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Expires' => gmdate( 'D, d M Y H:i:s', time() + $expiration_period ) . ' GMT',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Handles the AJAX endpoint to output the local copy of the CSS
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function output_cached_css() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Explicitly tell the browser that this is CSS, to avoid MIME sniffing vulnerabilities
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Explicitly tell the browser that this is CSS, to avoid MIME sniffing vulnerabilities.
</ins><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/css; charset=' . get_option( 'blog_charset' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappsynchronizeremotecssphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/synchronize-remote-css.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/synchronize-remote-css.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/synchronize-remote-css.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use Jetpack_Custom_CSS_Enhancements;
</span><span class="cx" style="display: block; padding: 0 10px"> use Exception;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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"> * Synchronizes the local safe/cached copy of the CSS with the canonical, remote source.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $remote_css_url
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws \Exception if the response body could not be retrieved for any reason
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception If the response body could not be retrieved for any reason.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,14 +36,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_css_url,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user-agent' => 'WordCamp.org Remote CSS', // GitHub's API explicitly requests this, and it could be beneficial for other platforms too
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => 'WordCamp.org Remote CSS', // GitHub's API explicitly requests this, and it could be beneficial for other platforms too.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'reject_unsafe_urls' => true,
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'request_error', compact( 'remote_css_url', 'response' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( $response->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( $response->get_error_message() );
</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"> $response_code = (int) wp_remote_retrieve_response_code( $response );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $response_code, array( 200, 301, 302, 303, 307, 308 ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'invalid_response_code', compact( 'remote_css_url', 'response' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The remote server responded with status code <code>%d</code>, which is not valid.', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $response_code
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,8 +83,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $parser_rules_setup || ! $subvalue_sanitization_setup ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s is an email address
- __( "Could not update CSS because sanitization was not available. Please notify us at %s.", 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is an email address.
+ __( 'Could not update CSS because sanitization was not available. Please notify us at %s.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> EMAIL_CENTRAL_SUPPORT
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,8 +97,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( did_action( 'csstidy_optimize_postparse' ) < 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s is an email address
- __( "Could not update CSS because sanitization did not run. Please notify us at %s.", 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is an email address.
+ __( 'Could not update CSS because sanitization did not run. Please notify us at %s.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> EMAIL_CENTRAL_SUPPORT
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $safe_css
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function save_safe_css( $safe_css ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = get_safe_css_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_safe_css_post();
</ins><span class="cx" style="display: block; padding: 0 10px"> $post->post_content = $safe_css;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappuserinterfacephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,14 +1,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace WordCamp\RemoteCSS;
+use Exception;
+
+defined( 'WPINC' ) || die();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo Move all of this into the Customizer. Replace the discovery notice with an input field for the URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * Not sure how to fit all the contextual help. though.
</span><span class="cx" style="display: block; padding: 0 10px"> * For errors, use https://developer.wordpress.org/themes/customize-api/tools-for-improved-user-experience/#notifications
</span><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">-namespace WordCamp\RemoteCSS;
-defined( 'WPINC' ) or die();
-
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_menu', __NAMESPACE__ . '\add_admin_pages' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,15 +40,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $notice = process_options_page();
</span><span class="cx" style="display: block; padding: 0 10px"> $notice_class = 'notice-success';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } catch( \Exception $exception ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } catch ( Exception $exception ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $notice = $exception->getMessage();
</span><span class="cx" style="display: block; padding: 0 10px"> $notice_class = 'notice-error';
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output_mode = get_output_mode();
- $remote_css_url = get_option( OPTION_REMOTE_CSS_URL , '' );
- $fonts_tool_url = admin_url( 'themes.php?page=wc-fonts-options' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output_mode = get_output_mode();
+ $remote_css_url = get_option( OPTION_REMOTE_CSS_URL, '' );
+ $fonts_tool_url = admin_url( 'themes.php?page=wc-fonts-options' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __DIR__ ) . '/views/page-remote-css.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,9 +68,9 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Process submissions of the form on the options page
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Process submissions of the form on the options page.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws \Exception if the user isn't authorized
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception If the user isn't authorized.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'wcrcss-options-submit', 'wcrcss-options-nonce' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'switch_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( 'Access denied.', 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( 'Access denied.', 'wordcamporg' ) );
</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"> $remote_css_url = trim( $_POST['wcrcss-remote-css-url'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,28 +106,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $remote_css_url
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws \Exception if the URL cannot be validated
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception If the URL cannot be validated.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function validate_remote_css_url( $remote_css_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Syntactically-valid URLs only
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Syntactically-valid URLs only.
</ins><span class="cx" style="display: block; padding: 0 10px"> $remote_css_url = filter_var( $remote_css_url, FILTER_VALIDATE_URL );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $remote_css_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( 'The URL was invalid.', 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( 'The URL was invalid.', 'wordcamporg' ) );
</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"> $remote_css_url = esc_url_raw( $remote_css_url, array( 'http', 'https' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $remote_css_url ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( 'The URL was invalid.', 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( 'The URL was invalid.', 'wordcamporg' ) );
</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">- $parsed_url = parse_url( $remote_css_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_url = wp_parse_url( $remote_css_url );
</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">- * Only allow whitelisted hostnames, to prevent SSRF attacks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Only allow whitelisted hostnames, to prevent SSRF attacks.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * WARNING: These must be trusted in the sense that they're not malicious, but also in the sense that they
</span><span class="cx" style="display: block; padding: 0 10px"> * have strong internal security. We can't allow sites hosted by local WordPress communities, for instance,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,8 +139,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $trusted_hostnames = apply_filters( 'wcrcss_trusted_remote_hostnames', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $parsed_url['host'], $trusted_hostnames, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( sprintf(
- // translators: %s: WordPress Meta Trac URL
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( sprintf(
+ // translators: %s: WordPress Meta Trac URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Due to security constraints, only certain third-party platforms can be used. We currently only support GitHub, but more platforms can be added if there\'s interest from organizers. To request an additional platform, please <a href="%s">create a ticket</a> on Meta Trac.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,8 +157,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * sanitized, which would further couple the plugin to Jetpack.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '.css' !== substr( $parsed_url['path'], strlen( $parsed_url['path'] ) - 4, 4 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( sprintf(
- // translators: %s: '.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( sprintf(
+ // translators: %s: '.css'.
</ins><span class="cx" style="display: block; padding: 0 10px"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'The URL must be a vanilla CSS file ending in %s. If you\'d like to use SASS/LESS, please compile it into vanilla CSS on your server, and then enter the URL for that file.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'overview' => __( 'Overview', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'basic-setup' => __( 'Basic Setup', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'automated-synchronization' => __( 'Automated Synchronization', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tips' => __( 'Tips', 'wordcamporg' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tips' => __( 'Tips', 'wordcamporg' ),
</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"> foreach ( $tabs as $id => $label ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappwebhookhandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/webhook-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/webhook-handler.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/webhook-handler.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,10 +2,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_configured() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wp_ajax_' . AJAX_ACTION, __NAMESPACE__ . '\webhook_handler' ); // This is useless in production, but useful for manual testing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wp_ajax_' . AJAX_ACTION, __NAMESPACE__ . '\webhook_handler' ); // This is useless in production, but useful for manual testing.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_nopriv_' . AJAX_ACTION, __NAMESPACE__ . '\webhook_handler' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( SYNCHRONIZE_ACTION, __NAMESPACE__ . '\synchronize_remote_css' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( SYNCHRONIZE_ACTION, get_option( OPTION_REMOTE_CSS_URL ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( __( 'The remote CSS file was successfully synchronized.', 'wordcamporg' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } catch ( \Exception $exception ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_send_json_error( strip_tags( $exception->getMessage() ) ); // strip_tags() instead of wp_strip_tags() because we want to preserve the inner content
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_send_json_error( strip_tags( $exception->getMessage() ) ); // strip_tags() instead of wp_strip_tags() because we want to preserve the inner content.
</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"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/bootstrap.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/bootstrap.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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"> Plugin Name: WordCamp Remote CSS
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssplatformsgithubphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/platforms/github.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/platforms/github.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/platforms/github.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_Error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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"> * @todo -- Once another platform has been added and you can see the similarities, this should probably be
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,16 +37,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function convert_to_api_urls( $remote_css_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $owner = $repository = $file_path = null;
-
- $parsed_url = parse_url( $remote_css_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $owner = null;
+ $repository = null;
+ $file_path = null;
+ $parsed_url = wp_parse_url( $remote_css_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = explode( '/', $parsed_url['path'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'github.com' == $parsed_url['host'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'github.com' === $parsed_url['host'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $owner = $path[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $repository = $path[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $file_path = implode( '/', array_slice( $path, 5 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'raw.githubusercontent.com' == $parsed_url['host'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'raw.githubusercontent.com' === $parsed_url['host'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $owner = $path[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $repository = $path[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $file_path = implode( '/', array_slice( $path, 4 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,14 +71,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This allows us to make 5k requests per hour, instead of just 60.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param false|array|WP_Error $preempt See `pre_http_request`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param false|array|WP_Error $preempt See `pre_http_request`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $request_args
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $request_url
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|array|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function authenticate_requests( $preempt, $request_args, $request_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_url = parse_url( $request_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_url = wp_parse_url( $request_url );
</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"> * SECURITY: Make sure we're only authorizing the requests we're intending to, to avoid the possibility of
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,13 +97,13 @@
</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"> $has_authentication_params = array_key_exists( 'client_id', $request_query_params ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_key_exists( 'client_secret', $request_query_params );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_key_exists( 'client_secret', $request_query_params );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $has_authentication_params ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $request_url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'client_id' => REMOTE_CSS_GITHUB_ID,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'client_secret' => REMOTE_CSS_GITHUB_SECRET
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'client_secret' => REMOTE_CSS_GITHUB_SECRET,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $request_url
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecsstestsbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/bootstrap.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/bootstrap.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Defining WP_ADMIN is so that wordcamp-remote-css/bootstrap.php will load the app/*.php files.
</span><span class="cx" style="display: block; padding: 0 10px"> * It may need to be refactored if we add tests for output-cached-css.php.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'WP_ADMIN', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'WP_ADMIN', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'JETPACK_DEV_DEBUG', true );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'JETPACK__PLUGIN_DIR', dirname( dirname( __DIR__ ) ) . '/jetpack' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,10 +36,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'JETPACK__VERSION', $jetpack_plugin_data['Version'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once( dirname( __DIR__ ) . '/bootstrap.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( dirname( __DIR__ ) . '/bootstrap.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( JETPACK__PLUGIN_DIR . '/modules/custom-css/custom-css-4.7.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Some of the sanitization lives here because it runs for both Custom CSS and Remote CSS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Some of the sanitization lives here because it runs for both Custom CSS and Remote CSS.
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( dirname( dirname( __DIR__ ) ) ) . '/mu-plugins/jetpack-tweaks/css-sanitization.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> tests_add_filter( 'muplugins_loaded', __NAMESPACE__ . '\manually_load_plugin' );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssteststestsynchronizeremotecssphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-synchronize-remote-css.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-synchronize-remote-css.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-synchronize-remote-css.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Test_Synchronize_Remote_CSS extends \WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssteststestuserinterfacephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-user-interface.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-user-interface.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/test-user-interface.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Test_User_Interface extends \WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpautomatedsynchronizationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,71 +1,71 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> "You don't have to manually synchronize the local file every time you make a change to the remote file; instead, you can setup a webhook to trigger synchronization automatically.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h2><?php _e( 'Setup', 'wordcamporg' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2><?php esc_html_e( 'Setup', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "The details will vary depending on your server, but let's use GitHub as an example.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( "The details will vary depending on your server, but let's use GitHub as an example.", 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Follow <a href="%s">GitHub\'s instructions for creating a webhook</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_data( __( 'Follow <a href="%s">GitHub\'s instructions for creating a webhook</a>.', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://developer.github.com/webhooks/creating/'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'For the <code>Payload URL</code>, enter <code>%s</code>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_post( __( 'For the <code>Payload URL</code>, enter <code>%s</code>.', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( $webhook_payload_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php _e( 'For the rest of the options, you can accept the default values.', 'wordcamporg' ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><?php esc_html_e( 'For the rest of the options, you can accept the default values.', 'wordcamporg' ); ?></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> "If you're not using GitHub, your process will be different, but at the end of the day all you need to do is setup something to open an HTTP request to the payload URL above whenever your file changes.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h2><?php _e( 'Testing & Troubleshooting', 'wordcamporg' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2><?php esc_html_e( 'Testing & Troubleshooting', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'To test if the synchronization is working, make a change to the file, commit it, push it to GitHub, and then check the site to see if that change is active.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> "If your change isn't active on WordCamp.org, edit the webhook and scroll down to the <strong>Recent Deliveries</strong> section, then open the latest delivery and look at the <strong>Response</strong> tab for any errors.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s: WordPress Slack URL */
- __(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: WordPress Slack URL.
+ wp_kses_post( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'If that doesn\'t help solve the problem, you can ask for help in the <code>#meta-wordcamp</code> channel on <a href="%s">Slack</a>.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://chat.wordpress.org'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpbasicsetupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,39 +1,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( '<strong>Publish your CSS file</strong> to one of our supported platforms.', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_data( __( '<strong>Publish your CSS file</strong> to one of our supported platforms.', 'wordcamporg' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s: WordPress Meta Trac URL
- __(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: WordPress Meta Trac URL.
+ wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Due to security constraints, only certain third-party platforms can be used. We currently only support GitHub, but more platforms can be added if there\'s interest from organizers. To request an additional platform, please <a href="%s">create a ticket</a> on Meta Trac.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://meta.trac.wordpress.org/newticket'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "If you're using SASS or LESS, you'll need to compile it into vanilla CSS and publish that file.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( "If you're using SASS or LESS, you'll need to compile it into vanilla CSS and publish that file.", 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( '<strong>Enter the URL</strong> for the CSS file into the input box below.', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_data( __( '<strong>Enter the URL</strong> for the CSS file into the input box below.', 'wordcamporg' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> "If you're using GitHub, you can enter the URL in any of the following formats, but we'll convert them to use the GitHub API.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,27 +41,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Web-based file browser:', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Web-based file browser:', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <code>https://github.com/WordPressSeattle/seattle.wordcamp.org-<?php echo esc_html( date( 'Y' ) ); ?>/blob/master/style.css</code>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Raw file:', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Raw file:', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <code>https://raw.githubusercontent.com/WordPressSeattle/seattle.wordcamp.org-<?php echo esc_html( date( 'Y' ) ); ?>/master/style.css</code>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'API:', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'API:', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <code>https://api.github.com/repos/WordPressSeattle/seattle.wordcamp.org-<?php echo esc_html( date( 'Y' ) ); ?>/contents/style.css</code>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Click the <strong>Update</strong> button.', 'wordcamporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php echo wp_kses_data( __( 'Click the <strong>Update</strong> button.', 'wordcamporg' ) ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> "WordCamp.org will download the file, sanitize it, minify it, and store a local copy, then enqueue the local copy as a stylesheet alongside your theme's default stylesheet.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,20 +69,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'The local copy will need to be <strong>synchronized</strong> whenever you make a change to the file. You can either update manually by pushing the <strong>Update</strong> button again, or update automatically by setting up a webhook. For instructions on setting up a webhook, open the <strong>Automated Synchronization</strong> tab.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s: WordPress Slack URL */
- __(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: WordPress Slack URL.
+ wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'If you run into any problems, you can ask for help in the <code>#meta-wordcamp</code> channel on <a href="%s">Slack</a>.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://chat.wordpress.org'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpoverviewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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"> * @var string $custom_css_url
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,39 +10,39 @@
</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"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Remote CSS gives you a lot more flexibility in how you develop your site than the Core/Jetpack editor. For instance, you can:',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php _e( 'Work in a local development environment, like Varying Vagrant Vagrants.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Use your favorite IDE or text-editor, like PhpStorm or Sublime Text.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Use SASS or LESS instead of vanilla CSS.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Use tools like Grunt to automate your workflow.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Manage your CSS in a source control system like Git.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Collaborate with others on a social coding platform like GitHub.', 'wordcamporg' ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><?php esc_html_e( 'Work in a local development environment, like Varying Vagrant Vagrants.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Use your favorite IDE or text-editor, like PhpStorm or Sublime Text.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Use SASS or LESS instead of vanilla CSS.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Use tools like Grunt to automate your workflow.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Manage your CSS in a source control system like Git.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Collaborate with others on a social coding platform like GitHub.', 'wordcamporg' ); ?></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> "You can use all of those tools, only some of them, or completely different ones. It's up to you how you choose to work.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> "This tool works by fetching your CSS file from a remote server (like GitHub.com), sanitizing the CSS, minifying it, and then storing a local copy on WordCamp.org. The local copy is then enqueued as a stylesheet, either in addition to your theme's stylesheet, or as a replacement for it. The local copy of the CSS is synchronized with the remote file whenever you press the <strong>Update</strong> button, and you can also setup webhook notifications for automatic synchronization when the remote file changes.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s: URL to Custom CSS section in the Customizer
- __( 'If you\'re looking for something simpler, <a href="%s">the Core/Jetpack editor</a> is a great option.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: URL to Custom CSS section in the Customizer.
+ wp_kses_data( __( 'If you\'re looking for something simpler, <a href="%s">the Core/Jetpack editor</a> is a great option.', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( $custom_css_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelptipsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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"> * @var string $fonts_tool_url
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,37 +13,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We recommend <a href="%s">setting up a local development environment that mirrors WordCamp.org</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_data( __( 'We recommend <a href="%s">setting up a local development environment that mirrors WordCamp.org</a>.', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://make.wordpress.org/community/handbook/wordcamp-organizer-handbook/first-steps/web-presence/contributing-to-wordcamp-org/setting-up-a-local-wordcamp-org-sandbox/'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> "Don't use post IDs as selectors, because they can change between your development environment and production. Instead, use the slug; e.g. <code>body.post-slug-call-for-volunteers</code>, or <code>body.wcb_speaker-slug-sergey-biryukov</code>. Just make sure that you update your CSS if you rename a post.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Use <a href="%s">the Fonts tool</a> to embed your web fonts.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_data( __( 'Use <a href="%s">the Fonts tool</a> to embed your web fonts.', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( $fonts_tool_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Upload your images to <a href="%s">the Media Library</a> rather than hosting them on 3rd party servers. That way, visitors will avoid an extra DNS request, and you won\'t have to worry about them going offline if there\'s a problem with the external server.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( $media_library_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e(
</ins><span class="cx" style="display: block; padding: 0 10px"> "This tool plays nicely with the Core/Jetpack editor, and it's possible to use both. If you do, the rules in the Core/Jetpack editor will take precedence.",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewspageremotecssphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordCamp\Jetpack_Tweaks;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string $notice
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string $notice_class
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,28 +15,30 @@
</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"> <div class="wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1><?php _e( 'Remote CSS', 'wordcamporg' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1><?php esc_html_e( 'Remote CSS', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_callable( '\WordCamp\Jetpack_Tweaks\notify_import_rules_stripped' ) ) {
- // This has to be called manually because process_options_page() is called after `admin_notices` fires
- \WordCamp\Jetpack_Tweaks\notify_import_rules_stripped();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_callable( '\WordCamp\Jetpack_Tweaks\notify_import_rules_stripped' ) ) {
+ // This has to be called manually because process_options_page() is called after `admin_notices` fires.
+ Jetpack_Tweaks\notify_import_rules_stripped();
+ }
+
</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"> <?php if ( $notice ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="notice <?php echo esc_attr( $notice_class ); ?> is-dismissible">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php echo wp_kses( $notice, wp_kses_allowed_html( 'data' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php echo wp_kses_data( $notice ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // translators: %s: button attributes
- __(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: button attributes.
+ wp_kses_data( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Remote CSS allows you to develop your CSS in any environment that you choose, and with whatever tools that you prefer. <button %s>Open the Help tab</button> for detailed instructions.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type="button" id="wcrcss-open-help-tab" class="button-link"'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,26 +48,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Remote CSS URL:', 'wordcamporg' ); ?><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Remote CSS URL:', 'wordcamporg' ); ?><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="wcrcss-remote-css-url" class="large-text" value="<?php echo esc_url( $remote_css_url ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Output Mode:', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Output Mode:', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="wcrcss-output-mode" value="add-on" <?php checked( $output_mode, 'add-on' ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "Add-on: The theme's stylesheet will remain, and your custom CSS will be added after it.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( "Add-on: The theme's stylesheet will remain, and your custom CSS will be added after it.", 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="wcrcss-output-mode" value="replace" <?php checked( $output_mode, 'replace' ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "Replace: The theme's stylesheet will be removed, so that only your custom CSS is present.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( "Replace: The theme's stylesheet will be removed, so that only your custom CSS is present.", 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewstemplatediscoverynoticephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/template-discovery-notice.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/template-discovery-notice.php 2018-02-20 23:55:27 UTC (rev 6703)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/template-discovery-notice.php 2018-02-21 00:10:49 UTC (rev 6704)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\RemoteCSS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</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"> * @var string $plugin_url
</span></span></pre>
</div>
</div>
</body>
</html>