eventespresso / event-espresso-core

core/libraries/rest_api/controllers/Base.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	 *
 	 * @param string $route
 	 * @param string $regex
-	 * @param array  $match_keys EXCLUDING matching the entire regex
+	 * @param string[]  $match_keys EXCLUDING matching the entire regex
 	 * @return array where  $match_keys are the keys (the first value of $match_keys
 	 * becomes the first key of the return value, etc. Eg passing in $match_keys of
 	 * array( 'model', 'id' ), will, if the regex is successful, will return

Spacing +35 added lines, -35 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -36,7 +36,7 @@ 
 	protected $_requested_version;
 
 	public function __construct() {
-		$this->_debug_mode = defined( 'EE_REST_API_DEBUG_MODE' ) ? EE_REST_API_DEBUG_MODE : false;
+		$this->_debug_mode = defined('EE_REST_API_DEBUG_MODE') ? EE_REST_API_DEBUG_MODE : false;
 	}
 
 
@@ -44,7 +44,7 @@ 
 	 * Sets the version the user requested
 	 * @param string $version eg '4.8'
 	 */
-	public function set_requested_version( $version ) {
+	public function set_requested_version($version) {
 		$this->_requested_version = $version;
 	}
 
@@ -53,8 +53,8 @@ 
 	 * @param string $key
 	 * @param string|array $info
 	 */
-	protected function _set_debug_info( $key, $info ){
-		$this->_debug_info[ $key ] = $info;
+	protected function _set_debug_info($key, $info) {
+		$this->_debug_info[$key] = $info;
 	}
 
 
@@ -69,52 +69,52 @@ 
 	 * @param array|\WP_Error|\Exception $response
 	 * @return \WP_REST_Response
 	 */
-	public function send_response( $response ) {
-		if( $response instanceof \Exception ) {
-			$response = new \WP_Error( $response->getCode(), $response->getMessage() );
+	public function send_response($response) {
+		if ($response instanceof \Exception) {
+			$response = new \WP_Error($response->getCode(), $response->getMessage());
 		}
-		if( $response instanceof \WP_Error ) {
+		if ($response instanceof \WP_Error) {
 			//we want to send a "normal"-looking WP error response, but we also
 			//want to add headers. It doesn't seem WP API 1.2 supports this.
 			//I'd like to use WP_JSON_Server::error_to_response() but its protected
 			//so here's most of it copy-and-pasted :P
 			$error_data = $response->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+			if (is_array($error_data) && isset($error_data['status'])) {
 				$status = $error_data['status'];
 			} else {
 				$status = 500;
 			}
 
 			$errors = array();
-			foreach ( (array) $response->errors as $code => $messages ) {
-				foreach ( (array) $messages as $message ) {
+			foreach ((array) $response->errors as $code => $messages) {
+				foreach ((array) $messages as $message) {
 					$errors[] = array(
 						'code'    => $code,
 						'message' => $message,
-						'data'    => $response->get_error_data( $code )
+						'data'    => $response->get_error_data($code)
 					);
 				}
 			}
-			$data = isset( $errors[0] ) ? $errors[0] : array();
-			if ( count( $errors ) > 1 ) {
+			$data = isset($errors[0]) ? $errors[0] : array();
+			if (count($errors) > 1) {
 				// Remove the primary error.
-				array_shift( $errors );
+				array_shift($errors);
 				$data['additional_errors'] = $errors;
 			}
-			$rest_response = new \WP_REST_Response( $data, $status );
-		}else{
-			$rest_response = new \WP_REST_Response( $response, 200 );
+			$rest_response = new \WP_REST_Response($data, $status);
+		} else {
+			$rest_response = new \WP_REST_Response($response, 200);
 		}
 		$headers = array();
-		if( $this->_debug_mode && is_array( $this->_debug_info ) ) {
-			foreach( $this->_debug_info  as $debug_key => $debug_info ) {
-				if( is_array( $debug_info ) ) {
-					$debug_info = json_encode( $debug_info );
+		if ($this->_debug_mode && is_array($this->_debug_info)) {
+			foreach ($this->_debug_info  as $debug_key => $debug_info) {
+				if (is_array($debug_info)) {
+					$debug_info = json_encode($debug_info);
 				}
-				$headers[ 'X-EE4-Debug-' . ucwords( $debug_key ) ] = $debug_info;
+				$headers['X-EE4-Debug-'.ucwords($debug_key)] = $debug_info;
 			}
 		}
-		$rest_response->set_headers( $headers );
+		$rest_response->set_headers($headers);
 		return $rest_response;
 	}
 
@@ -136,23 +136,23 @@ 
 	 * array( 'model' => 'foo', 'id' => 'bar' )
 	 * @throws \EE_Error if it couldn't be parsed
 	 */
-	public function parse_route( $route, $regex, $match_keys ) {
+	public function parse_route($route, $regex, $match_keys) {
 		$indexed_matches = array();
-		$success = preg_match( $regex, $route, $matches );
-		if(
-			is_array( $matches ) ) {
+		$success = preg_match($regex, $route, $matches);
+		if (
+			is_array($matches) ) {
 			//skip the overall regex match. Who cares
-			for( $i = 1; $i <= count( $match_keys ); $i++ ) {
-				if( ! isset( $matches[ $i ] ) ) {
+			for ($i = 1; $i <= count($match_keys); $i++) {
+				if ( ! isset($matches[$i])) {
 					$success = false;
 				} else {
-					$indexed_matches[ $match_keys[ $i - 1 ] ] = $matches[ $i ];
+					$indexed_matches[$match_keys[$i - 1]] = $matches[$i];
 				}
 			}
 		}
-		if( ! $success ) {
+		if ( ! $success) {
 			throw new \EE_Error(
-				__( 'We could not parse the URL. Please contact Event Espresso Support', 'event_espresso' ),
+				__('We could not parse the URL. Please contact Event Espresso Support', 'event_espresso'),
 				'endpoint_parsing_error'
 			);
 		}

core/libraries/rest_api/Capabilities.php

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,16 +21,16 @@ 
 	 * @param string $model_context one of the return values from EEM_Base::valid_cap_contexts()
 	 * @return boolean
 	 */
-	public static function current_user_has_partial_access_to( $model, $model_context = \EEM_Base::caps_read ) {
-		if( apply_filters( 'FHEE__Capabilities__current_user_has_partial_access_to__override_begin', false, $model, $model ) ) {
+	public static function current_user_has_partial_access_to($model, $model_context = \EEM_Base::caps_read) {
+		if (apply_filters('FHEE__Capabilities__current_user_has_partial_access_to__override_begin', false, $model, $model)) {
 			return true;
 		}
-		foreach( $model->caps_missing( $model_context ) as $capability_name => $restriction_obj ) {
-			if( $restriction_obj instanceof \EE_Return_None_Where_Conditions ){
+		foreach ($model->caps_missing($model_context) as $capability_name => $restriction_obj) {
+			if ($restriction_obj instanceof \EE_Return_None_Where_Conditions) {
 				return false;
 			}
 		}
-		if( apply_filters( 'FHEE__Capabilities__current_user_has_partial_access_to__override_end', false, $model, $model ) ) {
+		if (apply_filters('FHEE__Capabilities__current_user_has_partial_access_to__override_end', false, $model, $model)) {
 			return false;
 		}
 		return true;
@@ -43,8 +43,8 @@ 
 	 * @param string $request_type one of the constants on WP_JSON_Server
 	 * @return array
 	 */
-	public static function get_missing_permissions( $model, $request_type = \EEM_Base::caps_read ) {
-		return $model->caps_missing( $request_type );
+	public static function get_missing_permissions($model, $request_type = \EEM_Base::caps_read) {
+		return $model->caps_missing($request_type);
 	}
 	/**
 	 * Gets a string of all the capabilities the current user is missing that affected
@@ -54,8 +54,8 @@ 
 	 * @param string $model_context one of the return values from EEM_Base::valid_cap_contexts()
 	 * @return string
 	 */
-	public static function get_missing_permissions_string( $model, $model_context = \EEM_Base::caps_read ) {
-		return implode(',', array_keys( self::get_missing_permissions( $model, $model_context ) ) );
+	public static function get_missing_permissions_string($model, $model_context = \EEM_Base::caps_read) {
+		return implode(',', array_keys(self::get_missing_permissions($model, $model_context)));
 	}
 
 	/**
@@ -66,25 +66,25 @@ 
 	 * @param Model_Version_Info $model_version_info
 	 * @return array ready for converting into json
 	 */
-	public static function filter_out_inaccessible_entity_fields( $entity,  $model, $request_type, $model_version_info ) {
+	public static function filter_out_inaccessible_entity_fields($entity, $model, $request_type, $model_version_info) {
 		//we only care to do this for frontend reads and when the user can't edit the item
-		if(  $request_type !== \EEM_Base::caps_read ||
-				$model->exists( array(
-					array( $model->primary_key_name() => $entity[ $model->primary_key_name() ] ),
+		if ($request_type !== \EEM_Base::caps_read ||
+				$model->exists(array(
+					array($model->primary_key_name() => $entity[$model->primary_key_name()]),
 					'default_where_conditions' => 'none',
-					'caps' => \EEM_Base::caps_edit ) ) ) {
+					'caps' => \EEM_Base::caps_edit ))) {
 			return $entity;
 		}
-		foreach( $model->field_settings() as $field_name => $field_obj ){
-			if( $model_version_info->field_has_rendered_format( $field_obj )
-				&& isset( $entity[ $field_name ][ 'raw' ] )
+		foreach ($model->field_settings() as $field_name => $field_obj) {
+			if ($model_version_info->field_has_rendered_format($field_obj)
+				&& isset($entity[$field_name]['raw'])
 			) {
-				unset( $entity[ $field_name ][ 'raw' ] );
+				unset($entity[$field_name]['raw']);
 			}
 		}
 		//theoretically we may want to filter out specific fields for specific models
 
-		return apply_filters( 'FHEE__Capabilities__filter_out_inaccessible_entity_fields', $entity, $model, $request_type );
+		return apply_filters('FHEE__Capabilities__filter_out_inaccessible_entity_fields', $entity, $model, $request_type);
 	}
 }
 

core/libraries/rest_api/controllers/config/Read.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\config;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,11 +21,11 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \EE_Config|\WP_Error
 	 */
-	public static function handle_request( \WP_REST_Request $request) {
+	public static function handle_request(\WP_REST_Request $request) {
 		$cap = \EE_Restriction_Generator_Base::get_default_restrictions_cap();
-		if( \EE_Capabilities::instance()->current_user_can( $cap, 'read_over_api' ) ){
+		if (\EE_Capabilities::instance()->current_user_can($cap, 'read_over_api')) {
 			return \EE_Config::instance();
-		}else{
+		} else {
 			return new \WP_Error(
 				'cannot_read_config',
 				sprintf(
@@ -35,7 +35,7 @@ 
 					),
 					$cap
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
 	}

modules/core_rest_api/EED_Core_Rest_Api.module.php

Braces +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
 			//if it's not above the current core version, and it's compatible with the current version of core
 			if( $possibly_served_version < EED_REST_API::core_version() && $possibly_served_version >= $lowest_compatible_version ) {
 				$versions_served[ $possibly_served_version ] = true;
-			}else {
+			} else {
 				$versions_served[ $possibly_served_version ] = false;
 			}
 		}

Spacing +63 added lines, -63 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -22,7 +22,7 @@ 
 	 * @return EED_Core_Rest_Api
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -52,9 +52,9 @@ 
 
 
 	public static function set_hooks_both() {
-		add_action( 'rest_api_init', array( 'EED_Core_REST_API', 'register_routes' ) );
-		add_filter( 'rest_route_data', array( 'EED_Core_REST_API', 'hide_old_endpoints' ), 10, 2 );
-		add_filter( 'rest_index', array( 'EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index' ) );
+		add_action('rest_api_init', array('EED_Core_REST_API', 'register_routes'));
+		add_filter('rest_route_data', array('EED_Core_REST_API', 'hide_old_endpoints'), 10, 2);
+		add_filter('rest_index', array('EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index'));
 	}
 
 
@@ -63,16 +63,16 @@ 
 	 * so we actually prefer to only do it when an EE plugin is activated or upgraded
 	 */
 	public static function register_routes() {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					register_rest_route(
 						$namespace,
 						$endpoint,
 						array(
-							'callback' => $route[ 'callback' ],
-							'methods' => $route[ 'methods' ],
-							'args' => isset( $route[ 'args' ] ) ? $route[ 'args' ] : array(),
+							'callback' => $route['callback'],
+							'methods' => $route['methods'],
+							'args' => isset($route['args']) ? $route['args'] : array(),
 						)
 					);
 				}
@@ -89,10 +89,10 @@ 
 	 * }
 	 */
 	public static function get_ee_route_data() {
-		$ee_routes = get_option( self::saved_routes_option_names, null );
-		if( ! $ee_routes || ( defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE )){
+		$ee_routes = get_option(self::saved_routes_option_names, null);
+		if ( ! $ee_routes || (defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE)) {
 			self::save_ee_routes();
-			$ee_routes = get_option( self::saved_routes_option_names, array() );
+			$ee_routes = get_option(self::saved_routes_option_names, array());
 		}
 		return $ee_routes;
 	}
@@ -103,14 +103,14 @@ 
 	 * @return void
 	 */
 	public static function save_ee_routes() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$instance = self::instance();
 			$routes = array_replace_recursive(
 				$instance->_register_config_routes(),
 				$instance->_register_meta_routes(),
 				$instance->_register_model_routes()
 			);
-			update_option( self::saved_routes_option_names, $routes, true );
+			update_option(self::saved_routes_option_names, $routes, true);
 		}
 	}
 
@@ -119,7 +119,7 @@ 
 	 * @return array @see get_ee_route_data
 	 */
 	protected function _register_model_routes() {
-		EE_Registry::instance()->load_helper( 'Inflector' );
+		EE_Registry::instance()->load_helper('Inflector');
 		$models_to_register = apply_filters(
 			'FHEE__EED_Core_REST_API___register_model_routes',
 			EE_Registry::instance()->non_abstract_db_models
@@ -128,23 +128,23 @@ 
 		unset($models_to_register['Extra_Meta']);
 		unset($models_to_register['Extra_Join']);
 		$model_routes = array( );
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
 
-			foreach ( $models_to_register as $model_name => $model_classname ) {
+			foreach ($models_to_register as $model_name => $model_classname) {
 				//yes we could just register one route for ALL models, but then they wouldn't show up in the index
-				$ee_namespace = self::ee_api_namespace . $version;
-				$plural_model_route = EEH_Inflector::pluralize_and_lower( $model_name );
-				$singular_model_route = $plural_model_route . '/(?P<id>\d+)' ;
-				$model_routes[ $ee_namespace ][ $plural_model_route ] = array(
+				$ee_namespace = self::ee_api_namespace.$version;
+				$plural_model_route = EEH_Inflector::pluralize_and_lower($model_name);
+				$singular_model_route = $plural_model_route.'/(?P<id>\d+)';
+				$model_routes[$ee_namespace][$plural_model_route] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 								'handle_request_get_all' ),
 							'methods' => WP_REST_Server::READABLE,
 							'hidden_endpoint' => $hidden_endpoint,
-							'args' => $this->_get_read_query_params( $model_name ),
+							'args' => $this->_get_read_query_params($model_name),
 							'_links' => array(
-								'self' => rest_url( $ee_namespace . $singular_model_route ),
+								'self' => rest_url($ee_namespace.$singular_model_route),
 							)
 						),
 //						array(
@@ -155,7 +155,7 @@ 
 //							'hidden_endpoint' => $hidden_endpoint
 //						)
 					);
-				$model_routes[ $ee_namespace ][ $singular_model_route ] = array(
+				$model_routes[$ee_namespace][$singular_model_route] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
@@ -166,7 +166,7 @@ 
 								'include' => array(
 									'required' => false,
 									'default' => '*',
-									'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso' ),
+									'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso'),
 								),
 							)
 						),
@@ -179,20 +179,20 @@ 
 //							),
 				);
 				//@todo: also handle  DELETE for a single item
-				$model = EE_Registry::instance()->load_model( $model_classname );
-				foreach ( $model->relation_settings() as $relation_name => $relation_obj ) {
+				$model = EE_Registry::instance()->load_model($model_classname);
+				foreach ($model->relation_settings() as $relation_name => $relation_obj) {
 					$related_model_name_endpoint_part = EventEspresso\core\libraries\rest_api\controllers\model\Read::get_related_entity_name(
 						$relation_name,
 						$relation_obj
 					);
-					$model_routes[ $ee_namespace ][ $singular_model_route . '/' . $related_model_name_endpoint_part ] = array(
+					$model_routes[$ee_namespace][$singular_model_route.'/'.$related_model_name_endpoint_part] = array(
 							array(
 								'callback' => array(
 									'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 									'handle_request_get_related' ),
 								'methods' => WP_REST_Server::READABLE,
 								'hidden_endpoint' => $hidden_endpoint,
-								'args' => $this->_get_read_query_params( $relation_name ),
+								'args' => $this->_get_read_query_params($relation_name),
 							),
 //							array(
 //								'callback' => array(
@@ -215,47 +215,47 @@ 
 	 * @param string $model_name eg 'Event' or 'Venue'
 	 * @return array describing the args acceptable when querying this model
 	 */
-	protected function _get_read_query_params( $model_name ) {
-		$model = EE_Registry::instance()->load_model( $model_name );
+	protected function _get_read_query_params($model_name) {
+		$model = EE_Registry::instance()->load_model($model_name);
 		$default_orderby = array();
-		foreach( $model->get_combined_primary_key_fields() as $key_field ) {
-			$default_orderby[ $key_field->get_name() ] = 'ASC';
+		foreach ($model->get_combined_primary_key_fields() as $key_field) {
+			$default_orderby[$key_field->get_name()] = 'ASC';
 		}
 		return array(
 			'where' => array(
 				'required' => false,
 				'default' => array(),
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterwhere for documentation', 'event_espresso' ),
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterwhere for documentation', 'event_espresso'),
 				),
 			'limit' => array(
 				'required' => false,
 				'default' => 50,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterlimit for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterlimit for documentation', 'event_espresso')
 			),
 			'order_by' => array(
 				'required' => false,
 				'default' => $default_orderby,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterorder_by for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterorder_by for documentation', 'event_espresso')
 			),
 			'group_by' => array(
 				'required' => false,
 				'default' => null,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filtergroup_by for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filtergroup_by for documentation', 'event_espresso')
 			),
 			'having' => array(
 				'required' => false,
 				'default' => null,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterhaving for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filterhaving for documentation', 'event_espresso')
 			),
 			'caps' => array(
 				'required' => false,
 				'default' => EEM_Base::caps_read,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filtercaps for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#filtercaps for documentation', 'event_espresso')
 			),
 			'include' => array(
 				'required' => false,
 				'default' => '*',
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso' ),
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-json-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso'),
 			),
 		);
 	}
@@ -266,8 +266,8 @@ 
 	 */
 	protected function _register_config_routes() {
 		$config_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$config_routes[ self::ee_api_namespace . $version ][ 'config' ] = array(
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$config_routes[self::ee_api_namespace.$version]['config'] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\config\Read',
@@ -286,8 +286,8 @@ 
 	 */
 	protected function _register_meta_routes() {
 		$meta_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$meta_routes[ self::ee_api_namespace . $version ][ '/resources' ] = array(
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$meta_routes[self::ee_api_namespace.$version]['/resources'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\model\Meta',
@@ -308,13 +308,13 @@ 
 	 * @param array $route_data
 	 * @return array
 	 */
-	public function hide_old_endpoints( $route_data ) {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
-					if( $route[ 'hidden_endpoint' ] ) {
-						$full_route = '/' . ltrim( $namespace, '/' ) . '/' . ltrim( $endpoint, '/' );
-						unset( $route_data[ $full_route ] );
+	public function hide_old_endpoints($route_data) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
+					if ($route['hidden_endpoint']) {
+						$full_route = '/'.ltrim($namespace, '/').'/'.ltrim($endpoint, '/');
+						unset($route_data[$full_route]);
 					}
 				}
 			}
@@ -334,7 +334,7 @@ 
 	 * @return array
 	 */
 	public static function version_compatibilities() {
-		return apply_filters( 'FHEE__EED_Core_REST_API__version_compatibilities', array( '4.8.29' => '4.8.29' ) );
+		return apply_filters('FHEE__EED_Core_REST_API__version_compatibilities', array('4.8.29' => '4.8.29'));
 	}
 
 	/**
@@ -348,17 +348,17 @@ 
 	public static function versions_served() {
 		$version_compatibilities = EED_Core_Rest_Api::version_compatibilities();
 		$versions_served = array();
-		$lowest_compatible_version = $version_compatibilities[ EED_Core_Rest_Api::core_version() ];
+		$lowest_compatible_version = $version_compatibilities[EED_Core_Rest_Api::core_version()];
 		//for each version of core we have ever served:
-		foreach( array_keys( EED_Core_Rest_Api::version_compatibilities() ) as $possibly_served_version ) {
+		foreach (array_keys(EED_Core_Rest_Api::version_compatibilities()) as $possibly_served_version) {
 			//if it's not above the current core version, and it's compatible with the current version of core
-			if(
+			if (
 				$possibly_served_version < EED_Core_Rest_Api::core_version()
 				&& $possibly_served_version >= $lowest_compatible_version
 			) {
-				$versions_served[ $possibly_served_version ] = true;
-			}else {
-				$versions_served[ $possibly_served_version ] = false;
+				$versions_served[$possibly_served_version] = true;
+			} else {
+				$versions_served[$possibly_served_version] = false;
 			}
 		}
 		return $versions_served;
@@ -371,7 +371,7 @@ 
 	 * @return string
 	 */
 	public static function core_version() {
-		return apply_filters( 'FHEE__EED_Core_REST_API__core_version', implode('.', array_slice( explode( '.', espresso_version() ), 0, 3 ) ) );
+		return apply_filters('FHEE__EED_Core_REST_API__core_version', implode('.', array_slice(explode('.', espresso_version()), 0, 3)));
 	}
 
 
@@ -383,7 +383,7 @@ 
 	 * @param  WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 
 	}
 

core/libraries/rest_api/controllers/model/Read.php

Doc Comments +4 added lines

@@ -653,6 +653,10 @@
 		}
 		return $model_ready_query_params;
 	}
+
+	/**
+	 * @param \EEM_Base $model
+	 */
 	public function prepare_rest_query_params_values_for_models( $model,  $query_params ) {
 		$model_ready_query_params = array();
 		foreach( $query_params as $key => $value ) {

Braces +16 added lines, -16 removed lines

@@ -227,7 +227,7 @@ 
 		){
 			if( $relation instanceof \EE_Belongs_To_Relation ) {
 				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
+			} else{
 				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
 			}
 			return new \WP_Error(
@@ -280,7 +280,7 @@ 
 		}
 		if( $relation instanceof \EE_Belongs_To_Relation ){
 			return array_shift( $nice_results );
-		}else{
+		} else{
 			return $nice_results;
 		}
 	}
@@ -331,26 +331,26 @@ 
 			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
 			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
 				unset( $result[ $field_name ] );
-			}elseif(
+			} elseif(
 				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
 			){
 				$result[ $field_name ] = array(
 					'raw' => $field_obj->prepare_for_get( $field_value ),
 					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
 				);
-			}elseif(
+			} elseif(
 				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
 			){
 				$result[ $field_name ] = array(
 					'raw' => $field_obj->prepare_for_get( $field_value ),
 					'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value )
 				);
-			}elseif( $field_obj instanceof \EE_Datetime_Field ){
+			} elseif( $field_obj instanceof \EE_Datetime_Field ){
 				if( $raw_field_value instanceof \DateTime ) {
 					$raw_field_value = $raw_field_value->format( 'c' );
 				}
 				$result[ $field_name ] = mysql_to_rfc3339( $raw_field_value );
-			}else{
+			} else{
 				$value_prepared = $field_obj->prepare_for_get( $field_value );
 
 				$result[ $field_name ] = $value_prepared === INF ? EE_INF_IN_DB : $value_prepared;
@@ -479,7 +479,7 @@ 
 	public static function get_related_entity_name( $relation_name, $relation_obj ){
 		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
 			return strtolower( $relation_name );
-		}else{
+		} else{
 			return \EEH_Inflector::pluralize_and_lower( $relation_name );
 		}
 	}
@@ -548,7 +548,7 @@ 
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
 		if( in_array( $context, $valid_contexts )  ){
 			return $context;
-		}else{
+		} else{
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -573,7 +573,7 @@ 
 			$order_by = $query_parameters[ 'order_by' ];
 		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
 			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		} else{
 			$order_by = null;
 		}
 		if( $order_by !== null ){
@@ -583,7 +583,7 @@ 
 			$group_by = $query_parameters[ 'group_by' ];
 		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
 			$group_by = $query_parameters[ 'groupby' ];
-		}else{
+		} else{
 			$group_by = null;
 		}
 		if( $group_by !== null ){
@@ -606,7 +606,7 @@ 
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
 			if( is_string( $query_parameters[ 'limit' ] ) ) {
 				$limit_array = explode(',', $query_parameters['limit']);
-			}else {
+			} else {
 				$limit_array = $query_parameters[ 'limit' ];
 			}
 			$sanitized_limit = array();
@@ -622,12 +622,12 @@ 
 				$sanitized_limit[] = intval( $limit_part );
 			}
 			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
+		} else{
 			$model_query_params[ 'limit' ] = 50;
 		}
 		if( isset( $query_parameters[ 'caps' ] ) ) {
 			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
+		} else{
 			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
 		}
 		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
@@ -647,7 +647,7 @@ 
 		foreach( $query_params as $key => $value ) {
 			if( is_array( $value ) ) {
 				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
+			} else{
 				$model_ready_query_params[ $key ] = $value;
 			}
 		}
@@ -689,11 +689,11 @@ 
 					//found the model name at the exact start
 					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				} elseif( $field_to_include == $model_name ){
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else{
 			//look for ones with no period
 			foreach( $includes as $field_to_include ) {
 				$field_to_include = trim( $field_to_include );

Spacing +244 added lines, -244 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\model;
 use EventEspresso\core\libraries\rest_api\Capabilities;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -24,7 +24,7 @@ 
 
 	public function __construct() {
 		parent::__construct();
-		\EE_Registry::instance()->load_helper( 'Inflector' );
+		\EE_Registry::instance()->load_helper('Inflector');
 	}
 
 	/**
@@ -32,22 +32,22 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_all( \WP_REST_Request $request) {
+	public static function handle_request_get_all(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)~',
-				array( 'version', 'model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)~',
+				array('version', 'model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -55,12 +55,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entities_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 					)
 			);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -70,21 +70,21 @@ 
 	 * @param \WP_Rest_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_one( \WP_Rest_Request $request ) {
+	public static function handle_request_get_one(\WP_Rest_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)~',
-				array( 'version', 'model', 'id' ) );
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)~',
+				array('version', 'model', 'id') );
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -92,12 +92,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entity_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 						)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -109,35 +109,35 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_related( \WP_REST_Request $request ) {
+	public static function handle_request_get_related(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)/(.*)~',
-				array( 'version', 'model', 'id', 'related_model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)/(.*)~',
+				array('version', 'model', 'id', 'related_model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$main_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $main_model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$main_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($main_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$main_model_name_singular
 						)
 					)
 				);
 			}
-			$main_model = $controller->get_model_version_info()->load_model( $main_model_name_singular );
-			$related_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'related_model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			$main_model = $controller->get_model_version_info()->load_model($main_model_name_singular);
+			$related_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['related_model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$related_model_name_singular
 						)
 					)
@@ -146,13 +146,13 @@ 
 
 			return $controller->send_response(
 					$controller->get_entities_from_relation(
-						$request->get_param( 'id' ),
-						$main_model->related_settings_for( $related_model_name_singular ) ,
+						$request->get_param('id'),
+						$main_model->related_settings_for($related_model_name_singular),
 						$request
 					)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -165,30 +165,30 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_model( $model, $request) {
-		$query_params = $this->create_model_query_params( $model, $request->get_params() );
-		if( ! Capabilities::current_user_has_partial_access_to( $model, $query_params[ 'caps' ] ) ) {
-			$model_name_plural = \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() );
+	public function get_entities_from_model($model, $request) {
+		$query_params = $this->create_model_query_params($model, $request->get_params());
+		if ( ! Capabilities::current_user_has_partial_access_to($model, $query_params['caps'])) {
+			$model_name_plural = \EEH_Inflector::pluralize_and_lower($model->get_this_model_name());
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $model_name_plural ),
+				sprintf('rest_%s_cannot_list', $model_name_plural),
 				sprintf(
-					__( 'Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso'),
 					$model_name_plural,
-					Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] )
+					Capabilities::get_missing_permissions_string($model, $query_params['caps'])
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
 
-		$this->_set_debug_info( 'model query params', $query_params );
-		$results = $model->get_all_wpdb_results( $query_params );
+		$this->_set_debug_info('model query params', $query_params);
+		$results = $model->get_all_wpdb_results($query_params);
 		$nice_results = array( );
-		foreach ( $results as $result ) {
-			$nice_results[ ] = $this->create_entity_from_wpdb_result(
+		foreach ($results as $result) {
+			$nice_results[] = $this->create_entity_from_wpdb_result(
 					$model,
 					$result,
-					$request->get_param( 'include' ),
-					$query_params[ 'caps' ]
+					$request->get_param('include'),
+					$query_params['caps']
 				);
 		}
 		return $nice_results;
@@ -205,82 +205,82 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_relation( $id,  $relation, $request ) {
-		$context = $this->validate_context( $request->get_param( 'caps' ));
+	public function get_entities_from_relation($id, $relation, $request) {
+		$context = $this->validate_context($request->get_param('caps'));
 		$model = $relation->get_this_model();
 		$related_model = $relation->get_other_model();
 		//check if they can access the 1st model object
-		$query_params = array( array( $model->primary_key_name() => $id ),'limit' => 1 );
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+		$query_params = array(array($model->primary_key_name() => $id), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'main model query params', $restricted_query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $related_model, $context ) );
+		$restricted_query_params['caps'] = $context;
+		$this->_set_debug_info('main model query params', $restricted_query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($related_model, $context));
 
-		if(
+		if (
 			! (
-				Capabilities::current_user_has_partial_access_to( $related_model, $context )
-				&& $model->exists( $restricted_query_params )
+				Capabilities::current_user_has_partial_access_to($related_model, $context)
+				&& $model->exists($restricted_query_params)
 			)
-		){
-			if( $relation instanceof \EE_Belongs_To_Relation ) {
-				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
-				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
+		) {
+			if ($relation instanceof \EE_Belongs_To_Relation) {
+				$related_model_name_maybe_plural = strtolower($related_model->get_this_model_name());
+			} else {
+				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower($related_model->get_this_model_name());
 			}
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $related_model_name_maybe_plural ),
+				sprintf('rest_%s_cannot_list', $related_model_name_maybe_plural),
 				sprintf(
-					__(	'Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso'),
 					$related_model_name_maybe_plural,
 					$relation->get_this_model()->get_this_model_name(),
 					implode(
 						',',
 						array_keys(
-							Capabilities::get_missing_permissions( $related_model, $context )
+							Capabilities::get_missing_permissions($related_model, $context)
 						)
 					)
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		$query_params = $this->create_model_query_params( $relation->get_other_model(), $request->get_params() );
-		$query_params[0][ $relation->get_this_model()->get_this_model_name() . '.' . $relation->get_this_model()->primary_key_name() ] = $id;
-		$query_params[ 'default_where_conditions' ] = 'none';
-		$query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'model query params', $query_params );
-		$results = $relation->get_other_model()->get_all_wpdb_results( $query_params );
+		$query_params = $this->create_model_query_params($relation->get_other_model(), $request->get_params());
+		$query_params[0][$relation->get_this_model()->get_this_model_name().'.'.$relation->get_this_model()->primary_key_name()] = $id;
+		$query_params['default_where_conditions'] = 'none';
+		$query_params['caps'] = $context;
+		$this->_set_debug_info('model query params', $query_params);
+		$results = $relation->get_other_model()->get_all_wpdb_results($query_params);
 		$nice_results = array();
-		foreach( $results as $result ) {
+		foreach ($results as $result) {
 			$nice_result = $this->create_entity_from_wpdb_result(
 				$relation->get_other_model(),
 				$result,
-				$request->get_param( 'include' ),
-				$query_params[ 'caps' ]
+				$request->get_param('include'),
+				$query_params['caps']
 			);
-			if( $relation instanceof \EE_HABTM_Relation ) {
+			if ($relation instanceof \EE_HABTM_Relation) {
 				//put the unusual stuff (properties from the HABTM relation) first, and make sure
 				//if there are conflicts we prefer the properties from the main model
 				$join_model_result = $this->create_entity_from_wpdb_result(
 					$relation->get_join_model(),
 					$result,
-					$request->get_param( 'include' ),
-					$query_params[ 'caps' ]
+					$request->get_param('include'),
+					$query_params['caps']
 				);
-				$joined_result = array_merge( $nice_result, $join_model_result );
+				$joined_result = array_merge($nice_result, $join_model_result);
 				//but keep the meta stuff from the main model
-				if( isset( $nice_result['meta'] ) ){
+				if (isset($nice_result['meta'])) {
 					$joined_result['meta'] = $nice_result['meta'];
 				}
 				$nice_result = $joined_result;
 			}
 			$nice_results[] = $nice_result;
 		}
-		if( $relation instanceof \EE_Belongs_To_Relation ){
-			return array_shift( $nice_results );
-		}else{
+		if ($relation instanceof \EE_Belongs_To_Relation) {
+			return array_shift($nice_results);
+		} else {
 			return $nice_results;
 		}
 	}
@@ -317,110 +317,110 @@ 
 	 * @param string $context one of the return values from EEM_Base::valid_cap_contexts()
 	 * @return array ready for being converted into json for sending to client
 	 */
-	public function create_entity_from_wpdb_result( $model, $db_row, $include, $context ) {
-		if( $include == null ) {
+	public function create_entity_from_wpdb_result($model, $db_row, $include, $context) {
+		if ($include == null) {
 			$include = '*';
 		}
-		if( $context == null ) {
+		if ($context == null) {
 			$context = \EEM_Base::caps_read;
 		}
-		$result = $model->deduce_fields_n_values_from_cols_n_values( $db_row );
-		$result = array_intersect_key( $result, $this->get_model_version_info()->fields_on_model_in_this_version( $model ) );
-		foreach( $result as $field_name => $raw_field_value ) {
+		$result = $model->deduce_fields_n_values_from_cols_n_values($db_row);
+		$result = array_intersect_key($result, $this->get_model_version_info()->fields_on_model_in_this_version($model));
+		foreach ($result as $field_name => $raw_field_value) {
 			$field_obj = $model->field_settings_for($field_name);
-			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
-			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
-				unset( $result[ $field_name ] );
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			$field_value = $field_obj->prepare_for_set_from_db($raw_field_value);
+			if ($this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_ignored())) {
+				unset($result[$field_name]);
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_rendered_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'rendered' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_pretty_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'pretty' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif( $field_obj instanceof \EE_Datetime_Field ){
-				if( $raw_field_value instanceof \DateTime ) {
-					$raw_field_value = $raw_field_value->format( 'c' );
+			}elseif ($field_obj instanceof \EE_Datetime_Field) {
+				if ($raw_field_value instanceof \DateTime) {
+					$raw_field_value = $raw_field_value->format('c');
 				}
-				$result[ $field_name ] = mysql_to_rfc3339( $raw_field_value );
-			}else{
-				$value_prepared = $field_obj->prepare_for_get( $field_value );
+				$result[$field_name] = mysql_to_rfc3339($raw_field_value);
+			} else {
+				$value_prepared = $field_obj->prepare_for_get($field_value);
 
-				$result[ $field_name ] = $value_prepared === INF ? EE_INF_IN_DB : $value_prepared;
+				$result[$field_name] = $value_prepared === INF ? EE_INF_IN_DB : $value_prepared;
 			}
 		}
-		if( $model instanceof \EEM_CPT_Base ) {
+		if ($model instanceof \EEM_CPT_Base) {
 			$attachment = wp_get_attachment_image_src(
-				get_post_thumbnail_id( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+				get_post_thumbnail_id($db_row[$model->get_primary_key_field()->get_qualified_column()]),
 				'full'
 			);
-			$result[ 'featured_image_url' ] = !empty( $attachment ) ? $attachment[ 0 ] : null;
-			$result[ 'link' ] = get_permalink( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] );
+			$result['featured_image_url'] = ! empty($attachment) ? $attachment[0] : null;
+			$result['link'] = get_permalink($db_row[$model->get_primary_key_field()->get_qualified_column()]);
 		}
 		//add links to related data
 		$result['_links'] = array(
 			'self' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $result[ $model->primary_key_name() ]
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$result[$model->primary_key_name()]
 					)
 				)
 			),
 			'collection' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() )
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name())
 					)
 				)
 			),
 		);
 		global $wp_rest_server;
-		if( $model instanceof \EEM_CPT_Base &&
+		if ($model instanceof \EEM_CPT_Base &&
 			$wp_rest_server instanceof \WP_REST_Server &&
-			$wp_rest_server->get_route_options( '/wp/v2/posts' ) ) {
-			$result[ '_links' ][ 'https://api.eventespresso.com/self_wp_post' ] = array(
+			$wp_rest_server->get_route_options('/wp/v2/posts')) {
+			$result['_links']['https://api.eventespresso.com/self_wp_post'] = array(
 				array(
-					'href' => rest_url( '/wp/v2/posts/' . $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+					'href' => rest_url('/wp/v2/posts/'.$db_row[$model->get_primary_key_field()->get_qualified_column()]),
 					'single' => true
 				)
 			);
 		}
 
 		//filter fields if specified
-		$includes_for_this_model = $this->extract_includes_for_this_model( $include );
-		if( ! empty( $includes_for_this_model ) ) {
-			if( $model->has_primary_key_field() ) {
+		$includes_for_this_model = $this->extract_includes_for_this_model($include);
+		if ( ! empty($includes_for_this_model)) {
+			if ($model->has_primary_key_field()) {
 				//always include the primary key
 				$includes_for_this_model[] = $model->primary_key_name();
 			}
-			$result = array_intersect_key( $result, array_flip( $includes_for_this_model ) );
+			$result = array_intersect_key($result, array_flip($includes_for_this_model));
 		}
 		//add meta links and possibly include related models
 		$relation_settings = apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_result__related_models_to_include',
 			$model->relation_settings()
 		);
-		foreach( $relation_settings as $relation_name => $relation_obj ) {
-			$related_model_part = $this->get_related_entity_name( $relation_name, $relation_obj );
-			if( empty( $includes_for_this_model ) || isset( $includes_for_this_model['meta'] ) ) {
-				$result['_links']['https://api.eventespresso.com/' . $related_model_part] = array(
+		foreach ($relation_settings as $relation_name => $relation_obj) {
+			$related_model_part = $this->get_related_entity_name($relation_name, $relation_obj);
+			if (empty($includes_for_this_model) || isset($includes_for_this_model['meta'])) {
+				$result['_links']['https://api.eventespresso.com/'.$related_model_part] = array(
 					array(
 						'href' => $this->get_versioned_link_to(
-							\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $result[ $model->primary_key_name() ] . '/' . $related_model_part
+							\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$result[$model->primary_key_name()].'/'.$related_model_part
 						),
 						'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false
 					)
 				);
 			}
-			$related_fields_to_include = $this->extract_includes_for_this_model( $include, $relation_name );
-			if( $related_fields_to_include ) {
+			$related_fields_to_include = $this->extract_includes_for_this_model($include, $relation_name);
+			if ($related_fields_to_include) {
 				$pretend_related_request = new \WP_REST_Request();
 				$pretend_related_request->set_query_params(
 					array(
@@ -432,11 +432,11 @@ 
 					)
 				);
 				$related_results = $this->get_entities_from_relation(
-					$result[ $model->primary_key_name() ],
+					$result[$model->primary_key_name()],
 					$relation_obj,
 					$pretend_related_request
 				);
-				$result[ $related_model_part ] = $related_results instanceof \WP_Error ? null : $related_results;
+				$result[$related_model_part] = $related_results instanceof \WP_Error ? null : $related_results;
 			}
 		}
 		$result = apply_filters(
@@ -453,7 +453,7 @@ 
 		);
 		$this->_set_debug_info(
 			'inaccessible fields',
-			array_keys( array_diff_key( $result, $result_without_inaccessible_fields ) )
+			array_keys(array_diff_key($result, $result_without_inaccessible_fields))
 		);
 		return apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_return',
@@ -468,8 +468,8 @@ 
 	 * @param string $link_part_after_version_and_slash eg "events/10/datetimes"
 	 * @return string url eg "http://mysite.com/wp-json/ee/v4.6/events/10/datetimes"
 	 */
-	public function get_versioned_link_to( $link_part_after_version_and_slash ) {
-		return rest_url( \EED_Core_Rest_Api::ee_api_namespace . $this->get_model_version_info()->requested_version() . '/' . $link_part_after_version_and_slash );
+	public function get_versioned_link_to($link_part_after_version_and_slash) {
+		return rest_url(\EED_Core_Rest_Api::ee_api_namespace.$this->get_model_version_info()->requested_version().'/'.$link_part_after_version_and_slash);
 	}
 
 	/**
@@ -479,11 +479,11 @@ 
 	 * @param \EE_Model_Relation_Base $relation_obj
 	 * @return string
 	 */
-	public static function get_related_entity_name( $relation_name, $relation_obj ){
-		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
-			return strtolower( $relation_name );
-		}else{
-			return \EEH_Inflector::pluralize_and_lower( $relation_name );
+	public static function get_related_entity_name($relation_name, $relation_obj) {
+		if ($relation_obj instanceof \EE_Belongs_To_Relation) {
+			return strtolower($relation_name);
+		} else {
+			return \EEH_Inflector::pluralize_and_lower($relation_name);
 		}
 	}
 
@@ -496,44 +496,44 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entity_from_model( $model, $request ) {
-		$query_params = array( array( $model->primary_key_name() => $request->get_param( 'id' ) ),'limit' => 1);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+	public function get_entity_from_model($model, $request) {
+		$query_params = array(array($model->primary_key_name() => $request->get_param('id')), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] =  $this->validate_context(  $request->get_param( 'caps' ) );
-		$this->_set_debug_info( 'model query params', $restricted_query_params );
-		$model_rows = $model->get_all_wpdb_results( $restricted_query_params );
-		if ( ! empty ( $model_rows ) ) {
+		$restricted_query_params['caps'] = $this->validate_context($request->get_param('caps'));
+		$this->_set_debug_info('model query params', $restricted_query_params);
+		$model_rows = $model->get_all_wpdb_results($restricted_query_params);
+		if ( ! empty ($model_rows)) {
 			return $this->create_entity_from_wpdb_result(
 				$model,
-				array_shift( $model_rows ),
-				$request->get_param( 'include' ),
-				$this->validate_context( $request->get_param( 'caps' ) ) );
+				array_shift($model_rows),
+				$request->get_param('include'),
+				$this->validate_context($request->get_param('caps')) );
 		} else {
 			//ok let's test to see if we WOULD have found it, had we not had restrictions from missing capabilities
-			$lowercase_model_name = strtolower( $model->get_this_model_name() );
-			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results( $query_params );
-			if( ! empty( $model_rows_found_sans_restrictions ) ) {
+			$lowercase_model_name = strtolower($model->get_this_model_name());
+			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results($query_params);
+			if ( ! empty($model_rows_found_sans_restrictions)) {
 				//you got shafted- it existed but we didn't want to tell you!
 				return new \WP_Error(
 					'rest_user_cannot_read',
 					sprintf(
-						__( 'Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso' ),
-						strtolower( $model->get_this_model_name() ),
+						__('Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso'),
+						strtolower($model->get_this_model_name()),
 						Capabilities::get_missing_permissions_string(
 							$model,
-							$this->validate_context( $request->get_param( 'caps' ) ) )
+							$this->validate_context($request->get_param('caps')) )
 					),
-					array( 'status' => 403 )
+					array('status' => 403)
 				);
 			} else {
 				//it's not you. It just doesn't exist
 				return new \WP_Error(
-					sprintf( 'rest_%s_invalid_id', $lowercase_model_name ),
-					sprintf( __( 'Invalid %s ID.', 'event_espresso' ), $lowercase_model_name ),
-					array( 'status' => 404 )
+					sprintf('rest_%s_invalid_id', $lowercase_model_name),
+					sprintf(__('Invalid %s ID.', 'event_espresso'), $lowercase_model_name),
+					array('status' => 404)
 				);
 			}
 		}
@@ -546,14 +546,14 @@ 
 	 * @param string $context
 	 * @return string array key of EEM_Base::cap_contexts_to_cap_action_map()
 	 */
-	public function validate_context( $context ) {
-		if( ! $context ) {
+	public function validate_context($context) {
+		if ( ! $context) {
 			$context = \EEM_Base::caps_read;
 		}
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_contexts )  ){
+		if (in_array($context, $valid_contexts)) {
 			return $context;
-		}else{
+		} else {
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -569,73 +569,73 @@ 
 	 *                          that absolutely no results should be returned
 	 * @throws \EE_Error
 	 */
-	public function create_model_query_params( $model, $query_parameters ) {
+	public function create_model_query_params($model, $query_parameters) {
 		$model_query_params = array( );
-		if ( isset( $query_parameters[ 'where' ] ) ) {
-			$model_query_params[ 0 ] = $this->prepare_rest_query_params_key_for_models( $model, $query_parameters[ 'where' ] );
-		}
-		if ( isset( $query_parameters[ 'order_by' ] ) ) {
-			$order_by = $query_parameters[ 'order_by' ];
-		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
-			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		if (isset($query_parameters['where'])) {
+			$model_query_params[0] = $this->prepare_rest_query_params_key_for_models($model, $query_parameters['where']);
+		}
+		if (isset($query_parameters['order_by'])) {
+			$order_by = $query_parameters['order_by'];
+		} elseif (isset($query_parameters['orderby'])) {
+			$order_by = $query_parameters['orderby'];
+		} else {
 			$order_by = null;
 		}
-		if( $order_by !== null ){
-			$model_query_params[ 'order_by' ] = $this->prepare_rest_query_params_key_for_models( $model, $order_by );
+		if ($order_by !== null) {
+			$model_query_params['order_by'] = $this->prepare_rest_query_params_key_for_models($model, $order_by);
 		}
-		if ( isset( $query_parameters[ 'group_by' ] ) ) {
-			$group_by = $query_parameters[ 'group_by' ];
-		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
-			$group_by = $query_parameters[ 'groupby' ];
-		}else{
+		if (isset($query_parameters['group_by'])) {
+			$group_by = $query_parameters['group_by'];
+		} elseif (isset($query_parameters['groupby'])) {
+			$group_by = $query_parameters['groupby'];
+		} else {
 			$group_by = null;
 		}
-		if( $group_by !== null ){
-			if( is_array( $group_by ) ) {
-				$group_by = $this->prepare_rest_query_params_values_for_models( $model, $group_by );
+		if ($group_by !== null) {
+			if (is_array($group_by)) {
+				$group_by = $this->prepare_rest_query_params_values_for_models($model, $group_by);
 			}
-			$model_query_params[ 'group_by' ] = $group_by;
+			$model_query_params['group_by'] = $group_by;
 		}
-		if ( isset( $query_parameters[ 'having' ] ) ) {
+		if (isset($query_parameters['having'])) {
 			//@todo: no good for permissions
-			$model_query_params[ 'having' ] = $this->prepare_rest_query_params_key_for_models( $model, $query_parameters[ 'having' ] );
+			$model_query_params['having'] = $this->prepare_rest_query_params_key_for_models($model, $query_parameters['having']);
 		}
-		if ( isset( $query_parameters[ 'order' ] ) ) {
-			$model_query_params[ 'order' ] = $query_parameters[ 'order' ];
+		if (isset($query_parameters['order'])) {
+			$model_query_params['order'] = $query_parameters['order'];
 		}
-		if ( isset( $query_parameters[ 'mine' ] ) ){
-			$model_query_params = $model->alter_query_params_to_only_include_mine( $model_query_params );
+		if (isset($query_parameters['mine'])) {
+			$model_query_params = $model->alter_query_params_to_only_include_mine($model_query_params);
 		}
-		if( isset( $query_parameters[ 'limit' ] ) ) {
+		if (isset($query_parameters['limit'])) {
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
-			if( is_string( $query_parameters[ 'limit' ] ) ) {
+			if (is_string($query_parameters['limit'])) {
 				$limit_array = explode(',', $query_parameters['limit']);
-			}else {
-				$limit_array = $query_parameters[ 'limit' ];
+			} else {
+				$limit_array = $query_parameters['limit'];
 			}
 			$sanitized_limit = array();
-			foreach( $limit_array as $key => $limit_part ) {
-				if( $this->_debug_mode && ( ! is_numeric( $limit_part ) || count( $sanitized_limit ) > 2 ) ) {
+			foreach ($limit_array as $key => $limit_part) {
+				if ($this->_debug_mode && ( ! is_numeric($limit_part) || count($sanitized_limit) > 2)) {
 					throw new \EE_Error(
 						sprintf(
-							__( 'An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso' ),
-							json_encode( $query_parameters[ 'limit' ] )
+							__('An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso'),
+							json_encode($query_parameters['limit'])
 						)
 					);
 				}
-				$sanitized_limit[] = intval( $limit_part );
+				$sanitized_limit[] = intval($limit_part);
 			}
-			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
-			$model_query_params[ 'limit' ] = 50;
+			$model_query_params['limit'] = implode(',', $sanitized_limit);
+		} else {
+			$model_query_params['limit'] = 50;
 		}
-		if( isset( $query_parameters[ 'caps' ] ) ) {
-			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
-			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
+		if (isset($query_parameters['caps'])) {
+			$model_query_params['caps'] = $this->validate_context($query_parameters['caps']);
+		} else {
+			$model_query_params['caps'] = \EEM_Base::caps_read;
 		}
-		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
+		return apply_filters('FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model);
 	}
 
 
@@ -647,24 +647,24 @@ 
 	 * @param array     $query_params sub-array from @see EEM_Base::get_all()
 	 * @return array
 	 */
-	public function prepare_rest_query_params_key_for_models( $model,  $query_params ) {
+	public function prepare_rest_query_params_key_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
-				$model_ready_query_params[ $key ] = $value;
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_key_for_models($model, $value);
+			} else {
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
 	}
-	public function prepare_rest_query_params_values_for_models( $model,  $query_params ) {
+	public function prepare_rest_query_params_values_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_values_for_models( $model, $value );
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_values_for_models($model, $value);
 			} else {
-				$model_ready_query_params[ $key ] = $value;
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -680,33 +680,33 @@ 
 	 * @return array of fields for this model. If $model_name is provided, then
 	 * the fields for that model, with the model's name removed from each.
 	 */
-	public function extract_includes_for_this_model( $include_string, $model_name = null ) {
-		if( is_array( $include_string ) ) {
-			$include_string = implode( ',', $include_string );
+	public function extract_includes_for_this_model($include_string, $model_name = null) {
+		if (is_array($include_string)) {
+			$include_string = implode(',', $include_string);
 		}
-		if( $include_string === '*' ) {
+		if ($include_string === '*') {
 			return array();
 		}
-		$includes = explode( ',', $include_string );
+		$includes = explode(',', $include_string);
 		$extracted_fields_to_include = array();
-		if( $model_name ){
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
-				if( strpos( $field_to_include, $model_name . '.' ) === 0 ) {
+		if ($model_name) {
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
+				if (strpos($field_to_include, $model_name.'.') === 0) {
 					//found the model name at the exact start
-					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
+					$field_sans_model_name = str_replace($model_name.'.', '', $field_to_include);
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				}elseif ($field_to_include == $model_name) {
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else {
 			//look for ones with no period
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
 				if (
-					strpos( $field_to_include, '.' ) === false
-					&& ! $this->get_model_version_info()->is_model_name_in_this_version( $field_to_include )
+					strpos($field_to_include, '.') === false
+					&& ! $this->get_model_version_info()->is_model_name_in_this_version($field_to_include)
 				) {
 					$extracted_fields_to_include[] = $field_to_include;
 				}

admin_pages/events/Events_Admin_Page.core.php

Spacing +405 added lines, -405 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -67,7 +67,7 @@ 
 			'espresso_events' => 'edit'
 			);
 
-		add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array( $this, 'verify_event_edit' ) );
+		add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array($this, 'verify_event_edit'));
 	}
 
 	protected function _ajax_hooks() {
@@ -93,20 +93,20 @@ 
 				'edit' => __('Update Event', 'event_espresso'),
 				'add_category' => __('Save New Category', 'event_espresso'),
 				'edit_category' => __('Update Category', 'event_espresso'),
-				'template_settings' => __( 'Update Settings', 'event_espresso' )
+				'template_settings' => __('Update Settings', 'event_espresso')
 				)
 		);
 	}
 
 	protected function _set_page_routes() {
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		//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;
 
 
 		$this->_page_routes = array(
@@ -320,7 +320,7 @@ 
 				'help_tour' => array(
 					'Event_Editor_Help_Tour'
 					),
-				'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips' => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => FALSE
 			),
 			'edit' => array(
@@ -376,7 +376,7 @@ 
 				'help_tour' => array(
 					'Event_Edit_Help_Tour'
 				),
-				'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips' => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => FALSE
 			),
 			'default_event_settings' => array(
@@ -398,7 +398,7 @@ 
 						'filename' => 'events_default_settings_status'
 					)
 				),
-				'help_tour' => array( 'Event_Default_Settings_Help_Tour'),
+				'help_tour' => array('Event_Default_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//template settings
@@ -414,7 +414,7 @@ 
 						'filename' => 'general_settings_templates'
 					)
 				),
-				'help_tour' => array( 'Templates_Help_Tour' ),
+				'help_tour' => array('Templates_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//event category stuff
@@ -438,7 +438,7 @@ 
 					'label' => __('Edit Category', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'help_tabs' => array(
 					'edit_category_help_tab' => array(
@@ -508,14 +508,14 @@ 
 
 	public function load_scripts_styles() {
 
-		wp_register_style('events-admin-css', EVENTS_ASSETS_URL . 'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
-		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('events-admin-css', EVENTS_ASSETS_URL.'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('events-admin-css');
 		wp_enqueue_style('ee-cat-admin');
 		//todo note: we also need to load_scripts_styles per view (i.e. default/view_report/event_details
 		//registers for all views
 		//scripts
-		wp_register_script('event_editor_js', EVENTS_ASSETS_URL . 'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('event_editor_js', EVENTS_ASSETS_URL.'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 	/**
@@ -533,11 +533,11 @@ 
 	public function load_scripts_styles_edit() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style('event-editor-css', EVENTS_ASSETS_URL . 'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('event-editor-css', EVENTS_ASSETS_URL.'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('event-editor-css');
 
 		//scripts
-		wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL . 'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION );
+		wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL.'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_script('event-datetime-metabox');
 
 	}
@@ -572,7 +572,7 @@ 
 
 
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'image_confirm' ] = __( 'Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['image_confirm'] = __('Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso');
 	}
 
 
@@ -593,45 +593,45 @@ 
 	 */
 	public function verify_event_edit($event = NULL) {
 		// no event?
-		if ( empty( $event )) {
+		if (empty($event)) {
 			// set event
 			$event = $this->_cpt_model_obj;
 		}
 		// STILL no event?
-		if ( empty ( $event )) {
+		if (empty ($event)) {
 			return;
 		}
 		// first check if event is active.
-		if ( $event->is_expired() || $event->is_inactive() || $event->status() == EEM_Event::cancelled || $event->status() == EEM_Event::postponed ) {
+		if ($event->is_expired() || $event->is_inactive() || $event->status() == EEM_Event::cancelled || $event->status() == EEM_Event::postponed) {
 			return;
 		}
 		$orig_status = $event->status();
 		//made it here so it IS active... next check that any of the tickets are sold.
-		if ( $event->is_sold_out( true ) ) {
-			if ( $event->status() !== $orig_status && $orig_status !== EEM_Event::sold_out  ) {
+		if ($event->is_sold_out(true)) {
+			if ($event->status() !== $orig_status && $orig_status !== EEM_Event::sold_out) {
 				EE_Error::add_attention(
 					sprintf(
-						__( 'Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.', 'event_espresso' ),
-						EEH_Template::pretty_status( EEM_Event::sold_out, FALSE, 'sentence' )
+						__('Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.', 'event_espresso'),
+						EEH_Template::pretty_status(EEM_Event::sold_out, FALSE, 'sentence')
 					)
 				);
 			}
 			return;
-		} else if ( $orig_status === EEM_Event::sold_out ) {
+		} else if ($orig_status === EEM_Event::sold_out) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
-						'event_espresso' ),
-					EEH_Template::pretty_status( $event->status(), false, 'sentence' )
+					__('Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
+						'event_espresso'),
+					EEH_Template::pretty_status($event->status(), false, 'sentence')
 				)
 			);
 		}
 		//now we need to determine if the event has any tickets on sale.  If not then we dont' show the error
-		if ( ! $event->tickets_on_sale() ) {
+		if ( ! $event->tickets_on_sale()) {
 			return;
 		}
 		//made it here so show warning
-		EE_Error::add_attention( $this->_edit_event_warning() );
+		EE_Error::add_attention($this->_edit_event_warning());
 	}
 
 
@@ -671,7 +671,7 @@ 
 			),
 		);
 
-		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'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -701,39 +701,39 @@ 
 				'desc' => __('View Registrations for Event', 'event_espresso')
 			)
 		);
-		$items  = apply_filters( 'FHEE__Events_Admin_Page___event_legend_items__items', $items );
+		$items = apply_filters('FHEE__Events_Admin_Page___event_legend_items__items', $items);
 		$statuses = array(
 			'sold_out_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::sold_out,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::sold_out, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::sold_out,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::sold_out, FALSE, 'sentence')
 			),
 			'active_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::active,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::active, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::active,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::active, FALSE, 'sentence')
 			),
 			'upcoming_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::upcoming,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::upcoming, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::upcoming,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::upcoming, FALSE, 'sentence')
 			),
 			'postponed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::postponed,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::postponed, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::postponed,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::postponed, FALSE, 'sentence')
 			),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::cancelled,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::cancelled,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::cancelled, FALSE, 'sentence')
 			),
 			'expired_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::expired,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::expired, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::expired,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::expired, FALSE, 'sentence')
 			),
 			'inactive_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::inactive,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::inactive, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::inactive,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::inactive, FALSE, 'sentence')
 			)
 		);
-		$statuses = apply_filters( 'FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses );
-		return array_merge( $items, $statuses );
+		$statuses = apply_filters('FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses);
+		return array_merge($items, $statuses);
 	}
 
 
@@ -745,8 +745,8 @@ 
 	 * @return EEM_Event
 	 */
 	private function _event_model() {
-		if ( ! $this->_event_model instanceof EEM_Event ) {
-			$this->_event_model = EE_Registry::instance()->load_model( 'Event' );
+		if ( ! $this->_event_model instanceof EEM_Event) {
+			$this->_event_model = EE_Registry::instance()->load_model('Event');
 		}
 		return $this->_event_model;
 	}
@@ -765,12 +765,12 @@ 
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
 		//make sure this is only when editing
-		if ( !empty( $id ) ) {
-			$post = get_post( $id );
-			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">' . __('Shortcode', 'event_espresso') . '</a> ';
-			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id=\'' . $post->ID . '\']"">';
+		if ( ! empty($id)) {
+			$post = get_post($id);
+			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'.__('Shortcode', 'event_espresso').'</a> ';
+			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id=\''.$post->ID.'\']"">';
 		}
 		return $return;
 	}
@@ -786,8 +786,8 @@ 
 	 * @return string html for generated table
 	 */
 	protected function _events_overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link( get_post_type_archive_link('espresso_events'), __("View Event Archive Page", "event_espresso"), 'button' ) .
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(get_post_type_archive_link('espresso_events'), __("View Event Archive Page", "event_espresso"), 'button').
 		$this->_display_legend($this->_event_legend_items());
 		$this->_admin_page_title .= $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
 		$this->display_admin_list_table_page_with_no_sidebar();
@@ -805,51 +805,51 @@ 
 
 
 
-	protected function _insert_update_cpt_item( $post_id, $post ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
 
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_events' ) {
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_events') {
 			//getout we're not processing an event save.
 			return;
 		}
 
 		$event_values = array(
-			'EVT_display_desc' => !empty( $this->_req_data['display_desc'] ) ? 1 : 0,
-			'EVT_display_ticket_selector' => !empty( $this->_req_data['display_ticket_selector'] ) ? 1 : 0,
+			'EVT_display_desc' => ! empty($this->_req_data['display_desc']) ? 1 : 0,
+			'EVT_display_ticket_selector' => ! empty($this->_req_data['display_ticket_selector']) ? 1 : 0,
 			'EVT_additional_limit' => min(
-					apply_filters( 'FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255 ),
-					!empty( $this->_req_data['additional_limit'] ) ? $this->_req_data['additional_limit'] : NULL ),
-			'EVT_default_registration_status' => !empty( $this->_req_data['EVT_default_registration_status'] ) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID,
-			'EVT_member_only' => !empty( $this->_req_data['member_only'] ) ? 1 : 0,
-			'EVT_allow_overflow' => !empty( $this->_req_data['EVT_allow_overflow'] ) ? 1 : 0,
-			'EVT_timezone_string' => !empty( $this->_req_data['timezone_string'] ) ? $this->_req_data['timezone_string'] : NULL,
-			'EVT_external_URL' => !empty( $this->_req_data['externalURL'] ) ? $this->_req_data['externalURL'] : NULL,
-			'EVT_phone' => !empty( $this->_req_data['event_phone'] ) ? $this->_req_data['event_phone'] : NULL
+					apply_filters('FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255),
+					! empty($this->_req_data['additional_limit']) ? $this->_req_data['additional_limit'] : NULL ),
+			'EVT_default_registration_status' => ! empty($this->_req_data['EVT_default_registration_status']) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID,
+			'EVT_member_only' => ! empty($this->_req_data['member_only']) ? 1 : 0,
+			'EVT_allow_overflow' => ! empty($this->_req_data['EVT_allow_overflow']) ? 1 : 0,
+			'EVT_timezone_string' => ! empty($this->_req_data['timezone_string']) ? $this->_req_data['timezone_string'] : NULL,
+			'EVT_external_URL' => ! empty($this->_req_data['externalURL']) ? $this->_req_data['externalURL'] : NULL,
+			'EVT_phone' => ! empty($this->_req_data['event_phone']) ? $this->_req_data['event_phone'] : NULL
 			);
 
 		//update event
-		$success = $this->_event_model()->update_by_ID( $event_values, $post_id );
+		$success = $this->_event_model()->update_by_ID($event_values, $post_id);
 
 
 		//get event_object for other metaboxes... though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status );
-		$event = $this->_event_model()->get_one( array($get_one_where) );
+		$get_one_where = array($this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$event = $this->_event_model()->get_one(array($get_one_where));
 
 
 		//the following are default callbacks for event attachment updates that can be overridden by caffeinated functionality and/or addons.
-		$event_update_callbacks = apply_filters( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( array($this, '_default_venue_update' ), array( $this, '_default_tickets_update') ) );
+		$event_update_callbacks = apply_filters('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array(array($this, '_default_venue_update'), array($this, '_default_tickets_update')));
 
 		$att_success = TRUE;
 
-		foreach ( $event_update_callbacks as $e_callback ) {
-			$_succ = call_user_func_array( $e_callback, array( $event,  $this->_req_data ) );
-			$att_success = !$att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
+		foreach ($event_update_callbacks as $e_callback) {
+			$_succ = call_user_func_array($e_callback, array($event, $this->_req_data));
+			$att_success = ! $att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 
 		//any errors?
-		if ( $success && FALSE === $att_success ) {
-			EE_Error::add_error( __('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-		} else if ( $success === FALSE ) {
-			EE_Error::add_error( __('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success && FALSE === $att_success) {
+			EE_Error::add_error(__('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success === FALSE) {
+			EE_Error::add_error(__('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -859,14 +859,14 @@ 
 	/**
 	 * @see parent::restore_item()
 	 */
-	protected function _restore_cpt_item( $post_id, $revision_id ) {
+	protected function _restore_cpt_item($post_id, $revision_id) {
 		//copy existing event meta to new post
 		$post_evt = $this->_event_model()->get_one_by_ID($post_id);
-		if ( $post_evt instanceof EE_Event ) {
+		if ($post_evt instanceof EE_Event) {
 			//meta revision restore
-			$post_evt->restore_revision( $revision_id );
+			$post_evt->restore_revision($revision_id);
 			//related objs restore
-			$post_evt->restore_revision( $revision_id, array( 'Venue', 'Datetime', 'Price' ) );
+			$post_evt->restore_revision($revision_id, array('Venue', 'Datetime', 'Price'));
 		}
 	}
 
@@ -879,52 +879,52 @@ 
 	 * @param  array  $data   The request data from the form
 	 * @return bool           Success or fail.
 	 */
-	protected function _default_venue_update( $evtobj, $data ) {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
+	protected function _default_venue_update($evtobj, $data) {
+		require_once(EE_MODELS.'EEM_Venue.model.php');
 		$venue_model = EE_Registry::instance()->load_model('Venue');
 		$rows_affected = NULL;
-		$venue_id = !empty( $data['venue_id'] ) ? $data['venue_id'] : NULL;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : NULL;
 
 		// very important.  If we don't have a venue name...
 		// then we'll get out because not necessary to create empty venue
-		if ( empty( $data['venue_title'] ) ) {
+		if (empty($data['venue_title'])) {
 			return false;
 		}
 
 		$venue_array = array(
 				'VNU_wp_user' => $evtobj->get('EVT_wp_user'),
-				'VNU_name' => !empty( $data['venue_title'] ) ? $data['venue_title'] : NULL,
-				'VNU_desc' => !empty( $data['venue_description'] ) ? $data['venue_description'] : NULL,
-				'VNU_identifier' => !empty( $data['venue_identifier'] ) ? $data['venue_identifier'] : NULL,
-				'VNU_short_desc' => !empty( $data['venue_short_description'] ) ? $data['venue_short_description'] : NULL,
-				'VNU_address' => !empty( $data['address'] ) ? $data['address'] : NULL,
-				'VNU_address2' => !empty( $data['address2'] ) ? $data['address2'] : NULL,
-				'VNU_city' => !empty( $data['city'] ) ? $data['city'] : NULL,
-				'STA_ID' => !empty( $data['state'] ) ? $data['state'] : NULL,
-				'CNT_ISO' => !empty( $data['countries'] ) ? $data['countries'] : NULL,
-				'VNU_zip' => !empty( $data['zip'] ) ? $data['zip'] : NULL,
-				'VNU_phone' => !empty( $data['venue_phone'] ) ? $data['venue_phone'] : NULL,
-				'VNU_capacity' => !empty( $data['venue_capacity'] ) ? $data['venue_capacity'] : NULL,
-				'VNU_url' => !empty($data['venue_url'] ) ? $data['venue_url'] : NULL,
-				'VNU_virtual_phone' => !empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL,
-				'VNU_virtual_url' => !empty( $data['virtual_url'] ) ? $data['virtual_url'] : NULL,
-				'VNU_enable_for_gmap' => isset( $data['enable_for_gmap'] ) ? 1 : 0,
+				'VNU_name' => ! empty($data['venue_title']) ? $data['venue_title'] : NULL,
+				'VNU_desc' => ! empty($data['venue_description']) ? $data['venue_description'] : NULL,
+				'VNU_identifier' => ! empty($data['venue_identifier']) ? $data['venue_identifier'] : NULL,
+				'VNU_short_desc' => ! empty($data['venue_short_description']) ? $data['venue_short_description'] : NULL,
+				'VNU_address' => ! empty($data['address']) ? $data['address'] : NULL,
+				'VNU_address2' => ! empty($data['address2']) ? $data['address2'] : NULL,
+				'VNU_city' => ! empty($data['city']) ? $data['city'] : NULL,
+				'STA_ID' => ! empty($data['state']) ? $data['state'] : NULL,
+				'CNT_ISO' => ! empty($data['countries']) ? $data['countries'] : NULL,
+				'VNU_zip' => ! empty($data['zip']) ? $data['zip'] : NULL,
+				'VNU_phone' => ! empty($data['venue_phone']) ? $data['venue_phone'] : NULL,
+				'VNU_capacity' => ! empty($data['venue_capacity']) ? $data['venue_capacity'] : NULL,
+				'VNU_url' => ! empty($data['venue_url']) ? $data['venue_url'] : NULL,
+				'VNU_virtual_phone' => ! empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL,
+				'VNU_virtual_url' => ! empty($data['virtual_url']) ? $data['virtual_url'] : NULL,
+				'VNU_enable_for_gmap' => isset($data['enable_for_gmap']) ? 1 : 0,
 				'status' => 'publish'
 			);
 
 
 		//if we've got the venue_id then we're just updating the existing venue so let's do that and then get out.
-		if ( !empty( $venue_id ) ) {
-			$update_where = array( $venue_model->primary_key_name() => $venue_id );
-			$rows_affected = $venue_model->update( $venue_array, array( $update_where ) );
+		if ( ! empty($venue_id)) {
+			$update_where = array($venue_model->primary_key_name() => $venue_id);
+			$rows_affected = $venue_model->update($venue_array, array($update_where));
 			//we've gotta make sure that the venue is always attached to a revision.. add_relation_to should take care of making sure that the relation is already present.
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
+			$evtobj->_add_relation_to($venue_id, 'Venue');
 			return $rows_affected > 0 ? TRUE : FALSE;
 		} else {
 			//we insert the venue
-			$venue_id = $venue_model->insert( $venue_array );
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
-			return !empty( $venue_id ) ? TRUE : FALSE;
+			$venue_id = $venue_model->insert($venue_array);
+			$evtobj->_add_relation_to($venue_id, 'Venue');
+			return ! empty($venue_id) ? TRUE : FALSE;
 		}
 		//when we have the ancestor come in it's already been handled by the revision save.
 	}
@@ -938,55 +938,55 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return bool             success or fail
 	 */
-	protected function _default_tickets_update( EE_Event $evtobj, $data ) {
+	protected function _default_tickets_update(EE_Event $evtobj, $data) {
 		$success = true;
 		$saved_dtt = null;
 		$saved_tickets = array();
-		$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$incoming_date_formats = array('Y-m-d', 'h:i a');
 
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
-			$dtt =  array_map( 'trim', $dtt );
-			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
+			$dtt = array_map('trim', $dtt);
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID' 		=> ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : NULL,
+				'DTT_ID' 		=> ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL,
 				'DTT_EVT_start' => $dtt['DTT_EVT_start'],
 				'DTT_EVT_end' 	=> $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' => empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_reg_limit' => empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
 				'DTT_order' 	=> $row,
 			);
 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 
-			if ( !empty( $dtt['DTT_ID'] ) ) {
-				$DTM = EE_Registry::instance()->load_model('Datetime', array( $evtobj->get_timezone() ) )->get_one_by_ID($dtt['DTT_ID'] );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+			if ( ! empty($dtt['DTT_ID'])) {
+				$DTM = EE_Registry::instance()->load_model('Datetime', array($evtobj->get_timezone()))->get_one_by_ID($dtt['DTT_ID']);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 
 				//make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.  We need to do this so we dont' TRASH the parent DTT.
 				$saved_dtts[$DTM->ID()] = $DTM;
 			} else {
-				$DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values ), FALSE, FALSE );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				$DTM->set_timezone( $evtobj->get_timezone() );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values), FALSE, FALSE);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				$DTM->set_timezone($evtobj->get_timezone());
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 			$DTM->save();
 
-			$DTT = $evtobj->_add_relation_to( $DTM, 'Datetime' );
+			$DTT = $evtobj->_add_relation_to($DTM, 'Datetime');
 
 			//load DTT helper
 			EE_Registry::instance()->load_helper('DTT_Helper');
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end') ) {
-				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start') );
+			if ($DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end')) {
+				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start'));
 				$DTT = EEH_DTT_Helper::date_time_add($DTT, 'DTT_EVT_end', 'days');
 				$DTT->save();
 			}
@@ -994,45 +994,45 @@ 
 			//now we got to make sure we add the new DTT_ID to the $saved_dtts array  because it is possible there was a new one created for the autosave.
 			$saved_dtt = $DTT;
 
-			$success = !$success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now.
+			$success = ! $success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now.
 		}
 
 		//no dtts get deleted so we don't do any of that logic here.
 		//update tickets next
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array();
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
-			$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
+		foreach ($data['edit_tickets'] as $row => $tkt) {
+			$incoming_date_formats = array('Y-m-d', 'h:i a');
 			$update_prices = false;
-			$ticket_price = isset( $data['edit_prices'][$row][1]['PRC_amount'] ) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
+			$ticket_price = isset($data['edit_prices'][$row][1]['PRC_amount']) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
 
 			// trim inputs to ensure any excess whitespace is removed.
-			$tkt = array_map( 'trim', $tkt );
+			$tkt = array_map('trim', $tkt);
 
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			if (empty($tkt['TKT_start_date'])) {
 				//let's use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $incoming_date_formats[0] . ' ' . $incoming_date_formats[1] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($incoming_date_formats[0].' '.$incoming_date_formats[1]);
 			}
 
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				//use the start date of the first datetime
 				$dtt = $evtobj->first_datetime();
-				$tkt['TKT_end_date'] = $dtt->start_date_and_time( $incoming_date_formats[0], $incoming_date_formats[1] );
+				$tkt['TKT_end_date'] = $dtt->start_date_and_time($incoming_date_formats[0], $incoming_date_formats[1]);
 			}
 
 			$TKT_values = array(
-				'TKT_ID' 			=> !empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : NULL,
-				'TTM_ID' 			=> !empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name' 			=> !empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' 	=> !empty( $tkt['TKT_description'] ) ? $tkt['TKT_description'] : '',
+				'TKT_ID' 			=> ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : NULL,
+				'TTM_ID' 			=> ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name' 			=> ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' 	=> ! empty($tkt['TKT_description']) ? $tkt['TKT_description'] : '',
 				'TKT_start_date' 	=> $tkt['TKT_start_date'],
 				'TKT_end_date' 		=> $tkt['TKT_end_date'],
-				'TKT_qty' 			=> ! isset( $tkt[ 'TKT_qty' ] ) || $tkt[ 'TKT_qty' ] === '' ? EE_INF : $tkt['TKT_qty'],
-				'TKT_uses' 			=> ! isset( $tkt[ 'TKT_uses' ] ) || $tkt[ 'TKT_uses' ] === '' ? EE_INF : $tkt[ 'TKT_uses' ],
-				'TKT_min' 			=> empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max' 			=> empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty' 			=> ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses' 			=> ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min' 			=> empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max' 			=> empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row' 			=> $row,
-				'TKT_order' 		=> isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : $row,
+				'TKT_order' 		=> isset($tkt['TKT_order']) ? $tkt['TKT_order'] : $row,
 				'TKT_price' 		=> $ticket_price
 			);
 
@@ -1040,7 +1040,7 @@ 
 
 
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$TKT_values['TKT_price'] = $ticket_price;
@@ -1051,58 +1051,58 @@ 
 			//we actually do our saves a head of doing any add_relations to because its entirely possible that this ticket didn't removed or added to any datetime in the session but DID have it's items modified.
 			//keep in mind that if the TKT has been sold (and we have changed pricing information), then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
 
-			if ( !empty( $tkt['TKT_ID'] ) ) {
-				$TKT = EE_Registry::instance()->load_model( 'Ticket', array( $evtobj->get_timezone() ) )->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
-					$ticket_sold = $TKT->count_related( 'Registration', array( array( 'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) ) ) ) ) > 0 ? true : false;
+			if ( ! empty($tkt['TKT_ID'])) {
+				$TKT = EE_Registry::instance()->load_model('Ticket', array($evtobj->get_timezone()))->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
+					$ticket_sold = $TKT->count_related('Registration', array(array('STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))))) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
-					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' ) && ! $TKT->get( 'TKT_deleted' ) ? true : false;
-					$TKT->set_date_format( $incoming_date_formats[ 0 ] );
-					$TKT->set_time_format( $incoming_date_formats[ 1 ] );
+					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get('TKT_price') && ! $TKT->get('TKT_deleted') ? true : false;
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
+					if ($create_new_TKT) {
 						//archive the old ticket first
-						$TKT->set( 'TKT_deleted', 1 );
+						$TKT->set('TKT_deleted', 1);
 						$TKT->save();
 						//make sure this ticket is still recorded in our saved_tkts so we don't run it through the regular trash routine.
-						$saved_tickets[ $TKT->ID() ] = $TKT;
+						$saved_tickets[$TKT->ID()] = $TKT;
 						//create new ticket that's a copy of the existing except a new id of course (and not archived) AND has the new TKT_price associated with it.
 						$TKT = clone $TKT;
-						$TKT->set( 'TKT_ID', 0 );
-						$TKT->set( 'TKT_deleted', 0 );
-						$TKT->set( 'TKT_price', $ticket_price );
-						$TKT->set( 'TKT_sold', 0 );
+						$TKT->set('TKT_ID', 0);
+						$TKT->set('TKT_deleted', 0);
+						$TKT->set('TKT_price', $ticket_price);
+						$TKT->set('TKT_sold', 0);
 						//now we need to make sure that $new prices are created as well and attached to new ticket.
 						$update_prices = true;
 					}
 					//make sure price is set if it hasn't been already
-					$TKT->set( 'TKT_price', $ticket_price );
+					$TKT->set('TKT_price', $ticket_price);
 				}
 
 			} else {
 				//no TKT_id so a new TKT
 				$TKT_values['TKT_price'] = $ticket_price;
-				$TKT = EE_Registry::instance()->load_class('Ticket', array( $TKT_values ), FALSE, FALSE );
-				if ( $TKT instanceof EE_Ticket ) {
+				$TKT = EE_Registry::instance()->load_class('Ticket', array($TKT_values), FALSE, FALSE);
+				if ($TKT instanceof EE_Ticket) {
 					//need to reset values to properly account for the date formats
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
-					$TKT->set_timezone( $evtobj->get_timezone() );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
+					$TKT->set_timezone($evtobj->get_timezone());
 
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 
@@ -1110,32 +1110,32 @@ 
 				}
 			}
 			// cap ticket qty by datetime reg limits
-			$TKT->set_qty( min( $TKT->qty(), $TKT->qty( 'reg_limit' ) ) );
+			$TKT->set_qty(min($TKT->qty(), $TKT->qty('reg_limit')));
 			//update ticket.
 			$TKT->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date') ) {
-				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date') );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 				$TKT->save();
 			}
 
 			//initially let's add the ticket to the dtt
-			$saved_dtt->_add_relation_to( $TKT, 'Ticket' );
+			$saved_dtt->_add_relation_to($TKT, 'Ticket');
 
 			$saved_tickets[$TKT->ID()] = $TKT;
 
 			//add prices to ticket
-			$this->_add_prices_to_ticket( $data['edit_prices'][$row], $TKT, $update_prices );
+			$this->_add_prices_to_ticket($data['edit_prices'][$row], $TKT, $update_prices);
 		}
 		//however now we need to handle permanently deleting tickets via the ui.  Keep in mind that the ui does not allow deleting/archiving tickets that have ticket sold.  However, it does allow for deleting tickets that have no tickets sold, in which case we want to get rid of permanently because there is no need to save in db.
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys( $saved_tickets ) );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
 
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 
 			//get the ticket for this id
 			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
@@ -1143,7 +1143,7 @@ 
 			//need to get all the related datetimes on this ticket and remove from every single one of them (remember this process can ONLY kick off if there are NO tkts_sold)
 			$dtts = $tkt_to_remove->get_many_related('Datetime');
 
-			foreach( $dtts as $dtt ) {
+			foreach ($dtts as $dtt) {
 				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 
@@ -1154,7 +1154,7 @@ 
 			//finally let's delete this ticket (which should not be blocked at this point b/c we've removed all our relationships)
 			$tkt_to_remove->delete_permanently();
 		}
-		return array( $saved_dtt, $saved_tickets );
+		return array($saved_dtt, $saved_tickets);
 	}
 
 
@@ -1169,31 +1169,31 @@ 
 	 * @param bool 		$new_prices Whether attach existing incoming prices or create new ones.
 	 * @return  void
 	 */
-	private function  _add_prices_to_ticket( $prices, EE_Ticket $ticket, $new_prices = FALSE ) {
-		foreach ( $prices as $row => $prc ) {
+	private function  _add_prices_to_ticket($prices, EE_Ticket $ticket, $new_prices = FALSE) {
+		foreach ($prices as $row => $prc) {
 			$PRC_values = array(
-				'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL,
-				'PRT_ID' => !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL,
-				'PRC_amount' => !empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name' => !empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc' => !empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL,
+				'PRT_ID' => ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL,
+				'PRC_amount' => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name' => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc' => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => 0, //make sure prices are NOT set as default from this context
 				'PRC_order' => $row
 			);
 
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class('Price', array( $PRC_values ), FALSE, FALSE);
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), FALSE, FALSE);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 				$PRC->save();
 			}
 
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 	}
 
@@ -1216,33 +1216,33 @@ 
 
 		return; //TEMPORARILY EXITING CAUSE THIS IS A TODO
 
-		$postid = isset( $this->_req_data['post_ID'] ) ? $this->_req_data['post_ID'] : NULL;
+		$postid = isset($this->_req_data['post_ID']) ? $this->_req_data['post_ID'] : NULL;
 
 
 		//if no postid then get out cause we need it for stuff in here
-		if ( empty( $postid ) ) return;
+		if (empty($postid)) return;
 
 
 		//handle datetime saves
 		$items = array();
 
-		$get_one_where = array( $this->_event_model()->primary_key_name() => $postid );
-		$event = $this->_event_model()->get_one( array($get_one_where) );
+		$get_one_where = array($this->_event_model()->primary_key_name() => $postid);
+		$event = $this->_event_model()->get_one(array($get_one_where));
 
 		//now let's get the attached datetimes from the most recent autosave
 		$dtts = $event->get_many_related('Datetime');
 
 		$dtt_ids = array();
-		foreach( $dtts as $dtt ) {
+		foreach ($dtts as $dtt) {
 			$dtt_ids[] = $dtt->ID();
 			$order = $dtt->order();
 			$this->_template_args['data']['items']['ID-'.$order] = $dtt->ID();
 		}
-		$this->_template_args['data']['items']['datetime_IDS'] = serialize( $dtt_ids );
+		$this->_template_args['data']['items']['datetime_IDS'] = serialize($dtt_ids);
 
 		//handle DECAF venues
 		//we need to make sure that the venue_id gets updated in the form so that future autosaves will properly conntect that venue to the event.
-		if ( $do_venue_autosaves = apply_filters( 'FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', TRUE ) ) {
+		if ($do_venue_autosaves = apply_filters('FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', TRUE)) {
 			$venue = $event->get_first_related('Venue');
 			$this->_template_args['data']['items']['venue-id'] = $venue->ID();
 		}
@@ -1253,23 +1253,23 @@ 
 
 		$ticket_ids = array();
 		$price_ids = array();
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$ticket_ids[] = $price->ID();
 			$ticket_order = $price->get('TKT_order');
-			$this->_template_args['data']['items']['edit-ticket-id-' . $ticket_order] = $ticket->ID();
-			$this->_template_args['data']['items']['edit-ticket-event-id-' . $order] = $event->ID();
+			$this->_template_args['data']['items']['edit-ticket-id-'.$ticket_order] = $ticket->ID();
+			$this->_template_args['data']['items']['edit-ticket-event-id-'.$order] = $event->ID();
 
 			//now we have to make sure the prices are updated appropriately
 			$prices = $ticket->get_many_related('Prices');
 
-			foreach ( $prices as $price ) {
+			foreach ($prices as $price) {
 				$price_ids[] = $price->ID();
 				$price_order = $price->get('PRC_order');
-				$this->_template_args['data']['items']['quick-edit-ticket-price-id-ticketrow-' . $ticket_order . '-' . $price_order] = $price->ID();
-				$this->_template_args['data']['items']['edit-ticket-price-id-ticketrow-' . $ticket_row . '-' . $price_row] = $price->ID();
-				$this->_template_args['data']['items']['edit-ticket-price-is-default-ticketrow-' . $ticket_row . '-' . $price_row] = $price->get('PRC_is_default');
+				$this->_template_args['data']['items']['quick-edit-ticket-price-id-ticketrow-'.$ticket_order.'-'.$price_order] = $price->ID();
+				$this->_template_args['data']['items']['edit-ticket-price-id-ticketrow-'.$ticket_row.'-'.$price_row] = $price->ID();
+				$this->_template_args['data']['items']['edit-ticket-price-is-default-ticketrow-'.$ticket_row.'-'.$price_row] = $price->get('PRC_is_default');
 			}
-			$this->_template_args['data']['items']['price-IDs-ticketrow-' . $ticket_row] = implode(',', $price_ids);
+			$this->_template_args['data']['items']['price-IDs-ticketrow-'.$ticket_row] = implode(',', $price_ids);
 		}
 		$this->_template_args['data']['items']['ticket-IDs'] = implode(',', $ticket_ids);
 	}
@@ -1287,12 +1287,12 @@ 
 	private function _generate_publish_box_extra_content() {
 
 		//load formatter helper
-  		EE_Registry::instance()->load_helper( 'Formatter' );
+  		EE_Registry::instance()->load_helper('Formatter');
 
   		//args for getting related registrations
-  		$approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved ) );
-  		$not_approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved ) );
-  		$pending_payment_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment ) );
+  		$approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved));
+  		$not_approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved));
+  		$pending_payment_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment));
 
 
 		// publish box
@@ -1321,9 +1321,9 @@ 
 				),
 				REG_ADMIN_URL
 			),
-			'approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $approved_query_args ),
-			'not_approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $not_approved_query_args ),
-			'pending_payment_regs' => $this->_cpt_model_obj->count_related( 'Registration', $pending_payment_query_args ),
+			'approved_regs' => $this->_cpt_model_obj->count_related('Registration', $approved_query_args),
+			'not_approved_regs' => $this->_cpt_model_obj->count_related('Registration', $not_approved_query_args),
+			'pending_payment_regs' => $this->_cpt_model_obj->count_related('Registration', $pending_payment_query_args),
 			'misc_pub_section_class' => apply_filters(
 				'FHEE_Events_Admin_Page___generate_publish_box_extra_content__misc_pub_section_class',
 				'misc-pub-section'
@@ -1342,9 +1342,9 @@ 
 			'AHEE__Events_Admin_Page___generate_publish_box_extra_content__event_editor_overview_add',
 			$this->_cpt_model_obj
 		);
-		$publish_box_extra_args[ 'event_editor_overview_add' ] = ob_get_clean();
+		$publish_box_extra_args['event_editor_overview_add'] = ob_get_clean();
 		// load template
-		EEH_Template::display_template( EVENTS_TEMPLATE_PATH . 'event_publish_box_extras.template.php', $publish_box_extra_args );
+		EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_publish_box_extras.template.php', $publish_box_extra_args);
 	}
 
 
@@ -1376,16 +1376,16 @@ 
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_tickets',
-			__( 'Event Datetime & Ticket', 'event_espresso' ),
-			array( $this, 'ticket_metabox' ),
+			__('Event Datetime & Ticket', 'event_espresso'),
+			array($this, 'ticket_metabox'),
 			$this->page_slug,
 			'normal',
 			'high'
 		);
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'default'
@@ -1415,38 +1415,38 @@ 
 			'disabled' => ''
 			);
 
-		$event_id = is_object( $this->_cpt_model_obj ) ? $this->_cpt_model_obj->ID() : NULL;
+		$event_id = is_object($this->_cpt_model_obj) ? $this->_cpt_model_obj->ID() : NULL;
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		/**
 		 * 1. Start with retrieving Datetimes
 		 * 2. Fore each datetime get related tickets
 		 * 3. For each ticket get related prices
 		 */
-		$times = EE_Registry::instance()->load_model('Datetime' )->get_all_event_dates( $event_id );
-		EE_Registry::instance()->load_helper('DTT_Helper' );
+		$times = EE_Registry::instance()->load_model('Datetime')->get_all_event_dates($event_id);
+		EE_Registry::instance()->load_helper('DTT_Helper');
 		/** @type EE_Datetime $first_datetime */
-		$first_datetime = array_slice( $times, 0, 1 );
+		$first_datetime = array_slice($times, 0, 1);
 		//do we get related tickets?
-		if ( $first_datetime[ 0 ]->get( 'DTT_ID' ) !== 0 ) {
-			foreach ( $times as $time ) {
-				if ( $time instanceof EE_Datetime ) {
+		if ($first_datetime[0]->get('DTT_ID') !== 0) {
+			foreach ($times as $time) {
+				if ($time instanceof EE_Datetime) {
 					$existing_datetime_ids[] = $time->get('DTT_ID');
 					$template_args['time'] = $time;
 					$related_tickets = $time->tickets(
 						array(
-							array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ),
+							array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)),
 							'default_where_conditions' => 'none'
 						)
 					);
 
-					if ( !empty($related_tickets) ) {
+					if ( ! empty($related_tickets)) {
 						$template_args['total_ticket_rows'] = count($related_tickets);
 						$row = 0;
-						foreach ( $related_tickets as $ticket ) {
+						foreach ($related_tickets as $ticket) {
 							$existing_ticket_ids[] = $ticket->get('TKT_ID');
-							$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row );
+							$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row);
 
 							$row++;
 						}
@@ -1454,7 +1454,7 @@ 
 						$template_args['total_ticket_rows'] = 1;
 						/** @type EE_Ticket $ticket */
 						$ticket = EE_Registry::instance()->load_model('Ticket')->create_default_object();
-						$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket );
+						$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket);
 					}
 				}
 			}
@@ -1462,7 +1462,7 @@ 
 			$template_args['time'] = $times[0];
 			/** @type EE_Ticket $ticket */
 			$ticket = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
-			$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket[1] );
+			$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket[1]);
 			// NOTE: we're just sending the first default row
 			// (decaf can't manage default tickets so this should be sufficient);
 		}
@@ -1471,8 +1471,8 @@ 
 		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link('ticket_options_info');
 		$template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
 		$template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
-		$template_args['ticket_js_structure'] = $this->_get_ticket_row( EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE );
-		$template = apply_filters( 'FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php' );
+		$template_args['ticket_js_structure'] = $this->_get_ticket_row(EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE);
+		$template = apply_filters('FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_main.template.php');
 		EEH_Template::display_template($template, $template_args);
 	}
 
@@ -1487,21 +1487,21 @@ 
 	 * @param int        $row
 	 * @return string generated html for the ticket row.
 	 */
-	private function _get_ticket_row( $ticket, $skeleton = FALSE, $row = 0 ) {
+	private function _get_ticket_row($ticket, $skeleton = FALSE, $row = 0) {
 		$template_args = array(
-			'tkt_status_class' => ' tkt-status-' . $ticket->ticket_status(),
-			'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && !$skeleton ? ' tkt-archived' : '',
+			'tkt_status_class' => ' tkt-status-'.$ticket->ticket_status(),
+			'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && ! $skeleton ? ' tkt-archived' : '',
 			'ticketrow' => $skeleton ? 'TICKETNUM' : $row,
 			'TKT_ID' => $ticket->get('TKT_ID'),
 			'TKT_name' => $ticket->get('TKT_name'),
 			'TKT_start_date' => $skeleton ? '' : $ticket->get_date('TKT_start_date', 'Y-m-d h:i a'),
 			'TKT_end_date' => $skeleton ? '' : $ticket->get_date('TKT_end_date', 'Y-m-d h:i a'),
 			'TKT_is_default' => $ticket->get('TKT_is_default'),
-			'TKT_qty' => $ticket->get_pretty('TKT_qty','input'),
+			'TKT_qty' => $ticket->get_pretty('TKT_qty', 'input'),
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_sold' => $skeleton ? 0 : $ticket->get('TKT_sold'),
-			'trash_icon' => ( $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted') ) ) && ( !empty( $ticket ) && $ticket->get('TKT_sold') === 0 ) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
-			'disabled' => $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted' ) ) ? '' : ' disabled=disabled'
+			'trash_icon' => ($skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted'))) && ( ! empty($ticket) && $ticket->get('TKT_sold') === 0) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
+			'disabled' => $skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')) ? '' : ' disabled=disabled'
 			);
 
 		$price = $ticket->ID() !== 0 ? $ticket->get_first_related('Price', array('default_where_conditions' => 'none')) : EE_Registry::instance()->load_model('Price')->create_default_object();
@@ -1517,23 +1517,23 @@ 
 
 		//make sure we have default start and end dates if skeleton
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
 			$template_args['TKT_start_date'] = date('Y-m-d h:i a', current_time('timestamp'));
 		}
 
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 			//get the earliest datetime (if present);
-			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
+			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC'))) : NULL;
 
-			if ( !empty( $earliest_dtt ) )
+			if ( ! empty($earliest_dtt))
 				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
 			else
-				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
+				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d") + 7, date("Y")));
 		}
 
-		$template_args = array_merge( $template_args, $price_args );
-		$template = apply_filters( 'FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_ticket_row.template.php', $ticket);
+		$template_args = array_merge($template_args, $price_args);
+		$template = apply_filters('FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_ticket_row.template.php', $ticket);
 		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
@@ -1562,8 +1562,8 @@ 
 		$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['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_TEMPLATE_PATH . 'event_registration_options.template.php';
+		$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_TEMPLATE_PATH.'event_registration_options.template.php';
 		EEH_Template::display_template($templatepath, $template_args);
 	}
 
@@ -1591,21 +1591,21 @@ 
 		$EEME = $this->_event_model();
 
 		$offset = ($current_page - 1) * $per_page;
-		$limit = $count ? NULL : $offset . ',' . $per_page;
+		$limit = $count ? NULL : $offset.','.$per_page;
 		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'EVT_ID';
 		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : "DESC";
 
 		if (isset($this->_req_data['month_range'])) {
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
-			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
-			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
 		}
 
 		$where = array();
 
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case NULL :
@@ -1613,7 +1613,7 @@ 
 				break;
 
 			case 'draft' :
-				$where['status'] = array( 'IN', array('draft', 'auto-draft') );
+				$where['status'] = array('IN', array('draft', 'auto-draft'));
 				break;
 
 			default :
@@ -1621,43 +1621,43 @@ 
 		}
 
 		//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;
 
-		if ( !empty ( $category ) ) {
+		if ( ! empty ($category)) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 
 		//date where conditions
-		$start_formats = EEM_Datetime::instance()->get_formats_for( 'DTT_EVT_start' );
+		$start_formats = EEM_Datetime::instance()->get_formats_for('DTT_EVT_start');
 		if (isset($this->_req_data['month_range']) && $this->_req_data['month_range'] != '') {
-			$DateTime = new DateTime( $year_r . '-' . $month_r . '-01 00:00:00', new DateTimeZone( EEM_Datetime::instance()->get_timezone() ) );
-			$start = $DateTime->format( implode( ' ', $start_formats  ) );
-			$end = $DateTime->setDate( $year_r, $month_r, $DateTime->format('t') )->setTime(23,59,59)->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array( $start, $end ) );
+			$DateTime = new DateTime($year_r.'-'.$month_r.'-01 00:00:00', new DateTimeZone(EEM_Datetime::instance()->get_timezone()));
+			$start = $DateTime->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate($year_r, $month_r, $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'today') {
-			$DateTime = new DateTime( 'now', new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0,0,0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset($this->_req_data['status']) && $this->_req_data['status'] == 'month' ) {
-			$now = date( 'Y-m-01' );
-			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( date('Y'), date('m'), $DateTime->format('t' ) )->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
+			$DateTime = new DateTime('now', new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'month') {
+			$now = date('Y-m-01');
+			$DateTime = new DateTime($now, new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate(date('Y'), date('m'), $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		}
 
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
-			$where['EVT_wp_user'] =  get_current_user_id();
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
+			$where['EVT_wp_user'] = get_current_user_id();
 		} else {
-			if ( ! isset( $where['status'] ) ) {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) {
+			if ( ! isset($where['status'])) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND' => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'EVT_wp_user' => get_current_user_id()
 						)
 					);
@@ -1665,16 +1665,16 @@ 
 			}
 		}
 
-		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
-			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
+		if (isset($this->_req_data['EVT_wp_user'])) {
+			if ($this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
 		}
 
 
 		//search query handling
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
 				'EVT_name' => array('LIKE', $search_string),
 				'EVT_desc' => array('LIKE', $search_string),
@@ -1683,32 +1683,32 @@ 
 		}
 
 
-		$where = apply_filters( 'FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data );
-		$query_params = apply_filters( 'FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID' ), $this->_req_data );
+		$where = apply_filters('FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data);
+		$query_params = apply_filters('FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID'), $this->_req_data);
 
 
 		//let's first check if we have special requests coming in.
-		if ( isset( $this->_req_data['active_status'] ) ) {
-			switch ( $this->_req_data['active_status'] ) {
+		if (isset($this->_req_data['active_status'])) {
+			switch ($this->_req_data['active_status']) {
 				case 'upcoming' :
-					return $EEME->get_upcoming_events( $query_params, $count );
+					return $EEME->get_upcoming_events($query_params, $count);
 					break;
 
 				case 'expired' :
-					return $EEME->get_expired_events( $query_params, $count );
+					return $EEME->get_expired_events($query_params, $count);
 					break;
 
 				case 'active' :
-					return $EEME->get_active_events( $query_params, $count );
+					return $EEME->get_active_events($query_params, $count);
 					break;
 
 				case 'inactive' :
-					return $EEME->get_inactive_events( $query_params, $count );
+					return $EEME->get_inactive_events($query_params, $count);
 					break;
 			}
 		}
 
-		$events = $count ? $EEME->count( array( $where ), 'EVT_ID', true ) : $EEME->get_all( $query_params );
+		$events = $count ? $EEME->count(array($where), 'EVT_ID', true) : $EEME->get_all($query_params);
 
 		return $events;
 	}
@@ -1717,23 +1717,23 @@ 
 
 
 	//handling for WordPress CPT actions (trash, restore, delete)
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'trash', FALSE );
+		$this->_trash_or_restore_event('trash', FALSE);
 	}
 
 
 
 
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'draft', FALSE );
+		$this->_trash_or_restore_event('draft', FALSE);
 	}
 
 
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_delete_event( FALSE );
+		$this->_delete_event(FALSE);
 	}
 
 
@@ -1745,7 +1745,7 @@ 
 	 * @param  string $event_status
 	 * @return void
 	 */
-	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE ) {
+	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE) {
 		//determine the event id and set to array.
 		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : FALSE;
 		// loop thru events
@@ -1753,7 +1753,7 @@ 
 			// clean status
 			$event_status = sanitize_key($event_status);
 			// grab status
-			if (!empty($event_status)) {
+			if ( ! empty($event_status)) {
 				$success = $this->_change_event_status($EVT_ID, $event_status);
 			} else {
 				$success = FALSE;
@@ -1767,7 +1767,7 @@ 
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
 	}
 
@@ -1782,7 +1782,7 @@ 
 		// clean status
 		$event_status = sanitize_key($event_status);
 		// grab status
-		if (!empty($event_status)) {
+		if ( ! empty($event_status)) {
 			$success = TRUE;
 			//determine the event id and set to array.
 			$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
@@ -1817,15 +1817,15 @@ 
 	 * @param  string $event_status
 	 * @return bool
 	 */
-	private function _change_event_status( $EVT_ID = 0, $event_status = '') {
+	private function _change_event_status($EVT_ID = 0, $event_status = '') {
 		// grab event id
-		if (!$EVT_ID) {
+		if ( ! $EVT_ID) {
 			$msg = __('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 
 		// clean status
 		$event_status = sanitize_key($event_status);
@@ -1851,7 +1851,7 @@ 
 				$hook = FALSE;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $event_status );
+		$this->_cpt_model_obj->set_status($event_status);
 		$success = $this->_cpt_model_obj->save();
 
 		if ($success === FALSE) {
@@ -1873,15 +1873,15 @@ 
 	 * @access protected
 	 * @param bool $redirect_after
 	 */
-	protected function _delete_event( $redirect_after = TRUE ) {
+	protected function _delete_event($redirect_after = TRUE) {
 		//determine the event id and set to array.
 		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : NULL;
-		$EVT_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $EVT_ID;
+		$EVT_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $EVT_ID;
 
 
 		// loop thru events
 		if ($EVT_ID) {
-			$success = $this->_permanently_delete_event( $EVT_ID );
+			$success = $this->_permanently_delete_event($EVT_ID);
 			// get list of events with no prices
 			$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 			// remove this event from the list of events with no prices
@@ -1895,7 +1895,7 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
 	}
 
@@ -1913,12 +1913,12 @@ 
 		$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 		// loop thru events
 		foreach ($EVT_IDs as $EVT_ID) {
-			$EVT_ID = absint( $EVT_ID );
-			if ( $EVT_ID ) {
-				$results = $this->_permanently_delete_event( $EVT_ID );
+			$EVT_ID = absint($EVT_ID);
+			if ($EVT_ID) {
+				$results = $this->_permanently_delete_event($EVT_ID);
 				$success = $results !== FALSE ? $success : FALSE;
 				// remove this event from the list of events with no prices
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			} else {
 				$success = FALSE;
 				$msg = __('An error occurred. An event could not be deleted because a valid event ID was not not supplied.', 'event_espresso');
@@ -1938,21 +1938,21 @@ 
 	 * @param  int $EVT_ID
 	 * @return bool
 	 */
-	private function _permanently_delete_event( $EVT_ID = 0 ) {
+	private function _permanently_delete_event($EVT_ID = 0) {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = __('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 
 		//need to delete related tickets and prices first.
 		$datetimes = $this->_cpt_model_obj->get_many_related('Datetime');
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$this->_cpt_model_obj->_remove_relation_to($datetime, 'Datetime');
 			$tickets = $datetime->get_many_related('Ticket');
-			foreach ( $tickets as $ticket ) {
+			foreach ($tickets as $ticket) {
 				$ticket->_remove_relation_to($datetime, 'Datetime');
 				$ticket->delete_related_permanently('Price');
 				$ticket->delete_permanently();
@@ -1962,14 +1962,14 @@ 
 
 		//what about related venues or terms?
 		$venues = $this->_cpt_model_obj->get_many_related('Venue');
-		foreach ( $venues as $venue ) {
+		foreach ($venues as $venue) {
 			$this->_cpt_model_obj->_remove_relation_to($venue, 'Venue');
 		}
 
 		//any attached question groups?
 		$question_groups = $this->_cpt_model_obj->get_many_related('Question_Group');
-		if ( !empty( $question_groups ) ) {
-			foreach ( $question_groups as $question_group ) {
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $question_group) {
 				$this->_cpt_model_obj->_remove_relation_to($question_group, 'Question_Group');
 			}
 		}
@@ -1978,12 +1978,12 @@ 
 
 
 		//Message Template Groups
-		$this->_cpt_model_obj->_remove_relations( 'Message_Template_Group' );
+		$this->_cpt_model_obj->_remove_relations('Message_Template_Group');
 
 		/** @type EE_Term_Taxonomy[] $term_taxonomies */
 		$term_taxonomies = $this->_cpt_model_obj->term_taxonomies();
 
-		foreach ( $term_taxonomies as $term_taxonomy ) {
+		foreach ($term_taxonomies as $term_taxonomy) {
 			$this->_cpt_model_obj->remove_relation_to_term_taxonomy($term_taxonomy);
 		}
 
@@ -1997,7 +1997,7 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		do_action( 'AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID );
+		do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID);
 		return TRUE;
 	}
 
@@ -2014,7 +2014,7 @@ 
 	 */
 	public function total_events() {
 
-		$count = EEM_Event::instance()->count( array( 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array('caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2029,10 +2029,10 @@ 
 	 */
 	public function total_events_draft() {
 		$where = array(
-			'status' => array( 'IN', array('draft', 'auto-draft' ) )
+			'status' => array('IN', array('draft', 'auto-draft'))
 			);
 
-		$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;
 	}
 
@@ -2051,7 +2051,7 @@ 
 			'status' => 'trash'
 			);
 
-		$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;
 	}
 
@@ -2079,11 +2079,11 @@ 
 			// translated
 			TRUE
 		);
-		$this->_template_args['default_reg_status'] = isset( EE_Registry::instance()->CFG->registration->default_STS_ID ) ? sanitize_text_field( EE_Registry::instance()->CFG->registration->default_STS_ID ) : EEM_Registration::status_id_pending_payment;
+		$this->_template_args['default_reg_status'] = isset(EE_Registry::instance()->CFG->registration->default_STS_ID) ? sanitize_text_field(EE_Registry::instance()->CFG->registration->default_STS_ID) : EEM_Registration::status_id_pending_payment;
 
 		$this->_set_add_edit_form_tags('update_default_event_settings');
 		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH . 'event_settings.template.php', $this->_template_args, TRUE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -2109,9 +2109,9 @@ 
 
 	protected function _template_settings() {
 		$this->_admin_page_title = __('Template Settings (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . EVENTS_ASSETS_URL . DS . 'images' . DS . 'caffeinated_template_features.jpg" alt="' . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' ) . '" />';
-		$this->_template_args['preview_text'] = '<strong>'.__( 'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso' ).'</strong>';
-		$this->display_admin_caf_preview_page( 'template_settings_tab' );
+		$this->_template_args['preview_img'] = '<img src="'.EVENTS_ASSETS_URL.DS.'images'.DS.'caffeinated_template_features.jpg" alt="'.esc_attr__('Template Settings Preview screenshot', 'event_espresso').'" />';
+		$this->_template_args['preview_text'] = '<strong>'.__('Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso').'</strong>';
+		$this->display_admin_caf_preview_page('template_settings_tab');
 	}
 
 
@@ -2124,22 +2124,22 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
+		if (isset($this->_category->id) && ! empty($this->_category->id))
 			return; //already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();
 
 		//only set if we've got an id
-		if ( !isset($this->_req_data['EVT_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_CAT_ID'])) {
 			return;
 		}
 
 		$category_id = absint($this->_req_data['EVT_CAT_ID']);
 
-		$term = get_term( $category_id, 'espresso_event_categories' );
+		$term = get_term($category_id, 'espresso_event_categories');
 
-		if ( !empty( $term ) ) {
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -2153,13 +2153,13 @@ 
 
 	private function _set_empty_category_object() {
 		$this->_category = new stdClass();
-		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc  = '';
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
 		$this->_category->id = $this->_category->parent = 0;
 	}
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_search_btn_label = __('Categories', 'event_espresso');
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -2169,22 +2169,22 @@ 
 	protected function _category_details($view) {
 
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		$route = $view == 'edit' ? 'update_category' : 'insert_category';
 		$this->_set_add_edit_form_tags($route);
 
 		$this->_set_category_object();
-		$id = !empty($this->_category->id) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 
 		$delete_action = 'delete_category';
 
 		//custom redirect
-		$redirect = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'category_list'), $this->_admin_base_url );
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
 
-		$this->_set_publish_post_box_vars( 'EVT_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('EVT_CAT_ID', $id, $delete_action, $redirect);
 
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
@@ -2198,25 +2198,25 @@ 
 			'type' => 'wp_editor',
 			'value' => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class' => 'my_editor_custom',
-			'wpeditor_args' => array('media_buttons' => FALSE )
+			'wpeditor_args' => array('media_buttons' => FALSE)
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 
-		$all_terms = get_terms( array('espresso_event_categories' ), array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) ) );
+		$all_terms = get_terms(array('espresso_event_categories'), array('hide_empty' => 0, 'exclude' => array($this->_category->id)));
 
 		//setup category select for term parents.
 		$category_select_values[] = array(
 			'text' => __('No Parent', 'event_espresso'),
 			'id' => 0
 			);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id' => $term->term_id
 				);
 		}
 
-		$category_select = EEH_Form_Fields::select_input( 'category_parent', $category_select_values, $this->_category->parent );
+		$category_select = EEH_Form_Fields::select_input('category_parent', $category_select_values, $this->_category->parent);
 
 		$template_args = array(
 			'category' => $this->_category,
@@ -2226,15 +2226,15 @@ 
 			'disable' => '',
 			'disabled_message' => FALSE
 			);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template($template, $template_args, TRUE );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['EVT_CAT_ID'] ) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id'];
+		$cat_ids = isset($this->_req_data['EVT_CAT_ID']) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id'];
 
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ($cat_ids as $cat_id) {
 			$this->_delete_category($cat_id);
 		}
 
@@ -2242,7 +2242,7 @@ 
 		$query_args = array(
 			'action' => 'category_list'
 			);
-		$this->_redirect_after_action(0,'','',$query_args);
+		$this->_redirect_after_action(0, '', '', $query_args);
 
 	}
 
@@ -2252,61 +2252,61 @@ 
 
 	protected function _delete_category($cat_id) {
 		global $wpdb;
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_event_categories' );
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_event_categories');
 	}
 
 
 
 	protected function _insert_or_update_category($new_category) {
 
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( TRUE );
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(TRUE);
 		$success = 0; //we already have a success message so lets not send another.
 
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'EVT_CAT_ID' => $cat_id
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '','', $query_args, TRUE );
+		$this->_redirect_after_action($success, '', '', $query_args, TRUE);
 
 	}
 
 
 
-	private function _insert_category( $update = FALSE ) {
+	private function _insert_category($update = FALSE) {
 		$cat_id = $update ? $this->_req_data['EVT_CAT_ID'] : '';
-		$category_name= isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc= isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
 
-		if ( empty( $category_name ) ) {
-			$msg = __( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($category_name)) {
+			$msg = __('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		$term_args=array(
+		$term_args = array(
 			'name'=>$category_name,
 			'description'=>$category_desc,
 			'parent'=>$category_parent
 		);
 		//was the category_identifier input disabled?
-		if(isset($this->_req_data['category_identifier'])){
+		if (isset($this->_req_data['category_identifier'])) {
 			$term_args['slug'] = $this->_req_data['category_identifier'];
 		}
-		$insert_ids = $update ? wp_update_term( $cat_id, 'espresso_event_categories', $term_args ) :wp_insert_term( $category_name, 'espresso_event_categories', $term_args );
+		$insert_ids = $update ? wp_update_term($cat_id, 'espresso_event_categories', $term_args) : wp_insert_term($category_name, 'espresso_event_categories', $term_args);
 
-		if ( !is_array( $insert_ids ) ) {
-			$msg = __( 'An error occurred and the category has not been saved to the database.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($insert_ids)) {
+			$msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf ( __('The category %s was successfuly saved', 'event_espresso'), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(__('The category %s was successfuly saved', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 
 		return $cat_id;
@@ -2315,32 +2315,32 @@ 
 
 
 
-	public function get_categories( $per_page = 10, $current_page = 1, $count = FALSE ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = FALSE) {
 		global $wpdb;
 
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ($current_page-1)*$per_page;
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
 
-		$where = array( 'taxonomy' => 'espresso_event_categories' );
+		$where = array('taxonomy' => 'espresso_event_categories');
 
-		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(
-				'Term.name' => array( 'LIKE', $sstr),
-				'description' => array( 'LIKE', $sstr )
+				'Term.name' => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params = array(
-			$where ,
-			'order_by' => array( $orderby => $order ),
-			'limit' => $limit . ',' . $per_page,
+			$where,
+			'order_by' => array($orderby => $order),
+			'limit' => $limit.','.$per_page,
 			'force_join' => array('Term')
 			);
 
-		$categories = $count ? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' ) :EEM_Term_Taxonomy::instance()->get_all( $query_params );
+		$categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id') : EEM_Term_Taxonomy::instance()->get_all($query_params);
 
 		return $categories;
 	}

admin_pages/payments/Payments_Admin_Page.core.php

Spacing +168 added lines, -168 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * @return \Payments_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -130,19 +130,19 @@ 
 	protected function _set_page_config() {
 		$payment_method_list_config = array(
 			'nav'           => array(
-				'label' => __( 'Payment Methods', 'event_espresso' ),
+				'label' => __('Payment Methods', 'event_espresso'),
 				'order' => 10
 			),
 			'metaboxes'     => $this->_default_espresso_metaboxes,
 			'help_tabs'     => array_merge(
 				array(
 					'payment_methods_overview_help_tab' => array(
-						'title'    => __( 'Payment Methods Overview', 'event_espresso' ),
+						'title'    => __('Payment Methods Overview', 'event_espresso'),
 						'filename' => 'payment_methods_overview'
 					)
 				),
 				$this->_add_payment_method_help_tabs() ),
-			'help_tour'     => array( 'Payment_Methods_Selection_Help_Tour' ),
+			'help_tour'     => array('Payment_Methods_Selection_Help_Tour'),
 			'require_nonce' => false
 		);
 
@@ -160,7 +160,7 @@ 
 					)
 				),
 				//'help_tour' => array( 'Payment_Methods_Settings_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 			),
 			'payment_log'=>array(
@@ -179,17 +179,17 @@ 
 	/**
 	 * @return array
 	 */
-	protected function _add_payment_method_help_tabs(){
+	protected function _add_payment_method_help_tabs() {
 		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
 		$all_pmt_help_tabs_config = array();
-		foreach( $payment_method_types as $payment_method_type ){
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $payment_method_type->cap_name(), 'specific_payment_method_type_access' ) ) {
+		foreach ($payment_method_types as $payment_method_type) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($payment_method_type->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
-			foreach( $payment_method_type->help_tabs_config() as $help_tab_name => $config ){
-				$template_args = isset( $config[ 'template_args' ] ) ? $config[ 'template_args' ] : array();
-				$template_args[ 'admin_page_obj' ] = $this;
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
 				$all_pmt_help_tabs_config[$help_tab_name] = array(
 					'title'=>$config['title'],
 					'content'=>EEH_Template::display_template( 
@@ -216,9 +216,9 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_enqueue_script( 'ee_admin_js' );
-		wp_enqueue_script( 'ee-text-links' );
-		wp_enqueue_script( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js', array( 'espresso-ui-theme', 'ee-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script('espresso_payments', EE_PAYMENTS_ASSETS_URL.'espresso_payments_admin.js', array('espresso-ui-theme', 'ee-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -227,9 +227,9 @@ 
 
 	public function load_scripts_styles_default() {
 		//styles
-		wp_register_style( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'ee-payments.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso_payments' );
-		wp_enqueue_style( 'ee-text-links' );
+		wp_register_style('espresso_payments', EE_PAYMENTS_ASSETS_URL.'ee-payments.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
 		//scripts
 	}
 
@@ -243,46 +243,46 @@ 
 		 * to the loading process.  However, people MUST setup the details for the payment method so its safe to do a
 		 * recheck here.
 		 */
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		EEM_Payment_Method::instance()->verify_button_urls();
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
+		EE_Registry::instance()->load_helper('HTML');
 		//setup tabs, one for each payment method type
 		$tabs = array();
 		$payment_methods = array();
-		foreach( EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj ) {
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 			// we don't want to show admin-only PMTs for now
-			if ( $pmt_obj instanceof EE_PMT_Admin_Only ) {
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
 				continue;
 			}
 			//check access
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $pmt_obj->cap_name(), 'specific_payment_method_type_access' ) ) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($pmt_obj->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
 			//check for any active pms of that type
-			$payment_method = EEM_Payment_Method::instance()->get_one_of_type( $pmt_obj->system_name() );
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				$payment_method = EE_Payment_Method::new_instance(
 					array(
-						'PMD_slug'					=>sanitize_key( $pmt_obj->system_name() ),
+						'PMD_slug'					=>sanitize_key($pmt_obj->system_name()),
 						'PMD_type'					=>$pmt_obj->system_name(),
 						'PMD_name'				=>$pmt_obj->pretty_name(),
 						'PMD_admin_name'	=>$pmt_obj->pretty_name()
 					)
 				);
 			}
-			$payment_methods[ $payment_method->slug() ] = $payment_method;
+			$payment_methods[$payment_method->slug()] = $payment_method;
 		}
-		$payment_methods = apply_filters( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods );
-		foreach( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		$payment_methods = apply_filters('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				add_meta_box(
 					//html id
-					'espresso_' . $payment_method->slug() . '_payment_settings',
+					'espresso_'.$payment_method->slug().'_payment_settings',
 					//title
-					sprintf( __( '%s Settings', 'event_espresso' ), $payment_method->admin_name() ),
+					sprintf(__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
 					//callback
-					array( $this, 'payment_method_settings_meta_box' ),
+					array($this, 'payment_method_settings_meta_box'),
 					//post type
 					null,
 					//context
@@ -290,19 +290,19 @@ 
 					//priority
 					'default',
 					//callback args
-					array( 'payment_method' => $payment_method )
+					array('payment_method' => $payment_method)
 				);
 				//setup for tabbed content
-				$tabs[ $payment_method->slug() ] = array(
+				$tabs[$payment_method->slug()] = array(
 					'label' => $payment_method->admin_name(),
 					'class' => $payment_method->active() ? 'gateway-active' : '',
-					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-					'title' => __( 'Modify this Payment Method', 'event_espresso' ),
+					'href'  => 'espresso_'.$payment_method->slug().'_payment_settings',
+					'title' => __('Modify this Payment Method', 'event_espresso'),
 					'slug'  => $payment_method->slug()
 				);
 			}
 		}
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug() );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug());
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -313,20 +313,20 @@ 
 	 *   _get_active_payment_method_slug
 	 * 	@return string
 	 */
-	protected function _get_active_payment_method_slug(){
+	protected function _get_active_payment_method_slug() {
 		$payment_method_slug = FALSE;
 		//decide which payment method tab to open first, as dictated by the request's 'payment_method'
-		if ( isset( $this->_req_data['payment_method'] )) {
+		if (isset($this->_req_data['payment_method'])) {
 			// if they provided the current payment method, use it
-			$payment_method_slug = sanitize_key( $this->_req_data['payment_method'] );
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 		}
-		$payment_method = EEM_Payment_Method::instance()->get_one( array( array( 'PMD_slug' => $payment_method_slug )));
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
 		// if that didn't work or wasn't provided, find another way to select the current pm
-		if ( ! $this->_verify_payment_method( $payment_method )) {
+		if ( ! $this->_verify_payment_method($payment_method)) {
 			// like, looking for an active one
-			$payment_method = EEM_Payment_Method::instance()->get_one_active( 'CART' );
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
 			// test that one as well
-			if ( $this->_verify_payment_method( $payment_method )) {
+			if ($this->_verify_payment_method($payment_method)) {
 				$payment_method_slug = $payment_method->slug();
 			} else {
 				$payment_method_slug = 'paypal_standard';
@@ -344,11 +344,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	protected function _verify_payment_method( $payment_method ){
+	protected function _verify_payment_method($payment_method) {
 		if (
 			$payment_method instanceof EE_Payment_Method &&
 			$payment_method->type_obj() instanceof EE_PMT_Base &&
-			EE_Registry::instance()->CAP->current_user_can( $payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access' )
+			EE_Registry::instance()->CAP->current_user_can($payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access')
 		) {
 			return TRUE;
 		}
@@ -365,21 +365,21 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_method_settings_meta_box( $post_obj_which_is_null, $metabox ){
-		$payment_method = isset( $metabox['args'], $metabox['args']['payment_method'] ) ? $metabox['args']['payment_method'] : NULL;
-		if ( ! $payment_method instanceof EE_Payment_Method ){
-			throw new EE_Error( sprintf( __( 'Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso' )));
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox) {
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method']) ? $metabox['args']['payment_method'] : NULL;
+		if ( ! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(sprintf(__('Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso')));
 		}
 		$payment_method_scopes = $payment_method->active();
 		// if the payment method really exists show its form, otherwise the activation template
-		if ( $payment_method->ID() && ! empty( $payment_method_scopes )) {
-				$form = $this->_generate_payment_method_settings_form( $payment_method );
-				if ( $form->form_data_present_in( $this->_req_data )) {
-					$form->receive_form_submission( $this->_req_data );
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+				$form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($form->form_data_present_in($this->_req_data)) {
+					$form->receive_form_submission($this->_req_data);
 				}
-				echo $form->form_open() . $form->get_html_and_js() . $form->form_close();
+				echo $form->form_open().$form->get_html_and_js().$form->form_close();
 		} else {
-			echo $this->_activate_payment_method_button( $payment_method )->get_html_and_js();
+			echo $this->_activate_payment_method_button($payment_method)->get_html_and_js();
 		}
 	}
 
@@ -392,14 +392,14 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _generate_payment_method_settings_form( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method instanceof EE_Payment_Method ){
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			return new EE_Form_Section_Proper();
 		}
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> $payment_method->slug() . '_settings_form',
-				'html_id' 	=> $payment_method->slug() . '_settings_form',
+				'name' 	=> $payment_method->slug().'_settings_form',
+				'html_id' 	=> $payment_method->slug().'_settings_form',
 				'action' 	=> EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' 						=> 'update_payment_method',
@@ -411,12 +411,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
 					array(
-						'pci_dss_compliance_' . $payment_method->slug() 				=> $this->_pci_dss_compliance( $payment_method ),
-						'currency_support_' . $payment_method->slug()					=> $this->_currency_support( $payment_method ),
-						'payment_method_settings_' . $payment_method->slug() 	=> $this->_payment_method_settings( $payment_method ),
-						'update_' . $payment_method->slug()										=> $this->_update_payment_method_button( $payment_method ),
-						'deactivate_' . $payment_method->slug()								=> $this->_deactivate_payment_method_button( $payment_method ),
-						'fine_print_' . $payment_method->slug()									=> $this->_fine_print()
+						'pci_dss_compliance_'.$payment_method->slug() 				=> $this->_pci_dss_compliance($payment_method),
+						'currency_support_'.$payment_method->slug()					=> $this->_currency_support($payment_method),
+						'payment_method_settings_'.$payment_method->slug() 	=> $this->_payment_method_settings($payment_method),
+						'update_'.$payment_method->slug()										=> $this->_update_payment_method_button($payment_method),
+						'deactivate_'.$payment_method->slug()								=> $this->_deactivate_payment_method_button($payment_method),
+						'fine_print_'.$payment_method->slug()									=> $this->_fine_print()
 					),
 					$payment_method
 				)
@@ -433,19 +433,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
-		if ( $payment_method->type_obj()->requires_https() ) {
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method) {
+		if ($payment_method->type_obj()->requires_https()) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
-						EEH_HTML::strong( __( 'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso' )) .
-						EEH_HTML::br() .
-						__( 'Learn more about ', 'event_espresso' ) . EEH_HTML::link( 'https://www.pcisecuritystandards.org/merchants/index.php', __( 'PCI DSS compliance', 'event_espresso' ))
+						EEH_HTML::strong(__('You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso')).
+						EEH_HTML::br().
+						__('Learn more about ', 'event_espresso').EEH_HTML::link('https://www.pcisecuritystandards.org/merchants/index.php', __('PCI DSS compliance', 'event_espresso'))
 					)
 				)
 			);
@@ -463,19 +463,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _currency_support( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
+	protected function _currency_support(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
 						EEH_HTML::strong(
 							sprintf(
-								__( 'This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
+								__('This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
 								EE_Config::instance()->currency->code
 							)
 						)
@@ -495,9 +495,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
+	protected function _payment_method_settings(EE_Payment_Method $payment_method) {
 		//modify the form so we only have/show fields that will be implemented for this version
-		return $this->_simplify_form( $payment_method->type_obj()->settings_form(), $payment_method->name() );
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
 	}
 
 
@@ -510,8 +510,8 @@ 
 	 * @return \EE_Payment_Method_Form
 	 * @throws \EE_Error
 	 */
-	protected function _simplify_form( $form_section, $payment_method_name = '' ){
-		if ( $form_section instanceof EE_Payment_Method_Form ) {
+	protected function _simplify_form($form_section, $payment_method_name = '') {
+		if ($form_section instanceof EE_Payment_Method_Form) {
 			$form_section->exclude(
 				array(
 					'PMD_type', //dont want them changing the type
@@ -522,7 +522,7 @@ 
 			);
 			return $form_section;
 		} else {
-			throw new EE_Error( sprintf( __( 'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso' ), $payment_method_name ));
+			throw new EE_Error(sprintf(__('The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso'), $payment_method_name));
 		}
 	}
 
@@ -535,18 +535,18 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _update_payment_method_button( EE_Payment_Method $payment_method ) {
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method) {
 		$update_button = new EE_Submit_Input(
 			array(
-				'html_id' 		=> 'save_' . $payment_method->slug() . '_settings',
-				'default' 		=> sprintf( __( 'Update %s Payment Settings', 'event_espresso' ), $payment_method->admin_name() ),
+				'html_id' 		=> 'save_'.$payment_method->slug().'_settings',
+				'default' 		=> sprintf(__('Update %s Payment Settings', 'event_espresso'), $payment_method->admin_name()),
 				'html_label' => EEH_HTML::nbsp()
 			)
 		);
 		return new EE_Form_Section_HTML(
-			EEH_HTML::no_row( EEH_HTML::br(2) ) .
+			EEH_HTML::no_row(EEH_HTML::br(2)).
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Update Settings', 'event_espresso') ) .
+				EEH_HTML::th(__('Update Settings', 'event_espresso')).
 				EEH_HTML::td(
 					$update_button->get_html_for_input()
 				)
@@ -563,11 +563,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Deactivate Payment Method', 'event_espresso') ) .
+				EEH_HTML::th(__('Deactivate Payment Method', 'event_espresso')).
 				EEH_HTML::td(
 					EEH_HTML::link(
 						EE_Admin_Page::add_query_args_and_nonce(
@@ -579,7 +579,7 @@ 
 						),
 						$link_text_and_title,
 						$link_text_and_title,
-						'deactivate_' . $payment_method->slug(),
+						'deactivate_'.$payment_method->slug(),
 						'espresso-button button-secondary'
 					)
 				)
@@ -595,12 +595,12 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _activate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
-				'html_id' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
+				'name' 	=> 'activate_'.$payment_method->slug().'_settings_form',
+				'html_id' 	=> 'activate_'.$payment_method->slug().'_settings_form',
 				'action' 	=> '#',
 				'layout_strategy'		=> new EE_Admin_Two_Column_Layout(),
 				'subsections' 			=> apply_filters(
@@ -609,8 +609,8 @@ 
 						new EE_Form_Section_HTML(
 							EEH_HTML::tr(
 								EEH_HTML::th(
-									EEH_HTML::label( __( 'Click to Activate ', 'event_espresso' ))
-								) .
+									EEH_HTML::label(__('Click to Activate ', 'event_espresso'))
+								).
 								EEH_HTML::td(
 									EEH_HTML::link(
 										EE_Admin_Page::add_query_args_and_nonce(
@@ -622,7 +622,7 @@ 
 										),
 										$link_text_and_title,
 										$link_text_and_title,
-										'activate_' . $payment_method->slug(),
+										'activate_'.$payment_method->slug(),
 										'espresso-button-green button-primary'
 									)
 								)
@@ -644,9 +644,9 @@ 
 	protected function _fine_print() {
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th() .
+				EEH_HTML::th().
 				EEH_HTML::td(
-					EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' )
+					EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
 				)
 			)
 		);
@@ -658,15 +658,15 @@ 
 	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
 	 * @global WP_User $current_user
 	 */
-	protected function _activate_payment_method(){
-		if(isset($this->_req_data['payment_method_type'])){
+	protected function _activate_payment_method() {
+		if (isset($this->_req_data['payment_method_type'])) {
 			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
 			//see if one exists
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type($payment_method_type);
 
-			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -674,14 +674,14 @@ 
 	/**
 	 * Deactivates the payment method with the specified slug, and redirects.
 	 */
-	protected function _deactivate_payment_method(){
-		if(isset($this->_req_data['payment_method'])){
+	protected function _deactivate_payment_method() {
+		if (isset($this->_req_data['payment_method'])) {
 			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 			//deactivate it
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
-			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default', 'payment_method'=>$payment_method_slug));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -695,39 +695,39 @@ 
 	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
 	 * @return void
 	 */
-	protected function _update_payment_method(){
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
+	protected function _update_payment_method() {
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			//ok let's find which gateway form to use based on the form input
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
 			$correct_pmt_form_to_use = NULL;
 			$pmt_obj = NULL;
-			foreach(EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj){
+			foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 				/** @var $pmt_obj EE_PMT_Base */
 				//get the form and simplify it, like what we do when we display it
 				$pmt_form = $pmt_obj->settings_form();
 				$this->_simplify_form($pmt_form);
-				if($pmt_form->form_data_present_in($this->_req_data)){
+				if ($pmt_form->form_data_present_in($this->_req_data)) {
 					$correct_pmt_form_to_use = $pmt_form;
 					break;
 				}
 			}
 			//if we couldn't find the correct payment method type...
-			if( ! $correct_pmt_form_to_use ){
+			if ( ! $correct_pmt_form_to_use) {
 				EE_Error::add_error(__("We could not find which payment method type your form submission related to. Please contact support", 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 			}
 			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-			if($correct_pmt_form_to_use->is_valid()){
+			if ($correct_pmt_form_to_use->is_valid()) {
 				$correct_pmt_form_to_use->save();
 				$pm = $correct_pmt_form_to_use->get_model_object();
 				/** @var $pm EE_Payment_Method */
-				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$pm->slug()));
-			}else{
+				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default', 'payment_method'=>$pm->slug()));
+			} else {
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
-						$pmt_obj instanceof EE_PMT_Base ? $pmt_obj->pretty_name() : __( '"(unknown)"', 'event_espresso' )
+						$pmt_obj instanceof EE_PMT_Base ? $pmt_obj->pretty_name() : __('"(unknown)"', 'event_espresso')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -744,11 +744,11 @@ 
 	protected function _payment_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['show_pending_payment_options'] = isset( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) ? absint( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) : FALSE;
+		$this->_template_args['show_pending_payment_options'] = isset(EE_Registry::instance()->CFG->registration->show_pending_payment_options) ? absint(EE_Registry::instance()->CFG->registration->show_pending_payment_options) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_payment_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_PAYMENTS_TEMPLATE_PATH . 'payment_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_PAYMENTS_TEMPLATE_PATH.'payment_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -762,13 +762,13 @@ 
 	*		@return array
 	*/
 	protected function _update_payment_settings() {
-		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );
+		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset($this->_req_data['show_pending_payment_options']) ? $this->_req_data['show_pending_payment_options'] : FALSE;
+		EE_Registry::instance()->CFG = apply_filters('FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG);
 
 
-		$what = __('Payment Settings','event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, $what, __('updated','event_espresso'), array( 'action' => 'payment_settings' ) );
+		$what = __('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), array('action' => 'payment_settings'));
 
 	}
 	protected function _payment_log_overview_list_table() {
@@ -794,18 +794,18 @@ 
 	 * @param bool $count
 	 * @return array
 	 */
-	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false){
-		EE_Registry::instance()->load_model( 'Change_Log' );
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false) {
+		EE_Registry::instance()->load_model('Change_Log');
 		//we may need to do multiple queries (joining differently), so we actually wan tan array of query params
-		$query_params =  array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
+		$query_params = array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
 		//check if they've selected a specific payment method
-		if( isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all'){
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
 			$query_params[0]['OR*pm_or_pay_pm'] = array('Payment.Payment_Method.PMD_ID'=>$this->_req_data['_payment_method'],
 				'Payment_Method.PMD_ID'=>$this->_req_data['_payment_method']);
 		}
 		//take into account search
-		if(isset($this->_req_data['s']) && $this->_req_data['s']){
-			$similarity_string = array('LIKE','%'.str_replace("","%",$this->_req_data['s']) .'%');
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%'.str_replace("", "%", $this->_req_data['s']).'%');
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
@@ -820,48 +820,48 @@ 
 			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
 
 		}
-		if(isset( $this->_req_data['payment-filter-start-date'] ) && isset( $this->_req_data['payment-filter-end-date'] )){
+		if (isset($this->_req_data['payment-filter-start-date']) && isset($this->_req_data['payment-filter-end-date'])) {
 			//add date
-			$start_date =wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] );
-			$end_date = wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] );
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
 			//make sure our timestamps start and end right at the boundaries for each day
-			$start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-			$end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+			$start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 			//convert to timestamps
-			$start_date = strtotime( $start_date );
-			$end_date = strtotime( $end_date );
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
 
 			//makes sure start date is the lowest value and vice versa
-			$start_date = min( $start_date, $end_date );
-			$end_date = max( $start_date, $end_date );
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
 
 			//convert for query
-			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
-			$query_params[0]['LOG_time'] = array('BETWEEN',array($start_date,$end_date));
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
 
 		}
-		if($count){
+		if ($count) {
 			return EEM_Change_Log::instance()->count($query_params);
 		}
-		if(isset($this->_req_data['order'])){
-			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else {
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 
-		if( ! isset($this->_req_data['download_results'])){
-			$query_params['limit'] = array( $offset, $per_page );
+		if ( ! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
 		}
 
 
 
 		//now they've requested to instead just download the file instead of viewing it.
-		if(isset($this->_req_data['download_results'])){
+		if (isset($this->_req_data['download_results'])) {
 			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
 			header('Content-Disposition: attachment');
 			header("Content-Disposition: attachment; filename=ee_payment_logs_for_".sanitize_key(site_url()));
@@ -883,36 +883,36 @@ 
 	 * @param EE_Change_Log $logB
 	 * @return int
 	 */
-	protected function _sort_logs_again($logA,$logB){
+	protected function _sort_logs_again($logA, $logB) {
 		$timeA = $logA->get_raw('LOG_time');
 		$timeB = $logB->get_raw('LOG_time');
-		if($timeA == $timeB){
+		if ($timeA == $timeB) {
 			return 0;
 		}
 		$comparison = $timeA < $timeB ? -1 : 1;
-		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
 			return $comparison * -1;
-		}else{
+		} else {
 			return $comparison;
 		}
 	}
 
 	protected function _payment_log_details() {
-		EE_Registry::instance()->load_model( 'Change_Log' );
+		EE_Registry::instance()->load_model('Change_Log');
 		/** @var $payment_log EE_Change_Log */
 		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
 		$payment_method = NULL;
 		$transaction = NULL;
-		if( $payment_log instanceof EE_Change_Log ){
-			if( $payment_log->object() instanceof EE_Payment ){
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			}elseif ($payment_log->object() instanceof EE_Payment_Method) {
 				$payment_method = $payment_log->object();
 			}
 		}
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			EE_PAYMENTS_TEMPLATE_PATH.'payment_log_details.template.php',
 			array(
 				'payment_log'=>$payment_log,
 				'payment_method'=>$payment_method,

admin_pages/support/Support_Admin_Page.core.php

Spacing +47 added lines, -47 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -37,8 +37,8 @@ 
 	protected $_job_step_response = null;
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -53,8 +53,8 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_batch_continue',array($this,'batch_continue'));
-		add_action('wp_ajax_espresso_batch_cleanup',array($this,'batch_cleanup'));
+		add_action('wp_ajax_espresso_batch_continue', array($this, 'batch_continue'));
+		add_action('wp_ajax_espresso_batch_cleanup', array($this, 'batch_cleanup'));
 		
 	}
 
@@ -102,14 +102,14 @@ 
 				'nav' => array(
 					'label' => __('Shortcodes', 'event_espresso'),
 					'order' => 30),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_shortcodes_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
 				'require_nonce' => FALSE
 				),
 			'contact_support' => array(
 				'nav' => array(
 					'label' => __('Support', 'event_espresso'),
 					'order' => 40),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_support_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
 				'require_nonce' => FALSE
 				),
 			'developers' => array(
@@ -137,8 +137,8 @@ 
 
 
 	protected function _installation() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, '', TRUE);
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_installation.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, '', TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -163,10 +163,10 @@ 
 			'other_resources' => __('Other Resources', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -187,15 +187,15 @@ 
 			'shortcodes_event_listings' => __('Event Listings', 'event_espresso'),
 			'shortcodes_ticket_selector' => __('Event Ticket Selector', 'event_espresso'),
 			'shortcodes_category' => __('Event Categories', 'event_espresso'),
-			'shortcodes_attendee' => __( 'Event Attendees', 'event_espresso' )
+			'shortcodes_attendee' => __('Event Attendees', 'event_espresso')
 			/*'shortcodes_single_events' => __('Single Events', 'event_espresso'),*/
 			/*'shortcodes_attendee_listings' => __('Attendee Listings', 'event_espresso'),*/
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -214,41 +214,41 @@ 
 			'important_information' => __('Important Information', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path, 'template_args' => $this->_template_args);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
 		}
 	}
 
 
 	protected function _developers() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true );
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'developers_admin_details.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true);
 		$this->display_admin_page_with_sidebar();
 	}
 	
 	public function load_scripts_styles_batch_create() {	
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' ));
-		wp_localize_script( 'support_batch_runner', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'support_batch_runner', 'ee_job_i18n', 
+		wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar'));
+		wp_localize_script('support_batch_runner', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('support_batch_runner', 'ee_job_i18n', 
 			array(
-				'redirect_url' => $this->_req_data['redirect_url' ],
+				'redirect_url' => $this->_req_data['redirect_url'],
 			));
 	}
 	public function load_scripts_styles_batch_file_create() {
 		//creates a job based on the request variable
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'support_batch_file_runner', EE_SUPPORT_ASSETS_URL . 'support_batch_file_runner.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION,true);
-		wp_localize_script( 'support_batch_file_runner', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'support_batch_file_runner', 'ee_job_i18n', 
+		wp_enqueue_script('support_batch_file_runner', EE_SUPPORT_ASSETS_URL.'support_batch_file_runner.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('support_batch_file_runner', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('support_batch_file_runner', 'ee_job_i18n', 
 				array(
 					'download_and_redirecting' => sprintf( 
 							__('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
-							'<a href="' . $this->_req_data['redirect_url' ] .'">',
+							'<a href="'.$this->_req_data['redirect_url'].'">',
 							'</a>' ),
-					'redirect_url' => $this->_req_data['redirect_url' ],
+					'redirect_url' => $this->_req_data['redirect_url'],
 				));
 	}
 	
@@ -259,16 +259,16 @@ 
 	 * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
 	 */
 	protected function _enqueue_batch_job_scripts_and_styles_and_start_job() {
-		wp_register_script( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js', array( 'jquery' ) );
-		wp_enqueue_style( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' ));
-		$job_handler_classname = stripslashes( $this->_req_data[ 'job_handler' ] );
+		wp_register_script('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js', array('jquery'));
+		wp_enqueue_style('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar'));
+		$job_handler_classname = stripslashes($this->_req_data['job_handler']);
 		$request_data = array_diff_key( 
 				$this->_req_data, 
-				array_flip( array( 'action',  'page' ) ) );
+				array_flip(array('action', 'page')) );
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
 		//eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport'
-		$job_response = $batch_runner->create_job( $job_handler_classname, $request_data );
+		$job_response = $batch_runner->create_job($job_handler_classname, $request_data);
 		//remember the response for later. We need it to display the page body
 		$this->_job_step_response = $job_response;
 		return $job_response;
@@ -277,7 +277,7 @@ 
 	 * Invokes the report-generating code
 	 */
 	protected function batch_create() {		
-		echo EEH_Template::locate_template( EE_SUPPORT_ADMIN . 'templates' . DS . 'admin_batch_runner.template.html' );
+		echo EEH_Template::locate_template(EE_SUPPORT_ADMIN.'templates'.DS.'admin_batch_runner.template.html');
 	}
 	
 	/**
@@ -285,13 +285,13 @@ 
 	 * and then sends the user back to wherever they were before
 	 */
 	protected function batch_file_create() {
-		if( $this->_job_step_response instanceof \EventEspressoBatchRequest\Helpers\JobStepResponse ) {
-			$filename = EEH_File::get_filename_from_filepath( $this->_job_step_response->job_parameters()->extra_datum( 'filepath' ) );
+		if ($this->_job_step_response instanceof \EventEspressoBatchRequest\Helpers\JobStepResponse) {
+			$filename = EEH_File::get_filename_from_filepath($this->_job_step_response->job_parameters()->extra_datum('filepath'));
 		} else {
-			$filename = __( 'Unknown', 'event_espresso' );
+			$filename = __('Unknown', 'event_espresso');
 		}
 		echo EEH_Template::locate_template( 
-				EE_SUPPORT_ADMIN . 'templates' . DS . 'admin_batch_file_runner.template.html', 
+				EE_SUPPORT_ADMIN.'templates'.DS.'admin_batch_file_runner.template.html', 
 				array( 
 					'filename' => $filename 
 				)
@@ -302,10 +302,10 @@ 
 	 * Receives ajax calls for continuing a job
 	 */
 	public function batch_continue() {
-		$job_id = sanitize_text_field( $this->_req_data[ 'job_id' ] );
+		$job_id = sanitize_text_field($this->_req_data['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$responseobj = $batch_runner->continue_job( $job_id);
-		$this->_template_args[ 'data' ] = $responseobj->to_array();
+		$responseobj = $batch_runner->continue_job($job_id);
+		$this->_template_args['data'] = $responseobj->to_array();
 		$this->_return_json();
 	}
 	
@@ -314,10 +314,10 @@ 
 	 * @return type
 	 */
 	public function batch_cleanup() {
-		$job_id = sanitize_text_field( $this->_req_data[ 'job_id' ] );
+		$job_id = sanitize_text_field($this->_req_data['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->cleanup_job( $job_id );
-		$this->_template_args[ 'data' ] = $response_obj->to_array();
+		$response_obj = $batch_runner->cleanup_job($job_id);
+		$this->_template_args['data'] = $response_obj->to_array();
 		$this->_return_json();
 	}
 

caffeinated/admin/new/pricing/espresso_events_Pricing_Hooks.class.php

Spacing +376 added lines, -376 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -54,23 +54,23 @@ 
 		$this->_name = 'pricing';
 
 		//capability check
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_default_prices', 'advanced_ticket_datetime_metabox' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_default_prices', 'advanced_ticket_datetime_metabox')) {
 			return;
 		}
 
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
+		EE_Registry::instance()->load_helper('DTT_Helper');
 
 		//if we were going to add our own metaboxes we'd use the below.
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array('edit','create_new'),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'pricing_metabox',
 				'label' => __('Event Tickets & Datetimes', 'event_espresso'),
 				'priority' => 'high',
 				'context' => 'normal'
 				),
 
-			);/**/
+			); /**/
 
 		$this->_remove_metaboxes = array(
 			0 => array(
@@ -89,24 +89,24 @@ 
 		 *
 		 * @var array  Expected an array returned with 'date' and 'time' keys.
 		 */
-		$this->_date_format_strings = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
+		$this->_date_format_strings = apply_filters('FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
 			));
 
 		//validate
-		$this->_date_format_strings['date'] = isset( $this->_date_format_strings['date'] ) ? $this->_date_format_strings['date'] : null;
-		$this->_date_format_strings['time'] = isset( $this->_date_format_strings['time'] ) ? $this->_date_format_strings['time'] : null;
+		$this->_date_format_strings['date'] = isset($this->_date_format_strings['date']) ? $this->_date_format_strings['date'] : null;
+		$this->_date_format_strings['time'] = isset($this->_date_format_strings['time']) ? $this->_date_format_strings['time'] : null;
 
 		//validate format strings
-		$format_validation = EEH_DTT_Helper::validate_format_string( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
-		if ( is_array( $format_validation ) ) {
-			$msg = '<p>' . sprintf( __( 'The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso' ), $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ) . '</p><ul>';
-			foreach ( $format_validation as $error ) {
-				$msg .= '<li>' . $error . '</li>';
+		$format_validation = EEH_DTT_Helper::validate_format_string($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
+		if (is_array($format_validation)) {
+			$msg = '<p>'.sprintf(__('The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso'), $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']).'</p><ul>';
+			foreach ($format_validation as $error) {
+				$msg .= '<li>'.$error.'</li>';
 			}
-			$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
-			EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
+			EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 			$this->_date_format_strings = array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
@@ -117,60 +117,60 @@ 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'ee-tickets-datetimes-css' => array(
-					'url' => PRICING_ASSETS_URL . 'event-tickets-datetimes.css',
+					'url' => PRICING_ASSETS_URL.'event-tickets-datetimes.css',
 					'type' => 'css'
 					),
 				'ee-dtt-ticket-metabox' => array(
-					'url' => PRICING_ASSETS_URL . 'ee-datetime-ticket-metabox.js',
+					'url' => PRICING_ASSETS_URL.'ee-datetime-ticket-metabox.js',
 					'depends' => array('ee-datepicker', 'ee-dialog', 'underscore')
 					)
 				),
 			'deregisters' => array(
-				'event-editor-css' => array('type' => 'css' ),
+				'event-editor-css' => array('type' => 'css'),
 				'event-datetime-metabox' => array('type' => 'js')
 				),
 			'enqueues' => array(
-				'ee-tickets-datetimes-css' => array( 'edit', 'create_new' ),
-				'ee-dtt-ticket-metabox' => array( 'edit', 'create_new' )
+				'ee-tickets-datetimes-css' => array('edit', 'create_new'),
+				'ee-dtt-ticket-metabox' => array('edit', 'create_new')
 				),
 			'localize' => array(
 				'ee-dtt-ticket-metabox' => array(
 					'DTT_TRASH_BLOCK' => array(
 						'main_warning' => __('The Datetime you are attempting to trash is the only datetime selected for the following ticket(s):', 'event_espresso'),
 						'after_warning' => __('In order to trash this datetime you must first make sure the above ticket(s) are assigned to other datetimes.', 'event_espresso'),
-						'cancel_button' => '<button class="button-secondary ee-modal-cancel">' . __('Cancel', 'event_espresso') . '</button>',
+						'cancel_button' => '<button class="button-secondary ee-modal-cancel">'.__('Cancel', 'event_espresso').'</button>',
 						'single_warning_from_tkt' => __('The Datetime you are attempting to unassign from this ticket is the only remaining datetime for this ticket. Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
 						'single_warning_from_dtt' => __('The ticket you are attempting to unassign from this datetime cannot be unassigned because the datetime is the only remaining datetime for the ticket.  Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
-						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button>'
+						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button>'
 						),
 					'DTT_ERROR_MSG' => array(
 						'no_ticket_name' => __('General Admission', 'event_espresso'),
-						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button></div>'
+						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button></div>'
 						),
 					'DTT_OVERSELL_WARNING' => array(
 						'datetime_ticket' => __('You cannot add this ticket to this datetime because it has a sold amount that is greater than the amount of spots remaining for this datetime.', 'event_espresso'),
 						'ticket_datetime' => __('You cannot add this datetime to this ticket because the ticket has a sold amount that is greater than the amount of spots remaining on the datetime.', 'event_espresso')
 						),
-					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats( $this->_date_format_strings['date'], $this->_date_format_strings['time'] ),
-					'DTT_START_OF_WEEK' => array( 'dayValue' => (int) get_option( 'start_of_week' ) )
+					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats($this->_date_format_strings['date'], $this->_date_format_strings['time']),
+					'DTT_START_OF_WEEK' => array('dayValue' => (int) get_option('start_of_week'))
 					)
 				)
 			);
 
 
-		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array( $this, 'autosave_handling' ), 10 );
-		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'caf_updates' ), 10 );
+		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array($this, 'autosave_handling'), 10);
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'caf_updates'), 10);
 	}
 
 
 
-	public function caf_updates( $update_callbacks ) {
-		foreach ( $update_callbacks as $key => $callback ) {
-			if ( $callback[1] == '_default_tickets_update' )
-				unset( $update_callbacks[$key] );
+	public function caf_updates($update_callbacks) {
+		foreach ($update_callbacks as $key => $callback) {
+			if ($callback[1] == '_default_tickets_update')
+				unset($update_callbacks[$key]);
 		}
 
-		$update_callbacks[] = array( $this, 'dtt_and_tickets_caf_update' );
+		$update_callbacks[] = array($this, 'dtt_and_tickets_caf_update');
 		return $update_callbacks;
 	}
 
@@ -183,11 +183,11 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return bool             success or fail
 	 */
-	public function dtt_and_tickets_caf_update( $evtobj, $data ) {
+	public function dtt_and_tickets_caf_update($evtobj, $data) {
 		//first we need to start with datetimes cause they are the "root" items attached to events.
-		$saved_dtts = $this->_update_dtts( $evtobj, $data );
+		$saved_dtts = $this->_update_dtts($evtobj, $data);
 		//next tackle the tickets (and prices?)
-		$this->_update_tkts( $evtobj, $saved_dtts, $data );
+		$this->_update_tkts($evtobj, $saved_dtts, $data);
 	}
 
 
@@ -198,41 +198,41 @@ 
 	 * @param  array    	$data    the request data from the form
 	 * @return EE_Datetime[]
 	 */
-	protected function _update_dtts( $evt_obj, $data ) {
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+	protected function _update_dtts($evt_obj, $data) {
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_dtt_ids = array();
 		$saved_dtt_objs = array();
 
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
 			$dtt = array_map(
-				function( $datetime_data ) {
-					return is_array( $datetime_data ) ? $datetime_data : trim( $datetime_data );
+				function($datetime_data) {
+					return is_array($datetime_data) ? $datetime_data : trim($datetime_data);
 				},
 				$dtt
 			);
-			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID' 			=> ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : NULL,
-				'DTT_name' 			=> ! empty( $dtt['DTT_name'] ) ? $dtt['DTT_name'] : '',
-				'DTT_description' 	=> ! empty( $dtt['DTT_description'] ) ? $dtt['DTT_description'] : '',
+				'DTT_ID' 			=> ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL,
+				'DTT_name' 			=> ! empty($dtt['DTT_name']) ? $dtt['DTT_name'] : '',
+				'DTT_description' 	=> ! empty($dtt['DTT_description']) ? $dtt['DTT_description'] : '',
 				'DTT_EVT_start' 	=> $dtt['DTT_EVT_start'],
 				'DTT_EVT_end' 		=> $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' 	=> empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt[ 'DTT_reg_limit' ],
-				'DTT_order' 		=> ! isset( $dtt['DTT_order'] ) ? $row : $dtt['DTT_order'],
+				'DTT_reg_limit' 	=> empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_order' 		=> ! isset($dtt['DTT_order']) ? $row : $dtt['DTT_order'],
 			);
 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 
-			if ( !empty( $dtt['DTT_ID'] ) ) {
-				$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone) )->get_one_by_ID($dtt['DTT_ID'] );
+			if ( ! empty($dtt['DTT_ID'])) {
+				$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone))->get_one_by_ID($dtt['DTT_ID']);
 
 				//set date and time format according to what is set in this class.
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
 
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 
 				// make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.
@@ -240,24 +240,24 @@ 
 				$saved_dtt_ids[$DTM->ID()] = $DTM->ID();
 
 			} else {
-				$DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values, $timezone ), FALSE, FALSE );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values, $timezone), FALSE, FALSE);
 
 				//reset date and times to match the format
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
-				foreach( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 
 
 			$DTM->save();
-			$DTM = $evt_obj->_add_relation_to( $DTM, 'Datetime' );
+			$DTM = $evt_obj->_add_relation_to($DTM, 'Datetime');
 			$evt_obj->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end') ) {
-				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start') );
+			if ($DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end')) {
+				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$DTM = EEH_DTT_Helper::date_time_add($DTM, 'DTT_EVT_end', 'days');
 				$DTM->save();
@@ -273,25 +273,25 @@ 
 		}
 
 		//now we need to REMOVE any dtts that got deleted.  Keep in mind that this process will only kick in for DTT's that don't have any DTT_sold on them. So its safe to permanently delete at this point.
-		$old_datetimes = explode(',', $data['datetime_IDs'] );
+		$old_datetimes = explode(',', $data['datetime_IDs']);
 		$old_datetimes = $old_datetimes[0] == '' ? array() : $old_datetimes;
 
-		if ( is_array( $old_datetimes ) ) {
-			$dtts_to_delete = array_diff( $old_datetimes, $saved_dtt_ids );
-			foreach ( $dtts_to_delete as $id ) {
-				$id = absint( $id );
-				if ( empty( $id ) )
+		if (is_array($old_datetimes)) {
+			$dtts_to_delete = array_diff($old_datetimes, $saved_dtt_ids);
+			foreach ($dtts_to_delete as $id) {
+				$id = absint($id);
+				if (empty($id))
 					continue;
 
 				$dtt_to_remove = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($id);
 
 				//remove tkt relationships.
 				$related_tickets = $dtt_to_remove->get_many_related('Ticket');
-				foreach ( $related_tickets as $tkt ) {
+				foreach ($related_tickets as $tkt) {
 					$dtt_to_remove->_remove_relation_to($tkt, 'Ticket');
 				}
 
-				$evt_obj->_remove_relation_to( $id, 'Datetime' );
+				$evt_obj->_remove_relation_to($id, 'Datetime');
 				$dtt_to_remove->refresh_cache_of_related_objects();
 
 			}
@@ -312,86 +312,86 @@ 
 	 * @param  array            $data       incoming request data
 	 * @return EE_Ticket[]
 	 */
-	protected function _update_tkts( $evtobj, $saved_dtts, $data ) {
+	protected function _update_tkts($evtobj, $saved_dtts, $data) {
 
 		$new_tkt = null;
 		$new_default = null;
 		//stripslashes because WP filtered the $_POST ($data) array to add slashes
 		$data = stripslashes_deep($data);
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_tickets = $dtts_on_existing = array();
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array();
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
 
 		//load money helper
-		EE_Registry::instance()->load_helper( 'Money' );
+		EE_Registry::instance()->load_helper('Money');
 
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
+		foreach ($data['edit_tickets'] as $row => $tkt) {
 
 			$update_prices = $create_new_TKT = FALSE;
 
 			//figure out what dtts were added to the ticket and what dtts were removed from the ticket in the session.
 
-			$starting_tkt_dtt_rows = explode(',',$data['starting_ticket_datetime_rows'][$row]);
-			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row] );
+			$starting_tkt_dtt_rows = explode(',', $data['starting_ticket_datetime_rows'][$row]);
+			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row]);
 			$dtts_added = array_diff($tkt_dtt_rows, $starting_tkt_dtt_rows);
 			$dtts_removed = array_diff($starting_tkt_dtt_rows, $tkt_dtt_rows);
 
 			// trim inputs to ensure any excess whitespace is removed.
 			$tkt = array_map(
-				function( $ticket_data ) {
-					return is_array( $ticket_data ) ? $ticket_data : trim( $ticket_data );
+				function($ticket_data) {
+					return is_array($ticket_data) ? $ticket_data : trim($ticket_data);
 				},
 				$tkt
 			);
 
 			//note we are doing conversions to floats here instead of allowing EE_Money_Field to handle because we're doing calcs prior to using the models.
 			//note incoming ['TKT_price'] value is already in standard notation (via js).
-			$ticket_price = isset( $tkt['TKT_price'] ) ?  round ( (float) $tkt['TKT_price'], 3 ) : 0;
+			$ticket_price = isset($tkt['TKT_price']) ? round((float) $tkt['TKT_price'], 3) : 0;
 
 			//note incoming base price needs converted from localized value.
-			$base_price = isset( $tkt['TKT_base_price'] ) ? EEH_Money::convert_to_float_from_localized_money( $tkt['TKT_base_price'] ) : 0;
+			$base_price = isset($tkt['TKT_base_price']) ? EEH_Money::convert_to_float_from_localized_money($tkt['TKT_base_price']) : 0;
 			//if ticket price == 0 and $base_price != 0 then ticket price == base_price
 			$ticket_price = $ticket_price === 0 && $base_price !== 0 ? $base_price : $ticket_price;
-			$base_price_id = isset( $tkt['TKT_base_price_ID'] ) ? $tkt['TKT_base_price_ID'] : 0;
+			$base_price_id = isset($tkt['TKT_base_price_ID']) ? $tkt['TKT_base_price_ID'] : 0;
 
 			$price_rows = is_array($data['edit_prices']) && isset($data['edit_prices'][$row]) ? $data['edit_prices'][$row] : array();
 
 			$now = null;
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			if (empty($tkt['TKT_start_date'])) {
 				//lets' use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			}
 
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				/**
 				 * set the TKT_end_date to the first datetime attached to the ticket.
 				 */
-				$first_dtt = $saved_dtts[reset( $tkt_dtt_rows )];
-				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time( $this->_date_format_strings['date'] . ' ' . $this->_date_format_string['time'] );
+				$first_dtt = $saved_dtts[reset($tkt_dtt_rows)];
+				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time($this->_date_format_strings['date'].' '.$this->_date_format_string['time']);
 			}
 
 			$TKT_values = array(
-				'TKT_ID' 			=> ! empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : NULL,
-				'TTM_ID' 			=> ! empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name' 			=> ! empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' 	=> ! empty( $tkt['TKT_description'] ) && $tkt['TKT_description'] != __('You can modify this description', 'event_espresso') ? $tkt['TKT_description'] : '',
+				'TKT_ID' 			=> ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : NULL,
+				'TTM_ID' 			=> ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name' 			=> ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' 	=> ! empty($tkt['TKT_description']) && $tkt['TKT_description'] != __('You can modify this description', 'event_espresso') ? $tkt['TKT_description'] : '',
 				'TKT_start_date' 	=> $tkt['TKT_start_date'],
 				'TKT_end_date' 		=> $tkt['TKT_end_date'],
-				'TKT_qty' 			=> ! isset( $tkt[ 'TKT_qty' ] ) || $tkt[ 'TKT_qty' ] === '' ? EE_INF : $tkt[ 'TKT_qty' ],
-				'TKT_uses' 			=> ! isset( $tkt[ 'TKT_uses' ] ) || $tkt[ 'TKT_uses' ] === '' ? EE_INF : $tkt['TKT_uses'],
-				'TKT_min' 			=> empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max' 			=> empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty' 			=> ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses' 			=> ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min' 			=> empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max' 			=> empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row' 			=> $row,
-				'TKT_order' 		=> isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : 0,
-				'TKT_taxable' 		=> ! empty( $tkt['TKT_taxable'] ) ? 1 : 0,
-				'TKT_required' 		=> ! empty( $tkt['TKT_required'] ) ? 1 : 0,
+				'TKT_order' 		=> isset($tkt['TKT_order']) ? $tkt['TKT_order'] : 0,
+				'TKT_taxable' 		=> ! empty($tkt['TKT_taxable']) ? 1 : 0,
+				'TKT_required' 		=> ! empty($tkt['TKT_required']) ? 1 : 0,
 				'TKT_price' 		=> $ticket_price
 			);
 
 
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$update_prices = TRUE;
@@ -403,21 +403,21 @@ 
 			// but DID have it's items modified.
 			// keep in mind that if the TKT has been sold (and we have changed pricing information),
 			// then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
-			if ( absint( $TKT_values['TKT_ID'] ) ) {
-				$TKT = EE_Registry::instance()->load_model( 'Ticket', array( $timezone ) )->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
+			if (absint($TKT_values['TKT_ID'])) {
+				$TKT = EE_Registry::instance()->load_model('Ticket', array($timezone))->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
 
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					// are there any registrations using this ticket ?
 					$tickets_sold = $TKT->count_related(
 						'Registration',
-						array( array(
-								'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) )
-						) )
+						array(array(
+								'STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))
+						))
 					);
 					//set ticket formats
-					$TKT->set_date_format( $this->_date_format_strings['date'] );
-					$TKT->set_time_format( $this->_date_format_strings['time'] );
+					$TKT->set_date_format($this->_date_format_strings['date']);
+					$TKT->set_time_format($this->_date_format_strings['time']);
 
 					// let's just check the total price for the existing ticket
 					// and determine if it matches the new total price.
@@ -427,17 +427,17 @@ 
 							? TRUE : FALSE;
 
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field === 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field === 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
-						$new_tkt = $this->_duplicate_ticket( $TKT, $price_rows, $ticket_price, $base_price, $base_price_id );
+					if ($create_new_TKT) {
+						$new_tkt = $this->_duplicate_ticket($TKT, $price_rows, $ticket_price, $base_price, $base_price_id);
 					}
 				}
 
@@ -446,12 +446,12 @@ 
 				$TKT = EE_Ticket::new_instance(
 					$TKT_values,
 					$timezone,
-					array( $this->_date_format_strings[ 'date' ], $this->_date_format_strings[ 'time' ]  )
+					array($this->_date_format_strings['date'], $this->_date_format_strings['time'])
 				);
-				if ( $TKT instanceof EE_Ticket ) {
+				if ($TKT instanceof EE_Ticket) {
 					// make sure ticket has an ID of setting relations won't work
 					$TKT->save();
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					$update_prices = TRUE;
 				}
 			}
@@ -459,38 +459,38 @@ 
 			//$TKT->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date') ) {
-				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date') );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 			}
 
 			//let's make sure the base price is handled
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( array(), $TKT, $update_prices, $base_price, $base_price_id ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket(array(), $TKT, $update_prices, $base_price, $base_price_id) : $TKT;
 
 			//add/update price_modifiers
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( $price_rows, $TKT, $update_prices ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket($price_rows, $TKT, $update_prices) : $TKT;
 
 			//need to make sue that the TKT_price is accurate after saving the prices.
 			$TKT->ensure_TKT_Price_correct();
 
 			//handle CREATING a default tkt from the incoming tkt but ONLY if this isn't an autosave.
-			if ( ! defined('DOING_AUTOSAVE' ) ) {
-				if ( !empty($tkt['TKT_is_default_selector'] ) ) {
+			if ( ! defined('DOING_AUTOSAVE')) {
+				if ( ! empty($tkt['TKT_is_default_selector'])) {
 					$update_prices = TRUE;
 					$new_default = clone $TKT;
-					$new_default->set( 'TKT_ID', 0 );
-					$new_default->set( 'TKT_is_default', 1 );
-					$new_default->set( 'TKT_row', 1 );
-					$new_default->set( 'TKT_price', $ticket_price );
+					$new_default->set('TKT_ID', 0);
+					$new_default->set('TKT_is_default', 1);
+					$new_default->set('TKT_row', 1);
+					$new_default->set('TKT_price', $ticket_price);
 					//remove any dtt relations cause we DON'T want dtt relations attached (note this is just removing the cached relations in the object)
 					$new_default->_remove_relations('Datetime');
 					//todo we need to add the current attached prices as new prices to the new default ticket.
-					$new_default = $this->_add_prices_to_ticket( $price_rows, $new_default, $update_prices );
+					$new_default = $this->_add_prices_to_ticket($price_rows, $new_default, $update_prices);
 					//don't forget the base price!
-					$new_default = $this->_add_prices_to_ticket( array(), $new_default, $update_prices, $base_price, $base_price_id );
+					$new_default = $this->_add_prices_to_ticket(array(), $new_default, $update_prices, $base_price, $base_price_id);
 					$new_default->save();
-					do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data );
+					do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data);
 				}
 			}
 
@@ -501,19 +501,19 @@ 
 			//let's assign any tickets that have been setup to the saved_tickets tracker
 			//save existing TKT
 			$TKT->save();
-			if ( $create_new_TKT && $new_tkt instanceof EE_Ticket ) {
+			if ($create_new_TKT && $new_tkt instanceof EE_Ticket) {
 				//save new TKT
 				$new_tkt->save();
 				//add new ticket to array
-				$saved_tickets[ $new_tkt->ID() ] = $new_tkt;
+				$saved_tickets[$new_tkt->ID()] = $new_tkt;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data);
 
 			} else {
 				//add tkt to saved tkts
-				$saved_tickets[ $TKT->ID() ] = $TKT;
+				$saved_tickets[$TKT->ID()] = $TKT;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data);
 			}
 
 		}
@@ -523,22 +523,22 @@ 
 		// (i.e. autosaves are happening and then in between autosaves the user trashes a ticket).
 		// Or a draft event was saved and in the process of editing a ticket is trashed.
 		// No sense in keeping all the related data in the db!
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys($saved_tickets) );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
 
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 
 			//get the ticket for this id
 			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
 
 			//if this tkt is a default tkt we leave it alone cause it won't be attached to the datetime
-			if ( $tkt_to_remove->get('TKT_is_default') )
+			if ($tkt_to_remove->get('TKT_is_default'))
 				continue;
 
 			// if this tkt has any registrations attached so then we just ARCHIVE
 			// because we don't actually permanently delete these tickets.
-			if ( $tkt_to_remove->count_related('Registration') > 0 ) {
+			if ($tkt_to_remove->count_related('Registration') > 0) {
 				$tkt_to_remove->delete();
 				continue;
 			}
@@ -547,7 +547,7 @@ 
 			// (remember this process can ONLY kick off if there are NO tkts_sold)
 			$dtts = $tkt_to_remove->get_many_related('Datetime');
 
-			foreach( $dtts as $dtt ) {
+			foreach ($dtts as $dtt) {
 				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 
@@ -555,7 +555,7 @@ 
 			// tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
 			$tkt_to_remove->delete_related_permanently('Price');
 
-			do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove );
+			do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove);
 
 			// finally let's delete this ticket
 			// (which should not be blocked at this point b/c we've removed all our relationships)
@@ -587,39 +587,39 @@ 
 		// and removing the ticket from datetimes it got removed from.
 
 		// first let's add datetimes
-		if ( ! empty( $added_datetimes ) && is_array( $added_datetimes ) ) {
-			foreach ( $added_datetimes as $row_id ) {
-				$row_id = (int)$row_id;
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_add_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+		if ( ! empty($added_datetimes) && is_array($added_datetimes)) {
+			foreach ($added_datetimes as $row_id) {
+				$row_id = (int) $row_id;
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_add_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to add that to the DTT sold because this DTT is getting added.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->increase_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->increase_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// then remove datetimes
-		if ( ! empty( $removed_datetimes ) && is_array( $removed_datetimes ) ) {
-			foreach ( $removed_datetimes as $row_id ) {
-				$row_id = (int)$row_id;
+		if ( ! empty($removed_datetimes) && is_array($removed_datetimes)) {
+			foreach ($removed_datetimes as $row_id) {
+				$row_id = (int) $row_id;
 				// its entirely possible that a datetime got deleted (instead of just removed from relationship.
 				// So make sure we skip over this if the dtt isn't in the $saved_datetimes array)
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_remove_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_remove_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to remove it's sold from the DTT_sold.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->decrease_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->decrease_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// cap ticket qty by datetime reg limits
-		$ticket->set_qty( min( $ticket->qty(), $ticket->qty( 'reg_limit' ) ) );
+		$ticket->set_qty(min($ticket->qty(), $ticket->qty('reg_limit')));
 		return $ticket;
 	}
 
@@ -640,39 +640,39 @@ 
 		EE_Ticket $ticket,
 		$price_rows = array(),
 		$ticket_price = 0,
-		$base_price = 0 ,
+		$base_price = 0,
 		$base_price_id = 0
 	) {
 
 		// create new ticket that's a copy of the existing
 		// except a new id of course (and not archived)
 		// AND has the new TKT_price associated with it.
-		$new_ticket = clone( $ticket );
-		$new_ticket->set( 'TKT_ID', 0 );
-		$new_ticket->set( 'TKT_deleted', 0 );
-		$new_ticket->set( 'TKT_price', $ticket_price );
-		$new_ticket->set( 'TKT_sold', 0 );
+		$new_ticket = clone($ticket);
+		$new_ticket->set('TKT_ID', 0);
+		$new_ticket->set('TKT_deleted', 0);
+		$new_ticket->set('TKT_price', $ticket_price);
+		$new_ticket->set('TKT_sold', 0);
 		// let's get a new ID for this ticket
 		$new_ticket->save();
 		// we also need to make sure this new ticket gets the same datetime attachments as the archived ticket
-		$datetimes_on_existing = $ticket->get_many_related( 'Datetime' );
+		$datetimes_on_existing = $ticket->get_many_related('Datetime');
 		$new_ticket = $this->_update_ticket_datetimes(
 			$new_ticket,
 			$datetimes_on_existing,
-			array_keys( $datetimes_on_existing )
+			array_keys($datetimes_on_existing)
 		);
 
 		// $ticket will get archived later b/c we are NOT adding it to the saved_tickets array.
 		// if existing $ticket has sold amount, then we need to adjust the qty for the new TKT to = the remaining
 		// available.
-		if ( $ticket->sold() > 0 ) {
+		if ($ticket->sold() > 0) {
 			$new_qty = $ticket->qty() - $ticket->sold();
-			$new_ticket->set_qty( $new_qty );
+			$new_ticket->set_qty($new_qty);
 		}
 		//now we update the prices just for this ticket
-		$new_ticket = $this->_add_prices_to_ticket( $price_rows, $new_ticket, true );
+		$new_ticket = $this->_add_prices_to_ticket($price_rows, $new_ticket, true);
 		//and we update the base price
-		$new_ticket = $this->_add_prices_to_ticket( array(), $new_ticket, true, $base_price, $base_price_id );
+		$new_ticket = $this->_add_prices_to_ticket(array(), $new_ticket, true, $base_price, $base_price_id);
 		return $new_ticket;
 	}
 
@@ -692,7 +692,7 @@ 
 	 * @param int|bool 		$base_price_id  if present then this is the base_price_id being updated.
 	 * @return EE_Ticket
 	 */
-	protected function  _add_prices_to_ticket( $prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE ) {
+	protected function  _add_prices_to_ticket($prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE) {
 
 		//let's just get any current prices that may exist on the given ticket so we can remove any prices that got trashed in this session.
 		$current_prices_on_ticket = $base_price !== FALSE ? $ticket->base_price(TRUE) : $ticket->price_modifiers();
@@ -700,7 +700,7 @@ 
 		$updated_prices = array();
 
 		// if $base_price ! FALSE then updating a base price.
-		if ( $base_price !== FALSE ) {
+		if ($base_price !== FALSE) {
 			$prices[1] = array(
 				'PRC_ID' => $new_prices || $base_price_id === 1 ? NULL : $base_price_id,
 				'PRT_ID' => 1,
@@ -711,47 +711,47 @@ 
 		}
 
 		//possibly need to save tkt
-		if ( ! $ticket->ID() )
+		if ( ! $ticket->ID())
 			$ticket->save();
 
-		foreach ( $prices as $row => $prc ) {
-			$prt_id = !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL;
-			if ( empty($prt_id) )
+		foreach ($prices as $row => $prc) {
+			$prt_id = ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL;
+			if (empty($prt_id))
 				continue; //prices MUST have a price type id.
 			$PRC_values = array(
-				'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL,
+				'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL,
 				'PRT_ID' => $prt_id,
-				'PRC_amount' => !empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name' => !empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc' => !empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_amount' => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name' => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc' => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => false, //make sure we set PRC_is_default to false for all ticket saves from event_editor
 				'PRC_order' => $row
 				);
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class('Price', array( $PRC_values ), FALSE, FALSE);
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), FALSE, FALSE);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 			}
 			$PRC->save();
 			$prcid = $PRC->ID();
 			$updated_prices[$prcid] = $PRC;
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 
 		//now let's remove any prices that got removed from the ticket
-		if ( !empty ( $current_prices_on_ticket ) ) {
+		if ( ! empty ($current_prices_on_ticket)) {
 			$current = array_keys($current_prices_on_ticket);
 			$updated = array_keys($updated_prices);
 			$prices_to_remove = array_diff($current, $updated);
-			if ( !empty( $prices_to_remove ) ) {
-				foreach ( $prices_to_remove as $prc_id ) {
+			if ( ! empty($prices_to_remove)) {
+				foreach ($prices_to_remove as $prc_id) {
 					$p = $current_prices_on_ticket[$prc_id];
-					$ticket->_remove_relation_to( $p, 'Price' );
+					$ticket->_remove_relation_to($p, 'Price');
 
 					//delete permanently the price
 					$p->delete_permanently();
@@ -764,7 +764,7 @@ 
 
 
 
-	public function autosave_handling( $event_admin_obj ) {
+	public function autosave_handling($event_admin_obj) {
 		return $event_admin_obj; //doing nothing for the moment.
 		//todo when I get to this remember that I need to set the template args on the $event_admin_obj (use the set_template_args() method)
 
@@ -798,12 +798,12 @@ 
 
 		//default main template args
 		$main_template_args = array(
-			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
+			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
 			'existing_datetime_ids' => '',
 			'total_dtt_rows' => 1,
-			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'datetime_rows' => '',
-			'show_tickets_container' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
+			'show_tickets_container' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
 			'ticket_rows' => '',
 			'existing_ticket_ids' => '',
 			'total_ticket_rows' => 1,
@@ -813,7 +813,7 @@ 
 
 		$timezone = $evtobj instanceof EE_Event ? $evtobj->timezone_string() : NULL;
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		/**
 		 * 1. Start with retrieving Datetimes
@@ -821,25 +821,25 @@ 
 		 * 3. For each ticket get related prices
 		 */
 
-		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone) );
-		$times = $DTM->get_all_event_dates( $evtID );
+		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone));
+		$times = $DTM->get_all_event_dates($evtID);
 
 
 
 		$main_template_args['total_dtt_rows'] = count($times);
-		foreach ( $times as $time ) {
+		foreach ($times as $time) {
 			$dttid = $time->get('DTT_ID');
 			$dttrow = $time->get('DTT_order');
 			$existing_datetime_ids[] = $dttid;
 
 			//tickets attached
-			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array( array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC' ) ) ) : array();
+			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array(array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC'))) : array();
 
 			//if there are no related tickets this is likely a new event OR autodraft
 			// event so we need to generate the default tickets because dtts
 			// ALWAYS have at least one related ticket!!.  EXCEPT, we dont' do this if there is already more than one
 			// datetime on the event.
-			if ( empty ( $related_tickets ) && count( $times ) < 2 ) {
+			if (empty ($related_tickets) && count($times) < 2) {
 				$related_tickets = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
 			}
 
@@ -848,11 +848,11 @@ 
 
 			//loop through and setup the ticket rows and make sure the order is set.
 			$order = 0;
-			foreach ( $related_tickets as $ticket ) {
+			foreach ($related_tickets as $ticket) {
 				$tktid = $ticket->get('TKT_ID');
 				$tktrow = $ticket->get('TKT_row');
 				//we only want unique tickets in our final display!!
-				if ( !in_array( $tktid, $existing_ticket_ids ) ) {
+				if ( ! in_array($tktid, $existing_ticket_ids)) {
 					$existing_ticket_ids[] = $tktid;
 					$all_tickets[] = $ticket;
 				}
@@ -861,56 +861,56 @@ 
 				$datetime_tickets[$dttid][] = $tktrow;
 
 				//temporary cache of this datetime info for this ticket for later processing of ticket rows.
-				if ( !isset( $ticket_datetimes[$tktid] ) || ! in_array( $dttrow, $ticket_datetimes[$tktid] ) )
+				if ( ! isset($ticket_datetimes[$tktid]) || ! in_array($dttrow, $ticket_datetimes[$tktid]))
 					$ticket_datetimes[$tktid][] = $dttrow;
 			}
 		}
 
-		$main_template_args['total_ticket_rows'] = count( $existing_ticket_ids );
-		$main_template_args['existing_ticket_ids'] = implode( ',', $existing_ticket_ids );
-		$main_template_args['existing_datetime_ids'] = implode( ',', $existing_datetime_ids );
+		$main_template_args['total_ticket_rows'] = count($existing_ticket_ids);
+		$main_template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
+		$main_template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
 
 		//sort $all_tickets by order
-		usort( $all_tickets, function( $a, $b ) {
+		usort($all_tickets, function($a, $b) {
 			$a_order = (int) $a->get('TKT_order');
 			$b_order = (int) $b->get('TKT_order');
-			if ( $a_order == $b_order ) {
+			if ($a_order == $b_order) {
 				return 0;
 			}
-			return ( $a_order < $b_order ) ? -1 : 1;
+			return ($a_order < $b_order) ? -1 : 1;
 		});
 
 		//k NOW we have all the data we need for setting up the dtt rows and ticket rows so we start our dtt loop again.
 		$dttrow = 1;
-		foreach ( $times as $time ) {
-			$main_template_args['datetime_rows'] .= $this->_get_datetime_row( $dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times );
+		foreach ($times as $time) {
+			$main_template_args['datetime_rows'] .= $this->_get_datetime_row($dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times);
 			$dttrow++;
 		}
 
 		//then loop through all tickets for the ticket rows.
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$main_template_args['ticket_rows'] .= $this->_get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets );
+		foreach ($all_tickets as $ticket) {
+			$main_template_args['ticket_rows'] .= $this->_get_ticket_row($tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets);
 			$tktrow++;
 		}
 
 		$main_template_args['ticket_js_structure'] = $this->_get_ticket_js_structure($times, $all_tickets);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php';
-		EEH_Template::display_template( $template, $main_template_args );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_metabox_main.template.php';
+		EEH_Template::display_template($template, $main_template_args);
 		return;
 	}
 
 
 
-	protected function _get_datetime_row( $dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array() ) {
+	protected function _get_datetime_row($dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array()) {
 
 		$dtt_display_template_args = array(
-			'dtt_edit_row' => $this->_get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ),
-			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ),
+			'dtt_edit_row' => $this->_get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts),
+			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default),
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_row_wrapper.template.php';
-		return EEH_Template::display_template( $template, $dtt_display_template_args, TRUE);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_row_wrapper.template.php';
+		return EEH_Template::display_template($template, $dtt_display_template_args, TRUE);
 	}
 
 
@@ -928,7 +928,7 @@ 
 	 *
 	 * @return string Generated edit row.
 	 */
-	protected function _get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ) {
+	protected function _get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts) {
 
 		// if the incomign $dtt object is NOT an instance of EE_Datetime then force default to true.
 		$default = ! $dtt instanceof EE_Datetime ? true : false;
@@ -936,30 +936,30 @@ 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
 			'event_datetimes_name' => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
-			'edit_dtt_expanded' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
+			'edit_dtt_expanded' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
 			'DTT_ID' => $default ? '' : $dtt->ID(),
 			'DTT_name' => $default ? '' : $dtt->name(),
 			'DTT_description' => $default ? '' : $dtt->description(),
-			'DTT_EVT_start' => $default ? '' : $dtt->start_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_EVT_end' => $default ? '' : $dtt->end_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit','input'),
+			'DTT_EVT_start' => $default ? '' : $dtt->start_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_EVT_end' => $default ? '' : $dtt->end_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit', 'input'),
 			'DTT_order' => $default ? 'DTTNUM' : $dttrow,
 			'dtt_sold' => $default ? '0' : $dtt->get('DTT_sold'),
-			'clone_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
-			'trash_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0  ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable'
+			'clone_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
+			'trash_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable'
 			);
 
-		$template_args['show_trash'] = count( $all_dtts ) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['show_trash'] = count($all_dtts) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//allow filtering of template args at this point.
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_edit_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_edit_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ) {
+	protected function _get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default) {
 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
@@ -967,47 +967,47 @@ 
 			'DTT_description' => $default ? '' : $dtt->description(),
 			'datetime_tickets_list' => $default ? '<li class="hidden"></li>' : '',
 			'show_tickets_row' => ' style="display:none;"', //$default || $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? ' style="display:none;"' : '',
-			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'DTT_ID' => $default ? '' : $dtt->ID()
 			);
 
 		//need to setup the list items (but only if this isnt' a default skeleton setup)
-		if ( !$default ) {
+		if ( ! $default) {
 			$tktrow = 1;
-			foreach ( $all_tickets as $ticket ) {
-				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default );
+			foreach ($all_tickets as $ticket) {
+				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default);
 				$tktrow++;
 			}
 		}
 
 		//filter template args at this point
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_attached_tickets_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_attached_tickets_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default ) {
-		$tktid = !empty( $ticket ) ? $ticket->ID() : 0;
-		$dtt_tkts = $dtt instanceof EE_Datetime && isset( $datetime_tickets[$dtt->ID()] ) ? $datetime_tickets[$dtt->ID()] : array();
+	protected function _get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default) {
+		$tktid = ! empty($ticket) ? $ticket->ID() : 0;
+		$dtt_tkts = $dtt instanceof EE_Datetime && isset($datetime_tickets[$dtt->ID()]) ? $datetime_tickets[$dtt->ID()] : array();
 
-		$displayrow = !empty( $ticket ) ? $ticket->get('TKT_row') : 0;
+		$displayrow = ! empty($ticket) ? $ticket->get('TKT_row') : 0;
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
-			'tkt_row' => $default && empty( $ticket ) ? 'TICKETNUM' : $tktrow,
+			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'datetime_ticket_checked' => in_array($displayrow, $dtt_tkts) ? ' checked="checked"' : '',
 			'ticket_selected' => in_array($displayrow, $dtt_tkts) ? ' ticket-selected' : '',
-			'TKT_name' => $default && empty( $ticket ) ? 'TKTNAME' : $ticket->get('TKT_name'),
-			'tkt_status_class' => ( $default && empty( $ticket ) ) || $this->_is_creating_event ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status(),
+			'TKT_name' => $default && empty($ticket) ? 'TKTNAME' : $ticket->get('TKT_name'),
+			'tkt_status_class' => ($default && empty($ticket)) || $this->_is_creating_event ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status(),
 			);
 
 		//filter template args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_dtt_tickets_list.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_dtt_tickets_list.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1029,32 +1029,32 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	protected function _get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array() ) {
+	protected function _get_ticket_row($tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array()) {
 
 		//if $ticket is not an instance of EE_Ticket then force default to true.
-		$default =  ! $ticket instanceof EE_Ticket ? true : false;
+		$default = ! $ticket instanceof EE_Ticket ? true : false;
 
 
-		$prices = !empty($ticket) && !$default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC') ) ) : array();
+		$prices = ! empty($ticket) && ! $default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC'))) : array();
 
 		// check if we're dealing with a default ticket in which case we don't want any starting_ticket_datetime_row values set (otherwise there won't be any new relationships created for tickets based off of the default ticket).  This will future proof in case there is ever any behaviour change between what the primary_key defaults to.
-		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default') ) ? TRUE : FALSE;
+		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default')) ? TRUE : FALSE;
 
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 
 		$ticket_subtotal = $default ? 0 : $ticket->get_ticket_subtotal();
-		$base_price = $default ? NULL :  $ticket->base_price();
+		$base_price = $default ? NULL : $ticket->base_price();
 		$count_price_mods = EEM_Price::instance()->get_all_default_prices(TRUE);
 
 		//breaking out complicated condition for ticket_status
-		if ( $default ) {
-			$ticket_status_class = ' tkt-status-' . EE_Ticket::onsale;
+		if ($default) {
+			$ticket_status_class = ' tkt-status-'.EE_Ticket::onsale;
 		} else {
-			$ticket_status_class =  $ticket->is_default() ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status();
+			$ticket_status_class = $ticket->is_default() ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status();
 		}
 
 		//breaking out complicated condition for TKT_taxable
-		if ( $default ) {
+		if ($default) {
 			$TKT_taxable = '';
 		} else {
 			$TKT_taxable = $ticket->get('TKT_taxable') ? ' checked="checked"' : '';
@@ -1069,19 +1069,19 @@ 
 			'edit_tkt_expanded' => '',
 			'edit_tickets_name' => $default ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_name' => $default ? '' : $ticket->get('TKT_name'),
-			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time']  ),
-			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status( EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
+			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
 			'TKT_price' => $default ? '' : EEH_Template::format_currency($ticket->get_ticket_total_with_taxes(), FALSE, FALSE),
 			'TKT_price_code' => EE_Registry::instance()->CFG->currency->code,
 			'TKT_price_amount' => $default ? 0 : $ticket_subtotal,
-			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty','symbol'),
-			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty','input'),
-			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses','input'),
-			'TKT_min' => $default ? '' : ( $ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min') ),
-			'TKT_max' => $default ? '' :  $ticket->get_pretty('TKT_max','input'),
+			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty', 'symbol'),
+			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty', 'input'),
+			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses', 'input'),
+			'TKT_min' => $default ? '' : ($ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min')),
+			'TKT_max' => $default ? '' : $ticket->get_pretty('TKT_max', 'input'),
 			'TKT_sold' => $default ? 0 : $ticket->tickets_sold('ticket'),
-			'TKT_registrations' => $default ? 0 : $ticket->count_registrations( array( array( 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) ) ) ),
+			'TKT_registrations' => $default ? 0 : $ticket->count_registrations(array(array('STS_ID' => array('!=', EEM_Registration::status_id_incomplete)))),
 			'TKT_ID' => $default ? 0 : $ticket->get('TKT_ID'),
 			'TKT_description' => $default ? '' : $ticket->get('TKT_description'),
 			'TKT_is_default' => $default ? 0 : $ticket->get('TKT_is_default'),
@@ -1090,99 +1090,99 @@ 
 			'ticket_price_rows' => '',
 			'TKT_base_price' => $default || ! $base_price instanceof EE_Price ? '' : $base_price->get_pretty('PRC_amount', 'localized_float'),
 			'TKT_base_price_ID' => $default || ! $base_price instanceof EE_Price ? 0 : $base_price->ID(),
-			'show_price_modifier' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) ? '' : ' style="display:none;"',
-			'show_price_mod_button' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) || ( !$default && $ticket->get('TKT_deleted') ) ? ' style="display:none;"' : '',
+			'show_price_modifier' => count($prices) > 1 || ($default && $count_price_mods > 0) ? '' : ' style="display:none;"',
+			'show_price_mod_button' => count($prices) > 1 || ($default && $count_price_mods > 0) || ( ! $default && $ticket->get('TKT_deleted')) ? ' style="display:none;"' : '',
 			'total_price_rows' => count($prices) > 1 ? count($prices) : 1,
 			'ticket_datetimes_list' => $default ? '<li class="hidden"></li>' : '',
 			'starting_ticket_datetime_rows' => $default || $default_dtt ? '' : implode(',', $tkt_dtts),
 			'ticket_datetime_rows' => $default ? '' : implode(',', $tkt_dtts),
-			'existing_ticket_price_ids' => $default, '', implode(',', array_keys( $prices) ),
+			'existing_ticket_price_ids' => $default, '', implode(',', array_keys($prices)),
 			'ticket_template_id' => $default ? 0 : $ticket->get('TTM_ID'),
 			'TKT_taxable' => $TKT_taxable,
 			'display_subtotal' => $ticket instanceof EE_Ticket && $ticket->get('TKT_taxable') ? '' : ' style="display:none"',
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE ),
+			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE),
 			'TKT_subtotal_amount' => $ticket_subtotal,
-			'tax_rows' => $this->_get_tax_rows( $tktrow, $ticket ),
-			'disabled' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? TRUE: FALSE,
+			'tax_rows' => $this->_get_tax_rows($tktrow, $ticket),
+			'disabled' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? TRUE : FALSE,
 			'ticket_archive_class' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? ' ticket-archived' : '',
 			'trash_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? 'ee-lock-icon ' : 'trash-icon dashicons dashicons-post-trash clickable',
 			'clone_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? '' : 'clone-icon ee-icon ee-icon-clone clickable'
 			);
 
-		$template_args['trash_hidden'] = count( $all_tickets ) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['trash_hidden'] = count($all_tickets) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
-			$template_args['TKT_start_date'] = date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , current_time('timestamp'));
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['TKT_start_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], current_time('timestamp'));
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 
 			//get the earliest datetime (if present);
-			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
+			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC'))) : NULL;
 
-			if ( !empty( $earliest_dtt ) ) {
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+			if ( ! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			} else {
 				//default so let's just use what's been set for the default date-time which is 30 days from now.
-				$template_args['TKT_end_date'] = date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , mktime(24, 0, 0, date("m"), date("d") + 29, date("Y") )  );
+				$template_args['TKT_end_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], mktime(24, 0, 0, date("m"), date("d") + 29, date("Y")));
 			}
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
 		//generate ticket_datetime items
-		if ( ! $default ) {
+		if ( ! $default) {
 			$dttrow = 1;
-			foreach ( $all_dtts as $dtt ) {
-				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default );
+			foreach ($all_dtts as $dtt) {
+				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default);
 				$dttrow++;
 			}
 		}
 
 		$prcrow = 1;
-		foreach ( $prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($prices as $price) {
+			if ($price->is_base_price()) {
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $prices ) > 1 && $prcrow === 1 ) || count( $prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $prices ) > 1 && count( $prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create );
+			$show_trash = (count($prices) > 1 && $prcrow === 1) || count($prices) === 1 ? FALSE : TRUE;
+			$show_create = count($prices) > 1 && count($prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create);
 			$prcrow++;
 		}
 
 		//filter $template_args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
 
 
-	protected function _get_tax_rows( $tktrow, $ticket ) {
+	protected function _get_tax_rows($tktrow, $ticket) {
 		$tax_rows = '';
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_tax_row.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_tax_row.template.php';
 		$template_args = array();
-		$taxes = empty( $ticket ) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
-		foreach ( $taxes as $tax ) {
-			$tax_added = $this->_get_tax_added( $tax, $ticket );
+		$taxes = empty($ticket) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
+		foreach ($taxes as $tax) {
+			$tax_added = $this->_get_tax_added($tax, $ticket);
 			$template_args = array(
-				'display_tax' => !empty( $ticket ) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
+				'display_tax' => ! empty($ticket) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
 				'tax_id' => $tax->ID(),
 				'tkt_row' => $tktrow,
 				'tax_label' => $tax->get('PRC_name'),
 				'tax_added' => $tax_added,
-				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE ),
+				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE),
 				'tax_amount' => $tax->get('PRC_amount')
 				);
-			$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event  );
-			$tax_rows .= EEH_Template::display_template( $template, $template_args, TRUE );
+			$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event);
+			$tax_rows .= EEH_Template::display_template($template, $template_args, TRUE);
 		}
 
 
@@ -1190,81 +1190,81 @@ 
 	}
 
 
-	protected function _get_tax_added( EE_Price $tax, $ticket ) {
-		$subtotal = empty( $ticket ) ? 0 : $ticket->get_ticket_subtotal();
+	protected function _get_tax_added(EE_Price $tax, $ticket) {
+		$subtotal = empty($ticket) ? 0 : $ticket->get_ticket_subtotal();
 		return $subtotal * $tax->get('PRC_amount') / 100;
 	}
 
 
 
 
-	protected function _get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE ) {
-		$send_disabled = !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
+	protected function _get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE) {
+		$send_disabled = ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
 		$template_args = array(
 			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
 			'edit_prices_name' => $default && empty($price) ? 'PRICENAMEATTR' : 'edit_prices',
-			'price_type_selector' => $default && empty( $price ) ? $this->_get_base_price_template( $tktrow, $prcrow, $price, $default ) : $this->_get_price_type_selector( $tktrow, $prcrow, $price, $default, $send_disabled ),
+			'price_type_selector' => $default && empty($price) ? $this->_get_base_price_template($tktrow, $prcrow, $price, $default) : $this->_get_price_type_selector($tktrow, $prcrow, $price, $default, $send_disabled),
 			'PRC_ID' => $default && empty($price) ? 0 : $price->ID(),
 			'PRC_is_default' => $default && empty($price) ? 0 : $price->get('PRC_is_default'),
 			'PRC_name' => $default && empty($price) ? '' : $price->get('PRC_name'),
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
 			'show_plus_or_minus' => $default && empty($price) ? '' : ' style="display:none;"',
-			'show_plus' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
-			'show_minus' => $default && empty( $price ) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
-			'show_currency_symbol' => $default && empty( $price ) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : '' ),
-			'PRC_amount' => $default && empty( $price ) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
-			'show_percentage' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_percent() ? '' : ' style="display:none;"' ),
+			'show_plus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
+			'show_minus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
+			'show_currency_symbol' => $default && empty($price) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : ''),
+			'PRC_amount' => $default && empty($price) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
+			'show_percentage' => $default && empty($price) ? ' style="display:none;"' : ($price->is_percent() ? '' : ' style="display:none;"'),
 			'show_trash_icon' => $show_trash ? '' : ' style="display:none;"',
 			'show_create_button' => $show_create ? '' : ' style="display:none;"',
-			'PRC_desc' => $default && empty( $price ) ? '' : $price->get('PRC_desc'),
-			'disabled' => !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE
+			'PRC_desc' => $default && empty($price) ? '' : $price->get('PRC_desc'),
+			'disabled' => ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE
 			);
 
-	$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event );
+	$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_price_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_price_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_price_type_selector( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		if ( $price->is_base_price() ) {
-			return $this->_get_base_price_template( $tktrow, $prcrow, $price, $default );
+	protected function _get_price_type_selector($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		if ($price->is_base_price()) {
+			return $this->_get_base_price_template($tktrow, $prcrow, $price, $default);
 		} else {
-			return $this->_get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled );
+			return $this->_get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled);
 		}
 
 	}
 
 
-	protected function _get_base_price_template( $tktrow, $prcrow, $price, $default ) {
+	protected function _get_base_price_template($tktrow, $prcrow, $price, $default) {
 		$template_args = array(
 				'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-				'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-				'PRT_ID' => $default && empty( $price ) ? 1 : $price->get('PRT_ID'),
+				'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+				'PRT_ID' => $default && empty($price) ? 1 : $price->get('PRT_ID'),
 				'PRT_name' => __('Price', 'event_espresso'),
 				'price_selected_operator' => '+',
 				'price_selected_is_percent' => 0
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_type_base.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_type_base.template.php';
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event);
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		$select_name = $default && empty( $price ) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices[' . $tktrow . '][' . $prcrow . '][PRT_ID]';
-		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array( array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3' ) ) ) );
-		$price_option_span_template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_option_span.template.php';
-		$all_price_types = $default && empty( $price ) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso')) ) : array();
-		$selected_price_type_id = $default && empty( $price ) ? 0 : $price->type();
+	protected function _get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		$select_name = $default && empty($price) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices['.$tktrow.']['.$prcrow.'][PRT_ID]';
+		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array(array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3'))));
+		$price_option_span_template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_option_span.template.php';
+		$all_price_types = $default && empty($price) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso'))) : array();
+		$selected_price_type_id = $default && empty($price) ? 0 : $price->type();
 		$price_option_spans = '';
 		//setup pricetypes for selector
-		foreach ( $price_types as $price_type ) {
+		foreach ($price_types as $price_type) {
 			$all_price_types[] = array(
 				'id' => $price_type->ID(),
 				'text' => $price_type->get('PRT_name'),
@@ -1276,50 +1276,50 @@ 
 				'PRT_operator' => $price_type->is_discount() ? '-' : '+',
 				'PRT_is_percent' => $price_type->get('PRT_is_percent') ? 1 : 0
 				);
-			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE );
+			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE);
 		}
 
-		$select_params = $disabled ? 'style="width:auto;" disabled'  : 'style="width:auto;"';
+		$select_params = $disabled ? 'style="width:auto;" disabled' : 'style="width:auto;"';
 		$main_name = $select_name;
-		$select_name = $disabled ? 'archive_price[' . $tktrow . '][' . $prcrow . '][PRT_ID]' : $main_name;
+		$select_name = $disabled ? 'archive_price['.$tktrow.']['.$prcrow.'][PRT_ID]' : $main_name;
 
 		$template_args = array(
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-			'price_modifier_selector' => EEH_Form_Fields::select_input( $select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID' ),
+			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+			'price_modifier_selector' => EEH_Form_Fields::select_input($select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID'),
 			'main_name' => $main_name,
 			'selected_price_type_id' => $selected_price_type_id,
 			'price_option_spans' => $price_option_spans,
-			'price_selected_operator' => $default && empty( $price ) ? '' : ( $price->is_discount() ? '-' : '+' ),
-			'price_selected_is_percent' => $default && empty( $price ) ? '' : ( $price->is_percent() ? 1 : 0 ),
+			'price_selected_operator' => $default && empty($price) ? '' : ($price->is_discount() ? '-' : '+'),
+			'price_selected_is_percent' => $default && empty($price) ? '' : ($price->is_percent() ? 1 : 0),
 			'disabled' => $disabled
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_modifier_selector.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_modifier_selector.template.php';
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default ) {
-		$dttid = !empty($dtt) ? $dtt->ID() : 0;
-		$displayrow = !empty($dtt) ? $dtt->get('DTT_order') : 0;
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+	protected function _get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default) {
+		$dttid = ! empty($dtt) ? $dtt->ID() : 0;
+		$displayrow = ! empty($dtt) ? $dtt->get('DTT_order') : 0;
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 		$template_args = array(
-			'dtt_row' => $default && empty( $dtt ) ? 'DTTNUM' : $dttrow,
+			'dtt_row' => $default && empty($dtt) ? 'DTTNUM' : $dttrow,
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'ticket_datetime_selected' => in_array( $displayrow, $tkt_dtts ) ? ' ticket-selected' : '',
-			'ticket_datetime_checked' => in_array( $displayrow, $tkt_dtts ) ? ' checked="checked"' : '',
-			'DTT_name' => $default && empty( $dtt ) ? 'DTTNAME' : $dtt->get_dtt_display_name( TRUE ),
+			'ticket_datetime_selected' => in_array($displayrow, $tkt_dtts) ? ' ticket-selected' : '',
+			'ticket_datetime_checked' => in_array($displayrow, $tkt_dtts) ? ' checked="checked"' : '',
+			'DTT_name' => $default && empty($dtt) ? 'DTTNAME' : $dtt->get_dtt_display_name(TRUE),
 			'tkt_status_class' => '',
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event );
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_datetimes_list_item.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_datetimes_list_item.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1327,53 +1327,53 @@ 
 	protected function _get_ticket_js_structure($all_dtts, $all_tickets) {
 		$template_args = array(
 			'default_datetime_edit_row' => $this->_get_dtt_edit_row('DTTNUM', NULL, TRUE, $all_dtts),
-			'default_ticket_row' => $this->_get_ticket_row( 'TICKETNUM', NULL, array(), array(), TRUE),
-			'default_price_row' => $this->_get_ticket_price_row( 'TICKETNUM', 'PRICENUM', NULL, TRUE, NULL ),
+			'default_ticket_row' => $this->_get_ticket_row('TICKETNUM', NULL, array(), array(), TRUE),
+			'default_price_row' => $this->_get_ticket_price_row('TICKETNUM', 'PRICENUM', NULL, TRUE, NULL),
 			'default_price_rows' => '',
 			'default_base_price_amount' => 0,
 			'default_base_price_name' => '',
 			'default_base_price_description' => '',
-			'default_price_modifier_selector_row' => $this->_get_price_modifier_template( 'TICKETNUM', 'PRICENUM', NULL, TRUE ),
-			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row( 'DTTNUM', NULL, array(), array(), TRUE ),
+			'default_price_modifier_selector_row' => $this->_get_price_modifier_template('TICKETNUM', 'PRICENUM', NULL, TRUE),
+			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row('DTTNUM', NULL, array(), array(), TRUE),
 			'existing_available_datetime_tickets_list' => '',
 			'existing_available_ticket_datetimes_list' => '',
-			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE ),
-			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE )
+			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE),
+			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE)
 			);
 
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( 'DTTNUM', $tktrow, NULL, $ticket, array(), TRUE );
+		foreach ($all_tickets as $ticket) {
+			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item('DTTNUM', $tktrow, NULL, $ticket, array(), TRUE);
 			$tktrow++;
 		}
 
 
 		$dttrow = 1;
-		foreach ( $all_dtts as $dtt ) {
-			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE );
+		foreach ($all_dtts as $dtt) {
+			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE);
 			$dttrow++;
 		}
 
 		$default_prices = EE_Registry::instance()->load_model('Price')->get_all_default_prices();
 		$prcrow = 1;
-		foreach ( $default_prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($default_prices as $price) {
+			if ($price->is_base_price()) {
 				$template_args['default_base_price_amount'] = $price->get_pretty('PRC_amount', 'localized_float');
 				$template_args['default_base_price_name'] = $price->get('PRC_name');
 				$template_args['default_base_price_description'] = $price->get('PRC_desc');
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $default_prices ) > 1 && $prcrow === 1 ) || count( $default_prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $default_prices ) > 1 && count( $default_prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['default_price_rows'] .= $this->_get_ticket_price_row( 'TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create );
+			$show_trash = (count($default_prices) > 1 && $prcrow === 1) || count($default_prices) === 1 ? FALSE : TRUE;
+			$show_create = count($default_prices) > 1 && count($default_prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['default_price_rows'] .= $this->_get_ticket_price_row('TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create);
 			$prcrow++;
 		}
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_js_structure.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_js_structure.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}