eventespresso / event-espresso-core

admin_pages/support/Support_Admin_Page.core.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,8 +30,8 @@ 
 class Support_Admin_Page extends EE_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -85,14 +85,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(
@@ -120,8 +120,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();
 	}
 
@@ -146,10 +146,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);
 		}
 	}
 
@@ -170,15 +170,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);
 		}
 	}
 
@@ -197,17 +197,17 @@ 
 			'important_information' => __('Important Information', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path, 'template_args' => $this->_template_args);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
 		}
 	}
 
 
 	protected function _developers() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true );
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'developers_admin_details.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true);
 		$this->display_admin_page_with_sidebar();
 	}
 

core/db_models/EEM_CPT_Base.model.php

Indentation +15 added lines, -15 removed lines

@@ -1,21 +1,21 @@
 <?php
 define('EE_Event_Category_Taxonomy','espresso_event_category');
 /**
- *
- * EEM_CPT_Base
- *
- * For shared functionality between models internally implemented
- * as Custom Post Types. Subclass of EEM_Soft_Delete_Base, meaning that when you 'delete' one of these model objects
- * we actually default ot just trashing it. (It works differently than EEM_Soft_Delete under the hood,because there's a post status field
- * instead of a soft-delete flag, but the functionality is the same)
- * Note: if you add a new subclass of EEM_CPT_Base, you should add it as a relation
- * on EEM_Term_Taxonomy and EEM_Term_Relationship
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Mike Nelson
- *
- */
+	 *
+	 * EEM_CPT_Base
+	 *
+	 * For shared functionality between models internally implemented
+	 * as Custom Post Types. Subclass of EEM_Soft_Delete_Base, meaning that when you 'delete' one of these model objects
+	 * we actually default ot just trashing it. (It works differently than EEM_Soft_Delete under the hood,because there's a post status field
+	 * instead of a soft-delete flag, but the functionality is the same)
+	 * Note: if you add a new subclass of EEM_CPT_Base, you should add it as a relation
+	 * on EEM_Term_Taxonomy and EEM_Term_Relationship
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Mike Nelson
+	 *
+	 */
 abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base{
 
 	/**

Spacing +89 added lines, -89 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define('EE_Event_Category_Taxonomy','espresso_event_category');
+define('EE_Event_Category_Taxonomy', 'espresso_event_category');
 /**
  *
  * EEM_CPT_Base
@@ -16,7 +16,7 @@ 
  * @author 				Mike Nelson
  *
  */
-abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base{
+abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base {
 
 	/**
 	 * @var string post_status_publish - the wp post status for published cpts
@@ -69,56 +69,56 @@ 
 	 * @param string $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
+	protected function __construct($timezone = NULL) {
 
 		//adds a relationship to Term_Taxonomy for all these models. For this to work
 		//Term_Relationship must have a relation to each model subclassing EE_CPT_Base explicitly
 		//eg, in EEM_Term_Relationship, inside the _model_relations array, there must be an entry
 		//with key equalling the subclassing model's model name (eg 'Event' or 'Venue'), and the value
 		//must also be new EE_HABTM_Relation('Term_Relationship');
-		$this->_model_relations['Term_Taxonomy'] =new EE_HABTM_Relation('Term_Relationship');
-		$this->_model_relations[ 'Post_Meta' ] = new EE_Has_Many_Relation( false );
+		$this->_model_relations['Term_Taxonomy'] = new EE_HABTM_Relation('Term_Relationship');
+		$this->_model_relations['Post_Meta'] = new EE_Has_Many_Relation(false);
 		$primary_table_name = NULL;
 		//add  the common _status field to all CPT primary tables.
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Primary_Table ) {
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Primary_Table) {
 				$primary_table_name = $alias;
 			}
 		}
 		//set default wp post statuses if child has not already set.
-		if ( ! isset( $this->_fields[$primary_table_name]['status'] )) {
+		if ( ! isset($this->_fields[$primary_table_name]['status'])) {
 			$this->_fields[$primary_table_name]['status'] = new EE_WP_Post_Status_Field('post_status', __("Event Status", "event_espresso"), false, 'draft');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['to_ping'])){
-			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __( 'To Ping', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['to_ping'])) {
+			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __('To Ping', 'event_espresso'), FALSE, '');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['pinged'])){
-			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __( 'Pinged', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['pinged'])) {
+			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __('Pinged', 'event_espresso'), FALSE, '');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['comment_status'])){
-			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso' ), FALSE, 'open');
+		if ( ! isset($this->_fields[$primary_table_name]['comment_status'])) {
+			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['ping_status'])){
+		if ( ! isset($this->_fields[$primary_table_name]['ping_status'])) {
 			$this->_fields[$primary_table_name]['ping_status'] = new EE_Plain_Text_Field('ping_status', __('Ping Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['post_content_filtered'])){
-			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __( 'Post Content Filtered', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['post_content_filtered'])) {
+			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __('Post Content Filtered', 'event_espresso'), FALSE, '');
 		}
-		if( ! isset( $this->_model_relations[ 'Post_Meta' ] ) ) {
+		if ( ! isset($this->_model_relations['Post_Meta'])) {
 			//don't block deletes though because we want to maintain the current behaviour
-			$this->_model_relations[ 'Post_Meta' ] = new EE_Has_Many_Relation( false );
+			$this->_model_relations['Post_Meta'] = new EE_Has_Many_Relation(false);
 		}
-		if( ! $this->_minimum_where_conditions_strategy instanceof EE_Default_Where_Conditions ){
+		if ( ! $this->_minimum_where_conditions_strategy instanceof EE_Default_Where_Conditions) {
 			//nothing was set during child constructor, so set default
-			$this->_minimum_where_conditions_strategy = new EE_CPT_Minimum_Where_Conditions( $this->post_type() );
+			$this->_minimum_where_conditions_strategy = new EE_CPT_Minimum_Where_Conditions($this->post_type());
 		}
-		if( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions ) {
+		if ( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions) {
 			//nothing was set during child constructor, so set default
 			//it's ok for child classes to specify this, but generally this is more DRY
-			$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions( $this->post_type() );
+			$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions($this->post_type());
 		}
 		parent::__construct($timezone);
 
@@ -131,7 +131,7 @@ 
 	 */
 	public function public_event_stati() {
 		// @see wp-includes/post.php
-		return get_post_stati( array( 'public' => TRUE ));
+		return get_post_stati(array('public' => TRUE));
 	}
 
 
@@ -142,7 +142,7 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		throw new EE_Error(sprintf(__("EEM_CPT_Base should nto call deleted_field_name! It should instead use post_status_field_name", "event_espresso")));
 	}
 
@@ -153,12 +153,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function post_status_field_name(){
+	public function post_status_field_name() {
 		$field = $this->get_a_field_of_type('EE_WP_Post_Status_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -169,9 +169,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$post_status_field_name=$this->post_status_field_name();
-		$query_params[0][$post_status_field_name]=self::post_status_trashed;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$post_status_field_name = $this->post_status_field_name();
+		$query_params[0][$post_status_field_name] = self::post_status_trashed;
 		return $query_params;
 	}
 
@@ -182,8 +182,8 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		$query_params[ 'default_where_conditions' ] = 'minimum';
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		$query_params['default_where_conditions'] = 'minimum';
 		return $query_params;
 	}
 
@@ -195,11 +195,11 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean success
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$post_status_field_name=$this->post_status_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$post_status_field_name = $this->post_status_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		$new_status = $delete ? self::post_status_trashed : 'draft';
-		if ( $this->update (array($post_status_field_name=>$new_status), $query_params )) {
+		if ($this->update(array($post_status_field_name=>$new_status), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -216,7 +216,7 @@ 
 	 */
 	public function meta_table() {
 		$meta_table = $this->_get_other_tables();
-		$meta_table = reset( $meta_table );
+		$meta_table = reset($meta_table);
 		return $meta_table instanceof EE_Secondary_Table ? $meta_table->get_table_name() : NULL;
 	}
 
@@ -228,16 +228,16 @@ 
 	 * @param  bool $all triggers whether we include DB_Only fields or JUST non DB_Only fields.  Defaults to false (no db only fields)
 	 * @return array
 	 */
-	public function get_meta_table_fields( $all = FALSE ) {
+	public function get_meta_table_fields($all = FALSE) {
 		$all_fields = $fields_to_return = array();
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Secondary_Table )
-				$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Secondary_Table)
+				$all_fields = array_merge($this->_get_fields_for_table($alias), $all_fields);
 		}
 
-		if ( !$all ) {
-			foreach ( $all_fields as $name => $obj ) {
-				if ( $obj instanceof EE_DB_Only_Field_Base )
+		if ( ! $all) {
+			foreach ($all_fields as $name => $obj) {
+				if ($obj instanceof EE_DB_Only_Field_Base)
 					continue;
 				$fields_to_return[] = $name;
 			}
@@ -260,13 +260,13 @@ 
 	 * @param int $parent_term_taxonomy_id
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description ='',$parent_term_taxonomy_id = null){
+	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description = '', $parent_term_taxonomy_id = null) {
 		//create term
-		require_once( EE_MODELS . 'EEM_Term.model.php');
+		require_once(EE_MODELS.'EEM_Term.model.php');
 		//first, check for a term by the same name or slug
 		$category_slug = sanitize_title($category_name);
-		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name,'slug'=>$category_slug))));
-		if( ! $term ){
+		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name, 'slug'=>$category_slug))));
+		if ( ! $term) {
 			$term = EE_Term::new_instance(array(
 				'name'=>$category_name,
 				'slug'=>$category_slug
@@ -274,10 +274,10 @@ 
 			$term->save();
 		}
 		//make sure there's a term-taxonomy entry too
-		require_once( EE_MODELS . 'EEM_Term_Taxonomy.model.php');
-		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(),'taxonomy'=>EE_Event_Category_Taxonomy)));
+		require_once(EE_MODELS.'EEM_Term_Taxonomy.model.php');
+		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(), 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( ! $term_taxonomy ){
+		if ( ! $term_taxonomy) {
 			$term_taxonomy = EE_Term_Taxonomy::new_instance(array(
 				'term_id'=>$term->ID(),
 				'taxonomy'=>EE_Event_Category_Taxonomy,
@@ -286,7 +286,7 @@ 
 				'parent'=>$parent_term_taxonomy_id
 			));
 			$term_taxonomy->save();
-		}else{
+		} else {
 			$term_taxonomy->set_count($term_taxonomy->count() + 1);
 			$term_taxonomy->save();
 		}
@@ -301,11 +301,11 @@ 
 	 * @param string $category_name name of the event category (term)
 	 * @return bool
 	 */
-	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name){
+	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name) {
 		//find the term_taxonomy by that name
-		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name,'taxonomy'=>EE_Event_Category_Taxonomy)));
+		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name, 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( $term_taxonomy ){
+		if ($term_taxonomy) {
 			$term_taxonomy->set_count($term_taxonomy->count() - 1);
 			$term_taxonomy->save();
 		}
@@ -325,8 +325,8 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	public function get_feature_image( $id, $size = 'thumbnail', $attr = '' ) {
-		return get_the_post_thumbnail( $id, $size, $attr );
+	public function get_feature_image($id, $size = 'thumbnail', $attr = '') {
+		return get_the_post_thumbnail($id, $size, $attr);
 	}
 
 
@@ -339,10 +339,10 @@ 
 	 * @global array $wp_post_statuses set in wp core for storing all the post stati
 	 * @return array
 	 */
-	public function get_post_statuses(){
+	public function get_post_statuses() {
 		global $wp_post_statuses;
 		$statuses = array();
-		foreach($wp_post_statuses as $post_status => $args_object){
+		foreach ($wp_post_statuses as $post_status => $args_object) {
 			$statuses[$post_status] = $args_object->label;
 		}
 		return $statuses;
@@ -357,9 +357,9 @@ 
 	public function get_status_array() {
 		$statuses = $this->get_post_statuses();
 		//first the global filter
-		$statuses = apply_filters( 'FHEE_EEM_CPT_Base__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_CPT_Base__get_status_array', $statuses);
 		//now the class specific filter
-		$statuses = apply_filters( 'FHEE_EEM_' . get_class($this) . '__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_'.get_class($this).'__get_status_array', $statuses);
 		return $statuses;
 	}
 
@@ -371,7 +371,7 @@ 
 	 */
 	public function get_custom_post_statuses() {
 		$new_stati = array();
-		foreach ( $this->_custom_stati as $status => $props ) {
+		foreach ($this->_custom_stati as $status => $props) {
 			$new_stati[$status] = $props['label'];
 		}
 		return $new_stati;
@@ -387,24 +387,24 @@ 
 	 * @param WP_Post|array $post
 	 * @return EE_CPT_Base
 	 */
-	public function instantiate_class_from_post_object_orig($post){
-		$post = (array)$post;
+	public function instantiate_class_from_post_object_orig($post) {
+		$post = (array) $post;
 		$has_all_necessary_fields_for_table = true;
 		//check if the post has fields on the meta table already
-		foreach($this->_get_other_tables() as $table_obj){
+		foreach ($this->_get_other_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$has_all_necessary_fields_for_table = false;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( ! $has_all_necessary_fields_for_table){
+		if ( ! $has_all_necessary_fields_for_table) {
 
 			return $this->get_one_by_ID($post['ID']);
-		}else{
+		} else {
 			return $this->instantiate_class_from_array_or_object($post);
 		}
 	}
@@ -415,30 +415,30 @@ 
 	 * @param null $post
 	 * @return EE_Base_Class|EE_Soft_Delete_Base_Class
 	 */
-	public function instantiate_class_from_post_object( $post = NULL ){
-		if ( empty( $post )) {
+	public function instantiate_class_from_post_object($post = NULL) {
+		if (empty($post)) {
 			global $post;
 		}
-		$post = (array)$post;
+		$post = (array) $post;
 		$tables_needing_to_be_queried = array();
 		//check if the post has fields on the meta table already
-		foreach($this->get_tables() as $table_obj){
+		foreach ($this->get_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$tables_needing_to_be_queried[$table_obj->get_table_alias()] = $table_obj;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( $tables_needing_to_be_queried){
-			if(count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table){
+		if ($tables_needing_to_be_queried) {
+			if (count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table) {
 				//so we're only missing data from a secondary table. Well that's not too hard to query for
 				$table_to_query = reset($tables_needing_to_be_queried);
-				$missing_data = $this->_do_wpdb_query( 'get_row', array( 'SELECT * FROM ' . $table_to_query->get_table_name() . ' WHERE ' . $table_to_query->get_fk_on_table() . ' = ' . $post['ID'], ARRAY_A ));
-				if ( ! empty( $missing_data )) {
-					$post = array_merge( $post, $missing_data );
+				$missing_data = $this->_do_wpdb_query('get_row', array('SELECT * FROM '.$table_to_query->get_table_name().' WHERE '.$table_to_query->get_fk_on_table().' = '.$post['ID'], ARRAY_A));
+				if ( ! empty($missing_data)) {
+					$post = array_merge($post, $missing_data);
 				}
 			} else {
 				return $this->get_one_by_ID($post['ID']);
@@ -455,15 +455,15 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function post_type(){
+	public function post_type() {
 		$post_type_field = NULL;
-		foreach($this->field_settings(true) as $field_obj){
-			if($field_obj instanceof EE_WP_Post_Type_Field){
-				$post_type_field = $field_obj;break;
+		foreach ($this->field_settings(true) as $field_obj) {
+			if ($field_obj instanceof EE_WP_Post_Type_Field) {
+				$post_type_field = $field_obj; break;
 			}
 		}
-		if($post_type_field == NULL){
-			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"),get_class($this)));
+		if ($post_type_field == NULL) {
+			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"), get_class($this)));
 		}
 		return $post_type_field->get_default_value();
 	}

modules/single_page_checkout/reg_steps/attendee_information/EE_SPCO_Reg_Step_Attendee_Information.class.php

Braces +1 added lines, -1 removed lines

@@ -808,7 +808,7 @@
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
+			} else {
 				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
 				// remove malformed data
 				unset( $valid_data[ $reg_url_link ] );

Spacing +249 added lines, -250 removed lines

@@ -37,13 +37,13 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Attendee_Information
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'attendee_information';
 		$this->_name = __('Attendee Information', 'event_espresso');
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_main.template.php';
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
-		$this->set_instructions( __('Please answer the following registration questions before proceeding.', 'event_espresso'));
+		$this->set_instructions(__('Please answer the following registration questions before proceeding.', 'event_espresso'));
 	}
 
 
@@ -52,7 +52,7 @@ 
 		EE_Registry::$i18n_js_strings['required_field'] = __(' is a required question.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['required_multi_field'] = __(' is a required question. Please enter a value for at least one of the options.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['answer_required_questions'] = __('Please answer all required questions correctly before proceeding.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf( __('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>' );
+		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(__('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>');
 		EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = __('An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['enter_valid_email'] = __('You must enter a valid email address.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['valid_email_and_questions'] = __('You must enter a valid email address and answer all other required questions before you can proceed.', 'event_espresso');
@@ -85,7 +85,7 @@ 
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		$Line_Item_Display = new EE_Line_Item_Display();
 		// calculate taxes
-		$Line_Item_Display->display_line_item( $this->checkout->cart->get_grand_total(), array( 'set_tax_rate' => true ) );
+		$Line_Item_Display->display_line_item($this->checkout->cart->get_grand_total(), array('set_tax_rate' => true));
 		EE_Registry::instance()->load_helper('Line_Item');
 		/** @var $subsections EE_Form_Section_Proper[] */
 		$subsections = array(
@@ -97,33 +97,33 @@ 
 			'ticket_count' 	=> array()
 		);
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		if ( $registrations ) {
-			foreach ( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
 					// can this registration be processed during this visit ?
-					if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
-						$subsections[ $registration->reg_url_link() ] = $this->_registrations_reg_form( $registration );
-						if ( ! $this->checkout->admin_request ) {
-							$template_args['registrations'][ $registration->reg_url_link() ] = $registration;
-							$template_args['ticket_count'][ $registration->ticket()->ID() ] = isset( $template_args['ticket_count'][ $registration->ticket()->ID() ] ) ? $template_args['ticket_count'][ $registration->ticket()->ID() ] + 1 : 1;
-							$ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs( $this->checkout->cart->get_grand_total(), 'Ticket', array( $registration->ticket()->ID() ) );
-							$ticket_line_item = is_array( $ticket_line_item ) ? reset( $ticket_line_item ) : $ticket_line_item;
-							$template_args['ticket_line_item'][ $registration->ticket()->ID() ] = $Line_Item_Display->display_line_item( $ticket_line_item );
+					if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
+						$subsections[$registration->reg_url_link()] = $this->_registrations_reg_form($registration);
+						if ( ! $this->checkout->admin_request) {
+							$template_args['registrations'][$registration->reg_url_link()] = $registration;
+							$template_args['ticket_count'][$registration->ticket()->ID()] = isset($template_args['ticket_count'][$registration->ticket()->ID()]) ? $template_args['ticket_count'][$registration->ticket()->ID()] + 1 : 1;
+							$ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs($this->checkout->cart->get_grand_total(), 'Ticket', array($registration->ticket()->ID()));
+							$ticket_line_item = is_array($ticket_line_item) ? reset($ticket_line_item) : $ticket_line_item;
+							$template_args['ticket_line_item'][$registration->ticket()->ID()] = $Line_Item_Display->display_line_item($ticket_line_item);
 						}
-						if ( $registration->is_primary_registrant() ) {
+						if ($registration->is_primary_registrant()) {
 							$primary_registrant = $registration->reg_url_link();
 						}
 					}
 				}
 			}
 			// print_copy_info ?
-			if ( $primary_registrant && count( $registrations ) > 1 && ! $this->checkout->admin_request ) {
+			if ($primary_registrant && count($registrations) > 1 && ! $this->checkout->admin_request) {
 				// TODO: add admin option for toggling copy attendee info, then use that value to change $this->_print_copy_info
 				$copy_options['spco_copy_attendee_chk'] = $this->_print_copy_info ? $this->_copy_attendee_info_form() : $this->_auto_copy_attendee_info();
 				// generate hidden input
-				if ( isset( $subsections[ $primary_registrant ] ) && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper ) {
-					$subsections[ $primary_registrant ]->add_subsections( $copy_options, 'primary_registrant', false );
+				if (isset($subsections[$primary_registrant]) && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper) {
+					$subsections[$primary_registrant]->add_subsections($copy_options, 'primary_registrant', false);
 				}
 			}
 
@@ -135,8 +135,7 @@ 
 				'html_id' 					=> $this->reg_form_name(),
 				'subsections' 			=> $subsections,
 				'layout_strategy'		=> $this->checkout->admin_request ?
-					new EE_Div_Per_Section_Layout() :
-					new EE_Template_Layout(
+					new EE_Div_Per_Section_Layout() : new EE_Template_Layout(
 						array(
 							'layout_template_file' 	=> $this->_template, // layout_template
 							'template_args' 				=> $template_args
@@ -153,61 +152,61 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Form_Section_Proper
 	 */
-	private function _registrations_reg_form( EE_Registration $registration ) {
-		EE_Registry::instance()->load_helper( 'Template' );
+	private function _registrations_reg_form(EE_Registration $registration) {
+		EE_Registry::instance()->load_helper('Template');
 		static $attendee_nmbr = 1;
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id' 				=> 'ee-registration-' . $registration->reg_url_link(),
+			'html_id' 				=> 'ee-registration-'.$registration->reg_url_link(),
 			'html_class' 		=> 'ee-reg-form-attendee-dv',
 			'html_style' 		=> $this->checkout->admin_request ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;' : '',
 			'subsections' 		=> array(),
 			'layout_strategy' => new EE_Fieldset_Section_Layout(
 				array(
 					'legend_class' 	=> 'spco-attendee-lgnd smaller-text lt-grey-text',
-					'legend_text' 	=> sprintf( __( 'Attendee %d', 'event_espresso' ), $attendee_nmbr )
+					'legend_text' 	=> sprintf(__('Attendee %d', 'event_espresso'), $attendee_nmbr)
 				)
 			)
 		);
 		// verify that registration has valid event
-		if ( $registration->event() instanceof EE_Event ) {
+		if ($registration->event() instanceof EE_Event) {
 			$query_params = array(
 				array(
 					'Event.EVT_ID' => $registration->event()->ID(),
 					'Event_Question_Group.EQG_primary' => $registration->count() == 1 ? TRUE : FALSE
 				),
-				'order_by'=>array( 'QSG_order'=>'ASC' )
+				'order_by'=>array('QSG_order'=>'ASC')
 			);
-			$question_groups = $registration->event()->question_groups( $query_params );
-			if ( $question_groups ) {
-				foreach ( $question_groups as $question_group ) {
-					if ( $question_group instanceof EE_Question_Group ) {
-						$form_args['subsections'][ $question_group->identifier() ] = $this->_question_group_reg_form( $registration, $question_group );
+			$question_groups = $registration->event()->question_groups($query_params);
+			if ($question_groups) {
+				foreach ($question_groups as $question_group) {
+					if ($question_group instanceof EE_Question_Group) {
+						$form_args['subsections'][$question_group->identifier()] = $this->_question_group_reg_form($registration, $question_group);
 						// add hidden input
-						$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration );
+						$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration);
 					}
 				}
 				// if we have question groups for additional attendees, then display the copy options
 				$this->_print_copy_info = $attendee_nmbr > 1 ? TRUE : $this->_print_copy_info;
 			} else {
-				$form_args['subsections'][ 'attendee_info_not_required_' . $registration->reg_url_link() ] = new EE_Form_Section_HTML(
+				$form_args['subsections']['attendee_info_not_required_'.$registration->reg_url_link()] = new EE_Form_Section_HTML(
 					EEH_Template::locate_template(
-						SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_not_required.template.php',
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args', array()),
+						SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_not_required.template.php',
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args', array()),
 						TRUE,
 						TRUE
 					)
 				);
 				// add hidden input
-				$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration, FALSE );
+				$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration, FALSE);
 			}
 		}
-		if ( $registration->is_primary_registrant() ) {
+		if ($registration->is_primary_registrant()) {
 			// generate hidden input
-			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs( $registration );
+			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs($registration);
 		}
 		$attendee_nmbr++;
-		return new EE_Form_Section_Proper( $form_args );
+		return new EE_Form_Section_Proper($form_args);
 	}
 
 
@@ -220,11 +219,11 @@ 
 	 * @param bool  $additional_attendee_reg_info
 	 * @return    EE_Form_Input_Base
 	 */
-	private function _additional_attendee_reg_info_input( EE_Registration $registration, $additional_attendee_reg_info = TRUE ){
+	private function _additional_attendee_reg_info_input(EE_Registration $registration, $additional_attendee_reg_info = TRUE) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
-				'html_id' 				=> 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+				'html_id' 				=> 'additional-attendee-reg-info-'.$registration->reg_url_link(),
 				'default'				=> $additional_attendee_reg_info
 			)
 		);
@@ -237,22 +236,22 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return EE_Form_Section_Proper
 	 */
-	private function _question_group_reg_form( EE_Registration $registration, EE_Question_Group $question_group ){
+	private function _question_group_reg_form(EE_Registration $registration, EE_Question_Group $question_group) {
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id' 					=> 'ee-reg-form-qstn-grp-' . $question_group->identifier(),
+			'html_id' 					=> 'ee-reg-form-qstn-grp-'.$question_group->identifier(),
 			'html_class' 			=> $this->checkout->admin_request ? 'form-table ee-reg-form-qstn-grp-dv' : 'ee-reg-form-qstn-grp-dv',
-			'html_label_id' 		=> 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-lbl',
+			'html_label_id' 		=> 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-lbl',
 			'subsections' 			=> array(
-				'reg_form_qstn_grp_hdr' => $this->_question_group_header( $question_group )
+				'reg_form_qstn_grp_hdr' => $this->_question_group_header($question_group)
 			),
 			'layout_strategy' 	=> $this->checkout->admin_request ? new EE_Admin_Two_Column_Layout() : new EE_Div_Per_Section_Layout()
 		);
 		// where params
-		$query_params = array( 'QST_deleted' => 0 );
+		$query_params = array('QST_deleted' => 0);
 		// don't load admin only questions on the frontend
-		if ( ! $this->checkout->admin_request ) {
-			$query_params['QST_admin_only'] = array( '!=', TRUE );
+		if ( ! $this->checkout->admin_request) {
+			$query_params['QST_admin_only'] = array('!=', TRUE);
 		}
 		$questions = $question_group->get_many_related(
 			'Question',
@@ -264,21 +263,21 @@ 
 			)
 		);
 		// filter for additional content before questions
-		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this));
 		// loop thru questions
-		foreach ( $questions as $question ) {
-			if( $question instanceof EE_Question ){
+		foreach ($questions as $question) {
+			if ($question instanceof EE_Question) {
 				$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-				$form_args['subsections'][ $identifier ] = $this->reg_form_question( $registration, $question );
+				$form_args['subsections'][$identifier] = $this->reg_form_question($registration, $question);
 			}
 		}
-		$form_args['subsections'] = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this );
+		$form_args['subsections'] = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this);
 
 		// filter for additional content after questions
-		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this));
 //		d( $form_args );
-		$question_group_reg_form = new EE_Form_Section_Proper( $form_args );
-		return apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this );
+		$question_group_reg_form = new EE_Form_Section_Proper($form_args);
+		return apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this);
 	}
 
 
@@ -288,12 +287,12 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return 	EE_Form_Section_HTML
 	 */
-	private function _question_group_header( EE_Question_Group $question_group ){
+	private function _question_group_header(EE_Question_Group $question_group) {
 		$html = '';
 		// group_name
-		if ( $question_group->show_group_name() && $question_group->name() != '' ) {
+		if ($question_group->show_group_name() && $question_group->name() != '') {
 			EE_Registry::instance()->load_helper('HTML');
-			if ( $this->checkout->admin_request ) {
+			if ($this->checkout->admin_request) {
 				$html .= EEH_HTML::br();
 				$html .= EEH_HTML::h3(
 					$question_group->name(),
@@ -307,7 +306,7 @@ 
 			}
 		}
 		// group_desc
-		if ( $question_group->show_group_desc() && $question_group->desc() != '' ) {
+		if ($question_group->show_group_desc() && $question_group->desc() != '') {
 			$html .= EEH_HTML::p(
 				$question_group->desc(),
 				'',
@@ -315,7 +314,7 @@ 
 			);
 
 		}
-		return new EE_Form_Section_HTML( $html );
+		return new EE_Form_Section_HTML($html);
 	}
 
 
@@ -324,14 +323,14 @@ 
 	 * @access public
 	 * @return 	EE_Form_Section_Proper
 	 */
-	private function _copy_attendee_info_form(){
+	private function _copy_attendee_info_form() {
 		// array of params to pass to parent constructor
 		return new EE_Form_Section_Proper(
 			array(
 				'subsections' 			=> $this->_copy_attendee_info_inputs(),
 				'layout_strategy' 	=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 			=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'copy_attendee_info.template.php', // layout_template
+						'layout_template_file' 			=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'copy_attendee_info.template.php', // layout_template
 						'begin_template_file' 			=> NULL,
 						'input_template_file' 				=> NULL,
 						'subsection_template_file' 	=> NULL,
@@ -353,8 +352,8 @@ 
 	private function _auto_copy_attendee_info() {
 		return new EE_Form_Section_HTML(
 			EEH_Template::locate_template(
-				SPCO_REG_STEPS_PATH . $this->_slug . DS . '_auto_copy_attendee_info.template.php',
-				apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()),
+				SPCO_REG_STEPS_PATH.$this->_slug.DS.'_auto_copy_attendee_info.template.php',
+				apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()),
 				TRUE,
 				TRUE
 			)
@@ -373,25 +372,25 @@ 
 		$copy_attendee_info_inputs = array();
 		$prev_ticket = NULL;
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		foreach ($registrations as $registration) {
 			// for all  attendees other than the primary attendee
-			if ( $registration instanceof EE_Registration && ! $registration->is_primary_registrant() ) {
+			if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
 				// if this is a new ticket OR if this is the very first additional attendee after the primary attendee
-				if ( $registration->ticket()->ID() !== $prev_ticket ) {
+				if ($registration->ticket()->ID() !== $prev_ticket) {
 					$item_name = $registration->ticket()->name();
-					$item_name .= $registration->ticket()->description() != '' ? ' - ' . $registration->ticket()->description() : '';
-					$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ] = new EE_Form_Section_HTML(
-						'<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
+					$item_name .= $registration->ticket()->description() != '' ? ' - '.$registration->ticket()->description() : '';
+					$copy_attendee_info_inputs['spco_copy_attendee_chk[ticket-'.$registration->ticket()->ID().']'] = new EE_Form_Section_HTML(
+						'<h6 class="spco-copy-attendee-event-hdr">'.$item_name.'</h6>'
 					);
 					$prev_ticket = $registration->ticket()->ID();
 				}
 
-				$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ] = new
+				$copy_attendee_info_inputs['spco_copy_attendee_chk['.$registration->ID().']'] = new
 				EE_Checkbox_Multi_Input(
-					array( $registration->ID() => sprintf( __('Attendee #%s', 'event_espresso'), $registration->count() )),
+					array($registration->ID() => sprintf(__('Attendee #%s', 'event_espresso'), $registration->count())),
 					array(
-						'html_id' 								=> 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
+						'html_id' 								=> 'spco-copy-attendee-chk-'.$registration->reg_url_link(),
 						'html_class' 						=> 'spco-copy-attendee-chk ee-do-not-validate',
 						'display_html_label_text' 	=> FALSE
 					)
@@ -410,7 +409,7 @@ 
 	 * @param EE_Registration $registration
 	 * @return    EE_Form_Input_Base
 	 */
-	private function _additional_primary_registrant_inputs( EE_Registration $registration ){
+	private function _additional_primary_registrant_inputs(EE_Registration $registration) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
@@ -428,31 +427,31 @@ 
 	 * @param EE_Question     $question
 	 * @return 	EE_Form_Input_Base
 	 */
-	public function reg_form_question( EE_Registration $registration, EE_Question $question ){
+	public function reg_form_question(EE_Registration $registration, EE_Question $question) {
 
 		// if this question was for an attendee detail, then check for that answer
-		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value( $registration, $question->system_ID() );
+		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value($registration, $question->system_ID());
 		$answer = $answer_value === null
-				? EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() )	) )
+				? EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID())))
 				: null;
 		// if NOT returning to edit an existing registration OR if this question is for an attendee property OR we still don't have an EE_Answer object
-		if( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer ) {
+		if ( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer) {
 			// create an EE_Answer object for storing everything in
-			$answer = EE_Answer::new_instance ( array(
+			$answer = EE_Answer::new_instance(array(
 				'QST_ID'=> $question->ID(),
 				'REG_ID'=> $registration->ID()
 			));
 		}
 		// verify instance
-		if( $answer instanceof EE_Answer ){
-			if ( ! empty( $answer_value )) {
-				$answer->set( 'ANS_value', $answer_value );
+		if ($answer instanceof EE_Answer) {
+			if ( ! empty($answer_value)) {
+				$answer->set('ANS_value', $answer_value);
 			}
-			$answer->cache( 'Question', $question );
-			$answer_cache_id =$question->system_ID() != NULL ? $question->system_ID() . '-' . $registration->reg_url_link() : $question->ID() . '-' . $registration->reg_url_link();
-			$registration->cache( 'Answer', $answer, $answer_cache_id );
+			$answer->cache('Question', $question);
+			$answer_cache_id = $question->system_ID() != NULL ? $question->system_ID().'-'.$registration->reg_url_link() : $question->ID().'-'.$registration->reg_url_link();
+			$registration->cache('Answer', $answer, $answer_cache_id);
 		}
-		return $this->_generate_question_input( $registration, $question, $answer );
+		return $this->_generate_question_input($registration, $question, $answer);
 
 	}
 
@@ -464,31 +463,31 @@ 
 	 * @param mixed EE_Answer|NULL      $answer
 	 * @return EE_Form_Input_Base
 	 */
-	private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){
+	private function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) {
 		$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-		$this->_required_questions[ $identifier ] = $question->required() ? true : false;
-		add_filter( 'FHEE__EE_Question__generate_form_input__country_options', array( $this, 'use_cached_countries_for_form_input' ), 10, 4 );
-		add_filter( 'FHEE__EE_Question__generate_form_input__state_options', array( $this, 'use_cached_states_for_form_input' ), 10, 4 );
+		$this->_required_questions[$identifier] = $question->required() ? true : false;
+		add_filter('FHEE__EE_Question__generate_form_input__country_options', array($this, 'use_cached_countries_for_form_input'), 10, 4);
+		add_filter('FHEE__EE_Question__generate_form_input__state_options', array($this, 'use_cached_states_for_form_input'), 10, 4);
 		$input_constructor_args = array(
-			'html_name'     => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-			'html_id'       => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-			'html_class'    => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-			'html_label_id' => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_name'     => 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+			'html_id'       => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+			'html_class'    => 'ee-reg-qstn ee-reg-qstn-'.$identifier,
+			'html_label_id' => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
 			'html_label_class'	=> 'ee-reg-qstn',
 		);
-		$input_constructor_args['html_label_id'] 	.= '-lbl';
-		if ( $answer instanceof EE_Answer && $answer->ID() ) {
-			$input_constructor_args[ 'html_name' ] .= '[' . $answer->ID() . ']';
-			$input_constructor_args[ 'html_id' ] .= '-' . $answer->ID();
-			$input_constructor_args[ 'html_label_id' ] .= '-' . $answer->ID();
+		$input_constructor_args['html_label_id'] .= '-lbl';
+		if ($answer instanceof EE_Answer && $answer->ID()) {
+			$input_constructor_args['html_name'] .= '['.$answer->ID().']';
+			$input_constructor_args['html_id'] .= '-'.$answer->ID();
+			$input_constructor_args['html_label_id'] .= '-'.$answer->ID();
 		}
-		$form_input =  $question->generate_form_input(
+		$form_input = $question->generate_form_input(
 			$registration,
 			$answer,
 			$input_constructor_args
 		);
-		remove_filter( 'FHEE__EE_Question__generate_form_input__country_options', array( $this, 'use_cached_countries_for_form_input' ) );
-		remove_filter( 'FHEE__EE_Question__generate_form_input__state_options', array( $this, 'use_cached_states_for_form_input' ) );
+		remove_filter('FHEE__EE_Question__generate_form_input__country_options', array($this, 'use_cached_countries_for_form_input'));
+		remove_filter('FHEE__EE_Question__generate_form_input__state_options', array($this, 'use_cached_states_for_form_input'));
 		return $form_input;
 	}
 
@@ -502,20 +501,20 @@ 
 	 * @param EE_Registration $registration
 	 * @return array 2d keys are country IDs, values are their names
 	 */
-	public function use_cached_countries_for_form_input( $countries_list, $question, $registration, $answer ) {
-		$country_options = array( '' => '' );
+	public function use_cached_countries_for_form_input($countries_list, $question, $registration, $answer) {
+		$country_options = array('' => '');
 		// get possibly cached list of countries
 		$countries = $this->checkout->action == 'process_reg_step' ? EEM_Country::instance()->get_all_countries() : EEM_Country::instance()->get_all_active_countries();
-		if ( ! empty( $countries )) {
-			foreach( $countries as $country ){
-				if ( $country instanceof EE_Country ) {
-					$country_options[ $country->ID() ] = $country->name();
+		if ( ! empty($countries)) {
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$country_options[$country->ID()] = $country->name();
 				}
 			}
 		}
-		if( $question instanceof EE_Question 
-			&& $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) ) );
+		if ($question instanceof EE_Question 
+			&& $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID())));
 		} else {
 			$answer = EE_Answer::new_instance();
 		}
@@ -540,19 +539,19 @@ 
 	 * @param EE_Registration $registration
 	 * @return array 2d keys are state IDs, values are their names
 	 */
-	public function use_cached_states_for_form_input( $states_list, $question, $registration, $answer ) {
-		$state_options = array( '' => array( '' => ''));
+	public function use_cached_states_for_form_input($states_list, $question, $registration, $answer) {
+		$state_options = array('' => array('' => ''));
 		$states = $this->checkout->action == 'process_reg_step' ? EEM_State::instance()->get_all_states() : EEM_State::instance()->get_all_active_states();
-		if ( ! empty( $states )) {
-			foreach( $states as $state ){
-				if ( $state instanceof EE_State ) {
-					$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
+		if ( ! empty($states)) {
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$state_options[$state->country()->name()][$state->ID()] = $state->name();
 				}
 			}
 		}
-		if( $question instanceof EE_Question 
-			&& $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) ) );
+		if ($question instanceof EE_Question 
+			&& $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID())));
 		} else {
 			$answer = EE_Answer::new_instance();
 		}
@@ -586,65 +585,65 @@ 
 	 */
 	public function process_reg_step() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab validated data from form
 		$valid_data = $this->checkout->current_step->valid_data();
 		//EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $valid_data, '$valid_data', __FILE__, __LINE__ );
 		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-		if ( empty( $valid_data ))  {
-			EE_Error::add_error( __('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($valid_data)) {
+			EE_Error::add_error(__('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		//EEH_Debug_Tools::printr( $this->checkout->transaction, '$this->checkout->transaction', __FILE__, __LINE__ );
-		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg ) {
-			EE_Error::add_error( __( 'A valid transaction could not be initiated for processing your registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+			EE_Error::add_error(__('A valid transaction could not be initiated for processing your registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// get cached registrations
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
 		// verify we got the goods
-		if ( empty( $registrations )) {
-			EE_Error::add_error( __( 'Your form data could not be applied to any valid registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($registrations)) {
+			EE_Error::add_error(__('Your form data could not be applied to any valid registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// extract attendee info from form data and save to model objects
-		$registrations_processed = $this->_process_registrations( $registrations, $valid_data );
+		$registrations_processed = $this->_process_registrations($registrations, $valid_data);
 		// if first pass thru SPCO, then let's check processed registrations against the total number of tickets in the cart
-		if ( $registrations_processed === FALSE ) {
+		if ($registrations_processed === FALSE) {
 			// but return immediately if the previous step exited early due to errors
 			return FALSE;
-		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count ) {
+		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
 			// generate a correctly translated string for all possible singular/plural combinations
-			if ( $this->checkout->total_ticket_count === 1 && $registrations_processed !== 1 ) {
+			if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
 				$error_msg = sprintf(
-					__( 'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ),
+					__('There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
-			} else if ( $this->checkout->total_ticket_count !== 1 && $registrations_processed === 1 ) {
+			} else if ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
 				$error_msg = sprintf(
-					__( 'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
 			} else {
 				$error_msg = sprintf(
-					__( 'There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
 
 			}
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// mark this reg step as completed
 		$this->set_completed();
-		$this->_set_success_message( __('The Attendee Information Step has been successfully completed.', 'event_espresso' ));
+		$this->_set_success_message(__('The Attendee Information Step has been successfully completed.', 'event_espresso'));
 		//do action in case a plugin wants to do something with the data submitted in step 1.
 		//passes EE_Single_Page_Checkout, and it's posted data
-		do_action( 'AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data );
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
 		return TRUE;
 
 	}
@@ -658,9 +657,9 @@ 
 	 * @param array             $valid_data
 	 * @return boolean | int
 	 */
-	private function _process_registrations( $registrations = array(), $valid_data = array() ) {
+	private function _process_registrations($registrations = array(), $valid_data = array()) {
 		// load resources and set some defaults
-		EE_Registry::instance()->load_model( 'Attendee' );
+		EE_Registry::instance()->load_model('Attendee');
 		// holder for primary registrant attendee object
 		$this->checkout->primary_attendee_obj = NULL;
 		// array for tracking reg form data for the primary registrant
@@ -677,19 +676,19 @@ 
 		// attendee counter
 		$att_nmbr = 0;
 		// grab the saved registrations from the transaction
-		foreach ( $registrations  as $registration ) {
+		foreach ($registrations  as $registration) {
 			// verify EE_Registration object
-			if ( ! $registration instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ( ! $registration instanceof EE_Registration) {
+				EE_Error::add_error(__('An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 			$reg_url_link = $registration->reg_url_link();
 			// reg_url_link exists ?
-			if ( $reg_url_link ) {
+			if ($reg_url_link) {
 				// should this registration be processed during this visit ?
-				if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
+				if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
 					// if NOT revisiting, then let's save the registration now, so that we have a REG_ID to use when generating other objects
-					if ( ! $this->checkout->revisit ) {
+					if ( ! $this->checkout->revisit) {
 						$registration->save();
 					}
 
@@ -700,41 +699,41 @@ 
 					 * @var bool   if TRUE is returned by the plugin then the
 					 *      		registration processing is halted.
 					 */
-					if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this ) ) {
+					if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this)) {
 						return FALSE;
 					}
 
 					// Houston, we have a registration!
 					$att_nmbr++;
-					$this->_attendee_data[ $reg_url_link ] = array();
+					$this->_attendee_data[$reg_url_link] = array();
 					// unset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] );
-					if ( isset( $valid_data[ $reg_url_link ] )) {
+					if (isset($valid_data[$reg_url_link])) {
 						// do we need to copy basic info from primary attendee ?
-						$copy_primary = isset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) && absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0 ? TRUE : FALSE;
+						$copy_primary = isset($valid_data[$reg_url_link]['additional_attendee_reg_info']) && absint($valid_data[$reg_url_link]['additional_attendee_reg_info']) === 0 ? TRUE : FALSE;
 						// filter form input data for this registration
-						$valid_data[ $reg_url_link ] = apply_filters( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[ $reg_url_link ] );
+						$valid_data[$reg_url_link] = apply_filters('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[$reg_url_link]);
 						//EEH_Debug_Tools::printr( $valid_data[ $reg_url_link ], '$valid_data[ $reg_url_link ]', __FILE__, __LINE__ );
-						if ( isset( $valid_data['primary_attendee'] )) {
-							$primary_registrant['line_item_id'] =  ! empty( $valid_data['primary_attendee'] ) ? $valid_data['primary_attendee'] : FALSE;
-							unset( $valid_data['primary_attendee'] );
+						if (isset($valid_data['primary_attendee'])) {
+							$primary_registrant['line_item_id'] = ! empty($valid_data['primary_attendee']) ? $valid_data['primary_attendee'] : FALSE;
+							unset($valid_data['primary_attendee']);
 						}
 						// now loop through our array of valid post data && process attendee reg forms
-						foreach ( $valid_data[ $reg_url_link ] as $form_section => $form_inputs ) {
-							if ( ! in_array( $form_section, $non_input_form_sections )) {
-								foreach ( $form_inputs as $form_input => $input_value ) {
+						foreach ($valid_data[$reg_url_link] as $form_section => $form_inputs) {
+							if ( ! in_array($form_section, $non_input_form_sections)) {
+								foreach ($form_inputs as $form_input => $input_value) {
 									// check for critical inputs
-									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email( $form_input, $input_value )) {
+									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email($form_input, $input_value)) {
 										return FALSE;
 									}
 									// store a bit of data about the primary attendee
-									if ( $att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty( $input_value )) {
-										$primary_registrant[ $form_input ] = $input_value;
-									} else if ( $copy_primary && isset( $primary_registrant[ $form_input ] ) && $input_value == NULL ) {
-										$input_value = $primary_registrant[ $form_input ];
+									if ($att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty($input_value)) {
+										$primary_registrant[$form_input] = $input_value;
+									} else if ($copy_primary && isset($primary_registrant[$form_input]) && $input_value == NULL) {
+										$input_value = $primary_registrant[$form_input];
 									}
 									// now attempt to save the input data
-									if ( ! $this->_save_registration_form_input( $registration, $form_input, $input_value ))  {
-										EE_Error::add_error( sprintf( __( 'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso' ), $form_input, $input_value ), __FILE__, __FUNCTION__, __LINE__ );
+									if ( ! $this->_save_registration_form_input($registration, $form_input, $input_value)) {
+										EE_Error::add_error(sprintf(__('Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso'), $form_input, $input_value), __FILE__, __FUNCTION__, __LINE__);
 										return FALSE;
 									}
 								}
@@ -743,51 +742,51 @@ 
 					}
 					//EEH_Debug_Tools::printr( $this->_attendee_data, '$this->_attendee_data', __FILE__, __LINE__ );
 					// this registration does not require additional attendee information ?
-					if ( $copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+					if ($copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 						// just copy the primary registrant
 						$attendee = $this->checkout->primary_attendee_obj;
 					} else {
 						// have we met before?
-						$attendee = $this->_find_existing_attendee( $registration, $this->_attendee_data[ $reg_url_link ] );
+						$attendee = $this->_find_existing_attendee($registration, $this->_attendee_data[$reg_url_link]);
 						// did we find an already existing record for this attendee ?
-						if ( $attendee instanceof EE_Attendee ) {
-							$attendee = $this->_update_existing_attendee_data( $attendee, $this->_attendee_data[ $reg_url_link ] );
+						if ($attendee instanceof EE_Attendee) {
+							$attendee = $this->_update_existing_attendee_data($attendee, $this->_attendee_data[$reg_url_link]);
 						} else {
 							// ensure critical details are set for additional attendees
-							$this->_attendee_data[ $reg_url_link ] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant( $this->_attendee_data[ $reg_url_link ] ) : $this->_attendee_data[ $reg_url_link ];
-							$attendee = $this->_create_new_attendee( $registration, $this->_attendee_data[ $reg_url_link ] );
+							$this->_attendee_data[$reg_url_link] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant($this->_attendee_data[$reg_url_link]) : $this->_attendee_data[$reg_url_link];
+							$attendee = $this->_create_new_attendee($registration, $this->_attendee_data[$reg_url_link]);
 						}
 						// who's #1 ?
-						if ( $att_nmbr == 1 ) {
+						if ($att_nmbr == 1) {
 							$this->checkout->primary_attendee_obj = $attendee;
 						}
 					}
 					//EEH_Debug_Tools::printr( $attendee, '$attendee', __FILE__, __LINE__ );
 					// add relation to registration, set attendee ID, and cache attendee
-					$this->_associate_attendee_with_registration( $registration, $attendee );
-					if ( ! $registration->attendee() instanceof EE_Attendee ) {
-						EE_Error::add_error( sprintf( __( 'Registration %s has an invalid or missing Attendee object.', 'event_espresso' ), $reg_url_link ), __FILE__, __FUNCTION__, __LINE__ );
+					$this->_associate_attendee_with_registration($registration, $attendee);
+					if ( ! $registration->attendee() instanceof EE_Attendee) {
+						EE_Error::add_error(sprintf(__('Registration %s has an invalid or missing Attendee object.', 'event_espresso'), $reg_url_link), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					}
 					/** @type EE_Registration_Processor $registration_processor */
-					$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+					$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 					// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-					$registration_processor->toggle_incomplete_registration_status_to_default( $registration, FALSE );
+					$registration_processor->toggle_incomplete_registration_status_to_default($registration, FALSE);
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-					$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+					$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 					// if we've gotten this far, then let's save what we have
 					$registration->save();
 					// add relation between TXN and registration
-					$this->_associate_registration_with_transaction( $registration );
+					$this->_associate_registration_with_transaction($registration);
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
-				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			} else {
+				EE_Error::add_error(__('An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				// remove malformed data
-				unset( $valid_data[ $reg_url_link ] );
+				unset($valid_data[$reg_url_link]);
 				return FALSE;
 			}
 
@@ -805,22 +804,22 @@ 
 	 * @param string           	$input_value
 	 * @return boolean
 	 */
-	private function _save_registration_form_input( EE_Registration $registration, $form_input = '', $input_value = '' ) {
+	private function _save_registration_form_input(EE_Registration $registration, $form_input = '', $input_value = '') {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '()</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
 		//EEH_Debug_Tools::printr( $form_input, '$form_input', __FILE__, __LINE__ );
 		// allow for plugins to hook in and do their own processing of the form input.
 		// For plugins to bypass normal processing here, they just need to return a boolean value.
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this)) {
 			return TRUE;
 		}
 
 		// grab related answer objects
 		$answers = $registration->answers();
 		// $answer_cache_id is the key used to find the EE_Answer we want
-		$answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input . '-' . $registration->reg_url_link();
-		$answer_is_obj = isset( $answers[ $answer_cache_id ] ) && $answers[ $answer_cache_id ] instanceof EE_Answer ? TRUE : FALSE;
+		$answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input.'-'.$registration->reg_url_link();
+		$answer_is_obj = isset($answers[$answer_cache_id]) && $answers[$answer_cache_id] instanceof EE_Answer ? TRUE : FALSE;
 		//rename form_inputs if they are EE_Attendee properties
-		switch( (string)$form_input ) {
+		switch ((string) $form_input) {
 
 			case 'state' :
 			case 'STA_ID' :
@@ -835,33 +834,33 @@ 
 				break;
 
 			default :
-				$ATT_input = 'ATT_' . $form_input;
+				$ATT_input = 'ATT_'.$form_input;
 				//EEH_Debug_Tools::printr( $ATT_input, '$ATT_input', __FILE__, __LINE__ );
-				$attendee_property = EEM_Attendee::instance()->has_field( $ATT_input ) ? TRUE : FALSE;
-				$form_input = $attendee_property ? 'ATT_' . $form_input : $form_input;
+				$attendee_property = EEM_Attendee::instance()->has_field($ATT_input) ? TRUE : FALSE;
+				$form_input = $attendee_property ? 'ATT_'.$form_input : $form_input;
 		}
 		//EEH_Debug_Tools::printr( $input_value, '$input_value', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $answer_cache_id, '$answer_cache_id', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $attendee_property, '$attendee_property', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $answer_is_obj, '$answer_is_obj', __FILE__, __LINE__ );
 		// if this form input has a corresponding attendee property
-		if ( $attendee_property ) {
-			$this->_attendee_data[ $registration->reg_url_link() ][ $form_input ] = $input_value;
-			if (  $answer_is_obj ) {
+		if ($attendee_property) {
+			$this->_attendee_data[$registration->reg_url_link()][$form_input] = $input_value;
+			if ($answer_is_obj) {
 				// and delete the corresponding answer since we won't be storing this data in that object
-				$registration->_remove_relation_to( $answers[ $answer_cache_id ], 'Answer' );
-				$answers[ $answer_cache_id ]->delete_permanently();
+				$registration->_remove_relation_to($answers[$answer_cache_id], 'Answer');
+				$answers[$answer_cache_id]->delete_permanently();
 			}
 			return TRUE;
-		} elseif ( $answer_is_obj ) {
+		} elseif ($answer_is_obj) {
 			// save this data to the answer object
-			$answers[ $answer_cache_id ]->set_value( $input_value );
-			$result = $answers[ $answer_cache_id ]->save();
+			$answers[$answer_cache_id]->set_value($input_value);
+			$result = $answers[$answer_cache_id]->save();
 			return $result !== false ? true : false;
 		} else {
-			foreach ( $answers as $answer ) {
-				if ( $answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id ) {
-					$answer->set_value( $input_value );
+			foreach ($answers as $answer) {
+				if ($answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id) {
+					$answer->set_value($input_value);
 					$result = $answer->save();
 					return $result !== false ? true : false;
 				}
@@ -879,33 +878,33 @@ 
 	 * @param string $input_value
 	 * @return boolean
 	 */
-	private function _verify_critical_attendee_details_are_set_and_validate_email( $form_input = '', $input_value = '' ) {
-		if ( empty( $input_value )) {
+	private function _verify_critical_attendee_details_are_set_and_validate_email($form_input = '', $input_value = '') {
+		if (empty($input_value)) {
 			// if the form input isn't marked as being required, then just return
-			if ( ! isset( $this->_required_questions[ $form_input ]  ) || ! $this->_required_questions[ $form_input ] ) {
+			if ( ! isset($this->_required_questions[$form_input]) || ! $this->_required_questions[$form_input]) {
 				return true;
 			}
-			switch( $form_input ) {
+			switch ($form_input) {
 				case 'fname' :
-					EE_Error::add_error( __( 'First Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('First Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'lname' :
-					EE_Error::add_error( __( 'Last Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Last Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'email' :
-					EE_Error::add_error( __( 'Email Address is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Email Address is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 			}
-		} else if ( $form_input === 'email' ) {
+		} else if ($form_input === 'email') {
 			// clean the email address
-			$valid_email = sanitize_email( $input_value );
+			$valid_email = sanitize_email($input_value);
 			// check if it matches
-			if ( $input_value != $valid_email ) {
+			if ($input_value != $valid_email) {
 				// whoops!!!
-				EE_Error::add_error( __( 'Please enter a valid email address.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('Please enter a valid email address.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 		}
@@ -933,14 +932,14 @@ 
 	 * @param array           $attendee_data
 	 * @return boolean
 	 */
-	private function _find_existing_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _find_existing_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		$ATT_fname = isset( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_fname'] ) ? $attendee_data['ATT_fname'] : '';
-		$ATT_lname = isset( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_lname'] ) ? $attendee_data['ATT_lname'] : '';
-		$ATT_email = isset( $attendee_data['ATT_email'] ) && ! empty( $attendee_data['ATT_email'] ) ? $attendee_data['ATT_email'] : '';
+		$ATT_fname = isset($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_fname']) ? $attendee_data['ATT_fname'] : '';
+		$ATT_lname = isset($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_lname']) ? $attendee_data['ATT_lname'] : '';
+		$ATT_email = isset($attendee_data['ATT_email']) && ! empty($attendee_data['ATT_email']) ? $attendee_data['ATT_email'] : '';
 		// but only if those have values
-		if ( $ATT_fname && $ATT_lname && $ATT_email ) {
-			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array(
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
+			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array(
 				'ATT_fname' => $ATT_fname,
 				'ATT_lname' => $ATT_lname,
 				'ATT_email' => $ATT_email
@@ -948,7 +947,7 @@ 
 		} else {
 			$existing_attendee = NULL;
 		}
-		return apply_filters( 'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data );
+		return apply_filters('FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data);
 	}
 
 
@@ -960,13 +959,13 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	private function _update_existing_attendee_data( EE_Attendee $existing_attendee, $attendee_data = array() ) {
+	private function _update_existing_attendee_data(EE_Attendee $existing_attendee, $attendee_data = array()) {
 		// first remove fname, lname, and email from attendee data
-		$dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$dont_set = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// now loop thru what's left and add to attendee CPT
-		foreach ( $attendee_data as $property_name => $property_value ) {
-			if ( ! in_array( $property_name, $dont_set ) && EEM_Attendee::instance()->has_field( $property_name )) {
-				$existing_attendee->set( $property_name, $property_value );
+		foreach ($attendee_data as $property_name => $property_value) {
+			if ( ! in_array($property_name, $dont_set) && EEM_Attendee::instance()->has_field($property_name)) {
+				$existing_attendee->set($property_name, $property_value);
 			}
 		}
 		// better save that now
@@ -983,11 +982,11 @@ 
 	 * @param EE_Attendee     $attendee
 	 * @return void
 	 */
-	private function _associate_attendee_with_registration( EE_Registration $registration, EE_Attendee $attendee ) {
+	private function _associate_attendee_with_registration(EE_Registration $registration, EE_Attendee $attendee) {
 		// add relation to attendee
-		$registration->_add_relation_to( $attendee, 'Attendee' );
-		$registration->set_attendee_id( $attendee->ID() );
-		$registration->update_cache_after_object_save( 'Attendee', $attendee );
+		$registration->_add_relation_to($attendee, 'Attendee');
+		$registration->set_attendee_id($attendee->ID());
+		$registration->update_cache_after_object_save('Attendee', $attendee);
 	}
 
 
@@ -998,10 +997,10 @@ 
 	 * @param EE_Registration $registration
 	 * @return void
 	 */
-	private function _associate_registration_with_transaction( EE_Registration $registration ) {
+	private function _associate_registration_with_transaction(EE_Registration $registration) {
 		// add relation to attendee
-		$this->checkout->transaction->_add_relation_to( $registration, 'Registration' );
-		$this->checkout->transaction->update_cache_after_object_save( 'Registration', $registration );
+		$this->checkout->transaction->_add_relation_to($registration, 'Registration');
+		$this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
 	}
 
 
@@ -1013,17 +1012,17 @@ 
 	 * @param array $attendee_data
 	 * @return array
 	 */
-	private function _copy_critical_attendee_details_from_primary_registrant( $attendee_data = array() ) {
+	private function _copy_critical_attendee_details_from_primary_registrant($attendee_data = array()) {
 		// bare minimum critical details include first name, last name, email address
-		$critical_attendee_details = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$critical_attendee_details = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// add address info to critical details?
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE )) {
-			$address_details = array( 'ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone' );
-			$critical_attendee_details = array_merge( $critical_attendee_details, $address_details );
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE)) {
+			$address_details = array('ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone');
+			$critical_attendee_details = array_merge($critical_attendee_details, $address_details);
 		}
-		foreach ( $critical_attendee_details as $critical_attendee_detail ) {
-			if ( ! isset( $attendee_data[ $critical_attendee_detail ] ) || empty( $attendee_data[ $critical_attendee_detail ] )) {
-				$attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get( $critical_attendee_detail );
+		foreach ($critical_attendee_details as $critical_attendee_detail) {
+			if ( ! isset($attendee_data[$critical_attendee_detail]) || empty($attendee_data[$critical_attendee_detail])) {
+				$attendee_data[$critical_attendee_detail] = $this->checkout->primary_attendee_obj->get($critical_attendee_detail);
 			}
 		}
 		return $attendee_data;
@@ -1038,11 +1037,11 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	private function _create_new_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _create_new_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// create new attendee object
-		$new_attendee = EE_Attendee::new_instance( $attendee_data );
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
 		// set author to event creator
-		$new_attendee->set( 'ATT_author', $registration->event()->wp_user() );
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
 		$new_attendee->save();
 		return $new_attendee;
 	}
@@ -1058,7 +1057,7 @@ 
 	 */
 	public function update_reg_step() {
 		// save everything
-		if ( $this->process_reg_step() ) {
+		if ($this->process_reg_step()) {
 			$this->checkout->redirect = TRUE;
 			$this->checkout->redirect_url = add_query_arg(
 				array(
@@ -1067,7 +1066,7 @@ 
 				),
 				$this->checkout->thank_you_page_url
 			);
-			$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 			return TRUE;
 		}
 		return FALSE;

caffeinated/admin/extend/registration_form/Registration_Form_Question_Groups_Admin_List_Table.class.php

Spacing +30 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,7 +31,7 @@ 
 class Registration_Form_Question_Groups_Admin_List_Table extends EE_Admin_List_Table {
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -39,8 +39,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, FALSE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, FALSE );
-		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, FALSE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, FALSE);
+		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 	}
 
 
@@ -49,8 +49,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('question group', 'event_espresso' ),
-			'plural' => __('question groups', 'event_espresso' ),
+			'singular' => __('question group', 'event_espresso'),
+			'plural' => __('question groups', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -65,8 +65,8 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'id' => array( 'QSG_ID' => FALSE ),
-			'name' => array( 'QSG_name' => FALSE )
+			'id' => array('QSG_ID' => FALSE),
+			'name' => array('QSG_name' => FALSE)
 			);
 
 		$this->_hidden_columns = array(
@@ -92,9 +92,9 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE );
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_group' ) ) {
-			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_views['all']['count'] = $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_group')) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		$system_group = $item->get('QSG_system');
 		$has_questions_with_answers = $item->has_questions_with_answers();
 		$lock_icon = $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-		return $system_group > 0 || ( $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_groups', $item->ID() ) ? '<span class="' . $lock_icon . '"></span>'  . sprintf( '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID() )  : sprintf( '<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
+		return $system_group > 0 || ($system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers) || ! EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_groups', $item->ID()) ? '<span class="'.$lock_icon.'"></span>'.sprintf('<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID()) : sprintf('<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
 	}
 
 
@@ -117,7 +117,7 @@ 
 
 	public function column_id(EE_Question_Group $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' .$item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -127,7 +127,7 @@ 
 		$actions = array();
 
 		//return $item->name();
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$edit_query_args = array(
@@ -152,32 +152,32 @@ 
 
 
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
-		$trash_link = EE_Admin_Page::add_query_args_and_nonce( $trash_query_args, EE_FORMS_ADMIN_URL );
-		$restore_link = EE_Admin_Page::add_query_args_and_nonce( $restore_query_args, EE_FORMS_ADMIN_URL );
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_FORMS_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
 
-		if (  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID())) {
 			$actions = array(
-				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Question Group', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+				'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Question Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
 			);
 		}
-		if ( $item->get('QSG_system') < 1 && $this->_view != 'trash' &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID() ) ) {
-			$actions['delete'] = '<a href="' . $trash_link . '" title="' . esc_attr__('Delete Question Group', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->get('QSG_system') < 1 && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID())) {
+			$actions['delete'] = '<a href="'.$trash_link.'" title="'.esc_attr__('Delete Question Group', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 		}
 
-		if ( $this->_view == 'trash' ) {
+		if ($this->_view == 'trash') {
 
-			if (  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID() ) ) {
-				$actions['restore'] = '<a href="' . $restore_link . '" title="' . esc_attr__('Restore Question Group', 'event_espresso') . '">' . __('Restore', 'event_espresso') . '</a>';
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID())) {
+				$actions['restore'] = '<a href="'.$restore_link.'" title="'.esc_attr__('Restore Question Group', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
 
-			if ( !$item->has_questions_with_answers() &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID() ) ) {
-				$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__('Delete Question Group Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+			if ( ! $item->has_questions_with_answers() && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID())) {
+				$actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__('Delete Question Group Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		$content =  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' : $item->name();
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>' : $item->name();
 		$content .= $this->row_actions($actions);
 		return $content;
 	}
@@ -198,13 +198,13 @@ 
 
 
 	public function column_show_group_name(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_name() ];
+		return $this->_yes_no[$item->show_group_name()];
 	}
 
 
 
 	public function column_show_group_desc(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_desc() ];
+		return $this->_yes_no[$item->show_group_desc()];
 	}
 
 

caffeinated/payment_methods/Mijireh/EEG_Mijireh.gateway.php

Indentation +39 added lines, -39 removed lines

@@ -1,13 +1,13 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- *
- * EEG_Mijireh
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- */
+	 *
+	 * EEG_Mijireh
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 */
 class EEG_Mijireh extends EE_Offsite_Gateway{
 
 	protected $_access_key;
@@ -99,45 +99,45 @@ 
 		'body'=>  json_encode($order)
 		);
 		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
-                $problems_string = false;
+				$problems_string = false;
 		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
 		if( ! $response instanceof WP_Error ){
 			$response_body = json_decode($response['body']);
 			if($response_body && isset($response_body->checkout_url)){
-                            $payment->set_redirect_url($response_body->checkout_url);
-                            $payment->set_txn_id_chq_nmbr($response_body->order_number);
-                            $payment->set_details($response['body']);
+							$payment->set_redirect_url($response_body->checkout_url);
+							$payment->set_txn_id_chq_nmbr($response_body->order_number);
+							$payment->set_details($response['body']);
 			} else {
-                           if( is_array( $response_body ) || is_object( $response_body)){
-                                    $response_body_as_array = (array)$response_body;
-                                    foreach($response_body_as_array as $problem_parameter => $problems){
-                                            $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
-                                    }
-                            }else{
-                                    $problems_string = $response['body'];
-                            }
-                            if( ! $problems_string ) {
-                                //no message to show? wack
-                                if( isset( $response[ 'headers' ][ 'status' ] ) ){
-                                        $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
-                                        $problems_string = __( 'No response from Mijireh', 'event_espresso' );
-                                }
-                            }
-                        }
+						   if( is_array( $response_body ) || is_object( $response_body)){
+									$response_body_as_array = (array)$response_body;
+									foreach($response_body_as_array as $problem_parameter => $problems){
+											$problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
+									}
+							}else{
+									$problems_string = $response['body'];
+							}
+							if( ! $problems_string ) {
+								//no message to show? wack
+								if( isset( $response[ 'headers' ][ 'status' ] ) ){
+										$problems_string = $response[ 'headers' ][ 'status' ];
+								}else{
+										$problems_string = __( 'No response from Mijireh', 'event_espresso' );
+								}
+							}
+						}
 		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+					$problems_string = implode( ",", $response->get_error_messages() );
 		}
                 
-                if( $problems_string ) {
-                    $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
-                    $payment->set_details( $response );
-                    $payment->set_redirect_url( null );
-                    //even though the payment's status is failed at this point anyways,
-                    //let's be explicit about it. The fact that the redirect url is null
-                    //should be enough to client code that they can't redirect the user
-                    $payment->set_status( $this->_pay_model->failed_status() );
-                }
+				if( $problems_string ) {
+					$payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
+					$payment->set_details( $response );
+					$payment->set_redirect_url( null );
+					//even though the payment's status is failed at this point anyways,
+					//let's be explicit about it. The fact that the redirect url is null
+					//should be enough to client code that they can't redirect the user
+					$payment->set_status( $this->_pay_model->failed_status() );
+				}
 		return $payment;
 	}
 

Spacing +58 added lines, -58 removed lines

@@ -8,7 +8,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EEG_Mijireh extends EE_Offsite_Gateway{
+class EEG_Mijireh extends EE_Offsite_Gateway {
 
 	protected $_access_key;
 
@@ -37,10 +37,10 @@ 
 		$primary_attendee = $primary_registrant->attendee();
 		$items = array();
 		//if we're are charging for the full amount, show the normal line items
-		if( $this->_can_easily_itemize_transaction_for( $payment )){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$total_line_item = $transaction->total_line_item();
 			$tax_total = $total_line_item->get_total_tax();
-			foreach($total_line_item->get_items() as $line_item){
+			foreach ($total_line_item->get_items() as $line_item) {
 				$items[] = array(
 					'name'=>apply_filters(
 						'FHEE__EEG_Mijireh__set_redirection_info__full_amount_line_item_name',
@@ -54,7 +54,7 @@ 
 					'quantity'=>$line_item->quantity()
 				);
 			}
-		}else{//its a partial payment
+		} else {//its a partial payment
 			$tax_total = 0;
 			//partial payment, so just add 1 item
 			$items[] = array(
@@ -62,7 +62,7 @@ 
 					'FHEE__EEG_Mijireh__set_redirection_info__partial_amount_line_item_name',
 					sprintf(
 						__("Payment of %s for %s", 'event_espresso'),
-						$payment->get_pretty( 'PAY_amount', 'no_currency_code' ),
+						$payment->get_pretty('PAY_amount', 'no_currency_code'),
 						$primary_registrant->event_name()
 					),
 					$payment,
@@ -76,18 +76,18 @@ 
 		$order = array(
 			'total'=>$this->format_currency($payment->amount()),
 			'return_url'=>$return_url,
-			'items'=>$this->_prepare_for_mijireh( $items ),
+			'items'=>$this->_prepare_for_mijireh($items),
 			'email'=>$primary_attendee->email(),
 			'first_name'=>$primary_attendee->fname(),
 			'last_name'=>$primary_attendee->lname(),
 			'tax'=>$this->format_currency($tax_total),
 			'partner_id'=>'ee');
 		//setup address?
-		if(		$primary_attendee->address()  &&
-				$primary_attendee->city()  &&
-				$primary_attendee->state_ID()  &&
-				$primary_attendee->country_ID()  &&
-				$primary_attendee->zip()  ){
+		if ($primary_attendee->address() &&
+				$primary_attendee->city() &&
+				$primary_attendee->state_ID() &&
+				$primary_attendee->country_ID() &&
+				$primary_attendee->zip()) {
 			$shipping_address = array(
 				'first_name'=>$primary_attendee->fname(),
 				'last_name'=>$primary_attendee->lname(),
@@ -97,62 +97,62 @@ 
 				'zip_code' => $primary_attendee->zip(),
 				'country' => $primary_attendee->country_ID()
 			);
-			if( $primary_attendee->address2() ){
-				$shipping_address[ 'apt_suite' ] = $primary_attendee->address2();
+			if ($primary_attendee->address2()) {
+				$shipping_address['apt_suite'] = $primary_attendee->address2();
 			}
-			if( $primary_attendee->phone() ){
-				$shipping_address[ 'phone' ] = $primary_attendee->phone();
+			if ($primary_attendee->phone()) {
+				$shipping_address['phone'] = $primary_attendee->phone();
 			}
-			$order[ 'shipping_address' ] = $shipping_address;
+			$order['shipping_address'] = $shipping_address;
 		}
-		$order = apply_filters( 'FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant );
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)) );
+		$order = apply_filters('FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant);
+		do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)));
 		$args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			),
 			'body'=>  json_encode($order)
 		);
-		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
+		$response = wp_remote_post($this->_mijireh_api_orders_url, $args);
                 $problems_string = false;
-		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
-		if( ! $response instanceof WP_Error ){
+		$this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
+		if ( ! $response instanceof WP_Error) {
 			$response_body = json_decode($response['body']);
-			if($response_body && isset($response_body->checkout_url)){
+			if ($response_body && isset($response_body->checkout_url)) {
                             $payment->set_redirect_url($response_body->checkout_url);
                             $payment->set_txn_id_chq_nmbr($response_body->order_number);
                             $payment->set_details($response['body']);
 			} else {
-                           if( is_array( $response_body ) || is_object( $response_body)){
-                                    $response_body_as_array = (array)$response_body;
-                                    foreach($response_body_as_array as $problem_parameter => $problems){
-                                            $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
+                           if (is_array($response_body) || is_object($response_body)) {
+                                    $response_body_as_array = (array) $response_body;
+                                    foreach ($response_body_as_array as $problem_parameter => $problems) {
+                                            $problems_string .= sprintf(__('\nProblems with %s: %s', 'event_espresso'), $problem_parameter, implode(", ", $problems));
                                     }
-                            }else{
+                            } else {
                                     $problems_string = $response['body'];
                             }
-                            if( ! $problems_string ) {
+                            if ( ! $problems_string) {
                                 //no message to show? wack
-                                if( isset( $response[ 'headers' ][ 'status' ] ) ){
-                                        $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
-                                        $problems_string = __( 'No response from Mijireh', 'event_espresso' );
+                                if (isset($response['headers']['status'])) {
+                                        $problems_string = $response['headers']['status'];
+                                } else {
+                                        $problems_string = __('No response from Mijireh', 'event_espresso');
                                 }
                             }
                         }
-		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+		} else {
+                    $problems_string = implode(",", $response->get_error_messages());
 		}
                 
-                if( $problems_string ) {
-                    $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
-                    $payment->set_details( $response );
-                    $payment->set_redirect_url( null );
+                if ($problems_string) {
+                    $payment->set_gateway_response(sprintf(__('Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string));
+                    $payment->set_details($response);
+                    $payment->set_redirect_url(null);
                     //even though the payment's status is failed at this point anyways,
                     //let's be explicit about it. The fact that the redirect url is null
                     //should be enough to client code that they can't redirect the user
-                    $payment->set_status( $this->_pay_model->failed_status() );
+                    $payment->set_status($this->_pay_model->failed_status());
                 }
 		return $payment;
 	}
@@ -165,16 +165,16 @@ 
 	 * @param mixed $data
 	 * @return mixed same type as $data
 	 */
-	private function _prepare_for_mijireh( $data ){
-		if( is_array( $data ) ){
+	private function _prepare_for_mijireh($data) {
+		if (is_array($data)) {
 			$prepared_data = array();
-			foreach($data as $key => $datum ){
-				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
+			foreach ($data as $key => $datum) {
+				$prepared_data[$key] = $this->_prepare_for_mijireh($datum);
 			}
 			return $prepared_data;
-		}elseif(is_string( $data ) ){
-			return str_replace( '%', 'percent', $data );
-		}else{
+		}elseif (is_string($data)) {
+			return str_replace('%', 'percent', $data);
+		} else {
 			return $data;
 		}
 	}
@@ -195,30 +195,30 @@ 
 
 		$payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
 
-		if ( ! $payment instanceof EEI_Payment ){
-			throw new EE_Error( sprintf( __( "Could not find Mijireh payment for transaction %s", 'event_espresso' ), $transaction->ID() ) );
+		if ( ! $payment instanceof EEI_Payment) {
+			throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s", 'event_espresso'), $transaction->ID()));
 		}
 
 		$request_args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			)
 		);
 
 		$response = wp_remote_get(
-			$this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
+			$this->_mijireh_api_orders_url.'/'.$payment->txn_id_chq_nmbr(),
 			$request_args
 		);
 
 		$this->log(
-			array( 'get payment status request_args' => $request_args, 'response' => $response ),
+			array('get payment status request_args' => $request_args, 'response' => $response),
 			$payment
 		);
 		// validate response
-		$response_body = isset( $response[ 'body' ] ) ? json_decode( $response[ 'body' ] ) : '';
-		if( $response && $response_body ){
-			switch( $response_body->status ){
+		$response_body = isset($response['body']) ? json_decode($response['body']) : '';
+		if ($response && $response_body) {
+			switch ($response_body->status) {
 				case 'paid':
 					$payment->set_status($this->_pay_model->approved_status());
 					break;
@@ -230,9 +230,9 @@ 
 			}
 
 		} else {
-			$payment->set_gateway_response( __( 'Response from Mijireh could not be understood.', 'event_espresso' ) );
-			$payment->set_details( $response );
-			$payment->set_status( $this->_pay_model->failed_status() );
+			$payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso'));
+			$payment->set_details($response);
+			$payment->set_status($this->_pay_model->failed_status());
 		}
 		// the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage
 //		$payment->set_status( $this->_pay_model->pending_status() );

core/EE_Request_Handler.core.php

Spacing +77 added lines, -77 removed lines

@@ -65,13 +65,13 @@ 
 	 * @param WP $wp
 	 * @return \EE_Request_Handler
 	 */
-	public function __construct( $wp = null ) {
+	public function __construct($wp = null) {
 		// grab request vars
 		$this->_params = $_REQUEST;
 		// AJAX ???
-		$this->ajax = defined( 'DOING_AJAX' ) ? true : false;
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false;
-		do_action( 'AHEE__EE_Request_Handler__construct__complete' );
+		$this->ajax = defined('DOING_AJAX') ? true : false;
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false;
+		do_action('AHEE__EE_Request_Handler__construct__complete');
 	}
 
 
@@ -83,12 +83,12 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function parse_request( $wp = null ) {
+	public function parse_request($wp = null) {
 		//if somebody forgot to provide us with WP, that's ok because its global
-		if ( ! $wp instanceof WP ) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		$this->set_request_vars( $wp );
+		$this->set_request_vars($wp);
 	}
 
 
@@ -100,14 +100,14 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function set_request_vars( $wp = null ) {
-		if ( ! is_admin() ) {
+	public function set_request_vars($wp = null) {
+		if ( ! is_admin()) {
 			// set request post_id
-			$this->set( 'post_id', $this->get_post_id_from_request( $wp ));
+			$this->set('post_id', $this->get_post_id_from_request($wp));
 			// set request post name
-			$this->set( 'post_name', $this->get_post_name_from_request( $wp ));
+			$this->set('post_name', $this->get_post_name_from_request($wp));
 			// set request post_type
-			$this->set( 'post_type', $this->get_post_type_from_request( $wp ));
+			$this->set('post_type', $this->get_post_type_from_request($wp));
 			// true or false ? is this page being used by EE ?
 			$this->set_espresso_page();
 		}
@@ -122,20 +122,20 @@ 
 	 * @param WP $wp
 	 * @return int
 	 */
-	public function get_post_id_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_id_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_id = null;
-		if ( isset( $wp->query_vars['p'] )) {
+		if (isset($wp->query_vars['p'])) {
 			$post_id = $wp->query_vars['p'];
 		}
-		if ( ! $post_id && isset( $wp->query_vars['page_id'] )) {
+		if ( ! $post_id && isset($wp->query_vars['page_id'])) {
 			$post_id = $wp->query_vars['page_id'];
 		}
-		if ( ! $post_id && isset( $wp->request )) {
-			if ( is_numeric( basename( $wp->request ))) {
-				$post_id = basename( $wp->request );
+		if ( ! $post_id && isset($wp->request)) {
+			if (is_numeric(basename($wp->request))) {
+				$post_id = basename($wp->request);
 			}
 		}
 		return $post_id;
@@ -150,35 +150,35 @@ 
 	 * @param WP $wp
 	 * @return string
 	 */
-	public function get_post_name_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_name_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_name = null;
-		if ( isset( $wp->query_vars['name'] ) && ! empty( $wp->query_vars['name'] )) {
+		if (isset($wp->query_vars['name']) && ! empty($wp->query_vars['name'])) {
 			$post_name = $wp->query_vars['name'];
 		}
-		if ( ! $post_name && isset( $wp->query_vars['pagename'] ) && ! empty( $wp->query_vars['pagename'] )) {
+		if ( ! $post_name && isset($wp->query_vars['pagename']) && ! empty($wp->query_vars['pagename'])) {
 			$post_name = $wp->query_vars['pagename'];
 		}
-		if ( ! $post_name && isset( $wp->request ) && ! empty( $wp->request )) {
-			$possible_post_name = basename( $wp->request );
-			if ( ! is_numeric( $possible_post_name )) {
+		if ( ! $post_name && isset($wp->request) && ! empty($wp->request)) {
+			$possible_post_name = basename($wp->request);
+			if ( ! is_numeric($possible_post_name)) {
 				/** @type WPDB $wpdb */
 				global $wpdb;
 				$SQL = "SELECT ID from $wpdb->posts WHERE post_status='publish' AND post_name=%s";
-				$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $possible_post_name ));
-				if ( $possible_post_name ) {
+				$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name));
+				if ($possible_post_name) {
 					$post_name = $possible_post_name;
 				}
 			}
 		}
-		if ( ! $post_name && $this->get( 'post_id' )) {
+		if ( ! $post_name && $this->get('post_id')) {
 			/** @type WPDB $wpdb */
 			global $wpdb;
 			$SQL = "SELECT post_name from $wpdb->posts WHERE post_status='publish' AND ID=%d";
-			$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $this->get( 'post_id' )));
-			if( $possible_post_name ) {
+			$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->get('post_id')));
+			if ($possible_post_name) {
 				$post_name = $possible_post_name;
 			}
 		}
@@ -194,11 +194,11 @@ 
 	 * @param WP $wp
 	 * @return mixed
 	 */
-	public function get_post_type_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_type_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		return isset( $wp->query_vars['post_type'] ) ? $wp->query_vars['post_type'] : null;
+		return isset($wp->query_vars['post_type']) ? $wp->query_vars['post_type'] : null;
 	}
 
 
@@ -208,18 +208,18 @@ 
 	 * @param  WP $wp
 	 * @return bool|string|void
 	 */
-	public function get_current_page_permalink( $wp = null ) {
-		$post_id = $this->get_post_id_from_request( $wp );
-		if ( $post_id ) {
-			$current_page_permalink = get_permalink( $post_id );
+	public function get_current_page_permalink($wp = null) {
+		$post_id = $this->get_post_id_from_request($wp);
+		if ($post_id) {
+			$current_page_permalink = get_permalink($post_id);
 		} else {
-			if ( ! $wp instanceof WP ) {
+			if ( ! $wp instanceof WP) {
 				global $wp;
 			}
-			if ( $wp->request ) {
-				$current_page_permalink = site_url( $wp->request );
+			if ($wp->request) {
+				$current_page_permalink = site_url($wp->request);
 			} else {
-				$current_page_permalink = esc_url( site_url( $_SERVER[ 'REQUEST_URI' ] ) );
+				$current_page_permalink = esc_url(site_url($_SERVER['REQUEST_URI']));
 			}
 		}
 		return $current_page_permalink;
@@ -236,41 +236,41 @@ 
 	public function test_for_espresso_page() {
 		global $wp;
 		/** @type EE_CPT_Strategy $EE_CPT_Strategy */
-		$EE_CPT_Strategy = EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		$EE_CPT_Strategy = EE_Registry::instance()->load_core('CPT_Strategy');
 		$espresso_CPT_taxonomies = $EE_CPT_Strategy->get_CPT_taxonomies();
-		if ( is_array( $espresso_CPT_taxonomies ) ) {
-			foreach ( $espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details ) {
-				if ( isset( $wp->query_vars, $wp->query_vars[ $espresso_CPT_taxonomy ] ) ) {
+		if (is_array($espresso_CPT_taxonomies)) {
+			foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details) {
+				if (isset($wp->query_vars, $wp->query_vars[$espresso_CPT_taxonomy])) {
 					return true;
 				}
 			}
 		}
 		// load espresso CPT endpoints
 		$espresso_CPT_endpoints = $EE_CPT_Strategy->get_CPT_endpoints();
-		$post_type_CPT_endpoints = array_flip( $espresso_CPT_endpoints );
-		$post_types = (array)$this->get( 'post_type' );
-		foreach ( $post_types as $post_type ) {
+		$post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
+		$post_types = (array) $this->get('post_type');
+		foreach ($post_types as $post_type) {
 			// was a post name passed ?
-			if ( isset( $post_type_CPT_endpoints[ $post_type ] ) ) {
+			if (isset($post_type_CPT_endpoints[$post_type])) {
 				// kk we know this is an espresso page, but is it a specific post ?
-				if ( ! $this->get( 'post_name' ) ) {
+				if ( ! $this->get('post_name')) {
 					// there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
-					$post_name = isset( $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] ) ? $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] : null;
+					$post_name = isset($post_type_CPT_endpoints[$this->get('post_type')]) ? $post_type_CPT_endpoints[$this->get('post_type')] : null;
 					// if the post type matches on of our then set the endpoint
-					if ( $post_name ) {
-						$this->set( 'post_name', $post_name );
+					if ($post_name) {
+						$this->set('post_name', $post_name);
 					}
 				}
 				return true;
 			}
 		}
-		if ( $this->get( 'post_name' )) {
+		if ($this->get('post_name')) {
 			// load all pages using espresso shortcodes
-			$post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			$post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// make sure core pages are included
-			$espresso_pages = array_merge( $espresso_CPT_endpoints, $post_shortcodes );
+			$espresso_pages = array_merge($espresso_CPT_endpoints, $post_shortcodes);
 			// was a post name passed ?
-			if (  isset( $espresso_pages[ $this->get( 'post_name' ) ] )) {
+			if (isset($espresso_pages[$this->get('post_name')])) {
 				 return true;
 			}
 		}
@@ -286,7 +286,7 @@ 
 	 * @param null $value
 	 * @return    mixed
 	 */
-	public function set_espresso_page( $value = null ) {
+	public function set_espresso_page($value = null) {
 		$value = $value ? $value : $this->test_for_espresso_page();
 		$this->_params['is_espresso_page'] = $value;
 	}
@@ -300,7 +300,7 @@ 
 	 *  @return 	mixed
 	 */
 	public function is_espresso_page() {
-		return isset( $this->_params['is_espresso_page'] ) ? $this->_params['is_espresso_page'] : false;
+		return isset($this->_params['is_espresso_page']) ? $this->_params['is_espresso_page'] : false;
 	}
 
 
@@ -324,10 +324,10 @@ 
 	 * @param bool $override_ee
 	 * @return    void
 	 */
-	public function set( $key, $value, $override_ee = false ) {
+	public function set($key, $value, $override_ee = false) {
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
-			$this->_params[ $key ] = $value;
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -341,8 +341,8 @@ 
 	 * @param null $default
 	 * @return    mixed
 	 */
-	public function get( $key, $default = null ) {
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
+	public function get($key, $default = null) {
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
 	}
 
 
@@ -354,8 +354,8 @@ 
 	 * @param $key
 	 * @return    boolean
 	 */
-	public function is_set( $key ) {
-		return isset( $this->_params[ $key ] ) ? true : false;
+	public function is_set($key) {
+		return isset($this->_params[$key]) ? true : false;
 	}
 
 
@@ -367,8 +367,8 @@ 
 	 * @param $key
 	 * @return    void
 	 */
-	public function un_set( $key ) {
-		unset( $this->_params[ $key ] );
+	public function un_set($key) {
+		unset($this->_params[$key]);
 	}
 
 
@@ -381,8 +381,8 @@ 
 	 * @param $value
 	 * @return    void
 	 */
-	public function set_notice( $key, $value ) {
-		$this->_notice[ $key ] = $value;
+	public function set_notice($key, $value) {
+		$this->_notice[$key] = $value;
 	}
 
 
@@ -394,8 +394,8 @@ 
 	 * @param $key
 	 * @return    mixed
 	 */
-	public function get_notice( $key ) {
-		return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : null;
+	public function get_notice($key) {
+		return isset($this->_notice[$key]) ? $this->_notice[$key] : null;
 	}
 
 
@@ -407,7 +407,7 @@ 
 	 * @param $string
 	 * @return    void
 	 */
-	public function add_output( $string ) {
+	public function add_output($string) {
 		$this->_output .= $string;
 	}
 
@@ -429,8 +429,8 @@ 
 	 * @param $item
 	 * @param $key
 	 */
-	function sanitize_text_field_for_array_walk( &$item, &$key ) {
-		$item = strpos( $item, 'email' ) !== false ? sanitize_email( $item ) : sanitize_text_field( $item );
+	function sanitize_text_field_for_array_walk(&$item, &$key) {
+		$item = strpos($item, 'email') !== false ? sanitize_email($item) : sanitize_text_field($item);
 	}
 
 
@@ -440,7 +440,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return false; }
+	public function __set($a, $b) { return false; }
 
 
 

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Indentation +1 added lines, -1 removed lines

@@ -715,7 +715,7 @@
 				}
 			}
 		}
-        }
+		}
 	/**
 	 * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;

core/db_models/EEM_Event.model.php

Indentation +43 added lines, -43 removed lines

@@ -179,11 +179,11 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_question_groups() {
 		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
 			array( 'QSG_deleted' => FALSE ),
@@ -197,12 +197,12 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 *		@return 		array
+	 */
 	public function get_all_event_question_groups( $EVT_ID = 0 ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -218,13 +218,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		boolean	$for_primary_attendee
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		boolean	$for_primary_attendee
+	 *		@return 		array
+	 */
 	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -241,13 +241,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		EE_Registration 	$registration
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		EE_Registration 	$registration
+	 *		@return 		array
+	 */
 	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
 
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
@@ -275,12 +275,12 @@ 
 
 
 	/**
-	*		get_question_target_db_column
-	*
-	* 		@access		public
-	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
-	*		@return 		array
-	*/
+	 *		get_question_target_db_column
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QSG_IDs  csv list of $QSG IDs
+	 *		@return 		array
+	 */
 	public function get_questions_in_groups( $QSG_IDs = '' ) {
 
 		if ( empty( $QSG_IDs )) {
@@ -306,12 +306,12 @@ 
 
 
 	/**
-	*		get_options_for_question
-	*
-	* 		@access		public
-	* 		@param		string		$QST_IDs  csv list of $QST IDs
-	*		@return 		array
-	*/
+	 *		get_options_for_question
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QST_IDs  csv list of $QST IDs
+	 *		@return 		array
+	 */
 	public function get_options_for_question( $QST_IDs ) {
 
 		if ( empty( $QST_IDs )) {
@@ -396,12 +396,12 @@ 
 
 
 	/**
-	*		_get_question_target_db_column
-	*
-	* 		@access		private
-	* 		@param		$QST
-	*		@return 		string		string
-	*/
+	 *		_get_question_target_db_column
+	 *
+	 * 		@access		private
+	 * 		@param		$QST
+	 *		@return 		string		string
+	 */
 	private function _generate_question_input_name( $QST ) {
 
 		if ( $QST->QST_system ) {

Spacing +161 added lines, -161 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_CPT_Base.model.php');
+require_once(EE_MODELS.'EEM_CPT_Base.model.php');
 /**
  *
  * EEM_Event Model
@@ -11,7 +11,7 @@ 
  * @author				Michael Nelson, Brent Christensen
  *
  */
-class EEM_Event  extends EEM_CPT_Base{
+class EEM_Event  extends EEM_CPT_Base {
 
 	/**
 	 * constant used by status(), indicating that no more tickets can be purchased for any of the datetimes for the event
@@ -51,15 +51,15 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	public static function instance( $timezone = NULL ){
+	public static function instance($timezone = NULL) {
 
 		// check if instance of EEM_Event already exists
-		if ( ! self::$_instance instanceof EEM_Event ) {
+		if ( ! self::$_instance instanceof EEM_Event) {
 			// instantiate Espresso_model
-			self::$_instance = new self( $timezone );
+			self::$_instance = new self($timezone);
 		}
 		//we might have a timezone set, let set_timezone decide what to do with it
-		self::$_instance->set_timezone( $timezone );
+		self::$_instance->set_timezone($timezone);
 		// EEM_Event object
 		return self::$_instance;
 	}
@@ -70,12 +70,12 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	protected function __construct($timezone = null){
+	protected function __construct($timezone = null) {
 
-		EE_Registry::instance()->load_model( 'Registration' );
+		EE_Registry::instance()->load_model('Registration');
 
-		$this->singular_item = __('Event','event_espresso');
-		$this->plural_item = __('Events','event_espresso');
+		$this->singular_item = __('Event', 'event_espresso');
+		$this->plural_item = __('Events', 'event_espresso');
 
 		// to remove Cancelled events from the frontend, copy the following filter to your functions.php file
 		// add_filter( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', '__return_false' );
@@ -89,57 +89,57 @@ 
 			array(
 				EEM_Event::cancelled => array(
 					'label' => __('Cancelled', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE)
 				),
 				EEM_Event::postponed => array(
 					'label' => __('Postponed', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE)
 				),
 				EEM_Event::sold_out => array(
 					'label' => __('Sold Out', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE)
 				)
 			)
 		);
 
-		self::$_default_reg_status = empty( self::$_default_reg_status ) ? EEM_Registration::status_id_pending_payment : self::$_default_reg_status;
+		self::$_default_reg_status = empty(self::$_default_reg_status) ? EEM_Registration::status_id_pending_payment : self::$_default_reg_status;
 
 		$this->_tables = array(
-			'Event_CPT'=>new EE_Primary_Table( 'posts','ID' ),
-			'Event_Meta'=> new EE_Secondary_Table( 'esp_event_meta', 'EVTM_ID', 'EVT_ID' )
+			'Event_CPT'=>new EE_Primary_Table('posts', 'ID'),
+			'Event_Meta'=> new EE_Secondary_Table('esp_event_meta', 'EVTM_ID', 'EVT_ID')
 		);
 
 		$this->_fields = array(
 			'Event_CPT'=>array(
-				'EVT_ID'=>new EE_Primary_Key_Int_Field( 'ID', __( 'Post ID for Event','event_espresso' )),
-				'EVT_name'=>new EE_Plain_Text_Field( 'post_title', __( 'Event Name','event_espresso' ), FALSE, '' ),
-				'EVT_desc'=>new EE_Post_Content_Field( 'post_content', __( 'Event Description', 'event_espresso' ), FALSE, '' ),
-				'EVT_slug'=>new EE_Slug_Field( 'post_name', __( 'Event Slug', 'event_espresso' ), FALSE, '' ),
-				'EVT_created'=>new EE_Datetime_Field( 'post_date', __( 'Date/Time Event Created', 'event_espresso' ), FALSE, time()),
-				'EVT_short_desc'=>new EE_Simple_HTML_Field( 'post_excerpt', __( 'Event Short Description', 'event_espresso' ), FALSE,'' ),
-				'EVT_modified'=>new EE_Datetime_Field( 'post_modified', __( 'Date/Time Event Modified', 'event_espresso' ), FALSE, time()),
-				'EVT_wp_user'=>new EE_WP_User_Field( 'post_author', __( 'Event Creator ID', 'event_espresso'), FALSE),
-				'parent'=>new EE_Integer_Field( 'post_parent', __( 'Event Parent ID', 'event_espresso' ), FALSE, 0 ),
-				'EVT_order'=>new EE_Integer_Field( 'menu_order', __( 'Event Menu Order', 'event_espresso' ), FALSE, 1 ),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'),// EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
-				'status' => new EE_WP_Post_Status_Field( 'post_status', __( 'Event Status', 'event_espresso' ), FALSE, 'draft', $this->_custom_stati )
+				'EVT_ID'=>new EE_Primary_Key_Int_Field('ID', __('Post ID for Event', 'event_espresso')),
+				'EVT_name'=>new EE_Plain_Text_Field('post_title', __('Event Name', 'event_espresso'), FALSE, ''),
+				'EVT_desc'=>new EE_Post_Content_Field('post_content', __('Event Description', 'event_espresso'), FALSE, ''),
+				'EVT_slug'=>new EE_Slug_Field('post_name', __('Event Slug', 'event_espresso'), FALSE, ''),
+				'EVT_created'=>new EE_Datetime_Field('post_date', __('Date/Time Event Created', 'event_espresso'), FALSE, time()),
+				'EVT_short_desc'=>new EE_Simple_HTML_Field('post_excerpt', __('Event Short Description', 'event_espresso'), FALSE, ''),
+				'EVT_modified'=>new EE_Datetime_Field('post_modified', __('Date/Time Event Modified', 'event_espresso'), FALSE, time()),
+				'EVT_wp_user'=>new EE_WP_User_Field('post_author', __('Event Creator ID', 'event_espresso'), FALSE),
+				'parent'=>new EE_Integer_Field('post_parent', __('Event Parent ID', 'event_espresso'), FALSE, 0),
+				'EVT_order'=>new EE_Integer_Field('menu_order', __('Event Menu Order', 'event_espresso'), FALSE, 1),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'), // EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
+				'status' => new EE_WP_Post_Status_Field('post_status', __('Event Status', 'event_espresso'), FALSE, 'draft', $this->_custom_stati)
 			),
 			'Event_Meta'=>array(
-				'EVTM_ID'=> new EE_DB_Only_Float_Field( 'EVTM_ID', __( 'Event Meta Row ID','event_espresso' ), FALSE ),
-				'EVT_ID_fk'=>new EE_DB_Only_Int_Field( 'EVT_ID', __( 'Foreign key to Event ID from Event Meta table', 'event_espresso' ), FALSE ),
-				'EVT_display_desc'=>new EE_Boolean_Field( 'EVT_display_desc', __( 'Display Description Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_display_ticket_selector'=>new EE_Boolean_Field( 'EVT_display_ticket_selector', __( 'Display Ticket Selector Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_visible_on'=>new EE_Datetime_Field( 'EVT_visible_on', __( 'Event Visible Date', 'event_espresso' ), TRUE, time()),
-				'EVT_additional_limit'=>new EE_Integer_Field( 'EVT_additional_limit', __( 'Limit of Additional Registrations on Same Transaction', 'event_espresso' ), TRUE, 10 ),
+				'EVTM_ID'=> new EE_DB_Only_Float_Field('EVTM_ID', __('Event Meta Row ID', 'event_espresso'), FALSE),
+				'EVT_ID_fk'=>new EE_DB_Only_Int_Field('EVT_ID', __('Foreign key to Event ID from Event Meta table', 'event_espresso'), FALSE),
+				'EVT_display_desc'=>new EE_Boolean_Field('EVT_display_desc', __('Display Description Flag', 'event_espresso'), FALSE, 1),
+				'EVT_display_ticket_selector'=>new EE_Boolean_Field('EVT_display_ticket_selector', __('Display Ticket Selector Flag', 'event_espresso'), FALSE, 1),
+				'EVT_visible_on'=>new EE_Datetime_Field('EVT_visible_on', __('Event Visible Date', 'event_espresso'), TRUE, time()),
+				'EVT_additional_limit'=>new EE_Integer_Field('EVT_additional_limit', __('Limit of Additional Registrations on Same Transaction', 'event_espresso'), TRUE, 10),
 				'EVT_default_registration_status'=>new EE_Enum_Text_Field(
-					'EVT_default_registration_status', __( 'Default Registration Status on this Event', 'event_espresso' ), FALSE, EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
+					'EVT_default_registration_status', __('Default Registration Status on this Event', 'event_espresso'), FALSE, EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
 				),
-				'EVT_member_only'=>new EE_Boolean_Field( 'EVT_member_only', __( 'Member-Only Event Flag', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __( 'Event Phone Number', 'event_espresso' ), FALSE ),
-				'EVT_allow_overflow'=>new EE_Boolean_Field(  'EVT_allow_overflow', __( 'Allow Overflow on Event', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_timezone_string'=>new EE_Plain_Text_Field( 'EVT_timezone_string', __( 'Timezone (name) for Event times', 'event_espresso' ), FALSE ),
-				'EVT_external_URL'=>new EE_Plain_Text_Field( 'EVT_external_URL', __( 'URL of Event Page if hosted elsewhere', 'event_espresso' ), TRUE ),
-				'EVT_donations'=>new EE_Boolean_Field( 'EVT_donations', __( 'Accept Donations?', 'event_espresso' ), FALSE, FALSE )
+				'EVT_member_only'=>new EE_Boolean_Field('EVT_member_only', __('Member-Only Event Flag', 'event_espresso'), FALSE, FALSE),
+				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __('Event Phone Number', 'event_espresso'), FALSE),
+				'EVT_allow_overflow'=>new EE_Boolean_Field('EVT_allow_overflow', __('Allow Overflow on Event', 'event_espresso'), FALSE, FALSE),
+				'EVT_timezone_string'=>new EE_Plain_Text_Field('EVT_timezone_string', __('Timezone (name) for Event times', 'event_espresso'), FALSE),
+				'EVT_external_URL'=>new EE_Plain_Text_Field('EVT_external_URL', __('URL of Event Page if hosted elsewhere', 'event_espresso'), TRUE),
+				'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __('Accept Donations?', 'event_espresso'), FALSE, FALSE)
 
 			));
 
@@ -154,8 +154,8 @@ 
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		parent::__construct($timezone);
 	}
 
 
@@ -163,14 +163,14 @@ 
 	/**
 	 * @param string $default_reg_status
 	 */
-	public static function set_default_reg_status( $default_reg_status ) {
+	public static function set_default_reg_status($default_reg_status) {
 		self::$_default_reg_status = $default_reg_status;
 		//if EEM_Event has already been instantiated, then we need to reset the `EVT_default_reg_status` field to use the new default.
-		if ( self::$_instance instanceof EEM_Event ) {
+		if (self::$_instance instanceof EEM_Event) {
 			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status'] = new EE_Enum_Text_Field(
-				'EVT_default_registration_status', __( 'Default Registration Status on this Event', 'event_espresso' ), false, $default_reg_status, EEM_Registration::reg_status_array()
+				'EVT_default_registration_status', __('Default Registration Status on this Event', 'event_espresso'), false, $default_reg_status, EEM_Registration::reg_status_array()
 			);
-			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status']->_construct_finalize( 'Event_Meta', 'EVT_default_registration_status', 'EEM_Event' );
+			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status']->_construct_finalize('Event_Meta', 'EVT_default_registration_status', 'EEM_Event');
 		}
 	}
 
@@ -183,9 +183,9 @@ 
 	*		@return 		array
 	*/
 	public function get_all_question_groups() {
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
-			array( 'QSG_deleted' => FALSE ),
-			'order_by' => array( 'QSG_order' => 'ASC' )
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
+			array('QSG_deleted' => FALSE),
+			'order_by' => array('QSG_order' => 'ASC')
 		));
 	}
 
@@ -201,13 +201,13 @@ 
 	* 		@param		int $EVT_ID
 	*		@return 		array
 	*/
-	public function get_all_event_question_groups( $EVT_ID = 0 ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_all_event_question_groups($EVT_ID = 0) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID)
 		));
 	}
 
@@ -223,13 +223,13 @@ 
 	* 		@param		boolean	$for_primary_attendee
 	*		@return 		array
 	*/
-	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_event_question_groups($EVT_ID = 0, $for_primary_attendee = TRUE) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee)
 		));
 	}
 
@@ -246,10 +246,10 @@ 
 	* 		@param		EE_Registration 	$registration
 	*		@return 		array
 	*/
-	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
+	public function get_question_groups_for_event($EVT_ID = 0, EE_Registration $registration) {
 
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -259,7 +259,7 @@ 
 			'QSG_deleted' => FALSE
 		);
 
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
 			$where_params,
 			'order_by' => array('QSG_order' => 'ASC')
 		));
@@ -279,16 +279,16 @@ 
 	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
 	*		@return 		array
 	*/
-	public function get_questions_in_groups( $QSG_IDs = '' ) {
+	public function get_questions_in_groups($QSG_IDs = '') {
 
-		if ( empty( $QSG_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Group IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QSG_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question Group IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question')->get_all(array(
 			array(
-				'Question_Group.QSG_ID' => array( 'IN', $QSG_IDs ),
+				'Question_Group.QSG_ID' => array('IN', $QSG_IDs),
 				'QST_deleted' => FALSE,
 				'QST_admin_only' => is_admin()
 			),
@@ -310,16 +310,16 @@ 
 	* 		@param		string		$QST_IDs  csv list of $QST IDs
 	*		@return 		array
 	*/
-	public function get_options_for_question( $QST_IDs ) {
+	public function get_options_for_question($QST_IDs) {
 
-		if ( empty( $QST_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QST_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question_Option' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Option')->get_all(array(
 			array(
-				'Question.QST_ID' => array( 'IN', $QST_IDs ),
+				'Question.QST_ID' => array('IN', $QST_IDs),
 				'QSO_deleted' => FALSE
 			),
 			'order_by' => 'QSO_ID'
@@ -338,46 +338,46 @@ 
 	 * @throws EE_Error
 	 * @return 	array
 	 */
-	public function assemble_array_of_groups_questions_and_options( EE_Registration $registration, $EVT_ID = 0 ) {
+	public function assemble_array_of_groups_questions_and_options(EE_Registration $registration, $EVT_ID = 0) {
 
-		if ( empty( $EVT_ID ) ) {
-			throw new EE_Error( __( 'An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso' ) );
+		if (empty($EVT_ID)) {
+			throw new EE_Error(__('An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso'));
 		}
 
 		$questions = array();
 
 		// get all question groups for event
-		$qgs = $this->get_question_groups_for_event( $EVT_ID, $registration );
-		if ( !empty( $qgs ) ) {
-			foreach ( $qgs as $qg ) {
+		$qgs = $this->get_question_groups_for_event($EVT_ID, $registration);
+		if ( ! empty($qgs)) {
+			foreach ($qgs as $qg) {
 			 	$qsts = $qg->questions();
-			 	$questions[ $qg->ID() ] = $qg->model_field_array();
-			 	$questions[ $qg->ID() ]['QSG_questions'] = array();
-			 	foreach ( $qsts as $qst ) {
-			 		if ( $qst->is_system_question() )
+			 	$questions[$qg->ID()] = $qg->model_field_array();
+			 	$questions[$qg->ID()]['QSG_questions'] = array();
+			 	foreach ($qsts as $qst) {
+			 		if ($qst->is_system_question())
 			 			continue;
-			 		$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID() ) ) );
+			 		$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID())));
 			 		$answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
 			 		$qst_name = $qstn_id = $qst->ID();
 			 		$ans_id = $answer->ID();
-			 		$qst_name = !empty( $ans_id ) ?  '[' . $qst_name . '][' . $ans_id . ']' : '[' . $qst_name . ']';
+			 		$qst_name = ! empty($ans_id) ? '['.$qst_name.']['.$ans_id.']' : '['.$qst_name.']';
 			 		$input_name = '';
-			 		$input_id = sanitize_key( $qst->display_text() );
+			 		$input_id = sanitize_key($qst->display_text());
 			 		$input_class = '';
 			 		$questions[$qg->ID()]['QSG_questions'][$qst->ID()] = $qst->model_field_array();
-		 			$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_name'] = 'qstn' . $input_name . $qst_name;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_id'] = $input_id . '-' . $qstn_id;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_class'] = $input_class;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'] = array();
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['qst_obj'] = $qst;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['ans_obj'] = $answer;
+		 			$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_name'] = 'qstn'.$input_name.$qst_name;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id.'-'.$qstn_id;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_class'] = $input_class;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'] = array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['qst_obj'] = $qst;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['ans_obj'] = $answer;
 					//leave responses as-is, don't convert stuff into html entities please!
-					$questions[ $qg->ID() ][ 'QSG_questions'][ $qst->ID() ][ 'htmlentities' ] = false;
-					if ( $qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN' ) {
-						$QSOs = $qst->options(TRUE,$answer->value());
-						if ( is_array( $QSOs ) ) {
-							foreach ( $QSOs as $QSO_ID => $QSO ) {
-								$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'][ $QSO_ID ] = $QSO->model_field_array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['htmlentities'] = false;
+					if ($qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN') {
+						$QSOs = $qst->options(TRUE, $answer->value());
+						if (is_array($QSOs)) {
+							foreach ($QSOs as $QSO_ID => $QSO) {
+								$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'][$QSO_ID] = $QSO->model_field_array();
 							}
 						}
 					}
@@ -401,9 +401,9 @@ 
 	* 		@param		$QST
 	*		@return 		string		string
 	*/
-	private function _generate_question_input_name( $QST ) {
+	private function _generate_question_input_name($QST) {
 
-		if ( $QST->QST_system ) {
+		if ($QST->QST_system) {
 			$qst_name = $QST->QST_system;
 /*			switch( $QST->QST_system ) {
 
@@ -470,36 +470,36 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_active_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_active_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
 		//if already have where params for DTT_EVT_start or DTT_EVT_end then append these conditions
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
-			$where_params['Datetime.DTT_EVT_start******'] = array('<',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start******'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		} else {
-			$where_params['Datetime.DTT_EVT_start'] = array('<',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+			$where_params['Datetime.DTT_EVT_start'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
-			$where_params['Datetime.DTT_EVT_end*****'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
+			$where_params['Datetime.DTT_EVT_end*****'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 		} else {
-			$where_params['Datetime.DTT_EVT_end'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+			$where_params['Datetime.DTT_EVT_end'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 		}
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -514,30 +514,30 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array               EE_Event objects
 	 */
-	public function get_upcoming_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_upcoming_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
 		//if there are already query_params matching DTT_EVT_start then we need to modify that to add them.
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
-			$where_params['Datetime.DTT_EVT_start*****'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start*****'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		} else {
-			$where_params['Datetime.DTT_EVT_start'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+			$where_params['Datetime.DTT_EVT_start'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		}
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -549,56 +549,56 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_expired_events( $query_params, $count = FALSE ) {
+	public function get_expired_events($query_params, $count = FALSE) {
 
-		$where_params = isset( $query_params[0] ) ? $query_params[0] : array();
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
-		if ( isset( $where_params['status'] ) ) {
-			unset( $where_params['status'] );
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
 		}
 		$exclude_query = $query_params;
-		if ( isset( $exclude_query[0] ) ) {
-			unset( $exclude_query[0] );
+		if (isset($exclude_query[0])) {
+			unset($exclude_query[0]);
 		}
-		$exclude_query[0] = array( 'Datetime.DTT_EVT_end' => array( '>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ) );
+		$exclude_query[0] = array('Datetime.DTT_EVT_end' => array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')));
 		//first get all events that have datetimes where its not expired.
-		$event_ids = $this->_get_all_wpdb_results( $exclude_query, OBJECT_K, 'Event_CPT.ID' );
-		$event_ids = array_keys( $event_ids );
+		$event_ids = $this->_get_all_wpdb_results($exclude_query, OBJECT_K, 'Event_CPT.ID');
+		$event_ids = array_keys($event_ids);
 
 		//if we have any additional query_params, let's add them to the 'AND' condition
 		$and_condition = array(
-			'Datetime.DTT_EVT_end' => array( '<', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ),
-			'EVT_ID' =>  array( 'NOT IN', $event_ids )
+			'Datetime.DTT_EVT_end' => array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')),
+			'EVT_ID' =>  array('NOT IN', $event_ids)
 			);
 
-		if ( isset( $where_params['OR'] ) ) {
+		if (isset($where_params['OR'])) {
 			$and_condition['OR'] = $where_params['OR'];
-			unset( $where_params['OR'] );
+			unset($where_params['OR']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
 			$and_condition['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-			unset( $where_params['Datetime.DTT_EVT_end'] );
+			unset($where_params['Datetime.DTT_EVT_end']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
 			$and_condition['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-			unset( $where_params['Datetime.DTT_EVT_start'] );
+			unset($where_params['Datetime.DTT_EVT_start']);
 		}
 
 		//merge remaining $where params with the and conditions.
-		$and_condtion = array_merge( $and_condition, $where_params );
+		$and_condtion = array_merge($and_condition, $where_params);
 
 		$where_params['AND'] = $and_condition;
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -609,40 +609,40 @@ 
 	 * @param  boolean $count        whether to return the count or not (default FALSE)
 	 * @return EE_Event[]            array of EE_Event objects
 	 */
-	public function get_inactive_events( $query_params, $count = FALSE ) {
-		$where_params = isset( $query_params[0] ) ? $query_params[0] : array();
+	public function get_inactive_events($query_params, $count = FALSE) {
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
 
 		//let's add in specific query_params for inactive events.
-		if ( isset( $where_params['status'] ) ) {
-			unset( $where_params['status'] );
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//if we have any additional query_params, let's add them to the 'AND' condition
-		$where_params['AND']['status'] = array( '!=', 'publish' );
+		$where_params['AND']['status'] = array('!=', 'publish');
 
-		if ( isset( $where_params['OR'] ) ) {
+		if (isset($where_params['OR'])) {
 			$where_params['AND']['OR'] = $where_params['OR'];
-			unset( $where_params['OR'] );
+			unset($where_params['OR']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
 			$where_params['AND']['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-			unset( $where_params['Datetime.DTT_EVT_end'] );
+			unset($where_params['Datetime.DTT_EVT_end']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
 			$where_params['AND']['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-			unset( $where_params['Datetime.DTT_EVT_start'] );
+			unset($where_params['Datetime.DTT_EVT_start']);
 		}
 
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -650,13 +650,13 @@ 
 	 * This is just injecting into the parent add_relationship_to so we do special handling on price relationships because we don't want to override any existing global default prices but instead insert NEW prices that get attached to the event.
 	 * See parent for param descriptions
 	 */
-	public function add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query = array()){
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 
-		if ( $relationName == 'Price' ) {
+		if ($relationName == 'Price') {
 			//let's get the PRC object for the given ID to make sure that we aren't dealing with a default
 			$prc_chk = $this->get_related_model_obj($relationName)->ensure_is_obj($other_model_id_or_obj);
 			//if EVT_ID = 0, then this is a default
-			if ( $prc_chk->get('EVT_ID') == 0 ) {
+			if ($prc_chk->get('EVT_ID') == 0) {
 				//let's set the prc_id as 0 so we force an insert on the add_relation_to carried out by relation
 				$prc_chk->set('PRC_ID', 0);
 			}
@@ -666,7 +666,7 @@ 
 		}
 
 		//otherwise carry on as normal
-		return parent::add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query);
+		return parent::add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query);
 	}
 
 

core/db_classes/EE_Checkin.class.php

Indentation +12 added lines, -12 removed lines

@@ -1,18 +1,18 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author				Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link					{@link http://www.eventespresso.com}
- * @ since		 		4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author				Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link					{@link http://www.eventespresso.com}
+	 * @ since		 		4.0
+	 *
+	 */
 
 
 

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * Event Espresso
  *
@@ -23,7 +23,7 @@ 
  * @subpackage		includes/classes/EE_Checkin.class.php
  * @author				Darren Ethier
  */
-class EE_Checkin extends EE_Base_Class{
+class EE_Checkin extends EE_Base_Class {
 
 	/**
 	 *
@@ -34,9 +34,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Checkin
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Checkin
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}