<!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>[7915] sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator: CampTix Badge Generator: 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 { white-space: pre-line; 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/7915">7915</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/7915","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-11-29 03:19:31 +0000 (Thu, 29 Nov 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'>CampTix Badge Generator: Apply coding standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorbootstrapphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/bootstrap.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludescommonphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/common.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludeshtmlbadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/html-badges.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludesindesignbadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewscommonpagegeneratebadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/common/page-generate-badges.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewshtmlbadgessectiondescriptionphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/html-badges/section-description.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewshtmlbadgestemplatebadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/html-badges/template-badges.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewshtmlbadgestemplatepartbadgecontentsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/html-badges/template-part-badge-contents.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewsindesignbadgespageindesignbadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/indesign-badges/page-indesign-badges.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorbootstrapphp"></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/camptix-badge-generator/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/camptix-badge-generator/bootstrap.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/bootstrap.php 2018-11-29 03:19:31 UTC (rev 7915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</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"> namespace CampTix\Badge_Generator;
</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 REQUIRED_CAPABILITY = 'manage_options';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludescommonphp"></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/camptix-badge-generator/includes/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/camptix-badge-generator/includes/common.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/common.php 2018-11-29 03:19:31 UTC (rev 7915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +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 CampTix\Badge_Generator;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use \CampTix\Badge_Generator\HTML;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use CampTix_Plugin;
+use CampTix\Badge_Generator\HTML;
</ins><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_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_menu_tools_tabs', __NAMESPACE__ . '\add_badges_tab' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,11 +66,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the attendees
</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 string|array $ticket_ids Reduce fetched attendees by the ticket they purchased. The string 'all'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|array $ticket_ids Filter fetched attendees by the ticket they purchased. The string 'all'
</ins><span class="cx" style="display: block; padding: 0 10px"> * will result in all attendees being fetched, regardless of their
</span><span class="cx" style="display: block; padding: 0 10px"> * ticket. An array of ticket IDs will result in only the attendees for
</span><span class="cx" style="display: block; padding: 0 10px"> * those tickets being fetched.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $registered_after Reduce fetched attendees by their registration date. Any value parseable
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $registered_after Filter fetched attendees by their registration date. Any value parseable
</ins><span class="cx" style="display: block; padding: 0 10px"> * by strtotime().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $admin_flag Filter fetched attendees to only those who have the given admin flag
</span><span class="cx" style="display: block; padding: 0 10px"> * assigned.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Any non-null value will be returned as if it were pulled from the database
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_dynamic_post_meta( $value, $post_id, $meta_key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @global \CampTix_Plugin $camptix */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @global CampTix_Plugin $camptix */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $camptix;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attendee = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</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">- if ( 'tix_attendee' != $attendee->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'tix_attendee' !== $attendee->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $value;
</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">@@ -155,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'rating' => 'g',
</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">- $value = str_replace( 'secure.gravatar.com', 'en.gravatar.com', $value ); // work around Varnish bug on secure.gravatar.com that causes `503` response codes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = str_replace( 'secure.gravatar.com', 'en.gravatar.com', $value ); // work around Varnish bug on secure.gravatar.com that causes `503` response codes.
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'coupon':
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludeshtmlbadgesphp"></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/camptix-badge-generator/includes/html-badges.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/camptix-badge-generator/includes/html-badges.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/html-badges.php 2018-11-29 03:19:31 UTC (rev 7915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,21 +5,23 @@
</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"> namespace CampTix\Badge_Generator\HTML;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use \CampTix\Badge_Generator;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use CampTix\Badge_Generator;
+use CampTix_Plugin;
+use WP_Customize_Manager;
</ins><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"> add_action( 'customize_register', __NAMESPACE__ . '\register_customizer_components' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', __NAMESPACE__ . '\enqueue_customizer_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_print_styles', __NAMESPACE__ . '\print_customizer_styles' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\remove_all_previewer_styles', 998 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_previewer_scripts', 999 ); // after remove_all_previewer_styles()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_previewer_scripts', 999 ); // after remove_all_previewer_styles().
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'template_include', __NAMESPACE__ . '\use_badges_template' );
</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"> * Register our Customizer settings, panels, sections, and controls
</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 \WP_Customize_Manager $wp_customize
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Customize_Manager $wp_customize
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_customizer_components( $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +124,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Enqueue our scripts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Enqueue our scripts.
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script(
</span><span class="cx" style="display: block; padding: 0 10px"> 'camptix-html-badges-customizer',
</span><span class="cx" style="display: block; padding: 0 10px"> plugins_url( 'javascript/html-badges-customizer.js', __DIR__ ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_badges_preview() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @global \WP_Customize_Manager $wp_customize */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @global WP_Customize_Manager $wp_customize */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $_GET['camptix-badges'] ) && $wp_customize->is_preview();
</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"> * @todo Need some way of detecting failed HTTP requests for Gravatars and retrying them, like InDesign badges does
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_badges_template() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @global \CampTix_Plugin $camptix */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @global CampTix_Plugin $camptix */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $camptix;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_html = array(
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorincludesindesignbadgesphp"></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/camptix-badge-generator/includes/indesign-badges.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/camptix-badge-generator/includes/indesign-badges.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php 2018-11-29 03:19:31 UTC (rev 7915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,14 @@
</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 CampTix\Badge_Generator\InDesign;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use \CampTix\Badge_Generator;
-use \CampTix\Badge_Generator\HTML;
-use \WordCamp\Logger;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use Exception;
+use CampTix_Plugin;
+use CampTix\Badge_Generator;
+use CampTix\Badge_Generator\HTML;
+use WordCamp\Logger;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WordCamp\Utilities;
</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"> add_action( 'camptix_menu_tools_indesign_badges', __NAMESPACE__ . '\render_indesign_page' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,6 +29,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Build the badge assets for InDesign
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $options
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @throws Exception
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function build_assets( $options ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $options = shortcode_atts(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> generate_csv( $csv_filename, $zip_local_folder, $attendees, $gravatar_folder );
</span><span class="cx" style="display: block; padding: 0 10px"> create_zip_file( $zip_filename, $zip_local_folder, $csv_filename, $gravatar_folder );
</span><span class="cx" style="display: block; padding: 0 10px"> } finally {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // todo Delete contents of $assets_folder, then rmdir( $assets_folder );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo Delete contents of $assets_folder, then rmdir( $assets_folder );.
</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">@@ -64,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $attendees
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $gravatar_folder
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function download_gravatars( $attendees, $gravatar_folder ) {
</span><span class="cx" style="display: block; padding: 0 10px"> set_time_limit( 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $gravatar_file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'gravatar_open_failed', compact( 'attendee', 'gravatar_folder', 'filename' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( "Couldn't save all Gravatars.", 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( "Couldn't save all Gravatars.", '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"> fwrite( $gravatar_file, $gravatar_image );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo Update this to use wcorg_redundant_remote_get() instead, for DRYness
</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 when the HTTP request fails
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception when the HTTP request fails
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function download_single_gravatar( $request_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attempt_count = 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $retry_after = wp_remote_retrieve_header( $response, 'retry-after' ) ?: 5;
</span><span class="cx" style="display: block; padding: 0 10px"> $retry_after = min( $retry_after * $attempt_count, 30 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // A 404 is expected when the attendee doesn't have a Gravatar setup, so don't retry them
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A 404 is expected when the attendee doesn't have a Gravatar setup, so don't retry them.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 404 == $status_code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +137,7 @@
</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_array( $response ) && isset( $response['body'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response['body'] = '[redacted]'; // Avoid cluttering the logs with a ton of binary data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['body'] = '[redacted]'; // Avoid cluttering the logs with a ton of binary data.
</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"> if ( $attempt_count < 3 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sleep( $retry_after );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'request_failed_permenantly', compact( 'request_url', 'response' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( "Couldn't download all Gravatars.", 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( "Couldn't download all Gravatars.", '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"> $attempt_count++;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the filename for the Zip file
</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 $assets_folder
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $assets_folder
</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">@@ -196,10 +200,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $attendees
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $gravatar_folder
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function generate_csv( $csv_filename, $zip_local_folder, $attendees, $gravatar_folder ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var \CampTix_Plugin $camptix */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var CampTix_Plugin $camptix */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $camptix;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $csv_handle = fopen( $csv_filename, 'w' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $csv_handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'open_csv_failed' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( "Couldn't open CSV file.", 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( "Couldn't open CSV file.", '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"> fputcsv( $csv_handle, Utilities\Export_CSV::esc_csv( get_header_row( $admin_flags, $questions ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +238,7 @@
</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 get_admin_flags() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var \CampTix_Plugin $camptix */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var CampTix_Plugin $camptix */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $camptix;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $flags = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_attendee_csv_row( $attendee, $gravatar_folder, $destination_directory, $empty_twitter, $admin_flags, $questions ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $row = array();
</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 ( 'unknown.attendee@example.org' == $attendee->tix_email ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'unknown.attendee@example.org' === $attendee->tix_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $row;
</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">@@ -326,7 +330,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_twitter_username( $attendee ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @global \CampTix_Plugin $camptix */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @global CampTix_Plugin $camptix */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $camptix;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $username = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,17 +356,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $username
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $first_name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $empty_mode 'replace' to replace empty usernames with first names
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $empty_mode 'replace' to replace empty usernames with first names.
</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 format_twitter_username( $username, $first_name, $empty_mode = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty ( $username ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $username ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'replace' === $empty_mode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $username = $first_name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Strip out everything but the username, and prefix a @
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip out everything but the username, and prefix a `@` character.
</ins><span class="cx" style="display: block; padding: 0 10px"> $username = '@' . preg_replace(
</span><span class="cx" style="display: block; padding: 0 10px"> '/
</span><span class="cx" style="display: block; padding: 0 10px"> (https?:\/\/)?
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,12 +411,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $csv_filename
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $gravatar_folder
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function create_zip_file( $zip_filename, $zip_local_folder, $csv_filename, $gravatar_folder ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'ZipArchive') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'zip_ext_not_installed' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( 'The Zip extension for PHP is not installed.', 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( 'The Zip extension for PHP is not installed.', '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"> $zip_file = new \ZipArchive();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true !== $open_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'zip_open_failed', compact( 'zip_filename', 'open_status' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( 'The Zip file could not be created.', 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( 'The Zip file could not be created.', '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"> $zip_file->addFile(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,12 +456,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $filename
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function serve_zip_file( $filename ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( Badge_Generator\REQUIRED_CAPABILITY ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'access_denied' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception( __( "You don't have authorization to perform this action.", 'wordcamporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( __( "You don't have authorization to perform this action.", '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"> set_time_limit( 0 );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewscommonpagegeneratebadgesphp"></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/camptix-badge-generator/views/common/page-generate-badges.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/camptix-badge-generator/views/common/page-generate-badges.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/common/page-generate-badges.php 2018-11-29 03:19:31 UTC (rev 7915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,18 @@
</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 CampTix\Badge_Generator;
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @var string $html_customizer_url
+ * @var string $indesign_page_url
+ * @var string $notify_tool_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"> <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"> 'This tool will help you create personalized badges for attendees to wear during the event. There are two methods for this, depending on your preferences:',
</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">@@ -14,28 +20,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="cbg-method-overviews">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="html-badge-overview">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php _e( 'HTML and CSS', 'wordcamporg' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2>
+ <?php esc_html_e( 'HTML and CSS', 'wordcamporg' ); ?>
+ </h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="ul-disc">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php _e( 'The Easiest method.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Can be as simple as using the default design and printing at home.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Design is customizable by a designer or developer, but options are limited compared to InDesign.', 'wordcamporg' ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><?php esc_html_e( 'The Easiest method.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Can be as simple as using the default design and printing at home.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Design is customizable by a designer or developer, but options are limited compared to InDesign.', '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"> <a class="button button-primary" href="<?php echo esc_url( $html_customizer_url ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Create Badges with HTML and CSS', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Create Badges with HTML and CSS', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="indesign-badges-overview" class="cbg-method-overview">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php _e( 'InDesign', 'wordcamporg' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2>
+ <?php esc_html_e( 'InDesign', 'wordcamporg' ); ?>
+ </h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="ul-disc">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php _e( 'The best results, but requires more work.', 'wordcamporg' ); ?></li>
- <li><?php _e( 'Most flexible design options.', 'wordcamporg' ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><?php esc_html_e( 'The best results, but requires more work.', 'wordcamporg' ); ?></li>
+ <li><?php esc_html_e( 'Most flexible design options.', 'wordcamporg' ); ?></li>
</ins><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">- __( 'Requires a designer and a copy of InDesign. <a href="%s">Free trial copies are available</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_post( __( 'Requires a designer and a copy of InDesign. <a href="%s">Free trial copies are available</a>.', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://www.adobe.com/products/indesign.html'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +52,7 @@
</span><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"> <a class="button button-primary" href="<?php echo esc_url( $indesign_page_url ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Create Badges with InDesign', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Create Badges with InDesign', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,11 +59,11 @@
</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: 1: Gravatar.com URL, 2: Notify tool URL
- __(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: 1: Gravatar.com URL, 2: Notify tool URL.
+ wp_kses_post( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Regardless of which method you choose, you\'ll get the best results if you encourage attendees to create <a href="%1$s">Gravatar</a> accounts before you create the badges. You can use <a href="%2$s">the Notify tool</a> to e-mail everyone. Make sure to tell them to create their Gravatar account using the same e-mail address that provided when purchasing a ticket.',
</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://gravatar.com',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $notify_tool_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewshtmlbadgessectiondescriptionphp"></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/camptix-badge-generator/views/html-badges/section-description.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/camptix-badge-generator/views/html-badges/section-description.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/html-badges/section-description.php 2018-11-29 03:19:31 UTC (rev 7915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,14 +1,14 @@
</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 CampTix\Badge_Generator\HTML;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-_e( 'Create personalized attendee badges with HTML and CSS. ', 'wordcamporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+esc_html_e( 'Create personalized attendee badges with HTML and CSS. ', '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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="cbg-firefox-recommended" class="notice notice-warning notice-large hidden">
</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"> 'We strongly recommend using Firefox, because other browsers have inconsistent support for CSS page breaks.',
</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_htmlwpcontentpluginscamptixbadgegeneratorviewshtmlbadgestemplatebadgesphp"></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/camptix-badge-generator/views/html-badges/template-badges.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/camptix-badge-generator/views/html-badges/template-badges.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/html-badges/template-badges.php 2018-11-29 03:19:31 UTC (rev 7915)
</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 CampTix\Badge_Generator\HTML;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_Post;
</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"> * @global string $template
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * template-loader.php includes this file in the global scope, which is ugly. So, include this again from a
</span><span class="cx" style="display: block; padding: 0 10px"> * function, so that we get a nice, clean, local scope.
</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 ( isset( $template ) && __FILE__ == $template ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $template ) && __FILE__ === $template ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> render_badges_template();
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <html <?php language_attributes(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <title><?php _e( 'CampTix HTML Badges', 'wordcamporg' ); ?></title>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <title><?php esc_html_e( 'CampTix HTML Badges', 'wordcamporg' ); ?></title>
</ins><span class="cx" style="display: block; padding: 0 10px"> <meta charset="<?php bloginfo( 'charset' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_head(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attendees ) ) :
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'No attendees were found. Please try again once tickets have been purchased.', 'wordcamporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html_e( 'No attendees were found. Please try again once tickets have been purchased.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewshtmlbadgestemplatepartbadgecontentsphp"></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/camptix-badge-generator/views/html-badges/template-part-badge-contents.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/camptix-badge-generator/views/html-badges/template-part-badge-contents.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/html-badges/template-part-badge-contents.php 2018-11-29 03:19:31 UTC (rev 7915)
</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 CampTix\Badge_Generator\HTML;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_Post;
</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"> * @var WP_Post $attendee
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewsindesignbadgespageindesignbadgesphp"></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/camptix-badge-generator/views/indesign-badges/page-indesign-badges.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/camptix-badge-generator/views/indesign-badges/page-indesign-badges.php 2018-11-29 03:19:26 UTC (rev 7914)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/indesign-badges/page-indesign-badges.php 2018-11-29 03:19:31 UTC (rev 7915)
</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 CampTix\Badge_Generator\InDesign;
</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 $html_customizer_url
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,11 @@
</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"> <h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'InDesign Badges', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'InDesign Badges', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h2>
</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"> "The process for building InDesign badges hasn't been automated yet, so it requires a developer to run a script. That script will create a CSV file and will download Gravatar images for all attendees. Once that's done, a designer can take those files into InDesign and use the Data Merge feature to create personalized badges for each attendee.",
</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">@@ -22,10 +22,10 @@
</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">- __(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_post( __(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Full instructions are <a href="%1$s">available in the WordCamp Organizer Handbook</a>. If you\'d prefer an easier way, <a href="%2$s">the HTML/CSS method</a> is much more automated at this time.',
</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://make.wordpress.org/community/handbook/wordcamp-organizer-handbook/first-steps/helpful-documents-and-templates/create-wordcamp-badges-with-gravatars/',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $html_customizer_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</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">- __( 'If you\'d like to help automate the InDesign process, you can contribute to <a href="%s">Meta ticket #262</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_kses_post( __( 'If you\'d like to help automate the InDesign process, you can contribute to <a href="%s">Meta ticket #262</a>.', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://meta.trac.wordpress.org/ticket/262'
</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>
</div>
</body>
</html>