eventespresso / event-espresso-core

core/libraries/form_sections/base/EE_Form_Section_Base.form.php

Spacing +57 added lines, -57 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 /**
@@ -79,12 +79,12 @@ 
 	 *	@type $name string the name for this form section, if you want to explicitly define it
 	 * }
 	 */
-	public function __construct( $options_array = array() ) {
+	public function __construct($options_array = array()) {
 		// used by display strategies
 		// assign incoming values to properties
-		foreach( $options_array as $key => $value ) {
-			$key = '_' . $key;
-			if ( property_exists( $this, $key ) && empty( $this->{$key} )) {
+		foreach ($options_array as $key => $value) {
+			$key = '_'.$key;
+			if (property_exists($this, $key) && empty($this->{$key} )) {
 				$this->{$key} = $value;
 			}
 		}
@@ -97,10 +97,10 @@ 
 	 * @param $name
 	 * @throws \EE_Error
 	 */
-	protected function _construct_finalize( $parent_form_section, $name ){
+	protected function _construct_finalize($parent_form_section, $name) {
 		$this->_construction_finalized = TRUE;
 		$this->_parent_section = $parent_form_section;
-		if( $name !== null ) {
+		if ($name !== null) {
 			$this->_name = $name;
 		}
 	}
@@ -111,9 +111,9 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -131,7 +131,7 @@ 
 	/**
 	 * @param string $action
 	 */
-	public function set_action( $action ) {
+	public function set_action($action) {
 		$this->_action = $action;
 	}
 
@@ -141,7 +141,7 @@ 
 	 * @return string
 	 */
 	public function method() {
-		return ! empty( $this->_method ) ? $this->_method : 'POST';
+		return ! empty($this->_method) ? $this->_method : 'POST';
 	}
 
 
@@ -149,8 +149,8 @@ 
 	/**
 	 * @param string $method
 	 */
-	public function set_method( $method ) {
-		switch ( $method ) {
+	public function set_method($method) {
+		switch ($method) {
 			case 'get' :
 			case 'GET' :
 				$this->_method = 'GET';
@@ -169,12 +169,12 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	protected function _set_default_html_id_if_empty(){
-		if( ! $this->_html_id ){
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper ){
-				$this->_html_id = $this->_parent_section->html_id() . '-' . $this->_prep_name_for_html_id( $this->name() );
-			}else{
-				$this->_html_id = $this->_prep_name_for_html_id( $this->name() );
+	protected function _set_default_html_id_if_empty() {
+		if ( ! $this->_html_id) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_id = $this->_parent_section->html_id().'-'.$this->_prep_name_for_html_id($this->name());
+			} else {
+				$this->_html_id = $this->_prep_name_for_html_id($this->name());
 			}
 		}
 	}
@@ -186,8 +186,8 @@ 
 	 * @param $name
 	 * @return string
 	 */
-	private function _prep_name_for_html_id( $name ) {
-		return sanitize_key( str_replace( array( '&nbsp;', ' ', '_' ), '-', $name ));
+	private function _prep_name_for_html_id($name) {
+		return sanitize_key(str_replace(array('&nbsp;', ' ', '_'), '-', $name));
 	}
 
 
@@ -201,7 +201,7 @@ 
 	 * and so might stop working anytime.
 	 * @return string
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		return $this->get_html();
 	}
 	
@@ -217,9 +217,9 @@ 
 	 * @param bool $add_pound_sign
 	 * @return string
 	 */
-	public function html_id( $add_pound_sign = FALSE ){
+	public function html_id($add_pound_sign = FALSE) {
 		$this->_set_default_html_id_if_empty();
-		return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+		return $add_pound_sign ? '#'.$this->_html_id : $this->_html_id;
 	}
 
 
@@ -227,7 +227,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_class(){
+	public function html_class() {
 		return $this->_html_class;
 	}
 
@@ -236,7 +236,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_style(){
+	public function html_style() {
 		return $this->_html_style;
 	}
 
@@ -245,7 +245,7 @@ 
 	/**
 	 * @param mixed $html_class
 	 */
-	public function set_html_class( $html_class ) {
+	public function set_html_class($html_class) {
 		$this->_html_class = $html_class;
 	}
 
@@ -254,7 +254,7 @@ 
 	/**
 	 * @param mixed $html_id
 	 */
-	public function set_html_id( $html_id ) {
+	public function set_html_id($html_id) {
 		$this->_html_id = $html_id;
 	}
 
@@ -263,7 +263,7 @@ 
 	/**
 	 * @param mixed $html_style
 	 */
-	public function set_html_style( $html_style ) {
+	public function set_html_style($html_style) {
 		$this->_html_style = $html_style;
 	}
 
@@ -272,7 +272,7 @@ 
 	/**
 	 * @param string $other_html_attributes
 	 */
-	public function set_other_html_attributes( $other_html_attributes ) {
+	public function set_other_html_attributes($other_html_attributes) {
 		$this->_other_html_attributes = $other_html_attributes;
 	}
 
@@ -292,9 +292,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function name(){
-		if( ! $this->_construction_finalized ){
-			throw new EE_Error(sprintf( __( 'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso' ), get_class($this) ) );
+	public function name() {
+		if ( ! $this->_construction_finalized) {
+			throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso'), get_class($this)));
 		}
 		return $this->_name;
 	}
@@ -305,7 +305,7 @@ 
 	 * Gets the parent section
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		return $this->_parent_section;
 	}
 
@@ -318,18 +318,18 @@ 
 	 * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
 	 * @return string
 	 */
-	public function form_open( $action = '', $method = '', $other_attributes = '' ) {
-		if ( ! empty( $action )) {
-			$this->set_action( $action );
+	public function form_open($action = '', $method = '', $other_attributes = '') {
+		if ( ! empty($action)) {
+			$this->set_action($action);
 		}
-		if ( ! empty( $method )) {
-			$this->set_method( $method );
+		if ( ! empty($method)) {
+			$this->set_method($method);
 		}
-		$html = EEH_HTML::nl( 1, 'form' ) . '<form';
-		$html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : '';
-		$html .= ' action="' . $this->action() . '"';
-		$html .= ' method="' . $this->method() . '"';
-		$html .= $other_attributes . '>';
+		$html = EEH_HTML::nl(1, 'form').'<form';
+		$html .= $this->html_id() !== '' ? ' id="'.$this->html_id().'"' : '';
+		$html .= ' action="'.$this->action().'"';
+		$html .= ' method="'.$this->method().'"';
+		$html .= $other_attributes.'>';
 		return $html;
 	}
 
@@ -340,7 +340,7 @@ 
 	 * @return string
 	 */
 	public function form_close() {
-		return EEH_HTML::nl( -1, 'form' ) . '</form>' . EEH_HTML::nl() . '<!-- end of ee-' . $this->html_id() . '-form -->' . EEH_HTML::nl();
+		return EEH_HTML::nl( -1, 'form' ).'</form>'.EEH_HTML::nl().'<!-- end of ee-'.$this->html_id().'-form -->'.EEH_HTML::nl();
 	}
 	
 	/**
@@ -349,7 +349,7 @@ 
 	 * Default does nothing, but child classes can override
 	 * @return void
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		//defaults to enqueue NO js or css
 	}
 
@@ -365,7 +365,7 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
+	public function get_other_js_data($form_other_js_data = array()) {
 		return $form_other_js_data;
 	}
 
@@ -383,20 +383,20 @@ 
 	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
 	 * @return EE_Form_Section_Base
 	 */
-	public function find_section_from_path( $form_section_path ) {		
-		if( strpos( $form_section_path, '/' ) === 0 ) {
-			$form_section_path = substr( $form_section_path, strlen( '/' ) );
+	public function find_section_from_path($form_section_path) {		
+		if (strpos($form_section_path, '/') === 0) {
+			$form_section_path = substr($form_section_path, strlen('/'));
 		}
-		if( empty( $form_section_path ) ) {
+		if (empty($form_section_path)) {
 			return $this;
 		}
-		if( strpos( $form_section_path, '../' ) === 0 ) {
+		if (strpos($form_section_path, '../') === 0) {
 			$parent = $this->parent_section();
 			
-			$form_section_path = substr( $form_section_path, strlen( '../' ) );
-			if( $parent instanceof EE_Form_Section_Base ) {
-				return $parent->find_section_from_path( $form_section_path );
-			} elseif( empty( $form_section_path ) ) {
+			$form_section_path = substr($form_section_path, strlen('../'));
+			if ($parent instanceof EE_Form_Section_Base) {
+				return $parent->find_section_from_path($form_section_path);
+			} elseif (empty($form_section_path)) {
 				return $this;
 			}
 		}

core/libraries/plugin_api/db/EEME_Base.lib.php

Indentation +46 added lines, -46 removed lines

@@ -71,10 +71,10 @@ 
 	 */
 	public function __construct(){
 		if( ! $this->_model_name_extended){
-            throw new EE_Error(
-                __( "When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
-                "event_espresso" )
-            );
+			throw new EE_Error(
+				__( "When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
+				"event_espresso" )
+			);
 		}
 		$construct_end_action = 'AHEE__EEM_'.$this->_model_name_extended.'__construct__end';
 		if ( did_action( $construct_end_action )) {
@@ -95,30 +95,30 @@ 
 
 
 
-    /**
-     * @param array $existing_tables
-     * @return array
-     */
-    public function add_extra_tables_on_filter( array $existing_tables ){
-        return array_merge( $existing_tables, $this->_extra_tables );
+	/**
+	 * @param array $existing_tables
+	 * @return array
+	 */
+	public function add_extra_tables_on_filter( array $existing_tables ){
+		return array_merge( $existing_tables, $this->_extra_tables );
 	}
 
 
 
-    /**
-     * @param array $existing_fields
-     * @return array
-     */
-    public function add_extra_fields_on_filter( array $existing_fields ){
+	/**
+	 * @param array $existing_fields
+	 * @return array
+	 */
+	public function add_extra_fields_on_filter( array $existing_fields ){
 		if( $this->_extra_fields){
 			foreach($this->_extra_fields as $table_alias => $fields){
 				if( ! isset( $existing_fields[ $table_alias ] ) ){
 					$existing_fields[ $table_alias ] = array();
 				}
 				$existing_fields[$table_alias] = array_merge(
-				    $existing_fields[$table_alias],
-                    $this->_extra_fields[$table_alias]
-                );
+					$existing_fields[$table_alias],
+					$this->_extra_fields[$table_alias]
+				);
 
 			}
 		}
@@ -127,12 +127,12 @@ 
 
 
 
-    /**
-     * @param array $existing_relations
-     * @return array
-     */
-    public function add_extra_relations_on_filter( array $existing_relations ){
-        return  array_merge($existing_relations,$this->_extra_relations);
+	/**
+	 * @param array $existing_relations
+	 * @return array
+	 */
+	public function add_extra_relations_on_filter( array $existing_relations ){
+		return  array_merge($existing_relations,$this->_extra_relations);
 	}
 
 
@@ -168,8 +168,8 @@ 
 				remove_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10);
 			}
 		}
-        /** @var EEM_Base $model_to_reset */
-        $model_to_reset = 'EEM_' . $this->_model_name_extended;
+		/** @var EEM_Base $model_to_reset */
+		$model_to_reset = 'EEM_' . $this->_model_name_extended;
 		if ( class_exists( $model_to_reset ) ) {
 			$model_to_reset::reset();
 		}
@@ -177,13 +177,13 @@ 
 
 
 
-    /**
-     * @param string $callback_method_name
-     * @param array  $args
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function __call( $callback_method_name, array $args){
+	/**
+	 * @param string $callback_method_name
+	 * @param array  $args
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function __call( $callback_method_name, array $args){
 		if(strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0){
 			//it's a dynamic callback for a method name
 			$method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
@@ -194,23 +194,23 @@ 
 				return call_user_func_array(array($this,$extending_method), $args_provided_to_method_on_model);
 			}else{
 				throw new EE_Error(
-				    sprintf(
-				        __("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"),
-                        $this->_model_name_extended,
-                        get_class($this),
-                        $extending_method,$extending_method
-                    )
-                );
+					sprintf(
+						__("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"),
+						$this->_model_name_extended,
+						get_class($this),
+						$extending_method,$extending_method
+					)
+				);
 			}
 
 		}else{
 			throw new EE_Error(
-			    sprintf(
-			        __("There is no method named '%s' on '%s'", "event_espresso"),
-                    $callback_method_name,
-                    get_class($this)
-                )
-            );
+				sprintf(
+					__("There is no method named '%s' on '%s'", "event_espresso"),
+					$callback_method_name,
+					get_class($this)
+				)
+			);
 		}
 	}
 

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -69,27 +69,27 @@ 
 	/**
 	 * @throws \EE_Error
 	 */
-	public function __construct(){
-		if( ! $this->_model_name_extended){
+	public function __construct() {
+		if ( ! $this->_model_name_extended) {
             throw new EE_Error(
-                __( "When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
-                "event_espresso" )
+                __("When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
+                "event_espresso")
             );
 		}
 		$construct_end_action = 'AHEE__EEM_'.$this->_model_name_extended.'__construct__end';
-		if ( did_action( $construct_end_action )) {
+		if (did_action($construct_end_action)) {
 			throw new EE_Error(
 				sprintf(
-					__( "Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired", "event_espresso"),
+					__("Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired", "event_espresso"),
 					get_class($this),
 					$this->_model_name_extended,
 					$construct_end_action
 				)
 			);
 		}
-		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',array($this,'add_extra_tables_on_filter'));
-		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',array($this,'add_extra_fields_on_filter'));
-		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',array($this,'add_extra_relations_on_filter'));
+		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables', array($this, 'add_extra_tables_on_filter'));
+		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields', array($this, 'add_extra_fields_on_filter'));
+		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations', array($this, 'add_extra_relations_on_filter'));
 		$this->_register_extending_methods();
 	}
 
@@ -99,8 +99,8 @@ 
      * @param array $existing_tables
      * @return array
      */
-    public function add_extra_tables_on_filter( array $existing_tables ){
-        return array_merge( $existing_tables, $this->_extra_tables );
+    public function add_extra_tables_on_filter(array $existing_tables) {
+        return array_merge($existing_tables, $this->_extra_tables);
 	}
 
 
@@ -109,11 +109,11 @@ 
      * @param array $existing_fields
      * @return array
      */
-    public function add_extra_fields_on_filter( array $existing_fields ){
-		if( $this->_extra_fields){
-			foreach($this->_extra_fields as $table_alias => $fields){
-				if( ! isset( $existing_fields[ $table_alias ] ) ){
-					$existing_fields[ $table_alias ] = array();
+    public function add_extra_fields_on_filter(array $existing_fields) {
+		if ($this->_extra_fields) {
+			foreach ($this->_extra_fields as $table_alias => $fields) {
+				if ( ! isset($existing_fields[$table_alias])) {
+					$existing_fields[$table_alias] = array();
 				}
 				$existing_fields[$table_alias] = array_merge(
 				    $existing_fields[$table_alias],
@@ -131,8 +131,8 @@ 
      * @param array $existing_relations
      * @return array
      */
-    public function add_extra_relations_on_filter( array $existing_relations ){
-        return  array_merge($existing_relations,$this->_extra_relations);
+    public function add_extra_relations_on_filter(array $existing_relations) {
+        return  array_merge($existing_relations, $this->_extra_relations);
 	}
 
 
@@ -141,13 +141,13 @@ 
 	 * scans the child of EEME_Base for functions starting with ext_, and magically makes them functions on the
 	 * model extended. (Internally uses filters, and the __call magic method)
 	 */
-	protected function _register_extending_methods(){
+	protected function _register_extending_methods() {
 		$all_methods = get_class_methods(get_class($this));
-		foreach($all_methods as $method_name){
-			if(strpos($method_name, self::extending_method_prefix) === 0){
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
 				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
 				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-				add_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10,10);
+				add_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10, 10);
 			}
 		}
 	}
@@ -156,21 +156,21 @@ 
 	 * scans the child of EEME_Base for functions starting with ext_, and magically REMOVES them as functions on the
 	 * model extended. (Internally uses filters, and the __call magic method)
 	 */
-	public function deregister(){
-		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',array($this,'add_extra_tables_on_filter'));
-		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',array($this,'add_extra_fields_on_filter'));
-		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',array($this,'add_extra_relations_on_filter'));
+	public function deregister() {
+		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables', array($this, 'add_extra_tables_on_filter'));
+		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields', array($this, 'add_extra_fields_on_filter'));
+		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations', array($this, 'add_extra_relations_on_filter'));
 		$all_methods = get_class_methods(get_class($this));
-		foreach($all_methods as $method_name){
-			if(strpos($method_name, self::extending_method_prefix) === 0){
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
 				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
 				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-				remove_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10);
+				remove_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10);
 			}
 		}
         /** @var EEM_Base $model_to_reset */
-        $model_to_reset = 'EEM_' . $this->_model_name_extended;
-		if ( class_exists( $model_to_reset ) ) {
+        $model_to_reset = 'EEM_'.$this->_model_name_extended;
+		if (class_exists($model_to_reset)) {
 			$model_to_reset::reset();
 		}
 	}
@@ -183,27 +183,27 @@ 
      * @return mixed
      * @throws EE_Error
      */
-    public function __call( $callback_method_name, array $args){
-		if(strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0){
+    public function __call($callback_method_name, array $args) {
+		if (strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0) {
 			//it's a dynamic callback for a method name
 			$method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
-			list( $original_return_val, $model_called, $args_provided_to_method_on_model ) = $args;
+			list($original_return_val, $model_called, $args_provided_to_method_on_model) = $args;
 			$this->_ = $model_called;
 			$extending_method = self::extending_method_prefix.$method_called_on_model;
-			if(method_exists($this, $extending_method)){
-				return call_user_func_array(array($this,$extending_method), $args_provided_to_method_on_model);
-			}else{
+			if (method_exists($this, $extending_method)) {
+				return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
+			} else {
 				throw new EE_Error(
 				    sprintf(
 				        __("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"),
                         $this->_model_name_extended,
                         get_class($this),
-                        $extending_method,$extending_method
+                        $extending_method, $extending_method
                     )
                 );
 			}
 
-		}else{
+		} else {
 			throw new EE_Error(
 			    sprintf(
 			        __("There is no method named '%s' on '%s'", "event_espresso"),

core/libraries/messages/data_class/EE_Messages_Registrations_incoming_data.class.php

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 
 /**
  * This prepares data for message types that send messages for multiple registrations (that could span multiple
@@ -20,13 +20,13 @@ 
 	 * @throws EE_Error
 	 * @access protected
 	 */
-	public function __construct( $data = array() ) {
+	public function __construct($data = array()) {
 
 		//validate that the first element in the array is an EE_Registration object.
-		if ( ! reset( $data ) instanceof EE_Registration ) {
-			throw new EE_Error( __( 'The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso' ) );
+		if ( ! reset($data) instanceof EE_Registration) {
+			throw new EE_Error(__('The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso'));
 		}
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 
@@ -58,10 +58,10 @@ 
 	 *
 	 * @return EE_Registration[]   The data being prepared for the db
 	 */
-	static public function convert_data_for_persistent_storage( $registrations ) {
+	static public function convert_data_for_persistent_storage($registrations) {
 		if (
-			! is_array( $registrations )
-			|| ! reset( $registrations ) instanceof EE_Registration
+			! is_array($registrations)
+			|| ! reset($registrations) instanceof EE_Registration
 		) {
 			return array();
 		}
@@ -70,8 +70,8 @@ 
 
 		$registration_ids = array_filter(
 			array_map(
-				function( $registration ) {
-					if ( $registration instanceof EE_Registration ) {
+				function($registration) {
+					if ($registration instanceof EE_Registration) {
 						return $registration->ID();
 					}
 				},
@@ -95,16 +95,16 @@ 
 	 *
 	 * @return EE_Registration[]
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		//since this was added later, we need to account of possible back compat issues where data already queued for generation
 		//is in the old format, which is an array of EE_Registration objects.  So if that's the case, then let's just return them
 		//@see https://events.codebasehq.com/projects/event-espresso/tickets/10127
-		if ( is_array( $data ) && reset( $data ) instanceof EE_Registration ) {
+		if (is_array($data) && reset($data) instanceof EE_Registration) {
 			return $data;
 		}
 
-		$registrations = is_array( $data )
-				? EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $data ) ) ) )
+		$registrations = is_array($data)
+				? EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $data))))
 				: array();
 		return $registrations;
 	}

payment_methods/Paypal_Standard/EE_Paypal_Standard_Form.form.php

Indentation +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@
 
 
 
-    /**
-     * @param array $req_data
-     * @throws EE_Error
-     */
-    public function _normalize( $req_data ) {
+	/**
+	 * @param array $req_data
+	 * @throws EE_Error
+	 */
+	public function _normalize( $req_data ) {
 		parent::_normalize( $req_data );
 		$paypal_calculates_shipping = $this->get_input_value( 'paypal_shipping' );
 		$paypal_calculates_taxes = $this->get_input_value( 'paypal_taxes' );

Spacing +37 added lines, -37 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,35 +21,35 @@ 
 	/**
 	 * @param EE_PMT_Paypal_Standard $payment_method_type
 	 */
-	public function __construct( $payment_method_type ){
+	public function __construct($payment_method_type) {
 		parent::__construct(
 			array(
 				'payment_method_type'          => $payment_method_type,
 				'extra_meta_inputs'            => array(
-					'paypal_id'        => new EE_Text_Input( array(
-						'html_label_text' => sprintf( __( "Paypal Email %s", 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( "Typically payment@example-domain.com", 'event_espresso' ),
+					'paypal_id'        => new EE_Text_Input(array(
+						'html_label_text' => sprintf(__("Paypal Email %s", 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __("Typically payment@example-domain.com", 'event_espresso'),
 						'required'        => true
-					) ),
-					'image_url'        => new EE_Admin_File_Uploader_Input( array(
-						'html_help_text'  => __( "Used for your business/personal logo on the PayPal page", 'event_espresso' ),
-						'html_label_text' => __( 'Image URL', 'event_espresso' )
-					) ),
-					'paypal_taxes'     => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Taxes %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add taxes to the order', 'event_espresso' ),
+					)),
+					'image_url'        => new EE_Admin_File_Uploader_Input(array(
+						'html_help_text'  => __("Used for your business/personal logo on the PayPal page", 'event_espresso'),
+						'html_label_text' => __('Image URL', 'event_espresso')
+					)),
+					'paypal_taxes'     => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Taxes %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add taxes to the order', 'event_espresso'),
 						'default'         => false
-					) ),
-					'paypal_shipping'  => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Shipping %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add shipping surcharges', 'event_espresso' ),
+					)),
+					'paypal_shipping'  => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Shipping %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add shipping surcharges', 'event_espresso'),
 						'default'         => false
-					) ),
-					'shipping_details' => new EE_Select_Input( array(
-						EE_PMT_Paypal_Standard::shipping_info_none     => __( "Do not prompt for an address", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_optional => __( "Prompt for an address, but do not require it", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_required => __( "Prompt for an address, and require it", 'event_espresso' )
-					) )
+					)),
+					'shipping_details' => new EE_Select_Input(array(
+						EE_PMT_Paypal_Standard::shipping_info_none     => __("Do not prompt for an address", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_optional => __("Prompt for an address, but do not require it", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_required => __("Prompt for an address, and require it", 'event_espresso')
+					))
 				)
 			)
 		);
@@ -61,28 +61,28 @@ 
      * @param array $req_data
      * @throws EE_Error
      */
-    public function _normalize( $req_data ) {
-		parent::_normalize( $req_data );
-		$paypal_calculates_shipping = $this->get_input_value( 'paypal_shipping' );
-		$paypal_calculates_taxes = $this->get_input_value( 'paypal_taxes' );
-		$paypal_requests_address_info = $this->get_input_value( 'shipping_details' );
+    public function _normalize($req_data) {
+		parent::_normalize($req_data);
+		$paypal_calculates_shipping = $this->get_input_value('paypal_shipping');
+		$paypal_calculates_taxes = $this->get_input_value('paypal_taxes');
+		$paypal_requests_address_info = $this->get_input_value('shipping_details');
 		if (
-			( $paypal_calculates_shipping || $paypal_calculates_taxes ) &&
+			($paypal_calculates_shipping || $paypal_calculates_taxes) &&
 			$paypal_requests_address_info == EE_PMT_Paypal_Standard::shipping_info_none
 		) {
 			//they want paypal to calculate taxes or shipping. They need to ask for
 			//address info, otherwise paypal can't calculate taxes or shipping
 			/** @type EE_Select_Input $shipping_details_input */
-			$shipping_details_input = $this->get_input( 'shipping_details' );
-			$shipping_details_input->set_default( EE_PMT_Paypal_Standard::shipping_info_optional );
+			$shipping_details_input = $this->get_input('shipping_details');
+			$shipping_details_input->set_default(EE_PMT_Paypal_Standard::shipping_info_optional);
 			$shipping_details_input_options = $shipping_details_input->options();
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso' ),
-					strip_tags( $shipping_details_input->html_label_text() ),
-					isset( $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ] )
-						? $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ]
-						: __( 'Unknown', 'event_espresso' )
+					__('Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso'),
+					strip_tags($shipping_details_input->html_label_text()),
+					isset($shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional])
+						? $shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional]
+						: __('Unknown', 'event_espresso')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);

admin_pages/messages/EE_Message_List_Table.class.php

Spacing +105 added lines, -105 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -26,8 +26,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_get_messages( $this->_per_page, $this->_view );
-		$this->_all_data_count = $this->_get_messages( $this->_per_page, $this->_view, true );
+		$this->_data = $this->_get_messages($this->_per_page, $this->_view);
+		$this->_all_data_count = $this->_get_messages($this->_per_page, $this->_view, true);
 	}
 
 
@@ -35,32 +35,32 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __( 'Message', 'event_espresso' ),
-			'plural' => __( 'Messages', 'event_espresso' ),
+			'singular' => __('Message', 'event_espresso'),
+			'plural' => __('Messages', 'event_espresso'),
 			'ajax' => true,
 			'screen' => $this->get_admin_page()->get_current_screen()->id
 		);
 
 		$this->_columns = array(
 			'cb' => '<input type="checkbox" />',
-			'to' => __( 'To', 'event_espresso' ),
-			'from' => __( 'From', 'event_espresso' ),
-			'messenger' => __( 'Messenger', 'event_espresso' ),
-			'message_type' => __( 'Message Type', 'event_espresso' ),
-			'context' => __( 'Context', 'event_espresso' ),
-			'modified' => __( 'Modified', 'event_espresso' ),
-			'action' => __( 'Actions', 'event_espresso' ),
-			'msg_id' => __( 'ID', 'event_espresso' ),
+			'to' => __('To', 'event_espresso'),
+			'from' => __('From', 'event_espresso'),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'message_type' => __('Message Type', 'event_espresso'),
+			'context' => __('Context', 'event_espresso'),
+			'modified' => __('Modified', 'event_espresso'),
+			'action' => __('Actions', 'event_espresso'),
+			'msg_id' => __('ID', 'event_espresso'),
 		);
 
 		$this->_sortable_columns = array(
-			'modified' => array( 'MSG_modified' => true ),
-			'message_type' => array( 'MSG_message_type' => false ),
-			'messenger' => array( 'MSG_messenger' => false ),
-			'to' => array( 'MSG_to' => false ),
-			'from' => array( 'MSG_from' => false ),
-			'context' => array( 'MSG_context' => false ),
-			'msg_id' => array( 'MSG_ID', false ),
+			'modified' => array('MSG_modified' => true),
+			'message_type' => array('MSG_message_type' => false),
+			'messenger' => array('MSG_messenger' => false),
+			'to' => array('MSG_to' => false),
+			'from' => array('MSG_from' => false),
+			'context' => array('MSG_context' => false),
+			'msg_id' => array('MSG_ID', false),
 		);
 
 		$this->_primary_column = 'to';
@@ -78,11 +78,11 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip msg-status-' . $item->STS_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip msg-status-'.$item->STS_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -110,8 +110,8 @@ 
 		);
 
 		//set filters to select inputs if they aren't empty
-		foreach ( $select_inputs as $select_input ) {
-			if ( $select_input ) {
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
 				$filters[] = $select_input;
 			}
 		}
@@ -121,8 +121,8 @@ 
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args ) {
-			$this->_views[ $view ]['count'] = $this->_get_messages( $this->_per_page, $view, true, true );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
 		}
 	}
 
@@ -133,8 +133,8 @@ 
 	 * @return string   checkbox
 	 * @throws \EE_Error
 	 */
-	public function column_cb( $message ) {
-		return sprintf( '<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID() );
+	public function column_cb($message) {
+		return sprintf('<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID());
 	}
 
 
@@ -144,7 +144,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_msg_id( EE_Message $message ) {
+	public function column_msg_id(EE_Message $message) {
 		return $message->ID();
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @return string    The recipient of the message
 	 * @throws \EE_Error
 	 */
-	public function column_to( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'URL' );
+	public function column_to(EE_Message $message) {
+		EE_Registry::instance()->load_helper('URL');
 		$actions = array();
 		$actions['delete'] = '<a href="'
 			. EEH_URL::add_query_args_and_nonce(
@@ -165,10 +165,10 @@ 
 					'action' => 'delete_ee_message',
 					'MSG_ID' => $message->ID()
 				),
-				admin_url( 'admin.php' )
+				admin_url('admin.php')
 			)
-			. '">' . __( 'Delete', 'event_espresso' ) . '</a>';
-		return esc_html( $message->to() ) . $this->row_actions( $actions );
+			. '">'.__('Delete', 'event_espresso').'</a>';
+		return esc_html($message->to()).$this->row_actions($actions);
 	}
 
 
@@ -176,8 +176,8 @@ 
 	 * @param EE_Message $message
 	 * @return string   The sender of the message
 	 */
-	public function column_from( EE_Message $message ) {
-		return esc_html( $message->from() );
+	public function column_from(EE_Message $message) {
+		return esc_html($message->from());
 	}
 
 
@@ -186,8 +186,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The messenger used to send the message.
 	 */
-	public function column_messenger( EE_Message $message ) {
-		return ucwords( $message->messenger_label() );
+	public function column_messenger(EE_Message $message) {
+		return ucwords($message->messenger_label());
 	}
 
 
@@ -195,8 +195,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The message type used to generate the message.
 	 */
-	public function column_message_type( EE_Message $message ) {
-		return ucwords( $message->message_type_label() );
+	public function column_message_type(EE_Message $message) {
+		return ucwords($message->message_type_label());
 	}
 
 
@@ -204,7 +204,7 @@ 
 	 * @param EE_Message $message
 	 * @return string  The context the message was generated for.
 	 */
-	public function column_context( EE_Message $message ) {
+	public function column_context(EE_Message $message) {
 		return $message->context_label();
 	}
 
@@ -213,7 +213,7 @@ 
 	 * @param EE_Message $message
 	 * @return string    The timestamp when this message was last modified.
 	 */
-	public function column_modified( EE_Message $message ) {
+	public function column_modified(EE_Message $message) {
 		return $message->modified();
 	}
 
@@ -222,36 +222,36 @@ 
 	 * @param EE_Message $message
 	 * @return string   Actions that can be done on the current message.
 	 */
-	public function column_action( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public function column_action(EE_Message $message) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$action_links = array(
-			'view' => EEH_MSG_Template::get_message_action_link( 'view', $message ),
-			'error' => EEH_MSG_Template::get_message_action_link( 'error', $message ),
-			'generate_now' => EEH_MSG_Template::get_message_action_link( 'generate_now', $message ),
-			'send_now' => EEH_MSG_Template::get_message_action_link( 'send_now', $message ),
-			'queue_for_resending' => EEH_MSG_Template::get_message_action_link( 'queue_for_resending', $message ),
-			'view_transaction' => EEH_MSG_Template::get_message_action_link( 'view_transaction', $message ),
+			'view' => EEH_MSG_Template::get_message_action_link('view', $message),
+			'error' => EEH_MSG_Template::get_message_action_link('error', $message),
+			'generate_now' => EEH_MSG_Template::get_message_action_link('generate_now', $message),
+			'send_now' => EEH_MSG_Template::get_message_action_link('send_now', $message),
+			'queue_for_resending' => EEH_MSG_Template::get_message_action_link('queue_for_resending', $message),
+			'view_transaction' => EEH_MSG_Template::get_message_action_link('view_transaction', $message),
 		);
 		$content = '';
-		switch ( $message->STS_ID() ) {
+		switch ($message->STS_ID()) {
 			case EEM_Message::status_sent :
-				$content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['queue_for_resending'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_resend :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_retry :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_failed :
 			case EEM_Message::status_debug_only :
-				$content = $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_idle :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_incomplete;
-				$content = $action_links['generate_now'] . $action_links['view_transaction'];
+				$content = $action_links['generate_now'].$action_links['view_transaction'];
 				break;
 		}
 		return $content;
@@ -269,54 +269,54 @@ 
 	 * @return int | EE_Message[]
 	 * @throws \EE_Error
 	 */
-	protected function _get_messages( $perpage = 10, $view = 'all', $count = false, $all = false ) {
+	protected function _get_messages($perpage = 10, $view = 'all', $count = false, $all = false) {
 
-		$current_page = isset( $this->_req_data['paged'] ) && ! empty( $this->_req_data['paged'] )
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
 			? $this->_req_data['paged']
 			: 1;
 
-		$per_page = isset( $this->_req_data['perpage'] ) && ! empty( $this->_req_data['perpage'] )
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
 			? $this->_req_data['perpage']
 			: $perpage;
 
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $all || $count ? null : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all || $count ? null : array($offset, $per_page);
 		$query_params = array(
-			'order_by' => empty( $this->_req_data[ 'orderby' ] ) ? 'MSG_modified' : $this->_req_data[ 'orderby' ],
-			'order'    => empty( $this->_req_data[ 'order' ] ) ? 'DESC' : $this->_req_data[ 'order' ],
+			'order_by' => empty($this->_req_data['orderby']) ? 'MSG_modified' : $this->_req_data['orderby'],
+			'order'    => empty($this->_req_data['order']) ? 'DESC' : $this->_req_data['order'],
 			'limit'    => $limit,
 		);
 
 		/**
 		 * Any filters coming in from other routes?
 		 */
-		if ( isset( $this->_req_data['filterby'] ) ) {
-			$query_params = array_merge( $query_params, EEM_Message::instance()->filter_by_query_params() );
-			if ( ! $count ) {
+		if (isset($this->_req_data['filterby'])) {
+			$query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
+			if ( ! $count) {
 				$query_params['group_by'] = 'MSG_ID';
 			}
 		}
 
 		//view conditionals
-		if ( $view !== 'all' && $count && $all ) {
+		if ($view !== 'all' && $count && $all) {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $view ),
+				'STS_ID' => strtoupper($view),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] !== 'all' ) {
+		if ( ! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $this->_req_data['status'] ),
+				'STS_ID' => strtoupper($this->_req_data['status']),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if ( ! $all && ! empty($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'MSG_to' => array( 'LIKE', $search_string ),
-				'MSG_from' => array( 'LIKE', $search_string ),
-				'MSG_subject' => array( 'LIKE', $search_string ),
-				'MSG_content' => array( 'LIKE', $search_string ),
+				'MSG_to' => array('LIKE', $search_string),
+				'MSG_from' => array('LIKE', $search_string),
+				'MSG_subject' => array('LIKE', $search_string),
+				'MSG_content' => array('LIKE', $search_string),
 			);
 		}
 
@@ -324,16 +324,16 @@ 
 		//the messages system is in debug mode.
 		//Note: for backward compat with previous iterations, this is necessary because there may be EEM_Message::status_debug_only
 		//messages in the database.
-		if ( ! EEM_Message::debug() ) {
+		if ( ! EEM_Message::debug()) {
 			$query_params[0]['AND*debug_only_conditional'] = array(
-				'STS_ID' => array( '!=', EEM_Message::status_debug_only )
+				'STS_ID' => array('!=', EEM_Message::status_debug_only)
 			);
 		}
 
 		//account for filters
 		if (
 			! $all
-			&& isset( $this->_req_data['ee_messenger_filter_by'] )
+			&& isset($this->_req_data['ee_messenger_filter_by'])
 			&& $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*messenger_filter'] = array(
@@ -342,7 +342,7 @@ 
 		}
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_message_type_filter_by'] )
+			&& ! empty($this->_req_data['ee_message_type_filter_by'])
 			&& $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*message_type_filter'] = array(
@@ -352,17 +352,17 @@ 
 
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_context_filter_by'] )
+			&& ! empty($this->_req_data['ee_context_filter_by'])
 			&& $this->_req_data['ee_context_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*context_filter'] = array(
-				'MSG_context' => array( 'IN', explode( ',', $this->_req_data['ee_context_filter_by'] ) )
+				'MSG_context' => array('IN', explode(',', $this->_req_data['ee_context_filter_by']))
 			);
 		}
 
 		return $count
-			? EEM_Message::instance()->count( $query_params, null, true )
-			: EEM_Message::instance()->get_all( $query_params );
+			? EEM_Message::instance()->count($query_params, null, true)
+			: EEM_Message::instance()->get_all($query_params);
 	}
 
 
@@ -372,15 +372,15 @@ 
 	 */
 	protected function _get_messengers_dropdown_filter() {
 		$messenger_options = array();
-		$active_messages_grouped_by_messenger = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_messenger' ) );
+		$active_messages_grouped_by_messenger = EEM_Message::instance()->get_all(array('group_by' => 'MSG_messenger'));
 
 		//setup array of messenger options
-		foreach ( $active_messages_grouped_by_messenger as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
-				$messenger_options[ $active_message->messenger() ] = ucwords( $active_message->messenger_label() );
+		foreach ($active_messages_grouped_by_messenger as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$messenger_options[$active_message->messenger()] = ucwords($active_message->messenger_label());
 			}
 		}
-		return $this->get_admin_page()->get_messengers_select_input( $messenger_options );
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
 	}
 
 
@@ -391,15 +391,15 @@ 
 	 */
 	protected function _get_message_types_dropdown_filter() {
 		$message_type_options = array();
-		$active_messages_grouped_by_message_type = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_message_type' ) );
+		$active_messages_grouped_by_message_type = EEM_Message::instance()->get_all(array('group_by' => 'MSG_message_type'));
 
 		//setup array of message type options
-		foreach ( $active_messages_grouped_by_message_type as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
-				$message_type_options[ $active_message->message_type() ] = ucwords( $active_message->message_type_label() );
+		foreach ($active_messages_grouped_by_message_type as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$message_type_options[$active_message->message_type()] = ucwords($active_message->message_type_label());
 			}
 		}
-		return $this->get_admin_page()->get_message_types_select_input( $message_type_options );
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
 	}
 
 
@@ -409,21 +409,21 @@ 
 	 */
 	protected function _get_contexts_for_message_types_dropdown_filter() {
 		$context_options = array();
-		$active_messages_grouped_by_context = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_context' ) );
+		$active_messages_grouped_by_context = EEM_Message::instance()->get_all(array('group_by' => 'MSG_context'));
 
 		//setup array of context options
-		foreach ( $active_messages_grouped_by_context as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
+		foreach ($active_messages_grouped_by_context as $active_message) {
+			if ($active_message instanceof EE_Message) {
 				$message_type = $active_message->message_type_object();
-				if ( $message_type instanceof EE_message_type ) {
-					foreach ( $message_type->get_contexts() as $context => $context_details ) {
-						if ( isset( $context_details['label'] ) ) {
-							$context_options[ $context ] = $context_details['label'];
+				if ($message_type instanceof EE_message_type) {
+					foreach ($message_type->get_contexts() as $context => $context_details) {
+						if (isset($context_details['label'])) {
+							$context_options[$context] = $context_details['label'];
 						}
 					}
 				}
 			}
 		}
-		return $this->get_admin_page()->get_contexts_for_message_types_select_input( $context_options );
+		return $this->get_admin_page()->get_contexts_for_message_types_select_input($context_options);
 	}
 } //end EE_Message_List_Table class
\ No newline at end of file

caffeinated/core/libraries/messages/message_type/newsletter/EE_Messages_Contacts_incoming_data.class.php

Spacing +12 added lines, -12 removed lines

@@ -27,14 +27,14 @@ 
 	 * @throws EE_Error
 	 * @access protected
 	 */
-	public function __construct( $data = array() ) {
+	public function __construct($data = array()) {
 
 		//validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
-		$ctc_chk = reset( $data );
-		if ( ! $ctc_chk instanceof EE_Attendee )
-			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+		$ctc_chk = reset($data);
+		if ( ! $ctc_chk instanceof EE_Attendee)
+			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso'));
 
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 
@@ -43,11 +43,11 @@ 
 	 * @param array $attendees
 	 * @return array
 	 */
-	public static function convert_data_for_persistent_storage( $attendees ) {
+	public static function convert_data_for_persistent_storage($attendees) {
 		$attendee_ids = array_filter(
 			array_map(
-				function( $attendee ) {
-					if ( $attendee instanceof EE_Attendee ) {
+				function($attendee) {
+					if ($attendee instanceof EE_Attendee) {
 						return $attendee->ID();
 					}
 					return false;
@@ -66,11 +66,11 @@ 
 	 * @param array $attendee_ids
 	 * @return EE_Attendee[]
 	 */
-	public static function convert_data_from_persistent_storage( $attendee_ids ) {
+	public static function convert_data_from_persistent_storage($attendee_ids) {
 		$attendee_ids = (array) $attendee_ids;
 		$attendees = EEM_Attendee::instance()->get_all(
 		  array(
-			  array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
+			  array('ATT_ID' => array('IN', $attendee_ids))
 		  )
 		);
 		return $attendees;
@@ -99,7 +99,7 @@ 
 		$this->payment = NULL;
 		$this->billing = array();
 		$this->reg_objs = array();
-		$this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+		$this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer = $this->registrations = array();
 		$this->total_ticket_count = 0;
 		$this->primary_attendee_data = array(
 			'registration_id' => 0,
@@ -109,7 +109,7 @@ 
 			'primary_reg_obj' => NULL
 			);
 
-		foreach ( $this->_data as $contact ) {
+		foreach ($this->_data as $contact) {
 			$id = $contact->ID();
 			$reg = $contact->get_first_related('Registration');
 			$this->attendees[$id]['att_obj'] = $contact;

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This prepares data for message types that send messages for multiple contacts and handles
@@ -31,8 +33,9 @@ 
 
 		//validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
 		$ctc_chk = reset( $data );
-		if ( ! $ctc_chk instanceof EE_Attendee )
-			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+		if ( ! $ctc_chk instanceof EE_Attendee ) {
+					throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+		}
 
 		parent::__construct( $data );
 	}

modules/ticket_selector/templates/ticket_selector_chart.template.php

Spacing +156 added lines, -156 removed lines

@@ -11,18 +11,18 @@ 
 
 $row = 1;
 $max = 1;
-$ticket_count = count( $tickets );
+$ticket_count = count($tickets);
 $ticket_status_display = '';
-if ( ! $ticket_count ) {
+if ( ! $ticket_count) {
 	return;
 }
 
 $required_ticket_sold_out = FALSE;
-$template_settings = isset ( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector )
+$template_settings = isset (EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector)
 	? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector
 	: new EE_Ticket_Selector_Config();
 
-$tax_settings = isset ( EE_Registry::instance()->CFG->tax_settings )
+$tax_settings = isset (EE_Registry::instance()->CFG->tax_settings)
 	? EE_Registry::instance()->CFG->tax_settings
 	: new EE_Tax_Config();
 
@@ -31,22 +31,22 @@ 
 
 ob_start();
 
-foreach ( $tickets as $TKT_ID => $ticket ) {
-	if ( $ticket instanceof EE_Ticket ) {
+foreach ($tickets as $TKT_ID => $ticket) {
+	if ($ticket instanceof EE_Ticket) {
 		$cols = 2;
 		$max = $ticket->max();
 		$min = 0;
 		$remaining = $ticket->remaining();
-		if ( $ticket->is_on_sale() && $ticket->is_remaining() ) {
+		if ($ticket->is_on_sale() && $ticket->is_remaining()) {
 			// offer the number of $tickets_remaining or $max_atndz, whichever is smaller
-			$max = min( $remaining, $max_atndz );
+			$max = min($remaining, $max_atndz);
 			// but... we also want to restrict the number of tickets by the ticket max setting,
 			// however, the max still can't be higher than what was just set above
-			$max = $ticket->max() > 0 ? min( $ticket->max(), $max ) : $max;
+			$max = $ticket->max() > 0 ? min($ticket->max(), $max) : $max;
 			// and we also want to restrict the minimum number of tickets by the ticket min setting
 			$min = $ticket->min() > 0 ? $ticket->min() : 0;
 			// and if the ticket is required, then make sure that min qty is at least 1
-			$min = $ticket->required() ? max( $min, 1 ) : $min;
+			$min = $ticket->required() ? max($min, 1) : $min;
 		} else {
 			// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
 			$required_ticket_sold_out = $ticket->required() && ! $remaining ? $ticket->start_date() : $required_ticket_sold_out;
@@ -58,41 +58,41 @@ 
 		$taxable_tickets = $ticket->taxable() ? true : $taxable_tickets;
 		$ticket_bundle = FALSE;
 		// for ticket bundles, set min and max qty the same
-		if ( $ticket->min() !== 0 && $ticket->min() === $ticket->max() ) {
+		if ($ticket->min() !== 0 && $ticket->min() === $ticket->max()) {
 			$ticket_price *= $ticket->min();
 			$ticket_bundle = TRUE;
 		}
-		$ticket_price = apply_filters( 'FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket );
+		$ticket_price = apply_filters('FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket);
 		// if a previous required ticket with the same sale start date is sold out, then mark this ticket as sold out as well.
 		// tickets that go on sale at a later date than the required ticket  will NOT be affected
 		$tkt_status = $required_ticket_sold_out !== FALSE && $required_ticket_sold_out === $ticket->start_date() ? EE_Ticket::sold_out : $ticket->ticket_status();
 		$tkt_status = $event_status === EE_Datetime::sold_out ? EE_Ticket::sold_out : $tkt_status;
 		// check ticket status
-		switch ( $tkt_status ) {
+		switch ($tkt_status) {
 			// sold_out
 			case EE_Ticket::sold_out :
-				$ticket_status = '<span class="ticket-sales-sold-out">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-sold-out">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-sold-out lt-grey-text';
 			break;
 			// expired
 			case EE_Ticket::expired :
-				$ticket_status = '<span class="ticket-sales-expired">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-expired">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-expired lt-grey-text';
 			break;
 			// archived
 			case EE_Ticket::archived :
-				$ticket_status = '<span class="archived-ticket">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="archived-ticket">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'archived-ticket hidden';
 			break;
 			// pending
 			case EE_Ticket::pending :
-				$ticket_status = '<span class="ticket-pending">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-pending">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-pending';
 			break;
 			// onsale
 			case EE_Ticket::onsale :
 			default :
-				$ticket_status = '<span class="ticket-on-sale">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-on-sale">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-on-sale';
 			break;
 		}
@@ -132,7 +132,7 @@ 
             "tckt-slctr-tkt-details-{$EVT_ID}-{$TKT_ID}"
         );
 	?>
-				<tr class="tckt-slctr-tbl-tr <?php echo $status_class . ' ' . espresso_get_object_css_class( $ticket ); ?>">
+				<tr class="tckt-slctr-tbl-tr <?php echo $status_class.' '.espresso_get_object_css_class($ticket); ?>">
 		<?php
 		/**
 		 * Allow plugins to hook in and abort the generation and display of the contents of this
@@ -144,24 +144,24 @@ 
 		 *
 		 * @var string|bool
 		 */
-		if ( false !== ( $new_row_cells_content = apply_filters( 'FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class ) ) ) {
+		if (false !== ($new_row_cells_content = apply_filters('FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class))) {
 			echo $new_row_cells_content;
 			echo '</tr>';
 			continue;
 		}
 		?>
 					<td class="tckt-slctr-tbl-td-name">
-						<b><?php echo $ticket->get_pretty('TKT_name');?></b>
-						<?php if ( $template_settings->show_ticket_details ) : ?>
-							<a id="display-<?php echo $ticket_details_css_id; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __( 'click to show additional ticket details', 'event_espresso' )) ); ?>">
-								<?php echo sprintf( __( 'show%1$sdetails%1$s+', 'event_espresso' ), '&nbsp;' ); ?>
+						<b><?php echo $ticket->get_pretty('TKT_name'); ?></b>
+						<?php if ($template_settings->show_ticket_details) : ?>
+							<a id="display-<?php echo $ticket_details_css_id; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __('click to show additional ticket details', 'event_espresso'))); ?>">
+								<?php echo sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), '&nbsp;'); ?>
 							</a>
-							<a id="hide-<?php echo $ticket_details_css_id; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __( 'click to hide additional ticket details', 'event_espresso' )) ); ?>" style="display:none;">
-								<?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?>
+							<a id="hide-<?php echo $ticket_details_css_id; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __('click to hide additional ticket details', 'event_espresso'))); ?>" style="display:none;">
+								<?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?>
 							</a>
 						<?php endif; //end show details check ?>
-					<?php if ( $ticket->required() ) { ?>
-						<p class="ticket-required-pg"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_required_message', __( 'This ticket is required and must be purchased.', 'event_espresso' )); ?></p>
+					<?php if ($ticket->required()) { ?>
+						<p class="ticket-required-pg"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_required_message', __('This ticket is required and must be purchased.', 'event_espresso')); ?></p>
 					<?php } ?>
 					<?php
 //	echo '<br/><b>$max_atndz : ' . $max_atndz . '</b>';
@@ -177,16 +177,16 @@ 
 					</td>
 					<?php
 					if (
-						apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )
+						apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)
 					) { ?>
 					<td class="tckt-slctr-tbl-td-price jst-rght"><?php
-						echo EEH_Template::format_currency( $ticket_price );
+						echo EEH_Template::format_currency($ticket_price);
 						echo $ticket->taxable() ? '<span class="taxable-tickets-asterisk grey-text">*</span>' : '';
 						?>&nbsp;<span class="smaller-text no-bold"><?php
-						if ( $ticket_bundle ) {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __( ' / bundle', 'event_espresso' ));
+						if ($ticket_bundle) {
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __(' / bundle', 'event_espresso'));
 						} else {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_text', __( '', 'event_espresso' ));
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_text', __('', 'event_espresso'));
 						}?></span>&nbsp;</td>
 						<?php $cols++; ?>
 					<?php } ?>
@@ -194,28 +194,28 @@ 
 					<?php
 					$hidden_input_qty = $max_atndz > 1 ? TRUE : FALSE;
 					$ticket_status_display = '';
-					if ( $max_atndz === 0 ) {
+					if ($max_atndz === 0) {
 						// registration is CLOSED because admin set max attendees to ZERO
-						$ticket_status_display = '<span class="sold-out">' . apply_filters(
+						$ticket_status_display = '<span class="sold-out">'.apply_filters(
 													 'FHEE__ticket_selector_chart_template__ticket_closed_msg',
-													 __( 'Closed', 'event_espresso' )
-												 ) . '</span>';
-					} else if ( $tkt_status === EE_Ticket::sold_out || $remaining === 0 ) {
+													 __('Closed', 'event_espresso')
+												 ).'</span>';
+					} else if ($tkt_status === EE_Ticket::sold_out || $remaining === 0) {
 						// SOLD OUT - no tickets remaining
-						$ticket_status_display = '<span class="sold-out">' . apply_filters(
+						$ticket_status_display = '<span class="sold-out">'.apply_filters(
 													'FHEE__ticket_selector_chart_template__ticket_sold_out_msg',
-													__( 'Sold&nbsp;Out', 'event_espresso' )
-												) . '</span>';
-					} else if ( $tkt_status === EE_Ticket::expired || $tkt_status === EE_Ticket::archived ) {
+													__('Sold&nbsp;Out', 'event_espresso')
+												).'</span>';
+					} else if ($tkt_status === EE_Ticket::expired || $tkt_status === EE_Ticket::archived) {
 						// expired or archived ticket
 						$ticket_status_display = $ticket_status;
-					} else if ( $tkt_status === EE_Ticket::pending ) {
+					} else if ($tkt_status === EE_Ticket::pending) {
 						// ticket not on sale yet
 						$ticket_status_display = '<span class="ticket-pending-pg">
 						<span class="ticket-pending">'
 						. apply_filters(
 							'FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg',
-							__( 'Goes&nbsp;On&nbsp;Sale', 'event_espresso' )
+							__('Goes&nbsp;On&nbsp;Sale', 'event_espresso')
 						 )
 					. '</span><br/>
 						<span class="small-text">'
@@ -228,36 +228,36 @@ 
 						)
 					. '</span>
 					</span>';
-					} else if ( $ticket->min() > $remaining ) {
+					} else if ($ticket->min() > $remaining) {
 						// min qty purchasable is less than tickets available
 						$ticket_status_display = '
 					<div class="archived-ticket-pg">
 						<span class="archived-ticket small-text">'
-						 . apply_filters( 'FHEE__ticket_selector_chart_template__ticket_not_available_msg', __( 'Not Available', 'event_espresso' ))
+						 . apply_filters('FHEE__ticket_selector_chart_template__ticket_not_available_msg', __('Not Available', 'event_espresso'))
 					 . '</span><br/>
 					</div>';
-					} else if ( $max_atndz  === 1 ) {
+					} else if ($max_atndz === 1) {
 						// only ONE attendee is allowed to register at a time
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 					?>
-						<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row . '-'; ?>1" <?php echo $row === 1 ? ' checked="checked"' : ''; ?>  title=""/>
+						<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row.'-'; ?>1" <?php echo $row === 1 ? ' checked="checked"' : ''; ?>  title=""/>
 					<?php
 						$hidden_input_qty = FALSE;
 
-					} else if ( $max > 0 ) {
+					} else if ($max > 0) {
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 					?>
-					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" title="">
+					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" title="">
 					<?php
 						// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-						if ( ! $ticket->required() && $min !== 0 ) {
+						if ( ! $ticket->required() && $min !== 0) {
 					?>
 						<option value="0">&nbsp;0&nbsp;</option>
 					<?php }
 						// offer ticket quantities from the min to the max
-						for ( $i = $min; $i <= $max; $i++) {
+						for ($i = $min; $i <= $max; $i++) {
 					?>
 						<option value="<?php echo $i; ?>">&nbsp;<?php echo $i; ?>&nbsp;</option>
 					<?php } ?>
@@ -268,7 +268,7 @@ 
 					}
 					echo $ticket_status_display;
 					// depending on group reg we need to change the format for qty
-					if ( $hidden_input_qty ) {
+					if ($hidden_input_qty) {
 					?>
 					<input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="0" />
 					<?php
@@ -278,33 +278,33 @@ 
 
 					</td>
 				</tr>
-				<?php if ( $template_settings->show_ticket_details ) : ?>
-					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class( $ticket, '', 'details' );?>">
+				<?php if ($template_settings->show_ticket_details) : ?>
+					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class($ticket, '', 'details'); ?>">
 						<td class="tckt-slctr-tkt-details-td" colspan="<?php echo $cols; ?>" >
 							<div id="<?php echo $ticket_details_css_id; ?>-dv" class="tckt-slctr-tkt-details-dv" style="display: none;">
 
 								<section class="tckt-slctr-tkt-details-sctn">
-									<h3><?php _e( 'Details', 'event_espresso' ); ?></h3>
+									<h3><?php _e('Details', 'event_espresso'); ?></h3>
 									<p><?php echo $ticket->description(); ?></p>
 
-									<?php if ( $ticket_price !== 0 && apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE ) ) { ?>
+									<?php if ($ticket_price !== 0 && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 									<section class="tckt-slctr-tkt-price-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __( 'Price', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __('Price', 'event_espresso')); ?></h5>
 										<div class="tckt-slctr-tkt-details-tbl-wrap-dv">
 											<table class="tckt-slctr-tkt-details-tbl">
 												<thead>
 													<tr>
-														<th class="ee-third-width"><span class="small-text"><?php _e( 'Name', 'event_espresso' ); ?></span></th>
-														<th class="jst-cntr"><span class="small-text"><?php _e( 'Description', 'event_espresso' ); ?></span></th>
-														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e( 'Amount', 'event_espresso' ); ?></span></th>
+														<th class="ee-third-width"><span class="small-text"><?php _e('Name', 'event_espresso'); ?></span></th>
+														<th class="jst-cntr"><span class="small-text"><?php _e('Description', 'event_espresso'); ?></span></th>
+														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e('Amount', 'event_espresso'); ?></span></th>
 													</tr>
 												</thead>
 												<tbody>
-										<?php if ( $ticket->base_price() instanceof EE_Price ) { ?>
+										<?php if ($ticket->base_price() instanceof EE_Price) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
 													</tr>
 													<?php
 															$running_total = $ticket->base_price()->amount();
@@ -312,44 +312,44 @@ 
 															$running_total = 0;
 														}
 														// now add price modifiers
-														foreach ( $ticket->price_modifiers() as $price_mod ) { ?>
+														foreach ($ticket->price_modifiers() as $price_mod) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
-													<?php if ( $price_mod->is_percent() ) { ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
+													<?php if ($price_mod->is_percent()) { ?>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
 														<?php
-															$new_sub_total = $running_total * ( $price_mod->amount() / 100 );
+															$new_sub_total = $running_total * ($price_mod->amount() / 100);
 															$new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
 														?>
 													<?php } else { ?>
 														<?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1 : $price_mod->amount(); ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $price_mod->desc(); ?></td>
 														<?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1 : $price_mod->amount(); ?>
 													<?php } ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $new_sub_total ); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($new_sub_total); ?></td>
 														<?php $running_total += $new_sub_total; ?>
 													</tr>
 												<?php } ?>
-												<?php if ( $ticket->taxable() ) { ?>
+												<?php if ($ticket->taxable()) { ?>
 													<?php //$ticket_subtotal =$ticket->get_ticket_subtotal(); ?>
 													<tr>
-														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e( 'subtotal', 'event_espresso' ); ?></b></td>
-														<td data-th="<?php _e( 'subtotal', 'event_espresso' ); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency( $running_total ); ?></b></td>
+														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e('subtotal', 'event_espresso'); ?></b></td>
+														<td data-th="<?php _e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 
-													<?php foreach ( $ticket->get_ticket_taxes_for_admin() as $tax ) { ?>
+													<?php foreach ($ticket->get_ticket_taxes_for_admin() as $tax) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
-														<?php $tax_amount = $running_total * ( $tax->amount() / 100 ); ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $tax_amount ); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
+														<?php $tax_amount = $running_total * ($tax->amount() / 100); ?>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($tax_amount); ?></td>
 														<?php $running_total += $tax_amount; ?>
 													</tr>
 													<?php } ?>
 												<?php } ?>
 													<tr>
-														<td colspan="2" class="jst-rght small-text ttl-lbl-td"><b><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_total_price', __( 'Total', 'event_espresso' )); ?></b></td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_total_price', __( 'Total', 'event_espresso' )); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency( $running_total ); ?></b></td>
+														<td colspan="2" class="jst-rght small-text ttl-lbl-td"><b><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price', __('Total', 'event_espresso')); ?></b></td>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price', __('Total', 'event_espresso')); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 												</tbody>
 											</table>
@@ -359,106 +359,106 @@ 
 									<?php } ?>
 
 									<section class="tckt-slctr-tkt-sale-dates-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __( 'Sale Dates', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message', __( 'The dates when this option is available for purchase.', 'event_espresso' )); ?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale', __( 'Goes On Sale:', 'event_espresso' )); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime( 'TKT_start_date', $date_format) . ' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime( 'TKT_start_date',  $time_format ) ; ?><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_sales_end', __( 'Sales End:', 'event_espresso' )); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime( 'TKT_end_date', $date_format ) . ' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime( 'TKT_end_date', $time_format ) ; ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __('Sale Dates', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_dates_available_message', __('The dates when this option is available for purchase.', 'event_espresso')); ?></span><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale', __('Goes On Sale:', 'event_espresso')); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format).' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime('TKT_start_date', $time_format); ?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_sales_end', __('Sales End:', 'event_espresso')); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format).' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime('TKT_end_date', $time_format); ?><br/>
 									</section>
 									<br/>
 
-									<?php do_action( 'AHEE__ticket_selector_chart_template__after_ticket_date', $ticket ); ?>
+									<?php do_action('AHEE__ticket_selector_chart_template__after_ticket_date', $ticket); ?>
 
-									<?php if ( $ticket->min() &&$ticket->max() ) { ?>
+									<?php if ($ticket->min() && $ticket->max()) { ?>
 									<section class="tckt-slctr-tkt-quantities-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading', __( 'Purchasable Quantities', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message', __( 'The number of tickets that can be purchased per transaction (if available).', 'event_espresso' )); ?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty', __( 'Minimum Qty:', 'event_espresso' )); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
-										<?php if ( $ticket->min() > $remaining ) { ?> &nbsp; <span class="important-notice small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message', __( 'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining', 'event_espresso' )); ?></span><?php } ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading', __('Purchasable Quantities', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message', __('The number of tickets that can be purchased per transaction (if available).', 'event_espresso')); ?></span><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty', __('Minimum Qty:', 'event_espresso')); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
+										<?php if ($ticket->min() > $remaining) { ?> &nbsp; <span class="important-notice small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message', __('The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining', 'event_espresso')); ?></span><?php } ?><br/>
 										<?php //$max = min( $max, $max_atndz );?>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty', __( 'Maximum Qty:', 'event_espresso' )); ?></span><?php echo $ticket->max() === EE_INF ? __( 'no limit', 'event_espresso' ) : max( $ticket->max(), 1 ); ?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty', __('Maximum Qty:', 'event_espresso')); ?></span><?php echo $ticket->max() === EE_INF ? __('no limit', 'event_espresso') : max($ticket->max(), 1); ?><br/>
 									</section>
 									<br/>
 									<?php } ?>
 
-									<?php if ( $ticket->uses() !== EE_INF && ( ! defined( 'EE_DECAF' ) || EE_DECAF !== TRUE )) { ?>
+									<?php if ($ticket->uses() !== EE_INF && ( ! defined('EE_DECAF') || EE_DECAF !== TRUE)) { ?>
 									<section class="tckt-slctr-tkt-uses-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __( 'Event Date Ticket Uses', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __('Event Date Ticket Uses', 'event_espresso')); ?></h5>
 										<span class="drk-grey-text small-text no-bold"> - <?php
 											echo apply_filters(
 												'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_message',
 												sprintf(
-													__( 'The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s', 'event_espresso' ),
+													__('The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s', 'event_espresso'),
 													'<br/>',
 													'<strong>',
 													'</strong>'
 												)
 											);
 											?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes', __( '# Datetimes:', 'event_espresso' )); ?></span><?php  echo $ticket->uses();?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes', __('# Datetimes:', 'event_espresso')); ?></span><?php  echo $ticket->uses(); ?><br/>
 									</section>
 									<?php } ?>
 
 									<?php
-									$datetimes = $ticket->datetimes_ordered( $event_is_expired, FALSE );
+									$datetimes = $ticket->datetimes_ordered($event_is_expired, FALSE);
 									$chart_column_width = $template_settings->show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
-									if ( ! empty( $datetimes )) { ?>
+									if ( ! empty($datetimes)) { ?>
 									<section class="tckt-slctr-tkt-datetimes-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading', __( 'Access', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_message', __( 'This option allows access to the following dates and times.', 'event_espresso' )); ?></span>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_heading', __('Access', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_message', __('This option allows access to the following dates and times.', 'event_espresso')); ?></span>
 										<div class="tckt-slctr-tkt-details-tbl-wrap-dv">
 											<table class="tckt-slctr-tkt-details-tbl">
 												<thead>
 													<tr>
 														<th class="tckt-slctr-tkt-details-date-th">
-															<span class="dashicons dashicons-calendar"></span><span class="small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __( 'Date ', 'event_espresso' )); ?></span>
+															<span class="dashicons dashicons-calendar"></span><span class="small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __('Date ', 'event_espresso')); ?></span>
 														</th>
 														<th class="tckt-slctr-tkt-details-time-th <?php echo $chart_column_width; ?>">
-															<span class="dashicons dashicons-clock"></span><span class="small-text"><?php _e( 'Time ', 'event_espresso' ); ?></span>
+															<span class="dashicons dashicons-clock"></span><span class="small-text"><?php _e('Time ', 'event_espresso'); ?></span>
 														</th>
-														<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
+														<?php if ($template_settings->show_ticket_sale_columns) : ?>
 															<th class="tckt-slctr-tkt-details-this-ticket-sold-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', sprintf( __( 'Sold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', sprintf(__('Sold', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-this-ticket-left-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', sprintf( __( 'Remaining', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', sprintf(__('Remaining', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-total-tickets-sold-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', sprintf( __( 'Total%sSold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', sprintf(__('Total%sSold', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-total-tickets-left-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', sprintf( __( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', sprintf(__('Total Spaces%sLeft', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 														<?php endif; //end $template_settings->show_ticket_sale_columns conditional ?>
 													</tr>
 												</thead>
 												<tbody>
 											<?php
-												foreach ( $datetimes as $datetime ) {
-													if ( $datetime instanceof EE_Datetime ) {
+												foreach ($datetimes as $datetime) {
+													if ($datetime instanceof EE_Datetime) {
 											?>
 
 												<tr>
-													<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __( 'Event Date ', 'event_espresso' )); ?>" class="small-text">
+													<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __('Event Date ', 'event_espresso')); ?>" class="small-text">
 														<?php $datetime_name = $datetime->name(); ?>
-														<?php echo ! empty( $datetime_name ) ? '<b>' . $datetime_name . '</b><br/>' : ''; ?>
-														<?php echo $datetime->date_range( $date_format, __( ' to  ', 'event_espresso' )); ?>
+														<?php echo ! empty($datetime_name) ? '<b>'.$datetime_name.'</b><br/>' : ''; ?>
+														<?php echo $datetime->date_range($date_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<td data-th="<?php _e( 'Time ', 'event_espresso' ); ?>" class="cntr small-text">
-														<?php echo $datetime->time_range( $time_format, __( ' to  ', 'event_espresso' )); ?>
+													<td data-th="<?php _e('Time ', 'event_espresso'); ?>" class="cntr small-text">
+														<?php echo $datetime->time_range($time_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __( 'Sold', 'event_espresso' )); ?>" class="cntr small-text">
+													<?php if ($template_settings->show_ticket_sale_columns) : ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __('Sold', 'event_espresso')); ?>" class="cntr small-text">
 															<?php echo $ticket->sold(); ?>
 														</td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', __( 'Remaining', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $ticket->qty() - $ticket->sold(); ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', __('Remaining', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $ticket->qty() - $ticket->sold(); ?>
 														</td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __( 'Total Sold', 'event_espresso' )); ?>" class="cntr small-text">
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __('Total Sold', 'event_espresso')); ?>" class="cntr small-text">
 															<?php echo $datetime->sold(); ?>
 														</td>
-												<?php $tkts_left = $datetime->sold_out() ? '<span class="sold-out smaller-text">' . __( 'Sold&nbsp;Out', 'event_espresso' ) . '</span>' : $datetime->spaces_remaining(); ?>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', __( 'Total Spaces Left', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $tkts_left; ?>
+												<?php $tkts_left = $datetime->sold_out() ? '<span class="sold-out smaller-text">'.__('Sold&nbsp;Out', 'event_espresso').'</span>' : $datetime->spaces_remaining(); ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', __('Total Spaces Left', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $tkts_left; ?>
 														</td>
 													<?php endif; //end $template_settings->show_ticket_sale_columns conditional ?>
 												</tr>
@@ -476,7 +476,7 @@ 
 							</div>
 						</td>
 					</tr>
-				<?php endif;  //end template_settings->show_ticket_details check?>
+				<?php endif; //end template_settings->show_ticket_details check?>
 	<?php
 			$row++;
 		}
@@ -485,8 +485,8 @@ 
 $ticket_row_html = ob_get_clean();
 // if there is only ONE ticket with a max qty of ONE, and it is free... then not much need for the ticket selector
 $hide_ticket_selector = $ticket_count === 1 && $max_atndz === 1 && $ticket->is_free() ? true : false;
-$hide_ticket_selector = apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID );
-remove_all_filters( 'FHEE__EE_Ticket_Selector__hide_ticket_selector' );
+$hide_ticket_selector = apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID);
+remove_all_filters('FHEE__EE_Ticket_Selector__hide_ticket_selector');
 // EEH_Debug_Tools::printr( apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false ), 'display submit', __FILE__, __LINE__ );
 // EEH_Debug_Tools::printr( (string) $ticket_count, '$ticket_count', __FILE__, __LINE__ );
 // EEH_Debug_Tools::printr( (string) $max, '$max', __FILE__, __LINE__ );
@@ -500,20 +500,20 @@ 
 * @param string '#tkt-slctr-tbl-' . $EVT_ID The html ID to anchor to
 * @param int $EVT_ID The Event ID
 */
-$anchor_id = apply_filters( 'FHEE__EE_Ticket_Selector__redirect_anchor_id', '#tkt-slctr-tbl-' . $EVT_ID, $EVT_ID );
-if ( ! $hide_ticket_selector ) {
+$anchor_id = apply_filters('FHEE__EE_Ticket_Selector__redirect_anchor_id', '#tkt-slctr-tbl-'.$EVT_ID, $EVT_ID);
+if ( ! $hide_ticket_selector) {
 ?>
 <div id="tkt-slctr-tbl-wrap-dv-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl-wrap-dv">
 
-	<?php do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event ); ?>
+	<?php do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event); ?>
 
 	<table id="tkt-slctr-tbl-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl">
 		<thead>
 			<tr>
 				<th scope="col" class="ee-ticket-selector-ticket-details-th">
-					<?php echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID ) ); ?>
+					<?php echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID)); ?>
 				</th>
-				<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE ) ) { ?>
+				<?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 				<th scope="col" class="ee-ticket-selector-ticket-price-th cntr">
 					<?php
 						/**
@@ -524,7 +524,7 @@ 
 						 * @param string 'Price' The translatable text to display in the table header for price
 						 * @param int $EVT_ID The Event ID
 						 */
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_price', __( 'Price', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_price', __('Price', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 				<?php } ?>
@@ -538,77 +538,77 @@ 
 						* @param string 'Qty*' The translatable text to display in the table header for the Quantity of tickets
 						* @param int $EVT_ID The Event ID
 						*/
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_qty', __( 'Qty*', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_qty', __('Qty*', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
-			<?php echo $ticket_row_html;?>
+			<?php echo $ticket_row_html; ?>
 		</tbody>
 	</table>
 	<?php
-	if ( $taxable_tickets && apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', true ) ) {
-		if ( $tax_settings->prices_displayed_including_taxes ) {
-			$ticket_price_includes_taxes = __( '* price includes taxes', 'event_espresso' );
+	if ($taxable_tickets && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
+		if ($tax_settings->prices_displayed_including_taxes) {
+			$ticket_price_includes_taxes = __('* price includes taxes', 'event_espresso');
 		} else {
-			$ticket_price_includes_taxes = __( '* price does not include taxes', 'event_espresso' );
+			$ticket_price_includes_taxes = __('* price does not include taxes', 'event_espresso');
 		}
-		echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">' . $ticket_price_includes_taxes . '</p>';
+		echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">'.$ticket_price_includes_taxes.'</p>';
 	}
 	?>
 
 	<input type="hidden" name="noheader" value="true" />
-	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url() . $anchor_id; ?>" />
+	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url().$anchor_id; ?>" />
 	<input type="hidden" name="tkt-slctr-rows-<?php echo $EVT_ID; ?>" value="<?php echo $row - 1; ?>" />
 	<input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>" />
 	<input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>" />
 
 <?php
-if ( $max_atndz > 0 ) {
+if ($max_atndz > 0) {
 	echo apply_filters(
 		'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
 		''
 	);
 }
-if ( ! apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false ) ) {
-	add_filter( 'FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true' );
+if ( ! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
+	add_filter('FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true');
 }
-do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 ?>
 
 <?php
-} else if ( isset( $TKT_ID ) ) {
-	add_filter( 'FHEE__EE_Ticket_Selector__hide_ticket_selector', '__return_true' );
+} else if (isset($TKT_ID)) {
+	add_filter('FHEE__EE_Ticket_Selector__hide_ticket_selector', '__return_true');
 ?>
 
 <input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="1"/>
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <input type="hidden" name="noheader" value="true"/>
-<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url() . $anchor_id; ?>"/>
+<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url().$anchor_id; ?>"/>
 <input type="hidden" name="tkt-slctr-rows-<?php echo $EVT_ID; ?>" value="<?php echo $row - 1; ?>"/>
 <input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>"/>
 <input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>"/>
 <?php
-	if ( $ticket instanceof EE_Ticket ) {
-		do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+	if ($ticket instanceof EE_Ticket) {
+		do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
 		$ticket_description = $ticket->description();
-		$ticket_description .= ! empty( $ticket_description )
-			? '<br />' . $ticket_status_display
+		$ticket_description .= ! empty($ticket_description)
+			? '<br />'.$ticket_status_display
 			: $ticket_status_display;
-		if ( ! strpos( $ticket_description, '<div' ) ) {
+		if ( ! strpos($ticket_description, '<div')) {
 			$ticket_description = "<p>{$ticket_description}</p>";
 		}
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
 	<div class="no-tkt-slctr-ticket-content-dv">
 		<h5><?php echo $ticket->name(); ?></h5>
-		<?php if ( ! empty( $ticket_description ) ) { ?>
+		<?php if ( ! empty($ticket_description)) { ?>
 		<?php echo $ticket_description; ?>
 		<?php } ?>
 	</div>
 <?php
-		do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+		do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 	}
 }
 ?>

core/libraries/payment_methods/EE_PMT_Base.lib.php

Indentation +11 added lines, -11 removed lines

@@ -277,17 +277,17 @@
 		//if we know who the attendee is, and this is a billing form
 		//that uses attendee info, populate it
 		if (
-            apply_filters(
-                'FHEE__populate_billing_form_fields_from_attendee',
-                (
-                    $this->_billing_form instanceof EE_Billing_Attendee_Info_Form
-                    && $transaction instanceof EE_Transaction
-                    && $transaction->primary_registration() instanceof EE_Registration
-                    && $transaction->primary_registration()->attendee() instanceof EE_Attendee
-                ),
-                $this->_billing_form,
-                $transaction
-            )
+			apply_filters(
+				'FHEE__populate_billing_form_fields_from_attendee',
+				(
+					$this->_billing_form instanceof EE_Billing_Attendee_Info_Form
+					&& $transaction instanceof EE_Transaction
+					&& $transaction->primary_registration() instanceof EE_Registration
+					&& $transaction->primary_registration()->attendee() instanceof EE_Attendee
+				),
+				$this->_billing_form,
+				$transaction
+			)
 		){
 			$this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() );
 		}

modules/add_new_state/EED_Add_New_State.module.php

Spacing +165 added lines, -165 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Add_New_State
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -27,16 +27,16 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'translate_js_strings' ), 0 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'wp_enqueue_scripts' ), 10 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'translate_js_strings'), 0);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'wp_enqueue_scripts'), 10);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
 	}
 
 	/**
@@ -46,20 +46,20 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_action( 'wp_ajax_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_action( 'wp_ajax_nopriv_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_action('wp_ajax_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_action('wp_ajax_nopriv_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
 		//add_filter( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
+		add_filter('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array('EED_Add_New_State', 'filter_checkout_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
 	}
 
 
@@ -71,8 +71,8 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_definitions() {
-		define( 'ANS_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'ANS_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('ANS_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('ANS_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -84,7 +84,7 @@ 
 	 * @param \WP $WP
 	 * @return        void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -112,9 +112,9 @@ 
 	 * 	@return 		void
 	 */
 	public static function wp_enqueue_scripts() {
-		if ( apply_filters( 'EED_Single_Page_Checkout__SPCO_active', false ) ) {
-			wp_register_script( 'add_new_state', ANS_ASSETS_URL . 'add_new_state.js', array( 'espresso_core', 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, true );
-			wp_enqueue_script( 'add_new_state' );
+		if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
+			wp_register_script('add_new_state', ANS_ASSETS_URL.'add_new_state.js', array('espresso_core', 'single_page_checkout'), EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('add_new_state');
 		}
 	}
 
@@ -128,34 +128,34 @@ 
 	 * @return 	string
 	 */
 //	public static function display_add_new_state_micro_form( $html, EE_Form_Input_With_Options_Base $input ){
-	public static function display_add_new_state_micro_form( EE_Form_Section_Proper $question_group_reg_form ){
+	public static function display_add_new_state_micro_form(EE_Form_Section_Proper $question_group_reg_form) {
 		// only add the 'new_state_micro_form' when displaying reg forms,
 		// not during processing since we process the 'new_state_micro_form' in it's own AJAX request
-		$action = EE_Registry::instance()->REQ->get( 'action', '' );
+		$action = EE_Registry::instance()->REQ->get('action', '');
 		// is the "state" question in this form section?
-		$input = $question_group_reg_form->get_subsection( 'state' );
-		if ( $action === 'process_reg_step' || $action === 'update_reg_step' ) {
+		$input = $question_group_reg_form->get_subsection('state');
+		if ($action === 'process_reg_step' || $action === 'update_reg_step') {
 			//ok then all we need to do is make sure the input's HTML name is consistent
 			//by forcing it to set it now, like it did while getting the form for display
-			if( $input instanceof EE_State_Select_Input ) {
+			if ($input instanceof EE_State_Select_Input) {
 				$input->html_name();
 			}
 			return $question_group_reg_form;
 		}
 		
 		// we're only doing this for state select inputs
-		if ( $input instanceof EE_State_Select_Input ) {
+		if ($input instanceof EE_State_Select_Input) {
 			// grab any set values from the request
-			$country_name = str_replace( 'state', 'nsmf_new_state_country', $input->html_name() );
-			$state_name = str_replace( 'state', 'nsmf_new_state_name', $input->html_name() );
-			$abbrv_name = str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_name() );
-			$new_state_submit_id = str_replace( 'state', 'new_state', $input->html_id() );
+			$country_name = str_replace('state', 'nsmf_new_state_country', $input->html_name());
+			$state_name = str_replace('state', 'nsmf_new_state_name', $input->html_name());
+			$abbrv_name = str_replace('state', 'nsmf_new_state_abbrv', $input->html_name());
+			$new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
 			$country_options = array();
 			$countries = EEM_Country::instance()->get_all_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();
 					}
 				}
 			}
@@ -168,8 +168,8 @@ 
 						// add hidden input to indicate that a new state is being added
 						'add_new_state' 	=> new EE_Hidden_Input(
 							array(
-								'html_name' 	=> str_replace( 'state', 'nsmf_add_new_state', $input->html_name() ),
-								'html_id' 			=> str_replace( 'state', 'nsmf_add_new_state', $input->html_id() ),
+								'html_name' 	=> str_replace('state', 'nsmf_add_new_state', $input->html_name()),
+								'html_id' 			=> str_replace('state', 'nsmf_add_new_state', $input->html_id()),
 								'default'			=> 0
 							)
 						),
@@ -181,10 +181,10 @@ 
 									'',
 									__('click here to add a new state/province', 'event_espresso'),
 									'',
-									'display-' . $input->html_id(),
+									'display-'.$input->html_id(),
 									'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
 									'',
-									'data-target="' . $input->html_id() . '"'
+									'data-target="'.$input->html_id().'"'
 								)
 							)
 						),
@@ -192,13 +192,13 @@ 
 						'add_new_state_micro_form' =>new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
-								EEH_HTML::div( '', $input->html_id() . '-dv', 'ee-form-add-new-state-dv', 'display: none;' ) .
-								EEH_HTML::h6( __('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')) .
-								EEH_HTML::ul() .
-								EEH_HTML::li( __('first select the Country that your State/Province belongs to', 'event_espresso') ) .
-								EEH_HTML::li( __('enter the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('click the ADD button', 'event_espresso') ) .
+								EEH_HTML::div('', $input->html_id().'-dv', 'ee-form-add-new-state-dv', 'display: none;').
+								EEH_HTML::h6(__('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')).
+								EEH_HTML::ul().
+								EEH_HTML::li(__('first select the Country that your State/Province belongs to', 'event_espresso')).
+								EEH_HTML::li(__('enter the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('click the ADD button', 'event_espresso')).
 								EEH_HTML::ulx()
 							)
 						),
@@ -207,10 +207,10 @@ 
 							$country_options,
 							array(
 								'html_name' 			=> $country_name,
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_country', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-country',
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_country', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-country',
 								'html_label_text'		=> __('New State/Province Country', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $country_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($country_name, ''),
 								'required' 				=> false
 							)
 						),
@@ -218,23 +218,23 @@ 
 						'new_state_name' => new EE_Text_Input(
 							array(
 								'html_name' 			=> $state_name,
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_name', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-state',
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_name', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-state',
 								'html_label_text'		=> __('New State/Province Name', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $state_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($state_name, ''),
 								'required' 				=> false
 							)
 						),
-						'spacer' => new EE_Form_Section_HTML( EEH_HTML::br() ),
+						'spacer' => new EE_Form_Section_HTML(EEH_HTML::br()),
 						// NEW STATE NAME
 						'new_state_abbrv' => new EE_Text_Input(
 							array(
 								'html_name' 					=> $abbrv_name,
-								'html_id' 							=> str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_id() ),
-								'html_class' 					=> $input->html_class() . ' new-state-abbrv',
+								'html_id' 							=> str_replace('state', 'nsmf_new_state_abbrv', $input->html_id()),
+								'html_class' 					=> $input->html_class().' new-state-abbrv',
 								'html_label_text'				=> __('New State/Province Abbreviation', 'event_espresso'),
 								'html_other_attributes'	=> 'size="24"',
-								'default'							=> EE_Registry::instance()->REQ->get( $abbrv_name, '' ),
+								'default'							=> EE_Registry::instance()->REQ->get($abbrv_name, ''),
 								'required' 						=> false
 							)
 						),
@@ -242,15 +242,15 @@ 
 						'add_new_state_submit_button' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
-								EEH_HTML::nbsp(3) .
+								EEH_HTML::nbsp(3).
 								EEH_HTML::link(
 									'',
 									__('ADD', 'event_espresso'),
 									'',
-									'submit-' . $new_state_submit_id,
+									'submit-'.$new_state_submit_id,
 									'ee-form-add-new-state-submit button button-secondary',
 									'',
-									'data-target="' . $new_state_submit_id . '"'
+									'data-target="'.$new_state_submit_id.'"'
 								)
 							)
 						),
@@ -258,18 +258,18 @@ 
 						'add_new_state_extra' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_extra',
-								EEH_HTML::br(2) .
-								EEH_HTML::div( '', '', 'small-text' ) .
-								EEH_HTML::strong( __('Don\'t know your State/Province Abbreviation?', 'event_espresso') ) .
-								EEH_HTML::br() .
+								EEH_HTML::br(2).
+								EEH_HTML::div('', '', 'small-text').
+								EEH_HTML::strong(__('Don\'t know your State/Province Abbreviation?', 'event_espresso')).
+								EEH_HTML::br().
 								sprintf(
 									__('You can look here: %s, for a list of Countries and links to their State/Province Abbreviations ("Subdivisions assigned codes" column).', 'event_espresso'),
-									EEH_HTML::link( 'http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk' )
-								) .
-								EEH_HTML::divx() .
-								EEH_HTML::br() .
-								EEH_HTML::link( '', __('cancel new state/province', 'event_espresso'), '', 'hide-' . $input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="' . $input->html_id() . '"' ) .
-								EEH_HTML::divx() .
+									EEH_HTML::link('http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk')
+								).
+								EEH_HTML::divx().
+								EEH_HTML::br().
+								EEH_HTML::link('', __('cancel new state/province', 'event_espresso'), '', 'hide-'.$input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="'.$input->html_id().'"').
+								EEH_HTML::divx().
 								EEH_HTML::br()
 							)
 						)
@@ -277,7 +277,7 @@ 
 					)
 				)
 			);
-			$question_group_reg_form->add_subsections( array( 'new_state_micro_form' => $new_state_micro_form ), 'state', false );
+			$question_group_reg_form->add_subsections(array('new_state_micro_form' => $new_state_micro_form), 'state', false);
 		}
 		return $question_group_reg_form;
 	}
@@ -295,50 +295,50 @@ 
 	public static function add_new_state() {
 		$REQ = EE_Registry::instance()->load_core('Request_Handler');
 		if (
-			$REQ->is_set( 'nsmf_add_new_state' )
-			&& $REQ->get( 'nsmf_add_new_state' ) == 1
+			$REQ->is_set('nsmf_add_new_state')
+			&& $REQ->get('nsmf_add_new_state') == 1
 		) {
 			EE_Registry::instance()->load_model('State');
 			// grab country ISO code, new state name, and new state abbreviation
-			$state_country = $REQ->is_set( 'nsmf_new_state_country' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_country' ) )
+			$state_country = $REQ->is_set('nsmf_new_state_country')
+				? sanitize_text_field($REQ->get('nsmf_new_state_country'))
 				: false;
-			$state_name = $REQ->is_set( 'nsmf_new_state_name' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_name' ) )
+			$state_name = $REQ->is_set('nsmf_new_state_name')
+				? sanitize_text_field($REQ->get('nsmf_new_state_name'))
 				: false;
-			$state_abbr = $REQ->is_set( 'nsmf_new_state_abbrv' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_abbrv' ) )
+			$state_abbr = $REQ->is_set('nsmf_new_state_abbrv')
+				? sanitize_text_field($REQ->get('nsmf_new_state_abbrv'))
 				: false;
 //echo '<h4>$state_country : ' . $state_country . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_name : ' . $state_name . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_abbr : ' . $state_abbr . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 
-			if ( $state_country && $state_name && $state_abbr ) {
-				$new_state = EED_Add_New_State::save_new_state_to_db( array(
-					'CNT_ISO'=> strtoupper( $state_country ),
-					'STA_abbrev' => strtoupper( $state_abbr ),
-					'STA_name' => ucwords( $state_name ),
+			if ($state_country && $state_name && $state_abbr) {
+				$new_state = EED_Add_New_State::save_new_state_to_db(array(
+					'CNT_ISO'=> strtoupper($state_country),
+					'STA_abbrev' => strtoupper($state_abbr),
+					'STA_name' => ucwords($state_name),
 					'STA_active' => FALSE
 				));
 
-				if ( $new_state instanceof EE_State ) {
+				if ($new_state instanceof EE_State) {
 					// clean house
-					EE_Registry::instance()->REQ->un_set( 'nsmf_add_new_state' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_country' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_name' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_abbrv' );
+					EE_Registry::instance()->REQ->un_set('nsmf_add_new_state');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_country');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_name');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_abbrv');
 
 					// get any existing new states
 					$new_states = EE_Registry::instance()->SSN->get_session_data(
 						'nsmf_new_states'
 					);
-					$new_states[ $new_state->ID() ] = $new_state;
+					$new_states[$new_state->ID()] = $new_state;
 					EE_Registry::instance()->SSN->set_session_data(
-						array( 'nsmf_new_states' => $new_states )
+						array('nsmf_new_states' => $new_states)
 					);
 
-					if ( EE_Registry::instance()->REQ->ajax ) {
-						echo json_encode( array(
+					if (EE_Registry::instance()->REQ->ajax) {
+						echo json_encode(array(
 							'success' => TRUE,
 							'id' => $new_state->ID(),
 							'name' => $new_state->name(),
@@ -353,12 +353,12 @@ 
 				}
 
 			} else {
-				$error = __( 'A new State/Province could not be added because invalid or missing data was received.', 'event_espresso' );
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					echo json_encode( array( 'error' => $error ));
+				$error = __('A new State/Province could not be added because invalid or missing data was received.', 'event_espresso');
+				if (EE_Registry::instance()->REQ->ajax) {
+					echo json_encode(array('error' => $error));
 					exit();
 				} else {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
@@ -376,11 +376,11 @@ 
 	 * @param array $request_params
 	 * @return array
 	 */
-	public static function filter_checkout_request_params ( $request_params ) {
-		foreach ( $request_params as $form_section ) {
-			if ( is_array( $form_section )) {
-				EED_Add_New_State::unset_new_state_request_params( $form_section );
-				EED_Add_New_State::filter_checkout_request_params( $form_section );
+	public static function filter_checkout_request_params($request_params) {
+		foreach ($request_params as $form_section) {
+			if (is_array($form_section)) {
+				EED_Add_New_State::unset_new_state_request_params($form_section);
+				EED_Add_New_State::filter_checkout_request_params($form_section);
 			}
 		}
 		return $request_params;
@@ -395,12 +395,12 @@ 
 	 * @param array $request_params
 	 * @return        boolean
 	 */
-	public static function unset_new_state_request_params ( $request_params ) {
-		unset( $request_params[ 'new_state_micro_form' ] );
-		unset( $request_params[ 'new_state_micro_add_new_state' ] );
-		unset( $request_params[ 'new_state_micro_new_state_country' ] );
-		unset( $request_params[ 'new_state_micro_new_state_name' ] );
-		unset( $request_params[ 'new_state_micro_new_state_abbrv' ] );
+	public static function unset_new_state_request_params($request_params) {
+		unset($request_params['new_state_micro_form']);
+		unset($request_params['new_state_micro_add_new_state']);
+		unset($request_params['new_state_micro_new_state_country']);
+		unset($request_params['new_state_micro_new_state_name']);
+		unset($request_params['new_state_micro_new_state_abbrv']);
 		return $request_params;
 	}
 
@@ -413,25 +413,25 @@ 
 	 * @param array $props_n_values
 	 * @return        boolean
 	 */
-	public static function save_new_state_to_db ( $props_n_values = array() ) {
+	public static function save_new_state_to_db($props_n_values = array()) {
 //		EEH_Debug_Tools::printr( $props_n_values, '$props_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$existing_state = EEM_State::instance()->get_all( array( $props_n_values, 'limit' => 1 ));
-		if ( ! empty( $existing_state )) {
-			return array_pop( $existing_state );
+		$existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
+		if ( ! empty($existing_state)) {
+			return array_pop($existing_state);
 		}
-		$new_state = EE_State::new_instance( $props_n_values );
-		if ( $new_state instanceof EE_State ) {
+		$new_state = EE_State::new_instance($props_n_values);
+		if ($new_state instanceof EE_State) {
 			// if not non-ajax admin
-			$new_state_key = 'new-state-added-' . $new_state->country_iso() . '-' . $new_state->abbrev();
+			$new_state_key = 'new-state-added-'.$new_state->country_iso().'-'.$new_state->abbrev();
 			$new_state_notice = sprintf(
-					__( 'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso' ),
-					'<b>' . $new_state->name() . '</b>',
-					'<b>' . $new_state->abbrev() . '</b>',
-					'<b>' . $new_state->country()->name() . '</b>',
-					'<a href="' . add_query_arg( array( 'page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso() ), admin_url( 'admin.php' )) . '">' . __( 'Event Espresso - General Settings > Countries Tab', 'event_espresso' ) . '</a>',
+					__('A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso'),
+					'<b>'.$new_state->name().'</b>',
+					'<b>'.$new_state->abbrev().'</b>',
+					'<b>'.$new_state->country()->name().'</b>',
+					'<a href="'.add_query_arg(array('page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso()), admin_url('admin.php')).'">'.__('Event Espresso - General Settings > Countries Tab', 'event_espresso').'</a>',
 					'<br />'
 			);
-			EE_Error::add_persistent_admin_notice( $new_state_key, $new_state_notice );
+			EE_Error::add_persistent_admin_notice($new_state_key, $new_state_notice);
 			$new_state->save();
 			EEM_State::instance()->reset_cached_states();
 			return $new_state;
@@ -450,22 +450,22 @@ 
 	 * @param array  $cols_n_values
 	 * @return        boolean
 	 */
-	public static function update_country_settings( $CNT_ISO = '', $STA_ID = '', $cols_n_values = array() ) {
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'An invalid or missing Country ISO Code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array()) {
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('An invalid or missing Country ISO Code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$STA_abbrev = is_array( $cols_n_values ) && isset( $cols_n_values['STA_abbrev'] ) ? $cols_n_values['STA_abbrev'] : FALSE;
-		if (  ! $STA_abbrev && ! empty( $STA_ID )) {
-			$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-			if ( $state instanceof EE_State ) {
+		$STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev'] : FALSE;
+		if ( ! $STA_abbrev && ! empty($STA_ID)) {
+			$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+			if ($state instanceof EE_State) {
 				$STA_abbrev = $state->abbrev();
 			}
 		}
-		if ( ! $STA_abbrev ) {
-			EE_Error::add_error( __( 'An invalid or missing State Abbreviation was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $STA_abbrev) {
+			EE_Error::add_error(__('An invalid or missing State Abbreviation was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		EE_Error::dismiss_persistent_admin_notice( $CNT_ISO . '-' . $STA_abbrev, TRUE, TRUE );
+		EE_Error::dismiss_persistent_admin_notice($CNT_ISO.'-'.$STA_abbrev, TRUE, TRUE);
 	}
 
 
@@ -481,19 +481,19 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_state_into_options( $state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer  && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state ) {
+	public static function inject_new_reg_state_into_options($state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state) {
 			$STA_ID = $answer->value();
-			if ( ! empty( $STA_ID ) ) {
-				$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-				if ( $state instanceof EE_State ) {
+			if ( ! empty($STA_ID)) {
+				$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+				if ($state instanceof EE_State) {
 					$country = $state->country();
-					if ( $country instanceof EE_Country ) {
-						if ( ! isset( $state_options[ $country->name() ] )) {
-							$state_options[ $country->name() ] = array();
+					if ($country instanceof EE_Country) {
+						if ( ! isset($state_options[$country->name()])) {
+							$state_options[$country->name()] = array();
 						}
-						if ( ! isset( $state_options[ $country->name() ][ $STA_ID ] )) {
-							$state_options[ $country->name() ][ $STA_ID ] = $state->name();
+						if ( ! isset($state_options[$country->name()][$STA_ID])) {
+							$state_options[$country->name()][$STA_ID] = $state->name();
 						}
 					}
 				}
@@ -515,14 +515,14 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_country_into_options( $country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country ) {
+	public static function inject_new_reg_country_into_options($country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country) {
 			$CNT_ISO = $answer->value();
-			if ( ! empty( $CNT_ISO ) ) {
-				$country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO );
-				if ( $country instanceof EE_Country ) {
-					if ( ! isset( $country_options[ $CNT_ISO ] ) ) {
-						$country_options[ $CNT_ISO ] = $country->name();
+			if ( ! empty($CNT_ISO)) {
+				$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+				if ($country instanceof EE_Country) {
+					if ( ! isset($country_options[$CNT_ISO])) {
+						$country_options[$CNT_ISO] = $country->name();
 					}
 				}
 			}
@@ -539,14 +539,14 @@ 
 	 * @param EE_State[]  $state_options
 	 * @return        boolean
 	 */
-	public static function state_options( $state_options = array() ) {
+	public static function state_options($state_options = array()) {
 		$new_states = EED_Add_New_State::_get_new_states();
-		foreach ( $new_states as $new_state ) {
+		foreach ($new_states as $new_state) {
 			if (
 				$new_state instanceof EE_State
 				&& $new_state->country() instanceof EE_Country
 			) {
-				$state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
+				$state_options[$new_state->country()->name()][$new_state->ID()] = $new_state->name();
 			}
 		}
 		return $state_options;
@@ -562,12 +562,12 @@ 
 	 */
 	protected static function _get_new_states() {
 		$new_states = array();
-		if ( EE_Registry::instance()->SSN instanceof EE_Session ) {
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
 			$new_states = EE_Registry::instance()->SSN->get_session_data(
 				'nsmf_new_states'
 			);
 		}
-		return is_array( $new_states ) ? $new_states : array();
+		return is_array($new_states) ? $new_states : array();
 	}
 
 
@@ -579,14 +579,14 @@ 
 	 * @param EE_Country[]  $country_options
 	 * @return        boolean
 	 */
-	public static function country_options( $country_options = array() ) {
+	public static function country_options($country_options = array()) {
 		$new_states = EED_Add_New_State::_get_new_states();
-		foreach ( $new_states as $new_state ) {
+		foreach ($new_states as $new_state) {
 			if (
 				$new_state instanceof EE_State
 				&& $new_state->country() instanceof EE_Country
 			) {
-				$country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
+				$country_options[$new_state->country()->ID()] = $new_state->country()->name();
 			}
 		}
 		return $country_options;