Changeset 4314

Timestamp:

11/01/2016 07:08:47 PM (8 years ago)

Author:

iandunn

Message:

CampTix Tweaks: Add number of expected attendees to t-shirt report

Location:

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins

Files:

• 0-logger.php (modified) (2 diffs)
• camptix-tweaks/camptix-tweaks.php (modified) (2 diffs)
• wp-cli-commands/miscellaneous.php (modified) (1 diff)

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php

@@ -8 +8 @@
  *
  * SECURITY WARNING: You must redact any sensitive info before it's written to the log file. The best way to do
- * that is to add entries to wcorg_log_redact_keys(), so that the caller remain clean. You can also do it before
- * passing the data to this function, though. Right now this only redacts array keys, but it can be made more
- * sophisticated in the future to handle additional cases.
+ * that is to add entries to redact_keys(), so that the caller remain clean. You can also do it before
+ * passing the data to this function, though.
  *
- * In the future, it may be helpful to decode JSON values and search them for redactable values, and to allow
- * the caller to pass an array of strings that are sensitive and should be redacted. The latter would allow for
- * redacting values that aren't known until runtime, and could be helpful in other cases too.
+ * @todo add current username to every entry, and update wp-cli command parsing regex to match
  *
  * @param string $error_code
@@ -43 +40 @@
 /**
  * Redact sensitive values from log entries
+ *
+ * Right now this only redacts array keys, but it can be made more sophisticated in the future to handle
+ * additional cases.
+ *
+ * In the future, it may be helpful to decode JSON values and search them for redactable values, and to allow
+ * the caller to pass an array of strings that are sensitive and should be redacted. The latter would allow for
+ * redacting values that aren't known until runtime, and could be helpful in other cases too.
  *
  * @param array $data

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/camptix-tweaks.php

@@ -22 +22 @@
 add_filter( 'camptix_default_options', __NAMESPACE__ . '\modify_default_options'    );
 add_filter( 'camptix_html_message',    __NAMESPACE__ . '\render_html_emails', 10, 2 );
+add_action( 'camptix_tshirt_report_intro', __NAMESPACE__ . '\tshirt_report_intro_message', 10, 3 );
 
 
@@ -396 +397 @@
     return $html_message;
 }
+
+/**
+ * Extend the introduction message for each camp in the tshirt report
+ *
+ * @param string $message
+ * @param int    $site_id
+ * @param array  $sizes
+ *
+ * @return string
+ */
+function tshirt_report_intro_message( $message, $site_id, $sizes ) {
+    switch_to_blog( $site_id );
+
+    $wordcamp = get_wordcamp_post();
+
+    if ( ! empty( $wordcamp->meta['Number of Anticipated Attendees'][0] ) ) {
+        $message = sprintf(
+            "<p>This camp is expecting %d attendees.</p>",
+            $wordcamp->meta['Number of Anticipated Attendees'][0]
+        );
+    }
+
+    restore_current_blog();
+    return $message;
+}

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wp-cli-commands/miscellaneous.php

@@ -114 +114 @@
      * wp wc-misc format-log "$(grep 'bar' /var/log/php-errors.log)" --foreign=ignore
      *
+     * @todo Sometimes example passing entries as command line param fails because it passes the length limit.
+     *       Add an example of a good workaround for that.
+     *
      * @subcommand format-log
      *