eventespresso / event-espresso-core

admin_pages/transactions/templates/txn_admin_overview.template.php

Spacing +5 added lines, -5 removed lines

@@ -1,19 +1,19 @@
 
 		<ul class="subsubsub">
-			<li class="all"><a class="current" href="<?php echo $view_all_url;?>">View All <span class="count">(<?php echo $table_rows; ?>)</span></a></li>
+			<li class="all"><a class="current" href="<?php echo $view_all_url; ?>">View All <span class="count">(<?php echo $table_rows; ?>)</span></a></li>
 		</ul>
 
 		<div id="txn-filters-dv">
-			<form id="txn-filters-frm" action="<?php echo $txn_overview_url;?>" method="post" name="txn-filters-frm">
-				<label for="txn-filter-start-date"><?php _e( 'Display Transactions from ', 'event_espresso' ); ?></label>
+			<form id="txn-filters-frm" action="<?php echo $txn_overview_url; ?>" method="post" name="txn-filters-frm">
+				<label for="txn-filter-start-date"><?php _e('Display Transactions from ', 'event_espresso'); ?></label>
 				<input id="txn-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>" name="txn-filter-start-date" size="15"/>	
-				<label for="txn-filter-end-date"> <?php _e( 'until', 'event_espresso' ); ?> </label>
+				<label for="txn-filter-end-date"> <?php _e('until', 'event_espresso'); ?> </label>
 				<input id="txn-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>" name="txn-filter-end-date" size="15"/>	
 				<input id="submit-txn-filters-sbmt" class="button-secondary" type="submit" value="Filter Months">
 			</form>
 		</div>
 
-        <form id="transactions-overview-frm" action="<?php echo $txn_overview_url;?>" method="get">
+        <form id="transactions-overview-frm" action="<?php echo $txn_overview_url; ?>" method="get">
             <input type="hidden" name="page" value="<?php echo $_REQUEST['page'] ?>" />
             <input type="hidden" id="per_page" name="per_page" value="" />
             <?php echo $list_table->display(); ?>

admin_pages/transactions/templates/txn_admin_wrapper.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <div class="wrap">
 
-	<h2><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php esc_attr_e( $admin_page_title, 'event_espresso' ); ?></h2>
+	<h2><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php esc_attr_e($admin_page_title, 'event_espresso'); ?></h2>
 
 	<h2 class="nav-tab-wrapper">
 		<a class="nav-tab<?php echo $tab_active_overview; ?>" href="<?php echo $tab_url_overview; ?>"><?php echo $tab_lnk_overview; ?></a>
-		<?php if ( $tab_details ) : ?>
+		<?php if ($tab_details) : ?>
 			<a class="nav-tab<?php echo $tab_active_details; ?>" href="<?php echo $tab_url_details; ?>"><?php echo $tab_lnk_details; ?></a>
 		<?php endif; ?>
 		<a class="nav-tab<?php echo $tab_active_reports; ?>" href="<?php echo $tab_url_reports; ?>"><?php echo $tab_lnk_reports; ?></a>

caffeinated/EE_Caf_Messages.class.php

Spacing +142 added lines, -142 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,35 +282,35 @@ 
 
 
 
-	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 ) {
-			if ( $question instanceof EE_Question && $question->display_text() == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid]) ) {
+		foreach ($aee->questions as $ansid => $question) {
+			if ($question instanceof EE_Question && $question->display_text() == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid])) {
 				return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 			}
 		}
@@ -332,7 +332,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');
@@ -354,13 +354,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;
@@ -368,7 +368,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;
@@ -380,40 +380,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;
 								}
 							}
@@ -422,13 +422,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;
 								}
 							}
@@ -438,13 +438,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;
@@ -457,41 +457,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;
@@ -517,67 +517,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);
 	}
 
 
@@ -593,12 +593,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);
 	}
 }

Braces +21 added lines, -13 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage plugin api, messages
  * @since           4.3.2
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Used to initialize all EE messages caffeinated functionality.
@@ -291,8 +293,9 @@ 
 
 	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) )
-			return $parsed;
+		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);
@@ -388,14 +391,16 @@ 
 
 	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
 
