eventespresso / event-espresso-core

caffeinated/EE_Caf_Messages.class.php

Spacing +144 added lines, -144 removed lines

@@ -15,7 +15,7 @@ 
  * @since            4.3.2
  * @author          Darren Ethier
  */
-class EE_Caf_Messages  {
+class EE_Caf_Messages {
 
 
 	/**
@@ -34,36 +34,36 @@ 
 	 * @return void
 	 */
 	private function _caf_hooks() {
-		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( $this, 'messages_autoload_paths'), 5 );
-		add_filter('FHEE__EE_Email_messenger__get_validator_config', array( $this, 'email_messenger_validator_config'), 5, 2 );
-		add_filter('FHEE__EE_Email_messenger__get_template_fields', array( $this, 'email_messenger_template_fields'), 5, 2 );
-		add_filter( 'FHEE__EE_Html_messenger__get_template_fields', array( $this, 'html_messenger_template_fields' ), 5, 2 );
-		add_filter( 'FHEE__EE_Html_messenger__get_validator_config', array( $this, 'html_messenger_validator_config' ), 5, 2 );
-		add_filter( 'FHEE__EE_Pdf_messenger__get_template_fields', array( $this, 'pdf_messenger_template_fields' ), 5, 2 );
-		add_filter( 'FHEE__EE_Pdf_messenger__get_validator_config', array( $this, 'pdf_messenger_validator_config' ), 5, 2 );
-		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array( $this, 'new_default_templates'), 5, 7 );
-		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array( $this, 'message_types_valid_shortcodes'), 5, 2 );
+		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array($this, 'messages_autoload_paths'), 5);
+		add_filter('FHEE__EE_Email_messenger__get_validator_config', array($this, 'email_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Email_messenger__get_template_fields', array($this, 'email_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Html_messenger__get_template_fields', array($this, 'html_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Html_messenger__get_validator_config', array($this, 'html_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Pdf_messenger__get_template_fields', array($this, 'pdf_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Pdf_messenger__get_validator_config', array($this, 'pdf_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array($this, 'new_default_templates'), 5, 7);
+		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array($this, 'message_types_valid_shortcodes'), 5, 2);
 
 		//shortcode parsers
-		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array( $this, 'additional_attendee_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array( $this, 'additional_attendee_parser'), 5, 5 );
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array( $this, 'additional_recipient_details_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array( $this, 'additional_recipient_details_parser'), 5, 5 );
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array( $this, 'additional_primary_registration_details_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array( $this, 'additional_primary_registration_details_parser'), 5, 5 );
+		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array($this, 'additional_attendee_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array($this, 'additional_attendee_parser'), 5, 5);
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array($this, 'additional_recipient_details_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array($this, 'additional_recipient_details_parser'), 5, 5);
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array($this, 'additional_primary_registration_details_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array($this, 'additional_primary_registration_details_parser'), 5, 5);
 
 		/**
 		 * @since 4.2.0
 		 */
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__shortcodes', array( $this, 'additional_datetime_shortcodes'), 10, 2 );
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__parser_after', array( $this, 'additional_datetime_parser'), 10, 5 );
+		add_filter('FHEE__EE_Datetime_Shortcodes__shortcodes', array($this, 'additional_datetime_shortcodes'), 10, 2);
+		add_filter('FHEE__EE_Datetime_Shortcodes__parser_after', array($this, 'additional_datetime_parser'), 10, 5);
 
 		/**
 		 * @since 4.3.0
 		 */
 		//eat our own dog food!
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_message_types' ) );
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_shortcodes' ) );
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_message_types'));
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_shortcodes'));
 		do_action('EE_Brewing_Regular___messages_caf');
 	}
 
@@ -74,14 +74,14 @@ 
 	 * @param  array  $dir_ref original array of paths
 	 * @return array           appended paths
 	 */
-	public function messages_autoload_paths( $dir_ref ) {
-		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
+	public function messages_autoload_paths($dir_ref) {
+		$dir_ref[] = EE_CAF_LIBRARIES.'shortcodes/';
 		return $dir_ref;
 	}
 
 
 
-	public function email_messenger_validator_config( $validator_config, EE_Email_messenger $messenger ) {
+	public function email_messenger_validator_config($validator_config, EE_Email_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
 				'required' => array('[ATTENDEE_LIST]')
@@ -95,7 +95,7 @@ 
 
 
 
-	public function html_messenger_validator_config( $validator_config, EE_Html_messenger $messenger ) {
+	public function html_messenger_validator_config($validator_config, EE_Html_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 			'shortcodes' => array('attendee', 'question_list'),
 			'required' => array('[ATTENDEE_LIST]')
@@ -109,7 +109,7 @@ 
 
 
 
-	public function pdf_messenger_validator_config( $validator_config, EE_Pdf_messenger $messenger ) {
+	public function pdf_messenger_validator_config($validator_config, EE_Pdf_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 			'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
 			'required' => array('[ATTENDEE_LIST]')
@@ -124,7 +124,7 @@ 
 
 
 
-	public function email_messenger_template_fields( $template_fields, EE_Email_messenger $messenger ) {
+	public function email_messenger_template_fields($template_fields, EE_Email_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 						'input' => 'textarea',
 						'label' => '[QUESTION_LIST]',
@@ -140,7 +140,7 @@ 
 	}
 
 
-	public function html_messenger_template_fields( $template_fields, EE_Html_messenger $messenger ) {
+	public function html_messenger_template_fields($template_fields, EE_Html_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 			'input' => 'textarea',
 			'label' => '[QUESTION_LIST]',
@@ -157,7 +157,7 @@ 
 
 
 
-	public function pdf_messenger_template_fields( $template_fields, EE_Pdf_messenger $messenger ) {
+	public function pdf_messenger_template_fields($template_fields, EE_Pdf_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 			'input' => 'textarea',
 			'label' => '[QUESTION_LIST]',
@@ -174,39 +174,39 @@ 
 
 
 
-	public function new_default_templates( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack  ) {
+	public function new_default_templates($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) {
 
 		//we're only modifying templates for the default template pack
-		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default ) {
+		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default) {
 			return $contents;
 		}
 
 		//the template file name we're replacing contents for.
-		$template_file_prefix = $field . '_' . $context;
-		$msg_prefix = $messenger->name . '_' . $message_type->name . '_' ;
+		$template_file_prefix = $field.'_'.$context;
+		$msg_prefix = $messenger->name.'_'.$message_type->name.'_';
 
-		$base_path = EE_CAF_LIBRARIES . 'messages/defaults/default/';
+		$base_path = EE_CAF_LIBRARIES.'messages/defaults/default/';
 
-		if ( $messenger->name == 'email' && $message_type->name == 'registration' ) {
+		if ($messenger->name == 'email' && $message_type->name == 'registration') {
 
-			switch ( $template_file_prefix ) {
+			switch ($template_file_prefix) {
 
 				case 'question_list_admin' :
 				case 'question_list_attendee' :
 				case 'question_list_primary_attendee' :
-					$path = $base_path . $msg_prefix . 'question_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'question_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'attendee_list_primary_attendee' :
-					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'attendee_list_admin' :
-					$path = $base_path . $msg_prefix . 'attendee_list_admin.template.php';
-					$contents = EEH_Template::display_template( $path,
-						array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list_admin.template.php';
+					$contents = EEH_Template::display_template($path,
+						array(), true);
 					break;
 
 				case 'attendee_list_attendee' :
@@ -214,33 +214,33 @@ 
 					break;
 
 				case 'event_list_attendee' :
-					$path = $base_path . $msg_prefix . 'event_list_attendee.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'event_list_attendee.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
-		} elseif ( $messenger->name == 'email' && $message_type->name == 'newsletter' ) {
-			switch( $template_file_prefix ) {
+		} elseif ($messenger->name == 'email' && $message_type->name == 'newsletter') {
+			switch ($template_file_prefix) {
 
 				case 'content_attendee' :
-					$path = $base_path . $msg_prefix . 'content.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'newsletter_content_attendee' :
-					$path = $base_path . $msg_prefix . 'newsletter_content.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'newsletter_content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'newsletter_subject_attendee' :
-					$path = $base_path . $msg_prefix . 'subject.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'subject.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
-		} elseif ( $messenger->name == 'html' && $message_type->name == 'receipt' ) {
-			switch  ( $template_file_prefix ) {
+		} elseif ($messenger->name == 'html' && $message_type->name == 'receipt') {
+			switch ($template_file_prefix) {
 				case 'attendee_list_purchaser' :
-					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
 		}
@@ -251,7 +251,7 @@ 
 
 
 
-	public function message_types_valid_shortcodes( $valid_shortcodes, EE_Messages_Base $msg ) {
+	public function message_types_valid_shortcodes($valid_shortcodes, EE_Messages_Base $msg) {
 		//make sure question_list and question are ONLY added for the core message types.  Any other message types will have to explicitly set question_list as a valid shortcode.
 		$include_with = array(
 			'registration',
@@ -268,9 +268,9 @@ 
 			'invoice',
 			'receipt'
 			);
-		if ( $msg instanceof EE_message_type && in_array( $msg->name, $include_with )) {
+		if ($msg instanceof EE_message_type && in_array($msg->name, $include_with)) {
 			$contexts = array_keys($msg->get_contexts());
-				foreach ( $contexts as $context ) {
+				foreach ($contexts as $context) {
 					$valid_shortcodes[$context][] = 'question_list';
 					$valid_shortcodes[$context][] = 'question';
 				}
@@ -282,40 +282,40 @@ 
 
 
 
-	public function additional_attendee_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_attendee_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[ANSWER_*]'] = __('This is a special dynamic shortcode. Right after the "*", add the exact text of a existing question, and if there is an answer for that question for this registrant, that will take the place of this shortcode.', 'event_espresso');
 		return $shortcodes;
 	}
 
 
 
-	public function additional_attendee_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_attendee_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) )
+		if (strpos($shortcode, '[ANSWER_*') === FALSE || ! isset($extra_data['data']->questions) || ! isset($extra_data['data']->registrations))
 			return $parsed;
 
 		//let's get the question from the code.
 		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
-		$shortcode = trim( str_replace(']', '', $shortcode) );
+		$shortcode = trim(str_replace(']', '', $shortcode));
 
 		$registration = $data instanceof EE_Registration ? $data : null;
-		$registration = ! $registration instanceof EE_Registration && is_array( $extra_data ) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
+		$registration = ! $registration instanceof EE_Registration && is_array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
 
 		$aee = $data instanceof EE_Messages_Addressee ? $data : null;
-		$aee = ! $aee instanceof EE_Messages_Addressee && is_array( $extra_data ) && isset( $extra_data['data'] ) ? $extra_data['data'] : $aee;
+		$aee = ! $aee instanceof EE_Messages_Addressee && is_array($extra_data) && isset($extra_data['data']) ? $extra_data['data'] : $aee;
 
-		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee ) {
+		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
 			return $parsed;
 		}
 
 		//now let's figure out which question has this text.
-		foreach ( $aee->questions as $ansid => $question ) {
+		foreach ($aee->questions as $ansid => $question) {
 			if (
 				$question instanceof EE_Question
-				&& trim( $question->display_text() ) == trim( $shortcode )
-				&& isset( $aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ] )
+				&& trim($question->display_text()) == trim($shortcode)
+				&& isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid])
 			) {
-				return $aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ]->get_pretty('ANS_value', 'no_wpautop');
+				return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 			}
 		}
 
@@ -336,7 +336,7 @@ 
 	 * @return array                   						array of shortcodes and
 	 *                                             			descriptions
 	 */
-	public function additional_datetime_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_datetime_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[DTT_NAME]'] = __('This will be parsed to the Title given for a Datetime', 'event_espresso');
 		$shortcodes['[DTT_DESCRIPTION]'] = __('This will be parsed to the description for a Datetime', 'event_espresso');
 		$shortcodes['[DTT_NAME_OR_DATES]'] = __('When parsed, if the Datetime has a name, it is used, otherwise a formatted string including the start date and end date will be used.', 'event_espresso');
@@ -358,13 +358,13 @@ 
 	 * @param  EE_Datetime_Shortcodes $shortcode_parser
 	 * @return string                   The new parsed string.
 	 */
-	public function additional_datetime_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_datetime_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( ! $data instanceof EE_Datetime ) {
+		if ( ! $data instanceof EE_Datetime) {
 			return ''; //get out because we can only parse with the datetime object.
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[DTT_NAME]' :
 				return $data->name();
 				break;
@@ -372,7 +372,7 @@ 
 				return $data->description();
 				break;
 			case '[DTT_NAME_OR_DATES]' :
-				return $data->get_dtt_display_name( TRUE );
+				return $data->get_dtt_display_name(TRUE);
 				break;
 			default :
 				return $parsed;
@@ -384,40 +384,40 @@ 
 
 
 
-	public function additional_recipient_details_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_recipient_details_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[RECIPIENT_QUESTION_LIST]'] = __('This is used to indicate where you want the list of questions and answers to show for the person receiving the message.', 'event_espresso');
 		return $shortcodes;
 	}
 
 
-	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_recipient_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( array($data) && ! isset( $data['data'] ) )
+		if (array($data) && ! isset($data['data']))
 			return $parsed;
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return $parsed;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_QUESTION_LIST]' :
 				$att = $recipient->att_obj;
 				$registrations_on_attendee = $att instanceof EE_Attendee ? $recipient->attendees[$att->ID()]['reg_objs'] : array();
-				$registrations_on_attendee = empty( $registrations_on_attendee ) && $recipient->reg_obj instanceof EE_Registration ? array( $recipient->reg_obj ) : $registrations_on_attendee;
+				$registrations_on_attendee = empty($registrations_on_attendee) && $recipient->reg_obj instanceof EE_Registration ? array($recipient->reg_obj) : $registrations_on_attendee;
 				$answers = array();
 
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');
 
 				//if the context is main_content then get all answers for all registrations on this attendee
-				if ( $data['data'] instanceof EE_Messages_Addressee ) {
-					foreach ( $registrations_on_attendee as $reg ) {
-						if ( $reg instanceof EE_Registration ) {
-							$anss = !empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
-							foreach( $anss as $ans ) {
-								if ( $ans instanceof EE_Answer ) {
+				if ($data['data'] instanceof EE_Messages_Addressee) {
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration) {
+							$anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
 									$answers[$ans->ID()] = $ans;
 								}
 							}
@@ -426,13 +426,13 @@ 
 				}
 
 				//if the context is the event list parser, then let's return just the answers for all registrations attached to the recipient for that event.
-				if ( $data['data'] instanceof EE_Event ) {
+				if ($data['data'] instanceof EE_Event) {
 					$event = $data['data'];
-					foreach( $registrations_on_attendee as $reg ) {
-						if ( $reg instanceof EE_Registration && $reg->event_ID() == $event->ID() ) {
-							$anss = !empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
-							foreach( $anss as $ans ) {
-								if ( $ans instanceof EE_Answer ) {
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+							$anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
 									$answers[$ans->ID()] = $ans;
 								}
 							}
@@ -442,13 +442,13 @@ 
 
 				$question_list = '';
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
-				foreach ( $answers as $answer ) {
-					if ( $answer instanceof EE_Answer ) {
+				foreach ($answers as $answer) {
+					if ($answer instanceof EE_Answer) {
 						$question = $answer->question();
-						if ( ! $question instanceof EE_Question || ( $question instanceof EE_Question && $question->admin_only() ) ) {
+						if ( ! $question instanceof EE_Question || ($question instanceof EE_Question && $question->admin_only())) {
 							continue;
 						}
-						$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $extra_data);
+						$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $extra_data);
 					}
 				}
 				return $question_list;
@@ -461,41 +461,41 @@ 
 	}
 
 
-	public function additional_primary_registration_details_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_primary_registration_details_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[PRIMARY_REGISTRANT_QUESTION_LIST]'] = __('This is used to indicate the questions and answers for the primary_registrant. It should be placed in the "[attendee_list]" field', 'event_espresso');
 		return $shortcodes;
 	}
 
 
-	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
-		if ( array($data) && ! isset( $data['data'] ) )
+	public function additional_primary_registration_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
+		if (array($data) && ! isset($data['data']))
 			return $parsed;
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return $parsed;
 
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_QUESTION_LIST]' :
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
+				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration)
 					return '';
 				$registration = $recipient->primary_reg_obj;
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
 				$answers = $recipient->registrations[$registration->ID()]['ans_objs'];
 				$question_list = '';
-				foreach ( $answers as $answer ) {
-					if ( $answer instanceof EE_Answer ) {
+				foreach ($answers as $answer) {
+					if ($answer instanceof EE_Answer) {
 						$question = $answer->question();
-						if ( $question instanceof EE_Question and $question->admin_only() ) {
+						if ($question instanceof EE_Question and $question->admin_only()) {
 							continue;
 						}
-						$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $send_data);
+						$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $send_data);
 					}
 				}
 				return $question_list;
@@ -521,67 +521,67 @@ 
 		$setup_args = array(
 			'mtfilename' => 'EE_Newsletter_message_type.class.php',
 			'autoloadpaths' => array(
-				EE_CAF_LIBRARIES . 'messages/message_type/newsletter/'
+				EE_CAF_LIBRARIES.'messages/message_type/newsletter/'
 				),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'newsletter', $setup_args );
+		EE_Register_Message_Type::register('newsletter', $setup_args);
 
 		//register payment reminder message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Reminder_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_reminder/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_reminder/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_reminder', $setup_args );
+		EE_Register_Message_Type::register('payment_reminder', $setup_args);
 
 		//register payment declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Declined_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_declined/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_declined/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_declined', $setup_args );
+		EE_Register_Message_Type::register('payment_declined', $setup_args);
 
 		//register registration declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Declined_Registration_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/declined_registration/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/declined_registration/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'declined_registration', $setup_args );
+		EE_Register_Message_Type::register('declined_registration', $setup_args);
 
 		//register registration cancelled message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Cancelled_Registration_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/cancelled_registration/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/cancelled_registration/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'cancelled_registration', $setup_args );
+		EE_Register_Message_Type::register('cancelled_registration', $setup_args);
 
 
 		//register payment failed message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Failed_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_failed/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_failed/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_failed', $setup_args );
+		EE_Register_Message_Type::register('payment_failed', $setup_args);
 
 		//register payment declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Cancelled_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_cancelled/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_cancelled/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_cancelled', $setup_args );
+		EE_Register_Message_Type::register('payment_cancelled', $setup_args);
 	}
 
 
@@ -597,12 +597,12 @@ 
 	public function register_caf_shortcodes() {
 		$setup_args = array(
 			'autoloadpaths' => array(
-				EE_CAF_LIBRARIES . 'shortcodes/'
+				EE_CAF_LIBRARIES.'shortcodes/'
 				),
-			'msgr_validator_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_validator_config' ),
-			'msgr_template_fields_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_template_fields' ),
-			'list_type_shortcodes' => array( '[NEWSLETTER_CONTENT]' )
+			'msgr_validator_callback' => array('EE_Newsletter_Shortcodes', 'messenger_validator_config'),
+			'msgr_template_fields_callback' => array('EE_Newsletter_Shortcodes', 'messenger_template_fields'),
+			'list_type_shortcodes' => array('[NEWSLETTER_CONTENT]')
 			);
-		EE_Register_Messages_Shortcode_Library::register( 'newsletter', $setup_args );
+		EE_Register_Messages_Shortcode_Library::register('newsletter', $setup_args);
 	}
 }

core/libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -45,32 +45,32 @@ 
 			'[PRIMARY_REGISTRANT_ADDRESS2]' => __('Whatever was in the address 2 field for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_CITY]' => __('The city for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_ZIP_PC]' => __('The ZIP (or Postal) Code for the primary registrant for the transaction.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso' ),
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_COUNTRY]' => __('The country for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]' => __('The date the registration occured for the primary registration.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.', 'event_espresso' )
+			'[PRIMARY_REGISTRANT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
+		if ( ! $primary_registration instanceof EE_Messages_Addressee)
 			return '';
 
 		$attendee = $primary_registration->primary_att_obj;
 		$primary_reg = $primary_registration->primary_reg_obj;
 
-		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration )
+		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -118,9 +118,9 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
-				return $primary_registration->primary_reg_obj->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) );
+				return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
 				break;
 
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
@@ -128,22 +128,22 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[PRIMARY_REGISTRANT_ANSWER_*' ) !== false ) {
-			$shortcode = str_replace( '[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 
 			//now let's figure out what question has this text
-			if ( empty( $primary_registration->questions ) ) {
+			if (empty($primary_registration->questions)) {
 				return '';
 			}
 
-			foreach ( $primary_registration->questions as $ansid => $question ) {
+			foreach ($primary_registration->questions as $ansid => $question) {
 				if (
-					trim( $question->get( 'QST_display_text' ) ) == trim( $shortcode )
-					&& isset( $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ] )
+					trim($question->get('QST_display_text')) == trim($shortcode)
+					&& isset($primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid])
 				) {
-					return $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ]->get_pretty( 'ANS_value', 'no_wpautop' );
+					return $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 				}
 			}
 		}

admin_pages/support/Support_Admin_Page.core.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,8 +30,8 @@ 
 class Support_Admin_Page extends EE_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -84,7 +84,7 @@ 
 				'nav' => array(
 					'label' => __('Support', 'event_espresso'),
 					'order' => 30),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_support_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
 				'require_nonce' => FALSE
 				),
 			'developers' => array(
@@ -98,7 +98,7 @@ 
 				'nav' => array(
 					'label' => __('Shortcodes', 'event_espresso'),
 					'order' => 60),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_shortcodes_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
 				'require_nonce' => FALSE
 				),
 			);
@@ -119,8 +119,8 @@ 
 
 
 	protected function _installation() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, '', TRUE);
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_installation.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, '', TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -145,10 +145,10 @@ 
 			'other_resources' => __('Other Resources', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -169,15 +169,15 @@ 
 			'shortcodes_event_listings' => __('Event Listings', 'event_espresso'),
 			'shortcodes_ticket_selector' => __('Event Ticket Selector', 'event_espresso'),
 			'shortcodes_category' => __('Event Categories', 'event_espresso'),
-			'shortcodes_attendee' => __( 'Event Attendees', 'event_espresso' )
+			'shortcodes_attendee' => __('Event Attendees', 'event_espresso')
 			/*'shortcodes_single_events' => __('Single Events', 'event_espresso'),*/
 			/*'shortcodes_attendee_listings' => __('Attendee Listings', 'event_espresso'),*/
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -196,17 +196,17 @@ 
 			'important_information' => __('Important Information', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path, 'template_args' => $this->_template_args);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 		}
 	}
 
 
 	protected function _developers() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true );
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'developers_admin_details.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true);
 		$this->display_admin_page_with_sidebar();
 	}
 } //end Support_Admin_Page class

caffeinated/admin/extend/support/templates/support_admin_details_additional_information.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <div class="padding">
-	<p><?php printf( esc_html__( 'Check out the %1$sroadmap for Event Espresso%2$s.', 'event_espresso' ), '<a href="https://trello.com/b/zg9DCIpe/event-espresso-public-roadmap" target="_blank">','</a>' ); ?></p>
+	<p><?php printf(esc_html__('Check out the %1$sroadmap for Event Espresso%2$s.', 'event_espresso'), '<a href="https://trello.com/b/zg9DCIpe/event-espresso-public-roadmap" target="_blank">', '</a>'); ?></p>
 </div>
\ No newline at end of file

caffeinated/admin/extend/support/templates/support_admin_details_faq.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <div class="padding">
-	<h3><?php esc_html_e( 'Frequently Asked Questions about Event Espresso', 'event_espresso' ); ?></h3>
+	<h3><?php esc_html_e('Frequently Asked Questions about Event Espresso', 'event_espresso'); ?></h3>
 	
-	<h4><?php esc_html_e( 'New to Event Espresso?', 'event_espresso' ); ?></h4>
+	<h4><?php esc_html_e('New to Event Espresso?', 'event_espresso'); ?></h4>
 
-	<p><?php printf( esc_html__( 'Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.', 'event_espresso' ), '<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">','</a>','<em>','</em>' ); ?></p>
+	<p><?php printf(esc_html__('Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.', 'event_espresso'), '<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">', '</a>', '<em>', '</em>'); ?></p>
 </div>
\ No newline at end of file

admin_pages/support/templates/support_admin_details_contact_support.template.php

Spacing +13 added lines, -13 removed lines

@@ -1,29 +1,29 @@
 <div class="padding">
 	<h3><?php esc_html_e('Need help with Event Espresso?', 'event_espresso'); ?></h3>
 	
-	<h4><?php esc_html_e( 'You may be able to find an answer for your question or concern here:', 'event_espresso' ); ?></h4>
+	<h4><?php esc_html_e('You may be able to find an answer for your question or concern here:', 'event_espresso'); ?></h4>
 				<ol>
-					<li><strong><em><?php esc_html_e( 'A known issue.', 'event_espresso' ); ?></em></strong>  <?php printf( esc_html__( 'Some themes and plugins have %1$sknown conflicts%2$s with Event Espresso. (You can also browse the %3$sEvent Espresso support pages%2$s or %4$sEvent Espresso support forums%2$s to see if other members have experienced and solved the problem.)', 'event_espresso' ), '<a href="https://eventespresso.com/wiki/known-third-party-plugin-theme-conflicts/" target="_blank">','</a>', '<a href="https://eventespresso.com/support/documentation/versioned-docs/?doc_ver=ee4" target="_blank">', '<a href="https://eventespresso.com/support/forums/" target="_blank">' ); ?></li>
-					<li><strong><em><?php esc_html_e( 'A plugin conflict.', 'event_espresso' ); ?></em></strong>  <?php esc_html_e( 'You can check to see if there is a plugin conflict by temporarily deactivating all plugins except for Event Espresso. If the problem goes away, then reactivate your plugins one by one until the issue returns. This will help you pinpoint the source of the conflict.', 'event_espresso' ); ?></li>
+					<li><strong><em><?php esc_html_e('A known issue.', 'event_espresso'); ?></em></strong>  <?php printf(esc_html__('Some themes and plugins have %1$sknown conflicts%2$s with Event Espresso. (You can also browse the %3$sEvent Espresso support pages%2$s or %4$sEvent Espresso support forums%2$s to see if other members have experienced and solved the problem.)', 'event_espresso'), '<a href="https://eventespresso.com/wiki/known-third-party-plugin-theme-conflicts/" target="_blank">', '</a>', '<a href="https://eventespresso.com/support/documentation/versioned-docs/?doc_ver=ee4" target="_blank">', '<a href="https://eventespresso.com/support/forums/" target="_blank">'); ?></li>
+					<li><strong><em><?php esc_html_e('A plugin conflict.', 'event_espresso'); ?></em></strong>  <?php esc_html_e('You can check to see if there is a plugin conflict by temporarily deactivating all plugins except for Event Espresso. If the problem goes away, then reactivate your plugins one by one until the issue returns. This will help you pinpoint the source of the conflict.', 'event_espresso'); ?></li>
 					<li>
-						<strong><em><?php esc_html_e( 'A theme conflict.', 'event_espresso' ); ?></em></strong>
+						<strong><em><?php esc_html_e('A theme conflict.', 'event_espresso'); ?></em></strong>
 						<?php
-							$default_theme = wp_get_theme( WP_DEFAULT_THEME );
+							$default_theme = wp_get_theme(WP_DEFAULT_THEME);
 
-							if ( $default_theme->exists() ) {
-								 printf( esc_html__( 'If your problem is not a known issue or caused by a plugin, then try activating %s (the default WordPress theme).', 'event_espresso' ), $default_theme->get( 'Name' ) );
+							if ($default_theme->exists()) {
+								 printf(esc_html__('If your problem is not a known issue or caused by a plugin, then try activating %s (the default WordPress theme).', 'event_espresso'), $default_theme->get('Name'));
 							} else {
-								esc_html_e( 'If your problem is not a known issue or caused by a plugin, then try activating the default WordPress theme.', 'event_espresso' );
+								esc_html_e('If your problem is not a known issue or caused by a plugin, then try activating the default WordPress theme.', 'event_espresso');
 							}
 						?>
-						<?php esc_html_e( 'If this solves the problem for you, then something in your theme is causing this issue. Check to see if an update is available for your WordPress theme or reach out to the theme author.', 'event_espresso' ); ?>
+						<?php esc_html_e('If this solves the problem for you, then something in your theme is causing this issue. Check to see if an update is available for your WordPress theme or reach out to the theme author.', 'event_espresso'); ?>
 					</li>
 				</ol>
 				
-	<p><?php esc_html_e( 'If none of the suggestions above help you find a solution, then feel free to reach out to the support team at Event Espresso.', 'event_espresso' ); ?></p>
-	<p><?php printf( esc_html__( 'Login to your account on EventEspresso.com and %1$screate a support post in our member support forums%2$s. Use a %3$sclear and descriptive title%4$s in your support post, %3$sdescribe the issue to the best of your knowledge%4$s, and %3$snever post any sensitive information such as login details%4$s. Be sure to also include %5$simportant information in the section below%2$s about your WordPress site.', 'event_espresso' ), '<a href="https://eventespresso.com/support/forums/" target="_blank">','</a>','<strong>','</strong>','<a href="#espresso_important_information_settings">' ); ?></p>
+	<p><?php esc_html_e('If none of the suggestions above help you find a solution, then feel free to reach out to the support team at Event Espresso.', 'event_espresso'); ?></p>
+	<p><?php printf(esc_html__('Login to your account on EventEspresso.com and %1$screate a support post in our member support forums%2$s. Use a %3$sclear and descriptive title%4$s in your support post, %3$sdescribe the issue to the best of your knowledge%4$s, and %3$snever post any sensitive information such as login details%4$s. Be sure to also include %5$simportant information in the section below%2$s about your WordPress site.', 'event_espresso'), '<a href="https://eventespresso.com/support/forums/" target="_blank">', '</a>', '<strong>', '</strong>', '<a href="#espresso_important_information_settings">'); ?></p>
 
-	<h4><?php esc_html_e( 'Have an emergency?', 'event_espresso' ); ?></h4>
+	<h4><?php esc_html_e('Have an emergency?', 'event_espresso'); ?></h4>
 
-	<p><?php printf( esc_html__( 'We offer support tokens to members that need help with a time-sensitive issue. A support token will provide you with up to 30 minutes of one-on-one time with a team member at Event Espresso. If you have an emergency and need help quickly, then please %1$spurchase a support token%2$s.', 'event_espresso' ), '<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">','</a>' ); ?></p>
+	<p><?php printf(esc_html__('We offer support tokens to members that need help with a time-sensitive issue. A support token will provide you with up to 30 minutes of one-on-one time with a team member at Event Espresso. If you have an emergency and need help quickly, then please %1$spurchase a support token%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">', '</a>'); ?></p>
 </div>
\ No newline at end of file

admin_pages/support/templates/developers_admin_details.template.php

Spacing +16 added lines, -16 removed lines

@@ -1,26 +1,26 @@
 <div class="padding">
-	<?php esc_html_e( 'If you want to integrate with Event Espresso or participate in building code, then you are in the right place. The following resources can help you get started.', 'event_espresso' ); ?>
-	<h2><?php esc_html_e( 'Developer Resources', 'event_espresso' ); ?></h2>
+	<?php esc_html_e('If you want to integrate with Event Espresso or participate in building code, then you are in the right place. The following resources can help you get started.', 'event_espresso'); ?>
+	<h2><?php esc_html_e('Developer Resources', 'event_espresso'); ?></h2>
 	<ul>
-		<li><?php printf( esc_html__( '%1$sEvent Espresso 4 Developer Documentation%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/tree/master/docs#getting-started-with-the-ee-developer-docs" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sEvent Espresso 4 Developer News%2$s', 'event_espresso' ), '<a href="http://developer.eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sApply%2$s to be listed as an %3$sEvent Espresso Professional%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/developers/event-espresso-pros-application/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>','<a href="https://eventespresso.com/developers/event-espresso-pros/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">' ); ?></li>
+		<li><?php printf(esc_html__('%1$sEvent Espresso 4 Developer Documentation%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/tree/master/docs#getting-started-with-the-ee-developer-docs" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sEvent Espresso 4 Developer News%2$s', 'event_espresso'), '<a href="http://developer.eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sApply%2$s to be listed as an %3$sEvent Espresso Professional%2$s', 'event_espresso'), '<a href="https://eventespresso.com/developers/event-espresso-pros-application/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>', '<a href="https://eventespresso.com/developers/event-espresso-pros/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">'); ?></li>
 	</ul>
 
-	<h2><?php esc_html_e( 'Event Espresso 4 Articles for Developers', 'event_espresso' ); ?></h2>
+	<h2><?php esc_html_e('Event Espresso 4 Articles for Developers', 'event_espresso'); ?></h2>
 	<ul>
-		<li><?php printf( esc_html__( '%1$sCustom Post Types Usage%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/2014/02/epsresso-brewery-custom-post-types-event-espresso/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sTheme Development%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/2014/02/developers-corner-theming-event-espresso-4/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sCapability System%2$s', 'event_espresso' ), '<a href="http://developer.eventespresso.com/docs/ee-capability-system-overview/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sPayment Method Development%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/L--Payment-Methods-and-Gateways/creating-a-payment-method.md" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sMessages System in Event Espresso 4%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/2014/03/messages-systemyour-tool-getting-word/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sDatabase Model System%2$s (used for interfacing with EE4 data via WordPress plugins and server side querying)', 'event_espresso' ), '<a href="http://developer.eventespresso.com/docs/using-ee4-model-objects/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
+		<li><?php printf(esc_html__('%1$sCustom Post Types Usage%2$s', 'event_espresso'), '<a href="https://eventespresso.com/2014/02/epsresso-brewery-custom-post-types-event-espresso/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sTheme Development%2$s', 'event_espresso'), '<a href="https://eventespresso.com/2014/02/developers-corner-theming-event-espresso-4/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sCapability System%2$s', 'event_espresso'), '<a href="http://developer.eventespresso.com/docs/ee-capability-system-overview/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sPayment Method Development%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/L--Payment-Methods-and-Gateways/creating-a-payment-method.md" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sMessages System in Event Espresso 4%2$s', 'event_espresso'), '<a href="https://eventespresso.com/2014/03/messages-systemyour-tool-getting-word/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sDatabase Model System%2$s (used for interfacing with EE4 data via WordPress plugins and server side querying)', 'event_espresso'), '<a href="http://developer.eventespresso.com/docs/using-ee4-model-objects/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
 	</ul>
 	
-	<h2><?php esc_html_e( 'REST API Resources', 'event_espresso' ); ?></h2>
+	<h2><?php esc_html_e('REST API Resources', 'event_espresso'); ?></h2>
 	<ul>
-		<li><?php printf( esc_html__( '%1$sREST API: Introduction%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-introduction.md" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sREST API: Reading Data%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-reading-data.md" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sBuilding an EE4 Add-on Using the REST API%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/T--Tutorials/building-an-ee4-addon-that-uses-angular-js-and-the-ee4-json-rest-api.md" target="_blank">','</a>' ); ?></li>
+		<li><?php printf(esc_html__('%1$sREST API: Introduction%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-introduction.md" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sREST API: Reading Data%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-reading-data.md" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sBuilding an EE4 Add-on Using the REST API%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/T--Tutorials/building-an-ee4-addon-that-uses-angular-js-and-the-ee4-json-rest-api.md" target="_blank">', '</a>'); ?></li>
 	</ul>
 </div>
\ No newline at end of file

core/libraries/plugin_api/EE_Register_Addon.lib.php

Indentation +5 added lines, -5 removed lines

@@ -381,7 +381,7 @@ 
 		// if plugin_action_slug is NOT set, but an admin page path IS set,
 		// then let's just use the plugin_slug since that will be used for linking to the admin page
 		$addon_settings['plugin_action_slug'] = empty( $addon_settings['plugin_action_slug'] )
-		                                        && ! empty( $addon_settings['admin_path'] )
+												&& ! empty( $addon_settings['admin_path'] )
 			? $addon_settings['plugin_slug']
 			: $addon_settings['plugin_action_slug'];
 		// full server path to main file (file loaded directly by WP)
@@ -766,15 +766,15 @@ 
 				EE_Register_Widget::deregister( $addon_name );
 			}
 			if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] )
-			     ||
-			     ! empty( self::$_settings[ $addon_name ]['class_paths'] )
+				 ||
+				 ! empty( self::$_settings[ $addon_name ]['class_paths'] )
 			) {
 				// add to list of shortcodes to be registered
 				EE_Register_Model::deregister( $addon_name );
 			}
 			if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] )
-			     ||
-			     ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )
+				 ||
+				 ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )
 			) {
 				// add to list of shortcodes to be registered
 				EE_Register_Model_Extensions::deregister( $addon_name );

Spacing +182 added lines, -182 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -60,23 +60,23 @@ 
 	 * @param string $min_core_version
 	 * @return string always like '4.3.0.rc.000'
 	 */
-	protected static function _effective_version( $min_core_version ) {
+	protected static function _effective_version($min_core_version) {
 		// versions: 4 . 3 . 1 . p . 123
 		// offsets:    0 . 1 . 2 . 3 . 4
-		$version_parts = explode( '.', $min_core_version );
+		$version_parts = explode('.', $min_core_version);
 		//check they specified the micro version (after 2nd period)
-		if ( ! isset( $version_parts[2] ) ) {
+		if ( ! isset($version_parts[2])) {
 			$version_parts[2] = '0';
 		}
 		//if they didn't specify the 'p', or 'rc' part. Just assume the lowest possible
 		//soon we can assume that's 'rc', but this current version is 'alpha'
-		if ( ! isset( $version_parts[3] ) ) {
+		if ( ! isset($version_parts[3])) {
 			$version_parts[3] = 'dev';
 		}
-		if ( ! isset( $version_parts[4] ) ) {
+		if ( ! isset($version_parts[4])) {
 			$version_parts[4] = '000';
 		}
-		return implode( '.', $version_parts );
+		return implode('.', $version_parts);
 	}
 
 
@@ -93,8 +93,8 @@ 
 		$actual_core_version = EVENT_ESPRESSO_VERSION
 	) {
 		return version_compare(
-			self::_effective_version( $actual_core_version ),
-			self::_effective_version( $min_core_version ),
+			self::_effective_version($actual_core_version),
+			self::_effective_version($min_core_version),
 			'>='
 		);
 	}
@@ -216,9 +216,9 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $addon_name = '', $setup_args = array() ) {
+	public static function register($addon_name = '', $setup_args = array()) {
 		// required fields MUST be present, so let's make sure they are.
-		if ( empty( $addon_name ) || ! is_array( $setup_args ) ) {
+		if (empty($addon_name) || ! is_array($setup_args)) {
 			throw new EE_Error(
 				__(
 					'In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.',
@@ -226,19 +226,19 @@ 
 				)
 			);
 		}
-		if ( ! isset( $setup_args['main_file_path'] ) || empty( $setup_args['main_file_path'] ) ) {
+		if ( ! isset($setup_args['main_file_path']) || empty($setup_args['main_file_path'])) {
 			throw new EE_Error(
 				sprintf(
 					__(
 						'When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s',
 						'event_espresso'
 					),
-					implode( ",", array_keys( $setup_args ) )
+					implode(",", array_keys($setup_args))
 				)
 			);
 		}
 		// check that addon has not already been registered with that name
-		if ( isset( self::$_settings[ $addon_name ] ) && ! did_action( 'activate_plugin' ) ) {
+		if (isset(self::$_settings[$addon_name]) && ! did_action('activate_plugin')) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -250,124 +250,124 @@ 
 			);
 		}
 		// no class name for addon?
-		if ( empty( $setup_args['class_name'] ) ) {
+		if (empty($setup_args['class_name'])) {
 			// generate one by first separating name with spaces
-			$class_name = str_replace( array( '-', '_' ), ' ', trim( $addon_name ) );
+			$class_name = str_replace(array('-', '_'), ' ', trim($addon_name));
 			//capitalize, then replace spaces with underscores
-			$class_name = str_replace( ' ', '_', ucwords( $class_name ) );
+			$class_name = str_replace(' ', '_', ucwords($class_name));
 		} else {
 			$class_name = $setup_args['class_name'];
 		}
-		$class_name = strpos( $class_name, 'EE_' ) === 0 ? $class_name : 'EE_' . $class_name;
+		$class_name = strpos($class_name, 'EE_') === 0 ? $class_name : 'EE_'.$class_name;
 		//setup $_settings array from incoming values.
 		$addon_settings = array(
 			// generated from the addon name, changes something like "calendar" to "EE_Calendar"
 			'class_name'            => $class_name,
 			// the addon slug for use in URLs, etc
-			'plugin_slug'           => isset( $setup_args['plugin_slug'] )
+			'plugin_slug'           => isset($setup_args['plugin_slug'])
 				? (string) $setup_args['plugin_slug']
 				: '',
 			// page slug to be used when generating the "Settings" link on the WP plugin page
-			'plugin_action_slug'    => isset( $setup_args['plugin_action_slug'] )
+			'plugin_action_slug'    => isset($setup_args['plugin_action_slug'])
 				? (string) $setup_args['plugin_action_slug']
 				: '',
 			// the "software" version for the addon
-			'version'               => isset( $setup_args['version'] )
+			'version'               => isset($setup_args['version'])
 				? (string) $setup_args['version']
 				: '',
 			// the minimum version of EE Core that the addon will work with
-			'min_core_version'      => isset( $setup_args['min_core_version'] )
+			'min_core_version'      => isset($setup_args['min_core_version'])
 				? (string) $setup_args['min_core_version']
 				: '',
 			// the minimum version of WordPress that the addon will work with
-			'min_wp_version'        => isset( $setup_args['min_wp_version'] )
+			'min_wp_version'        => isset($setup_args['min_wp_version'])
 				? (string) $setup_args['min_wp_version']
 				: EE_MIN_WP_VER_REQUIRED,
 			// full server path to main file (file loaded directly by WP)
-			'main_file_path'        => isset( $setup_args['main_file_path'] )
+			'main_file_path'        => isset($setup_args['main_file_path'])
 				? (string) $setup_args['main_file_path']
 				: '',
 			// path to folder containing files for integrating with the EE core admin and/or setting up EE admin pages
-			'admin_path'            => isset( $setup_args['admin_path'] )
+			'admin_path'            => isset($setup_args['admin_path'])
 				? (string) $setup_args['admin_path'] : '',
 			// a method to be called when the EE Admin is first invoked, can be used for hooking into any admin page
-			'admin_callback'        => isset( $setup_args['admin_callback'] )
+			'admin_callback'        => isset($setup_args['admin_callback'])
 				? (string) $setup_args['admin_callback']
 				: '',
 			// the section name for this addon's configuration settings section (defaults to "addons")
-			'config_section'        => isset( $setup_args['config_section'] )
+			'config_section'        => isset($setup_args['config_section'])
 				? (string) $setup_args['config_section']
 				: 'addons',
 			// the class name for this addon's configuration settings object
-			'config_class'          => isset( $setup_args['config_class'] )
+			'config_class'          => isset($setup_args['config_class'])
 				? (string) $setup_args['config_class'] : '',
 			//the name given to the config for this addons' configuration settings object (optional)
-			'config_name'           => isset( $setup_args['config_name'] )
+			'config_name'           => isset($setup_args['config_name'])
 				? (string) $setup_args['config_name'] : '',
 			// an array of "class names" => "full server paths" for any classes that might be invoked by the addon
-			'autoloader_paths'      => isset( $setup_args['autoloader_paths'] )
+			'autoloader_paths'      => isset($setup_args['autoloader_paths'])
 				? (array) $setup_args['autoloader_paths']
 				: array(),
 			// an array of  "full server paths" for any folders containing classes that might be invoked by the addon
-			'autoloader_folders'    => isset( $setup_args['autoloader_folders'] )
+			'autoloader_folders'    => isset($setup_args['autoloader_folders'])
 				? (array) $setup_args['autoloader_folders']
 				: array(),
 			// array of full server paths to any EE_DMS data migration scripts used by the addon
-			'dms_paths'             => isset( $setup_args['dms_paths'] )
+			'dms_paths'             => isset($setup_args['dms_paths'])
 				? (array) $setup_args['dms_paths']
 				: array(),
 			// array of full server paths to any EED_Modules used by the addon
-			'module_paths'          => isset( $setup_args['module_paths'] )
+			'module_paths'          => isset($setup_args['module_paths'])
 				? (array) $setup_args['module_paths']
 				: array(),
 			// array of full server paths to any EES_Shortcodes used by the addon
-			'shortcode_paths'       => isset( $setup_args['shortcode_paths'] )
+			'shortcode_paths'       => isset($setup_args['shortcode_paths'])
 				? (array) $setup_args['shortcode_paths']
 				: array(),
 			// array of full server paths to any WP_Widgets used by the addon
-			'widget_paths'          => isset( $setup_args['widget_paths'] )
+			'widget_paths'          => isset($setup_args['widget_paths'])
 				? (array) $setup_args['widget_paths']
 				: array(),
 			// array of PUE options used by the addon
-			'pue_options'           => isset( $setup_args['pue_options'] )
+			'pue_options'           => isset($setup_args['pue_options'])
 				? (array) $setup_args['pue_options']
 				: array(),
-			'message_types'         => isset( $setup_args['message_types'] )
+			'message_types'         => isset($setup_args['message_types'])
 				? (array) $setup_args['message_types']
 				: array(),
-			'capabilities'          => isset( $setup_args['capabilities'] )
+			'capabilities'          => isset($setup_args['capabilities'])
 				? (array) $setup_args['capabilities']
 				: array(),
-			'capability_maps'       => isset( $setup_args['capability_maps'] )
+			'capability_maps'       => isset($setup_args['capability_maps'])
 				? (array) $setup_args['capability_maps']
 				: array(),
-			'model_paths'           => isset( $setup_args['model_paths'] )
+			'model_paths'           => isset($setup_args['model_paths'])
 				? (array) $setup_args['model_paths']
 				: array(),
-			'class_paths'           => isset( $setup_args['class_paths'] )
+			'class_paths'           => isset($setup_args['class_paths'])
 				? (array) $setup_args['class_paths']
 				: array(),
-			'model_extension_paths' => isset( $setup_args['model_extension_paths'] )
+			'model_extension_paths' => isset($setup_args['model_extension_paths'])
 				? (array) $setup_args['model_extension_paths']
 				: array(),
-			'class_extension_paths' => isset( $setup_args['class_extension_paths'] )
+			'class_extension_paths' => isset($setup_args['class_extension_paths'])
 				? (array) $setup_args['class_extension_paths']
 				: array(),
-			'custom_post_types'     => isset( $setup_args['custom_post_types'] )
+			'custom_post_types'     => isset($setup_args['custom_post_types'])
 				? (array) $setup_args['custom_post_types']
 				: array(),
-			'custom_taxonomies'     => isset( $setup_args['custom_taxonomies'] )
+			'custom_taxonomies'     => isset($setup_args['custom_taxonomies'])
 				? (array) $setup_args['custom_taxonomies']
 				: array(),
-			'payment_method_paths'  => isset( $setup_args['payment_method_paths'] )
+			'payment_method_paths'  => isset($setup_args['payment_method_paths'])
 				? (array) $setup_args['payment_method_paths']
 				: array(),
-			'default_terms'         => isset( $setup_args['default_terms'] )
+			'default_terms'         => isset($setup_args['default_terms'])
 				? (array) $setup_args['default_terms']
 				: array(),
 			// if not empty, inserts a new table row after this plugin's row on the WP Plugins page
 			// that can be used for adding upgrading/marketing info
-			'plugins_page_row'      => isset( $setup_args['plugins_page_row'] )
+			'plugins_page_row'      => isset($setup_args['plugins_page_row'])
 				? $setup_args['plugins_page_row']
 				: '',
 			'namespace'             => isset(
@@ -380,19 +380,19 @@ 
 		);
 		// if plugin_action_slug is NOT set, but an admin page path IS set,
 		// then let's just use the plugin_slug since that will be used for linking to the admin page
-		$addon_settings['plugin_action_slug'] = empty( $addon_settings['plugin_action_slug'] )
-		                                        && ! empty( $addon_settings['admin_path'] )
+		$addon_settings['plugin_action_slug'] = empty($addon_settings['plugin_action_slug'])
+		                                        && ! empty($addon_settings['admin_path'])
 			? $addon_settings['plugin_slug']
 			: $addon_settings['plugin_action_slug'];
 		// full server path to main file (file loaded directly by WP)
-		$addon_settings['plugin_basename'] = plugin_basename( $addon_settings['main_file_path'] );
+		$addon_settings['plugin_basename'] = plugin_basename($addon_settings['main_file_path']);
 		global $wp_version;
 		$incompatibility_message = '';
 		//check whether this addon version is compatible with EE core
 		if (
-			isset( EE_Register_Addon::$_incompatible_addons[ $addon_name ] )
+			isset(EE_Register_Addon::$_incompatible_addons[$addon_name])
 			&& ! self::_meets_min_core_version_requirement(
-				EE_Register_Addon::$_incompatible_addons[ $addon_name ],
+				EE_Register_Addon::$_incompatible_addons[$addon_name],
 				$addon_settings['version']
 			)
 		) {
@@ -403,10 +403,10 @@ 
 				),
 				$addon_name,
 				'<br />',
-				EE_Register_Addon::$_incompatible_addons[ $addon_name ]
+				EE_Register_Addon::$_incompatible_addons[$addon_name]
 			);
 		} else if (
-		! self::_meets_min_core_version_requirement( $addon_settings['min_core_version'], espresso_version() )
+		! self::_meets_min_core_version_requirement($addon_settings['min_core_version'], espresso_version())
 		) {
 			$incompatibility_message = sprintf(
 				__(
@@ -414,11 +414,11 @@ 
 					'event_espresso'
 				),
 				$addon_name,
-				self::_effective_version( $addon_settings['min_core_version'] ),
-				self::_effective_version( espresso_version() ),
+				self::_effective_version($addon_settings['min_core_version']),
+				self::_effective_version(espresso_version()),
 				'<br />'
 			);
-		} else if ( version_compare( $wp_version, $addon_settings['min_wp_version'], '<' ) ) {
+		} else if (version_compare($wp_version, $addon_settings['min_wp_version'], '<')) {
 			$incompatibility_message = sprintf(
 				__(
 					'The Event Espresso "%1$s" addon could not be activated because it requires WordPress version "%2$s" or greater.%3$sPlease update your version of WordPress to use the "%1$s" addon and to keep your site secure.',
@@ -429,20 +429,20 @@ 
 				'<br />'
 			);
 		}
-		if ( ! empty( $incompatibility_message ) ) {
+		if ( ! empty($incompatibility_message)) {
 			//remove 'activate' from the REQUEST so WP doesn't erroneously tell the user the
 			//plugin activated fine when it didn't
-			if ( isset( $_GET['activate'] ) ) {
-				unset( $_GET['activate'] );
+			if (isset($_GET['activate'])) {
+				unset($_GET['activate']);
 			}
-			if ( isset( $_REQUEST['activate'] ) ) {
-				unset( $_REQUEST['activate'] );
+			if (isset($_REQUEST['activate'])) {
+				unset($_REQUEST['activate']);
 			}
 			//and show an error message indicating the plugin didn't activate properly
-			EE_Error::add_error( $incompatibility_message, __FILE__, __FUNCTION__, __LINE__ );
-			if ( current_user_can( 'activate_plugins' ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-				deactivate_plugins( plugin_basename( $addon_settings['main_file_path'] ), true );
+			EE_Error::add_error($incompatibility_message, __FILE__, __FUNCTION__, __LINE__);
+			if (current_user_can('activate_plugins')) {
+				require_once(ABSPATH.'wp-admin/includes/plugin.php');
+				deactivate_plugins(plugin_basename($addon_settings['main_file_path']), true);
 			}
 			return;
 		}
@@ -460,13 +460,13 @@ 
 			);
 		}
 		//this is an activation request
-		if ( did_action( 'activate_plugin' ) ) {
+		if (did_action('activate_plugin')) {
 			//to find if THIS is the addon that was activated,
 			//just check if we have already registered it or not
 			//(as the newly-activated addon wasn't around the first time addons were registered)
-			if ( ! isset( self::$_settings[ $addon_name ] ) ) {
-				self::$_settings[ $addon_name ] = $addon_settings;
-				$addon = self::_load_and_init_addon_class( $addon_name );
+			if ( ! isset(self::$_settings[$addon_name])) {
+				self::$_settings[$addon_name] = $addon_settings;
+				$addon = self::_load_and_init_addon_class($addon_name);
 				$addon->set_activation_indicator_option();
 				//dont bother setting up the rest of the addon.
 				//we know it was just activated and the request will end soon
@@ -475,8 +475,8 @@ 
 		} else {
 			// make sure this was called in the right place!
 			if (
-				! did_action( 'AHEE__EE_System__load_espresso_addons' )
-				|| did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' )
+				! did_action('AHEE__EE_System__load_espresso_addons')
+				|| did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')
 			) {
 				EE_Error::doing_it_wrong(
 					__METHOD__,
@@ -490,155 +490,155 @@ 
 					'4.3.0'
 				);
 			}
-			self::$_settings[ $addon_name ] = $addon_settings;
+			self::$_settings[$addon_name] = $addon_settings;
 		}
 		// we need cars
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_paths'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_paths'])) {
 			// setup autoloader for single file
-			EEH_Autoloader::instance()->register_autoloader( self::$_settings[ $addon_name ]['autoloader_paths'] );
+			EEH_Autoloader::instance()->register_autoloader(self::$_settings[$addon_name]['autoloader_paths']);
 		}
 		// setup autoloaders for folders
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_folders'] ) ) {
-			foreach ( self::$_settings[ $addon_name ]['autoloader_folders'] as $autoloader_folder ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $autoloader_folder );
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_folders'])) {
+			foreach (self::$_settings[$addon_name]['autoloader_folders'] as $autoloader_folder) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($autoloader_folder);
 			}
 		}
 		// register new models
 		if (
-			! empty( self::$_settings[ $addon_name ]['model_paths'] )
-			|| ! empty( self::$_settings[ $addon_name ]['class_paths'] )
+			! empty(self::$_settings[$addon_name]['model_paths'])
+			|| ! empty(self::$_settings[$addon_name]['class_paths'])
 		) {
 			EE_Register_Model::register(
 				$addon_name,
 				array(
-					'model_paths' => self::$_settings[ $addon_name ]['model_paths'],
-					'class_paths' => self::$_settings[ $addon_name ]['class_paths'],
+					'model_paths' => self::$_settings[$addon_name]['model_paths'],
+					'class_paths' => self::$_settings[$addon_name]['class_paths'],
 				)
 			);
 		}
 		// register model extensions
 		if (
-			! empty( self::$_settings[ $addon_name ]['model_extension_paths'] )
-			|| ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )
+			! empty(self::$_settings[$addon_name]['model_extension_paths'])
+			|| ! empty(self::$_settings[$addon_name]['class_extension_paths'])
 		) {
 			EE_Register_Model_Extensions::register(
 				$addon_name,
 				array(
-					'model_extension_paths' => self::$_settings[ $addon_name ]['model_extension_paths'],
-					'class_extension_paths' => self::$_settings[ $addon_name ]['class_extension_paths'],
+					'model_extension_paths' => self::$_settings[$addon_name]['model_extension_paths'],
+					'class_extension_paths' => self::$_settings[$addon_name]['class_extension_paths'],
 				)
 			);
 		}
 		// setup DMS
-		if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
 			EE_Register_Data_Migration_Scripts::register(
 				$addon_name,
-				array( 'dms_paths' => self::$_settings[ $addon_name ]['dms_paths'] )
+				array('dms_paths' => self::$_settings[$addon_name]['dms_paths'])
 			);
 		}
 		// if config_class is present let's register config.
-		if ( ! empty( self::$_settings[ $addon_name ]['config_class'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 			EE_Register_Config::register(
-				self::$_settings[ $addon_name ]['config_class'],
+				self::$_settings[$addon_name]['config_class'],
 				array(
-					'config_section' => self::$_settings[ $addon_name ]['config_section'],
-					'config_name'    => self::$_settings[ $addon_name ]['config_name'],
+					'config_section' => self::$_settings[$addon_name]['config_section'],
+					'config_name'    => self::$_settings[$addon_name]['config_name'],
 				)
 			);
 		}
 		// register admin page
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
 			EE_Register_Admin_Page::register(
 				$addon_name,
-				array( 'page_path' => self::$_settings[ $addon_name ]['admin_path'] )
+				array('page_path' => self::$_settings[$addon_name]['admin_path'])
 			);
 		}
 		// add to list of modules to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
 			EE_Register_Module::register(
 				$addon_name,
-				array( 'module_paths' => self::$_settings[ $addon_name ]['module_paths'] )
+				array('module_paths' => self::$_settings[$addon_name]['module_paths'])
 			);
 		}
 		// add to list of shortcodes to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
 			EE_Register_Shortcode::register(
 				$addon_name,
-				array( 'shortcode_paths' => self::$_settings[ $addon_name ]['shortcode_paths'] )
+				array('shortcode_paths' => self::$_settings[$addon_name]['shortcode_paths'])
 			);
 		}
 		// add to list of widgets to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
 			EE_Register_Widget::register(
 				$addon_name,
-				array( 'widget_paths' => self::$_settings[ $addon_name ]['widget_paths'] )
+				array('widget_paths' => self::$_settings[$addon_name]['widget_paths'])
 			);
 		}
 		//register capability related stuff.
-		if ( ! empty( self::$_settings[ $addon_name ]['capabilities'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['capabilities'])) {
 			EE_Register_Capabilities::register(
 				$addon_name,
 				array(
-					'capabilities'    => self::$_settings[ $addon_name ]['capabilities'],
-					'capability_maps' => self::$_settings[ $addon_name ]['capability_maps'],
+					'capabilities'    => self::$_settings[$addon_name]['capabilities'],
+					'capability_maps' => self::$_settings[$addon_name]['capability_maps'],
 				)
 			);
 		}
 		//any message type to register?
-		if ( ! empty( self::$_settings[ $addon_name ]['message_types'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
 			add_action(
 				'EE_Brewing_Regular___messages_caf',
-				array( 'EE_Register_Addon', 'register_message_types' )
+				array('EE_Register_Addon', 'register_message_types')
 			);
 		}
 		// if plugin update engine is being used for auto-updates (not needed if PUE is not being used)
-		if ( ! empty( $setup_args['pue_options'] ) ) {
-			self::$_settings[ $addon_name ]['pue_options'] = array(
-				'pue_plugin_slug' => isset( $setup_args['pue_options']['pue_plugin_slug'] )
+		if ( ! empty($setup_args['pue_options'])) {
+			self::$_settings[$addon_name]['pue_options'] = array(
+				'pue_plugin_slug' => isset($setup_args['pue_options']['pue_plugin_slug'])
 					? (string) $setup_args['pue_options']['pue_plugin_slug']
-					: 'espresso_' . strtolower( $class_name ),
-				'plugin_basename' => isset( $setup_args['pue_options']['plugin_basename'] )
+					: 'espresso_'.strtolower($class_name),
+				'plugin_basename' => isset($setup_args['pue_options']['plugin_basename'])
 					? (string) $setup_args['pue_options']['plugin_basename']
-					: plugin_basename( self::$_settings[ $addon_name ]['main_file_path'] ),
-				'checkPeriod'     => isset( $setup_args['pue_options']['checkPeriod'] )
+					: plugin_basename(self::$_settings[$addon_name]['main_file_path']),
+				'checkPeriod'     => isset($setup_args['pue_options']['checkPeriod'])
 					? (string) $setup_args['pue_options']['checkPeriod']
 					: '24',
-				'use_wp_update'   => isset( $setup_args['pue_options']['use_wp_update'] )
+				'use_wp_update'   => isset($setup_args['pue_options']['use_wp_update'])
 					? (string) $setup_args['pue_options']['use_wp_update']
 					: false,
 			);
 			add_action(
 				'AHEE__EE_System__brew_espresso__after_pue_init',
-				array( 'EE_Register_Addon', 'load_pue_update' )
+				array('EE_Register_Addon', 'load_pue_update')
 			);
 		}
 		//any custom post type/ custom capabilities or default terms to register
 		if (
-			! empty( self::$_settings[ $addon_name ]['custom_post_types'] )
-			|| ! empty( self::$_settings[ $addon_name ]['custom_taxonomies'] )
+			! empty(self::$_settings[$addon_name]['custom_post_types'])
+			|| ! empty(self::$_settings[$addon_name]['custom_taxonomies'])
 		) {
 			EE_Register_CPT::register(
 				$addon_name,
 				array(
-					'cpts'          => self::$_settings[ $addon_name ]['custom_post_types'],
-					'cts'           => self::$_settings[ $addon_name ]['custom_taxonomies'],
-					'default_terms' => self::$_settings[ $addon_name ]['default_terms'],
+					'cpts'          => self::$_settings[$addon_name]['custom_post_types'],
+					'cts'           => self::$_settings[$addon_name]['custom_taxonomies'],
+					'default_terms' => self::$_settings[$addon_name]['default_terms'],
 				)
 			);
 		}
-		if ( ! empty( self::$_settings[ $addon_name ]['payment_method_paths'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['payment_method_paths'])) {
 			EE_Register_Payment_Method::register(
 				$addon_name,
-				array( 'payment_method_paths' => self::$_settings[ $addon_name ]['payment_method_paths'] )
+				array('payment_method_paths' => self::$_settings[$addon_name]['payment_method_paths'])
 			);
 		}
 		// load and instantiate main addon class
-		$addon = self::_load_and_init_addon_class( $addon_name );
+		$addon = self::_load_and_init_addon_class($addon_name);
 		// call any additional admin_callback functions during load_admin_controller hook
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_callback'] ) ) {
+		if ( ! empty(self::$_settings[$addon_name]['admin_callback'])) {
 			add_action(
 				'AHEE__EE_System__load_controllers__load_admin_controllers',
-				array( $addon, self::$_settings[ $addon_name ]['admin_callback'] )
+				array($addon, self::$_settings[$addon_name]['admin_callback'])
 			);
 		}
 	}
@@ -651,25 +651,25 @@ 
 	 * @param string $addon_name
 	 * @return EE_Addon
 	 */
-	private static function _load_and_init_addon_class( $addon_name ) {
+	private static function _load_and_init_addon_class($addon_name) {
 		$addon = EE_Registry::instance()->load_addon(
-			dirname( self::$_settings[ $addon_name ]['main_file_path'] ),
-			self::$_settings[ $addon_name ]['class_name']
+			dirname(self::$_settings[$addon_name]['main_file_path']),
+			self::$_settings[$addon_name]['class_name']
 		);
-		$addon->set_name( $addon_name );
-		$addon->set_plugin_slug( self::$_settings[ $addon_name ]['plugin_slug'] );
-		$addon->set_plugin_basename( self::$_settings[ $addon_name ]['plugin_basename'] );
-		$addon->set_main_plugin_file( self::$_settings[ $addon_name ]['main_file_path'] );
-		$addon->set_plugin_action_slug( self::$_settings[ $addon_name ]['plugin_action_slug'] );
-		$addon->set_plugins_page_row( self::$_settings[ $addon_name ]['plugins_page_row'] );
-		$addon->set_version( self::$_settings[ $addon_name ]['version'] );
-		$addon->set_min_core_version( self::_effective_version( self::$_settings[ $addon_name ]['min_core_version'] ) );
-		$addon->set_config_section( self::$_settings[ $addon_name ]['config_section'] );
-		$addon->set_config_class( self::$_settings[ $addon_name ]['config_class'] );
-		$addon->set_config_name( self::$_settings[ $addon_name ]['config_name'] );
+		$addon->set_name($addon_name);
+		$addon->set_plugin_slug(self::$_settings[$addon_name]['plugin_slug']);
+		$addon->set_plugin_basename(self::$_settings[$addon_name]['plugin_basename']);
+		$addon->set_main_plugin_file(self::$_settings[$addon_name]['main_file_path']);
+		$addon->set_plugin_action_slug(self::$_settings[$addon_name]['plugin_action_slug']);
+		$addon->set_plugins_page_row(self::$_settings[$addon_name]['plugins_page_row']);
+		$addon->set_version(self::$_settings[$addon_name]['version']);
+		$addon->set_min_core_version(self::_effective_version(self::$_settings[$addon_name]['min_core_version']));
+		$addon->set_config_section(self::$_settings[$addon_name]['config_section']);
+		$addon->set_config_class(self::$_settings[$addon_name]['config_class']);
+		$addon->set_config_name(self::$_settings[$addon_name]['config_name']);
 		//unfortunately this can't be hooked in upon construction, because we don't have
 		//the plugin mainfile's path upon construction.
-		register_deactivation_hook( $addon->get_main_plugin_file(), array( $addon, 'deactivation' ) );
+		register_deactivation_hook($addon->get_main_plugin_file(), array($addon, 'deactivation'));
 		return $addon;
 	}
 
@@ -682,18 +682,18 @@ 
 	 */
 	public static function load_pue_update() {
 		// load PUE client
-		require_once EE_THIRD_PARTY . 'pue' . DS . 'pue-client.php';
+		require_once EE_THIRD_PARTY.'pue'.DS.'pue-client.php';
 		// cycle thru settings
-		foreach ( self::$_settings as $settings ) {
-			if ( ! empty( $settings['pue_options'] ) ) {
+		foreach (self::$_settings as $settings) {
+			if ( ! empty($settings['pue_options'])) {
 				// initiate the class and start the plugin update engine!
 				new PluginUpdateEngineChecker(
 				// host file URL
 					'https://eventespresso.com',
 					// plugin slug(s)
 					array(
-						'premium'    => array( 'p' => $settings['pue_options']['pue_plugin_slug'] ),
-						'prerelease' => array( 'beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr' ),
+						'premium'    => array('p' => $settings['pue_options']['pue_plugin_slug']),
+						'prerelease' => array('beta' => $settings['pue_options']['pue_plugin_slug'].'-pr'),
 					),
 					// options
 					array(
@@ -721,9 +721,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function register_message_types() {
-		foreach ( self::$_settings as $settings ) {
-			foreach ( $settings['message_types'] as $message_type => $message_type_settings ) {
-				EE_Register_Message_Type::register( $message_type, $message_type_settings );
+		foreach (self::$_settings as $settings) {
+			foreach ($settings['message_types'] as $message_type => $message_type_settings) {
+				EE_Register_Message_Type::register($message_type, $message_type_settings);
 			}
 		}
 	}
@@ -738,73 +738,73 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function deregister( $addon_name = null ) {
-		if ( isset( self::$_settings[ $addon_name ] ) ) {
-			$class_name = self::$_settings[ $addon_name ]['class_name'];
-			if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] ) ) {
+	public static function deregister($addon_name = null) {
+		if (isset(self::$_settings[$addon_name])) {
+			$class_name = self::$_settings[$addon_name]['class_name'];
+			if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
 				// setup DMS
-				EE_Register_Data_Migration_Scripts::deregister( $addon_name );
+				EE_Register_Data_Migration_Scripts::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] ) ) {
+			if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
 				// register admin page
-				EE_Register_Admin_Page::deregister( $addon_name );
+				EE_Register_Admin_Page::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] ) ) {
+			if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
 				// add to list of modules to be registered
-				EE_Register_Module::deregister( $addon_name );
+				EE_Register_Module::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] ) ) {
+			if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Shortcode::deregister( $addon_name );
+				EE_Register_Shortcode::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['config_class'] ) ) {
+			if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 				// if config_class present let's register config.
-				EE_Register_Config::deregister( self::$_settings[ $addon_name ]['config_class'] );
+				EE_Register_Config::deregister(self::$_settings[$addon_name]['config_class']);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] ) ) {
+			if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
 				// add to list of widgets to be registered
-				EE_Register_Widget::deregister( $addon_name );
+				EE_Register_Widget::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] )
+			if ( ! empty(self::$_settings[$addon_name]['model_paths'])
 			     ||
-			     ! empty( self::$_settings[ $addon_name ]['class_paths'] )
+			     ! empty(self::$_settings[$addon_name]['class_paths'])
 			) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model::deregister( $addon_name );
+				EE_Register_Model::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] )
+			if ( ! empty(self::$_settings[$addon_name]['model_extension_paths'])
 			     ||
-			     ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )
+			     ! empty(self::$_settings[$addon_name]['class_extension_paths'])
 			) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model_Extensions::deregister( $addon_name );
+				EE_Register_Model_Extensions::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['message_types'] ) ) {
-				foreach ( self::$_settings[ $addon_name ]['message_types'] as $message_type => $message_type_settings )
+			if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				foreach (self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings)
 				{
-					EE_Register_Message_Type::deregister( $message_type );
+					EE_Register_Message_Type::deregister($message_type);
 				}
 			}
 			//deregister capabilities for addon
 			if (
-				! empty( self::$_settings[ $addon_name ]['capabilities'] )
-				|| ! empty( self::$_settings[ $addon_name ]['capability_maps'] )
+				! empty(self::$_settings[$addon_name]['capabilities'])
+				|| ! empty(self::$_settings[$addon_name]['capability_maps'])
 			) {
-				EE_Register_Capabilities::deregister( $addon_name );
+				EE_Register_Capabilities::deregister($addon_name);
 			}
 			//deregister custom_post_types for addon
-			if ( ! empty( self::$_settings[ $addon_name ]['custom_post_types'] ) ) {
-				EE_Register_CPT::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['custom_post_types'])) {
+				EE_Register_CPT::deregister($addon_name);
 			}
 			remove_action(
-				'deactivate_' . EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(),
-				array( EE_Registry::instance()->addons->{$class_name}, 'deactivation' )
+				'deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(),
+				array(EE_Registry::instance()->addons->{$class_name}, 'deactivation')
 			);
 			remove_action(
 				'AHEE__EE_System__perform_activations_upgrades_and_migrations',
-				array( EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required' )
+				array(EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required')
 			);
-			unset( EE_Registry::instance()->addons->{$class_name}, self::$_settings[ $addon_name ] );
+			unset(EE_Registry::instance()->addons->{$class_name}, self::$_settings[$addon_name]);
 		}
 	}
 

core/libraries/shortcodes/EE_Recipient_Details_Shortcodes.lib.php

Spacing +66 added lines, -67 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -37,24 +37,24 @@ 
 
 
 	protected function _init_props() {
-		$this->label = esc_html__( 'Recipient Details Shortcodes', 'event_espresso' );
-		$this->description = esc_html__( 'All shortcodes specific to recipient registration data', 'event_espresso' );
+		$this->label = esc_html__('Recipient Details Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to recipient registration data', 'event_espresso');
 		$this->_shortcodes = array(
-			'[RECIPIENT_FNAME]' => esc_html__( 'Parses to the first name of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_LNAME]' => esc_html__( 'Parses to the last name of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_EMAIL]' => esc_html__( 'Parses to the email address of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_REGISTRATION_ID]' => esc_html__( 'Parses to the registration ID of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_REGISTRATION_CODE]' => esc_html__( 'Parses to the registration code of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_EDIT_REGISTRATION_LINK]' => esc_html__( 'Parses to a link for frontend editing of the registration for the recipient.', 'event_espresso' ),
-			'[RECIPIENT_PHONE_NUMBER]' => esc_html__( 'The Phone Number for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ADDRESS]' => esc_html__( 'The Address for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ADDRESS2]' => esc_html__( 'Whatever was in the address 2 field for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_CITY]' => esc_html__( 'The city for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ZIP_PC]' => esc_html__( 'The ZIP (or Postal) Code for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ADDRESS_STATE]' => esc_html__( 'The state/province for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_COUNTRY]' => esc_html__( 'The country for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ANSWER_*]' => esc_html__( 'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso' ),
-			'[RECIPIENT_TOTAL_AMOUNT_PAID]' => esc_html__( 'If a single registration related to the recipient is available, that is used to retrieve the total amount that has been paid for this recipient.  Otherwise the value of 0 is printed.', 'event_espresso' )
+			'[RECIPIENT_FNAME]' => esc_html__('Parses to the first name of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_LNAME]' => esc_html__('Parses to the last name of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_EMAIL]' => esc_html__('Parses to the email address of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_REGISTRATION_ID]' => esc_html__('Parses to the registration ID of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_REGISTRATION_CODE]' => esc_html__('Parses to the registration code of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_EDIT_REGISTRATION_LINK]' => esc_html__('Parses to a link for frontend editing of the registration for the recipient.', 'event_espresso'),
+			'[RECIPIENT_PHONE_NUMBER]' => esc_html__('The Phone Number for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ADDRESS]' => esc_html__('The Address for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ADDRESS2]' => esc_html__('Whatever was in the address 2 field for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_CITY]' => esc_html__('The city for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ZIP_PC]' => esc_html__('The ZIP (or Postal) Code for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ADDRESS_STATE]' => esc_html__('The state/province for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_COUNTRY]' => esc_html__('The country for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ANSWER_*]' => esc_html__('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso'),
+			'[RECIPIENT_TOTAL_AMOUNT_PAID]' => esc_html__('If a single registration related to the recipient is available, that is used to retrieve the total amount that has been paid for this recipient.  Otherwise the value of 0 is printed.', 'event_espresso')
 			);
 	}
 
@@ -65,36 +65,35 @@ 
 	 * @param  string $shortcode the shortcode to be parsed.
 	 * @return string parsed shortcode
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-		                    && is_array( $this->_data )
-		                    && isset( $this->_data['data'] )
+		                    && is_array($this->_data)
+		                    && isset($this->_data['data'])
 		                    && $this->_data['data'] instanceof EE_Messages_Addressee
-			? $this->_data['data'] :
-			$this->_recipient;
+			? $this->_data['data'] : $this->_recipient;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-		                    && ! empty( $this->_extra_data['data'] )
+		                    && ! empty($this->_extra_data['data'])
 		                    && $this->_extra_data['data'] instanceof EE_Messages_Addressee
 			? $this->_extra_data['data']
 			: $this->_recipient;
 
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		$attendee = $this->_recipient->att_obj;
-		if ( ! $attendee instanceof EE_Attendee ) {
+		if ( ! $attendee instanceof EE_Attendee) {
 			return '';
 		}
 
-		$this->_registrations_for_recipient = isset( $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] )
-			? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs']
+		$this->_registrations_for_recipient = isset($this->_recipient->attendees[$attendee->ID()]['reg_objs'])
+			? $this->_recipient->attendees[$attendee->ID()]['reg_objs']
 			: array();
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -108,21 +107,21 @@ 
 				break;
 
 			case '[RECIPIENT_REGISTRATION_ID]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
 					return '';
 				}
 				return $this->_get_reg_id();
 				break;
 
 			case '[RECIPIENT_REGISTRATION_CODE]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
 					return '';
 				}
 				return $this->_get_reg_code();
 				break;
 
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
 					return '';
 				}
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
@@ -164,23 +163,23 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[RECIPIENT_ANSWER_*' ) !== false ) {
-			$shortcode = str_replace( '[RECIPIENT_ANSWER_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[RECIPIENT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[RECIPIENT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 
 			//now let's figure out what question has this text
-			if ( empty( $this->_recipient->questions ) || ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+			if (empty($this->_recipient->questions) || ! $this->_recipient->reg_obj instanceof EE_Registration) {
 				return '';
 			}
 
-			foreach ( $this->_recipient->questions as $ansid => $question ) {
+			foreach ($this->_recipient->questions as $ansid => $question) {
 				if (
 					$question instanceof EE_Question
-					&& trim( $question->display_text() ) == trim( $shortcode )
-					&& isset( $this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ] )
+					&& trim($question->display_text()) == trim($shortcode)
+					&& isset($this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid])
 				) {
-					return $this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ]->get_pretty( 'ANS_value', 'no_wpautop' );
+					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 				}
 			}
 		}
@@ -211,53 +210,53 @@ 
 	protected function _get_reg_code() {
 
 		//if only one related registration for the recipient then just return that reg code.
-		if ( count( $this->_registrations_for_recipient ) <= 1 )  {
+		if (count($this->_registrations_for_recipient) <= 1) {
 			return $this->_recipient->reg_obj->reg_code();
 		}
 
 		//k more than one registration so let's see if we can get specific to context
 		//are we parsing event_list?
-		if ( $this->_data instanceof EE_Event ) {
+		if ($this->_data instanceof EE_Event) {
 			$reg_code = array();
 			//loop through registrations for recipient and see if there is a match for this event
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
 					$reg_code[] = $reg->reg_code();
 				}
 			}
-			return implode( ', ', $reg_code );
+			return implode(', ', $reg_code);
 		}
 
 		//are we parsing ticket list?
-		if ( $this->_data instanceof EE_Ticket ) {
+		if ($this->_data instanceof EE_Ticket) {
 			$reg_code = array();
 			//loop through each registration for recipient and see if there is a match for this ticket
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
 					$reg_code = $reg->reg_code();
 				}
 			}
-			return implode( ', ', $reg_code );
+			return implode(', ', $reg_code);
 		}
 
 		//do we have a specific reg_obj?  Let's use it
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
 			return $this->_data->reg_obj->reg_code();
 		}
 
 		//do we have a specific reg_obj?  Let's use it
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
 			return $this->_data->reg_obj->reg_code();
 		}
 
 		//not able to determine the single reg code so let's return a comma delimited list of reg codes.
 		$reg_code = array();
-		foreach ( $this->_registrations_for_recipient as $reg ) {
-			if ( $reg instanceof EE_Registration ) {
+		foreach ($this->_registrations_for_recipient as $reg) {
+			if ($reg instanceof EE_Registration) {
 				$reg_code[] = $reg->reg_code();
 			}
 		}
-		return implode( ', ', $reg_code );
+		return implode(', ', $reg_code);
 	}
 
 
@@ -270,48 +269,48 @@ 
 	protected function _get_reg_id() {
 
 		//if only one related registration for the recipient then just return that reg code.
-		if ( count( $this->_registrations_for_recipient ) <= 1 )  {
+		if (count($this->_registrations_for_recipient) <= 1) {
 			return $this->_recipient->reg_obj->ID();
 		}
 
 		//k more than one registration so let's see if we can get specific to context
 		//are we parsing event_list?
-		if ( $this->_data instanceof EE_Event ) {
+		if ($this->_data instanceof EE_Event) {
 			$registration_ids = array();
 			//loop through registrations for recipient and see if there is a match for this event
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
 					$registration_ids[] = $reg->ID();
 				}
 			}
-			return implode( ', ', $registration_ids );
+			return implode(', ', $registration_ids);
 		}
 
 		//are we parsing ticket list?
-		if ( $this->_data instanceof EE_Ticket ) {
+		if ($this->_data instanceof EE_Ticket) {
 			$registration_ids = array();
 			//loop through each registration for recipient and see if there is a match for this ticket
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
 					$registration_ids = $reg->ID();
 				}
 			}
-			return implode( ', ', $registration_ids );
+			return implode(', ', $registration_ids);
 		}
 
 		//do we have a specific reg_obj?  Let's use it
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
 			return $this->_data->reg_obj->ID();
 		}
 
 		//not able to determine the single reg code so let's return a comma delimited list of reg codes.
 		$registration_ids = array();
-		foreach ( $this->_registrations_for_recipient as $reg ) {
-			if ( $reg instanceof EE_Registration ) {
+		foreach ($this->_registrations_for_recipient as $reg) {
+			if ($reg instanceof EE_Registration) {
 				$registration_ids[] = $reg->ID();
 			}
 		}
-		return implode( ', ', $registration_ids );
+		return implode(', ', $registration_ids);
 	}