eventespresso / event-espresso-core

caffeinated/payment_methods/Mijireh/templates/mijireh_intro.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php printf( esc_html__('Mijireh is an off-site payment method for accepting payments online through over 80+ payment gateways and is available to event organizers in many countries. An account with Mijireh is required to accept payments. Need a Mijireh account? %1$sClick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/mijireh/" target="_blank">','</a>' );
\ No newline at end of file
+<?php printf(esc_html__('Mijireh is an off-site payment method for accepting payments online through over 80+ payment gateways and is available to event organizers in many countries. An account with Mijireh is required to accept payments. Need a Mijireh account? %1$sClick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/mijireh/" target="_blank">', '</a>');
\ No newline at end of file

caffeinated/payment_methods/Paypal_Pro/templates/paypal_pro_intro.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php printf( esc_html__('PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalpro/" target="_blank">','</a>' );
\ No newline at end of file
+<?php printf(esc_html__('PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalpro/" target="_blank">', '</a>');
\ No newline at end of file

caffeinated/admin/extend/events/Extend_Events_Admin_Page.core.php

Spacing +216 added lines, -216 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,25 +30,25 @@ 
 class Extend_Events_Admin_Page extends Events_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'events/templates/');
-		define( 'EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'events/assets/');
-		define( 'EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'events/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'events/templates/');
+		define('EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'events/assets/');
+		define('EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'events/assets/');
 	}
 
 
 	protected function _extend_page_config() {
 
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'events';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'events';
 		$default_espresso_boxes = $this->_default_espresso_metaboxes;
 
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : 0;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 
 		//tkt_id?
-		$tkt_id = !empty( $this->_req_data['TKT_ID'] ) && ! is_array( $this->_req_data['TKT_ID'] ) ? $this->_req_data['TKT_ID'] : 0;
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID']) ? $this->_req_data['TKT_ID'] : 0;
 
 		$new_page_routes = array(
 			'duplicate_event' => array(
@@ -66,13 +66,13 @@ 
 				'capability' => 'ee_delete_default_ticket',
 				'obj_id' => $tkt_id,
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE )
+				'args' => array('trash' => TRUE)
 				),
 			'trash_tickets' => array(
 				'func' => '_trash_or_restore_ticket',
 				'capability' => 'ee_delete_default_tickets',
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE )
+				'args' => array('trash' => TRUE)
 				),
 			'restore_ticket' => array(
 				'func' => '_trash_or_restore_ticket',
@@ -132,7 +132,7 @@ 
 				)
 			);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 
 		//partial route/config override
@@ -144,8 +144,8 @@ 
 		$this->_page_config['default']['list_table'] = 'Extend_Events_Admin_List_Table';
 
 		//add tickets tab but only if there are more than one default ticket!
-		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(array( array('TKT_is_default' => 1 ) ), 'TKT_ID', TRUE );
-		if ( $tkt_count > 1 ) {
+		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(array(array('TKT_is_default' => 1)), 'TKT_ID', TRUE);
+		if ($tkt_count > 1) {
 			$new_page_config = array(
 				'ticket_list_table' => array(
 					'nav' => array(
@@ -164,14 +164,14 @@ 
 				'label' => esc_html__('Templates', 'event_espresso'),
 				'order' => 30
 			),
-			'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(
 				'general_settings_templates_help_tab' => array(
 					'title' => __('Templates', 'event_espresso'),
 					'filename' => 'general_settings_templates'
 				)
 			),
-			'help_tour' => array( 'Templates_Help_Tour' ),
+			'help_tour' => array('Templates_Help_Tour'),
 			'require_nonce' => FALSE
 		);
 
@@ -190,26 +190,26 @@ 
 //				'metaboxes' => $default_espresso_boxes,
 //				'require_nonce' => FALSE
 //		);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		//add filters and actions
 		//modifying _views
-		add_filter('FHEE_event_datetime_metabox_add_additional_date_time_template', array( $this, 'add_additional_datetime_button' ), 10, 2 );
-		add_filter('FHEE_event_datetime_metabox_clone_button_template', array( $this, 'add_datetime_clone_button' ), 10, 2 );
-		add_filter('FHEE_event_datetime_metabox_timezones_template', array( $this, 'datetime_timezones_template'), 10, 2 );
+		add_filter('FHEE_event_datetime_metabox_add_additional_date_time_template', array($this, 'add_additional_datetime_button'), 10, 2);
+		add_filter('FHEE_event_datetime_metabox_clone_button_template', array($this, 'add_datetime_clone_button'), 10, 2);
+		add_filter('FHEE_event_datetime_metabox_timezones_template', array($this, 'datetime_timezones_template'), 10, 2);
 
 
 		//filters for event list table
-		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array( $this, 'list_table_filters'), 10, 2);
-		add_filter('FHEE__Events_Admin_List_Table__column_actions__action_links', array( $this, 'extra_list_table_actions'), 10, 2 );
+		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array($this, 'list_table_filters'), 10, 2);
+		add_filter('FHEE__Events_Admin_List_Table__column_actions__action_links', array($this, 'extra_list_table_actions'), 10, 2);
 
 		//legend item
-		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array( $this, 'additional_legend_items') );
+		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array($this, 'additional_legend_items'));
 
-		add_action('admin_init', array( $this, 'admin_init') );
+		add_action('admin_init', array($this, 'admin_init'));
 
 		//heartbeat stuff
-		add_filter( 'heartbeat_received', array( $this, 'heartbeat_response' ), 10, 2 );
+		add_filter('heartbeat_received', array($this, 'heartbeat_response'), 10, 2);
 
 	}
 
@@ -222,12 +222,12 @@ 
 		EE_Registry::$i18n_js_strings = array_merge(
 			EE_Registry::$i18n_js_strings,
 			array(
-				'image_confirm'          => __( 'Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso' ),
-				'event_starts_on'        => __( 'Event Starts on', 'event_espresso' ),
-				'event_ends_on'          => __( 'Event Ends on', 'event_espresso' ),
-				'event_datetime_actions' => __( 'Actions', 'event_espresso' ),
-				'event_clone_dt_msg'     => __( 'Clone this Event Date and Time', 'event_espresso' ),
-				'remove_event_dt_msg'    => __( 'Remove this Event Time', 'event_espresso' )
+				'image_confirm'          => __('Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso'),
+				'event_starts_on'        => __('Event Starts on', 'event_espresso'),
+				'event_ends_on'          => __('Event Ends on', 'event_espresso'),
+				'event_datetime_actions' => __('Actions', 'event_espresso'),
+				'event_clone_dt_msg'     => __('Clone this Event Date and Time', 'event_espresso'),
+				'remove_event_dt_msg'    => __('Remove this Event Time', 'event_espresso')
 			)
 		);
 	}
@@ -242,12 +242,12 @@ 
 	 *
 	 * @return array  possibly appended response.
 	 */
-	public function heartbeat_response( $response, $data ) {
+	public function heartbeat_response($response, $data) {
 		/**
 		 * check whether count of tickets is approaching the potential
 		 * limits for the server.
 		 */
-		if ( ! empty( $data['input_count'] ) ) {
+		if ( ! empty($data['input_count'])) {
 			$response['max_input_vars_check'] = EE_Registry::instance()->CFG->environment->max_input_vars_limit_check($data['input_count']);
 		}
 
@@ -262,13 +262,13 @@ 
 
 
 
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
-		$return = parent::extra_permalink_field_buttons( $return, $id, $new_title, $new_slug );
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
+		$return = parent::extra_permalink_field_buttons($return, $id, $new_title, $new_slug);
 		//make sure this is only when editing
-		if ( !empty( $id ) ) {
-			$href = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'duplicate_event', 'EVT_ID' => $id), $this->_admin_base_url );
+		if ( ! empty($id)) {
+			$href = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_event', 'EVT_ID' => $id), $this->_admin_base_url);
 			$title = esc_attr__('Duplicate Event', 'event_espresso');
-			$return .= '<a href="' . $href . '" title="' . $title . '" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">' . $title  . '</button>';
+			$return .= '<a href="'.$href.'" title="'.$title.'" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">'.$title.'</button>';
 		}
 		return $return;
 	}
@@ -291,7 +291,7 @@ 
 				'label' => __('Trash', 'event_espresso'),
 				'count' => 0,
 				'bulk_action' => array(
-					'restore_tickets' => __('Restore from Trash' , 'event_espresso'),
+					'restore_tickets' => __('Restore from Trash', 'event_espresso'),
 					'delete_tickets' => __('Delete Permanently', 'event_espresso')
 					)
 				)
