<!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>[4314] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins: CampTix Tweaks: Add number of expected attendees to t-shirt report</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/4314">4314</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/4314","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-11-01 19:08:47 +0000 (Tue, 01 Nov 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'>CampTix Tweaks: Add number of expected attendees to t-shirt report</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmuplugins0loggerphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweakscamptixtweaksphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/camptix-tweaks.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginswpclicommandsmiscellaneousphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wp-cli-commands/miscellaneous.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmuplugins0loggerphp"></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/0-logger.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/0-logger.php 2016-11-01 18:38:42 UTC (rev 4313)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php 2016-11-01 19:08:47 UTC (rev 4314)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,13 +7,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Log an event, with optional additional data
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * SECURITY WARNING: You must redact any sensitive info before it's written to the log file. The best way to do
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * that is to add entries to wcorg_log_redact_keys(), so that the caller remain clean. You can also do it before
- * passing the data to this function, though. Right now this only redacts array keys, but it can be made more
- * sophisticated in the future to handle additional cases.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * that is to add entries to redact_keys(), so that the caller remain clean. You can also do it before
+ * passing the data to this function, though.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In the future, it may be helpful to decode JSON values and search them for redactable values, and to allow
- * the caller to pass an array of strings that are sensitive and should be redacted. The latter would allow for
- * redacting values that aren't known until runtime, and could be helpful in other cases too.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo add current username to every entry, and update wp-cli command parsing regex to match
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $error_code
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $data
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +40,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Redact sensitive values from log entries
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Right now this only redacts array keys, but it can be made more sophisticated in the future to handle
+ * additional cases.
+ *
+ * In the future, it may be helpful to decode JSON values and search them for redactable values, and to allow
+ * the caller to pass an array of strings that are sensitive and should be redacted. The latter would allow for
+ * redacting values that aren't known until runtime, and could be helpful in other cases too.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $data
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweakscamptixtweaksphp"></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/camptix-tweaks/camptix-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/camptix-tweaks/camptix-tweaks.php 2016-11-01 18:38:42 UTC (rev 4313)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/camptix-tweaks.php 2016-11-01 19:08:47 UTC (rev 4314)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_capabilities', __NAMESPACE__ . '\modify_capabilities' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_default_options', __NAMESPACE__ . '\modify_default_options' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_html_message', __NAMESPACE__ . '\render_html_emails', 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'camptix_tshirt_report_intro', __NAMESPACE__ . '\tshirt_report_intro_message', 10, 3 );
</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">@@ -395,3 +396,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $html_message;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Extend the introduction message for each camp in the tshirt report
+ *
+ * @param string $message
+ * @param int $site_id
+ * @param array $sizes
+ *
+ * @return string
+ */
+function tshirt_report_intro_message( $message, $site_id, $sizes ) {
+ switch_to_blog( $site_id );
+
+ $wordcamp = get_wordcamp_post();
+
+ if ( ! empty( $wordcamp->meta['Number of Anticipated Attendees'][0] ) ) {
+ $message = sprintf(
+ "<p>This camp is expecting %d attendees.</p>",
+ $wordcamp->meta['Number of Anticipated Attendees'][0]
+ );
+ }
+
+ restore_current_blog();
+ return $message;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginswpclicommandsmiscellaneousphp"></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/wp-cli-commands/miscellaneous.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/wp-cli-commands/miscellaneous.php 2016-11-01 18:38:42 UTC (rev 4313)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wp-cli-commands/miscellaneous.php 2016-11-01 19:08:47 UTC (rev 4314)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,6 +113,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * wp wc-misc format-log "$(grep 'foo' /var/log/php-errors.log -C 10)" |less -S
</span><span class="cx" style="display: block; padding: 0 10px"> * wp wc-misc format-log "$(grep 'bar' /var/log/php-errors.log)" --foreign=ignore
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Sometimes example passing entries as command line param fails because it passes the length limit.
+ * Add an example of a good workaround for that.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @subcommand format-log
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args
</span></span></pre>
</div>
</div>
</body>
</html>