<!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>[2944] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks.php: WordCamp.org: Defer the Jetpack connection process for new sites.</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/2944">2944</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/2944","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-13 13:59:15 +0000 (Wed, 13 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'>WordCamp.org: Defer the Jetpack connection process for new sites.
Jetpack requires a valid HTTPS connection to connected sites. Since
we don't have a valid cert for up to 12 hours after a new site is
created, we ask Jetpack to try later.</pre>
<h3>Modified 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_htmlwpcontentmupluginsjetpacktweaksphp"></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/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-13 11:29:05 UTC (rev 2943)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks.php 2016-04-13 13:59:15 UTC (rev 2944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,26 +90,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'jetpack_photon_reject_https', '__return_false' );
</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">- * Always automatically connect new sites to WordPress.com
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Never automatically connect new sites to WordPress.com.
+ * We offload this part to wp-cron.php because of https.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The UI for the auto-connect option is currently commented out in Jetpack. You can enable the setting manually,
- * but it will get overridden if you save the settings from the UI, because the form field is missing.
- *
- * @todo Remove this when the UI for the setting is launched.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param array $new_value
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $old_value
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function auto_connect_new_sites( $new_value, $old_value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_value['auto-connect'] = 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_value['auto-connect'] = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $new_value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_update_site_option_jetpack-network-settings', __NAMESPACE__ . '\auto_connect_new_sites', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Sanitize parsed Custom CSS rules
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @import rules are stripped because they can introduce security vulnerabilities by embedding external
</span></span></pre>
</div>
</div>
</body>
</html>