<!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>[2958] sites/trunk/wordcamp.org/public_html/wp-content: Jetpack Tweaks: Break into multiple files for better organization.</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/2958">2958</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/2958","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>2016-04-14 20:23:22 +0000 (Thu, 14 Apr 2016)</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'>Jetpack Tweaks: Break into multiple files for better organization.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsloadothermupluginsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/load-other-mu-plugins.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/</li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweakscsssanitizationphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/css-sanitization.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksmiscellaneousphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/miscellaneous.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksnewsitesphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/new-sites.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweakssharingphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/sharing.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweakscsssanitizationphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/css-sanitization.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/mu-plugins/jetpack-tweaks/css-sanitization.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/css-sanitization.php 2016-04-14 20:23:22 UTC (rev 2958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,119 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordCamp\Jetpack_Tweaks;
+defined( 'WPINC' ) or die();
+
+add_action( 'csstidy_optimize_postparse', __NAMESPACE__ . '\sanitize_csstidy_parsed_rules' );
+add_action( 'admin_notices', __NAMESPACE__ . '\notify_import_rules_stripped' );
+add_action( 'csstidy_optimize_subvalue', __NAMESPACE__ . '\sanitize_csstidy_subvalues' );
+
+/**
+ * Sanitize parsed Custom CSS rules
+ *
+ * @import rules are stripped because they can introduce security vulnerabilities by embedding external
+ * stylesheets that haven't been sanitized, and they also present a maintenance problem because they rely on
+ * external resources which could go offline at any point.
+ *
+ * @charset rules are stripped because manipulating the charset can allow an attacker to introduce XSS
+ * vulnerabilities by tricking the browser into interpreting the CSS as HTML.
+ *
+ * @param \safecss $safecss
+ */
+function sanitize_csstidy_parsed_rules( $safecss ) {
+ if ( ! empty( $safecss->parser->import ) ) {
+ update_option( 'custom_css_import_stripped', true );
+ }
+
+ $safecss->parser->import = array();
+ $safecss->parser->charset = array();
+}
+
+/**
+ * Notify the user that @import rules were stripped from their CSS
+ */
+function notify_import_rules_stripped() {
+ global $current_screen;
+ $relevant_screens = array( 'appearance_page_editcss', 'appearance_page_remote-css' );
+
+ if ( ! is_a( $current_screen, 'WP_Screen' ) || ! in_array( $current_screen->id, $relevant_screens, true ) ) {
+ return;
+ }
+
+ if ( ! get_option( 'custom_css_import_stripped' ) ) {
+ return;
+ }
+
+ delete_option( 'custom_css_import_stripped' );
+
+ ?>
+
+ <div class="notice notice-warning">
+ <p>
+ <?php printf(
+ __( 'WARNING: <code>@import</code> rules were stripped for security reasons.
+ Please use <a href="%s">the Fonts tool</a> to add web fonts, and merge other stylesheets directly into your custom CSS.',
+ 'wordcamporg' ),
+ admin_url( 'themes.php?page=wc-fonts-options' )
+ ); ?>
+ </p>
+ </div>
+
+ <?php
+}
+
+/**
+ * Sanitize Custom CSS subvalues
+ *
+ * @param \safecss $safecss
+ */
+function sanitize_csstidy_subvalues( $safecss ) {
+ $safecss->sub_value = trim( $safecss->sub_value );
+
+ // Send any urls through our filter
+ if ( preg_match( '!^\s*(?P<url_expression>url\s*(?P<opening_paren>\(|\\0028)(?P<parenthetical_content>.*)(?P<closing_paren>\)|\\0029))(.*)$!Dis', $safecss->sub_value, $matches ) ) {
+ $safecss->sub_value = sanitize_urls_in_css_properties( $matches['parenthetical_content'], $safecss->property );
+
+ // Only replace the url([...]) portion of the sub_value so we don't
+ // lose things like trailing commas or !important declarations.
+ if ( $safecss->sub_value ) {
+ $safecss->sub_value = str_replace( $matches['url_expression'], $safecss->sub_value, $matches[0] );
+ }
+ }
+
+ // Strip any expressions
+ if ( preg_match( '!^\\s*expression!Dis', $safecss->sub_value ) ) {
+ $safecss->sub_value = '';
+ }
+}
+
+/**
+ * Sanitize URLs used in CSS properties
+ *
+ * @param string $url
+ * @param string $property
+ *
+ * @return string
+ */
+function sanitize_urls_in_css_properties( $url, $property ) {
+ $allowed_properties = array( 'background', 'background-image', 'border-image', 'content', 'cursor', 'list-style', 'list-style-image' );
+ $allowed_protocols = array( 'http', 'https' );
+ // todo maybe add permenant warning note that `data` shouldn't be allowed, see #1616:comment:4
+
+ // Clean up the string
+ $url = trim( $url, "' \" \r \n" );
+
+ // Check against whitelist for properties allowed to have URL values
+ if ( ! in_array( trim( $property ), $allowed_properties, true ) ) {
+ // trim() is because multiple properties with the same name are stored with
+ // additional trailing whitespace so they don't overwrite each other in the hash.
+ return '';
+ }
+
+ $url = wp_kses_bad_protocol_once( $url, $allowed_protocols );
+
+ if ( empty( $url ) ) {
+ return '';
+ }
+
+ return "url('" . str_replace( "'", "\\'", $url ) . "')";
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksmiscellaneousphpfromrev2957sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/miscellaneous.php (from rev 2957, sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks.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/mu-plugins/jetpack-tweaks/miscellaneous.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/miscellaneous.php 2016-04-14 20:23:22 UTC (rev 2958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,7 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordCamp\Jetpack_Tweaks;
+defined( 'WPINC' ) or die();
+
+add_filter( 'jetpack_photon_reject_https', '__return_false' );
+add_filter( 'jetpack_is_holiday_snow_season', '__return_false' );
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksnewsitesphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/new-sites.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/mu-plugins/jetpack-tweaks/new-sites.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/new-sites.php 2016-04-14 20:23:22 UTC (rev 2958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,68 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordCamp\Jetpack_Tweaks;
+defined( 'WPINC' ) or die();
+
+add_filter( 'jetpack_get_default_modules', __NAMESPACE__ . '\default_jetpack_modules' );
+add_filter( 'pre_update_site_option_jetpack-network-settings', __NAMESPACE__ . '\auto_connect_new_sites', 10, 2 );
+add_action( 'wpmu_new_blog', __NAMESPACE__ . '\schedule_connect_new_site' );
+add_action( 'wcorg_connect_new_site', __NAMESPACE__ . '\wcorg_connect_new_site', 10, 2 );
+
+/*
+ * Determine which Jetpack modules should be automatically activated when new sites are created
+ */
+function default_jetpack_modules( $modules ) {
+ $modules = array_diff( $modules, array( 'widget-visibility' ) );
+ array_push( $modules, 'contact-form', 'shortcodes', 'custom-css', 'subscriptions' );
+
+ return $modules;
+}
+
+/**
+ * Never automatically connect new sites to WordPress.com.
+ * We offload this part to wp-cron.php because of https.
+ *
+ * @param array $new_value
+ * @param array $old_value
+ *
+ * @return array
+ */
+function auto_connect_new_sites( $new_value, $old_value ) {
+ $new_value['auto-connect'] = 0;
+
+ return $new_value;
+}
+
+/**
+ * Schedule an attempt to connect this site to Jetpack.
+ *
+ * @param int $blog_id The blog id.
+ */
+function schedule_connect_new_site( $blog_id ) {
+ wp_schedule_single_event(
+ time() + 12 * HOUR_IN_SECONDS + 600,
+ 'wcorg_connect_new_site',
+ array( $blog_id, get_current_user_id() )
+ );
+}
+
+/**
+ * Connect the new site to Jetpack. Runs during wp-cron.php.
+ *
+ * @param int $blog_id The blog_id to connect.
+ * @param int $user_id The user ID who created the new site.
+ */
+function wcorg_connect_new_site( $blog_id, $user_id ) {
+ if ( ! class_exists( 'Jetpack_Network' ) ) {
+ return;
+ }
+
+ $network = \Jetpack_Network::init();
+ $current_user_id = get_current_user_id();
+
+ wp_set_current_user( $user_id );
+ $network->do_subsiteregister( $blog_id );
+ wp_set_current_user( $current_user_id );
+
+ error_log( sprintf( 'Connecting new site %d for user %d.', $blog_id, $user_id ) );
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweakssharingphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/sharing.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/mu-plugins/jetpack-tweaks/sharing.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/sharing.php 2016-04-14 20:23:22 UTC (rev 2958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,76 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordCamp\Jetpack_Tweaks;
+defined( 'WPINC' ) or die();
+
+add_filter( 'jetpack_open_graph_image_default', __NAMESPACE__ . '\default_og_image' );
+add_filter( 'jetpack_images_get_images', __NAMESPACE__ . '\default_single_og_image', 10, 3 );
+add_filter( 'jetpack_open_graph_tags', __NAMESPACE__ . '\add_og_twitter_summary' );
+add_filter( 'jetpack_twitter_cards_site_tag', __NAMESPACE__ . '\twitter_sitetag' );
+
+/*
+ * Open Graph Default Image.
+ *
+ * Provides a default image for sharing WordCamp home/pages to Facebook/Twitter/Google other than the Jetpack "blank" image.
+ */
+function default_og_image() {
+ return 'https://s.w.org/images/backgrounds/wordpress-bg-medblue.png';
+}
+
+/**
+ * Choose the default Open Graph image for single posts
+ *
+ * @param array $media
+ * @param int $post_id
+ * @param array $args
+ *
+ * @return array
+ */
+function default_single_og_image( $media, $post_id, $args ) {
+ if ( $media ) {
+ return $media;
+ }
+
+ if ( has_site_icon() ) {
+ $image_url = get_site_icon_url();
+ } else if ( has_header_image() ) {
+ $image_url = get_header_image();
+ } else {
+ $image_url = default_og_image();
+ }
+
+ return array( array(
+ 'type' => 'image',
+ 'from' => 'custom_fallback',
+ 'src' => esc_url( $image_url ),
+ 'href' => get_permalink( $post_id ),
+ ) );
+}
+
+/*
+ * Add Twitter Card type.
+ *
+ * Added the twitter:card = summary OG tag for the home page and other ! is_singular() pages, which is not added by default by Jetpack.
+ */
+function add_og_twitter_summary( $og_tags ) {
+ if ( is_home() || is_front_page() ) {
+ $og_tags['twitter:card'] = 'summary';
+ }
+
+ return $og_tags;
+}
+
+/*
+ * User @WordCamp as the default Twitter account.
+ *
+ * Add default Twitter account as @WordCamp for when individual WCs do not set their Settings->Sharing option for Twitter cards only.
+ * Sets the "via" tag to blank to avoid slamming @WordCamp moderators with a ton of shared posts.
+ */
+function twitter_sitetag( $site_tag ) {
+ if ( 'jetpack' == $site_tag ) {
+ $site_tag = 'WordCamp';
+ add_filter( 'jetpack_sharing_twitter_via', '__return_empty_string' );
+ }
+
+ return $site_tag;
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks.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/mu-plugins/jetpack-tweaks.php 2016-04-14 18:02:46 UTC (rev 2957)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks.php 2016-04-14 20:23:22 UTC (rev 2958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,260 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-namespace WordCamp\Jetpack_Tweaks;
-
-/*
- * Open Graph Default Image.
- *
- * Provides a default image for sharing WordCamp home/pages to Facebook/Twitter/Google other than the Jetpack "blank" image.
- */
-function default_og_image() {
- return 'https://s.w.org/images/backgrounds/wordpress-bg-medblue.png';
-}
-add_filter( 'jetpack_open_graph_image_default', __NAMESPACE__ . '\default_og_image' );
-
-/**
- * Choose the default Open Graph image for single posts
- *
- * @param array $media
- * @param int $post_id
- * @param array $args
- *
- * @return array
- */
-function default_single_og_image( $media, $post_id, $args ) {
- if ( $media ) {
- return $media;
- }
-
- if ( has_site_icon() ) {
- $image_url = get_site_icon_url();
- } else if ( has_header_image() ) {
- $image_url = get_header_image();
- } else {
- $image_url = default_og_image();
- }
-
- return array( array(
- 'type' => 'image',
- 'from' => 'custom_fallback',
- 'src' => esc_url( $image_url ),
- 'href' => get_permalink( $post_id ),
- ) );
-}
-add_filter( 'jetpack_images_get_images', __NAMESPACE__ . '\default_single_og_image', 10, 3 );
-
-/*
- * Add Twitter Card type.
- *
- * Added the twitter:card = summary OG tag for the home page and other ! is_singular() pages, which is not added by default by Jetpack.
- */
-function add_og_twitter_summary( $og_tags ) {
- if ( is_home() || is_front_page() ) {
- $og_tags['twitter:card'] = 'summary';
- }
-
- return $og_tags;
-}
-add_filter( 'jetpack_open_graph_tags', __NAMESPACE__ . '\add_og_twitter_summary' );
-
-/*
- * User @WordCamp as the default Twitter account.
- *
- * Add default Twitter account as @WordCamp for when individual WCs do not set their Settings->Sharing option for Twitter cards only.
- * Sets the "via" tag to blank to avoid slamming @WordCamp moderators with a ton of shared posts.
- */
-function twitter_sitetag( $site_tag ) {
- if ( 'jetpack' == $site_tag ) {
- $site_tag = 'WordCamp';
- add_filter( 'jetpack_sharing_twitter_via', '__return_empty_string' );
- }
-
- return $site_tag;
-}
-add_filter( 'jetpack_twitter_cards_site_tag', __NAMESPACE__ . '\twitter_sitetag' );
-
-/*
- * Determine which Jetpack modules should be automatically activated when new sites are created
- */
-function default_jetpack_modules( $modules ) {
- $modules = array_diff( $modules, array( 'widget-visibility' ) );
- array_push( $modules, 'contact-form', 'shortcodes', 'custom-css', 'subscriptions' );
-
- return $modules;
-}
-add_filter( 'jetpack_get_default_modules', __NAMESPACE__ . '\default_jetpack_modules' );
-
-/*
- * Enable Photon support for HTTPS URLs
- */
-add_filter( 'jetpack_photon_reject_https', '__return_false' );
-
-/**
- * Never automatically connect new sites to WordPress.com.
- * We offload this part to wp-cron.php because of https.
- *
- * @param array $new_value
- * @param array $old_value
- *
- * @return array
- */
-function auto_connect_new_sites( $new_value, $old_value ) {
- $new_value['auto-connect'] = 0;
-
- return $new_value;
-}
-add_filter( 'pre_update_site_option_jetpack-network-settings', __NAMESPACE__ . '\auto_connect_new_sites', 10, 2 );
-
-/**
- * Schedule an attempt to connect this site to Jetpack.
- *
- * @param int $blog_id The blog id.
- */
-function schedule_connect_new_site( $blog_id ) {
- wp_schedule_single_event( time() + 12 * HOUR_IN_SECONDS + 600, 'wcorg_connect_new_site', array( $blog_id, get_current_user_id() ) );
-}
-add_action( 'wpmu_new_blog', __NAMESPACE__ . '\schedule_connect_new_site' );
-
-/**
- * Connect the new site to Jetpack. Runs during wp-cron.php.
- *
- * @param int $blog_id The blog_id to connect.
- * @param int $user_id The user ID who created the new site.
- */
-function wcorg_connect_new_site( $blog_id, $user_id ) {
- if ( ! class_exists( 'Jetpack_Network' ) )
- return;
-
- $network = \Jetpack_Network::init();
- $current_user_id = get_current_user_id();
- wp_set_current_user( $user_id );
-
- // Register this site with Jetpack.
- $network->do_subsiteregister( $blog_id );
-
- wp_set_current_user( $current_user_id );
- error_log( sprintf( 'Connecting new site %d for user %d.', $blog_id, $user_id ) );
-}
-add_action( 'wcorg_connect_new_site', __NAMESPACE__ . '\wcorg_connect_new_site', 10, 2 );
-
-/**
- * Sanitize parsed Custom CSS rules
- *
- * @import rules are stripped because they can introduce security vulnerabilities by embedding external
- * stylesheets that haven't been sanitized, and they also present a maintenance problem because they rely on
- * external resources which could go offline at any point.
- *
- * @charset rules are stripped because manipulating the charset can allow an attacker to introduce XSS
- * vulnerabilities by tricking the browser into interpreting the CSS as HTML.
- *
- * @param \safecss $safecss
- */
-function sanitize_csstidy_parsed_rules( $safecss ) {
- if ( ! empty( $safecss->parser->import ) ) {
- update_option( 'custom_css_import_stripped', true );
- }
-
- $safecss->parser->import = array();
- $safecss->parser->charset = array();
-}
-add_action( 'csstidy_optimize_postparse', __NAMESPACE__ . '\sanitize_csstidy_parsed_rules' );
-
-/**
- * Notify the user that @import rules were stripped from their CSS
- */
-function notify_import_rules_stripped() {
- global $current_screen;
- $relevant_screens = array( 'appearance_page_editcss', 'appearance_page_remote-css' );
-
- if ( ! is_a( $current_screen, 'WP_Screen' ) || ! in_array( $current_screen->id, $relevant_screens, true ) ) {
- return;
- }
-
- if ( ! get_option( 'custom_css_import_stripped' ) ) {
- return;
- }
-
- delete_option( 'custom_css_import_stripped' );
-
- ?>
-
- <div class="notice notice-warning">
- <p>
- <?php printf(
- __( 'WARNING: <code>@import</code> rules were stripped for security reasons.
- Please use <a href="%s">the Fonts tool</a> to add web fonts, and merge other stylesheets directly into your custom CSS.',
- 'wordcamporg' ),
- admin_url( 'themes.php?page=wc-fonts-options' )
- ); ?>
- </p>
- </div>
-
- <?php
-}
-add_action( 'admin_notices', __NAMESPACE__ . '\notify_import_rules_stripped' );
-
-/**
- * Sanitize Custom CSS subvalues
- *
- * @param \safecss $safecss
- */
-function sanitize_csstidy_subvalues( $safecss ) {
- $safecss->sub_value = trim( $safecss->sub_value );
-
- // Send any urls through our filter
- if ( preg_match( '!^\s*(?P<url_expression>url\s*(?P<opening_paren>\(|\\0028)(?P<parenthetical_content>.*)(?P<closing_paren>\)|\\0029))(.*)$!Dis', $safecss->sub_value, $matches ) ) {
- $safecss->sub_value = sanitize_urls_in_css_properties( $matches['parenthetical_content'], $safecss->property );
-
- // Only replace the url([...]) portion of the sub_value so we don't
- // lose things like trailing commas or !important declarations.
- if ( $safecss->sub_value ) {
- $safecss->sub_value = str_replace( $matches['url_expression'], $safecss->sub_value, $matches[0] );
- }
- }
-
- // Strip any expressions
- if ( preg_match( '!^\\s*expression!Dis', $safecss->sub_value ) ) {
- $safecss->sub_value = '';
- }
-}
-add_action( 'csstidy_optimize_subvalue', __NAMESPACE__ . '\sanitize_csstidy_subvalues' );
-
-/**
- * Sanitize URLs used in CSS properties
- *
- * @param string $url
- * @param string $property
- *
- * @return string
- */
-function sanitize_urls_in_css_properties( $url, $property ) {
- $allowed_properties = array( 'background', 'background-image', 'border-image', 'content', 'cursor', 'list-style', 'list-style-image' );
- $allowed_protocols = array( 'http', 'https' );
-
- // Clean up the string
- $url = trim( $url, "' \" \r \n" );
-
- // Check against whitelist for properties allowed to have URL values
- if ( ! in_array( trim( $property ), $allowed_properties, true ) ) {
- // trim() is because multiple properties with the same name are stored with
- // additional trailing whitespace so they don't overwrite each other in the hash.
- return '';
- }
-
- $url = wp_kses_bad_protocol_once( $url, $allowed_protocols );
-
- if ( empty( $url ) ) {
- return '';
- }
-
- return "url('" . str_replace( "'", "\\'", $url ) . "')";
-}
-
-/**
- * Disable Jetpack's Holiday Snow on all WordCamp sites
- *
- * That option appears in Settings > General between December 1st and January 4th.
- * It is off by default.
- * This filter removes it completely.
- */
-add_filter( 'jetpack_is_holiday_snow_season', '__return_false' );
</del></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsloadothermupluginsphp"></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/mu-plugins/load-other-mu-plugins.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/mu-plugins/load-other-mu-plugins.php 2016-04-14 18:02:46 UTC (rev 2957)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/load-other-mu-plugins.php 2016-04-14 20:23:22 UTC (rev 2958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,16 +2,37 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// mu-plugins in sub-directories
-require_once( __DIR__ . '/wp-cli-commands/bootstrap.php' );
-require_once( __DIR__ . '/camptix-tweaks/camptix-tweaks.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wcorg_include_individual_mu_plugins();
+wcorg_include_mu_plugin_folders();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Private mu-plugins
-$private_mu_plugins = glob( WP_CONTENT_DIR . '/mu-plugins-private/*.php' );
-if ( is_array( $private_mu_plugins ) ) {
- foreach ( $private_mu_plugins as $plugin ) {
- if ( is_file( $plugin ) ) {
- require_once( $plugin );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Load individually-targeted files
+ *
+ * This is because the folder contains some .php files that we don't want to automatically include with glob().
+ */
+function wcorg_include_individual_mu_plugins() {
+ require_once( __DIR__ . '/wp-cli-commands/bootstrap.php' );
+ require_once( __DIR__ . '/camptix-tweaks/camptix-tweaks.php' );
+}
+
+/**
+ * Load every mu-plugin in these folders
+ */
+function wcorg_include_mu_plugin_folders() {
+ $include_folders = array(
+ dirname( __DIR__ ) . '/mu-plugins-private',
+ __DIR__ . '/jetpack-tweaks',
+ );
+
+ foreach ( $include_folders as $folder ) {
+ $plugins = glob( $folder . '/*.php' );
+
+ if ( is_array( $plugins ) ) {
+ foreach ( $plugins as $plugin ) {
+ if ( is_file( $plugin ) ) {
+ require_once( $plugin );
+ }
+ }
</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_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 2016-04-14 18:02:46 UTC (rev 2957)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/tests/bootstrap.php 2016-04-14 20:23:22 UTC (rev 2958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __DIR__ ) . '/bootstrap.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( dirname( __DIR__ ) ) . '/jetpack/jetpack.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once( dirname( dirname( dirname( __DIR__ ) ) ) . '/mu-plugins/jetpack-tweaks.php' ); // 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
+ require_once( dirname( dirname( dirname( __DIR__ ) ) ) . '/mu-plugins/jetpack-tweaks/css-sanitization.php' );
</ins><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 class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>