<!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>[7071] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks: WordCamp tickets: Wording changes, add rows to Attendee Info table</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/7071">7071</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/7071","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-10 00:50:17 +0000 (Tue, 10 Apr 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'>WordCamp tickets: Wording changes, add rows to Attendee Info table
* Change the wording from "special accommodations" to "accessibility needs" to
avoid confusion. Some interpret "accommodations" as referring to lodging.
* Add the answers to the allergy, accessibility, and Code of Conduct questions
to the Attendee Info metabox table.
* Add the allergy, accessibility, and Code of Conduct fields to the list of
default fields in the Questions metabox.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweaksaddonsaccommodationsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/addons/accommodations.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweaksaddonsallergyphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/addons/allergy.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweaksaddonscodeofconductphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/addons/code-of-conduct.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweaksaddonsaccommodationsphp"></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/addons/accommodations.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/addons/accommodations.php 2018-04-09 21:45:35 UTC (rev 7070)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/addons/accommodations.php 2018-04-10 00:50:17 UTC (rev 7071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,15 +12,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Add a non-optional attendee field indicating if they require special accommodations.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note that the user-facing wording has been changed to "accessibility needs" to avoid confusion for attendees and translators.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @package WordCamp\CampTix_Tweaks
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Accommodations_Field extends CampTix_Addon {
</span><span class="cx" style="display: block; padding: 0 10px"> const SLUG = 'accommodations';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $question = '';
+
+ public $options = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Hook into WordPress and Camptix.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function camptix_init() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->question = __( 'Do you have any accessibility needs, such as a sign language interpreter or wheelchair access, to participate in WordCamp?', 'wordcamporg' );
+
+ $this->options = array(
+ 'yes' => _x( 'Yes (we will contact you)', 'ticket registration option', 'wordcamporg' ),
+ 'no' => _x( 'No', 'ticket registration option', 'wordcamporg' ),
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Registration field
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_attendee_form_after_questions', array( $this, 'render_registration_field' ), 12, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_checkout_attendee_info', array( $this, 'validate_registration_field' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +45,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_form_edit_attendee_ticket_info', array( $this, 'populate_ticket_info_array' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_form_edit_attendee_update_post_meta', array( $this, 'validate_save_ticket_info_field' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_form_edit_attendee_after_questions', array( $this, 'render_ticket_info_field' ), 12 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Metabox
+ add_filter( 'camptix_metabox_attendee_info_additional_rows', array( $this, 'add_metabox_row' ), 12, 2 );
</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">@@ -49,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="tix-row-<?php echo esc_attr( self::SLUG ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="tix-required tix-left">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Do you require special accommodations, such as a sign language interpreter or wheelchair access, to participate in WordCamp?', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $this->question ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="tix-required-star">*</span>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="tix-row-<?php echo esc_attr( self::SLUG ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="tix-required tix-left">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Do you require special accommodations, such as a sign language interpreter or wheelchair access, to participate in WordCamp?', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $this->question ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="tix-required-star">*</span>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,6 +198,49 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add a row to the Attendee Info metabox table for the new field and value.
+ *
+ * @param array $rows
+ * @param WP_Post $post
+ *
+ * @return mixed
+ */
+ public function add_metabox_row( $rows, $post ) {
+ $value = get_post_meta( $post->ID, 'tix_' . self::SLUG, true ) ?: '';
+ if ( $value && isset( $this->options[ $value ] ) ) {
+ $value = $this->options[ $value ];
+ }
+ $new_row = array( $this->question, esc_html( $value ) );
+
+ add_filter( 'locale', array( $this, 'set_locale_to_en_US' ) );
+
+ $ticket_row = array_filter( $rows, function( $row ) {
+ if ( 'Ticket' === $row[0] ) {
+ return true;
+ }
+
+ return false;
+ } );
+
+ remove_filter( 'locale', array( $this, 'set_locale_to_en_US' ) );
+
+ if ( ! empty( $ticket_row ) ) {
+ $ticket_row_key = key( $ticket_row );
+ $row_indexes = array_keys( $rows );
+ $position = array_search( $ticket_row_key, $row_indexes );
+
+ $slice = array_slice( $rows, $position );
+
+ array_unshift( $slice, $new_row );
+ array_splice( $rows, $position, count( $rows ), $slice );
+ } else {
+ $rows[] = $new_row;
+ }
+
+ return $rows;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Send a notification if it hasn't been sent already.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweaksaddonsallergyphp"></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/addons/allergy.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/addons/allergy.php 2018-04-09 21:45:35 UTC (rev 7070)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/addons/allergy.php 2018-04-10 00:50:17 UTC (rev 7071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,10 +17,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Allergy_Field extends CampTix_Addon {
</span><span class="cx" style="display: block; padding: 0 10px"> const SLUG = 'allergy';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $question = '';
+
+ public $options = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Hook into WordPress and Camptix.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function camptix_init() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->question = __( 'Do you have a life-threatening allergy that would affect your experience at WordCamp?', 'wordcamporg' );
+
+ $this->options = array(
+ 'yes' => _x( 'Yes (we will contact you)', 'ticket registration option', 'wordcamporg' ),
+ 'no' => _x( 'No', 'ticket registration option', 'wordcamporg' ),
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Registration field
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_attendee_form_after_questions', array( $this, 'render_registration_field' ), 11, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_checkout_attendee_info', array( $this, 'validate_registration_field' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +43,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_form_edit_attendee_ticket_info', array( $this, 'populate_ticket_info_array' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_form_edit_attendee_update_post_meta', array( $this, 'validate_save_ticket_info_field' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_form_edit_attendee_after_questions', array( $this, 'render_ticket_info_field' ), 11 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Metabox
+ add_filter( 'camptix_metabox_attendee_info_additional_rows', array( $this, 'add_metabox_row' ), 11, 2 );
</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">@@ -49,14 +63,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="tix-row-<?php echo esc_attr( self::SLUG ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="tix-required tix-left">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Do you have a life-threatening allergy that would affect your experience at WordCamp?', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $this->question ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="tix-required-star">*</span>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="tix-right">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input name="tix_attendee_info[<?php echo esc_attr( $i ); ?>][<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="yes" <?php checked( 'yes', $current_data[ self::SLUG ] ); ?> /> <?php esc_html( _ex( 'Yes (we will contact you)', 'ticket registration option', 'wordcamporg' ) ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input name="tix_attendee_info[<?php echo esc_attr( $i ); ?>][<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="yes" <?php checked( 'yes', $current_data[ self::SLUG ] ); ?> /> <?php echo esc_html( $this->options['yes'] ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input name="tix_attendee_info[<?php echo esc_attr( $i ); ?>][<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="no" <?php checked( 'no', $current_data[ self::SLUG ] ); ?> /> <?php esc_html( _ex( 'No', 'ticket registration option', 'wordcamporg' ) ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input name="tix_attendee_info[<?php echo esc_attr( $i ); ?>][<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="no" <?php checked( 'no', $current_data[ self::SLUG ] ); ?> /> <?php echo esc_html( $this->options['no'] ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,14 +181,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="tix-row-<?php echo esc_attr( self::SLUG ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="tix-required tix-left">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Do you have a life-threatening allergy that would affect your experience at WordCamp?', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $this->question ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="tix-required-star">*</span>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="tix-right">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input name="tix_ticket_info[<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="yes" <?php checked( 'yes', $current_data[ self::SLUG ] ); ?> /> <?php esc_html( _ex( 'Yes (we will contact you)', 'ticket registration option', 'wordcamporg' ) ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input name="tix_ticket_info[<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="yes" <?php checked( 'yes', $current_data[ self::SLUG ] ); ?> /> <?php echo esc_html( $this->options['yes'] ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input name="tix_ticket_info[<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="no" <?php checked( 'no', $current_data[ self::SLUG ] ); ?> /> <?php esc_html( _ex( 'No', 'ticket registration option', 'wordcamporg' ) ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input name="tix_ticket_info[<?php echo esc_attr( self::SLUG ); ?>]" type="radio" value="no" <?php checked( 'no', $current_data[ self::SLUG ] ); ?> /> <?php echo esc_html( $this->options['no'] ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,6 +196,49 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add a row to the Attendee Info metabox table for the new field and value.
+ *
+ * @param array $rows
+ * @param WP_Post $post
+ *
+ * @return mixed
+ */
+ public function add_metabox_row( $rows, $post ) {
+ $value = get_post_meta( $post->ID, 'tix_' . self::SLUG, true ) ?: '';
+ if ( $value && isset( $this->options[ $value ] ) ) {
+ $value = $this->options[ $value ];
+ }
+ $new_row = array( $this->question, esc_html( $value ) );
+
+ add_filter( 'locale', array( $this, 'set_locale_to_en_US' ) );
+
+ $ticket_row = array_filter( $rows, function( $row ) {
+ if ( 'Ticket' === $row[0] ) {
+ return true;
+ }
+
+ return false;
+ } );
+
+ remove_filter( 'locale', array( $this, 'set_locale_to_en_US' ) );
+
+ if ( ! empty( $ticket_row ) ) {
+ $ticket_row_key = key( $ticket_row );
+ $row_indexes = array_keys( $rows );
+ $position = array_search( $ticket_row_key, $row_indexes );
+
+ $slice = array_slice( $rows, $position );
+
+ array_unshift( $slice, $new_row );
+ array_splice( $rows, $position, count( $rows ), $slice );
+ } else {
+ $rows[] = $new_row;
+ }
+
+ return $rows;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Send a notification if it hasn't been sent already.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginscamptixtweaksaddonscodeofconductphp"></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/addons/code-of-conduct.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/addons/code-of-conduct.php 2018-04-09 21:45:35 UTC (rev 7070)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/addons/code-of-conduct.php 2018-04-10 00:50:17 UTC (rev 7071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> use CampTix_Plugin, CampTix_Addon;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WP_Post;
</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"> * Class Code_Of_Conduct_Field.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +26,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_form_attendee_info_errors', array( $this, 'add_registration_field_validation_error' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_form_register_complete_attendee_object', array( $this, 'populate_attendee_object' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_checkout_update_post_meta', array( $this, 'save_registration_field' ), 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Metabox
+ add_filter( 'camptix_metabox_attendee_info_additional_rows', array( $this, 'add_metabox_row' ), 15, 2 );
</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">@@ -131,6 +135,46 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add a row to the Attendee Info metabox table for the new field and value.
+ *
+ * @param array $rows
+ * @param WP_Post $post
+ *
+ * @return mixed
+ */
+ public function add_metabox_row( $rows, $post ) {
+ $value = get_post_meta( $post->ID, 'tix_' . self::SLUG, true ) ? __( 'Yes', 'wordcamporg' ) : '';
+ $new_row = array( __( 'Do you agree to follow the event Code of Conduct?', 'camptix' ), esc_html( $value ) );
+
+ add_filter( 'locale', array( $this, 'set_locale_to_en_US' ) );
+
+ $ticket_row = array_filter( $rows, function( $row ) {
+ if ( 'Ticket' === $row[0] ) {
+ return true;
+ }
+
+ return false;
+ } );
+
+ remove_filter( 'locale', array( $this, 'set_locale_to_en_US' ) );
+
+ if ( ! empty( $ticket_row ) ) {
+ $ticket_row_key = key( $ticket_row );
+ $row_indexes = array_keys( $rows );
+ $position = array_search( $ticket_row_key, $row_indexes );
+
+ $slice = array_slice( $rows, $position );
+
+ array_unshift( $slice, $new_row );
+ array_splice( $rows, $position, count( $rows ), $slice );
+ } else {
+ $rows[] = $new_row;
+ }
+
+ return $rows;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * If the Code of Conduct page is still the same one created with the site, get its URL.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|string
</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 2018-04-09 21:45:35 UTC (rev 7070)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/camptix-tweaks.php 2018-04-10 00:50:17 UTC (rev 7071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', __NAMESPACE__ . '\camptix_debug', 9 ); // CampTix does this at 10.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_default_addons', __NAMESPACE__ . '\load_addons' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_load_addons', __NAMESPACE__ . '\load_custom_addons', 11 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'camptix_metabox_questions_default_fields_list', __NAMESPACE__ . '\modify_default_fields_list' );
</ins><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_options', __NAMESPACE__ . '\modify_email_templates' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,6 +557,17 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Modify the list of default questions on the ticket registration form.
+ *
+ * @param string $default_fields
+ *
+ * @return string
+ */
+function modify_default_fields_list( $default_fields ) {
+ return __( 'Top three fields: First name, last name, e-mail address.<br />Bottom three fields: Life-threatening allergy, accessibility needs, Code of Conduct agreement.', 'wordcamporg' );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Modify CampTix's default capabilities
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function modify_capabilities( $capabilities ) {
</span></span></pre>
</div>
</div>
</body>
</html>