-		if ( array($data) && ! isset( $data['data'] ) )
-			return $parsed;
+		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;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return $parsed;
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return $parsed;
+		}
 
 		switch ( $shortcode ) {
 			case '[RECIPIENT_QUESTION_LIST]' :
@@ -464,21 +469,24 @@ 
 
 
 	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
-		if ( array($data) && ! isset( $data['data'] ) )
-			return $parsed;
+		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;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return $parsed;
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return $parsed;
+		}
 
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
 
 		switch ( $shortcode ) {
 			case '[RECIPIENT_QUESTION_LIST]' :
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
-					return '';
+				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'];
 				$valid_shortcodes = array('question');

caffeinated/admin/extend/about/templates/whats_new.template.php

Spacing +9 added lines, -9 removed lines

@@ -1,25 +1,25 @@
 <div class="changelog point-releases">
-	<!-- <h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3> -->
-	<h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>
+	<!-- <h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3> -->
+	<h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>
 	<?php //$type = 'minor'; ?>
 	<?php $type = 'major'; ?>
-	<p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?>
+	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?>
 		<?php
-			$ver = explode( '.', EVENT_ESPRESSO_VERSION );
-			array_pop( $ver );
-			$ver = implode( '.', $ver );
+			$ver = explode('.', EVENT_ESPRESSO_VERSION);
+			array_pop($ver);
+			$ver = implode('.', $ver);
 		?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?>
+		<?php printf(__('For more information, see <a href="%s">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?>
  	</p>
 </div>
 
 <div class="changelog">
 	<?php
 	//maintenance mode on?
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 		?>
 		<div class="ee-attention">
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
 			<p>
 			<?php
 				printf(

caffeinated/admin/extend/events/Extend_Events_Admin_List_Table.class.php

Spacing +3 added lines, -3 removed lines

@@ -17,14 +17,14 @@
  */
 class Extend_Events_Admin_List_Table extends Events_Admin_List_Table {
 
-	protected function _column_name_action_setup( EE_Event $item ) {
+	protected function _column_name_action_setup(EE_Event $item) {
 		$export_query_args = array(
 				'action' => 'export_events',
 				'EVT_ID' => $item->ID()
 			);
-		$export_event_link = EE_Admin_Page::add_query_args_and_nonce( $export_query_args, EVENTS_ADMIN_URL );
+		$export_event_link = EE_Admin_Page::add_query_args_and_nonce($export_query_args, EVENTS_ADMIN_URL);
 
-		$actions = parent::_column_name_action_setup( $item );
+		$actions = parent::_column_name_action_setup($item);
 //		$actions['export'] = '<a href="' . $export_event_link . '" title="' . __('Export Event', 'event_espresso') . '">' . __('Export', 'event_espresso') . '</a>';
 		return $actions;
 	}

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage admin
  * @since           4.4.9
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This is the caffeinated class for the event list table.  It is only loaded in caffeinated versions of Event

caffeinated/admin/extend/events/Tickets_List_Table.class.php

Indentation +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 				'TKT_taxable' => __('Taxable', 'event_espresso')
 			);
 
-        $this->_sortable_columns = array(
+		$this->_sortable_columns = array(
 				// TRUE means its already sorted
 				'TKT_name' => array( 'TKT_name' => TRUE ),
 				'TKT_description' => array( 'TKT_description' => FALSE ),
@@ -68,9 +68,9 @@ 
 				'TKT_min' => array( 'TKT_min' => FALSE ),
 				'TKT_max' => array( 'TKT_max' => FALSE ),
 				'TKT_price' => array( 'TKT_price' => FALSE )
-	        	);
+				);
 
-        $this->_hidden_columns = array(
+		$this->_hidden_columns = array(
 			);
 
 	}

Spacing +23 added lines, -23 removed lines

@@ -31,9 +31,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? TRUE : FALSE;
-		$this->_data = $this->_admin_page->get_default_tickets( $this->_per_page, FALSE, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, FALSE );
-		$this->_trashed_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, TRUE );
+		$this->_data = $this->_admin_page->get_default_tickets($this->_per_page, FALSE, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, FALSE);
+		$this->_trashed_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, TRUE);
 	}
 
 
@@ -61,13 +61,13 @@ 
 
         $this->_sortable_columns = array(
 				// TRUE means its already sorted
-				'TKT_name' => array( 'TKT_name' => TRUE ),
-				'TKT_description' => array( 'TKT_description' => FALSE ),
-				'TKT_qty' => array( 'TKT_qty' => FALSE ),
-				'TKT_uses' => array( 'TKT_uses' => FALSE ),
-				'TKT_min' => array( 'TKT_min' => FALSE ),
-				'TKT_max' => array( 'TKT_max' => FALSE ),
-				'TKT_price' => array( 'TKT_price' => FALSE )
+				'TKT_name' => array('TKT_name' => TRUE),
+				'TKT_description' => array('TKT_description' => FALSE),
+				'TKT_qty' => array('TKT_qty' => FALSE),
+				'TKT_uses' => array('TKT_uses' => FALSE),
+				'TKT_min' => array('TKT_min' => FALSE),
+				'TKT_max' => array('TKT_max' => FALSE),
+				'TKT_price' => array('TKT_price' => FALSE)
 	        	);
 
         $this->_hidden_columns = array(
@@ -93,7 +93,7 @@ 
 
 
 	function column_cb($item) {
-		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 
 	}
 
@@ -104,21 +104,21 @@ 
 		$actions = array();
 
 		//trash links
-		if ( $item->ID() !== 1 ) {
-			if ( $this->_view == 'all' ) {
-				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'trash_ticket', 'TKT_ID' => $item->ID() ), EVENTS_ADMIN_URL );
-				$actions['trash'] = '<a href="' . $trash_lnk_url . '" title="' . esc_attr__('Move Ticket to trash', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->ID() !== 1) {
+			if ($this->_view == 'all') {
+				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'trash_ticket', 'TKT_ID' => $item->ID()), EVENTS_ADMIN_URL);
+				$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Ticket to trash', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 			} else {
 				// restore price link
-				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_ticket', 'TKT_ID'=>$item->ID() ), EVENTS_ADMIN_URL );
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Ticket', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_ticket', 'TKT_ID'=>$item->ID()), EVENTS_ADMIN_URL);
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Ticket', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				// delete price link
-				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_ticket', 'TKT_ID'=>$item->ID() ), EVENTS_ADMIN_URL );
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Ticket Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_ticket', 'TKT_ID'=>$item->ID()), EVENTS_ADMIN_URL);
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Ticket Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		return $item->get('TKT_name') . $this->row_actions( $actions );
+		return $item->get('TKT_name').$this->row_actions($actions);
 	}
 
 
