Format Cleanup

public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/cron.php

@@ -6,7 +6,12 @@
 
 use CampTix_Plugin;
 
-use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\{get_email_id, queue_survey_email, get_lead_organizer_email, get_lead_organizer_full_name};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\{
+	get_email_id,
+	queue_survey_email,
+	get_lead_organizer_email,
+	get_lead_organizer_full_name
+};
 
 /**
  * Constants.

public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/email.php

@@ -32,7 +32,7 @@ function get_lead_organizer_email() {
 }
 
 /**
- * Return lead organizer email.
+ * Return lead organizer full name.
  *
  * @return string
  */
@@ -42,7 +42,7 @@ function get_lead_organizer_full_name() {
 }
 
 /**
- * Return wordcamp location.
+ * Return WordCamp location.
  *
  * @return string
  */
@@ -74,18 +74,23 @@ function get_email_content() {
 
 	$email  = "Howdy [email],\r\n\r\n";
 	$email .= sprintf( "Congratulations on completing %s! We hope you had a great time, and that you'll soon get some well-deserved rest\r\n\r\n", esc_html( $wordcamp_name ) );
+
 	$email .= "We'd love to hear how you feel the event went. What were your proudest moments and your greatest disappointments?\r\n";
 	$email .= sprintf( "We've created an Organizer Survey, so we can get all the details of how things went with your event. <strong>Please fill it out this form within 10 days:</strong> %s\r\n\r\n", esc_url( $survey_page_url ) );
+
 	$email .= "<strong>Event Budget</strong>\r\n";
 	$email .= 'Please update your working budget on your event dashboard. If you ran your money outside of WordPress Community Support, PBC, please also balance your budget spreadsheet and prepare your Transparency Report.';
 	$email .= "If there are any issues, please reach out to us at [email protected] to schedule a budget close-out meeting. Please complete these steps within the next two weeks.\r\n\r\n";
+
 	$email .= "<strong>Event Recording (if any)</strong>\r\n";
 	$email .= sprintf( "If you haven't yet done so, please review the submission guidelines before beginning to edit your videos (or before your videographers starts editing): %s\r\n\r\n", esc_url( 'http://blog.wordpress.tv/submission-guidelines/' ) );
 	$email .= sprintf( "To submit your video for publication to WordPress.tv, just upload them at this page: %s\r\n\r\n", esc_url( 'http://wordpress.tv/submit-video/' ) );
 	$email .= 'Our intrepid team of video moderators will review the videos and schedule them for publication. Our intrepid team of video moderators will review the videos and schedule them for publication. ';
 	$email .= sprintf( "If your content is in a language other than English, please see if you can recruit someone from your community to join the WordPress TV moderators' team and review your videos: %s\r\n\r\n", esc_url( 'http://wordpress.tv/apply-to-be-a-wordpress-tv-moderator/' ) );
+
 	$email .= "<strong>Event Recap</strong>\r\n";
 	$email .= "Finally, if you've published a recap on your site, please let us know, so we can reblog it on the WordCamp Central blog.\r\n\r\n";
+
 	$email .= sprintf( "Thanks again for all you've done to grow the WordPress community in %s!\r\n\r\n", get_wordcamp_location() );
 	$email .= "Best wishes,\r\n";
 	$email .= 'Your friendly WordCamp Central crew';

public_html/wp-content/plugins/wordcamp-organizer-survey/wordcamp-organizer-survey.php

@@ -14,7 +14,6 @@
 
 use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\add_email as add_debrief_survey_email;
 use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\delete_email as delete_debrief_survey_email;
-use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\get_encryption_token;
 use function WordCamp\OrganizerSurvey\DebriefSurvey\Cron\delete_temp_attendee as delete_debrief_survey_temp_attendee;
 
 defined( 'WPINC' ) || die();
@@ -51,21 +50,10 @@ function load() {
 	if ( is_wordcamp_type( 'next-gen' ) ) {
 		// Debrief Survey.
 		require_once get_includes_path() . 'debrief-survey/cron.php';
-
-		add_action( 'init', __NAMESPACE__ . '\activate_on_current_site' );
+		add_debrief_survey_email();
 	}
 }
 
-/**
- * The activation routine for a single site.
- *
- * @return void
- */
-function activate_on_current_site() {
-	// Debrief Survey.
-	add_debrief_survey_email();
-}
-
 /**
  * Remove the survey page.
  *
@@ -102,11 +90,9 @@ function deactivate_on_network() {
  * @return void
  */
 function deactivate_on_current_site() {
-	// Debrief Survey.
-	delete_debrief_survey_email();
-
 	if ( is_wordcamp_type( 'next-gen' ) ) {
-		// A temp attendee is only added in cron.
+		// Debrief Survey.
+		delete_debrief_survey_email();
 		delete_debrief_survey_temp_attendee();
 	}
 }