<!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>[4254] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp: WordCamp Post Type: Add logging to the site creation process</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/4254">4254</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/4254","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-10-18 00:22:01 +0000 (Tue, 18 Oct 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 Post Type: Add logging to the site creation process
Some new sites aren't getting the default content, but I'm not sure what's causing that, so hopefully this will help.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp"></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/wcpt/wcpt-wordcamp/wordcamp-loader.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/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-10-18 00:20:21 UTC (rev 4253)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-10-18 00:22:01 UTC (rev 4254)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,6 +224,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // back-compat
</span><span class="cx" style="display: block; padding: 0 10px"> 'public',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo this should be 'publish'?
</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_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp"></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/wcpt/wcpt-wordcamp/wordcamp-new-site.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/wcpt/wcpt-wordcamp/wordcamp-new-site.php 2016-10-18 00:20:21 UTC (rev 4253)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php 2016-10-18 00:22:01 UTC (rev 4254)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,7 @@
</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">+use \WordCamp\Logger;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> class WordCamp_New_Site {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $new_site_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,21 +97,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function maybe_create_new_site( $wordcamp_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_sites' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_user_id = get_current_user_id();
+ Logger\log( 'return_no_cap', compact( 'wordcamp_id', 'current_user_id' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> // The sponsor region is required so we can import the relevant sponsors and levels
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! get_post_meta( $wordcamp_id, 'Multi-Event Sponsor Region', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sponsor_region = get_post_meta( $wordcamp_id, 'Multi-Event Sponsor Region', true );
+ if ( ! $sponsor_region ) {
+ Logger\log( 'return_no_region', compact( 'wordcamp_id', 'sponsor_region' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> $url = get_post_meta( $wordcamp_id, 'URL', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST[ wcpt_key_to_str( 'create-site-in-network', 'wcpt_' ) ] ) || empty( $url ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Logger\log( 'return_no_request_or_url', compact( 'wordcamp_id', 'url' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> $url_components = parse_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $url_components || empty( $url_components['scheme'] ) || empty( $url_components['host'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Logger\log( 'return_invalid_url', compact( 'wordcamp_id', 'url', 'url_components' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $path = isset( $url_components['path'] ) ? $url_components['path'] : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,6 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $lead_organizer = $this->get_user_or_current_user( $wordcamp_meta['WordPress.org Username'][0] );
</span><span class="cx" style="display: block; padding: 0 10px"> $site_meta = array( 'public' => 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->new_site_id = wpmu_create_blog( $url_components['host'], $path, 'WordCamp Event', $lead_organizer->ID, $site_meta );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo can probably just set the final name here, rather than a generic one here and the final one in set_default_options()
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_int( $this->new_site_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $wordcamp_id, '_site_id', $this->new_site_id ); // this is used in other plugins to map the `wordcamp` post to it's corresponding site
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,12 +140,21 @@
</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"> $this->configure_new_site( $wordcamp_id, $wordcamp );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $new_site_id = $this->new_site_id;
+ Logger\log( 'finished', compact( 'wordcamp_id', 'url', 'lead_organizer', 'new_site_id' ) );
+ } else {
+ $new_site_id = $this->new_site_id;
+ Logger\log( 'no_site_id', compact( 'wordcamp_id', 'url', 'lead_organizer', 'new_site_id' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Maybe push multi-event sponsors out.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This is only used when _manually_ pushing new sponsors to an existing site via the 'Push Sponsor to Site' checkbox.
+ * create_post_stubs() is used when the sponsors are automatically pushed to a newly-created site.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id The WordCamp post id.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function maybe_push_mes( $wordcamp_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,13 +285,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Configure a new site and populate it with default content
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @todo Can probably just network-activate plugins instead, but need to test that they work fine in network-activated mode.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $wordcamp
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function configure_new_site( $wordcamp_id, $wordcamp ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WCPT_POST_TYPE_ID' ) || WCPT_POST_TYPE_ID != $wordcamp->post_type || ! is_numeric( $this->new_site_id ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_site_id = $this->new_site_id;
+ Logger\log( 'return_invalid_type_or_id', compact( 'wordcamp_id', 'new_site_id' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -289,6 +307,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->create_post_stubs( $wordcamp, $meta, $lead_organizer );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ Logger\log( 'finished', compact( 'wordcamp_id', 'wordcamp', 'meta', 'lead_organizer' ) );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,6 +340,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the new blog is https.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', set_url_scheme( get_option( 'siteurl' ), 'https' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', set_url_scheme( get_option( 'home' ), 'https' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ Logger\log( 'finished', compact( 'admin_email', 'blog_name' ) );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,9 +373,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $lead_organizer->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $page['title'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $page['content']
</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">+ ), true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $page_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $page_id ) ) {
+ Logger\log( 'insert_post_failed', compact( 'page_id', 'page' ) );
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Save post meta
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $page['meta'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $page['meta'] as $key => $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,10 +408,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'wcb_sponsor' == $page['type'] && isset( $page['term'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $page_id, $page['term'], 'wcb_sponsor_level', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">+
+ // todo realign
</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"> add_action( 'save_post', array( $GLOBALS['wordcamp_admin'], 'metabox_save' ) ); // restore wordcamp meta callback
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Logger\log( 'finished', compact( 'assigned_sponsor_data', 'stubs', 'blog_name' ) );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'street_address1', 'street_address2', 'city', 'state', 'zip_code', 'country'
</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">- switch_to_blog( BLOG_ID_CURRENT_SITE );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch_to_blog( BLOG_ID_CURRENT_SITE ); // central.wordcamp.org
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $meta_field_keys as $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sponsor_meta["_wcpt_sponsor_$key"] = get_post_meta( $assigned_sponsor->ID, "mes_$key", true );
</span></span></pre>
</div>
</div>
</body>
</html>