@@ -131,13 +131,13 @@ 
 
 
 	function column_TKT_qty($item) {
-		return $item->get_pretty('TKT_qty','text');
+		return $item->get_pretty('TKT_qty', 'text');
 	}
 
 
 
 	function column_TKT_uses($item) {
-		return $item->get_pretty('TKT_uses','text');
+		return $item->get_pretty('TKT_uses', 'text');
 	}
 
 
@@ -148,7 +148,7 @@ 
 
 
 	function column_TKT_max($item) {
-		return $item->get_pretty('TKT_max','text');
+		return $item->get_pretty('TKT_max', 'text');
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso

caffeinated/admin/extend/events/qtips/EE_Event_Editor_Tips.lib.php

Spacing +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
 				),
 			7 => array(
 				'content_id' => 'tkt-status-archived',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::archived,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::archived,
 				'content' => $this->_ticket_status_legend(EE_Ticket::archived),
 				'options' => array(
 					'position' => array(
@@ -96,7 +96,7 @@ 
 				),
 			8 => array(
 				'content_id' => 'tkt-status-expired',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::expired,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::expired,
 				'content' => $this->_ticket_status_legend(EE_Ticket::expired),
 				'options' => array(
 					'position' => array(
@@ -109,7 +109,7 @@ 
 				),
 			9 => array(
 				'content_id' => 'tkt-status-sold_out',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::sold_out,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::sold_out,
 				'content' => $this->_ticket_status_legend(EE_Ticket::sold_out),
 				'options' => array(
 					'position' => array(
@@ -122,7 +122,7 @@ 
 				),
 			10 => array(
 				'content_id' => 'tkt-status-pending',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::pending,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::pending,
 				'content' => $this->_ticket_status_legend(EE_Ticket::pending),
 				'options' => array(
 					'position' => array(
@@ -135,7 +135,7 @@ 
 				),
 			11 => array(
 				'content_id' => 'tkt-status-onsale',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::onsale,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::onsale,
 				'content' => $this->_ticket_status_legend(EE_Ticket::onsale),
 				'options' => array(
 					'position' => array(
@@ -178,8 +178,8 @@ 
 
 
 	private function _get_taxable_info_content() {
-		$price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL );
-		return '<p>' . sprintf( __('Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)', 'event_espresso'), '<a href="' . $price_admin_link . '" title="' . esc_attr__('Pricing Admin Page', 'event_espresso') . '">', '</a>' ) . '</p>';
+		$price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL);
+		return '<p>'.sprintf(__('Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)', 'event_espresso'), '<a href="'.$price_admin_link.'" title="'.esc_attr__('Pricing Admin Page', 'event_espresso').'">', '</a>').'</p>';
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 * @param  EE_Ticket constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _ticket_status_legend( $status ) {
+	private function _ticket_status_legend($status) {
 
 		$status_array = array(
 			'archived' => EE_Ticket::archived,
@@ -197,6 +197,6 @@ 
 			'onsale' => EE_Ticket::onsale
 			);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }

caffeinated/admin/extend/events/templates/event_datetime_metabox_clone_button.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <a class='clone-date-time dtm-inp-btn' rel='<?php echo $row; ?>' title='<?php esc_attr_e('Clone this Event Date and Time', 'event_espresso'); ?>' style='position:relative; top:5px; margin:0 0 0 10px; font-size:.9em; cursor:pointer;'>
-	<img src='<?php echo EE_IMAGES_URL;?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
+	<img src='<?php echo EE_IMAGES_URL; ?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
 </a>

caffeinated/admin/extend/events/templates/event_datetime_timezones.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( EE_Registry::instance()->CFG->admin->use_event_timezones ) : ?>
+<?php if (EE_Registry::instance()->CFG->admin->use_event_timezones) : ?>
 <div id="timezones-datetimes-dv" class="">
 	<span class="run-in"> <?php _e('Current Time for Event Timezone:', 'event_espresso'); ?> </span>
 	<span class="current-date"> <?php echo $current_date; ?></span>