eventespresso / event-espresso-core

admin_pages/venues/templates/google_map.template.php

Indentation +6 added lines, -6 removed lines

@@ -26,12 +26,12 @@
                     <input type="text" id="ee-google-map-api-key" class="regular-text" name="google_map_api_key" value="<?php echo $map_settings->google_map_api_key; ?>" />
                     <p class="description">
                         <?php
-                            printf(
-                                __('An API key is now required to use the Google Maps API: %1$sclick here to get an API key%2$s', 'event_espresso'),
-                                '<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend,static_maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank">',
-                                '</a>'
-                            );
-                        ?>
+							printf(
+								__('An API key is now required to use the Google Maps API: %1$sclick here to get an API key%2$s', 'event_espresso'),
+								'<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend,static_maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank">',
+								'</a>'
+							);
+						?>
                     </p>
                 </td>
             </tr>

Spacing +15 added lines, -15 removed lines

@@ -15,7 +15,7 @@ 
 				</td>
 			</tr>
 			<?php
-			if( apply_filters( 'FHEE__google_map__show_api_key_input', true ) ) { ?>
+			if (apply_filters('FHEE__google_map__show_api_key_input', true)) { ?>
             <tr>
                 <th>
                     <label for="ee-google-map-api-key">
@@ -110,19 +110,19 @@ 
 				<td>
 					<label for="event_details_control_type-default" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_control_type == 'default' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_control_type-default" type="radio" name="event_details_control_type" value="default"<?php echo $checked;?>/>
+						<input id="event_details_control_type-default" type="radio" name="event_details_control_type" value="default"<?php echo $checked; ?>/>
 						<?php _e(' Default', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_control_type-horizontal" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_control_type == 'horizontal' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_control_type-horizontal" type="radio" name="event_details_control_type" value="horizontal"<?php echo $checked;?>/>
+						<input id="event_details_control_type-horizontal" type="radio" name="event_details_control_type" value="horizontal"<?php echo $checked; ?>/>
 						<?php _e(' Horizontal', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_control_type-dropdown" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_control_type == 'dropdown' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_control_type-dropdown" type="radio" name="event_details_control_type" value="dropdown"<?php echo $checked;?>/>
+						<input id="event_details_control_type-dropdown" type="radio" name="event_details_control_type" value="dropdown"<?php echo $checked; ?>/>
 						<?php _e(' Dropdown', 'event_espresso') ?>
 					</label>
 				</td>
@@ -135,25 +135,25 @@ 
 				<td>
 					<label for="event_details_map_align-none" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'none' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-none" type="radio" name="event_details_map_align" value="none"<?php echo $checked;?>/>
+						<input id="event_details_map_align-none" type="radio" name="event_details_map_align" value="none"<?php echo $checked; ?>/>
 						<?php _e(' None', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_map_align-left" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'left' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-left" type="radio" name="event_details_map_align" value="left"<?php echo $checked;?>/>
+						<input id="event_details_map_align-left" type="radio" name="event_details_map_align" value="left"<?php echo $checked; ?>/>
 						<?php _e(' Align Left', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_map_align-center" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'center' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-center" type="radio" name="event_details_map_align" value="center"<?php echo $checked;?>/>
+						<input id="event_details_map_align-center" type="radio" name="event_details_map_align" value="center"<?php echo $checked; ?>/>
 						<?php _e(' Align Center', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_map_align-right" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'right' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-right" type="radio" name="event_details_map_align" value="right"<?php echo $checked;?>/>
+						<input id="event_details_map_align-right" type="radio" name="event_details_map_align" value="right"<?php echo $checked; ?>/>
 						<?php _e(' Align Right', 'event_espresso') ?>
 					</label>
 				</td>
@@ -228,19 +228,19 @@ 
 				<td>
 					<label for="event_list_control_type-default" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_control_type == 'default' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_control_type-default" type="radio" name="event_list_control_type" value="default"<?php echo $checked;?>/>
+						<input id="event_list_control_type-default" type="radio" name="event_list_control_type" value="default"<?php echo $checked; ?>/>
 						<?php _e(' Default', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_control_type-horizontal" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_control_type == 'horizontal' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_control_type-horizontal" type="radio" name="event_list_control_type" value="horizontal"<?php echo $checked;?>/>
+						<input id="event_list_control_type-horizontal" type="radio" name="event_list_control_type" value="horizontal"<?php echo $checked; ?>/>
 						<?php _e(' Horizontal', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_control_type-dropdown" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_control_type == 'dropdown' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_control_type-dropdown" type="radio" name="event_list_control_type" value="dropdown"<?php echo $checked;?>/>
+						<input id="event_list_control_type-dropdown" type="radio" name="event_list_control_type" value="dropdown"<?php echo $checked; ?>/>
 						<?php _e(' Dropdown', 'event_espresso') ?>
 					</label>
 
@@ -254,25 +254,25 @@ 
 				<td>
 					<label for="event_list_map_align-none" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'none' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-none" type="radio" name="event_list_map_align" value="none"<?php echo $checked;?>/>
+						<input id="event_list_map_align-none" type="radio" name="event_list_map_align" value="none"<?php echo $checked; ?>/>
 						<?php _e(' None', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_map_align-left" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'left' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-left" type="radio" name="event_list_map_align" value="left"<?php echo $checked;?>/>
+						<input id="event_list_map_align-left" type="radio" name="event_list_map_align" value="left"<?php echo $checked; ?>/>
 						<?php _e(' Align Left', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_map_align-center" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'center' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-center" type="radio" name="event_list_map_align" value="center"<?php echo $checked;?>/>
+						<input id="event_list_map_align-center" type="radio" name="event_list_map_align" value="center"<?php echo $checked; ?>/>
 						<?php _e(' Align Center', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_map_align-right" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'right' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-right" type="radio" name="event_list_map_align" value="right"<?php echo $checked;?>/>
+						<input id="event_list_map_align-right" type="radio" name="event_list_map_align" value="right"<?php echo $checked; ?>/>
 						<?php _e(' Align Right', 'event_espresso') ?>
 					</label>
 

widgets/upcoming_events/EEW_Upcoming_Events.widget.php

Spacing +71 added lines, -71 removed lines

@@ -30,8 +30,8 @@ 
 	function __construct() {
 		parent::__construct(
 			'ee-upcoming-events-widget',
-			__( 'Event Espresso Upcoming Events', 'event_espresso' ),
-			 array( 'description' => __( 'A widget to display your upcoming events.', 'event_espresso' )),
+			__('Event Espresso Upcoming Events', 'event_espresso'),
+			 array('description' => __('A widget to display your upcoming events.', 'event_espresso')),
 			array(
 				'width' => 300,
 				'height' => 350,
@@ -49,9 +49,9 @@ 
 	 * @param array $instance Previously saved values from database.
 	 * @return string|void
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		EE_Registry::instance()->load_class( 'Question_Option', array(), FALSE, FALSE, TRUE );
+		EE_Registry::instance()->load_class('Question_Option', array(), FALSE, FALSE, TRUE);
 		// Set up some default widget settings.
 		$defaults = array(
 			'title' => __('Upcoming Events', 'event_espresso'),
@@ -66,12 +66,12 @@ 
 			'image_size' => 'medium'
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args((array) $instance, $defaults);
 		// don't add HTML labels for EE_Form_Fields generated inputs
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
+		add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 		$yes_no_values = array(
-			EE_Question_Option::new_instance( array( 'QSO_value' => FALSE, 'QSO_desc' => __('No', 'event_espresso'))),
-			EE_Question_Option::new_instance( array( 'QSO_value' => TRUE, 'QSO_desc' => __('Yes', 'event_espresso')))
+			EE_Question_Option::new_instance(array('QSO_value' => FALSE, 'QSO_desc' => __('No', 'event_espresso'))),
+			EE_Question_Option::new_instance(array('QSO_value' => TRUE, 'QSO_desc' => __('Yes', 'event_espresso')))
 		);
 
 	?>
@@ -82,7 +82,7 @@ 
 			<label for="<?php echo $this->get_field_id('title'); ?>">
 				<?php _e('Title:', 'event_espresso'); ?>
 			</label>
-			<input id="<?php echo $this->get_field_id('title'); ?>" class="widefat" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr( $instance['title'] ); ?>" type="text" />
+			<input id="<?php echo $this->get_field_id('title'); ?>" class="widefat" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr($instance['title']); ?>" type="text" />
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('category_name'); ?>">
@@ -91,16 +91,16 @@ 
 			<?php
 			$event_categories = array();
 			/** @type EEM_Term $EEM_Term */
-			$EEM_Term = EE_Registry::instance()->load_model( 'Term' );
-			$categories = $EEM_Term->get_all_ee_categories( TRUE );
-			if ( $categories ) {
-				foreach ( $categories as $category ) {
-					if ( $category instanceof EE_Term ) {
-						$event_categories[] = EE_Question_Option::new_instance( array( 'QSO_value' => $category->get( 'slug' ), 'QSO_desc' => $category->get( 'name' )));
+			$EEM_Term = EE_Registry::instance()->load_model('Term');
+			$categories = $EEM_Term->get_all_ee_categories(TRUE);
+			if ($categories) {
+				foreach ($categories as $category) {
+					if ($category instanceof EE_Term) {
+						$event_categories[] = EE_Question_Option::new_instance(array('QSO_value' => $category->get('slug'), 'QSO_desc' => $category->get('name')));
 					}
 				}
 			}
-			array_unshift( $event_categories, EE_Question_Option::new_instance( array( 'QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
+			array_unshift($event_categories, EE_Question_Option::new_instance(array('QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
 			echo EEH_Form_Fields::select(
 				 __('Event Category:', 'event_espresso'),
 				$instance['category_name'],
@@ -137,16 +137,16 @@ 
 			<?php
 			$image_sizes = array();
 			$sizes = get_intermediate_image_sizes();
-			if ( $sizes ) {
+			if ($sizes) {
 				// loop thru images and create option objects out of them
-				foreach ( $sizes as $image_size ) {
-					$image_size = trim( $image_size );
+				foreach ($sizes as $image_size) {
+					$image_size = trim($image_size);
 					// no big images plz
-					if ( ! in_array( $image_size, array( 'large', 'post-thumbnail' ))) {
-						$image_sizes[] = EE_Question_Option::new_instance( array( 'QSO_value' => $image_size, 'QSO_desc' => $image_size ));
+					if ( ! in_array($image_size, array('large', 'post-thumbnail'))) {
+						$image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => $image_size, 'QSO_desc' => $image_size));
 					}
 				}
-				$image_sizes[] = EE_Question_Option::new_instance( array( 'QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso') ));
+				$image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso')));
 			}
 			echo EEH_Form_Fields::select(
 				 __('Image Size:', 'event_espresso'),
@@ -204,7 +204,7 @@ 
 			<label for="<?php echo $this->get_field_id('date_limit'); ?>">
 				<?php _e('Number of Dates to Display:', 'event_espresso'); ?>
 			</label>
-			<input id="<?php echo $this->get_field_id('date_limit'); ?>" name="<?php echo $this->get_field_name('date_limit'); ?>" value="<?php echo esc_attr( $instance['date_limit'] ); ?>" size="3" type="text" />
+			<input id="<?php echo $this->get_field_id('date_limit'); ?>" name="<?php echo $this->get_field_name('date_limit'); ?>" value="<?php echo esc_attr($instance['date_limit']); ?>" size="3" type="text" />
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('date_range'); ?>">
@@ -236,9 +236,9 @@ 
 	 *
 	 * @return array Updated safe values to be saved.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = ! empty( $new_instance['title'] ) ? strip_tags( $new_instance['title'] ) : '';
+		$instance['title'] = ! empty($new_instance['title']) ? strip_tags($new_instance['title']) : '';
 		$instance['category_name'] = $new_instance['category_name'];
 		$instance['show_expired'] = $new_instance['show_expired'];
 		$instance['limit'] = $new_instance['limit'];
@@ -261,18 +261,18 @@ 
 	 * @param array $args     Widget arguments.
 	 * @param array $instance Saved values from database.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		global $post;
 		// make sure there is some kinda post object
-		if ( $post instanceof WP_Post ) {
+		if ($post instanceof WP_Post) {
 			$before_widget = '';
 			$before_title = '';
 			$after_title = '';
 			$after_widget = '';
 			// but NOT an events archives page, cuz that would be like two event lists on the same page
-			$show_everywhere = isset( $instance['show_everywhere'] ) ? (bool) absint( $instance['show_everywhere'] ) : TRUE;
-			if ( $show_everywhere || ! ( $post->post_type == 'espresso_events' && is_archive() )) {
+			$show_everywhere = isset($instance['show_everywhere']) ? (bool) absint($instance['show_everywhere']) : TRUE;
+			if ($show_everywhere || ! ($post->post_type == 'espresso_events' && is_archive())) {
 				// let's use some of the event helper functions'
 				// make separate vars out of attributes
 
@@ -291,81 +291,81 @@ 
 				// Before widget (defined by themes).
 				echo $before_widget;
 				// Display the widget title if one was input (before and after defined by themes).
-				if ( ! empty( $title )) {
-					echo $before_title . $title . $after_title;
+				if ( ! empty($title)) {
+					echo $before_title.$title.$after_title;
 				}
 				// grab widget settings
-				$category = isset( $instance['category_name'] ) && ! empty( $instance['category_name'] ) ? $instance['category_name'] : FALSE;
-				$show_expired = isset( $instance['show_expired'] ) ? (bool) absint( $instance['show_expired'] ) : FALSE;
-				$image_size = isset( $instance['image_size'] ) && ! empty( $instance['image_size'] ) ? $instance['image_size'] : 'medium';
-				$show_desc = isset( $instance['show_desc'] ) ? (bool) absint( $instance['show_desc'] ) : TRUE;
-				$show_dates = isset( $instance['show_dates'] ) ? (bool) absint( $instance['show_dates'] ) : TRUE;
-				$date_limit = isset( $instance['date_limit'] ) && ! empty( $instance['date_limit'] ) ? $instance['date_limit'] : NULL;
-				$date_range = isset( $instance['date_range'] ) && ! empty( $instance['date_range'] ) ? $instance['date_range'] : FALSE;
+				$category = isset($instance['category_name']) && ! empty($instance['category_name']) ? $instance['category_name'] : FALSE;
+				$show_expired = isset($instance['show_expired']) ? (bool) absint($instance['show_expired']) : FALSE;
+				$image_size = isset($instance['image_size']) && ! empty($instance['image_size']) ? $instance['image_size'] : 'medium';
+				$show_desc = isset($instance['show_desc']) ? (bool) absint($instance['show_desc']) : TRUE;
+				$show_dates = isset($instance['show_dates']) ? (bool) absint($instance['show_dates']) : TRUE;
+				$date_limit = isset($instance['date_limit']) && ! empty($instance['date_limit']) ? $instance['date_limit'] : NULL;
+				$date_range = isset($instance['date_range']) && ! empty($instance['date_range']) ? $instance['date_range'] : FALSE;
 				// start to build our where clause
 				$where = array(
 //					'Datetime.DTT_is_primary' => 1,
 					'status' => 'publish'
 				);
 				// add category
-				if ( $category ) {
+				if ($category) {
 					$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 					$where['Term_Taxonomy.Term.slug'] = $category;
 				}
 				// if NOT expired then we want events that start today or in the future
-				if ( ! $show_expired ) {
-					$where['Datetime.DTT_EVT_end'] = array( '>=', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+				if ( ! $show_expired) {
+					$where['Datetime.DTT_EVT_end'] = array('>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 				}
 				// run the query
-				$events = EE_Registry::instance()->load_model( 'Event' )->get_all( array(
+				$events = EE_Registry::instance()->load_model('Event')->get_all(array(
 					$where,
-					'limit' => $instance['limit'] > 0 ? '0,' . $instance['limit'] : '0,10',
+					'limit' => $instance['limit'] > 0 ? '0,'.$instance['limit'] : '0,10',
 					'order_by' => 'Datetime.DTT_EVT_start',
 					'order' => 'ASC',
 					'group_by' => 'EVT_ID'
 				));
 
-				if ( ! empty( $events )) {
+				if ( ! empty($events)) {
 					echo '<ul class="ee-upcoming-events-widget-ul">';
-					foreach ( $events as $event ) {
-						if ( $event instanceof EE_Event && ( !is_single() || $post->ID != $event->ID() ) ) {
+					foreach ($events as $event) {
+						if ($event instanceof EE_Event && ( ! is_single() || $post->ID != $event->ID())) {
 							//printr( $event, '$event  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-							echo '<li id="ee-upcoming-events-widget-li-' . $event->ID() . '" class="ee-upcoming-events-widget-li">';
+							echo '<li id="ee-upcoming-events-widget-li-'.$event->ID().'" class="ee-upcoming-events-widget-li">';
 							// how big is the event name ?
-							$name_length = strlen( $event->name() );
-							switch( $name_length ) {
+							$name_length = strlen($event->name());
+							switch ($name_length) {
 								case $name_length > 70 :
-									$len_class =  ' three-line';
+									$len_class = ' three-line';
 									break;
 								case $name_length > 35 :
-									$len_class =  ' two-line';
+									$len_class = ' two-line';
 									break;
 								default :
-									$len_class =  ' one-line';
+									$len_class = ' one-line';
 							}
-							$event_url = apply_filters( 'FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event );
-							echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a' . $len_class . '" href="' . $event_url . '">' . $event->name() . '</a></h5>';
-							if ( post_password_required( $event->ID() ) ) {
-								$pswd_form = apply_filters( 'FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form( $event->ID() ), $event );
+							$event_url = apply_filters('FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event);
+							echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a'.$len_class.'" href="'.$event_url.'">'.$event->name().'</a></h5>';
+							if (post_password_required($event->ID())) {
+								$pswd_form = apply_filters('FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form($event->ID()), $event);
 								echo $pswd_form;
 							} else {
-								if ( has_post_thumbnail( $event->ID() ) && $image_size != 'none' ) {
-									echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="' . $event_url . '">' . get_the_post_thumbnail( $event->ID(), $image_size ) . '</a></div>';
+								if (has_post_thumbnail($event->ID()) && $image_size != 'none') {
+									echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="'.$event_url.'">'.get_the_post_thumbnail($event->ID(), $image_size).'</a></div>';
 								}
-								$desc = $event->short_description( 25 );
-								if ( $show_dates ) {
-									$date_format = apply_filters( 'FHEE__espresso_event_date_range__date_format', get_option( 'date_format' ));
-									$time_format = apply_filters( 'FHEE__espresso_event_date_range__time_format', get_option( 'time_format' ));
-									$single_date_format = apply_filters( 'FHEE__espresso_event_date_range__single_date_format', get_option( 'date_format' ));
-									$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', get_option( 'time_format' ));
-									if ( $date_range == TRUE ) {
-										echo espresso_event_date_range( $date_format, $time_format, $single_date_format, $single_time_format, $event->ID() );
-									}else{
-										echo espresso_list_of_event_dates( $event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit );
+								$desc = $event->short_description(25);
+								if ($show_dates) {
+									$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', get_option('date_format'));
+									$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', get_option('time_format'));
+									$single_date_format = apply_filters('FHEE__espresso_event_date_range__single_date_format', get_option('date_format'));
+									$single_time_format = apply_filters('FHEE__espresso_event_date_range__single_time_format', get_option('time_format'));
+									if ($date_range == TRUE) {
+										echo espresso_event_date_range($date_format, $time_format, $single_date_format, $single_time_format, $event->ID());
+									} else {
+										echo espresso_list_of_event_dates($event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit);
 									}
 								}
-								if ( $show_desc && $desc ) {
-									echo '<p style="margin-top: .5em">' . $desc . '</p>';
+								if ($show_desc && $desc) {
+									echo '<p style="margin-top: .5em">'.$desc.'</p>';
 								}
 							}
 							echo '</li>';
@@ -389,7 +389,7 @@ 
 	 * @return string
 	 */
 	public function make_the_title_a_link($title) {
-	    return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+	    return '<a href="'.EEH_Event_View::event_archive_url().'">'.$title.'</a>';
 	}
 
 }

Braces +4 added lines, -2 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
  *
@@ -360,7 +362,7 @@ 
 									$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', get_option( 'time_format' ));
 									if ( $date_range == TRUE ) {
 										echo espresso_event_date_range( $date_format, $time_format, $single_date_format, $single_time_format, $event->ID() );
-									}else{
+									} else{
 										echo espresso_list_of_event_dates( $event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit );
 									}
 								}

caffeinated/payment_methods/Paypal_Pro/EE_PMT_Paypal_Pro.pm.php

Spacing +30 added lines, -30 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Paypal_Pro extends EE_PMT_Base{
+class EE_PMT_Paypal_Pro extends EE_PMT_Base {
 
 	/**
 	 * @param EE_Payment_Method $pm_instance
@@ -35,7 +35,7 @@ 
 		require_once($this->file_folder().'EEG_Paypal_Pro.gateway.php');
 		$this->_gateway = new EEG_Paypal_Pro();
 		$this->_pretty_name = __("Paypal Pro", 'event_espresso');
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
 		$this->_requires_https = true;
 		parent::__construct($pm_instance);
 	}
@@ -51,21 +51,21 @@ 
 			'extra_meta_inputs'=>array(
 //				'paypal_email'=>new EE_Email_Input(), not actually used
 				'username'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'password'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'signature'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'credit_card_types'=>new EE_Checkbox_Multi_Input(
 						$this->card_types_supported(),
 						array(
-							'html_label_text' => __( 'Card Types Supported', 'event_espresso' ),
+							'html_label_text' => __('Card Types Supported', 'event_espresso'),
 							'required' => true )),
 				)
 			)
@@ -79,10 +79,10 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Billing_Info_Form
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
-		$allowed_types = $this->_pm_instance->get_extra_meta( 'credit_card_types', TRUE );
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
+		$allowed_types = $this->_pm_instance->get_extra_meta('credit_card_types', TRUE);
 		//if allowed types is a string or empty array or null...
-		if( empty( $allowed_types )) {
+		if (empty($allowed_types)) {
 			$allowed_types = array();
 		}
 
@@ -93,26 +93,26 @@ 
 //				'html_id'=> 'ee-Paypal_Pro-billing-form',
 				'subsections'=>array(
 					'credit_card'=>new EE_Credit_Card_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Number', 'event_espresso' ))
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
 					),
 					'credit_card_type'=>new EE_Select_Input(
 						//the options are set dynamically
-						array_intersect_key( EE_PMT_Paypal_Pro::card_types_supported(), array_flip( $allowed_types )),
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Type', 'event_espresso' ))
+						array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)),
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
 					),
 					'exp_month'=>new EE_Credit_Card_Month_Input(
-						TRUE, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __( 'Expiry Month', 'event_espresso' )  )
+						TRUE, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso'))
 					),
 					'exp_year'=>new EE_Credit_Card_Year_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Expiry Year', 'event_espresso' )  )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso'))
 					),
 					'cvv'=>new EE_CVV_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'CVV', 'event_espresso' ) )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso'))
 					),
 				)
 			)
 		);
-		return $this->apply_billing_form_debug_settings( $billing_form );
+		return $this->apply_billing_form_debug_settings($billing_form);
 	}
 
 
@@ -124,19 +124,19 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
-		if ( $this->_pm_instance->debug_mode() ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
+		if ($this->_pm_instance->debug_mode()) {
 			$billing_form->add_subsections(
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
 				'credit_card'
 			);
 			$billing_form->add_subsections(
-				array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php' )),
+				array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
 				'first_name'
 			);
-			$billing_form->get_input( 'credit_card_type' )->set_default( 'Visa' );
-			$billing_form->get_input( 'exp_year' )->set_default( 2018);
-			$billing_form->get_input( 'cvv' )->set_default( '115' );
+			$billing_form->get_input('credit_card_type')->set_default('Visa');
+			$billing_form->get_input('exp_year')->set_default(2018);
+			$billing_form->get_input('cvv')->set_default('115');
 		}
 		return $billing_form;
 	}
@@ -148,7 +148,7 @@ 
 	 * Keys are their values, values are their pretty names.
 	 * @return array
 	 */
-	public static function card_types_supported(){
+	public static function card_types_supported() {
 		return array(
 			'Visa'=>  __("Visa", 'event_espresso'),
 			'MasterCard'=>  __("MasterCard", 'event_espresso'),
@@ -164,7 +164,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('PayPal Pro Settings', 'event_espresso'),
@@ -179,10 +179,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		$billing_values = parent::_get_billing_values_from_form( $billing_form );
-		$billing_values[ 'country' ] = $billing_form->get_input_value( 'country' );
-		$billing_values[ 'credit_card_type' ] = $billing_form->get_input_value( 'credit_card_type' );
+	protected function _get_billing_values_from_form($billing_form) {
+		$billing_values = parent::_get_billing_values_from_form($billing_form);
+		$billing_values['country'] = $billing_form->get_input_value('country');
+		$billing_values['credit_card_type'] = $billing_form->get_input_value('credit_card_type');
 		return $billing_values;
 	}
 

Braces +2 added lines, -1 removed lines

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

admin_pages/registrations/templates/reg_admin_details_main_meta_box_attendees.template.php

Spacing +16 added lines, -16 removed lines

@@ -3,35 +3,35 @@
 	<br/>
 <?php //echo EEH_Debug_Tools::printr( $event_attendees, 'event_attendees' ); ?>
 <?php echo $attendee_notice; ?>
-<?php if ( !empty($attendees) ) : ?>
+<?php if ( ! empty($attendees)) : ?>
 	<div class="admin-primary-mbox-tbl-wrap">
 		<table class="admin-primary-mbox-tbl">
 			<thead>
 				<tr>
-					<th class="jst-left"><?php _e( '#', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Event Name', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Attendee', 'event_espresso' );?></th>
-					<th class="jst-rght"><?php _e( 'Price Paid', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Email', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Address', 'event_espresso' );?></th>
-					<!--<th class="jst-cntr"><?php _e( 'Actions', 'event_espresso' );?></th>-->
+					<th class="jst-left"><?php _e('#', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Event Name', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Attendee', 'event_espresso'); ?></th>
+					<th class="jst-rght"><?php _e('Price Paid', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Email', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Address', 'event_espresso'); ?></th>
+					<!--<th class="jst-cntr"><?php _e('Actions', 'event_espresso'); ?></th>-->
 				</tr>
 			</thead>
 			<tbody>
 
-			<?php foreach ( $attendees as $att_nmbr => $attendee ) : ?>
+			<?php foreach ($attendees as $att_nmbr => $attendee) : ?>
 
 				<tr>
-					<td class="jst-left"><?php echo $att_nmbr;?></td>
-					<td class="jst-left"><?php echo $attendee['event_name'];?></td>
+					<td class="jst-left"><?php echo $att_nmbr; ?></td>
+					<td class="jst-left"><?php echo $attendee['event_name']; ?></td>
 					<td class="jst-left">
-						<a href="<?php echo $attendee['att_link']; ?>" title="<?php esc_attr_e( 'View details for this attendee', 'event_espresso' );?>">
-							<?php echo $attendee['fname'] . ' ' . $attendee['lname'];?>
+						<a href="<?php echo $attendee['att_link']; ?>" title="<?php esc_attr_e('View details for this attendee', 'event_espresso'); ?>">
+							<?php echo $attendee['fname'].' '.$attendee['lname']; ?>
 						</a>
 					</td>
-					<td class="jst-rght"><?php echo $currency_sign . ' ' . number_format( $attendee['final_price'], 2 );?></td>
-					<td class="jst-left"><?php echo $attendee['email'];?></td>
-					<td class="jst-left"><?php echo $attendee['address'];?></td>
+					<td class="jst-rght"><?php echo $currency_sign.' '.number_format($attendee['final_price'], 2); ?></td>
+					<td class="jst-left"><?php echo $attendee['email']; ?></td>
+					<td class="jst-left"><?php echo $attendee['address']; ?></td>
 					<!--<th class="jst-cntr">view</th>-->
 				</tr>
 

modules/core_rest_api/EED_Core_Rest_Api.module.php

Spacing +106 added lines, -106 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 use EventEspresso\core\libraries\rest_api\Calculated_Model_Fields;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -35,7 +35,7 @@ 
 	 */
 	public static function instance() {
 		self::$_field_calculator = new Calculated_Model_Fields();
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -65,10 +65,10 @@ 
 
 
 	public static function set_hooks_both() {
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'register_routes' ), 10 );
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'set_hooks_rest_api' ), 5 );
-		add_filter( 'rest_route_data', array( 'EED_Core_Rest_Api', 'hide_old_endpoints' ), 10, 2 );
-		add_filter( 'rest_index', array( 'EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index' ) );
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'register_routes'), 10);
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'set_hooks_rest_api'), 5);
+		add_filter('rest_route_data', array('EED_Core_Rest_Api', 'hide_old_endpoints'), 10, 2);
+		add_filter('rest_index', array('EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index'));
 		EED_Core_Rest_Api::invalidate_cached_route_data_on_version_change();
 	}
 
@@ -87,7 +87,7 @@ 
 	 * Loads all the hooks which make requests to old versions of the API
 	 * appear the same as they always did
 	 */
-	public static function set_hooks_for_changes(){
+	public static function set_hooks_for_changes() {
 		self::_set_hooks_for_changes();
 	}
 
@@ -97,27 +97,27 @@ 
 	 * replace it with application passwords.
 	 */
 	public static function maybe_notify_of_basic_auth_removal() {
-		if( ! isset( $_SERVER['PHP_AUTH_USER'] )
-			&& ! isset( $_SERVER['HTTP_AUTHORIZATION'] ) ) {
+		if ( ! isset($_SERVER['PHP_AUTH_USER'])
+			&& ! isset($_SERVER['HTTP_AUTHORIZATION'])) {
 			//sure it's a WP API request, but they aren't using basic auth, so don't bother them
 			return;
 		}
 		//ok they're using the WP API with Basic Auth
 		$message = sprintf(
-			__( 'We noticed you\'re using the WP API, which is used by the Event Espresso 4 mobile apps. Because of security and compatibility concerns, we will soon be removing our default authentication mechanism, WP API Basic Auth, from Event Espresso. It is recommended you instead install the %1$sWP Application Passwords plugin%2$s and use it with the EE4 Mobile apps. See %3$sour mobile app documentation%2$s for more information. %4$sIf you have installed the WP API Basic Auth plugin separately, or are not using the Event Espresso 4 mobile apps, you can disregard this message.%4$sThe Event Espresso Team', 'event_espresso' ),
+			__('We noticed you\'re using the WP API, which is used by the Event Espresso 4 mobile apps. Because of security and compatibility concerns, we will soon be removing our default authentication mechanism, WP API Basic Auth, from Event Espresso. It is recommended you instead install the %1$sWP Application Passwords plugin%2$s and use it with the EE4 Mobile apps. See %3$sour mobile app documentation%2$s for more information. %4$sIf you have installed the WP API Basic Auth plugin separately, or are not using the Event Espresso 4 mobile apps, you can disregard this message.%4$sThe Event Espresso Team', 'event_espresso'),
 			'<a href="https://wordpress.org/plugins/application-passwords/">',
 			'</a>',
 			'<a href="https://eventespresso.com/wiki/ee4-event-apps/#authentication">',
 			'<br/>'
 		);
-		EE_Error::add_persistent_admin_notice( 'using_basic_auth', $message );
-		if( ! get_option( 'ee_notified_admin_on_basic_auth_removal', false ) ) {
-			add_option( 'ee_notified_admin_on_basic_auth_removal', true );
+		EE_Error::add_persistent_admin_notice('using_basic_auth', $message);
+		if ( ! get_option('ee_notified_admin_on_basic_auth_removal', false)) {
+			add_option('ee_notified_admin_on_basic_auth_removal', true);
 			//piggy back off EE_Error::set_content_type, which sets the content type to HTML
-			add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
+			add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
 			//and send the message to the site admin too
-			wp_mail( get_option( 'admin_email' ), __( 'Notice of Removal of WP API Basic Auth From Event Espresso 4', 'event_espresso' ), $message );
-			remove_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
+			wp_mail(get_option('admin_email'), __('Notice of Removal of WP API Basic Auth From Event Espresso 4', 'event_espresso'), $message);
+			remove_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
 		}
 	}
 	/**
@@ -125,16 +125,16 @@ 
 	 * appear the same as they always did
 	 */
 	protected static function _set_hooks_for_changes() {
-		$folder_contents = EEH_File::get_contents_of_folders( array( EE_LIBRARIES . 'rest_api' . DS . 'changes' ), false );
-		foreach( $folder_contents as $classname_in_namespace => $filepath ) {
+		$folder_contents = EEH_File::get_contents_of_folders(array(EE_LIBRARIES.'rest_api'.DS.'changes'), false);
+		foreach ($folder_contents as $classname_in_namespace => $filepath) {
 			//ignore the base parent class
-			if( $classname_in_namespace === 'Changes_In_Base' ) {
+			if ($classname_in_namespace === 'Changes_In_Base') {
 				continue;
 			}
-			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\' . $classname_in_namespace;
-			if ( class_exists( $full_classname )) {
+			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\'.$classname_in_namespace;
+			if (class_exists($full_classname)) {
 				$instance_of_class = new $full_classname;
-				if ( $instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base ) {
+				if ($instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base) {
 					$instance_of_class->set_hooks();
 				}
 			}
@@ -147,16 +147,16 @@ 
 	 * so we actually prefer to only do it when an EE plugin is activated or upgraded
 	 */
 	public static function register_routes() {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					register_rest_route(
 						$namespace,
 						$endpoint,
 						array(
-							'callback' => $route[ 'callback' ],
-							'methods' => $route[ 'methods' ],
-							'args' => isset( $route[ 'args' ] ) ? $route[ 'args' ] : array(),
+							'callback' => $route['callback'],
+							'methods' => $route['methods'],
+							'args' => isset($route['args']) ? $route['args'] : array(),
 						)
 					);
 				}
@@ -170,11 +170,11 @@ 
 	 * next time the WP API is used
 	 */
 	public static function invalidate_cached_route_data_on_version_change() {
-		if( EE_System::instance()->detect_req_type() != EE_System::req_type_normal ) {
+		if (EE_System::instance()->detect_req_type() != EE_System::req_type_normal) {
 			EED_Core_Rest_Api::invalidate_cached_route_data();
 		}
-		foreach( EE_Registry::instance()->addons as $addon ){
-			if( $addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal ) {
+		foreach (EE_Registry::instance()->addons as $addon) {
+			if ($addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal) {
 				EED_Core_Rest_Api::invalidate_cached_route_data();
 			}
 		}
@@ -185,7 +185,7 @@ 
 	 */
 	public static function invalidate_cached_route_data() {
 		//delete the saved EE REST API routes
-		delete_option( EED_Core_Rest_Api::saved_routes_option_names );
+		delete_option(EED_Core_Rest_Api::saved_routes_option_names);
 	}
 
 	/**
@@ -198,8 +198,8 @@ 
 	 */
 	public static function get_ee_route_data() {
 		$ee_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoints ) {
-			$ee_routes[  self::ee_api_namespace . $version ] = self::_get_ee_route_data_for_version( $version, $hidden_endpoints );
+		foreach (self::versions_served() as $version => $hidden_endpoints) {
+			$ee_routes[self::ee_api_namespace.$version] = self::_get_ee_route_data_for_version($version, $hidden_endpoints);
 		}
 		return $ee_routes;
 	}
@@ -211,10 +211,10 @@ 
 	 * @param boolean $hidden_endpoints
 	 * @return array
 	 */
-	protected static function _get_ee_route_data_for_version( $version, $hidden_endpoints = false ) {
-		$ee_routes = get_option( self::saved_routes_option_names . $version , null );
-		if( ! $ee_routes || ( defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE )){
-			$ee_routes = self::_save_ee_route_data_for_version( $version, $hidden_endpoints );
+	protected static function _get_ee_route_data_for_version($version, $hidden_endpoints = false) {
+		$ee_routes = get_option(self::saved_routes_option_names.$version, null);
+		if ( ! $ee_routes || (defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE)) {
+			$ee_routes = self::_save_ee_route_data_for_version($version, $hidden_endpoints);
 		}
 		return $ee_routes;
 	}
@@ -228,18 +228,18 @@ 
 	 * @param boolean $hidden_endpoints
 	 * @return mixed|null|void
 	 */
-	protected static function _save_ee_route_data_for_version( $version, $hidden_endpoints = false ) {
+	protected static function _save_ee_route_data_for_version($version, $hidden_endpoints = false) {
 		$instance = self::instance();
 		$routes = apply_filters(
 			'EED_Core_Rest_Api__save_ee_route_data_for_version__routes',
 			array_replace_recursive(
-				$instance->_get_config_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_meta_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_model_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_rpc_route_data_for_version( $version, $hidden_endpoints )
+				$instance->_get_config_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_meta_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_model_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_rpc_route_data_for_version($version, $hidden_endpoints)
 			)
 		);
-		update_option( self::saved_routes_option_names . $version, $routes, true );
+		update_option(self::saved_routes_option_names.$version, $routes, true);
 		return $routes;
 	}
 
@@ -250,7 +250,7 @@ 
 	 * @return void
 	 */
 	public static function save_ee_routes() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$instance = self::instance();
 			$routes = apply_filters(
 				'EED_Core_Rest_Api__save_ee_routes__routes',
@@ -261,7 +261,7 @@ 
 					$instance->_register_rpc_routes()
 				)
 			);
-			update_option( self::saved_routes_option_names, $routes, true );
+			update_option(self::saved_routes_option_names, $routes, true);
 		}
 	}
 
@@ -272,8 +272,8 @@ 
 	 */
 	protected function _register_model_routes() {
 		$model_routes = array( );
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$model_routes[ EED_Core_Rest_Api::ee_api_namespace . $version ] = $this->_get_config_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$model_routes[EED_Core_Rest_Api::ee_api_namespace.$version] = $this->_get_config_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $model_routes;
 	}
@@ -284,8 +284,8 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_model_route_data_for_version( $version, $hidden_endpoint = false ) {
-		$model_version_info = new \EventEspresso\core\libraries\rest_api\Model_Version_Info( $version );
+	protected function _get_model_route_data_for_version($version, $hidden_endpoint = false) {
+		$model_version_info = new \EventEspresso\core\libraries\rest_api\Model_Version_Info($version);
 		$models_to_register = apply_filters(
 			'FHEE__EED_Core_REST_API___register_model_routes',
 			$model_version_info->models_for_requested_version()
@@ -294,21 +294,21 @@ 
 		unset($models_to_register['Extra_Meta']);
 		unset($models_to_register['Extra_Join']);
 		$model_routes = array();
-		foreach ( $models_to_register as $model_name => $model_classname ) {
-			$model = \EE_Registry::instance()->load_model( $model_name );
+		foreach ($models_to_register as $model_name => $model_classname) {
+			$model = \EE_Registry::instance()->load_model($model_name);
 			//yes we could just register one route for ALL models, but then they wouldn't show up in the index
-			$plural_model_route = EEH_Inflector::pluralize_and_lower( $model_name );
-			$singular_model_route = $plural_model_route . '/(?P<id>\d+)' ;
-			$model_routes[ $plural_model_route ] = array(
+			$plural_model_route = EEH_Inflector::pluralize_and_lower($model_name);
+			$singular_model_route = $plural_model_route.'/(?P<id>\d+)';
+			$model_routes[$plural_model_route] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 							'handle_request_get_all' ),
 						'methods' => WP_REST_Server::READABLE,
 						'hidden_endpoint' => $hidden_endpoint,
-						'args' => $this->_get_read_query_params( $model, $version ),
+						'args' => $this->_get_read_query_params($model, $version),
 						'_links' => array(
-							'self' => rest_url( EED_Core_Rest_Api::ee_api_namespace . $version . $singular_model_route ),
+							'self' => rest_url(EED_Core_Rest_Api::ee_api_namespace.$version.$singular_model_route),
 						)
 					),
 //						array(
@@ -319,14 +319,14 @@ 
 //							'hidden_endpoint' => $hidden_endpoint
 //						)
 				);
-			$model_routes[ $singular_model_route ] = array(
+			$model_routes[$singular_model_route] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 							'handle_request_get_one' ),
 						'methods' => WP_REST_Server::READABLE,
 						'hidden_endpoint' => $hidden_endpoint,
-						'args' => $this->_get_response_selection_query_params( $model, $version)
+						'args' => $this->_get_response_selection_query_params($model, $version)
 					),
 //						array(
 //							'callback' => array(
@@ -337,19 +337,19 @@ 
 //							),
 			);
 			//@todo: also handle  DELETE for a single item
-			foreach ( $model->relation_settings() as $relation_name => $relation_obj ) {
+			foreach ($model->relation_settings() as $relation_name => $relation_obj) {
 				$related_model_name_endpoint_part = EventEspresso\core\libraries\rest_api\controllers\model\Read::get_related_entity_name(
 					$relation_name,
 					$relation_obj
 				);
-				$model_routes[ $singular_model_route . '/' . $related_model_name_endpoint_part ] = array(
+				$model_routes[$singular_model_route.'/'.$related_model_name_endpoint_part] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 								'handle_request_get_related' ),
 							'methods' => WP_REST_Server::READABLE,
 							'hidden_endpoint' => $hidden_endpoint,
-							'args' => $this->_get_read_query_params( $relation_obj->get_other_model(), $version ),
+							'args' => $this->_get_read_query_params($relation_obj->get_other_model(), $version),
 						),
 //							array(
 //								'callback' => array(
@@ -372,8 +372,8 @@ 
 	 */
 	protected function _register_rpc_routes() {
 		$routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$routes[ self::ee_api_namespace . $version ] = $this->_get_rpc_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$routes[self::ee_api_namespace.$version] = $this->_get_rpc_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $routes;
 	}
@@ -384,10 +384,10 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_rpc_route_data_for_version( $version, $hidden_endpoint = false ) {
+	protected function _get_rpc_route_data_for_version($version, $hidden_endpoint = false) {
 		$this_versions_routes = array();
 			//checkin endpoint
-			$this_versions_routes[ 'registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)' ] = array(
+			$this_versions_routes['registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\rpc\Checkin',
@@ -398,7 +398,7 @@ 
 						'force' => array(
 							'required' => false,
 							'default' => false,
-							'description' => __( 'Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso' )
+							'description' => __('Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso')
 						)
 					)
 				)
@@ -417,7 +417,7 @@ 
 	 * @param string $version
 	 * @return array
 	 */
-	protected function _get_response_selection_query_params( \EEM_Base $model, $version ) {
+	protected function _get_response_selection_query_params(\EEM_Base $model, $version) {
 		return apply_filters(
 			'FHEE__EED_Core_Rest_Api___get_response_selection_query_params',
 			array(
@@ -428,7 +428,7 @@ 
 				'calculate' => array(
 					'required' => false,
 					'default' => '',
-					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model( $model )
+					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model($model)
 				)
 			),
 			$model,
@@ -446,13 +446,13 @@ 
 	 * @return array    describing the args acceptable when querying this model
 	 * @throws \EE_Error
 	 */
-	protected function _get_read_query_params( \EEM_Base $model, $version ) {
+	protected function _get_read_query_params(\EEM_Base $model, $version) {
 		$default_orderby = array();
-		foreach( $model->get_combined_primary_key_fields() as $key_field ) {
-			$default_orderby[ $key_field->get_name() ] = 'ASC';
+		foreach ($model->get_combined_primary_key_fields() as $key_field) {
+			$default_orderby[$key_field->get_name()] = 'ASC';
 		}
 		return array_merge(
-			$this->_get_response_selection_query_params( $model, $version ),
+			$this->_get_response_selection_query_params($model, $version),
 			array(
 				'where' => array(
 					'required' => false,
@@ -489,8 +489,8 @@ 
 	 */
 	protected function _register_config_routes() {
 		$config_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$config_routes[ self::ee_api_namespace . $version ] = $this->_get_config_route_data_for_version( $version,	$hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$config_routes[self::ee_api_namespace.$version] = $this->_get_config_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $config_routes;
 	}
@@ -501,7 +501,7 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_config_route_data_for_version( $version, $hidden_endpoint ) {
+	protected function _get_config_route_data_for_version($version, $hidden_endpoint) {
 		return array(
 			'config' => array(
 				array(
@@ -522,8 +522,8 @@ 
 	 */
 	protected function _register_meta_routes() {
 		$meta_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$meta_routes[ self::ee_api_namespace . $version ] = $this->_get_meta_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$meta_routes[self::ee_api_namespace.$version] = $this->_get_meta_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $meta_routes;
 	}
@@ -534,7 +534,7 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_meta_route_data_for_version( $version, $hidden_endpoint = false ) {
+	protected function _get_meta_route_data_for_version($version, $hidden_endpoint = false) {
 		return array(
 			'resources'  => array(
 				array(
@@ -556,25 +556,25 @@ 
 	 * @param array $route_data
 	 * @return array
 	 */
-	public static function hide_old_endpoints( $route_data ) {
+	public static function hide_old_endpoints($route_data) {
 		//allow API clients to override which endpoints get hidden, in case
 		//they want to discover particular endpoints
 		//also, we don't have access to the request so we have to just grab it from the superglobal
 		$force_show_ee_namespace = ltrim(
-			EEH_Array::is_set( $_REQUEST, 'force_show_ee_namespace', '' ),
+			EEH_Array::is_set($_REQUEST, 'force_show_ee_namespace', ''),
 			'/'
 		);
 		
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					//by default, hide "hidden_endpoint"s, unless the request indicates
 					//to $force_show_ee_namespace, in which case only show that one
 					//namespace's endpoints (and hide all others)
-					if( ( $route[ 'hidden_endpoint' ] && $force_show_ee_namespace === '' )
-						|| ( $force_show_ee_namespace !== null && $force_show_ee_namespace !== $namespace ) ) {
-						$full_route = '/' . ltrim( $namespace, '/' ) . '/' . ltrim( $endpoint, '/' );
-						unset( $route_data[ $full_route ] );
+					if (($route['hidden_endpoint'] && $force_show_ee_namespace === '')
+						|| ($force_show_ee_namespace !== null && $force_show_ee_namespace !== $namespace)) {
+						$full_route = '/'.ltrim($namespace, '/').'/'.ltrim($endpoint, '/');
+						unset($route_data[$full_route]);
 					}
 				}
 			}
@@ -613,8 +613,8 @@ 
 	 */
 	public static function latest_rest_api_version() {
 		$versions_served = \EED_Core_Rest_Api::versions_served();
-		$versions_served_keys = array_keys( $versions_served );
-		return end( $versions_served_keys );
+		$versions_served_keys = array_keys($versions_served);
+		return end($versions_served_keys);
 	}
 
 	/**
@@ -628,32 +628,32 @@ 
 	public static function versions_served() {
 		$versions_served = array();
 		$possibly_served_versions = EED_Core_Rest_Api::version_compatibilities();
-		$lowest_compatible_version = end( $possibly_served_versions);
-		reset( $possibly_served_versions );
-		$versions_served_historically = array_keys( $possibly_served_versions );
-		$latest_version = end( $versions_served_historically );
-		reset( $versions_served_historically );
+		$lowest_compatible_version = end($possibly_served_versions);
+		reset($possibly_served_versions);
+		$versions_served_historically = array_keys($possibly_served_versions);
+		$latest_version = end($versions_served_historically);
+		reset($versions_served_historically);
 		//for each version of core we have ever served:
-		foreach ( $versions_served_historically as $key_versioned_endpoint ) {
+		foreach ($versions_served_historically as $key_versioned_endpoint) {
 			//if it's not above the current core version, and it's compatible with the current version of core
-			if( $key_versioned_endpoint == $latest_version ) {
+			if ($key_versioned_endpoint == $latest_version) {
 				//don't hide the latest version in the index
-				$versions_served[ $key_versioned_endpoint ] = false;
-			} else if(
+				$versions_served[$key_versioned_endpoint] = false;
+			} else if (
 				$key_versioned_endpoint < EED_Core_Rest_Api::core_version()
 				&& $key_versioned_endpoint >= $lowest_compatible_version
 			) {
 				//include, but hide, previous versions which are still supported
-				$versions_served[ $key_versioned_endpoint ] = true;
-			} elseif(
+				$versions_served[$key_versioned_endpoint] = true;
+			} elseif (
 				apply_filters(
 					'FHEE__EED_Core_Rest_Api__versions_served__include_incompatible_versions',
 					false,
 					$possibly_served_versions
 				)
-			){
+			) {
 				//if a version is no longer supported, don't include it in index or list of versions served
-				$versions_served[ $key_versioned_endpoint ] = true;
+				$versions_served[$key_versioned_endpoint] = true;
 			}
 		}
 		return $versions_served;
@@ -666,7 +666,7 @@ 
 	 * @return string
 	 */
 	public static function core_version() {
-		return apply_filters( 'FHEE__EED_Core_REST_API__core_version', implode('.', array_slice( explode( '.', espresso_version() ), 0, 3 ) ) );
+		return apply_filters('FHEE__EED_Core_REST_API__core_version', implode('.', array_slice(explode('.', espresso_version()), 0, 3)));
 	}
 
 	/**
@@ -691,7 +691,7 @@ 
 	 * @param  WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 
 	}
 

core/libraries/messages/EE_Message_Resource_Manager.lib.php

Indentation +4 added lines, -4 removed lines

@@ -880,8 +880,8 @@ 
 	 * @return void
 	 */
 	public function deactivate_messenger( $messenger_name ) {
-        $this->_initialize_collections();
-        if ( $messenger_name instanceof EE_messenger ) {
+		$this->_initialize_collections();
+		if ( $messenger_name instanceof EE_messenger ) {
 			$messenger_name = $messenger_name->name;
 		}
 		unset( $this->_active_messengers[ $messenger_name ] );
@@ -897,7 +897,7 @@ 
 	 * @param  string $message_type_name name of message type being deactivated
 	 */
 	public function deactivate_message_type( $message_type_name ) {
-        $this->_initialize_collections();
+		$this->_initialize_collections();
 		if ( $message_type_name instanceof EE_message_type ) {
 			$message_type_name = $message_type_name->name;
 		}
@@ -927,7 +927,7 @@ 
 	 * @param string $messenger_name     Name of messenger the message type is being deactivated for.
 	 */
 	public function deactivate_message_type_for_messenger( $message_type_name, $messenger_name ) {
-        $this->_initialize_collections();
+		$this->_initialize_collections();
 		if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
 			unset( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ] );
 		}

Spacing +166 added lines, -166 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -134,13 +134,13 @@ 
 	 * @return void
 	 */
 	protected function _initialize_collections() {
-		if ( $this->_initialized ) {
+		if ($this->_initialized) {
 			return;
 		}
 		$this->_initialized = true;
 		$this->_messenger_collection_loader->load_messengers_from_folder();
 		$this->_message_type_collection_loader->load_message_types_from_folder();
-		$this->get_has_activated_messengers_option( true );
+		$this->get_has_activated_messengers_option(true);
 		$this->_set_active_messengers_and_message_types();
 	}
 
@@ -170,8 +170,8 @@ 
 	 * @param string $messenger_name
 	 * @return \EE_messenger
 	 */
-	public function get_messenger( $messenger_name ) {
-		return $this->messenger_collection()->get_by_info( $messenger_name );
+	public function get_messenger($messenger_name) {
+		return $this->messenger_collection()->get_by_info($messenger_name);
 	}
 
 
@@ -182,9 +182,9 @@ 
 	 * @param string $messenger
 	 * @return EE_messenger | null
 	 */
-	public function get_active_messenger( $messenger ) {
+	public function get_active_messenger($messenger) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_messengers[ $messenger ] ) ? $this->_active_messengers[ $messenger ] : null;
+		return ! empty($this->_active_messengers[$messenger]) ? $this->_active_messengers[$messenger] : null;
 	}
 
 
@@ -193,11 +193,11 @@ 
 	 * @return \EE_messenger[]
 	 */
 	public function installed_messengers() {
-		if ( empty( $this->_installed_messengers ) ) {
+		if (empty($this->_installed_messengers)) {
 			$this->_installed_messengers = array();
 			$this->messenger_collection()->rewind();
-			while ( $this->messenger_collection()->valid() ) {
-				$this->_installed_messengers[ $this->messenger_collection()->current()->name ] = $this->messenger_collection()->current();
+			while ($this->messenger_collection()->valid()) {
+				$this->_installed_messengers[$this->messenger_collection()->current()->name] = $this->messenger_collection()->current();
 				$this->messenger_collection()->next();
 			}
 		}
@@ -211,14 +211,14 @@ 
 	 * @return \EE_messenger
 	 * @throws \EE_Error
 	 */
-	public function valid_messenger( $messenger_name ) {
-		$messenger = $this->get_messenger( $messenger_name );
-		if ( $messenger instanceof EE_messenger ) {
+	public function valid_messenger($messenger_name) {
+		$messenger = $this->get_messenger($messenger_name);
+		if ($messenger instanceof EE_messenger) {
 			return $messenger;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The "%1$s" messenger is either invalid or not installed', 'event_espresso' ),
+				__('The "%1$s" messenger is either invalid or not installed', 'event_espresso'),
 				$messenger_name
 			)
 		);
@@ -250,8 +250,8 @@ 
 	 * @param string $message_type_name
 	 * @return \EE_message_type
 	 */
-	public function get_message_type( $message_type_name ) {
-		return $this->message_type_collection()->get_by_info( $message_type_name );
+	public function get_message_type($message_type_name) {
+		return $this->message_type_collection()->get_by_info($message_type_name);
 	}
 
 
@@ -263,9 +263,9 @@ 
 	 * @param string $message_type_name
 	 * @return \EE_message_type|null
 	 */
-	public function get_active_message_type_for_messenger( $messenger_name, $message_type_name ) {
-		return $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name )
-			? $this->get_message_type( $message_type_name )
+	public function get_active_message_type_for_messenger($messenger_name, $message_type_name) {
+		return $this->is_message_type_active_for_messenger($messenger_name, $message_type_name)
+			? $this->get_message_type($message_type_name)
 			: null;
 	}
 
@@ -279,9 +279,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_message_type_active_for_messenger( $messenger_name, $message_type_name ) {
+	public function is_message_type_active_for_messenger($messenger_name, $message_type_name) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ] );
+		return ! empty($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]);
 	}
 
 
@@ -292,9 +292,9 @@ 
 	 * @param string $messenger_name  the name of the messenger to check if active.
 	 * @return bool
 	 */
-	public function is_messenger_active( $messenger_name ) {
+	public function is_messenger_active($messenger_name) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_message_types[ $messenger_name ] );
+		return ! empty($this->_active_message_types[$messenger_name]);
 	}
 
 
@@ -305,11 +305,11 @@ 
 	 * @param string $message_type_name  The slug of the message type getting the settings for.
 	 * @return array
 	 */
-	public function get_message_type_settings_for_messenger( $messenger_name, $message_type_name ) {
+	public function get_message_type_settings_for_messenger($messenger_name, $message_type_name) {
 		$settings = array();
-		if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-			$settings =  isset( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings'] )
-				? $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings']
+		if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+			$settings = isset($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings'])
+				? $this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings']
 				: array();
 		}
 		return $settings;
@@ -324,11 +324,11 @@ 
 	 * @param string $messenger_name
 	 * @return bool
 	 */
-	public function messenger_has_active_message_types( $messenger_name ) {
+	public function messenger_has_active_message_types($messenger_name) {
 		$this->_initialize_collections();
 		return
-			! empty( $this->_active_message_types[ $messenger_name ] )
-			&& ! empty( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ] );
+			! empty($this->_active_message_types[$messenger_name])
+			&& ! empty($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types']);
 	}
 
 
@@ -341,15 +341,15 @@ 
 	 * @param string $messenger_name The messenger being checked
 	 * @return EE_message_type[]|array    (empty array if no active_message_types)
 	 */
-	public function get_active_message_types_for_messenger( $messenger_name ) {
+	public function get_active_message_types_for_messenger($messenger_name) {
 		$message_types = array();
-		if ( ! $this->messenger_has_active_message_types( $messenger_name ) ) {
+		if ( ! $this->messenger_has_active_message_types($messenger_name)) {
 			return $message_types;
 		}
 		$installed_message_types = $this->installed_message_types();
-		foreach ( $installed_message_types as $message_type_name => $message_type ) {
-			if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-				$message_types[ $message_type_name ] = $message_type;
+		foreach ($installed_message_types as $message_type_name => $message_type) {
+			if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+				$message_types[$message_type_name] = $message_type;
 			}
 		}
 		return $message_types;
@@ -367,12 +367,12 @@ 
 	public function list_of_active_message_types() {
 		$active_message_type_names = array();
 		$this->_initialize_collections();
-		foreach ( $this->_active_message_types as $messenger => $messenger_settings ) {
-			if ( ! isset( $messenger_settings['settings'][ $messenger . '-message_types' ] ) ) {
+		foreach ($this->_active_message_types as $messenger => $messenger_settings) {
+			if ( ! isset($messenger_settings['settings'][$messenger.'-message_types'])) {
 				continue;
 			}
-			foreach ( $messenger_settings['settings'][ $messenger . '-message_types' ] as $message_type_name => $message_type_config ) {
-				if ( ! in_array( $message_type_name, $active_message_type_names ) ) {
+			foreach ($messenger_settings['settings'][$messenger.'-message_types'] as $message_type_name => $message_type_config) {
+				if ( ! in_array($message_type_name, $active_message_type_names)) {
 					$active_message_type_names[] = $message_type_name;
 				}
 			}
@@ -392,9 +392,9 @@ 
 		$active_message_types = array();
 		$installed_message_types = $this->installed_message_types();
 		$active_message_type_names = $this->list_of_active_message_types();
-		foreach ( $active_message_type_names as $active_message_type_name ) {
-			if ( isset( $installed_message_types[ $active_message_type_name ] ) ) {
-				$active_message_types[ $active_message_type_name ] = $installed_message_types[ $active_message_type_name ];
+		foreach ($active_message_type_names as $active_message_type_name) {
+			if (isset($installed_message_types[$active_message_type_name])) {
+				$active_message_types[$active_message_type_name] = $installed_message_types[$active_message_type_name];
 			}
 		}
 		return $active_message_types;
@@ -406,10 +406,10 @@ 
 	 * @return \EE_message_type[]
 	 */
 	public function installed_message_types() {
-		if ( empty( $this->_installed_message_types ) ) {
+		if (empty($this->_installed_message_types)) {
 			$this->message_type_collection()->rewind();
-			while ( $this->message_type_collection()->valid() ) {
-				$this->_installed_message_types[ $this->message_type_collection()->current()->name ] = $this->message_type_collection()->current();
+			while ($this->message_type_collection()->valid()) {
+				$this->_installed_message_types[$this->message_type_collection()->current()->name] = $this->message_type_collection()->current();
 				$this->message_type_collection()->next();
 			}
 		}
@@ -422,14 +422,14 @@ 
 	 * @return \EE_message_type
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type( $message_type_name ) {
-		$message_type = $this->get_message_type( $message_type_name );
-		if ( $message_type instanceof EE_message_type ) {
+	public function valid_message_type($message_type_name) {
+		$message_type = $this->get_message_type($message_type_name);
+		if ($message_type instanceof EE_message_type) {
 			return $message_type;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The "%1$s" message type is either invalid or not installed', 'event_espresso' ),
+				__('The "%1$s" message type is either invalid or not installed', 'event_espresso'),
 				$message_type_name
 			)
 		);
@@ -445,9 +445,9 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type_for_messenger( EE_messenger $messenger, $message_type_name ) {
+	public function valid_message_type_for_messenger(EE_messenger $messenger, $message_type_name) {
 		$valid_message_types = $messenger->get_valid_message_types();
-		if ( ! in_array( $message_type_name, $valid_message_types ) ) {
+		if ( ! in_array($message_type_name, $valid_message_types)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -474,9 +474,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_active_messengers_option( $reset = false) {
-		if ( $reset ) {
-			$this->_active_message_types = get_option( 'ee_active_messengers', array() );
+	public function get_active_messengers_option($reset = false) {
+		if ($reset) {
+			$this->_active_message_types = get_option('ee_active_messengers', array());
 		}
 		return $this->_active_message_types;
 	}
@@ -490,11 +490,11 @@ 
 	 *                                 representing this data is used.
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public function update_active_messengers_option( $active_messenger_settings = array() ) {
-		$active_messenger_settings = empty( $active_messenger_settings ) ? $this->_active_message_types : $active_messenger_settings;
+	public function update_active_messengers_option($active_messenger_settings = array()) {
+		$active_messenger_settings = empty($active_messenger_settings) ? $this->_active_message_types : $active_messenger_settings;
 		//make sure _active_message_types is updated (this is the internal cache for the settings).
 		$this->_active_message_types = $active_messenger_settings;
-		return update_option( 'ee_active_messengers', $active_messenger_settings );
+		return update_option('ee_active_messengers', $active_messenger_settings);
 	}
 
 
@@ -509,9 +509,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_has_activated_messengers_option( $reset = false ) {
-		if ( $reset || empty( $this->_has_activated_messengers_and_message_types ) ) {
-			$this->_has_activated_messengers_and_message_types = get_option( 'ee_has_activated_messenger', array() );
+	public function get_has_activated_messengers_option($reset = false) {
+		if ($reset || empty($this->_has_activated_messengers_and_message_types)) {
+			$this->_has_activated_messengers_and_message_types = get_option('ee_has_activated_messenger', array());
 		}
 		return $this->_has_activated_messengers_and_message_types;
 	}
@@ -526,15 +526,15 @@ 
 	 *
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public function update_has_activated_messengers_option( $has_activated_messengers = array() ) {
+	public function update_has_activated_messengers_option($has_activated_messengers = array()) {
 		//make sure the option has been retrieved from first so we don't overwrite it accidentally.
-		if ( empty( $has_activated_messengers ) && empty( $this->_has_activated_messengers_and_message_types ) ) {
+		if (empty($has_activated_messengers) && empty($this->_has_activated_messengers_and_message_types)) {
 			$this->get_has_activated_messengers_option();
 		}
-		$has_activated_messengers = empty( $has_activated_messengers )
+		$has_activated_messengers = empty($has_activated_messengers)
 			? $this->_has_activated_messengers_and_message_types
 			: $has_activated_messengers;
-		return update_option( 'ee_has_activated_messenger', $has_activated_messengers );
+		return update_option('ee_has_activated_messenger', $has_activated_messengers);
 	}
 
 
@@ -556,8 +556,8 @@ 
 		//echo "\n\n " . __LINE__ . ") " . __METHOD__ . "() \n";
 		// list of activated messengers as set via the admin
 		// note calling `get_active_messengers_options` also initializes the _active_message_types property.
-		$this->get_active_messengers_option( true );
-		$this->ensure_messengers_are_active( array(), false, true );
+		$this->get_active_messengers_option(true);
+		$this->ensure_messengers_are_active(array(), false, true);
 		$this->update_active_messengers_option();
 		$this->update_has_activated_messengers_option();
 	}
@@ -575,11 +575,11 @@ 
 	 * @param bool   $update_option  Whether to update the option in the db or not.
 	 * @return boolean true if either already active or successfully activated.
 	 */
-	public function ensure_messenger_is_active( $messenger_name, $update_option = true ) {
-		if ( ! isset( $this->_active_messengers[ $messenger_name ] ) ) {
+	public function ensure_messenger_is_active($messenger_name, $update_option = true) {
+		if ( ! isset($this->_active_messengers[$messenger_name])) {
 			try {
-				$this->activate_messenger( $messenger_name, array(), $update_option );
-			} catch( EE_Error $e ) {
+				$this->activate_messenger($messenger_name, array(), $update_option);
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					$e->getMessage(),
 					__FILE__,
@@ -606,25 +606,25 @@ 
 	 *                                and a messenger is indicated as active, but is NOT installed, then it will automatically be
 	 *                                deactivated.
 	 */
-	public function ensure_messengers_are_active( $messenger_names = array(), $update_option = true, $verify = false ) {
-		$messenger_names = empty( $messenger_names ) ? array_keys( $this->_active_message_types ) : $messenger_names;
+	public function ensure_messengers_are_active($messenger_names = array(), $update_option = true, $verify = false) {
+		$messenger_names = empty($messenger_names) ? array_keys($this->_active_message_types) : $messenger_names;
 
 		$not_installed = array();
-		foreach( $messenger_names as $messenger_name ) {
-			if ( $verify && ! $this->messenger_collection()->has_by_name( $messenger_name ) ) {
+		foreach ($messenger_names as $messenger_name) {
+			if ($verify && ! $this->messenger_collection()->has_by_name($messenger_name)) {
 				$not_installed[] = $messenger_name;
-				$this->deactivate_messenger( $messenger_name );
+				$this->deactivate_messenger($messenger_name);
 				continue;
 			}
-			$this->ensure_messenger_is_active( $messenger_name, $update_option );
+			$this->ensure_messenger_is_active($messenger_name, $update_option);
 		}
 
-		if ( ! empty( $not_installed_messenger ) ) {
+		if ( ! empty($not_installed_messenger)) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The following messengers are either not installed or are invalid:%1$s %2$s', 'event_espresso' ),
+					__('The following messengers are either not installed or are invalid:%1$s %2$s', 'event_espresso'),
 					'<br />',
-					implode( ', ', $not_installed_messenger )
+					implode(', ', $not_installed_messenger)
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -643,18 +643,18 @@ 
 	 * @return bool  Returns true if already is active or if was activated successfully.
 	 * @throws \EE_Error
 	 */
-	public function ensure_message_type_is_active( $message_type_name, $messenger_name, $update_option = true ) {
+	public function ensure_message_type_is_active($message_type_name, $messenger_name, $update_option = true) {
 		// grab the messenger to work with.
-		$messenger = $this->valid_messenger( $messenger_name );
-		if ( $this->valid_message_type_for_messenger( $messenger, $message_type_name ) ) {
+		$messenger = $this->valid_messenger($messenger_name);
+		if ($this->valid_message_type_for_messenger($messenger, $message_type_name)) {
 			//ensure messenger is active (that's an inherent coupling between active message types and the
 			//messenger they are being activated for.
 			try {
-				if ( ! $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
+				if ( ! $this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
 					//all is good so let's just get it active
-					$this->activate_messenger( $messenger_name, array( $message_type_name ), $update_option );
+					$this->activate_messenger($messenger_name, array($message_type_name), $update_option);
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					$e->getMessage(),
 					__FILE__,
@@ -678,14 +678,14 @@ 
 	 * @param string $messenger_name      The name of the messenger that the message types are to be activated on.
 	 * @param bool   $update_option       Whether to persist the activation to the database or not (default true).
 	 */
-	public function ensure_message_types_are_active( $message_type_names, $messenger_name, $update_option = true ) {
+	public function ensure_message_types_are_active($message_type_names, $messenger_name, $update_option = true) {
 		$message_type_names = (array) $message_type_names;
-		foreach ( $message_type_names as $message_type_name ) {
+		foreach ($message_type_names as $message_type_name) {
 			// note, intentionally not updating option here because we're in a loop.
 			// We'll follow the instructions of the incoming $update_option argument after the loop.
-			$this->ensure_message_type_is_active( $message_type_name, $messenger_name, false );
+			$this->ensure_message_type_is_active($message_type_name, $messenger_name, false);
 		}
-		if ( $update_option ) {
+		if ($update_option) {
 			$this->update_active_messengers_option();
 			$this->update_has_activated_messengers_option();
 		}
@@ -712,24 +712,24 @@ 
 	) {
 		$templates = array();
 		// grab the messenger to work with.
-		$messenger = $this->messenger_collection()->get_by_info( $messenger_name );
+		$messenger = $this->messenger_collection()->get_by_info($messenger_name);
 		// it's inactive. Activate it.
-		if ( $messenger instanceof EE_messenger ) {
-			$this->_active_messengers[ $messenger->name ] = $messenger;
+		if ($messenger instanceof EE_messenger) {
+			$this->_active_messengers[$messenger->name] = $messenger;
 			//activate incoming message types set to be activated with messenger.
-			$message_type_names = $this->_activate_message_types( $messenger, $message_type_names );
+			$message_type_names = $this->_activate_message_types($messenger, $message_type_names);
 			// setup any initial settings for the messenger if necessary.
-			$this->add_settings_for_messenger( $messenger->name );
-			if ( $update_active_messengers_option ) {
+			$this->add_settings_for_messenger($messenger->name);
+			if ($update_active_messengers_option) {
 				$this->update_active_messengers_option();
 				$this->update_has_activated_messengers_option();
 			}
 			//generate new templates if necessary and ensure all related templates that are already in the database are
 			//marked active.  Note, this will also deactivate a message type for a messenger if the template
 			//cannot be successfully created during its attempt (only happens for global template attempts).
-			if ( ! empty( $message_type_names ) ) {
-				$templates = EEH_MSG_Template::generate_new_templates( $messenger->name, $message_type_names, 0, true );
-				EEH_MSG_Template::update_to_active( array( $messenger->name ), $message_type_names );
+			if ( ! empty($message_type_names)) {
+				$templates = EEH_MSG_Template::generate_new_templates($messenger->name, $message_type_names, 0, true);
+				EEH_MSG_Template::update_to_active(array($messenger->name), $message_type_names);
 			}
 		}
 		return $templates;
@@ -748,29 +748,29 @@ 
 	 *
 	 * @return array
 	 */
-	protected function _activate_message_types( EE_messenger $messenger, $message_type_names = array() ) {
+	protected function _activate_message_types(EE_messenger $messenger, $message_type_names = array()) {
 		//If $message_type_names is empty, AND $this->_active_message_types is empty, then that means
 		//things have never been initialized (which should happen on EEH_Activation::generate_message_templates).
 		//So ONLY then do we need to actually grab defaults and cycle through them.  Otherwise we
 		//only override _active_message_types when an explicit array of $message_type_names has been provided.
-		$message_type_names = empty( $message_type_names ) && ! isset( $this->_active_message_types[ $messenger->name ] )
+		$message_type_names = empty($message_type_names) && ! isset($this->_active_message_types[$messenger->name])
 			? $messenger->get_default_message_types()
 			: (array) $message_type_names;
 
 		//now we ALWAYS need to make sure that the messenger is active for the message types we're activating!
-		if ( ! isset( $this->_active_message_types[ $messenger->name ] ) ) {
-			$this->_active_message_types[ $messenger->name ]['settings'] = array();
+		if ( ! isset($this->_active_message_types[$messenger->name])) {
+			$this->_active_message_types[$messenger->name]['settings'] = array();
 		}
 
-		if ( $message_type_names ) {
+		if ($message_type_names) {
 			// cycle thru message types
-			foreach ( $message_type_names as $message_type_name ) {
+			foreach ($message_type_names as $message_type_name) {
 				//only register the message type as active IF it isn't already active
 				//and if its actually installed.
 				if (
-					! $this->is_message_type_active_for_messenger( $messenger->name, $message_type_name )
+					! $this->is_message_type_active_for_messenger($messenger->name, $message_type_name)
 				) {
-					$this->add_settings_for_message_type( $messenger->name, $message_type_name );
+					$this->add_settings_for_message_type($messenger->name, $message_type_name);
 					$this->_set_messenger_has_activated_message_type(
 						$messenger,
 						$message_type_name
@@ -793,24 +793,24 @@ 
 	 * @param  string       $message_type_name The name of the message type adding the settings for
 	 * @param  array        $new_settings     Any new settings being set for the message type and messenger
 	 */
-	public function add_settings_for_message_type( $messenger_name, $message_type_name, $new_settings = array() ) {
+	public function add_settings_for_message_type($messenger_name, $message_type_name, $new_settings = array()) {
 		// get installed message type from collection
-		$message_type = $this->message_type_collection()->get_by_info( $message_type_name );
-		$existing_settings = $this->get_message_type_settings_for_messenger( $messenger_name, $message_type_name );
+		$message_type = $this->message_type_collection()->get_by_info($message_type_name);
+		$existing_settings = $this->get_message_type_settings_for_messenger($messenger_name, $message_type_name);
 		//we need to setup any initial settings for message types
-		if ( $message_type instanceof EE_message_type ) {
+		if ($message_type instanceof EE_message_type) {
 			$default_settings = $message_type->get_admin_settings_fields();
-			foreach ( $default_settings as $field => $values ) {
-				if ( isset( $new_settings[ $field ] ) ) {
-					$existing_settings[ $field ] = $new_settings[ $field ];
+			foreach ($default_settings as $field => $values) {
+				if (isset($new_settings[$field])) {
+					$existing_settings[$field] = $new_settings[$field];
 					continue;
 				}
-				if ( ! isset( $existing_settings[ $field ] ) ) {
-					$existing_settings[ $field ] = $values['default'];
+				if ( ! isset($existing_settings[$field])) {
+					$existing_settings[$field] = $values['default'];
 				}
 			}
 		}
-		$this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings'] = $existing_settings;
+		$this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings'] = $existing_settings;
 	}
 
 
@@ -823,20 +823,20 @@ 
 	 * @param \EE_messenger $messenger
 	 * @param string        $message_type_name
 	 */
-	protected function _set_messenger_has_activated_message_type( EE_messenger $messenger, $message_type_name ) {
+	protected function _set_messenger_has_activated_message_type(EE_messenger $messenger, $message_type_name) {
 
 		//if _has_activated_messengers_and_message_types is empty then lets ensure its initialized
-		if ( empty( $this->_has_activated_messengers_and_message_types ) ) {
+		if (empty($this->_has_activated_messengers_and_message_types)) {
 			$this->get_has_activated_messengers_option();
 		}
 
 		// make sure this messenger has a record in the has_activated array
-		if ( ! isset( $this->_has_activated_messengers_and_message_types[ $messenger->name ] ) ) {
-			$this->_has_activated_messengers_and_message_types[ $messenger->name ] = array();
+		if ( ! isset($this->_has_activated_messengers_and_message_types[$messenger->name])) {
+			$this->_has_activated_messengers_and_message_types[$messenger->name] = array();
 		}
 		// check if message type has already been added
-		if ( ! in_array( $message_type_name, $this->_has_activated_messengers_and_message_types[ $messenger->name ] ) ) {
-			$this->_has_activated_messengers_and_message_types[ $messenger->name ][] = $message_type_name;
+		if ( ! in_array($message_type_name, $this->_has_activated_messengers_and_message_types[$messenger->name])) {
+			$this->_has_activated_messengers_and_message_types[$messenger->name][] = $message_type_name;
 		}
 	}
 
@@ -851,20 +851,20 @@ 
 	 * @param string        $messenger_name The name of the messenger the settings is being added for.
 	 * @param array         $new_settings   An array of settings to update the existing settings.
 	 */
-	public function add_settings_for_messenger( $messenger_name, $new_settings = array() ) {
-		$messenger = $this->get_messenger( $messenger_name );
-		if ( $messenger instanceof EE_messenger ) {
+	public function add_settings_for_messenger($messenger_name, $new_settings = array()) {
+		$messenger = $this->get_messenger($messenger_name);
+		if ($messenger instanceof EE_messenger) {
 			$msgr_settings = $messenger->get_admin_settings_fields();
-			if ( ! empty( $msgr_settings ) ) {
-				foreach ( $msgr_settings as $field => $value ) {
+			if ( ! empty($msgr_settings)) {
+				foreach ($msgr_settings as $field => $value) {
 					//is there a new setting for this?
-					if ( isset( $new_settings[ $field ] ) ) {
-						$this->_active_message_types[ $messenger->name ]['settings'][ $field ] = $new_settings[ $field ];
+					if (isset($new_settings[$field])) {
+						$this->_active_message_types[$messenger->name]['settings'][$field] = $new_settings[$field];
 						continue;
 					}
 					//only set the default if it isn't already set.
-					if ( ! isset( $this->_active_message_types[ $messenger->name ]['settings'][ $field ] ) ) {
-						$this->_active_message_types[ $messenger->name ]['settings'][ $field ] = $value;
+					if ( ! isset($this->_active_message_types[$messenger->name]['settings'][$field])) {
+						$this->_active_message_types[$messenger->name]['settings'][$field] = $value;
 					}
 				}
 			}
@@ -879,14 +879,14 @@ 
 	 * @param  string|EE_messenger $messenger_name name of messenger
 	 * @return void
 	 */
-	public function deactivate_messenger( $messenger_name ) {
+	public function deactivate_messenger($messenger_name) {
         $this->_initialize_collections();
-        if ( $messenger_name instanceof EE_messenger ) {
+        if ($messenger_name instanceof EE_messenger) {
 			$messenger_name = $messenger_name->name;
 		}
-		unset( $this->_active_messengers[ $messenger_name ] );
-		unset( $this->_active_message_types[ $messenger_name ] );
-		$this->_message_template_group_model->deactivate_message_template_groups_for( $messenger_name );
+		unset($this->_active_messengers[$messenger_name]);
+		unset($this->_active_message_types[$messenger_name]);
+		$this->_message_template_group_model->deactivate_message_template_groups_for($messenger_name);
 		$this->update_active_messengers_option();
 	}
 
@@ -896,22 +896,22 @@ 
 	 *
 	 * @param  string $message_type_name name of message type being deactivated
 	 */
-	public function deactivate_message_type( $message_type_name ) {
+	public function deactivate_message_type($message_type_name) {
         $this->_initialize_collections();
-		if ( $message_type_name instanceof EE_message_type ) {
+		if ($message_type_name instanceof EE_message_type) {
 			$message_type_name = $message_type_name->name;
 		}
-		foreach ( $this->_active_message_types as $messenger_name => $settings ) {
+		foreach ($this->_active_message_types as $messenger_name => $settings) {
 			unset(
-				$this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]
+				$this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]
 			);
 
 			//we always record (even on deactivation) that a message type has been activated because there should at
 			//least be a record in the "has_activated" option that it WAS active at one point.
-			$messenger = $this->get_messenger( $messenger_name );
-			$this->_set_messenger_has_activated_message_type( $messenger, $message_type_name );
+			$messenger = $this->get_messenger($messenger_name);
+			$this->_set_messenger_has_activated_message_type($messenger, $message_type_name);
 		}
-		$this->_message_template_group_model->deactivate_message_template_groups_for( '', $message_type_name );
+		$this->_message_template_group_model->deactivate_message_template_groups_for('', $message_type_name);
 		$this->update_active_messengers_option();
 		$this->update_has_activated_messengers_option();
 	}
@@ -926,12 +926,12 @@ 
 	 * @param string $message_type_name  Name of message type being deactivated.
 	 * @param string $messenger_name     Name of messenger the message type is being deactivated for.
 	 */
-	public function deactivate_message_type_for_messenger( $message_type_name, $messenger_name ) {
+	public function deactivate_message_type_for_messenger($message_type_name, $messenger_name) {
         $this->_initialize_collections();
-		if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-			unset( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ] );
+		if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+			unset($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]);
 		}
-		$this->_message_template_group_model->deactivate_message_template_groups_for( array( $messenger_name ), array( $message_type_name ) );
+		$this->_message_template_group_model->deactivate_message_template_groups_for(array($messenger_name), array($message_type_name));
 		$this->update_active_messengers_option();
 	}
 
@@ -948,12 +948,12 @@ 
 	 *
 	 * @return bool true is a generating messenger and can be sent OR FALSE meaning cannot send.
 	 */
-	public function is_generating_messenger_and_active( EE_messenger $messenger, EE_message_type $message_type ) {
+	public function is_generating_messenger_and_active(EE_messenger $messenger, EE_message_type $message_type) {
 		//get the $messengers the message type says it can be used with.
-		foreach ( $message_type->with_messengers() as $generating_messenger => $secondary_messengers ) {
+		foreach ($message_type->with_messengers() as $generating_messenger => $secondary_messengers) {
 			if (
 				$messenger->name === $generating_messenger
-				&& $this->is_message_type_active_for_messenger( $messenger->name, $message_type->name )
+				&& $this->is_message_type_active_for_messenger($messenger->name, $message_type->name)
 			) {
 				return true;
 			}
@@ -990,25 +990,25 @@ 
 	 *                           or all contexts indexed by message type.
 	 * @return array
 	 */
-	public function get_all_contexts( $slugs_only = true ) {
+	public function get_all_contexts($slugs_only = true) {
 		$key = $slugs_only ? 'slugs' : 'all';
 		// check if contexts has been setup yet.
-		if ( empty( $this->_contexts[ $key ] ) ) {
+		if (empty($this->_contexts[$key])) {
 			// So let's get all active message type objects and loop through to get all unique contexts
-			foreach ( $this->get_active_message_type_objects() as $message_type ) {
-				if ( $message_type instanceof EE_message_type ) {
+			foreach ($this->get_active_message_type_objects() as $message_type) {
+				if ($message_type instanceof EE_message_type) {
 					$message_type_contexts = $message_type->get_contexts();
-					if ( $slugs_only ) {
-						foreach ( $message_type_contexts as $context => $context_details ) {
-							$this->_contexts[ $key ][ $context ] = $context_details[ 'label' ];
+					if ($slugs_only) {
+						foreach ($message_type_contexts as $context => $context_details) {
+							$this->_contexts[$key][$context] = $context_details['label'];
 						}
 					} else {
-						$this->_contexts[ $key ][ $message_type->name ] = $message_type_contexts;
+						$this->_contexts[$key][$message_type->name] = $message_type_contexts;
 					}
 				}
 			}
 		}
-		return ! empty( $this->_contexts[ $key ] ) ? $this->_contexts[ $key ] : array();
+		return ! empty($this->_contexts[$key]) ? $this->_contexts[$key] : array();
 	}
 
 
@@ -1027,9 +1027,9 @@ 
 		$installed_message_types = $this->installed_message_types();
 		$all_message_types_valid = true;
 		//loop through list of active message types and verify they are installed.
-		foreach( $list_of_active_message_type_names as $message_type_name ) {
-			if ( ! isset( $installed_message_types[$message_type_name] ) ) {
-				$this->deactivate_message_type( $message_type_name );
+		foreach ($list_of_active_message_type_names as $message_type_name) {
+			if ( ! isset($installed_message_types[$message_type_name])) {
+				$this->deactivate_message_type($message_type_name);
 				$all_message_types_valid = false;
 			}
 		}
@@ -1048,10 +1048,10 @@ 
 	 * @param $messenger_name
 	 * @return bool
 	 */
-	public function has_message_type_been_activated_for_messenger( $message_type_name, $messenger_name ) {
+	public function has_message_type_been_activated_for_messenger($message_type_name, $messenger_name) {
 		$has_activated = $this->get_has_activated_messengers_option();
-		return isset( $has_activated[ $messenger_name ] )
-			&& in_array( $message_type_name, $has_activated[ $messenger_name ] );
+		return isset($has_activated[$messenger_name])
+			&& in_array($message_type_name, $has_activated[$messenger_name]);
 	}
 }
 // End of file EE_Message_Resource_Manager.lib.php

core/libraries/shortcodes/EE_Attendee_Shortcodes.lib.php

Indentation +20 added lines, -20 removed lines

@@ -39,10 +39,10 @@ 
 
 
 
-    /**
-     * EE_Attendee_Shortcodes constructor.
-     */
-    public function __construct() {
+	/**
+	 * EE_Attendee_Shortcodes constructor.
+	 */
+	public function __construct() {
 		parent::__construct();
 	}
 
@@ -72,15 +72,15 @@ 
 
 
 
-    /**
-     * handles shortcode parsing
-     *
-     * @access protected
-     * @param  string $shortcode the shortcode to be parsed.
-     * @return string
-     * @throws \EE_Error
-     */
-    protected function _parser( $shortcode ) {
+	/**
+	 * handles shortcode parsing
+	 *
+	 * @access protected
+	 * @param  string $shortcode the shortcode to be parsed.
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	protected function _parser( $shortcode ) {
 
 
 		$this->_xtra = !empty($this->_extra_data ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : NULL;
@@ -91,9 +91,9 @@ 
 		if ( ! $registration instanceof EE_Registration ) {
 			//let's attempt to get the txn_id for the error message.
 			$txn_id = isset( $this->_xtra->txn ) && $this->_xtra->txn instanceof EE_Transaction ? $this->_xtra->txn->ID() : __('Unknown', 'event_espresso' );
-            $msg = __('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.',
-                    'event_espresso');
-            $dev_msg = sprintf(__('The transaction ID for this request is: %s', 'event_espresso'), $txn_id);
+			$msg = __('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.',
+					'event_espresso');
+			$dev_msg = sprintf(__('The transaction ID for this request is: %s', 'event_espresso'), $txn_id);
 			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
 		}
 
@@ -101,10 +101,10 @@ 
 		$attendee = isset( $this->_xtra->registrations[$registration->ID()]['att_obj'] ) ?  $this->_xtra->registrations[$registration->ID()]['att_obj'] : null ;
 
 		if ( ! $attendee instanceof EE_Attendee ) {
-            $msg = __('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.',
-                'event_espresso');
-            $dev_msg = sprintf(__('The registration ID for this request is: %s', 'event_espresso'),
-                $registration->ID());
+			$msg = __('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.',
+				'event_espresso');
+			$dev_msg = sprintf(__('The registration ID for this request is: %s', 'event_espresso'),
+				$registration->ID());
 			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -65,7 +65,7 @@ 
 			'[ADDRESS2]' => __('Whatever was in the address 2 field for the registration.', 'event_espresso'),
 			'[CITY]' => __('The city for the registration.', 'event_espresso'),
 			'[ZIP_PC]' => __('The ZIP (or Postal) Code for the Registration.', 'event_espresso'),
-			'[ADDRESS_STATE]' => __('The state/province for the registration.', 'event_espresso' ),
+			'[ADDRESS_STATE]' => __('The state/province for the registration.', 'event_espresso'),
 			'[COUNTRY]' => __('The country for the registration.', 'event_espresso')
 			);
 	}
@@ -80,27 +80,27 @@ 
      * @return string
      * @throws \EE_Error
      */
-    protected function _parser( $shortcode ) {
+    protected function _parser($shortcode) {
 
 
-		$this->_xtra = !empty($this->_extra_data ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : NULL;
+		$this->_xtra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : NULL;
 
 		//incoming object should only be a registration object.
 		$registration = ! $this->_data instanceof EE_Registration ? NULL : $this->_data;
 
-		if ( ! $registration instanceof EE_Registration ) {
+		if ( ! $registration instanceof EE_Registration) {
 			//let's attempt to get the txn_id for the error message.
-			$txn_id = isset( $this->_xtra->txn ) && $this->_xtra->txn instanceof EE_Transaction ? $this->_xtra->txn->ID() : __('Unknown', 'event_espresso' );
+			$txn_id = isset($this->_xtra->txn) && $this->_xtra->txn instanceof EE_Transaction ? $this->_xtra->txn->ID() : __('Unknown', 'event_espresso');
             $msg = __('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.',
                     'event_espresso');
             $dev_msg = sprintf(__('The transaction ID for this request is: %s', 'event_espresso'), $txn_id);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
 		//attendee obj for this registration
-		$attendee = isset( $this->_xtra->registrations[$registration->ID()]['att_obj'] ) ?  $this->_xtra->registrations[$registration->ID()]['att_obj'] : null ;
+		$attendee = isset($this->_xtra->registrations[$registration->ID()]['att_obj']) ? $this->_xtra->registrations[$registration->ID()]['att_obj'] : null;
 
-		if ( ! $attendee instanceof EE_Attendee ) {
+		if ( ! $attendee instanceof EE_Attendee) {
             $msg = __('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.',
                 'event_espresso');
             $dev_msg = sprintf(__('The registration ID for this request is: %s', 'event_espresso'),
@@ -108,7 +108,7 @@ 
 			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[FNAME]' :
 				return $attendee->fname();

Braces +2 added lines, -1 removed lines

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

admin_pages/support/templates/support_admin_details_shortcodes_event_listings.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,13 +1,13 @@
 <div class="padding">
 	<p>
-        <?php esc_html_e('Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.', 'event_espresso'); ?> <?php echo sprintf( esc_html__('For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.', 'event_espresso'), '<a href="https://eventespresso.com/wiki/ee4-shortcodes-template-variables/">', '</a>' ); ?>
+        <?php esc_html_e('Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.', 'event_espresso'); ?> <?php echo sprintf(esc_html__('For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.', 'event_espresso'), '<a href="https://eventespresso.com/wiki/ee4-shortcodes-template-variables/">', '</a>'); ?>
     </p>
 		<ul>
 			<li><strong><?php esc_html_e('Show a list of all of your events', 'event_espresso'); ?></strong><br /> [ESPRESSO_EVENTS]</li>
 			<li><strong><?php esc_html_e('Set a custom title for the event list', 'event_espresso'); ?></strong><br /> [ESPRESSO_EVENTS title="My Super Event List"]</li>
 			<li><strong><?php esc_html_e('Limit (paginate) the number of events that are shown in the event list on a page or post', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS limit=5]</li>
 			<li><strong><?php esc_html_e('Add a custom CSS class to each event post/article', 'event_espresso'); ?></strong><br /> [ESPRESSO_EVENTS css_class=my-custom-class]</li>
-			<li><strong><?php esc_html_e('Filter the event list by month and year', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS month="<?php echo date( 'F Y' ); ?>"]</li>
+			<li><strong><?php esc_html_e('Filter the event list by month and year', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS month="<?php echo date('F Y'); ?>"]</li>
 			<li><strong><?php esc_html_e('Show expired events in the event list', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS show_expired=true]</li>
 			<li><strong><?php esc_html_e('Sorts the event list in ascending order', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS sort=ASC]</li>
 			<li><strong><?php esc_html_e('Sorts the event list in descending order', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS sort=DESC]</li>

admin_pages/registration_form/Registration_Form_Admin_Page.core.php

Spacing +149 added lines, -149 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -68,12 +68,12 @@ 
 	 * 		@param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * 		@access public
 	 */
-	public function __construct( $routing = TRUE ) {
-		require_once( EE_MODELS . 'EEM_Question.model.php' );
-		require_once( EE_MODELS . 'EEM_Question_Group.model.php' );
-		$this->_question_model=  EEM_Question::instance();
-		$this->_question_group_model=EEM_Question_Group::instance();
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		require_once(EE_MODELS.'EEM_Question.model.php');
+		require_once(EE_MODELS.'EEM_Question_Group.model.php');
+		$this->_question_model = EEM_Question::instance();
+		$this->_question_group_model = EEM_Question_Group::instance();
+		parent::__construct($routing);
 	}
 
 
@@ -109,7 +109,7 @@ 
 	 *_set_page_routes
 	 */
 	protected function _set_page_routes() {
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
 		$this->_page_routes = array(
 			'default' => array(
 				'func' => '_questions_overview_list_table',
@@ -130,7 +130,7 @@ 
 
 			'update_question' => array(
 				'func' => '_insert_or_update_question',
-				'args' => array('new_question' => FALSE ),
+				'args' => array('new_question' => FALSE),
 				'capability' => 'ee_edit_question',
 				'obj_id' => $qst_id,
 				'noheader' => TRUE,
@@ -165,7 +165,7 @@ 
 						'filename' => 'registration_form_questions_overview_views_bulk_actions_search'
 						)
 					),
-				'help_tour' => array( 'Registration_Form_Questions_Overview_Help_Tour'),
+				'help_tour' => array('Registration_Form_Questions_Overview_Help_Tour'),
 				'require_nonce' => FALSE,
 				'qtips' => array(
 					'EE_Registration_Form_Tips'
@@ -184,7 +184,7 @@ 
 						'filename' => 'registration_form_question_groups'
 						),
 					),
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -193,16 +193,16 @@ 
 					'label' => esc_html__('Edit Question', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_edit_question_group_help_tab' => array(
 						'title' => esc_html__('Edit Question', 'event_espresso'),
 						'filename' => 'registration_form_edit_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			);
@@ -230,7 +230,7 @@ 
 	//none of the below group are currently used for Event Categories
 	protected function _add_feature_pointers() {}
 	public function load_scripts_styles() {
-		wp_register_style( 'espresso_registration', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_registration', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_registration');
 	}
 	public function admin_init() {}
@@ -246,20 +246,20 @@ 
 
 	public function load_scripts_styles_add_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 	public function load_scripts_styles_edit_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 
 
 
 
 	public function recaptcha_info_help_tab() {
-		$template = REGISTRATION_FORM_TEMPLATE_PATH . 'recaptcha_info_help_tab.template.php';
+		$template = REGISTRATION_FORM_TEMPLATE_PATH.'recaptcha_info_help_tab.template.php';
 		EEH_Template::display_template($template, array());
 	}
 
@@ -291,7 +291,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_questions', 'espresso_registration_form_trash_questions' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => esc_html__('Trash', 'event_espresso'),
@@ -309,9 +309,9 @@ 
 	 */
 	protected function _questions_groups_preview() {
 		$this->_admin_page_title = esc_html__('Question Groups (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . REGISTRATION_FORM_ASSETS_URL . 'caf_reg_form_preview.jpg" alt="' . esc_attr__( 'Preview Question Groups Overview List Table screenshot', 'event_espresso' ) . '" />';
-		$this->_template_args['preview_text'] = '<strong>'.esc_html__( 'Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso' ).'</strong>';
-		$this->display_admin_caf_preview_page( 'question_groups_tab' );
+		$this->_template_args['preview_img'] = '<img src="'.REGISTRATION_FORM_ASSETS_URL.'caf_reg_form_preview.jpg" alt="'.esc_attr__('Preview Question Groups Overview List Table screenshot', 'event_espresso').'" />';
+		$this->_template_args['preview_text'] = '<strong>'.esc_html__('Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso').'</strong>';
+		$this->display_admin_caf_preview_page('question_groups_tab');
 	}
 
 
@@ -322,58 +322,58 @@ 
 	 * @param \EEM_Base $model
 	 * @return array where each key is the name of a model's field/db column, and each value is its value.
 	 */
-	protected function _set_column_values_for(EEM_Base $model){
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=array();
+	protected function _set_column_values_for(EEM_Base $model) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = array();
 
 		//some initial checks for proper values.
 		//if QST_admin_only, then no matter what QST_required is we disable.
-		if ( !empty( $this->_req_data['QST_admin_only'] ) ) {
+		if ( ! empty($this->_req_data['QST_admin_only'])) {
 			$this->_req_data['QST_required'] = 0;
 		}
-		foreach($model->field_settings() as $fieldName=>$settings){
+		foreach ($model->field_settings() as $fieldName=>$settings) {
 			// basically if QSG_identifier is empty or not set
-			if ( $fieldName === 'QSG_identifier' && ( isset( $this->_req_data['QSG_identifier'] ) && empty( $this->_req_data['QSG_identifier'] ) )) {
-				$QSG_name = isset( $this->_req_data['QSG_name'] ) ? $this->_req_data['QSG_name'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title($QSG_name ) . '-' . uniqid( '', true );
+			if ($fieldName === 'QSG_identifier' && (isset($this->_req_data['QSG_identifier']) && empty($this->_req_data['QSG_identifier']))) {
+				$QSG_name = isset($this->_req_data['QSG_name']) ? $this->_req_data['QSG_name'] : '';
+				$set_column_values[$fieldName] = sanitize_title($QSG_name).'-'.uniqid('', true);
 //				dd($set_column_values);
 			}
 			//if the admin label is blank, use a slug version of the question text
-			else if ( $fieldName === 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
-				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
+			else if ($fieldName === 'QST_admin_label' && (isset($this->_req_data['QST_admin_label']) && empty($this->_req_data['QST_admin_label']))) {
+				$QST_text = isset($this->_req_data['QST_display_text']) ? $this->_req_data['QST_display_text'] : '';
+				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text, 10));
 			}
 
 
-			else if ( $fieldName === 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			else if ($fieldName === 'QST_admin_only' && ( ! isset($this->_req_data['QST_admin_only']))) {
 				$set_column_values[$fieldName] = 0;
 			}
 
-			else if ( $fieldName === 'QST_max' ) {
+			else if ($fieldName === 'QST_max') {
 				$qst_system = EEM_Question::instance()->get_var(
 					array(
 						array(
-							'QST_ID' => isset( $this->_req_data[ 'QST_ID' ] ) ? $this->_req_data[ 'QST_ID' ] : 0
+							'QST_ID' => isset($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0
 						)
 					),
 					'QST_system' );
-				$max_max = EEM_Question::instance()->absolute_max_for_system_question( $qst_system );
-				if( empty( $this->_req_data[ 'QST_max' ] ) ||
-					 $this->_req_data[ 'QST_max' ] > $max_max ) {
-					$set_column_values[ $fieldName ] = $max_max;
+				$max_max = EEM_Question::instance()->absolute_max_for_system_question($qst_system);
+				if (empty($this->_req_data['QST_max']) ||
+					 $this->_req_data['QST_max'] > $max_max) {
+					$set_column_values[$fieldName] = $max_max;
 				}
 			}
 
 
 			//only add a property to the array if it's not null (otherwise the model should just use the default value)
-			if(
-				! isset( $set_column_values[ $fieldName ] ) &&
-				isset($this->_req_data[$fieldName] ) ){
-				$set_column_values[$fieldName]=$this->_req_data[$fieldName];
+			if (
+				! isset($set_column_values[$fieldName]) &&
+				isset($this->_req_data[$fieldName]) ) {
+				$set_column_values[$fieldName] = $this->_req_data[$fieldName];
 			}
 
 		}
-		return $set_column_values;//validation fo this data to be performed by the model before insertion.
+		return $set_column_values; //validation fo this data to be performed by the model before insertion.
 	}
 
 
@@ -392,39 +392,39 @@ 
 	 * _edit_question
 	 */
 	protected function _edit_question() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QST_ID'] ) && ! empty( $this->_req_data['QST_ID'] ) ? absint( $this->_req_data['QST_ID'] ) : FALSE;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QST_ID']) && ! empty($this->_req_data['QST_ID']) ? absint($this->_req_data['QST_ID']) : FALSE;
 
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_question' :
-				$this->_admin_page_title = esc_html__( 'Add Question', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add Question', 'event_espresso');
 				break;
 			case 'edit_question' :
-				$this->_admin_page_title = esc_html__( 'Edit Question', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Question', 'event_espresso');
 				break;
 			default :
-				$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		}
 
 		// add PRC_ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QST_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
-			$question= EE_Question::new_instance();
+		} else {
+			$question = EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
 		}
-		$question_types = $question->has_answers() ?  $this->_question_model->question_types_in_same_category( $question->type() ) : $this->_question_model->allowed_question_types();
-		$this->_template_args['QST_ID']=$ID;
-		$this->_template_args['question']=$question;
-		$this->_template_args['question_types']= $question_types;
-		$this->_template_args['max_max'] = EEM_Question::instance()->absolute_max_for_system_question( $question->system_ID() );
+		$question_types = $question->has_answers() ? $this->_question_model->question_types_in_same_category($question->type()) : $this->_question_model->allowed_question_types();
+		$this->_template_args['QST_ID'] = $ID;
+		$this->_template_args['question'] = $question;
+		$this->_template_args['question_types'] = $question_types;
+		$this->_template_args['max_max'] = EEM_Question::instance()->absolute_max_for_system_question($question->system_ID());
 		$this->_template_args['question_type_descriptions'] = $this->_get_question_type_descriptions();
-		$this->_set_publish_post_box_vars( 'id', $ID );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'questions_main_meta_box.template.php', $this->_template_args, TRUE );
+		$this->_set_publish_post_box_vars('id', $ID);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'questions_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -439,18 +439,18 @@ 
 		EE_Registry::instance()->load_helper('HTML');
 		$descriptions = '';
 		$question_type_descriptions = EEM_Question::instance()->question_descriptions();
-		foreach ( $question_type_descriptions as $type => $question_type_description ) {
-			if ( $type == 'HTML_TEXTAREA' ) {
+		foreach ($question_type_descriptions as $type => $question_type_description) {
+			if ($type == 'HTML_TEXTAREA') {
 				$html = new EE_Simple_HTML_Validation_Strategy();
 				$question_type_description .= sprintf(
-					esc_html__( '%1$s(allowed tags: %2$s)', 'event_espresso' ),
+					esc_html__('%1$s(allowed tags: %2$s)', 'event_espresso'),
 					'<br/>',
 					$html->get_list_of_allowed_tags()
 				);
 			}
 			$descriptions .= EEH_HTML::p(
 				$question_type_description,
-				'question_type_description-' . $type,
+				'question_type_description-'.$type,
 				'question_type_description description',
 				'display:none;'
 			);
@@ -464,58 +464,58 @@ 
 	 * @param bool|true $new_question
 	 * @throws \EE_Error
 	 */
-	protected function _insert_or_update_question( $new_question = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_model);
-		if($new_question){
-			$ID=$this->_question_model->insert($set_column_values);
+	protected function _insert_or_update_question($new_question = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_model);
+		if ($new_question) {
+			$ID = $this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
-			$ID=absint($this->_req_data['QST_ID']);
-			$pk=$this->_question_model->primary_key_name();
-			$wheres=array($pk=>$ID);
+		} else {
+			$ID = absint($this->_req_data['QST_ID']);
+			$pk = $this->_question_model->primary_key_name();
+			$wheres = array($pk=>$ID);
 			unset($set_column_values[$pk]);
-			$success= $this->_question_model->update($set_column_values,array($wheres));
-			$action_desc='updated';
+			$success = $this->_question_model->update($set_column_values, array($wheres));
+			$action_desc = 'updated';
 		}
 
-		if ($ID){
+		if ($ID) {
 			//save the related options
 			//trash removed options, save old ones
 			//get list of all options
 			/** @type EE_Question $question */
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$options=$question->options();
-			if(! empty($options)){
-				foreach($options as $option_ID=>$option){
-					$option_req_index=$this->_get_option_req_data_index($option_ID);
-					if($option_req_index!==FALSE){
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$options = $question->options();
+			if ( ! empty($options)) {
+				foreach ($options as $option_ID=>$option) {
+					$option_req_index = $this->_get_option_req_data_index($option_ID);
+					if ($option_req_index !== FALSE) {
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else {
 						//not found, remove it
 						$option->delete();
 					}
 				}
 			}
 			//save new related options
-			foreach($this->_req_data['question_options'] as $index=>$option_req_data){
-				if( empty($option_req_data['QSO_ID'] ) && (  ( isset( $option_req_data['QSO_value'] ) && $option_req_data['QSO_value'] !== '' ) || ! empty( $option_req_data['QSO_desc'] ) ) ) {//no ID! save it!
-					if( ! isset( $option_req_data['QSO_value'] ) || $option_req_data['QSO_value'] === ''  ){
-						$option_req_data['QSO_value']=$option_req_data['QSO_desc'];
+			foreach ($this->_req_data['question_options'] as $index=>$option_req_data) {
+				if (empty($option_req_data['QSO_ID']) && ((isset($option_req_data['QSO_value']) && $option_req_data['QSO_value'] !== '') || ! empty($option_req_data['QSO_desc']))) {//no ID! save it!
+					if ( ! isset($option_req_data['QSO_value']) || $option_req_data['QSO_value'] === '') {
+						$option_req_data['QSO_value'] = $option_req_data['QSO_desc'];
 					}
-					$new_option=EE_Question_Option::new_instance( array( 'QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
+					$new_option = EE_Question_Option::new_instance(array('QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
 					$new_option->save();
 				}
 			}
 		}
-		$query_args = array( 'action' => 'edit_question', 'QST_ID' => $ID );
-		if ( $success !== FALSE ) {
-			$msg = $new_question ? sprintf( esc_html__('The %s has been created', 'event_espresso'), $this->_question_model->item_name() ) : sprintf( esc_html__('The %s has been updated', 'event_espresso' ), $this->_question_model->item_name() );
-			EE_Error::add_success( $msg );
+		$query_args = array('action' => 'edit_question', 'QST_ID' => $ID);
+		if ($success !== FALSE) {
+			$msg = $new_question ? sprintf(esc_html__('The %s has been created', 'event_espresso'), $this->_question_model->item_name()) : sprintf(esc_html__('The %s has been updated', 'event_espresso'), $this->_question_model->item_name());
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', $action_desc, $query_args, TRUE);
+		$this->_redirect_after_action(FALSE, '', $action_desc, $query_args, TRUE);
 	}
 
 
@@ -528,10 +528,10 @@ 
 	 * @param int $ID of the question option to find
 	 * @return int index in question_options array if successful, FALSE if unsuccessful
 	 */
-	protected function _get_option_req_data_index($ID){
-		$req_data_for_question_options=$this->_req_data['question_options'];
-		foreach($req_data_for_question_options as $num=>$option_data){
-			if( array_key_exists('QSO_ID',$option_data) && (int)$option_data['QSO_ID'] === $ID ){
+	protected function _get_option_req_data_index($ID) {
+		$req_data_for_question_options = $this->_req_data['question_options'];
+		foreach ($req_data_for_question_options as $num=>$option_data) {
+			if (array_key_exists('QSO_ID', $option_data) && (int) $option_data['QSO_ID'] === $ID) {
 				return $num;
 			}
 		}
@@ -553,25 +553,25 @@ 
 	 * @param int      $current_page
 	 * @return array lik EEM_Base::get_all's $query_params parameter
 	 */
-	protected function get_query_params($model, $per_page=10,$current_page=10){
+	protected function get_query_params($model, $per_page = 10, $current_page = 10) {
 		$query_params = array();
-		$offset=($current_page-1)*$per_page;
-		$query_params['limit']=array($offset,$per_page);
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$offset = ($current_page - 1) * $per_page;
+		$query_params['limit'] = array($offset, $per_page);
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 		$orderby_field = $model instanceof EEM_Question ? 'QST_ID' : 'QSG_order';
 		$field_to_order_by = empty($this->_req_data['orderby']) ? $orderby_field : $this->_req_data['orderby'];
-		$query_params['order_by']=array( $field_to_order_by => $order );
-		$search_string = array_key_exists('s',$this->_req_data) ? $this->_req_data['s'] : null;
-		if(! empty($search_string)){
-			if($model instanceof EEM_Question_Group){
-				$query_params[0]=array(
+		$query_params['order_by'] = array($field_to_order_by => $order);
+		$search_string = array_key_exists('s', $this->_req_data) ? $this->_req_data['s'] : null;
+		if ( ! empty($search_string)) {
+			if ($model instanceof EEM_Question_Group) {
+				$query_params[0] = array(
 					'OR'=>array(
-						'QSG_name'=>array('LIKE',"%$search_string%"),
-						'QSG_desc'=>array('LIKE',"%$search_string%"))
+						'QSG_name'=>array('LIKE', "%$search_string%"),
+						'QSG_desc'=>array('LIKE', "%$search_string%"))
 					);
-			}else{
-				$query_params[0]=array(
-					'QST_display_text'=>array('LIKE',"%$search_string%")
+			} else {
+				$query_params[0] = array(
+					'QST_display_text'=>array('LIKE', "%$search_string%")
 					);
 			}
 		}
@@ -619,13 +619,13 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_questions( $per_page=10, $current_page = 1, $count = FALSE ) {
+	public function get_questions($per_page = 10, $current_page = 1, $count = FALSE) {
 		$QST = EEM_Question::instance();
 		$query_params = $this->get_query_params($QST, $per_page, $current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $QST->count($where);
-		}else{
+		} else {
 			$results = $QST->get_all($query_params);
 		}
 		return $results;
@@ -640,10 +640,10 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_trashed_questions( $per_page, $current_page = 1, $count = FALSE ) {
-		$query_params =$this->get_query_params( EEM_Question::instance(), $per_page, $current_page);
-		$where        = isset( $query_params[0] ) ? array($query_params[0]) : array();
-		$questions    =$count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
+		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
+		$where        = isset($query_params[0]) ? array($query_params[0]) : array();
+		$questions    = $count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
 		return $questions;
 	}
 
@@ -655,12 +655,12 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_question_groups( $per_page, $current_page = 1, $count = FALSE ) {
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
 		/** @type EEM_Question_Group $questionGroupModel */
 		$questionGroupModel = EEM_Question_Group::instance();
 		//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
 		return $questionGroupModel->get_all(
-			$this->get_query_params( $questionGroupModel, $per_page, $current_page )
+			$this->get_query_params($questionGroupModel, $per_page, $current_page)
 		);
 	}
 
@@ -677,36 +677,36 @@ 
 
 		$this->_template_args['values'] = $this->_yes_no_values;
 
-		$this->_template_args['use_captcha'] = isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
-		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"': '';
+		$this->_template_args['use_captcha'] = isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
+		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"' : '';
 
-		$this->_template_args['recaptcha_publickey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : '';
-		$this->_template_args['recaptcha_privatekey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : '';
-		$this->_template_args['recaptcha_width'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_width ) ? absint( EE_Registry::instance()->CFG->registration->recaptcha_width ) : 500;
+		$this->_template_args['recaptcha_publickey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : '';
+		$this->_template_args['recaptcha_privatekey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : '';
+		$this->_template_args['recaptcha_width'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_width) ? absint(EE_Registry::instance()->CFG->registration->recaptcha_width) : 500;
 
 		$this->_template_args['recaptcha_theme_options'] = array(
-				array('id'  => 'red','text'=> esc_html__('Red', 'event_espresso')),
-				array('id'  => 'white','text'=> esc_html__('White', 'event_espresso')),
-				array('id'  => 'blackglass','text'=> esc_html__('Blackglass', 'event_espresso')),
-				array('id'  => 'clean','text'=> esc_html__('Clean', 'event_espresso'))
+				array('id'  => 'red', 'text'=> esc_html__('Red', 'event_espresso')),
+				array('id'  => 'white', 'text'=> esc_html__('White', 'event_espresso')),
+				array('id'  => 'blackglass', 'text'=> esc_html__('Blackglass', 'event_espresso')),
+				array('id'  => 'clean', 'text'=> esc_html__('Clean', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_theme'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->get_pretty( 'recaptcha_theme' ) : 'clean';
+		$this->_template_args['recaptcha_theme'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->get_pretty('recaptcha_theme') : 'clean';
 
 		$this->_template_args['recaptcha_language_options'] = array(
-				array('id'  => 'en','text'=> esc_html__('English', 'event_espresso')),
-				array('id'  => 'es','text'=> esc_html__('Spanish', 'event_espresso')),
-				array('id'  => 'nl','text'=> esc_html__('Dutch', 'event_espresso')),
-				array('id'  => 'fr','text'=> esc_html__('French', 'event_espresso')),
-				array('id'  => 'de','text'=> esc_html__('German', 'event_espresso')),
-				array('id'  => 'pt','text'=> esc_html__('Portuguese', 'event_espresso')),
-				array('id'  => 'ru','text'=> esc_html__('Russian', 'event_espresso')),
-				array('id'  => 'tr','text'=> esc_html__('Turkish', 'event_espresso'))
+				array('id'  => 'en', 'text'=> esc_html__('English', 'event_espresso')),
+				array('id'  => 'es', 'text'=> esc_html__('Spanish', 'event_espresso')),
+				array('id'  => 'nl', 'text'=> esc_html__('Dutch', 'event_espresso')),
+				array('id'  => 'fr', 'text'=> esc_html__('French', 'event_espresso')),
+				array('id'  => 'de', 'text'=> esc_html__('German', 'event_espresso')),
+				array('id'  => 'pt', 'text'=> esc_html__('Portuguese', 'event_espresso')),
+				array('id'  => 'ru', 'text'=> esc_html__('Russian', 'event_espresso')),
+				array('id'  => 'tr', 'text'=> esc_html__('Turkish', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_language'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
+		$this->_template_args['recaptcha_language'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
 
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'reg_form_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'reg_form_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 

Indentation +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 	 *_question_model EEM_Question model instance (for queries)
 	 *
 	 * @var EEM_Question $_question_model;
- */
+	 */
 	protected $_question_model;
 
 	/**
@@ -151,7 +151,7 @@ 
 					),
 				'list_table' => 'Registration_Form_Questions_Admin_List_Table',
 				'metaboxes' => $this->_default_espresso_metaboxes,
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registration_form_questions_overview_help_tab' => array(
 						'title' => esc_html__('Questions Overview', 'event_espresso'),
 						'filename' => 'registration_form_questions_overview'
@@ -202,7 +202,7 @@ 
 						'filename' => 'registration_form_edit_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
+				'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			);