@@ -301,7 +301,7 @@ 
 
 
 	public function load_scripts_styles_edit() {
-		wp_register_script( 'ee-event-editor-heartbeat', EVENTS_CAF_ASSETS_URL . 'event-editor-heartbeat.js', array( 'ee_admin_js', 'heartbeat' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-event-editor-heartbeat', EVENTS_CAF_ASSETS_URL.'event-editor-heartbeat.js', array('ee_admin_js', 'heartbeat'), EVENT_ESPRESSO_VERSION, TRUE);
 
 		/**
 		 * load accounting js.
@@ -320,20 +320,20 @@ 
 
 
 
-	public function add_additional_datetime_button( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_add_additional_time.template.php', $template_args, TRUE);
+	public function add_additional_datetime_button($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_add_additional_time.template.php', $template_args, TRUE);
 	}
 
 
 
-	public function add_datetime_clone_button( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_metabox_clone_button.template.php', $template_args, TRUE );
+	public function add_datetime_clone_button($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_metabox_clone_button.template.php', $template_args, TRUE);
 	}
 
 
 
-	public function datetime_timezones_template( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_timezones.template.php', $template_args, TRUE );
+	public function datetime_timezones_template($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_timezones.template.php', $template_args, TRUE);
 	}
 
 
@@ -342,11 +342,11 @@ 
 	protected function _set_list_table_views_default() {
 		parent::_set_list_table_views_default();
 		$export_label = __('Export Events', 'event_espresso');
-		if ( EE_Registry::instance()->CAP->current_user_can( 'export', 'espresso_events_export' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('export', 'espresso_events_export')) {
 //			$this->_views['all']['bulk_action']['export_events'] = $export_label;
 //			$this->_views['draft']['bulk_action']['export_events'] = $export_label;
 
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 //				$this->_views['trash']['bulk_action']['export_events'] = $export_label;
 			}
 		}
@@ -372,7 +372,7 @@ 
 			)
 		);
 
-		$this->_views = array_merge( $this->_views, $new_views);
+		$this->_views = array_merge($this->_views, $new_views);
 	}
 
 
@@ -386,17 +386,17 @@ 
 
 
 
-	public function extra_list_table_actions( $actionlinks, $event ) {
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_reports', $event->ID() ) ) {
+	public function extra_list_table_actions($actionlinks, $event) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_reports', $event->ID())) {
 			$reports_query_args = array(
 					'action' => 'reports',
 					'EVT_ID' => $event->ID()
 				);
-			$reports_link = EE_Admin_Page::add_query_args_and_nonce( $reports_query_args, REG_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $reports_link . '" title="' .  esc_attr__('View Report', 'event_espresso') . '"><div class="dashicons dashicons-chart-bar"></div></a>' . "\n\t";
+			$reports_link = EE_Admin_Page::add_query_args_and_nonce($reports_query_args, REG_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$reports_link.'" title="'.esc_attr__('View Report', 'event_espresso').'"><div class="dashicons dashicons-chart-bar"></div></a>'."\n\t";
 		}
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			EE_Registry::instance()->load_helper('MSG_Template');
 			$actionlinks[] = EEH_MSG_Template::get_message_action_link(
 				'see_notifications_for',
 				null,
@@ -411,15 +411,15 @@ 
 
 
 	public function additional_legend_items($items) {
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_reports' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_reports')) {
 			$items['reports'] = array(
 					'class' => 'dashicons dashicons-chart-bar',
 					'desc' => __('Event Reports', 'event_espresso')
 				);
 		}
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$related_for_icon = EEH_MSG_Template::get_message_action_icon( 'see_notifications_for' );
-			if ( isset( $related_for_icon['css_class']) && isset( $related_for_icon['label'] ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for');
+			if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) {
 				$items['view_related_messages'] = array(
 					'class' => $related_for_icon['css_class'],
 					'desc' => $related_for_icon['label'],
@@ -444,17 +444,17 @@ 
 	 */
 	protected function _duplicate_event() {
 		//first make sure the ID for the event is in the request.  If it isnt' then we need to bail and redirect back to overview list table (cause how did we get here?)
-		if ( !isset( $this->_req_data['EVT_ID'] ) ) {
-			EE_Error::add_error( __('In order to duplicate an event an Event ID is required.  None was given.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( FALSE, '', '', array(), TRUE );
+		if ( ! isset($this->_req_data['EVT_ID'])) {
+			EE_Error::add_error(__('In order to duplicate an event an Event ID is required.  None was given.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(FALSE, '', '', array(), TRUE);
 			return;
 		}
 
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
-		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
+		$orig_event = EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']);
 
-		if ( ! $orig_event instanceof EE_Event )
-			throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID'] ) );
+		if ( ! $orig_event instanceof EE_Event)
+			throw new EE_Error(sprintf(__('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID']));
 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
@@ -467,43 +467,43 @@ 
 
 
 		//reset the ID and modify other details to make it clear this is a dupe
-		$new_event->set( 'EVT_ID', 0 );
-		$new_name = $new_event->name() . ' ' . __('**DUPLICATE**', 'event_espresso');
-		$new_event->set( 'EVT_name',  $new_name );
-		$new_event->set( 'EVT_slug',  wp_unique_post_slug( sanitize_title( $orig_event->name() ), 0, 'publish', 'espresso_events', 0 ) );
-		$new_event->set( 'status', 'draft' );
+		$new_event->set('EVT_ID', 0);
+		$new_name = $new_event->name().' '.__('**DUPLICATE**', 'event_espresso');
+		$new_event->set('EVT_name', $new_name);
+		$new_event->set('EVT_slug', wp_unique_post_slug(sanitize_title($orig_event->name()), 0, 'publish', 'espresso_events', 0));
+		$new_event->set('status', 'draft');
 
 		//duplicate discussion settings
-		$new_event->set( 'comment_status', $orig_event->get('comment_status') );
-		$new_event->set( 'ping_status', $orig_event->get( 'ping_status' ) );
+		$new_event->set('comment_status', $orig_event->get('comment_status'));
+		$new_event->set('ping_status', $orig_event->get('ping_status'));
 
 		//save the new event
 		$new_event->save();
 
 		//venues
-		foreach( $orig_ven as $ven ) {
-			$new_event->_add_relation_to( $ven, 'Venue' );
+		foreach ($orig_ven as $ven) {
+			$new_event->_add_relation_to($ven, 'Venue');
 		}
 		$new_event->save();
 
 
 		//now we need to get the question group relations and handle that
 		//first primary question groups
-		$orig_primary_qgs = $orig_event->get_many_related('Question_Group', array( array('Event_Question_Group.EQG_primary' => 1 ) ) );
-		if ( !empty( $orig_primary_qgs ) ) {
-			foreach ( $orig_primary_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 1 ) );
+		$orig_primary_qgs = $orig_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1)));
+		if ( ! empty($orig_primary_qgs)) {
+			foreach ($orig_primary_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 1));
 				}
 			}
 		}
 
 		//next additional attendee question groups
-		$orig_additional_qgs = $orig_event->get_many_related('Question_Group', array( array('Event_Question_Group.EQG_primary' => 0 ) ) );
-		if ( !empty( $orig_additional_qgs ) ) {
-			foreach ( $orig_additional_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 0 ) );
+		$orig_additional_qgs = $orig_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0)));
+		if ( ! empty($orig_additional_qgs)) {
+			foreach ($orig_additional_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 0));
 				}
 			}
 		}
@@ -514,7 +514,7 @@ 
 
 		//k now that we have the new event saved we can loop through the datetimes and start adding relations.
 		$cloned_tickets = array();
