<!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>[8309] sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-admin-flags: CampTix Admin Flags: 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/8309">8309</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/8309","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>2019-02-21 18:15:15 +0000 (Thu, 21 Feb 2019)</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 Admin Flags: Apply coding standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixadminflagsaddonsadminflagsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-admin-flags/addons/admin-flags.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixadminflagscamptixadminflagsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-admin-flags/camptix-admin-flags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixadminflagsaddonsadminflagsphp"></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-admin-flags/addons/admin-flags.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-admin-flags/addons/admin-flags.php 2019-02-21 18:15:09 UTC (rev 8308)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-admin-flags/addons/admin-flags.php 2019-02-21 18:15:15 UTC (rev 8309)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Use case: flag everyone attending a closed party/event.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class CampTix_Admin_Flags_Addon extends CampTix_Addon {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $flags = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Constructor.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_init', array( $this, 'camptix_init' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,21 +31,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'camptix_validate_options', array( $this, 'validate_options' ), 10, 2 );
</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">- $this->flags = array();
</del><span class="cx" style="display: block; padding: 0 10px"> $camptix_options = $camptix->get_options();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No further actions if we don't have any configured flags.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $camptix_options['camptix-admin-flags-data-parsed'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $camptix_options['camptix-admin-flags-data-parsed'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->flags = (array) $camptix_options['camptix-admin-flags-data-parsed'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( $camptix->caps['manage_attendees'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Individual editing from Edit Attendee screen
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Individual editing from Edit Attendee screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( $this, 'save_post' ), 11, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'camptix_attendee_submitdiv_misc', array( $this, 'publish_metabox_actions' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bulk editing from Attendees screen
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bulk editing from Attendees screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'manage_tix_attendee_posts_columns', array( $this, 'add_custom_columns' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'manage_tix_attendee_posts_custom_column', array( $this, 'render_custom_columns' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'views_edit-tix_attendee', array( $this, 'add_custom_filters' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,13 +70,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function shortcode_attendees_atts( $out, $pairs, $atts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_flags = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $atts['has_admin_flag'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $atts['has_admin_flag'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_flags = array_map( 'trim', explode( ',', $atts['has_admin_flag'] ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_flags_clean = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $this->flags as $key => $label )
- if ( in_array( $key, $admin_flags ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->flags as $key => $label ) {
+ if ( in_array( $key, $admin_flags, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_flags_clean[] = $key;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out['has_admin_flag'] = $admin_flags;
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,21 +89,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Modify the attendees list shortcode query based on has_admin_flag.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function shortcode_attendees_query( $query_args, $shortcode_args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $shortcode_args['has_admin_flag'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $shortcode_args['has_admin_flag'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $query_args;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanitized in self::shortcode_attendees_atts.
</span><span class="cx" style="display: block; padding: 0 10px"> $flags = $shortcode_args['has_admin_flag'];
</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 ( empty( $query_args['meta_query'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $query_args['meta_query'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query_args['meta_query'] = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $flags as $flag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args['meta_query'][] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'camptix-admin-flag',
- 'value' => $flag,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'key' => 'camptix-admin-flag',
+ 'value' => $flag,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'compare' => '=',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => 'CHAR',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => 'CHAR',
</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">@@ -108,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function export_columns( $columns ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->flags as $key => $label ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $column_key = sprintf( 'camptix-admin-flags-%s', $key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $column_key = sprintf( 'camptix-admin-flags-%s', $key );
</ins><span class="cx" style="display: block; padding: 0 10px"> $columns[ $column_key ] = $label;
</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">@@ -122,16 +131,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * attendee. Prints "No" if the flag is configured but not set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function export_columns_values( $value, $index, $attendee ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 !== strpos( $index, 'camptix-admin-flags-' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 !== strpos( $index, 'camptix-admin-flags-' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // See self::export_columns() for key format.
</span><span class="cx" style="display: block; padding: 0 10px"> $key = str_replace( 'camptix-admin-flags-', '', $index );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! array_key_exists( $key, $this->flags ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! array_key_exists( $key, $this->flags ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attendee_flags = (array) get_post_meta( $attendee->ID, 'camptix-admin-flag' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $key, $attendee_flags ) ? 'Yes' : 'No';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $key, $attendee_flags, true ) ? 'Yes' : 'No';
</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">@@ -148,8 +159,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setup_controls( $section ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $camptix;
</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 ( 'admin-flags' != $section )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'admin-flags' !== $section ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_section( 'general', __( 'Admin Flags', 'camptix' ), array( $this, 'setup_controls_section' ), 'camptix_options' );
</span><span class="cx" style="display: block; padding: 0 10px"> $camptix->add_settings_field_helper( 'camptix-admin-flags-data', __( 'Admin Flags Data', 'camptix' ), 'field_textarea' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,38 +182,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Runs whenever the CampTix option is updated.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function validate_options( $output, $input ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $input['camptix-admin-flags-data'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $input['camptix-admin-flags-data'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $has_error = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $flags = array();
- $data = explode( "\n", $input['camptix-admin-flags-data'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $flags = array();
+ $data = explode( "\n", $input['camptix-admin-flags-data'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data as $line ) {
</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 ( empty( $line ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $line ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // flag-key: Flag Label
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // flag-key: Flag Label.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! preg_match( '#^([^:]+?):(.+)$#', $line, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $has_error = true;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- $key = sanitize_html_class( sanitize_title_with_dashes( trim( $matches[1] ) ) );
- $label = trim( $matches[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = sanitize_html_class( sanitize_title_with_dashes( trim( $matches[1] ) ) );
+ $label = trim( $matches[2] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $flags[ $key ] = $label;
</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"> $lines = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $flags as $key => $label )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $flags as $key => $label ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $lines[] = sprintf( '%s: %s', $key, $label );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output['camptix-admin-flags-data'] = implode( "\n", $lines );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output['camptix-admin-flags-data'] = implode( "\n", $lines );
</ins><span class="cx" style="display: block; padding: 0 10px"> $output['camptix-admin-flags-data-parsed'] = $flags;
</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 ( $has_error )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $has_error ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_settings_error( 'tix', 'error', __( 'Flags data has been saved, but one or more flags was invalid, so it has been stripped.', 'camptix' ), 'error' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,17 +226,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Runs during the generic save_post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function save_post( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_is_post_revision( $post_id ) || 'tix_attendee' != get_post_type( $post_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_is_post_revision( $post_id ) || 'tix_attendee' !== get_post_type( $post_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_POST['camptix-admin-flags-nonce'] ) || ! wp_verify_nonce( $_POST['camptix-admin-flags-nonce'], 'camptix-admin-flags-update' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_POST['camptix-admin-flags-nonce'] ) || ! wp_verify_nonce( $_POST['camptix-admin-flags-nonce'], 'camptix-admin-flags-update' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, 'camptix-admin-flag' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $this->flags as $key => $label )
- if ( ! empty( $_POST['camptix-admin-flags'][ $key ] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->flags as $key => $label ) {
+ if ( ! empty( $_POST['camptix-admin-flags'][ $key ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'camptix-admin-flag', $key );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ }
</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">@@ -227,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds to the CampTix additional metabox actions.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function publish_metabox_actions() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = get_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post();
</ins><span class="cx" style="display: block; padding: 0 10px"> $attendee_flags = (array) get_post_meta( $post->ID, 'camptix-admin-flag' );
</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">@@ -236,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $this->flags as $key => $label ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="tix-pub-section-item">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input id="camptix-admin-flags-<?php echo sanitize_html_class( $key ); ?>" name="camptix-admin-flags[<?php echo esc_attr( $key ); ?>]" type="checkbox" <?php checked( in_array( $key, $attendee_flags ) ); ?> value="1" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input id="camptix-admin-flags-<?php echo sanitize_html_class( $key ); ?>" name="camptix-admin-flags[<?php echo esc_attr( $key ); ?>]" type="checkbox" <?php checked( in_array( $key, $attendee_flags, true ) ); ?> value="1" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="camptix-admin-flags-<?php echo sanitize_html_class( $key ); ?>"><?php echo esc_html( $label ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Render custom columns on the Attendees screen.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $column
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $attendee_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $attendee_id
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_custom_columns( $column, $attendee_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attendee_flags = (array) get_post_meta( $attendee_id, 'camptix-admin-flag' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,34 +290,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $column ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'admin-flags':
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<ul>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $this->flags as $key => $label ) {
- $enabled = in_array( $key, $attendee_flags );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->flags as $key => $label ) {
+ $enabled = in_array( $key, $attendee_flags, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li>
- <span class="tix-admin-flag-label"><?php echo esc_html( $label ); ?></span>:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a
- href="#"
- data-attendee-id="<?php echo esc_attr( $attendee_id ); ?>"
- data-key="<?php echo esc_attr( $key ); ?>"
- data-nonce="<?php echo esc_attr( wp_create_nonce( sprintf( 'tix_toggle_flag_%s_%s', $attendee_id, $key ) ) ); ?>"
- data-command="<?php echo esc_attr( $enabled ? 'disable' : 'enable' ); ?>"
- class="tix-toggle-flag">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li>
+ <span class="tix-admin-flag-label">
+ <?php echo esc_html( $label ); ?>
+ </span>:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $enabled ) : ?>
- <?php _e( 'Disable', 'camptix' ); ?>
- <?php else : ?>
- <?php _e( 'Enable', 'camptix' ); ?>
- <?php endif; ?>
- </a>
- </li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a
+ href="#"
+ data-attendee-id="<?php echo esc_attr( $attendee_id ); ?>"
+ data-key="<?php echo esc_attr( $key ); ?>"
+ data-nonce="<?php echo esc_attr( wp_create_nonce( sprintf( 'tix_toggle_flag_%s_%s', $attendee_id, $key ) ) ); ?>"
+ data-command="<?php echo esc_attr( $enabled ? 'disable' : 'enable' ); ?>"
+ class="tix-toggle-flag">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $enabled ) : ?>
+ <?php esc_html_e( 'Disable', 'camptix' ); ?>
+ <?php else : ?>
+ <?php esc_html_e( 'Enable', 'camptix' ); ?>
+ <?php endif; ?>
+ </a>
+ </li>
+
+ <?php
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</ul>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,11 +356,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $base_url = add_query_arg( 'post_type', 'tix_attendee', 'edit.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->flags as $flag => $label ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $class_html = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( 'camptix_flag', $flag, $base_url );
</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 ( $currently_viewed_flag && $currently_viewed_flag == $flag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $currently_viewed_flag && $currently_viewed_flag === $flag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class_html = ' class="current"';
</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">@@ -391,7 +414,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Render the templates used by JavaScript
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_client_side_templates() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'tix_attendee' != $GLOBALS['typenow'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'tix_attendee' !== $GLOBALS['typenow'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,7 +435,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> data-command="{{data.command}}"
</span><span class="cx" style="display: block; padding: 0 10px"> class="tix-toggle-flag">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- {{data.command}} <?php // todo use i18n var ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ {{data.command}} <?php // todo use i18n var. ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * AJAX handler to toggle a flag from the Attendees screen.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function toggle_flag() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var $camptix CampTix_Plugin */
</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"> if ( empty( $_REQUEST['action'] ) || empty( $_REQUEST['attendee_id'] ) || empty( $_REQUEST['key'] ) || empty( $_REQUEST['command'] ) || empty( $_REQUEST['nonce'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,13 +463,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attendee = get_post( $attendee_id );
</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 ( ! is_a( $attendee, 'WP_Post' ) || 'tix_attendee' != $attendee->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_a( $attendee, 'WP_Post' ) || 'tix_attendee' !== $attendee->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( array( 'error' => 'Invalid attendee.' ) );
</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 ( 'enable' == $command ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'enable' === $command ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $attendee_id, 'camptix-admin-flag', $key );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'disable' == $command ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'disable' === $command ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $attendee_id, 'camptix-admin-flag', $key );
</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">@@ -457,7 +480,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Print our JavaScript
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function print_javascript() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'tix_attendee' != $GLOBALS['typenow'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'tix_attendee' !== $GLOBALS['typenow'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +548,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Print our CSS
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function print_css() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'tix_attendee' != $GLOBALS['typenow'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'tix_attendee' !== $GLOBALS['typenow'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixadminflagscamptixadminflagsphp"></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-admin-flags/camptix-admin-flags.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-admin-flags/camptix-admin-flags.php 2019-02-21 18:15:09 UTC (rev 8308)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-admin-flags/camptix-admin-flags.php 2019-02-21 18:15:15 UTC (rev 8309)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,13 +1,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Plugin Name: CampTix - Admin Flags
</span><span class="cx" style="display: block; padding: 0 10px"> * Description: An addon for CampTix that allows admins to configure and set private per-attendee flags.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Version: 0.1
- * Author: Konstantin Kovshenin
- * Author URI: http://kovshenin.com
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Version: 0.1
+ * Author: Konstantin Kovshenin
+ * Author URI: http://kovshenin.com
</ins><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">-add_action( 'camptix_load_addons', 'camptix_admin_flags_register' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Register this addon with CampTix.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function camptix_admin_flags_register() {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( plugin_dir_path( __FILE__ ) . 'addons/admin-flags.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+add_action( 'camptix_load_addons', 'camptix_admin_flags_register' );
</ins></span></pre>
</div>
</div>
</body>
</html>