-		foreach ( $orig_datetimes as $orig_dtt ) {
+		foreach ($orig_datetimes as $orig_dtt) {
 			$new_dtt = clone $orig_dtt;
 			$orig_tkts = $orig_dtt->tickets();
 
@@ -522,22 +522,22 @@ 
 			$new_dtt->set('DTT_ID', 0);
 			$new_dtt->set('DTT_sold', 0);
 			$new_dtt->save();
-			$new_event->_add_relation_to( $new_dtt, 'Datetime');
+			$new_event->_add_relation_to($new_dtt, 'Datetime');
 			$new_event->save();
 
 			//now let's get the ticket relations setup.
-			foreach ( (array) $orig_tkts as $orig_tkt ) {
+			foreach ((array) $orig_tkts as $orig_tkt) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket )
+				if ( ! $orig_tkt instanceof EE_Ticket)
 					continue;
 
 				//is this ticket archived?  If it is then let's skip
-				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
+				if ($orig_tkt->get('TKT_deleted')) {
 					continue;
 				}
 
 				//does this original ticket already exist in the clone_tickets cache?  If so we'll just use the new ticket from it.
-				if ( isset( $cloned_tickets[$orig_tkt->ID()] ) ) {
+				if (isset($cloned_tickets[$orig_tkt->ID()])) {
 					$new_tkt = $cloned_tickets[$orig_tkt->ID()];
 				} else {
 					$new_tkt = clone $orig_tkt;
@@ -549,7 +549,7 @@ 
 					$new_tkt->save(); //make sure new ticket has ID.
 
 					//price relations on new ticket need to be setup.
-					foreach ( $orig_prices as $orig_price ) {
+					foreach ($orig_prices as $orig_price) {
 						$new_price = clone $orig_price;
 						$new_price->set('PRC_ID', 0);
 						$new_price->save();
@@ -566,39 +566,39 @@ 
 		}
 
 		//clone taxonomy information
-		$taxonomies_to_clone_with = apply_filters( 'FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone', array( 'espresso_event_categories', 'espresso_event_type', 'post_tag' ) );
+		$taxonomies_to_clone_with = apply_filters('FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone', array('espresso_event_categories', 'espresso_event_type', 'post_tag'));
 
 		//get terms for original event (notice)
-		$orig_terms = wp_get_object_terms( $orig_event->ID(), $taxonomies_to_clone_with );
+		$orig_terms = wp_get_object_terms($orig_event->ID(), $taxonomies_to_clone_with);
 
 		//loop through terms and add them to new event.
-		foreach ( $orig_terms as $term ) {
-			wp_set_object_terms( $new_event->ID(), $term->term_id, $term->taxonomy, true );
+		foreach ($orig_terms as $term) {
+			wp_set_object_terms($new_event->ID(), $term->term_id, $term->taxonomy, true);
 		}
 
 
-		do_action( 'AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event );
+		do_action('AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event);
 
 		//now let's redirect to the edit page for this duplicated event if we have a new event id.
-		if ( $new_event->ID() ) {
+		if ($new_event->ID()) {
 			$redirect_args = array(
 				'post' => $new_event->ID(),
 				'action' => 'edit'
 			);
-			EE_Error::add_success( __('Event successfully duplicated.  Please review the details below and make any necessary edits', 'event_espresso') );
+			EE_Error::add_success(__('Event successfully duplicated.  Please review the details below and make any necessary edits', 'event_espresso'));
 		} else {
 			$redirect_args = array(
 				'action' => 'default'
 				);
-			EE_Error::add_error( __('Not able to duplicate event.  Something went wrong.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Not able to duplicate event.  Something went wrong.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		$this->_redirect_after_action(FALSE, '', '', $redirect_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $redirect_args, TRUE);
 	}
 
 
 
-	protected function _import_page(){
+	protected function _import_page() {
 
 		$title = __('Import', 'event_espresso');
 		$intro = __('If you have a previously exported Event Espresso 4 information in a Comma Separated Value (CSV) file format, you can upload the file here: ', 'event_espresso');
@@ -606,8 +606,8 @@ 
 		$action = 'import_events';
 		$type = 'csv';
 		$this->_template_args['form'] = EE_Import::instance()->upload_form($title, $intro, $form_url, $action, $type);
-		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'sample_export_file'),$this->_admin_base_url);
-		$content = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH . 'import_page.template.php',$this->_template_args,true);
+		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'sample_export_file'), $this->_admin_base_url);
+		$content = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'import_page.template.php', $this->_template_args, true);
 
 
 		$this->_template_args['admin_page_content'] = $content;
@@ -620,9 +620,9 @@ 
 	 * @return string html
 	 */
 	protected function _import_events() {
-		require_once(EE_CLASSES . 'EE_Import.class.php');
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		$success = EE_Import::instance()->import();
-		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'),true);
+		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'), true);
 
 	}
 
@@ -636,23 +636,23 @@ 
 	 * @return file
 	 */
 	protected function _events_export() {
-		if(isset($this->_req_data['EVT_ID'])){
+		if (isset($this->_req_data['EVT_ID'])) {
 			$event_ids = $this->_req_data['EVT_ID'];
-		}elseif(isset($this->_req_data['EVT_IDs'])){
+		}elseif (isset($this->_req_data['EVT_IDs'])) {
 			$event_ids = $this->_req_data['EVT_IDs'];
-		}else{
+		} else {
 			$event_ids = NULL;
 		}
 		//todo: I don't like doing this but it'll do until we modify EE_Export Class.
 		$new_request_args = array(
 			'export' => 'report',
 			'action' => 'all_event_data',
-			'EVT_ID' => $event_ids ,
+			'EVT_ID' => $event_ids,
 		);
 		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-			require_once(EE_CLASSES . 'EE_Export.class.php');
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
 			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
@@ -674,11 +674,11 @@ 
 			'category_ids' => $this->_req_data['EVT_CAT_ID']
 			);
 
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php') ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php');
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 
@@ -689,7 +689,7 @@ 
 	/**
 	 * Creates a sample CSV file for importing
 	 */
-	protected function _sample_export_file(){
+	protected function _sample_export_file() {
 //		require_once(EE_CLASSES . 'EE_Export.class.php');
 		EE_Export::instance()->export_sample();
 	}
@@ -706,10 +706,10 @@ 
 		 * Note leaving this filter in for backward compatibility this was moved in 4.6.x
 		 * from General_Settings_Admin_Page to here.
 		 */
-		$this->_template_args = apply_filters( 'FHEE__General_Settings_Admin_Page__template_settings__template_args', $this->_template_args );
-		$this->_set_add_edit_form_tags( 'update_template_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'template_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args = apply_filters('FHEE__General_Settings_Admin_Page__template_settings__template_args', $this->_template_args);
+		$this->_set_add_edit_form_tags('update_template_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'template_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -721,24 +721,24 @@ 
 		 * Note leaving this filter in for backward compatibility this was moved in 4.6.x
 		 * from General_Settings_Admin_Page to here.
 		 */
-		EE_Registry::instance()->CFG->template_settings = apply_filters( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', EE_Registry::instance()->CFG->template_settings, $this->_req_data );
+		EE_Registry::instance()->CFG->template_settings = apply_filters('FHEE__General_Settings_Admin_Page__update_template_settings__data', EE_Registry::instance()->CFG->template_settings, $this->_req_data);
 
 
 		//update custom post type slugs and detect if we need to flush rewrite rules
 		$old_slug = EE_Registry::instance()->CFG->core->event_cpt_slug;
-		EE_Registry::instance()->CFG->core->event_cpt_slug = empty( $this->_req_data['event_cpt_slug'] ) ? EE_Registry::instance()->CFG->core->event_cpt_slug : sanitize_title_with_dashes( $this->_req_data['event_cpt_slug'] );
+		EE_Registry::instance()->CFG->core->event_cpt_slug = empty($this->_req_data['event_cpt_slug']) ? EE_Registry::instance()->CFG->core->event_cpt_slug : sanitize_title_with_dashes($this->_req_data['event_cpt_slug']);
 
 
 		$what = 'Template Settings';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->template_settings, __FILE__, __FUNCTION__, __LINE__ );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->template_settings, __FILE__, __FUNCTION__, __LINE__);
 
 
-		if ( EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug ) {
-			update_option( 'ee_flush_rewrite_rules', true );
+		if (EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug) {
+			update_option('ee_flush_rewrite_rules', true);
 		}
 
 
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'template_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'template_settings'));
 
 	}
 
@@ -756,7 +756,7 @@ 
 
 		$this->verify_cpt_object();
 
-		add_meta_box('espresso_event_editor_event_options', __('Event Registration Options', 'event_espresso'), array( $this, 'registration_options_meta_box' ), $this->page_slug, 'side', 'core');
+		add_meta_box('espresso_event_editor_event_options', __('Event Registration Options', 'event_espresso'), array($this, 'registration_options_meta_box'), $this->page_slug, 'side', 'core');
 		//add_meta_box('espresso_event_types', __('Event Type', 'event_espresso'), array( $this, 'event_type_meta_box' ), $this->page_slug, 'side', 'default' ); //add this back in when the feature is ready.
 
 		//todo feature in progress
@@ -780,16 +780,16 @@ 
 			array('id' => true, 'text' => __('Yes', 'event_espresso')),
 			array('id' => false, 'text' => __('No', 'event_espresso'))
 		);
-		$default_reg_status_values = EEM_Registration::reg_status_array(array(EEM_Registration::status_id_cancelled, EEM_Registration::status_id_declined, EEM_Registration::status_id_incomplete ), TRUE);
+		$default_reg_status_values = EEM_Registration::reg_status_array(array(EEM_Registration::status_id_cancelled, EEM_Registration::status_id_declined, EEM_Registration::status_id_incomplete), TRUE);
 		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(FALSE);
 		$template_args['_event'] = $this->_cpt_model_obj;
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input('default_reg_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
 		$template_args['display_description'] = EEH_Form_Fields::select_input('display_desc', $yes_no_values, $this->_cpt_model_obj->display_description());
 		$template_args['display_ticket_selector'] = EEH_Form_Fields::select_input('display_ticket_selector', $yes_no_values, $this->_cpt_model_obj->display_ticket_selector(), '', '', false);
-		$template_args['EVT_default_registration_status'] = EEH_Form_Fields::select_input('EVT_default_registration_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status() );
-		$template_args['additional_registration_options'] = apply_filters( 'FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values );
-		$templatepath = EVENTS_CAF_TEMPLATE_PATH . 'event_registration_options.template.php';
+		$template_args['EVT_default_registration_status'] = EEH_Form_Fields::select_input('EVT_default_registration_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
+		$template_args['additional_registration_options'] = apply_filters('FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values);
+		$templatepath = EVENTS_CAF_TEMPLATE_PATH.'event_registration_options.template.php';
 		EEH_Template::display_template($templatepath, $template_args);
 	}
 
@@ -802,9 +802,9 @@ 
 	 * @param  array  $box  metabox args
 	 * @return string       metabox contents
 	 */
-	public function event_type_meta_box( $post, $box ) {
-		$template_args['radio_list'] = $this->wp_terms_radio($post->ID, array( 'taxonomy' => 'espresso_event_type' ) );
-		$template = EVENTS_CAF_TEMPLATE_PATH . 'event_type_metabox_contents.template.php';
+	public function event_type_meta_box($post, $box) {
+		$template_args['radio_list'] = $this->wp_terms_radio($post->ID, array('taxonomy' => 'espresso_event_type'));
+		$template = EVENTS_CAF_TEMPLATE_PATH.'event_type_metabox_contents.template.php';
 		EEH_Template::display_template($template, $template_args);
 	}
 
@@ -814,7 +814,7 @@ 
 
 
 
-	public function wp_terms_radio( $post_id = 0, $args = array() ) {
+	public function wp_terms_radio($post_id = 0, $args = array()) {
 		$defaults = array(
 			'descendants_and_self' => 0,
 			'selected_cats' => false,
@@ -823,11 +823,11 @@ 
 			'taxonomy' => 'category',
 			'checked_ontop' => true
 		);
-		$args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+		$args = apply_filters('wp_terms_checklist_args', $args, $post_id);
 
-		extract( wp_parse_args($args, $defaults), EXTR_SKIP );
+		extract(wp_parse_args($args, $defaults), EXTR_SKIP);
 
-		if ( empty($walker) || !is_a($walker, 'Walker') )
+		if (empty($walker) || ! is_a($walker, 'Walker'))
 			$walker = new Walker_Radio_Checklist;
 
 		$descendants_and_self = (int) $descendants_and_self;
@@ -835,37 +835,37 @@ 
 		$args = array('taxonomy' => $taxonomy);
 
 		$tax = get_taxonomy($taxonomy);
-		$args['disabled'] = !current_user_can($tax->cap->assign_terms);
+		$args['disabled'] = ! current_user_can($tax->cap->assign_terms);
 
-		if ( is_array( $selected_cats ) )
+		if (is_array($selected_cats))
 			$args['selected_cats'] = $selected_cats;
-		elseif ( $post_id )
+		elseif ($post_id)
 			$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
 		else
 			$args['selected_cats'] = array();
 
-		if ( is_array( $popular_cats ) )
+		if (is_array($popular_cats))
 			$args['popular_cats'] = $popular_cats;
 		else
-			$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+			$args['popular_cats'] = get_terms($taxonomy, array('fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false));
 
-		if ( $descendants_and_self ) {
-			$categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
-			$self = get_term( $descendants_and_self, $taxonomy );
-			array_unshift( $categories, $self );
+		if ($descendants_and_self) {
+			$categories = (array) get_terms($taxonomy, array('child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0));
+			$self = get_term($descendants_and_self, $taxonomy);
+			array_unshift($categories, $self);
 		} else {
 			$categories = (array) get_terms($taxonomy, array('get' => 'all'));
 		}
 
-		if ( $checked_ontop ) {
+		if ($checked_ontop) {
 			// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 			$checked_categories = array();
-			$keys = array_keys( $categories );
+			$keys = array_keys($categories);
 
-			foreach( $keys as $k ) {
-				if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
+			foreach ($keys as $k) {
+				if (in_array($categories[$k]->term_id, $args['selected_cats'])) {
 					$checked_categories[] = $categories[$k];
-					unset( $categories[$k] );
+					unset($categories[$k]);
 				}
 			}
 
@@ -890,18 +890,18 @@ 
 	 * @param  array  $list_table_obj the list table object
 	 * @return array                  new filters
 	 */
-	public function list_table_filters( $oldfilters, $list_table_obj ) {
+	public function list_table_filters($oldfilters, $list_table_obj) {
 		$filters = array();
 
 		//first month/year filters
 		$filters[] = $this->espresso_event_months_dropdown();
 
 
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 
 		//active status dropdown
-		if ( $status !== 'draft' )
-			$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		if ($status !== 'draft')
+			$filter[] = $this->active_status_dropdown(isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : '');
 
 		//category filter
 		$filters[] = $this->category_dropdown();
@@ -923,17 +923,17 @@ 
 	 */
 	public function espresso_event_months_dropdown() {
 		//what we need to do is get all PRIMARY datetimes for all events to filter on. Note we need to include any other filters that are set!
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
 
 		//active status?
-		$active_status = isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : NULL;
+		$active_status = isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : NULL;
 
 		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
 
-		return EEH_Form_Fields::generate_event_months_dropdown( $cur_date, $status, $category, $active_status );
+		return EEH_Form_Fields::generate_event_months_dropdown($cur_date, $status, $category, $active_status);
 	}
 
 
@@ -944,12 +944,12 @@ 
 	 * @param  string $current_value whatever the ucrrent active status is
 	 * @return string                html dropdown.
 	 */
-	public function  active_status_dropdown( $current_value = '' ) {
+	public function  active_status_dropdown($current_value = '') {
 		$select_name = 'active_status';
-		$values = array('none' => __('Show Active/Inactive', 'event_espresso'), 'active' => __('Active', 'event_espresso'), 'upcoming' => __('Upcoming', 'event_espresso'), 'expired' => __('Expired', 'event_espresso'), 'inactive' => __('Inactive', 'event_espresso') );
+		$values = array('none' => __('Show Active/Inactive', 'event_espresso'), 'active' => __('Active', 'event_espresso'), 'upcoming' => __('Upcoming', 'event_espresso'), 'expired' => __('Expired', 'event_espresso'), 'inactive' => __('Inactive', 'event_espresso'));
 		$id = 'id="espresso-active-status-dropdown-filter"';
 		$class = 'wide';
-		echo EEH_Form_Fields::select_input( $select_name, $values, $current_value, $id, $class );
+		echo EEH_Form_Fields::select_input($select_name, $values, $current_value, $id, $class);
 	}
 
 
@@ -961,9 +961,9 @@ 
 	 * @return string html
 	 */
 	public function category_dropdown() {
-		$cur_cat = isset( $this->_req_data['EVT_CAT'] ) ? $this->_req_data['EVT_CAT'] : -1;
+		$cur_cat = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
 
-		return EEH_Form_Fields::generate_event_category_dropdown( $cur_cat );
+		return EEH_Form_Fields::generate_event_category_dropdown($cur_cat);
 	}
 
 
@@ -975,14 +975,14 @@ 
 	 * @return int
 	 */
 	public function total_events_today() {
-		$start = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', date('Y-m-d' ) . ' 00:00:00', 'Y-m-d H:i:s', 'UTC' );
-		$end = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', date('Y-m-d' ) . ' 23:59:59', 'Y-m-d H:i:s', 'UTC' );
+		$start = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', date('Y-m-d').' 00:00:00', 'Y-m-d H:i:s', 'UTC');
+		$end = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', date('Y-m-d').' 23:59:59', 'Y-m-d H:i:s', 'UTC');
 
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array($start, $end ) )
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -997,14 +997,14 @@ 
 		$this_year_r = date('Y');
 		$this_month_r = date('m');
 		$days_this_month = date('t');
-		$start = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', $this_year_r . '-' . $this_month_r . '-01 00:00:00', 'Y-m-d H:i:s', 'UTC' );
-		$end = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' 23:59:59', 'Y-m-d H:i:s', 'UTC' );
+		$start = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', $this_year_r.'-'.$this_month_r.'-01 00:00:00', 'Y-m-d H:i:s', 'UTC');
+		$end = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' 23:59:59', 'Y-m-d H:i:s', 'UTC');
 
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array($start, $end ) )
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1021,53 +1021,53 @@ 
 
 
 
-	public function get_default_tickets( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_default_tickets($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		$orderby= empty( $this->_req_data['orderby'] ) ? 'TKT_name' : $this->_req_data['orderby'];
-		$order = empty( $this->_req_data['order'] ) ? 'ASC' : $this->_req_data['order'];
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $this->_req_data['order'];
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'TKT_name' :
-				$orderby = array( 'TKT_name' => $order );
+				$orderby = array('TKT_name' => $order);
 				break;
 
 			case 'TKT_price' :
-				$orderby = array( 'TKT_price' => $order );
+				$orderby = array('TKT_price' => $order);
 				break;
 
 			case 'TKT_uses' :
-				$orderby = array( 'TKT_uses' => $order );
+				$orderby = array('TKT_uses' => $order);
 				break;
 
 			case 'TKT_min' :
-				$orderby = array( 'TKT_min' => $order );
+				$orderby = array('TKT_min' => $order);
 				break;
 
 			case 'TKT_max' :
-				$orderby = array( 'TKT_max' => $order );
+				$orderby = array('TKT_max' => $order);
 				break;
 
 			case 'TKT_qty' :
-				$orderby = array( 'TKT_qty' => $order );
+				$orderby = array('TKT_qty' => $order);
 				break;
 		}
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array(
 			'TKT_is_default' => 1,
 			'TKT_deleted' => $trashed
 			);
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'TKT_name' => array('LIKE',$sstr ),
-				'TKT_description' => array('LIKE',$sstr )
+				'TKT_name' => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
@@ -1078,9 +1078,9 @@ 
 			'group_by'=>'TKT_ID'
 			);
 
-		if($count){
+		if ($count) {
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else {
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -1090,35 +1090,35 @@ 
 
 
 
-	protected function _trash_or_restore_ticket(  $trash = FALSE ) {
+	protected function _trash_or_restore_ticket($trash = FALSE) {
 		$success = 1;
 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
-				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if ( ! $TKT->delete_by_ID($TKT_ID))
 						$success = 0;
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+					if ( ! $TKT->restore_by_ID($TKT_ID))
 						$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
 
-			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			if ($trash) {
+				if ( ! $TKT->delete_by_ID($TKT_ID))
 					$success = 0;
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+				if ( ! $TKT->restore_by_ID($TKT_ID))
 					$success = 0;
 			}
 		}
@@ -1128,7 +1128,7 @@ 
 			'action' => 'ticket_list_table',
 			'status' => $trash ? '' : 'trashed'
 			);
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
@@ -1141,21 +1141,21 @@ 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
 				//delete
-				if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+				if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 		}
@@ -1167,16 +1167,16 @@ 
 			);
 
 		//failsafe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) )
+		if (EEM_Ticket::instance()->count_deleted_and_undeleted(array(array('TKT_is_default' => 1)), 'TKT_ID', TRUE))
 			$query_args = array();
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
 
 
-	protected function _delete_the_ticket( $TKT_ID ) {
-		$tkt = EEM_Ticket::instance()->get_one_by_ID( $TKT_ID );
+	protected function _delete_the_ticket($TKT_ID) {
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
 		$tkt->_remove_relations('Datetime');
 		//delete all related prices first
 		$tkt->delete_related_permanently('Price');

Braces +44 added lines, -32 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
@@ -453,8 +454,9 @@ 
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
 		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
 
-		if ( ! $orig_event instanceof EE_Event )
-			throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID'] ) );
+		if ( ! $orig_event instanceof EE_Event ) {
+					throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'), $this->_req_data['EVT_ID'] ) );
+		}
 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
@@ -528,8 +530,9 @@ 
 			//now let's get the ticket relations setup.
 			foreach ( (array) $orig_tkts as $orig_tkt ) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket )
-					continue;
+				if ( ! $orig_tkt instanceof EE_Ticket ) {
+									continue;
+				}
 
 				//is this ticket archived?  If it is then let's skip
 				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
@@ -638,9 +641,9 @@ 
 	protected function _events_export() {
 		if(isset($this->_req_data['EVT_ID'])){
 			$event_ids = $this->_req_data['EVT_ID'];
-		}elseif(isset($this->_req_data['EVT_IDs'])){
+		} elseif(isset($this->_req_data['EVT_IDs'])){
 			$event_ids = $this->_req_data['EVT_IDs'];
-		}else{
+		} else{
 			$event_ids = NULL;
 		}
 		//todo: I don't like doing this but it'll do until we modify EE_Export Class.
@@ -827,8 +830,9 @@ 
 
 		extract( wp_parse_args($args, $defaults), EXTR_SKIP );
 
-		if ( empty($walker) || !is_a($walker, 'Walker') )
-			$walker = new Walker_Radio_Checklist;
+		if ( empty($walker) || !is_a($walker, 'Walker') ) {
+					$walker = new Walker_Radio_Checklist;
+		}
 
 		$descendants_and_self = (int) $descendants_and_self;
 
@@ -837,17 +841,19 @@ 
 		$tax = get_taxonomy($taxonomy);
 		$args['disabled'] = !current_user_can($tax->cap->assign_terms);
 
-		if ( is_array( $selected_cats ) )
-			$args['selected_cats'] = $selected_cats;
-		elseif ( $post_id )
-			$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
-		else
-			$args['selected_cats'] = array();
+		if ( is_array( $selected_cats ) ) {
+					$args['selected_cats'] = $selected_cats;
+		} elseif ( $post_id ) {
+					$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
+		} else {
+					$args['selected_cats'] = array();
+		}
 
-		if ( is_array( $popular_cats ) )
-			$args['popular_cats'] = $popular_cats;
-		else
-			$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+		if ( is_array( $popular_cats ) ) {
+					$args['popular_cats'] = $popular_cats;
+		} else {
+					$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+		}
 
 		if ( $descendants_and_self ) {
 			$categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
@@ -900,8 +906,9 @@ 
 		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
 
 		//active status dropdown
-		if ( $status !== 'draft' )
-			$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		if ( $status !== 'draft' ) {
+					$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		}
 
 		//category filter
 		$filters[] = $this->category_dropdown();
@@ -1080,7 +1087,7 @@ 
 
 		if($count){
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else{
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -1103,11 +1110,13 @@ 
 			//cycle thru the boxes
 			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
 				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				}
 			}
 		} else {
@@ -1115,11 +1124,13 @@ 
 			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
 
 			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			}
 		}
 
@@ -1167,8 +1178,9 @@ 
 			);
 
 		//failsafe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) )
-			$query_args = array();
+		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) ) {
+					$query_args = array();
+		}
 		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
 	}
 

public/Espresso_Arabica_2014/content-espresso_events-venues.php

Spacing +33 added lines, -33 removed lines

@@ -1,69 +1,69 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 if (
-	( is_single() && espresso_display_venue_in_event_details() )
-	|| ( is_archive() && espresso_display_venue_in_event_list() )
+	(is_single() && espresso_display_venue_in_event_details())
+	|| (is_archive() && espresso_display_venue_in_event_list())
 ) :
 	global $post;
-	do_action( 'AHEE_event_details_before_venue_details', $post );
-	$venue_name = espresso_venue_name( 0, 'details', FALSE );
-	if ( empty( $venue_name ) && espresso_is_venue_private() ) {
-		do_action( 'AHEE_event_details_after_venue_details', $post );
+	do_action('AHEE_event_details_before_venue_details', $post);
+	$venue_name = espresso_venue_name(0, 'details', FALSE);
+	if (empty($venue_name) && espresso_is_venue_private()) {
+		do_action('AHEE_event_details_after_venue_details', $post);
 		return '';
 	}
 ?>
 
 <div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
 	<h3 class="event-venues-h3 ee-event-h3">
-		<?php _e( 'Location', 'event_espresso' ); ?>
+		<?php _e('Location', 'event_espresso'); ?>
 	</h3>
-	<h4><strong><?php _e( 'Venue:', 'event_espresso' ); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
+	<h4><strong><?php _e('Venue:', 'event_espresso'); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
 	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
-<?php  if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+<?php  if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?></strong></span> <?php echo $venue_phone; ?>
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?></strong></span> <?php echo $venue_phone; ?>
 	</p>
-<?php endif;  ?>
-<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
+<?php endif; ?>
+<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Website:', 'event_espresso' ); ?></strong></span> <?php echo $venue_website; ?>
+		<span class="small-text"><strong><?php _e('Venue Website:', 'event_espresso'); ?></strong></span> <?php echo $venue_website; ?>
 	</p>
 <?php endif; ?>
-<?php  if ( espresso_venue_has_address( $post->ID )) : ?>
-	<strong><span class="dashicons dashicons-location-alt"></span><?php _e( 'Address:', 'event_espresso' ); ?></strong>
-	<?php espresso_venue_address( 'inline' ); ?>
-	<?php espresso_venue_gmap( $post->ID ); ?>
+<?php  if (espresso_venue_has_address($post->ID)) : ?>
+	<strong><span class="dashicons dashicons-location-alt"></span><?php _e('Address:', 'event_espresso'); ?></strong>
+	<?php espresso_venue_address('inline'); ?>
+	<?php espresso_venue_gmap($post->ID); ?>
 	<div class="clear"><br/></div>
-<?php endif;  ?>
+<?php endif; ?>
 
-	<?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
-	<?php if ( is_single() ) : ?>
-		<?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_description ) : ?>
+	<?php $VNU_ID = espresso_venue_id($post->ID); ?>
+	<?php if (is_single()) : ?>
+		<?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
+		<?php if ($venue_description) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
-		<?php echo do_shortcode( $venue_description ); ?>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
+		<?php echo do_shortcode($venue_description); ?>
 	</p>
-		<?php endif;  ?>
+		<?php endif; ?>
 	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_excerpt ) : ?>
+		<?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
+		<?php if ($venue_excerpt) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
 		<?php echo $venue_excerpt; ?>
 	</p>
-			<?php endif;  ?>
-		<?php endif;  ?>
+			<?php endif; ?>
+		<?php endif; ?>
 </div>
 <!-- .espresso-venue-dv -->
 <?php
-do_action( 'AHEE_event_details_after_venue_details', $post );
+do_action('AHEE_event_details_after_venue_details', $post);
 else :
-	if ( espresso_venue_is_password_protected() ) :
+	if (espresso_venue_is_password_protected()) :
 ?>
 	<div class="espresso-venue-dv  espresso-password-protected-venue-dv" >
 		<h3 class="event-venues-h3 ee-event-h3">
-			<?php _e( 'Location', 'event_espresso' );?>
+			<?php _e('Location', 'event_espresso'); ?>
 		</h3>
 		<?php echo espresso_password_protected_venue_form(); ?>
 	</div>

payment_methods/Paypal_Standard/templates/paypal_standard_intro.template.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@
 $closing_tag = '</a>';
 //if this is decaf, which is put on WordPress.org, we need to inform users that
 //we just put an affiliate link there. See https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/ section 12
-if( apply_filters( 'FHEE__ee_show_affiliate_links', true ) ) {
-	$closing_tag .= esc_html__( ' (affiliate link)', 'event_espresso' );
+if (apply_filters('FHEE__ee_show_affiliate_links', true)) {
+	$closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
 }
-printf( esc_html__('PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">', $closing_tag );
\ No newline at end of file
+printf(esc_html__('PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">', $closing_tag);
\ No newline at end of file

core/db_models/fields/EE_Email_Field.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	 * @param string $email_address
 	 * @return string
 	 */
-	function prepare_for_set($email_address ) {
+	function prepare_for_set($email_address) {
 		$validation_level = isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 			? EE_Registry::instance()->CFG->registration->email_validation_level
 			: 'wp_default';

core/admin/EE_Admin_List_Table.core.php

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 
@@ -31,8 +31,8 @@ 
  * ------------------------------------------------------------------------
  */
 
-if ( ! class_exists( 'WP_List_Table' )) {
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+if ( ! class_exists('WP_List_Table')) {
+    require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php');
 }
 
 abstract class EE_Admin_List_Table extends WP_List_Table {
@@ -244,16 +244,16 @@ 
 	 * constructor
 	 * @param EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table.
 	 */
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		$this->_admin_page = $admin_page;
 		$this->_req_data = $this->_admin_page->get_request_data();
 		$this->_view = $this->_admin_page->get_view();
-		$this->_views = empty( $this->_views ) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
+		$this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
 		$this->_current_page = $this->get_pagenum();
-		$this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
-		$this->_yes_no = array(  __('No', 'event_espresso'), __('Yes', 'event_espresso'));
+		$this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view();
+		$this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
 
-		$this->_per_page = $this->get_items_per_page( $this->_screen . '_per_page', 10 );
+		$this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 10);
 
 		$this->_setup_data();
 		$this->_add_view_counts();
@@ -263,7 +263,7 @@ 
 		$this->_set_properties();
 
 		//set primary column
-		add_filter( 'list_table_primary_column', array( $this, 'set_primary_column' ) );
+		add_filter('list_table_primary_column', array($this, 'set_primary_column'));
 
 		//set parent defaults
 		parent::__construct($this->_wp_list_args);
@@ -339,17 +339,17 @@ 
 	 * @return string
 	 */
 	protected function _get_hidden_fields() {
-		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
-		$action = empty( $action ) && isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : $action;
+		$action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
+		$action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
 		//if action is STILL empty, then we set it to default
-		$action = empty( $action ) ? 'default' : $action;
-		$field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
-		$field .= '<input type="hidden" name="route" value="'. $action .'" />' . "\n";/**/
-		$field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
+		$action = empty($action) ? 'default' : $action;
+		$field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n";
+		$field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/
+		$field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n";
 
 		$bulk_actions = $this->_get_bulk_actions();
-		foreach ( $bulk_actions as $bulk_action => $label ) {
-			$field .= '<input type="hidden" name="' . $bulk_action . '_nonce" value="' . wp_create_nonce  ( $bulk_action . '_nonce' ) . '" />' . "\n";
+		foreach ($bulk_actions as $bulk_action => $label) {
+			$field .= '<input type="hidden" name="'.$bulk_action.'_nonce" value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n";
 		}
 
 		return $field;
@@ -379,15 +379,15 @@ 
 		 *
 		 * @var array
 		 */
-		$_sortable = apply_filters( "FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen );
+		$_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+		foreach ($_sortable as $id => $data) {
+			if (empty($data))
 				continue;
 
 			//fix for offset errors with WP_List_Table default get_columninfo()
-			if ( is_array($data) ) {
+			if (is_array($data)) {
 				$_data[0] = key($data);
 				$_data[1] = isset($data[1]) ? $data[1] : false;
 			} else {
@@ -396,14 +396,14 @@ 
 
 			$data = (array) $data;
 
-			if ( !isset( $data[1] ) )
+			if ( ! isset($data[1]))
 				$_data[1] = false;
 
 
 			$sortable[$id] = $_data;
 		}
 		$primary = $this->get_primary_column_name();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
 	}
 
 
@@ -412,8 +412,8 @@ 
 	 * @return string
 	 */
 	protected function get_primary_column_name() {
-		foreach( class_parents( $this ) as $parent ) {
-			if ( method_exists( $parent, 'get_primary_column_name' ) && $parent == 'WP_List_Table' ) {
+		foreach (class_parents($this) as $parent) {
+			if (method_exists($parent, 'get_primary_column_name') && $parent == 'WP_List_Table') {
 				return parent::get_primary_column_name();
 			}
 		}
@@ -430,10 +430,10 @@ 
 	 * @param string $primary
 	 * @return string
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		foreach( class_parents( $this ) as $parent ) {
-			if ( method_exists( $parent, 'handle_row_actions' ) && $parent == 'WP_List_Table' ) {
-				return parent::handle_row_actions( $item, $column_name, $primary );
+	protected function handle_row_actions($item, $column_name, $primary) {
+		foreach (class_parents($this) as $parent) {
+			if (method_exists($parent, 'handle_row_actions') && $parent == 'WP_List_Table') {
+				return parent::handle_row_actions($item, $column_name, $primary);
 			}
 		}
 		return '';
@@ -451,11 +451,11 @@ 
 	protected function _get_bulk_actions() {
 		$actions = array();
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
-		foreach ( $this->_views as $view => $args) {
-			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view )
+		foreach ($this->_views as $view => $args) {
+			if (isset($args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view)
 				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
-				foreach ( $args['bulk_action'] as $route =>$label ) {
-					if ( $this->_admin_page->check_user_access( $route, true ) ) {
+				foreach ($args['bulk_action'] as $route =>$label) {
+					if ($this->_admin_page->check_user_access($route, true)) {
 						$actions[$route] = $label;
 					}
 				}
@@ -473,18 +473,18 @@ 
 	 */
 	private function _filters() {
 		$classname = get_class($this);
-		$filters = apply_filters( "FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen );
+		$filters = apply_filters("FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen);
 
-		if ( empty( $filters )) {
+		if (empty($filters)) {
 			return;
 		}
-		foreach ( $filters as $filter ) {
+		foreach ($filters as $filter) {
 			echo $filter;
 		}
 		//add filter button at end
-		echo '<input type="submit" class="button-secondary" value="' . __('Filter', 'event_espresso') . '" id="post-query-submit" />';
+		echo '<input type="submit" class="button-secondary" value="'.__('Filter', 'event_espresso').'" id="post-query-submit" />';
 		//add reset filters button at end
-		echo '<a class="button button-secondary"  href="' . $this->_admin_page->get_current_page_view_url() . '" style="display:inline-block">' . __('Reset Filters', 'event_espresso') . '</a>';
+		echo '<a class="button button-secondary"  href="'.$this->_admin_page->get_current_page_view_url().'" style="display:inline-block">'.__('Reset Filters', 'event_espresso').'</a>';
 	}
 
 
@@ -498,8 +498,8 @@ 
 	 * @param string $column_name
 	 * @return string
 	 */
-	public function set_primary_column( $column_name ) {
-		return ! empty( $this->_primary_column ) ? $this->_primary_column : $column_name;
+	public function set_primary_column($column_name) {
+		return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
 	}
 
 
@@ -518,7 +518,7 @@ 
 			array(
 				'total_items' => $total_items,
 				'per_page' => $this->_per_page,
-				'total_pages' => ceil($total_items / $this->_per_page )
+				'total_pages' => ceil($total_items / $this->_per_page)
 			)
 		);
 	}
@@ -534,7 +534,7 @@ 
 	 *
 	 * @return string html content for the column
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 		/**
 		 * Dynamic hook allowing for adding additional column content in this list table.
 		 * Note that $this->screen->id is in the format
@@ -544,7 +544,7 @@ 
 		 * hook prefix ("event-espresso") will be different.
 		 *
 		 */
-		do_action( 'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id, $item, $this->_screen );
+		do_action('AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id, $item, $this->_screen);
 	}
 
 
@@ -560,7 +560,7 @@ 
 		 *
 		 * @var array
 		 */
-		$columns = apply_filters( 'FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen );
+		$columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen);
 		return $columns;
 	}
 
@@ -572,18 +572,18 @@ 
 		$views = $this->get_views();
 		$assembled_views = '';
 
-		if ( empty( $views )) {
+		if (empty($views)) {
 			return;
 		}
 		echo "<ul class='subsubsub'>\n";
-		foreach ( $views as $view ) {
-			$count = isset($view['count'] ) && !empty($view['count']) ? absint( $view['count'] )  : 0;
-			if ( isset( $view['slug'] ) && isset( $view['class'] ) && isset( $view['url'] ) && isset( $view['label']) ) {
-				$assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>" . '<a href="' . $view['url'] . '">' . $view['label'] . '</a> <span class="count">(' . $count . ')</span>';
+		foreach ($views as $view) {
+			$count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
+			if (isset($view['slug']) && isset($view['class']) && isset($view['url']) && isset($view['label'])) {
+				$assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>".'<a href="'.$view['url'].'">'.$view['label'].'</a> <span class="count">('.$count.')</span>';
 			}
 		}
 
-		echo is_array( $assembled_views) && ! empty( $assembled_views ) ? implode( " |</li>\n", $assembled_views ) . "</li>\n" : '';
+		echo is_array($assembled_views) && ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : '';
 		echo "</ul>";
 	}
 
@@ -596,10 +596,10 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row( $item ) {
-		$row_class = $this->_get_row_class( $item );
-		echo '<tr class="' . esc_attr( $row_class ) . '">';
-		$this->single_row_columns( $item );
+	public function single_row($item) {
+		$row_class = $this->_get_row_class($item);
+		echo '<tr class="'.esc_attr($row_class).'">';
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -610,13 +610,13 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
+		$row_class = ($row_class == '' ? 'alternate' : '');
 
 		$new_row_class = $row_class;
 
-		if ( !empty($this->_ajax_sorting_callback) ) {
+		if ( ! empty($this->_ajax_sorting_callback)) {
 			$new_row_class .= ' rowsortable';
 		}
 
@@ -635,13 +635,13 @@ 
 
 	public function get_hidden_columns() {
 		$user_id = get_current_user_id();
-		$has_default = get_user_option('default'. $this->screen->id . 'columnshidden', $user_id);
-		if ( empty( $has_default ) && !empty($this->_hidden_columns ) ) {
-			update_user_option($user_id, 'default'.$this->screen->id . 'columnshidden', TRUE);
-			update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, TRUE );
+		$has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id);
+		if (empty($has_default) && ! empty($this->_hidden_columns)) {
+			update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', TRUE);
+			update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, TRUE);
 		}
-		$ref = 'manage' . $this->screen->id . 'columnshidden';
-		$saved_columns = (array) get_user_option( $ref, $user_id );
+		$ref = 'manage'.$this->screen->id.'columnshidden';
+		$saved_columns = (array) get_user_option($ref, $user_id);
 		return $saved_columns;
 	}
 
@@ -656,47 +656,47 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
 		global $wp_version;
-		$use_hidden_class = version_compare( $wp_version, '4.3-RC', '>=' );
+		$use_hidden_class = version_compare($wp_version, '4.3-RC', '>=');
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 
 			/**
 			 * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns are
 			 * hidden or not instead of using "display:none;".  This bit of code provides backward compat.
 			 */
-			$hidden_class = $use_hidden_class && in_array( $column_name, $hidden ) ? ' hidden' : '';
-			$style = ! $use_hidden_class && in_array( $column_name, $hidden ) ? ' style="display:none;"' : '';
+			$hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : '';
+			$style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : '';
 
-			$classes = $column_name . ' column-' . $column_name.$hidden_class;
-			if ( $primary == $column_name ) {
+			$classes = $column_name.' column-'.$column_name.$hidden_class;
+			if ($primary == $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
 
-			$data = ' data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$class = "class='$classes'";
 
 			$attributes = "$class$style$data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				echo '<th scope="row" class="check-column">';
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb($item), $item, $this);
 				echo '</th>';
 			}
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			elseif (method_exists($this, 'column_'.$column_name)) {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content', call_user_func(array($this, 'column_'.$column_name), $item), $item, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 			else {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default($item, $column_name), $item, $column_name, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 		}
@@ -704,19 +704,19 @@ 
 
 
 
-	public function extra_tablenav( $which ) {
-		if ( $which == 'top' ) {
+	public function extra_tablenav($which) {
+		if ($which == 'top') {
 			$this->_filters();
 			echo $this->_get_hidden_fields();
 			echo '<br class="clear">';
-		}else{
+		} else {
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
-			foreach($this->_bottom_buttons as $type => $action){
-				$route = isset( $action['route'] ) ? $action['route'] : '';
-				$extra_request = isset( $action['extra_request'] ) ? $action['extra_request'] : '';
+			foreach ($this->_bottom_buttons as $type => $action) {
+				$route = isset($action['route']) ? $action['route'] : '';
+				$extra_request = isset($action['extra_request']) ? $action['extra_request'] : '';
 				echo $this->_admin_page->get_action_link_or_button($route, $type, $extra_request);
 			}
-			do_action( 'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen );
+			do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
 			echo '</div>';
 		}
 		//echo $this->_entries_per_page_dropdown;
@@ -766,13 +766,13 @@ 
 	 *
 	 * @return string The assembled action elements container.
 	 */
-	protected function _action_string( $action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '' ) {
+	protected function _action_string($action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '') {
 		$content = '';
-		$action_class = ! empty( $action_class ) ? ' class="' . $action_class . '"' : '';
-		$action_id = ! empty( $action_id ) ? ' id="' . $action_id . '"' : '';
-		$content .= ! empty( $action_container ) ? '<' . $action_container . $action_class . $action_id . '>' : '';
-		$content .= apply_filters( 'FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this );
-		$content .= ! empty( $action_container ) ? '</' . $action_container . '>' : '';
+		$action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : '';
+		$action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : '';
+		$content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : '';
+		$content .= apply_filters('FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this);
+		$content .= ! empty($action_container) ? '</'.$action_container.'>' : '';
 		return $content;
 	}
 }

core/domain/services/capabilities/CapabilitiesChecker.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      */
     public function processCapCheck($cap_check)
     {
-        if (is_array($cap_check)){
+        if (is_array($cap_check)) {
             foreach ($cap_check as $check) {
                 $this->processCapCheck($check);
             }

Indentation +84 added lines, -84 removed lines

@@ -5,7 +5,7 @@ 
 use EventEspresso\core\exceptions\InvalidClassException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -21,89 +21,89 @@ 
 class CapabilitiesChecker
 {
 
-    /**
-     * @type \EE_Capabilities $capabilities
-     */
-    private $capabilities;
-
-
-
-    /**
-     * CapabilitiesChecker constructor
-     *
-     * @param \EE_Capabilities $capabilities
-     */
-    public function __construct(\EE_Capabilities $capabilities)
-    {
-        $this->capabilities = $capabilities;
-    }
-
-
-
-    /**
-     * @return \EE_Capabilities
-     */
-    protected function capabilities()
-    {
-        return $this->capabilities;
-    }
-
-
-
-    /**
-     * Verifies that the current user has ALL of the capabilities listed in the CapCheck DTO.
-     * If any of the individual capability checks fails, then the command will NOT be executed.
-     *
-     * @param CapCheckInterface|CapCheckInterface[] $cap_check
-     * @return bool
-     * @throws InvalidClassException
-     * @throws InsufficientPermissionsException
-     */
-    public function processCapCheck($cap_check)
-    {
-        if (is_array($cap_check)){
-            foreach ($cap_check as $check) {
-                $this->processCapCheck($check);
-            }
-            return true;
-        }
-        // at this point, $cap_check should be an individual instance of CapCheck
-        if ( ! $cap_check instanceof CapCheckInterface) {
-            throw new InvalidClassException(
-                '\EventEspresso\core\domain\services\capabilities\CapCheckInterface'
-            );
-        }
-        // sometimes cap checks are conditional, and no capabilities are required
-        if ($cap_check instanceof PublicCapabilities) {
-            return true;
-        }
-        $capabilities = (array) $cap_check->capability();
-        foreach ($capabilities as $capability) {
-            if (
-                ! $this->capabilities()->current_user_can(
-                    $capability,
-                    $cap_check->context(),
-                    $cap_check->ID()
-                )
-            ) {
-                throw new InsufficientPermissionsException($cap_check->context());
-            }
-        }
-        return true;
-    }
-
-
-
-    /**
-     * @param string $capability - the capability to be checked, like: 'ee_edit_registrations'
-     * @param string $context    - what the user is attempting to do, like: 'Edit Registration'
-     * @param int    $ID         - (optional) ID for item where current_user_can is being called from
-     * @return bool
-     */
-    public function process($capability, $context, $ID = 0)
-    {
-        return $this->processCapCheck(new CapCheck($capability, $context, $ID));
-    }
+	/**
+	 * @type \EE_Capabilities $capabilities
+	 */
+	private $capabilities;
+
+
+
+	/**
+	 * CapabilitiesChecker constructor
+	 *
+	 * @param \EE_Capabilities $capabilities
+	 */
+	public function __construct(\EE_Capabilities $capabilities)
+	{
+		$this->capabilities = $capabilities;
+	}
+
+
+
+	/**
+	 * @return \EE_Capabilities
+	 */
+	protected function capabilities()
+	{
+		return $this->capabilities;
+	}
+
+
+
+	/**
+	 * Verifies that the current user has ALL of the capabilities listed in the CapCheck DTO.
+	 * If any of the individual capability checks fails, then the command will NOT be executed.
+	 *
+	 * @param CapCheckInterface|CapCheckInterface[] $cap_check
+	 * @return bool
+	 * @throws InvalidClassException
+	 * @throws InsufficientPermissionsException
+	 */
+	public function processCapCheck($cap_check)
+	{
+		if (is_array($cap_check)){
+			foreach ($cap_check as $check) {
+				$this->processCapCheck($check);
+			}
+			return true;
+		}
+		// at this point, $cap_check should be an individual instance of CapCheck
+		if ( ! $cap_check instanceof CapCheckInterface) {
+			throw new InvalidClassException(
+				'\EventEspresso\core\domain\services\capabilities\CapCheckInterface'
+			);
+		}
+		// sometimes cap checks are conditional, and no capabilities are required
+		if ($cap_check instanceof PublicCapabilities) {
+			return true;
+		}
+		$capabilities = (array) $cap_check->capability();
+		foreach ($capabilities as $capability) {
+			if (
+				! $this->capabilities()->current_user_can(
+					$capability,
+					$cap_check->context(),
+					$cap_check->ID()
+				)
+			) {
+				throw new InsufficientPermissionsException($cap_check->context());
+			}
+		}
+		return true;
+	}
+
+
+
+	/**
+	 * @param string $capability - the capability to be checked, like: 'ee_edit_registrations'
+	 * @param string $context    - what the user is attempting to do, like: 'Edit Registration'
+	 * @param int    $ID         - (optional) ID for item where current_user_can is being called from
+	 * @return bool
+	 */
+	public function process($capability, $context, $ID = 0)
+	{
+		return $this->processCapCheck(new CapCheck($capability, $context, $ID));
+	}
 
 
 

core/libraries/form_sections/inputs/EE_Form_Input_Base.input.php

Spacing +148 added lines, -148 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
+abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable {
 
 	/**
 	 * the input's name attribute
@@ -143,54 +143,54 @@ 
 	 *  @type EE_Validation_Strategy_Base[]  $validation_strategies
 	 * }
 	 */
-	public function __construct( $input_args = array() ){
-		$input_args = (array) apply_filters( 'FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this );
+	public function __construct($input_args = array()) {
+		$input_args = (array) apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
 		// the following properties must be cast as arrays
-		if ( isset( $input_args['validation_strategies'] ) ) {
-			foreach ( (array) $input_args['validation_strategies'] as $validation_strategy ) {
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-					$this->_validation_strategies[ get_class( $validation_strategy ) ] = $validation_strategy;
+		if (isset($input_args['validation_strategies'])) {
+			foreach ((array) $input_args['validation_strategies'] as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+					$this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
 				}
 			}
-			unset( $input_args['validation_strategies'] );
+			unset($input_args['validation_strategies']);
 		}
 		// loop thru incoming options
-		foreach( $input_args as $key => $value ) {
+		foreach ($input_args as $key => $value) {
 			// add underscore to $key to match property names
-			$_key = '_' . $key;
-			if ( property_exists( $this, $_key )) {
+			$_key = '_'.$key;
+			if (property_exists($this, $_key)) {
 				$this->{$_key} = $value;
 			}
 		}
 		// ensure that "required" is set correctly
 		$this->set_required(
-			$this->_required, isset( $input_args[ 'required_validation_error_message' ] )
-				? $input_args[ 'required_validation_error_message' ]
+			$this->_required, isset($input_args['required_validation_error_message'])
+				? $input_args['required_validation_error_message']
 				: null
 		);
 
 		//$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
 
 		$this->_display_strategy->_construct_finalize($this);
-		foreach( $this->_validation_strategies as $validation_strategy ){
+		foreach ($this->_validation_strategies as $validation_strategy) {
 			$validation_strategy->_construct_finalize($this);
 		}
 
-		if( ! $this->_normalization_strategy){
+		if ( ! $this->_normalization_strategy) {
 			$this->_normalization_strategy = new EE_Text_Normalization();
 		}
 		$this->_normalization_strategy->_construct_finalize($this);
 
 		//at least we can use the normalization strategy to populate the default
-		if( isset( $input_args[ 'default' ] ) ) {
-			$this->set_default( $input_args[ 'default' ] );
+		if (isset($input_args['default'])) {
+			$this->set_default($input_args['default']);
 		}
 
-		if( ! $this->_sensitive_data_removal_strategy){
+		if ( ! $this->_sensitive_data_removal_strategy) {
 			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
 		}
 		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
-		parent::__construct( $input_args );
+		parent::__construct($input_args);
 	}
 
 
@@ -201,11 +201,11 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	protected function _set_default_html_name_if_empty(){
-		if( ! $this->_html_name){
+	protected function _set_default_html_name_if_empty() {
+		if ( ! $this->_html_name) {
 			$this->_html_name = $this->name();
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
-				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
 			}
 		}
 	}
@@ -220,10 +220,10 @@ 
 	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_html_name_if_empty();
-		if( ! $this->_html_label && ! $this->_html_label_text){
-			$this->_html_label_text = ucwords( str_replace("_"," ",$name));
+		if ( ! $this->_html_label && ! $this->_html_label_text) {
+			$this->_html_label_text = ucwords(str_replace("_", " ", $name));
 		}
-		do_action( 'AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 	 /**
@@ -231,8 +231,8 @@ 
 	  * @return EE_Display_Strategy_Base
 	  * @throws EE_Error
 	  */
-	protected function _get_display_strategy(){
-		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
+	protected function _get_display_strategy() {
+		if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -243,7 +243,7 @@ 
 					$this->html_id()
 				)
 			);
-		}else{
+		} else {
 			return $this->_display_strategy;
 		}
 	}
@@ -251,7 +251,7 @@ 
 	 * Sets the display strategy.
 	 * @param EE_Display_Strategy_Base $strategy
 	 */
-	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) {
 		$this->_display_strategy = $strategy;
 	}
 
@@ -259,7 +259,7 @@ 
 	 * Sets the sanitization strategy
 	 * @param EE_Normalization_Strategy_Base $strategy
 	 */
-	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) {
 		$this->_normalization_strategy = $strategy;
 	}
 
@@ -285,14 +285,14 @@ 
 	 * Gets the display strategy for this input
 	 * @return EE_Display_Strategy_Base
 	 */
-	public function get_display_strategy(){
+	public function get_display_strategy() {
 		return $this->_display_strategy;
 	}
 	/**
 	 * Overwrites the display strategy
 	 * @param EE_Display_Strategy_Base $display_strategy
 	 */
-	public function set_display_strategy($display_strategy){
+	public function set_display_strategy($display_strategy) {
 		$this->_display_strategy = $display_strategy;
 		$this->_display_strategy->_construct_finalize($this);
 	}
@@ -300,14 +300,14 @@ 
 	 * Gets the normalization strategy set on this input
 	 * @return EE_Normalization_Strategy_Base
 	 */
-	public function get_normalization_strategy(){
+	public function get_normalization_strategy() {
 		return $this->_normalization_strategy;
 	}
 	/**
 	 * Overwrites the normalization strategy
 	 * @param EE_Normalization_Strategy_Base $normalization_strategy
 	 */
-	public function set_normalization_strategy($normalization_strategy){
+	public function set_normalization_strategy($normalization_strategy) {
 		$this->_normalization_strategy = $normalization_strategy;
 		$this->_normalization_strategy->_construct_finalize($this);
 	}
@@ -316,7 +316,7 @@ 
 	 * Returns all teh validation strategies which apply to this field, numerically indexed
 	 * @return EE_Validation_Strategy_Base[]
 	 */
-	public function get_validation_strategies(){
+	public function get_validation_strategies() {
 		return $this->_validation_strategies;
 	}
 
@@ -327,8 +327,8 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){
-		$validation_strategy->_construct_finalize( $this );
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$validation_strategy->_construct_finalize($this);
 		$this->_validation_strategies[] = $validation_strategy;
 	}
 
@@ -339,8 +339,8 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	public function add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ) {
-		$this->_add_validation_strategy( $validation_strategy );
+	public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$this->_add_validation_strategy($validation_strategy);
 	}
 
 
@@ -350,13 +350,13 @@ 
 	 *
 	 * @param string $validation_strategy_classname
 	 */
-	public function remove_validation_strategy( $validation_strategy_classname ) {
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if(
+	public function remove_validation_strategy($validation_strategy_classname) {
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (
 				$validation_strategy instanceof $validation_strategy_classname
-				|| is_subclass_of( $validation_strategy, $validation_strategy_classname )
+				|| is_subclass_of($validation_strategy, $validation_strategy_classname)
 			) {
-				unset( $this->_validation_strategies[ $key ] );
+				unset($this->_validation_strategies[$key]);
 			}
 		}
 	}
@@ -369,12 +369,12 @@ 
 	 * @param array $validation_strategy_classnames
 	 * @return bool
 	 */
-	public function has_validation_strategy( $validation_strategy_classnames ) {
-		$validation_strategy_classnames = is_array( $validation_strategy_classnames )
+	public function has_validation_strategy($validation_strategy_classnames) {
+		$validation_strategy_classnames = is_array($validation_strategy_classnames)
 			? $validation_strategy_classnames
-			: array( $validation_strategy_classnames );
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if( in_array( $key, $validation_strategy_classnames ) ) {
+			: array($validation_strategy_classnames);
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (in_array($key, $validation_strategy_classnames)) {
 				return true;
 			}
 		}
@@ -387,7 +387,7 @@ 
 	 * Gets the HTML
 	 * @return string
 	 */
-	public function get_html(){
+	public function get_html() {
 		return $this->_parent_section->get_html_for_input($this);
 	}
 
@@ -401,7 +401,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function get_html_for_input(){
+	public function get_html_for_input() {
 		return  $this->_get_display_strategy()->display();
 	}
 
@@ -411,7 +411,7 @@ 
 	 * @return string
 	 */
 	public function html_other_attributes() {
-		return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : '';
+		return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : '';
 	}
 
 
@@ -419,7 +419,7 @@ 
 	/**
 	 * @param string $html_other_attributes
 	 */
-	public function set_html_other_attributes( $html_other_attributes ) {
+	public function set_html_other_attributes($html_other_attributes) {
 		$this->_html_other_attributes = $html_other_attributes;
 	}
 
@@ -428,7 +428,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_label(){
+	public function get_html_for_label() {
 		return $this->_parent_section->get_layout_strategy()->display_label($this);
 	}
 	/**
@@ -436,7 +436,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_errors(){
+	public function get_html_for_errors() {
 		return $this->_parent_section->get_layout_strategy()->display_errors($this);
 	}
 	/**
@@ -444,7 +444,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_help(){
+	public function get_html_for_help() {
 		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
 	}
 	/**
@@ -453,18 +453,18 @@ 
 	 * @return boolean
 	 */
 	protected function _validate() {
-		foreach($this->_validation_strategies as $validation_strategy){
-			if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-				try{
+		foreach ($this->_validation_strategies as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+				try {
 					$validation_strategy->validate($this->normalized_value());
-				}catch(EE_Validation_Error $e){
+				} catch (EE_Validation_Error $e) {
 					$this->add_validation_error($e);
 				}
 			}
 		}
-		if( $this->get_validation_errors()){
+		if ($this->get_validation_errors()) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -478,8 +478,8 @@ 
 	 * @param string $value
 	 * @return null|string
 	 */
-	private function _sanitize( $value ) {
-		return $value !== null ? stripslashes( html_entity_decode( trim( $value ) ) ) : null;
+	private function _sanitize($value) {
+		return $value !== null ? stripslashes(html_entity_decode(trim($value))) : null;
 	}
 
 
@@ -493,25 +493,25 @@ 
 	 * @return boolean whether or not there was an error
 	 * @throws \EE_Error
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		//any existing validation errors don't apply so clear them
 		$this->_validation_errors = array();
 		try {
-			$raw_input = $this->find_form_data_for_this_section( $req_data );
+			$raw_input = $this->find_form_data_for_this_section($req_data);
 			//super simple sanitization for now
-			if ( is_array( $raw_input )) {
+			if (is_array($raw_input)) {
 				$raw_value = array();
-				foreach( $raw_input as $key => $value ) {
-					$raw_value[ $key ] = $this->_sanitize( $value );
+				foreach ($raw_input as $key => $value) {
+					$raw_value[$key] = $this->_sanitize($value);
 				}
-				$this->_set_raw_value( $raw_value );
+				$this->_set_raw_value($raw_value);
 			} else {
-				$this->_set_raw_value( $this->_sanitize( $raw_input ) );
+				$this->_set_raw_value($this->_sanitize($raw_input));
 			}
 			//we want to mostly leave the input alone in case we need to re-display it to the user
-			$this->_set_normalized_value( $this->_normalization_strategy->normalize( $this->raw_value() ) );
-		} catch ( EE_Validation_Error $e ) {
-			$this->add_validation_error( $e );
+			$this->_set_normalized_value($this->_normalization_strategy->normalize($this->raw_value()));
+		} catch (EE_Validation_Error $e) {
+			$this->add_validation_error($e);
 		}
 	}
 
@@ -520,7 +520,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_name(){
+	public function html_name() {
 		return $this->_html_name;
 	}
 
@@ -529,8 +529,8 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_id(){
-		return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl';
+	public function html_label_id() {
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl';
 	}
 
 
@@ -538,7 +538,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_class(){
+	public function html_label_class() {
 		return $this->_html_label_class;
 	}
 
@@ -547,7 +547,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_style(){
+	public function html_label_style() {
 		return $this->_html_label_style;
 	}
 
@@ -556,7 +556,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_text(){
+	public function html_label_text() {
 		return $this->_html_label_text;
 	}
 
@@ -565,7 +565,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_text(){
+	public function html_help_text() {
 		return $this->_html_help_text;
 	}
 
@@ -574,7 +574,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_class(){
+	public function html_help_class() {
 		return $this->_html_help_class;
 	}
 
@@ -583,7 +583,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_style(){
+	public function html_help_style() {
 		return $this->_html_style;
 	}
 	/**
@@ -596,7 +596,7 @@ 
 	 * in which case, we would have stored the malicious content to our database.
 	 * @return string
 	 */
-	public function raw_value(){
+	public function raw_value() {
 		return $this->_raw_value;
 	}
 	/**
@@ -604,15 +604,15 @@ 
 	 * it escapes all html entities
 	 * @return string
 	 */
-	public function raw_value_in_form(){
-		return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8');
+	public function raw_value_in_form() {
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
 	}
 	/**
 	 * returns the value after it's been sanitized, and then converted into it's proper type
 	 * in PHP. Eg, a string, an int, an array,
 	 * @return mixed
 	 */
-	public function normalized_value(){
+	public function normalized_value() {
 		return $this->_normalized_value;
 	}
 
@@ -622,7 +622,7 @@ 
 	 * the best thing to display
 	 * @return string
 	 */
-	public function pretty_value(){
+	public function pretty_value() {
 		return $this->_normalized_value;
 	}
 	/**
@@ -641,19 +641,19 @@ 
 		  }</code>
 	 * @return array
 	 */
-	public function get_jquery_validation_rules(){
+	public function get_jquery_validation_rules() {
 		$jquery_validation_js = array();
 		$jquery_validation_rules = array();
-		foreach($this->get_validation_strategies() as $validation_strategy){
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
 			$jquery_validation_rules = array_replace_recursive(
 				$jquery_validation_rules,
 				$validation_strategy->get_jquery_validation_rule_array()
 			);
 		}
 
-		if(! empty($jquery_validation_rules)){
-			foreach( $this->get_display_strategy()->get_html_input_ids( true ) as $html_id_with_pound_sign ) {
-				$jquery_validation_js[ $html_id_with_pound_sign ] = $jquery_validation_rules;
+		if ( ! empty($jquery_validation_rules)) {
+			foreach ($this->get_display_strategy()->get_html_input_ids(true) as $html_id_with_pound_sign) {
+				$jquery_validation_js[$html_id_with_pound_sign] = $jquery_validation_rules;
 			}
 		}
 		return $jquery_validation_js;
@@ -665,16 +665,16 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	public function set_default($value){
-		$this->_set_normalized_value( $value );
-		$this->_set_raw_value( $value );
+	public function set_default($value) {
+		$this->_set_normalized_value($value);
+		$this->_set_raw_value($value);
 	}
 	
 	/**
 	 * Sets the normalized value on this input
 	 * @param mixed $value
 	 */
-	protected function _set_normalized_value( $value ) {
+	protected function _set_normalized_value($value) {
 		$this->_normalized_value = $value;
 	}
 	
@@ -682,8 +682,8 @@ 
 	 * Sets the raw value on this input (ie, exactly as the user submitted it)
 	 * @param mixed $value
 	 */
-	protected function _set_raw_value( $value ) {
-		$this->_raw_value = $this->_normalization_strategy->unnormalize( $value );
+	protected function _set_raw_value($value) {
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
 	}
 
 	/**
@@ -691,7 +691,7 @@ 
 	 * @param string $label
 	 * @return void
 	 */
-	public function set_html_label_text($label){
+	public function set_html_label_text($label) {
 		$this->_html_label_text = $label;
 	}
 
@@ -705,13 +705,13 @@ 
 	 * @param boolean $required boolean
 	 * @param null    $required_text
 	 */
-	public function set_required($required = true, $required_text = NULL ){
-		$required = filter_var( $required, FILTER_VALIDATE_BOOLEAN  );
+	public function set_required($required = true, $required_text = NULL) {
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
 		//whether $required is a string or a boolean, we want to add a required validation strategy
-		if ( $required ) {
-			$this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) );
+		if ($required) {
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
 		} else {
-			unset( $this->_validation_strategies[ 'EE_Required_Validation_Strategy' ] );
+			unset($this->_validation_strategies['EE_Required_Validation_Strategy']);
 		}
 		$this->_required = $required;
 	}
@@ -719,7 +719,7 @@ 
 	 * Returns whether or not this field is required
 	 * @return boolean
 	 */
-	public function required(){
+	public function required() {
 		return $this->_required;
 	}
 
@@ -728,7 +728,7 @@ 
 	/**
 	 * @param string $required_css_class
 	 */
-	public function set_required_css_class( $required_css_class ) {
+	public function set_required_css_class($required_css_class) {
 		$this->_required_css_class = $required_css_class;
 	}
 
@@ -747,7 +747,7 @@ 
 	 * Sets the help text, in case
 	 * @param string $text
 	 */
-	public function set_html_help_text($text){
+	public function set_html_help_text($text) {
 		$this->_html_help_text = $text;
 	}
 	/**
@@ -759,9 +759,9 @@ 
 	public function clean_sensitive_data() {
 		//if we do ANY kind of sensitive data removal on this, then just clear out the raw value
 		//if we need more logic than this we'll make a strategy for it
-		if( $this->_sensitive_data_removal_strategy &&
-				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){
-			$this->_set_raw_value( null );
+		if ($this->_sensitive_data_removal_strategy &&
+				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) {
+			$this->_set_raw_value(null);
 		}
 		//and clean the normalized value according to the appropriate strategy
 		$this->_set_normalized_value(
@@ -778,10 +778,10 @@ 
 	 * @param string $button_size
 	 * @param string $other_attributes
 	 */
-	public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) {
+	public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') {
 		$button_css_attributes = 'button';
 		$button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary';
-		switch ( $button_size ) {
+		switch ($button_size) {
 			case 'xs' :
 			case 'extra-small' :
 				$button_css_attributes .= ' button-xs';
@@ -802,8 +802,8 @@ 
 			default :
 				$button_css_attributes .= '';
 		}
-		$this->_button_css_attributes .= ! empty( $other_attributes )
-			? $button_css_attributes . ' ' . $other_attributes
+		$this->_button_css_attributes .= ! empty($other_attributes)
+			? $button_css_attributes.' '.$other_attributes
 			: $button_css_attributes;
 	}
 
@@ -813,7 +813,7 @@ 
 	 * @return string
 	 */
 	public function button_css_attributes() {
-		if ( empty( $this->_button_css_attributes )) {
+		if (empty($this->_button_css_attributes)) {
 			$this->set_button_css_attributes();
 		}
 		return $this->_button_css_attributes;
@@ -835,26 +835,26 @@ 
 	 * @return mixed whatever the raw value of this form section is in the request data
 	 * @throws \EE_Error
 	 */
-	public function find_form_data_for_this_section( $req_data ){
+	public function find_form_data_for_this_section($req_data) {
 		// break up the html name by "[]"
-		if ( strpos( $this->html_name(), '[' ) !== FALSE ) {
-			$before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') );
+		if (strpos($this->html_name(), '[') !== FALSE) {
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
 		} else {
 			$before_any_brackets = $this->html_name();
 		}
 		// grab all of the segments
-		preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches);
-		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
-			$name_parts = $matches[ 1 ];
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
+		if (isset($matches[1]) && is_array($matches[1])) {
+			$name_parts = $matches[1];
 			array_unshift($name_parts, $before_any_brackets);
-		}else{
-			$name_parts = array( $before_any_brackets );
+		} else {
+			$name_parts = array($before_any_brackets);
 		}
 		// now get the value for the input
 		$value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data);
 		// check if this thing's name is at the TOP level of the request data
-		if( $value === null && isset( $req_data[ $this->name() ] ) ){
-			$value = $req_data[ $this->name() ];
+		if ($value === null && isset($req_data[$this->name()])) {
+			$value = $req_data[$this->name()];
 		}
 		return $value;
 	}
@@ -867,18 +867,18 @@ 
 	 * @param array $req_data
 	 * @return array | NULL
 	 */
-	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){
-		$first_part_to_consider = array_shift( $html_name_parts );
-		if( isset( $req_data[ $first_part_to_consider ] ) ){
-			if( empty($html_name_parts ) ){
-				return $req_data[ $first_part_to_consider ];
-			}else{
+	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) {
+		$first_part_to_consider = array_shift($html_name_parts);
+		if (isset($req_data[$first_part_to_consider])) {
+			if (empty($html_name_parts)) {
+				return $req_data[$first_part_to_consider];
+			} else {
 				return $this->_find_form_data_for_this_section_using_name_parts(
 					$html_name_parts,
-					$req_data[ $first_part_to_consider ]
+					$req_data[$first_part_to_consider]
 				);
 			}
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -892,14 +892,14 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function form_data_present_in($req_data = NULL){
-		if( $req_data === NULL ){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		$checked_value = $this->find_form_data_for_this_section( $req_data );
-		if( $checked_value !== null ){
+		$checked_value = $this->find_form_data_for_this_section($req_data);
+		if ($checked_value !== null) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -910,8 +910,8 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		$form_other_js_data = $this->get_other_js_data_from_strategies( $form_other_js_data );
+	public function get_other_js_data($form_other_js_data = array()) {
+		$form_other_js_data = $this->get_other_js_data_from_strategies($form_other_js_data);
 		return $form_other_js_data;
 	}
 
@@ -924,10 +924,10 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data_from_strategies( $form_other_js_data = array() ) {
-		$form_other_js_data = $this->get_display_strategy()->get_other_js_data( $form_other_js_data );
-		foreach( $this->get_validation_strategies() as $validation_strategy ) {
-			$form_other_js_data = $validation_strategy->get_other_js_data( $form_other_js_data );
+	public function get_other_js_data_from_strategies($form_other_js_data = array()) {
+		$form_other_js_data = $this->get_display_strategy()->get_other_js_data($form_other_js_data);
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$form_other_js_data = $validation_strategy->get_other_js_data($form_other_js_data);
 		}
 		return $form_other_js_data;
 	}
@@ -936,7 +936,7 @@ 
 	 * Override parent because we want to give our strategies an opportunity to enqueue some js and css
 	 * @return void
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		//ask our display strategy and validation strategies if they have js to enqueue
 		$this->enqueue_js_from_strategies();
 	}
@@ -947,7 +947,7 @@ 
 	 */
 	public function enqueue_js_from_strategies() {
 		$this->get_display_strategy()->enqueue_js();
-		foreach( $this->get_validation_strategies() as $validation_strategy ) {
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
 			$validation_strategy->enqueue_js();
 		}
 	}