eventespresso / event-espresso-core

core/db_models/EEM_Soft_Delete_Base.model.php

Indentation +24 added lines, -24 removed lines

@@ -1,30 +1,30 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 require_once( EE_MODELS . 'EEM_Base.model.php');
 /**
- * EEM_Soft_Delete_Base
- *
- * About this class: modifies parent EEM_Base's behaviour to make usage of soft-deletable models
- * (ie, models that have a flag indicated they've been "soft-deleted"/trashed).
- * Generally, by adding EE_Soft_Delete_where_conditions's conditions, most queries
- * will ignore soft-deleted items. For example, see EEM_Soft_Delete_base::get_all(),
- * which will only fetch non-deleted items from the DB, treating soft-deleted items
- * as if they didn't exist.
- * You may sometimes want to see the soft-deleted items, or pretend the model isn't a soft-deleted item.
- * There are functions with similar names that accomplish this (eg, get_all_deleted() and
- * get_all_deleted_and_undeleted()).
- * Also, when deleting soft-deletable models, their deleted flag is actually just switched.
- * Also notice that you can undo a soft-delete by using restore(), and you can permanently
- * delete an item (normal deletion) by using delete_permanently().
- * Also note: when querying related models that join to this model, this model's
- * default where conditions (ie, to only retrieve non-deleted items) will still apply. Eg
- * if querying EEM_Question::instance()->get_all(array(array('Question_Group.QSG_ID'=>3)),
- * will add WHERE conditions to the mysql query to only find rows that have a question group ID
- * of 3 AND THAT QUESTION GROUP IS NOT DELETED.
- *
- * @package			Event Espresso
- * @subpackage		includes/models/
- * @author				Michael Nelson
- */
+	 * EEM_Soft_Delete_Base
+	 *
+	 * About this class: modifies parent EEM_Base's behaviour to make usage of soft-deletable models
+	 * (ie, models that have a flag indicated they've been "soft-deleted"/trashed).
+	 * Generally, by adding EE_Soft_Delete_where_conditions's conditions, most queries
+	 * will ignore soft-deleted items. For example, see EEM_Soft_Delete_base::get_all(),
+	 * which will only fetch non-deleted items from the DB, treating soft-deleted items
+	 * as if they didn't exist.
+	 * You may sometimes want to see the soft-deleted items, or pretend the model isn't a soft-deleted item.
+	 * There are functions with similar names that accomplish this (eg, get_all_deleted() and
+	 * get_all_deleted_and_undeleted()).
+	 * Also, when deleting soft-deletable models, their deleted flag is actually just switched.
+	 * Also notice that you can undo a soft-delete by using restore(), and you can permanently
+	 * delete an item (normal deletion) by using delete_permanently().
+	 * Also note: when querying related models that join to this model, this model's
+	 * default where conditions (ie, to only retrieve non-deleted items) will still apply. Eg
+	 * if querying EEM_Question::instance()->get_all(array(array('Question_Group.QSG_ID'=>3)),
+	 * will add WHERE conditions to the mysql query to only find rows that have a question group ID
+	 * of 3 AND THAT QUESTION GROUP IS NOT DELETED.
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		includes/models/
+	 * @author				Michael Nelson
+	 */
 abstract class EEM_Soft_Delete_Base extends EEM_Base{
 
 	/**

Doc Comments +3 added lines, -3 removed lines

@@ -146,7 +146,7 @@ 
 	 * Sum all the deleted items.
 	 * @param array $query_params like EEM_Base::get_all
 	 * @param string $field_to_sum
-	 * @return int
+	 * @return double
 	 */
 	public function sum_deleted($query_params = null, $field_to_sum = null){
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
@@ -195,7 +195,7 @@ 
 	 * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
 	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
-	 * @return boolean success
+	 * @return integer success
 	 */
 	public function delete_permanently($query_params = array(), $allow_blocking = true){
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
@@ -278,7 +278,7 @@ 
 	/**
 	 * Updates all the items of this model which match the $query params, regardless of whether
 	 * they've been soft-deleted or not
-	 * @param array $field_n_values like EEM_Base::update's $fields_n_value
+	 * @param array $fields_n_values like EEM_Base::update's $fields_n_value
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @param boolean $keep_model_objs_in_sync if TRUE, makes sure we ALSO update model objects
 	 * in this model's entity map according to $fields_n_values that match $query_params. This

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_Base.model.php');
+require_once(EE_MODELS.'EEM_Base.model.php');
 /**
  * EEM_Soft_Delete_Base
  *
@@ -25,13 +25,13 @@ 
  * @subpackage		includes/models/
  * @author				Michael Nelson
  */
-abstract class EEM_Soft_Delete_Base extends EEM_Base{
+abstract class EEM_Soft_Delete_Base extends EEM_Base {
 
 	/**
 	 * @param null $timezone
 	 */
 	protected function __construct($timezone = NULL) {
-		if( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions ){
+		if ( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions) {
 			$this->_default_where_conditions_strategy = new EE_Soft_Delete_Where_Conditions();
 		}
 		parent::__construct($timezone);
@@ -42,12 +42,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -57,7 +57,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted($query_params = array()){
+	public function get_one_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -67,7 +67,7 @@ 
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted_or_undeleted($query_params = array()){
+	public function get_one_deleted_or_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -77,11 +77,11 @@ 
 	 * @param int|string $id
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_by_ID_but_ignore_deleted($id){
+	public function get_one_by_ID_but_ignore_deleted($id) {
 		return $this->get_one( 
 			$this->alter_query_params_to_restrict_by_ID( 
 				$id,
-				array( 'default_where_conditions' => 'default' ) 
+				array('default_where_conditions' => 'default') 
 			) 
 		);
 	}
@@ -93,7 +93,7 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -103,9 +103,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$deletedFlagFieldName=$this->deleted_field_name();
-		$query_params[0][$deletedFlagFieldName]=true;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$deletedFlagFieldName = $this->deleted_field_name();
+		$query_params[0][$deletedFlagFieldName] = true;
 		return $query_params;
 	}
 
@@ -114,7 +114,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	public function alter_query_params_so_deleted_and_undeleted_items_included( $query_params = array() ){
+	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params = array()) {
 		return $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 	}
 
@@ -123,8 +123,8 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		if( ! isset( $query_params[ 'default_where_conditions' ] ) ) {
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		if ( ! isset($query_params['default_where_conditions'])) {
 			$query_params['default_where_conditions'] = 'minimum';
 		}
 		return $query_params;
@@ -137,9 +137,9 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return parent::count($query_params,$field_to_count, $distinct);
+		return parent::count($query_params, $field_to_count, $distinct);
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::sum($query_params, $field_to_sum);
 	}
@@ -159,7 +159,7 @@ 
 	 * @param string $field_to_sum
 	 * @reutrn int
 	 */
-	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		parent::sum($query_params, $field_to_sum);
 	}
@@ -169,7 +169,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted_and_undeleted($query_params = array()){
+	public function get_all_deleted_and_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -179,7 +179,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted($query_params = array()){
+	public function get_all_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -197,7 +197,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently($query_params = array(), $allow_blocking = true){
+	public function delete_permanently($query_params = array(), $allow_blocking = true) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::delete_permanently($query_params, $allow_blocking);
 	}
@@ -208,8 +208,8 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean success
 	 */
-	public function restore_by_ID($ID=FALSE){
-		return $this->delete_or_restore_by_ID(false,$ID);
+	public function restore_by_ID($ID = FALSE) {
+		return $this->delete_or_restore_by_ID(false, $ID);
 	}
 	/**
 	 * For deleting or restoring a particular item. Note that this model is a SOFT-DELETABLE model! However,
@@ -218,14 +218,14 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean
 	 */
-	public function delete_or_restore_by_ID($delete=true,$ID=FALSE){
-		if ( ! $ID ) {
+	public function delete_or_restore_by_ID($delete = true, $ID = FALSE) {
+		if ( ! $ID) {
 			return FALSE;
 		}
 		if ( 
 			$this->delete_or_restore(
 				$delete, 
-				$this->alter_query_params_to_restrict_by_ID( $ID ) 
+				$this->alter_query_params_to_restrict_by_ID($ID) 
 			)
 		) {
 			return TRUE;
@@ -245,7 +245,7 @@ 
 	 * @param bool  $block_deletes
 	 * @return boolean
 	 */
-	public function delete($query_params = array(), $block_deletes = false){
+	public function delete($query_params = array(), $block_deletes = false) {
 		//no matter what, we WON'T block soft deletes.
 		return $this->delete_or_restore(true, $query_params);
 	}
@@ -256,7 +256,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	public function restore($query_params = array()){
+	public function restore($query_params = array()) {
 		return $this->delete_or_restore(false, $query_params);
 	}
 	/**
@@ -265,10 +265,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$deletedFlagFieldName=$this->deleted_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$deletedFlagFieldName = $this->deleted_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		if ( $this->update (array($deletedFlagFieldName=>$delete), $query_params )) {
+		if ($this->update(array($deletedFlagFieldName=>$delete), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -286,8 +286,8 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int number of items updated
 	 */
-	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
+	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync );
+		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 }

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

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * For containing info about a non-field form section, which contains other form sections/fields.
- * Relies heavily on the script form_section_validation.js for client-side validation, mostly
- * the php code just provides form_section_validation.js with teh variables to use.
- * Important: in order for the JS to be loaded properly, you must construct a form section
- * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
- * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
- */
+	 * For containing info about a non-field form section, which contains other form sections/fields.
+	 * Relies heavily on the script form_section_validation.js for client-side validation, mostly
+	 * the php code just provides form_section_validation.js with teh variables to use.
+	 * Important: in order for the JS to be loaded properly, you must construct a form section
+	 * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
+	 * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
+	 */
 class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
 
 	/**

Spacing +160 added lines, -160 removed lines

@@ -7,7 +7,7 @@ 
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
  * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
  */
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
 
 	/**
 	 * Subsections
@@ -68,38 +68,38 @@ 
 	 * } @see EE_Form_Section_Validatable::__construct()
 	 *
 	 */
-	public function __construct( $options_array = array() ){
+	public function __construct($options_array = array()) {
 		EE_Registry::instance()->load_helper('Formatter');
-		$options_array = apply_filters( 'FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this );
+		$options_array = apply_filters('FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this);
 		//call parent first, as it may be setting the name
 		parent::__construct($options_array);
 		//if they've included subsections in the constructor, add them now
-		if( isset( $options_array['include'] )){
+		if (isset($options_array['include'])) {
 			//we are going to make sure we ONLY have those subsections to include
 			//AND we are going to make sure they're in that specified order
 			$reordered_subsections = array();
-			foreach($options_array['include'] as $input_name){
-				if(isset($this->_subsections[$input_name])){
+			foreach ($options_array['include'] as $input_name) {
+				if (isset($this->_subsections[$input_name])) {
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
 				}
 			}
 			$this->_subsections = $reordered_subsections;
 		}
-		if(isset($options_array['exclude'])){
+		if (isset($options_array['exclude'])) {
 			$exclude = $options_array['exclude'];
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
 		}
-		if(isset($options_array['layout_strategy'])){
+		if (isset($options_array['layout_strategy'])) {
 			$this->_layout_strategy = $options_array['layout_strategy'];
 		}
-		if( ! $this->_layout_strategy){
+		if ( ! $this->_layout_strategy) {
 			$this->_layout_strategy = new EE_Two_Column_Layout();
 		}
 		$this->_layout_strategy->_construct_finalize($this);
 
-		add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
+		add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
 	}
 
 
@@ -111,25 +111,25 @@ 
 	 * @param string                 $name
 	 * @throws \EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
+	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_name_if_empty();
 		$this->_set_default_html_id_if_empty();
-		foreach( $this->_subsections as $subsection_name => $subsection ){
-			if ( $subsection instanceof EE_Form_Section_Base ) {
-				$subsection->_construct_finalize( $this, $subsection_name );
+		foreach ($this->_subsections as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Section_Base) {
+				$subsection->_construct_finalize($this, $subsection_name);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
 						$subsection_name,
 						get_class($this),
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
 					)
 				);
 			}
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 
@@ -138,7 +138,7 @@ 
 	 * Gets the layout strategy for this form section
 	 * @return EE_Form_Section_Layout_Base
 	 */
-	public function get_layout_strategy(){
+	public function get_layout_strategy() {
 		return $this->_layout_strategy;
 	}
 
@@ -150,7 +150,7 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function get_html_for_input($input){
+	public function get_html_for_input($input) {
 		return $this->_layout_strategy->layout_input($input);
 	}
 
@@ -163,7 +163,7 @@ 
 	 * @param null $form_data
 	 * @return boolean
 	 */
-	public function was_submitted($form_data = NULL){
+	public function was_submitted($form_data = NULL) {
 		return $this->form_data_present_in($form_data);
 	}
 
@@ -184,16 +184,16 @@ 
 	 * to skip this step.
 	 * @return void
 	 */
-	public function receive_form_submission($req_data = NULL, $validate = TRUE){
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate );
-		if( $req_data === NULL){
+	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate);
+		if ($req_data === NULL) {
 			$req_data = $_REQUEST;
 		}
 		$this->_normalize($req_data);
-		if( $validate ){
+		if ($validate) {
 			$this->_validate();
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate );
+		do_action('AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate);
 	}
 
 
@@ -206,12 +206,12 @@ 
 	 * the value being an array formatted in teh same way
 	 * @param array $default_data
 	 */
-	public function populate_defaults($default_data){
-		foreach($this->subsections() as $subsection_name => $subsection){
-			if(isset($default_data[$subsection_name])){
-				if($subsection instanceof EE_Form_Input_Base){
+	public function populate_defaults($default_data) {
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if (isset($default_data[$subsection_name])) {
+				if ($subsection instanceof EE_Form_Input_Base) {
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -229,8 +229,8 @@ 
 	 * (realizing that the subsections' html names might not be set yet, etc.)
 	 * @return EE_Form_Section_Base
 	 */
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		if( $require_construction_to_be_finalized ){
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		if ($require_construction_to_be_finalized) {
 			$this->ensure_construct_finalized_called();
 		}
 		return isset($this->_subsections[$name]) ? $this->_subsections[$name] : NULL;
@@ -242,10 +242,10 @@ 
 	 * Gets all the validatable subsections of this form section
 	 * @return EE_Form_Section_Validatable[]
 	 */
-	public function get_validatable_subsections(){
+	public function get_validatable_subsections() {
 		$validatable_subsections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Validatable){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Validatable) {
 				$validatable_subsections[$name] = $obj;
 			}
 		}
@@ -265,10 +265,10 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws EE_Error
 	 */
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
-		if( ! $subsection instanceof EE_Form_Input_Base){
-			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'),$name, get_class($this),$subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
+			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'), $name, get_class($this), $subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
 		}
 		return $subsection;
 	}
@@ -286,10 +286,10 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws EE_Error
 	 */
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
-		if( ! $subsection instanceof EE_Form_Section_Proper){
-			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),$name, get_class($this)));
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
+			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'), $name, get_class($this)));
 		}
 		return $subsection;
 	}
@@ -302,7 +302,7 @@ 
 	 * @param string $name
 	 * @return mixed depending on the input's type and its normalization strategy
 	 */
-	public function get_input_value($name){
+	public function get_input_value($name) {
 		$input = $this->get_input($name);
 		return $input->normalized_value();
 	}
@@ -315,16 +315,16 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if( ! $this->has_received_submission()){
+		if ( ! $this->has_received_submission()) {
 			throw new EE_Error(sprintf(__("You cannot check if a form is valid before receiving the form submission using receive_form_submission", "event_espresso")));
 		}
-		if( ! parent::is_valid()){
+		if ( ! parent::is_valid()) {
 			return false;
 		}
 		//ok so no errors general to this entire form section. so let's check the subsections
-		foreach( $this->get_validatable_subsections() as $subsection ){
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '' ){
-				$this->set_submission_error_message( $subsection->get_validation_error_string() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '') {
+				$this->set_submission_error_message($subsection->get_validation_error_string());
 				return false;
 			}
 		}
@@ -337,11 +337,11 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
 			$classname = get_class($this);
 			$default_name = str_replace("EE_", "", $classname);
-			$this->_name =  $default_name;
+			$this->_name = $default_name;
 		}
 	}
 
@@ -352,7 +352,7 @@ 
 	 * Also returns the HTML for the form, except for the form opening and closing tags
 	 * (as the form section doesn't know where you necessarily want to send the information to), and except for a submit button.
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		$this->enqueue_js();
 		return $this->get_html();
 	}
@@ -363,7 +363,7 @@ 
 	 * returns HTML for displaying this form section. recursively calls display_section() on all subsections
 	 * @return string
 	 */
-	public function get_html(){
+	public function get_html() {
 		$this->ensure_construct_finalized_called();
 		return $this->_layout_strategy->layout_form();
 	}
@@ -374,7 +374,7 @@ 
 	 * enqueues JS for the form
 	 * @return string
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		$this->_enqueue_and_localize_form_js();
 	}
 
@@ -390,11 +390,11 @@ 
 	 * @param boolean $init_form_validation_automatically whether or not we want the form validation to be triggered automatically or not
 	 * @return void
 	 */
-	public static function wp_enqueue_scripts( $init_form_validation_automatically = false ){
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		wp_register_script( 'ee_form_section_validation', EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js', array( 'jquery-validate', 'jquery-ui-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+	public static function wp_enqueue_scripts($init_form_validation_automatically = false) {
+		add_filter('FHEE_load_jquery_validate', '__return_true');
+		wp_register_script('ee_form_section_validation', EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js', array('jquery-validate', 'jquery-ui-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 		
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_validation_init', array( 'init' => $init_form_validation_automatically ) );
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_validation_init', array('init' => $init_form_validation_automatically));
 	}
 
 
@@ -404,14 +404,14 @@ 
 	 * This needs to be called AFTER we've called $this->_enqueue_jquery_validate_script,
 	 * but before the wordpress hook wp_loaded
 	 */
-	public function _enqueue_and_localize_form_js(){
+	public function _enqueue_and_localize_form_js() {
 		$this->ensure_construct_finalized_called();
 		//actually, we don't want to localize just yet. There may be other forms on the page.
 		//so we need to add our form section data to a static variable accessible by all form sections
 		//and localize it just before the footer
 		$this->localize_validation_rules();
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
 	}
 
 
@@ -421,11 +421,11 @@ 
 	 * @param bool $return_for_subsection
 	 * @return void
 	 */
-	public function localize_validation_rules( $return_for_subsection = FALSE ){
+	public function localize_validation_rules($return_for_subsection = FALSE) {
 		// we only want to localize vars ONCE for the entire form, so if the form section doesn't have a parent, then it must be the top dog
-		if ( ! $this->parent_section() || $return_for_subsection ) {
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
-				'form_section_id'=> $this->html_id( TRUE ),
+		if ( ! $this->parent_section() || $return_for_subsection) {
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
+				'form_section_id'=> $this->html_id(TRUE),
 				'validation_rules'=> $this->get_jquery_validation_rules(),
 				'errors'=> $this->subsection_validation_errors_by_html_name()
 			);
@@ -440,12 +440,12 @@ 
 	 * Keys are their form names, and values are the inputs themselves
 	 * @return EE_Form_Input_Base
 	 */
-	public function inputs_in_subsections(){
+	public function inputs_in_subsections() {
 		$inputs = array();
-		foreach($this->subsections() as $subsection){
-			if( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection->html_name()] = $subsection;
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -458,12 +458,12 @@ 
 	 * and values are a string of all their validation errors
 	 * @return string[]
 	 */
-	public function subsection_validation_errors_by_html_name(){
+	public function subsection_validation_errors_by_html_name() {
 		$inputs = $this->inputs();
 		$errors = array();
-		foreach( $inputs as $form_input ){
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
+		foreach ($inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
 			}
 		}
 		return $errors;
@@ -475,12 +475,12 @@ 
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
 	 */
-	public static function localize_script_for_all_forms(){
+	public static function localize_script_for_all_forms() {
 		//allow inputs and stuff to hook in their JS and stuff here
 		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
-		wp_enqueue_script( 'ee_form_section_validation' );
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization );
+		wp_enqueue_script('ee_form_section_validation');
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization);
 	}
 
 
@@ -488,8 +488,8 @@ 
 	/**
 	 * ensure_scripts_localized
 	 */
-	public function ensure_scripts_localized(){
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
+	public function ensure_scripts_localized() {
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
 			$this->_enqueue_and_localize_form_js();
 		}
 	}
@@ -501,10 +501,10 @@ 
 	 * is that the key here should be the same as the custom validation rule put in the JS file
 	 * @return array keys are custom validation rules, and values are internationalized strings
 	 */
-	private static function _get_localized_error_messages(){
+	private static function _get_localized_error_messages() {
 		return array(
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"),
-			'regex' => __( 'Please check your input', 'event_espresso' ),
+			'regex' => __('Please check your input', 'event_espresso'),
 		);
 	}
 
@@ -532,10 +532,10 @@ 
 	 * Gets the JS to put inside the jquery validation rules for subsection of this form section. See parent function for more...
 	 * @return array
 	 */
-	function get_jquery_validation_rules(){
+	function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			$jquery_validation_rules = array_merge( $jquery_validation_rules,  $subsection->get_jquery_validation_rules() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			$jquery_validation_rules = array_merge($jquery_validation_rules, $subsection->get_jquery_validation_rules());
 		}
 		return $jquery_validation_rules;
 	}
@@ -550,11 +550,11 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			try {
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
-				$subsection->add_validation_error( $e );
+			} catch (EE_Validation_Error $e) {
+				$subsection->add_validation_error($e);
 			}
 		}
 	}
@@ -568,9 +568,9 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if(method_exists($this,'_validate_'.$subsection_name)){
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if (method_exists($this, '_validate_'.$subsection_name)) {
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 			}
 			$subsection->_validate();
 		}
@@ -582,13 +582,13 @@ 
 	 * Gets all the validated inputs for the form section
 	 * @return array
 	 */
-	public function valid_data(){
+	public function valid_data() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
-				$inputs[ $subsection_name ] = $subsection->valid_data();
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
+				$inputs[$subsection_name] = $subsection->valid_data();
+			} else if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection->normalized_value();
 			}
 		}
 		return $inputs;
@@ -600,11 +600,11 @@ 
 	 * Gets all the inputs on this form section
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function inputs(){
+	public function inputs() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection;
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection;
 			}
 		}
 		return $inputs;
@@ -616,10 +616,10 @@ 
 	 * Gets all the subsections which are a proper form
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subforms(){
+	public function subforms() {
 		$form_sections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Proper){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Proper) {
 				$form_sections[$name] = $obj;
 			}
 		}
@@ -634,7 +634,7 @@ 
 	 * if you only want form inputs or proper form sections.
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subsections(){
+	public function subsections() {
 		$this->ensure_construct_finalized_called();
 		return $this->_subsections;
 	}
@@ -652,8 +652,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_values( $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( false, $include_subform_inputs, $flatten );
+	public function input_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(false, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -669,8 +669,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_pretty_values(  $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( true, $include_subform_inputs, $flatten );
+	public function input_pretty_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(true, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -683,17 +683,17 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) {
+	public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) {
 		$input_values = array();
-		foreach( $this->subsections() as $subsection_name => $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				$input_values[ $subsection_name ] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) {
-				$subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten );
-				if( $flatten ) {
-					$input_values = array_merge( $input_values, $subform_input_values );
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$input_values[$subsection_name] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) {
+				$subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten);
+				if ($flatten) {
+					$input_values = array_merge($input_values, $subform_input_values);
 				} else {
-					$input_values[ $subsection_name ] = $subform_input_values;
+					$input_values[$subsection_name] = $subform_input_values;
 				}
 			}
 		}
@@ -707,7 +707,7 @@ 
 	 * (ie, had receive_form_submission called on it yet)
 	 * @return boolean
 	 */
-	public function has_received_submission(){
+	public function has_received_submission() {
 		$this->ensure_construct_finalized_called();
 		return $this->_received_submission;
 	}
@@ -720,8 +720,8 @@ 
 	 * @param array $inputs_to_exclude values are the input names
 	 * @return void
 	 */
-	public function exclude($inputs_to_exclude = array()){
-		foreach($inputs_to_exclude as $input_to_exclude_name){
+	public function exclude($inputs_to_exclude = array()) {
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
 			unset($this->_subsections[$input_to_exclude_name]);
 		}
 	}
@@ -731,8 +731,8 @@ 
 	/**
 	 * @param array $inputs_to_hide
 	 */
-	public function hide($inputs_to_hide= array()){
-		foreach($inputs_to_hide as $input_to_hide){
+	public function hide($inputs_to_hide = array()) {
+		foreach ($inputs_to_hide as $input_to_hide) {
 			$input = $this->get_input($input_to_hide);
 
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -757,13 +757,13 @@ 
 	 * 																								or if $subsection_name_to_target is null, before or after entire subsections array
 	 * @return void
 	 */
-	public function add_subsections( $new_subsections, $subsection_name_to_target = NULL, $add_before = true ){
-		foreach($new_subsections as $subsection_name => $subsection){
-			if( ! $subsection instanceof EE_Form_Section_Base){
+	public function add_subsections($new_subsections, $subsection_name_to_target = NULL, $add_before = true) {
+		foreach ($new_subsections as $subsection_name => $subsection) {
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
 				EE_Error::add_error(
 					sprintf(
 						__("Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.", "event_espresso"),
-						get_class( $subsection ),
+						get_class($subsection),
 						$subsection_name,
 						$this->name()
 					)
@@ -772,8 +772,8 @@ 
 			}
 		}
 
-		EE_Registry::instance()->load_helper( 'Array' );
-		$this->_subsections = EEH_Array::insert_into_array( $this->_subsections, $new_subsections, $subsection_name_to_target, $add_before );
+		EE_Registry::instance()->load_helper('Array');
+		$this->_subsections = EEH_Array::insert_into_array($this->_subsections, $new_subsections, $subsection_name_to_target, $add_before);
 
 		/*$subsections_before = array();
 		if( $subsection_name_to_target ){
@@ -804,8 +804,8 @@ 
 				$this->_subsections = $new_subsections;
 			}
 		}*/
-		if( $this->_construction_finalized ){
-			foreach($this->_subsections as $name => $subsection){
+		if ($this->_construction_finalized) {
+			foreach ($this->_subsections as $name => $subsection) {
 				$subsection->_construct_finalize($this, $name);
 			}
 		}
@@ -816,8 +816,8 @@ 
 	/**
 	 * Just gets all validatable subsections to clean their sensitive data
 	 */
-	public function clean_sensitive_data(){
-		foreach($this->get_validatable_subsections() as $subsection){
+	public function clean_sensitive_data() {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$subsection->clean_sensitive_data();
 		}
 	}
@@ -827,8 +827,8 @@ 
 	/**
 	 * @param string $form_submission_error_message
 	 */
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message ) ? $form_submission_error_message : __( 'Form submission failed due to errors', 'event_espresso' );
+	public function set_submission_error_message($form_submission_error_message = '') {
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message) ? $form_submission_error_message : __('Form submission failed due to errors', 'event_espresso');
 	}
 
 
@@ -845,8 +845,8 @@ 
 	/**
 	 * @param string $form_submission_success_message
 	 */
-	public function set_submission_success_message( $form_submission_success_message ) {
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message ) ? $form_submission_success_message : __( 'Form submitted successfully', 'event_espresso' );
+	public function set_submission_success_message($form_submission_success_message) {
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message) ? $form_submission_success_message : __('Form submitted successfully', 'event_espresso');
 	}
 
 
@@ -868,10 +868,10 @@ 
 	 * EE_Form_Input_Base::_set_default_html_name_if_empty
 	 * @return string
 	 */
-	public function html_name_prefix(){
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+	public function html_name_prefix() {
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
+		} else {
 			return $this->name();
 		}
 	}
@@ -882,7 +882,7 @@ 
 	 * was set, which is probably nothing, or the classname)
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		$this->ensure_construct_finalized_called();
 		return parent::name();
 	}
@@ -891,7 +891,7 @@ 
 	 *
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		$this->ensure_construct_finalized_called();
 		return parent::parent_section();
 	}
@@ -900,9 +900,9 @@ 
 	 * make sure construction finalized was called, otherwise children might not be ready
 	 * @return void
 	 */
-	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);
 		}
 	}
 
@@ -914,17 +914,17 @@ 
 	 * @param array $req_data
 	 * @return boolean
 	 */
-	public function form_data_present_in( $req_data = NULL ) {
-		if( $req_data === NULL){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		foreach( $this->subsections() as $subsection ) {
-			if($subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
 			}
@@ -941,14 +941,14 @@ 
 	 */
 	public function get_validation_errors_accumulated() {
 		$validation_errors = $this->get_validation_errors();
-		foreach($this->get_validatable_subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Section_Proper ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
 			} else {
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
 			}
-			if( $validation_errors_on_this_subsection ){
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
+			if ($validation_errors_on_this_subsection) {
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
 			}
 		}
 		return $validation_errors;

core/db_classes/EE_Checkin.class.php

Indentation +12 added lines, -12 removed lines

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

Spacing +8 added lines, -8 removed lines

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

core/helpers/EEH_Class_Tools.helper.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author				Event Espresso
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EEH_Class_Tools Helper
- *
- * @package			Event Espresso
- * @subpackage		/helpers/
- * @author				Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author				Event Espresso
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EEH_Class_Tools Helper
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		/helpers/
+	 * @author				Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EEH_Class_Tools {
 
 	static $i = 0;

Spacing +34 added lines, -34 removed lines

@@ -35,35 +35,35 @@ 
 	 */
 	public static function get_called_class() {
 		$backtrace = debug_backtrace();
-		if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['class'] ) && ! isset( $backtrace[2]['file'] )) {
+		if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['class']) && ! isset($backtrace[2]['file'])) {
 			return $backtrace[2]['class'];
-		} else if ( isset( $backtrace[3] ) && is_array( $backtrace[3] ) && isset( $backtrace[3]['class'] ) && ! isset( $backtrace[3]['file'] )) {
+		} else if (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
 			return $backtrace[3]['class'];
-		} else if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['file'] ) && isset( $backtrace[2]['line'] )) {
-			if ( self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line'] ) {
+		} else if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
+			if (self::$file_line == $backtrace[2]['file'].$backtrace[2]['line']) {
 				self::$i++;
 			} else {
 				self::$i = 0;
-				self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
+				self::$file_line = $backtrace[2]['file'].$backtrace[2]['line'];
 			}
 			// was  class method called via call_user_func ?
-			if ( $backtrace[2]['function'] == 'call_user_func' && isset( $backtrace[2]['args'] ) && is_array( $backtrace[2]['args'] )){
-				if ( isset( $backtrace[2]['args'][0] ) && isset( $backtrace[2]['args'][0][0] )) {
+			if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
+				if (isset($backtrace[2]['args'][0]) && isset($backtrace[2]['args'][0][0])) {
 					$called_class = $backtrace[2]['args'][0][0];
 					// is it an EE function ?
-					if ( strpos( $called_class, 'EE' ) === 0 ) {
-						$prefix_chars = strpos( $called_class, '_' ) + 1;
-						$prefix = substr( $called_class, 0, $prefix_chars );
-						$classname = substr( $called_class, $prefix_chars, strlen( $called_class ));
-						$classname = $prefix . str_replace( ' ', '_', ucwords( strtolower( str_replace( '_', ' ', $classname  ))));
+					if (strpos($called_class, 'EE') === 0) {
+						$prefix_chars = strpos($called_class, '_') + 1;
+						$prefix = substr($called_class, 0, $prefix_chars);
+						$classname = substr($called_class, $prefix_chars, strlen($called_class));
+						$classname = $prefix.str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
 						return $classname;
 					}
 				}
 			} else {
-				$lines = file( $backtrace[2]['file'] );
-				preg_match_all( '/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[$backtrace[2]['line']-1], $matches );
-				if ( isset( $matches[1] ) && isset( $matches[1][ self::$i ] )) {
-					return $matches[1][ self::$i ];
+				$lines = file($backtrace[2]['file']);
+				preg_match_all('/([a-zA-Z0-9\_]+)::'.$backtrace[2]['function'].'/', $lines[$backtrace[2]['line'] - 1], $matches);
+				if (isset($matches[1]) && isset($matches[1][self::$i])) {
+					return $matches[1][self::$i];
 				}
 			}
 		}
@@ -80,22 +80,22 @@ 
 	 * 	@param 	string 	$hook
 	 * 	@return 	array
 	 */
-	public static function get_class_names_for_all_callbacks_on_hook( $hook = NULL ) {
+	public static function get_class_names_for_all_callbacks_on_hook($hook = NULL) {
 		global $wp_filter;
 		$class_names = array();
 		// are any callbacks registered for this hook ?
-		if ( isset( $wp_filter[ $hook ] )) {
+		if (isset($wp_filter[$hook])) {
 			// loop thru all of the callbacks attached to the deprecated hookpoint
-			foreach( $wp_filter[ $hook ] as $priority ) {
-				foreach( $priority as $callback ) {
+			foreach ($wp_filter[$hook] as $priority) {
+				foreach ($priority as $callback) {
 					// is the callback a non-static class method ?
-					if ( isset( $callback['function'] ) && is_array( $callback['function'] )) {
-						if ( isset( $callback['function'][0] ) && is_object( $callback['function'][0] )) {
-							$class_names[] = get_class( $callback['function'][0] );
+					if (isset($callback['function']) && is_array($callback['function'])) {
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
+							$class_names[] = get_class($callback['function'][0]);
 						}
 					// test for static method
-					} else if ( strpos( $callback['function'], '::' ) !== FALSE ) {
-						$class = explode( '::', $callback['function'] );
+					} else if (strpos($callback['function'], '::') !== FALSE) {
+						$class = explode('::', $callback['function']);
 						$class_names[] = $class[0];
 					} else {
 						// just a function
@@ -116,24 +116,24 @@ 
 	 * 	@param		string 	$property
 	 * 	@return 		boolean
 	 */
-	public static function has_property( $class = NULL, $property = NULL ) {
+	public static function has_property($class = NULL, $property = NULL) {
 		// if $class or $property don't exist, then get out, cuz that would be like... fatal dude
-		if ( empty( $class ) || empty( $property )) {
+		if (empty($class) || empty($property)) {
 			return FALSE;
 		}
 		// if your hosting company doesn't cut the mustard
-		if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
+		if (version_compare(PHP_VERSION, '5.3.0') < 0) {
 			// just in case $class is an actual instantiated object
-			if ( is_object( $class )) {
-				return isset( $class->{$property} ) ? TRUE : FALSE;
+			if (is_object($class)) {
+				return isset($class->{$property} ) ? TRUE : FALSE;
 			} else {
 				// use reflection for < PHP 5.3 to get details using just the class name
-				$reflector = new ReflectionClass( $class );
-				return $reflector->hasProperty( $property );
+				$reflector = new ReflectionClass($class);
+				return $reflector->hasProperty($property);
 			}
 		} else {
 			// or try regular property exists method which works as expected in PHP 5.3+
-			return property_exists( $class, $property );
+			return property_exists($class, $property);
 		}
 	}
 
@@ -143,7 +143,7 @@ 
 
 
 // if PHP version < 5.3
-if ( ! function_exists( 'get_called_class' )) {
+if ( ! function_exists('get_called_class')) {
 	/**
 	 * @return bool|string
 	 */

core/libraries/batch/JobHandlerBaseClasses/JobHandlerFile.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- *
- * Class JobHandlerFile
- *
- * Base class for common implementations of JobHandlerInterface, but ones
- * which write to a temporary file
- *
- * @package         Event Espresso
- * @subpackage    batch
- * @author				Mike Nelson
- * @since		 	   4.8.26
- *
- */
+	 *
+	 * Class JobHandlerFile
+	 *
+	 * Base class for common implementations of JobHandlerInterface, but ones
+	 * which write to a temporary file
+	 *
+	 * @package         Event Espresso
+	 * @subpackage    batch
+	 * @author				Mike Nelson
+	 * @since		 	   4.8.26
+	 *
+	 */
 namespace EventEspressoBatchRequest\JobHandlerBaseClasses;
 
 use EventEspressoBatchRequest\Helpers\BatchRequestException;

Spacing +23 added lines, -23 removed lines

@@ -16,8 +16,8 @@ 
 
 use EventEspressoBatchRequest\Helpers\BatchRequestException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -39,8 +39,8 @@ 
 	 *
 	 * @param \EEHI_File|null $file_helper
 	 */
-	public function __construct( \EEHI_File $file_helper = null ) {
-		if( ! $file_helper ) {
+	public function __construct(\EEHI_File $file_helper = null) {
+		if ( ! $file_helper) {
 			$this->_file_helper = new \EEH_File();
 		}
 	}
@@ -56,39 +56,39 @@ 
 	 * @return string
 	 * @throws \EventEspressoBatchRequest\Helpers\BatchRequestException
 	 */
-	public function create_file_from_job_with_name( $job_id, $filename, $filetype = 'application/ms-excel' ) {
+	public function create_file_from_job_with_name($job_id, $filename, $filetype = 'application/ms-excel') {
 		$filepath = '';
-		try{
+		try {
 			$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
-				EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name
+				EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name
 			);
-			if ( $success ) {
+			if ($success) {
 				$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
-					EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id
+					EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id
 				);
 			}
-			if( $success ) {
-				$filepath = EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id . DS. $filename;
-				$success = $this->_file_helper->ensure_file_exists_and_is_writable( $filepath );
+			if ($success) {
+				$filepath = EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id.DS.$filename;
+				$success = $this->_file_helper->ensure_file_exists_and_is_writable($filepath);
 			}
 			//let's add the .htaccess file so safari will open the file properly
-			if( $success ) {
-				$extension = \EEH_File::get_file_extension( $filepath );
+			if ($success) {
+				$extension = \EEH_File::get_file_extension($filepath);
 				\EEH_File::write_to_file(
-					EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id . DS . '.htaccess',
-					'AddType ' . $filetype . ' ' . $extension,
+					EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id.DS.'.htaccess',
+					'AddType '.$filetype.' '.$extension,
 					'.htaccess'
 				);
 			}
 			//those methods normally fail with an exception, but if not, let's do it
-			if( ! $success ) {
-				throw new \EE_Error( 'could_not_create_temp_file',
-				__( 'An unknown error occurred', 'event_espresso' ));
+			if ( ! $success) {
+				throw new \EE_Error('could_not_create_temp_file',
+				__('An unknown error occurred', 'event_espresso'));
 			}
-		} catch( \EE_Error $e ) {
+		} catch (\EE_Error $e) {
 			throw new BatchRequestException(
 				sprintf(
-					__( 'Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso' ),
+					__('Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso'),
 					$job_id,
 					$e->getMessage()
 				),
@@ -104,8 +104,8 @@ 
 	 * @param string $filepath
 	 * @return string url to file
 	 */
-	public function get_url_to_file( $filepath ) {
-		return str_replace( EVENT_ESPRESSO_UPLOAD_DIR, EVENT_ESPRESSO_UPLOAD_URL, $filepath );
+	public function get_url_to_file($filepath) {
+		return str_replace(EVENT_ESPRESSO_UPLOAD_DIR, EVENT_ESPRESSO_UPLOAD_URL, $filepath);
 	}
 }
 

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

Spacing +33 added lines, -33 removed lines

@@ -36,9 +36,9 @@ 
 	 */
 	protected $_price_types = array();
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$this->_PRT = EEM_Price_Type::instance();
 		$this->_price_types = $this->_PRT->get_all_deleted_and_undeleted();
 	}
@@ -48,9 +48,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? true : false;
-		$this->_data = $this->_admin_page->get_prices_overview_data( $this->_per_page, false, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, false );
-		$this->_trashed_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, true );
+		$this->_data = $this->_admin_page->get_prices_overview_data($this->_per_page, false, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, false);
+		$this->_trashed_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, true);
 	}
 
 
@@ -74,9 +74,9 @@ 
 
 			$this->_sortable_columns = array(
 						// true means its already sorted
-						'name' => array( 'name' => false ),
-						'type' => array( 'type' => false ),
-						'amount' => array( 'amount' => false )
+						'name' => array('name' => false),
+						'type' => array('type' => false),
+						'amount' => array('amount' => false)
 			);
 
         $this->_hidden_columns = array(
@@ -98,7 +98,7 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_prices', 'pricing_trash_price') ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
 			$this->_views['trashed']['count'] = $this->_trashed_count;
 		}
 	}
@@ -112,16 +112,16 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
+		$row_class = ($row_class == '' ? 'alternate' : '');
 
 		$new_row = $row_class;
 
-		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 )
+		if ($item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4)
 			$new_row .= ' rowsortable';
 
-		return ' class="' . $new_row . '"';
+		return ' class="'.$new_row.'"';
 	}
 
 
@@ -131,8 +131,8 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->type_obj()->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		if ($item->type_obj()->base_type() !== 1)
+			return sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 		return '';
 	}
 
@@ -145,31 +145,31 @@ 
 		//Build row actions
 		$actions = array();
 		// edit price link
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'pricing_edit_price', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_price', 'id'=>$item->ID() ), PRICING_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'pricing_edit_price', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_price', 'id'=>$item->ID()), PRICING_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'edit_price', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . stripslashes( $item->name() ) . '</a>' : $item->name();
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'edit_price', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.stripslashes($item->name()).'</a>' : $item->name();
 
-		if ( $item->type_obj()->base_type() !== 1 ) {
+		if ($item->type_obj()->base_type() !== 1) {
 			if ($this->_view == 'all') {
 				// trash price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_trash_price', $item->ID() ) ) {
-					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Price to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_trash_price', $item->ID())) {
+					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Price to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
 				}
 			} else {
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_restore_price', $item->ID() ) ) {
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_restore_price', $item->ID())) {
 					// restore price link
-					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Price', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Price', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				}
 
 				// delete price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_delete_price', $item->ID() ) ) {
-					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Price Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_delete_price', $item->ID())) {
+					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Price Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 				}
 			}
 		}
@@ -178,7 +178,7 @@ 
 		return sprintf('%1$s <span style="color:silver">(id:%2$s)</span>%3$s',
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->ID(),
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -195,7 +195,7 @@ 
 
 
 	function column_description($item) {
-		return stripslashes( $item->desc() );
+		return stripslashes($item->desc());
 	}
 
 
@@ -204,9 +204,9 @@ 
 
 	function column_amount($item) {
 		if ($this->_price_types[$item->type()]->is_percent()) {
-			return '<div class="pad-amnt-rght">' . number_format($item->amount(), 1) . '%</div>';
+			return '<div class="pad-amnt-rght">'.number_format($item->amount(), 1).'%</div>';
 		} else {
-			return '<div class="pad-amnt-rght">' . EEH_Template::format_currency( $item->amount() ) . '</div>';
+			return '<div class="pad-amnt-rght">'.EEH_Template::format_currency($item->amount()).'</div>';
 		}
 	}
 

caffeinated/admin/new/pricing/Pricing_Admin_Page.core.php

Spacing +184 added lines, -184 removed lines

@@ -31,8 +31,8 @@ 
 	 * @param bool $routing
 	 * @return Pricing_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -49,7 +49,7 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_update_prices_order', array( $this, 'update_price_order' ));
+		add_action('wp_ajax_espresso_update_prices_order', array($this, 'update_price_order'));
 	}
 
 
@@ -82,8 +82,8 @@ 
 	*		@return void
 	*/
 	protected function _set_page_routes() {
-		$prc_id = ! empty( $this->_req_data['PRC_ID'] ) && ! is_array( $this->_req_data['PRC_ID'] ) ? $this->_req_data['PRC_ID'] : 0;
-		$prt_id =  ! empty( $this->_req_data['PRT_ID'] ) && ! is_array( $this->_req_data['PRT_ID'] ) ? $this->_req_data['PRT_ID'] : 0;
+		$prc_id = ! empty($this->_req_data['PRC_ID']) && ! is_array($this->_req_data['PRC_ID']) ? $this->_req_data['PRC_ID'] : 0;
+		$prt_id = ! empty($this->_req_data['PRT_ID']) && ! is_array($this->_req_data['PRT_ID']) ? $this->_req_data['PRT_ID'] : 0;
 		$this->_page_routes = array(
 			'default' => array(
 					'func' => '_price_overview_list_table',
@@ -91,38 +91,38 @@ 
 				),
 			'add_new_price'	=> array(
 					'func' => '_edit_price_details',
-					'args' => array( 'new_price' => TRUE ),
+					'args' => array('new_price' => TRUE),
 					'capability' => 'ee_edit_default_prices'
 				),
 			'edit_price'	=> array(
 					'func' => '_edit_price_details',
-					'args' => array( 'new_price' => FALSE ),
+					'args' => array('new_price' => FALSE),
 					'capability' => 'ee_edit_default_price',
 					'obj_id' => $prc_id
 				),
 			'insert_price'	=> array(
 					'func' => '_insert_or_update_price',
-					'args' => array( 'new_price' => TRUE ),
+					'args' => array('new_price' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_prices',
 				),
 			'update_price'	=> array(
 					'func' => '_insert_or_update_price',
-					'args' => array( 'new_price' => FALSE ),
+					'args' => array('new_price' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price',
 					'obj_id' => $prc_id
 				),
 			'trash_price'	=> array(
 					'func' => '_trash_or_restore_price',
-					'args' => array( 'trash' => TRUE ),
+					'args' => array('trash' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price',
 					'obj_id' => $prc_id
 				),
 			'restore_price'	=> array(
 					'func' => '_trash_or_restore_price',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price',
 					'obj_id' => $prc_id
@@ -154,27 +154,27 @@ 
 				),
 			'insert_price_type'	=> array(
 					'func' => '_insert_or_update_price_type',
-					'args' => array( 'new_price_type' => TRUE ),
+					'args' => array('new_price_type' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price_types'
 				),
 			'update_price_type' => array(
 					'func' => '_insert_or_update_price_type',
-					'args' => array( 'new_price_type' => FALSE ),
+					'args' => array('new_price_type' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price_type',
 					'obj_id' => $prt_id
 				),
 			'trash_price_type'	=> array(
 					'func' => '_trash_or_restore_price_type',
-					'args' => array( 'trash' => TRUE ),
+					'args' => array('trash' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price_type',
 					'obj_id' => $prt_id
 				),
 			'restore_price_type'	=> array(
 					'func' => '_trash_or_restore_price_type',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price_type',
 					'obj_id' => $prt_id
@@ -214,7 +214,7 @@ 
 							'filename' => 'pricing_default_pricing_views_bulk_actions_search'
 							)
 						),
-					'help_tour' => array( 'Pricing_Default_Prices_Help_Tour'),
+					'help_tour' => array('Pricing_Default_Prices_Help_Tour'),
 					'require_nonce' => FALSE
 				),
 			'add_new_price' => array(
@@ -230,24 +230,24 @@ 
 							)
 						),
                     'help_tour' => array('Pricing_Add_New_Default_Price_Help_Tour'),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
 					'require_nonce' => FALSE
 				),
 			'edit_price' => array(
 					'nav' => array(
 							'label' => __('Edit Default Price', 'event_espresso'),
 							'order' => 20,
-							'url' => isset($this->_req_data['id']) ? add_query_arg(array('id' => $this->_req_data['id'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+							'url' => isset($this->_req_data['id']) ? add_query_arg(array('id' => $this->_req_data['id']), $this->_current_page_view_url) : $this->_admin_base_url,
 							'persistent' => FALSE
 						),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
                     'help_tabs' => array(
 						'edit_default_price_help_tab' => array(
 							'title' => __('Edit Default Price', 'event_espresso'),
 							'filename' => 'pricing_edit_default_price'
 							)
 						),
-					'help_tour' => array( 'Pricing_Edit_Default_Price_Help_Tour' ),
+					'help_tour' => array('Pricing_Edit_Default_Price_Help_Tour'),
 					'require_nonce' => FALSE
 				),
 			'price_types' => array(
@@ -270,7 +270,7 @@ 
 							'filename' => 'pricing_price_types_views_bulk_actions_search'
 							),
 						),
-					'help_tour' => array( 'Pricing_Price_Types_Default_Help_Tour' ),
+					'help_tour' => array('Pricing_Price_Types_Default_Help_Tour'),
 					'metaboxes' => array('_espresso_news_post_box', '_espresso_links_post_box'),
 					'require_nonce' => FALSE
 				),
@@ -286,8 +286,8 @@ 
 							'filename' => 'pricing_add_new_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Add_New_Price_Type_Help_Tour' ),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes' ),
+                    'help_tour' => array('Pricing_Add_New_Price_Type_Help_Tour'),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
 					'require_nonce' => FALSE
 				),
 			'edit_price_type' => array(
@@ -302,8 +302,8 @@ 
 							'filename' => 'pricing_edit_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Edit_Price_Type_Help_Tour' ),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes' ),
+                    'help_tour' => array('Pricing_Edit_Price_Type_Help_Tour'),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
 
 					'require_nonce' => FALSE
 				)
@@ -340,7 +340,7 @@ 
 	public function load_scripts_styles() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style( 'espresso_PRICING', PRICING_ASSETS_URL . 'espresso_pricing_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_PRICING', PRICING_ASSETS_URL.'espresso_pricing_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_PRICING');
 
 		//scripts
@@ -350,8 +350,8 @@ 
 		//wp_enqueue_script('jquery-ui-dialog');
 		//wp_enqueue_script('jquery-ui-draggable');
 		//wp_enqueue_script('jquery-ui-datepicker');
-		wp_register_script( 'espresso_PRICING', PRICING_ASSETS_URL . 'espresso_pricing_admin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_PRICING' );
+		wp_register_script('espresso_PRICING', PRICING_ASSETS_URL.'espresso_pricing_admin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_PRICING');
 	}
 
 
@@ -359,7 +359,7 @@ 
 
 
 	public function load_scripts_styles_default() {
-		wp_enqueue_script( 'espresso_ajax_table_sorting' );
+		wp_enqueue_script('espresso_ajax_table_sorting');
 	}
 
 
@@ -387,7 +387,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_prices', 'pricing_trash_price' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
 			$this->_views['trashed'] = array(
 					'slug' => 'trashed',
 					'label' => __('Trash', 'event_espresso'),
@@ -417,7 +417,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_types', 'pricing_trash_price_type' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_types', 'pricing_trash_price_type')) {
 			 $this->_views['trashed'] = array(
 					'slug' => 'trashed',
 					'label' => __('Trash', 'event_espresso'),
@@ -456,18 +456,18 @@ 
 	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
 	* 	@return mixed (int|array)  int = count || array of price objects
 	*/
-	public function get_prices_overview_data( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_prices_overview_data($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// start with an empty array
 		$event_pricing = array();
 
-		require_once( PRICING_ADMIN . 'Prices_List_Table.class.php' );
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(PRICING_ADMIN.'Prices_List_Table.class.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		//$PRC = EEM_Price::instance();
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
 		switch ($this->_req_data['orderby']) {
 			case 'name':
@@ -480,27 +480,27 @@ 
 				$orderby = array('PRC_amount'=>$order);
 				break;
 			default:
-				$orderby = array( 'PRC_order'=>$order, 'Price_Type.PRT_order'=>$order, 'PRC_ID'=>$order);
+				$orderby = array('PRC_order'=>$order, 'Price_Type.PRT_order'=>$order, 'PRC_ID'=>$order);
 		}
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array(
 				'PRC_is_default' => 1,
 				'PRC_deleted' => $trashed
 				);
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'PRC_name' => array('LIKE',$sstr ),
-				'PRC_desc' => array('LIKE',$sstr ),
-				'PRC_amount' => array( 'LIKE',$sstr ),
-				'Price_Type.PRT_name' => array( 'LIKE', $sstr )
+				'PRC_name' => array('LIKE', $sstr),
+				'PRC_desc' => array('LIKE', $sstr),
+				'PRC_amount' => array('LIKE', $sstr),
+				'Price_Type.PRT_name' => array('LIKE', $sstr)
 				);
 		}
 
@@ -511,9 +511,9 @@ 
 			'group_by'=>'PRC_ID'
 			);
 
-		if($count){
-			return $trashed ? EEM_Price::instance()->count( array( $_where ) ) : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		if ($count) {
+			return $trashed ? EEM_Price::instance()->count(array($_where)) : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
+		} else {
 			return EEM_Price::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 	}
@@ -529,40 +529,40 @@ 
 	*		@return void
 	*/
 	protected function _edit_price_details() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab price ID
-		$PRC_ID = isset( $this->_req_data['id'] ) && ! empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : FALSE;
+		$PRC_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : FALSE;
 		// change page title based on request action
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add PRC_ID to title if editing
-		$this->_admin_page_title = $PRC_ID ? $this->_admin_page_title . ' # ' . $PRC_ID : $this->_admin_page_title;
+		$this->_admin_page_title = $PRC_ID ? $this->_admin_page_title.' # '.$PRC_ID : $this->_admin_page_title;
 
 		// get prices
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
-		if ( $PRC_ID ) {
-			$price = $PRC->get_one_by_ID( $PRC_ID );
+		if ($PRC_ID) {
+			$price = $PRC->get_one_by_ID($PRC_ID);
 			$additional_hidden_fields = array(
-					'PRC_ID' => array( 'type' => 'hidden', 'value' => $PRC_ID )
+					'PRC_ID' => array('type' => 'hidden', 'value' => $PRC_ID)
 				);
-			$this->_set_add_edit_form_tags( 'update_price', $additional_hidden_fields );
+			$this->_set_add_edit_form_tags('update_price', $additional_hidden_fields);
 		} else {
 			$price = $PRC->get_new_price();
-			$this->_set_add_edit_form_tags( 'insert_price' );
+			$this->_set_add_edit_form_tags('insert_price');
 		}
 
 		$this->_template_args['PRC_ID'] = $PRC_ID;
 		$this->_template_args['price'] = $price;
 
 		// get price types
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
-		$price_types = $PRT->get_all( array( array('PBT_ID' => array('!=', 1 ) ) ) );
+		$price_types = $PRT->get_all(array(array('PBT_ID' => array('!=', 1))));
 		$price_type_names = array();
 		if (empty($price_types)) {
-			$msg = __( 'You have no price types defined. Please add a price type before adding a price.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('You have no price types defined. Please add a price type before adding a price.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			exit();
 		} else {
 			foreach ($price_types as $type) {
@@ -575,7 +575,7 @@ 
 		$this->_template_args['price_types'] = $price_type_names;
 		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
 
-		$this->_set_publish_post_box_vars( 'id', $PRC_ID );
+		$this->_set_publish_post_box_vars('id', $PRC_ID);
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
 	}
@@ -591,7 +591,7 @@ 
 	*		@return void
 	*/
 	protected function _price_details_meta_boxes() {
-		add_meta_box( 'edit-price-details-mbox', __( 'Default Price Details', 'event_espresso' ), array( $this, '_edit_price_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-price-details-mbox', __('Default Price Details', 'event_espresso'), array($this, '_edit_price_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
 	}
 
 
@@ -605,7 +605,7 @@ 
 	*		@return void
 	*/
 	public function _edit_price_details_meta_box() {
-		echo EEH_Template::display_template( PRICING_TEMPLATE_PATH . 'pricing_details_main_meta_box.template.php', $this->_template_args, TRUE );
+		echo EEH_Template::display_template(PRICING_TEMPLATE_PATH.'pricing_details_main_meta_box.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -619,7 +619,7 @@ 
 	*/
 	protected function set_price_column_values() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$set_column_values = array(
 				'PRT_ID' => absint($this->_req_data['PRT_ID']),
@@ -647,12 +647,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _insert_or_update_price( $insert = FALSE ) {
+	protected function _insert_or_update_price($insert = FALSE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		// why be so pessimistic ???  : (
@@ -660,14 +660,14 @@ 
 
 		$set_column_values = $this->set_price_column_values();
 		// is this a new Price ?
-		if ( $insert ) {
+		if ($insert) {
 			// run the insert
-			if ( $PRC_ID = $PRC->insert( $set_column_values )) {
+			if ($PRC_ID = $PRC->insert($set_column_values)) {
 				//make sure this new price modifier is attached to the ticket but ONLY if it is not a tax type
 				$PR = EEM_price::instance()->get_one_by_ID($PRC_ID);
-				if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-					$ticket->_add_relation_to( $PR, 'Price' );
+					$ticket->_add_relation_to($PR, 'Price');
 					$ticket->save();
 				}
 				$success = 1;
@@ -677,29 +677,29 @@ 
 			}
 			$action_desc = 'created';
 		} else {
-			$PRC_ID = absint( $this->_req_data['PRC_ID'] );
+			$PRC_ID = absint($this->_req_data['PRC_ID']);
 			// run the update
-			$where_cols_n_values = array( 'PRC_ID' => $PRC_ID );
-			if ( $PRC->update( $set_column_values, array($where_cols_n_values))) {
+			$where_cols_n_values = array('PRC_ID' => $PRC_ID);
+			if ($PRC->update($set_column_values, array($where_cols_n_values))) {
 				$success = 1;
 			}
 
 			$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-			if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+			if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 
 				//if this is $PRC_ID == 1, then we need to update the default ticket attached to this price so the TKT_price value is updated.
-				if ( $PRC_ID === 1 ) {
+				if ($PRC_ID === 1) {
 					$ticket = $PR->get_first_related('Ticket');
-					if ( $ticket ) {
-						$ticket->set('TKT_price', $PR->get('PRC_amount') );
-						$ticket->set('TKT_name', $PR->get('PRC_name') );
+					if ($ticket) {
+						$ticket->set('TKT_price', $PR->get('PRC_amount'));
+						$ticket->set('TKT_name', $PR->get('PRC_name'));
 						$ticket->set('TKT_description', $PR->get('PRC_desc'));
 						$ticket->save();
 					}
 				} else {
 					//we make sure this price is attached to base ticket. but ONLY if its not a tax ticket type.
 					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-					$ticket->_add_relation_to( $PRC_ID, 'Price' );
+					$ticket->_add_relation_to($PRC_ID, 'Price');
 					$ticket->save();
 				}
 			}
@@ -707,9 +707,9 @@ 
 			$action_desc = 'updated';
 		}
 
-		$query_args = array( 'action' => 'edit_price', 'id' => $PRC_ID );
+		$query_args = array('action' => 'edit_price', 'id' => $PRC_ID);
 
-		$this->_redirect_after_action( $success, 'Prices', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Prices', $action_desc, $query_args);
 
 	}
 
@@ -723,12 +723,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_price( $trash = TRUE ) {
+	protected function _trash_or_restore_price($trash = TRUE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		$success = 1;
@@ -737,18 +737,18 @@ 
 		//get base ticket for updating
 		$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $PRC_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID) ) ) {
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID))) {
 					$success = 0;
 				} else {
 					$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-					if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+					if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 						//if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-						if ( $PRC_deleted ) {
+						if ($PRC_deleted) {
 							$ticket->_remove_relation_to($PRC_ID, 'Price');
 						} else {
 							$ticket->_add_relation_to($PRC_ID, 'Price');
@@ -760,14 +760,14 @@ 
 
 		} else {
 			// grab single id and delete
-			$PRC_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-			if ( empty( $PRC_ID ) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID) ) {
+			$PRC_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRC_ID) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID)) {
 				$success = 0;
 			} else {
 				$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-				if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 					//if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-					if ( $PRC_deleted ) {
+					if ($PRC_deleted) {
 						$ticket->_remove_relation_to($PRC_ID, 'Price');
 					} else {
 						$ticket->_add_relation_to($PRC_ID, 'Price');
@@ -781,17 +781,17 @@ 
 			'action' => 'default'
 			);
 
-		if ( $success ) {
-			if ( $trash ) {
+		if ($success) {
+			if ($trash) {
 				$msg = $success == 2 ? __('The Prices have been trashed.', 'event_espresso') : __('The Price has been trashed.', 'event_espresso');
 			} else {
 				$msg = $success == 2 ? __('The Prices have been restored.', 'event_espresso') : __('The Price has been restored.', 'event_espresso');
 			}
 
-			EE_Error::add_success( $msg );
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -808,19 +808,19 @@ 
 	protected function _delete_price() {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru bulk action checkboxes
-			while (list( $PRC_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if (!$PRC->delete_permanently_by_ID(absint($PRC_ID))) {
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRC->delete_permanently_by_ID(absint($PRC_ID))) {
 					$success = 0;
 				}
 			}
@@ -834,7 +834,7 @@ 
 
 		}
 
-		$this->_redirect_after_action( $success, 'Prices', 'deleted', array() );
+		$this->_redirect_after_action($success, 'Prices', 'deleted', array());
 
 	}
 
@@ -842,16 +842,16 @@ 
 
 
 	public function update_price_order() {
-		$success = __( 'Price order was updated successfully.', 'event_espresso' );
+		$success = __('Price order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] ) ? explode( ',', rtrim( $this->_req_data['row_ids'], ',' )) : FALSE;
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids']) ? explode(',', rtrim($this->_req_data['row_ids'], ',')) : FALSE;
 
-		if ( is_array( $row_ids )) {
-			for ( $i = 0; $i < count( $row_ids ); $i++ ) {
+		if (is_array($row_ids)) {
+			for ($i = 0; $i < count($row_ids); $i++) {
 				//Update the prices when re-ordering
 				$id = absint($row_ids[$i]);
-				if ( EEM_Price::instance()->update ( array( 'PRC_order' => $i+1 ), array(array( 'PRC_ID' => $id ) )) === FALSE ) {
+				if (EEM_Price::instance()->update(array('PRC_order' => $i + 1), array(array('PRC_ID' => $id))) === FALSE) {
 					$success = FALSE;
 				}
 			}
@@ -859,9 +859,9 @@ 
 			$success = FALSE;
 		}
 
-		$errors = ! $success ? __( 'An error occurred. The price order was not updated.', 'event_espresso' ) : FALSE;
+		$errors = ! $success ? __('An error occurred. The price order was not updated.', 'event_espresso') : FALSE;
 
-		echo json_encode( array( 'return_data' => FALSE, 'success' => $success, 'errors' => $errors ));
+		echo json_encode(array('return_data' => FALSE, 'success' => $success, 'errors' => $errors));
 		die();
 	}
 
@@ -904,46 +904,46 @@ 
 	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
 	* 	@return mixed (int|array)  int = count || array of price objects
 	*/
-	public function get_price_types_overview_data( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_price_types_overview_data($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// start with an empty array
 
-		require_once( PRICING_ADMIN . 'Price_Types_List_Table.class.php' );
-		require_once( EE_MODELS . 'EEM_Price_Type.model.php' );
+		require_once(PRICING_ADMIN.'Price_Types_List_Table.class.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 		switch ($this->_req_data['orderby']) {
 			case 'name':
-				$orderby = array( 'PRT_name' => $order);
+				$orderby = array('PRT_name' => $order);
 				break;
 			default:
-				$orderby = array( 'PRT_order' => $order);
+				$orderby = array('PRT_order' => $order);
 		}
 
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		$_where = array('PRT_deleted'=>$trashed, 'PBT_ID' => array('!=', 1 ) );
+		$_where = array('PRT_deleted'=>$trashed, 'PBT_ID' => array('!=', 1));
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'PRT_name' => array( 'LIKE', $sstr )
+				'PRT_name' => array('LIKE', $sstr)
 				);
 		}
 		$query_params = array(
 			$_where,
 			'order_by'=>$orderby,
 			'limit'=>$limit);
-		if($count){
+		if ($count) {
 			return EEM_Price_Type::instance()->count_deleted_and_undeleted($query_params);
-		}else{
+		} else {
 			return EEM_Price_Type::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -963,25 +963,25 @@ 
 	*/
 	protected function _edit_price_type_details() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 
 		// grab price type ID
-		$PRT_ID = isset( $this->_req_data['id'] ) && ! empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : FALSE;
+		$PRT_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : FALSE;
 		// change page title based on request action
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add PRT_ID to title if editing
-		$this->_admin_page_title = $PRT_ID ? $this->_admin_page_title . ' # ' . $PRT_ID : $this->_admin_page_title;
+		$this->_admin_page_title = $PRT_ID ? $this->_admin_page_title.' # '.$PRT_ID : $this->_admin_page_title;
 
 //		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
 
-		if ( $PRT_ID ) {
-			$price_type = EEM_Price_Type::instance()->get_one_by_ID( $PRT_ID );
-			$additional_hidden_fields = array( 'PRT_ID' => array( 'type' => 'hidden', 'value' => $PRT_ID ));
-			$this->_set_add_edit_form_tags( 'update_price_type', $additional_hidden_fields );
+		if ($PRT_ID) {
+			$price_type = EEM_Price_Type::instance()->get_one_by_ID($PRT_ID);
+			$additional_hidden_fields = array('PRT_ID' => array('type' => 'hidden', 'value' => $PRT_ID));
+			$this->_set_add_edit_form_tags('update_price_type', $additional_hidden_fields);
 		} else {
 			$price_type = EEM_Price_Type::instance()->get_new_price_type();
-			$this->_set_add_edit_form_tags( 'insert_price_type' );
+			$this->_set_add_edit_form_tags('insert_price_type');
 		}
 
 		$this->_template_args['PRT_ID'] = $PRT_ID;
@@ -990,19 +990,19 @@ 
 
 		$base_types = EEM_Price_Type::instance()->get_base_types();
 		$select_values = array();
-		foreach ( $base_types as $ref => $text ) {
-			if ( $ref == EEM_Price_Type::base_type_base_price ) {
+		foreach ($base_types as $ref => $text) {
+			if ($ref == EEM_Price_Type::base_type_base_price) {
 				//do not allow creation of base_type_base_prices because that's a system only base type.
 				continue;
 			}
-			$values[] = array( 'id' => $ref, 'text' => $text );
+			$values[] = array('id' => $ref, 'text' => $text);
 		}
 
 
 		$this->_template_args['base_type_select'] = EEH_Form_Fields::select_input('base_type', $values, $price_type->base_type(), 'id="price-type-base-type-slct"');
 		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
-		$redirect_URL = add_query_arg( array( 'action' => 'price_types'), $this->_admin_base_url );
-		$this->_set_publish_post_box_vars( 'id', $PRT_ID, FALSE, $redirect_URL );
+		$redirect_URL = add_query_arg(array('action' => 'price_types'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $PRT_ID, FALSE, $redirect_URL);
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
 
@@ -1019,7 +1019,7 @@ 
 	*		@return void
 	*/
 	protected function _price_type_details_meta_boxes() {
-		add_meta_box( 'edit-price-details-mbox', __( 'Price Type Details', 'event_espresso' ), array( $this, '_edit_price_type_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-price-details-mbox', __('Price Type Details', 'event_espresso'), array($this, '_edit_price_type_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
 	}
 
 
@@ -1032,7 +1032,7 @@ 
 	*		@return void
 	*/
 	public function _edit_price_type_details_meta_box() {
-		echo EEH_Template::display_template( PRICING_TEMPLATE_PATH . 'pricing_type_details_main_meta_box.template.php', $this->_template_args, TRUE );
+		echo EEH_Template::display_template(PRICING_TEMPLATE_PATH.'pricing_type_details_main_meta_box.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -1045,9 +1045,9 @@ 
 	*/
 	protected function set_price_type_column_values() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		$base_type = !empty( $this->_req_data['base_type'] ) ? $this->_req_data['base_type'] : EEM_Price_Type::base_type_base_price;
+		$base_type = ! empty($this->_req_data['base_type']) ? $this->_req_data['base_type'] : EEM_Price_Type::base_type_base_price;
 
 		switch ($base_type) {
 
@@ -1094,12 +1094,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _insert_or_update_price_type( $new_price_type = FALSE ) {
+	protected function _insert_or_update_price_type($new_price_type = FALSE) {
 
 //		echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
 
 		// why be so pessimistic ???  : (
@@ -1107,24 +1107,24 @@ 
 
 		$set_column_values = $this->set_price_type_column_values();
 		// is this a new Price ?
-		if ( $new_price_type ) {
+		if ($new_price_type) {
 			// run the insert
-			if ( $PRT_ID = $PRT->insert( $set_column_values )) {
+			if ($PRT_ID = $PRT->insert($set_column_values)) {
 				$success = 1;
 			}
 			$action_desc = 'created';
 		} else {
 			$PRT_ID = absint($this->_req_data['PRT_ID']);
 			// run the update
-			$where_cols_n_values = array('PRT_ID' => $PRT_ID );
-			if ( $PRT->update( $set_column_values, array( $where_cols_n_values ))) {
+			$where_cols_n_values = array('PRT_ID' => $PRT_ID);
+			if ($PRT->update($set_column_values, array($where_cols_n_values))) {
 				$success = 1;
 			}
 			$action_desc = 'updated';
 		}
 
-		$query_args = array( 'action'=> 'edit_price_type', 'id' => $PRT_ID );
-		$this->_redirect_after_action( $success, 'Price Type', $action_desc, $query_args );
+		$query_args = array('action'=> 'edit_price_type', 'id' => $PRT_ID);
+		$this->_redirect_after_action($success, 'Price Type', $action_desc, $query_args);
 
 	}
 
@@ -1138,49 +1138,49 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_price_type( $trash = TRUE ) {
+	protected function _trash_or_restore_price_type($trash = TRUE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
 
 		$success = 1;
 		$PRT_deleted = $trash ? TRUE : FALSE;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
-			$what = count( $this->_req_data['checkbox'] ) > 1 ? 'Price Types' : 'Price Type';
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			$what = count($this->_req_data['checkbox']) > 1 ? 'Price Types' : 'Price Type';
 			// cycle thru checkboxes
-			while (list( $PRT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID ) ) {
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
 					$success = 0;
 				}
 			}
 
 		} else {
 			// grab single id and delete
-			$PRT_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-			if ( empty( $PRT_ID ) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID )) {
+			$PRT_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRT_ID) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
 				$success = 0;
 			}
 			$what = 'Price Type';
 
 		}
 
-		$query_args = array( 'action' => 'price_types' );
-		if ( $success ) {
-			if ( $trash ) {
+		$query_args = array('action' => 'price_types');
+		if ($success) {
+			if ($trash) {
 				$msg = $success > 1 ? __('The Price Types have been trashed.', 'event_espresso') : __('The Price Type has been trashed.', 'event_espresso');
 			} else {
 				$msg = $success > 1 ? __('The Price Types have been restored.', 'event_espresso') : __('The Price Type has been restored.', 'event_espresso');
 			}
-			EE_Error::add_success( $msg );
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -1197,19 +1197,19 @@ 
 	protected function _delete_price_type() {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$PRT = EEM_Price_Type::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			$what = $PRT->item_name($success);
 			// cycle thru bulk action checkboxes
-			while (list( $PRT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if (!$PRT->delete_permanently_by_ID($PRT_ID) ) {
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRT->delete_permanently_by_ID($PRT_ID)) {
 					$success = 0;
 				}
 			}
@@ -1217,8 +1217,8 @@ 
 		}
 
 
-		$query_args = array( 'action'=> 'price_types' );
-		$this->_redirect_after_action( $success, $what, 'deleted', $query_args );
+		$query_args = array('action'=> 'price_types');
+		$this->_redirect_after_action($success, $what, 'deleted', $query_args);
 
 	}
 
@@ -1234,7 +1234,7 @@ 
 	*		@return string
 	*/
 	protected function _learn_more_about_pricing_link() {
-		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __('learn more about how pricing works', 'event_espresso') . '</a>';
+		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >'.__('learn more about how pricing works', 'event_espresso').'</a>';
 	}
 
 

caffeinated/admin/extend/registration_form/Extend_Registration_Form_Admin_Page.core.php

Spacing +163 added lines, -163 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,13 +30,13 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		define( 'REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND . 'registration_form' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN . 'assets' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/assets/' );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN . 'templates' . DS );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/templates/' );
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND.'registration_form'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN.'assets'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/assets/');
+		define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN.'templates'.DS);
+		define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/templates/');
+		parent::__construct($routing);
 	}
 
 
@@ -46,8 +46,8 @@ 
 
 	protected function _extend_page_config() {
 		$this->_admin_base_path = REGISTRATION_FORM_CAF_ADMIN;
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) && ! is_array( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
-		$qsg_id = ! empty( $this->_req_data['QSG_ID'] ) && ! is_array( $this->_req_data['QSG_ID'] ) ? $this->_req_data['QSG_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) && ! is_array($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
+		$qsg_id = ! empty($this->_req_data['QSG_ID']) && ! is_array($this->_req_data['QSG_ID']) ? $this->_req_data['QSG_ID'] : 0;
 
 		$new_page_routes = array(
 			'question_groups' => array(
@@ -80,7 +80,7 @@ 
 				'func' => '_trash_or_restore_questions',
 				'capability' => 'ee_delete_question',
 				'obj_id' => $qst_id,
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'noheader' => TRUE
 				),
 
@@ -139,7 +139,7 @@ 
 
 			'trash_question_group' => array(
 				'func' => '_trash_or_restore_question_groups',
-				'args' => array( 'trash' => TRUE ),
+				'args' => array('trash' => TRUE),
 				'capability' => 'ee_delete_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE
@@ -147,7 +147,7 @@ 
 
 			'restore_question_group' => array(
 				'func' => '_trash_or_restore_question_groups',
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'capability' => 'ee_delete_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE
@@ -162,7 +162,7 @@ 
 
 			'update_question_group' => array(
 				'func' => '_insert_or_update_question_group',
-				'args' => array('new_question_group' => FALSE ),
+				'args' => array('new_question_group' => FALSE),
 				'capability' => 'ee_edit_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE,
@@ -200,7 +200,7 @@ 
 					'noheader' => TRUE
 				),
 			);
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 
@@ -224,7 +224,7 @@ 
 						'filename' => 'registration_form_question_groups_views_bulk_actions_search'
 						),
 					),
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
 				'metaboxes' => $this->_default_espresso_metaboxes,
 				'require_nonce' => FALSE,
 				'qtips' => array(
@@ -238,14 +238,14 @@ 
 					'order' => 5,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
                 'help_tabs' => array(
 					'registration_form_add_question_help_tab' => array(
 						'title' => __('Add Question', 'event_espresso'),
 						'filename' => 'registration_form_add_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Help_Tour'),
+                'help_tour' => array('Registration_Form_Add_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -255,14 +255,14 @@ 
 					'order' => 5,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_add_question_group_help_tab' => array(
 						'title' => __('Add Question Group', 'event_espresso'),
 						'filename' => 'registration_form_add_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Group_Help_Tour'),
+                'help_tour' => array('Registration_Form_Add_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -271,16 +271,16 @@ 
 					'label' => __('Edit Question Group', 'event_espresso'),
 					'order' => 5,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_edit_question_group_help_tab' => array(
 						'title' => __('Edit Question Group', 'event_espresso'),
 						'filename' => 'registration_form_edit_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Group_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -292,19 +292,19 @@ 
 				'labels' => array(
 					'publishbox' => __('Update Settings', 'event_espresso')
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_reg_form_settings_help_tab' => array(
 						'title' => __('Registration Form Settings', 'event_espresso'),
 						'filename' => 'registration_form_reg_form_settings'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Settings_Help_Tour'),
+                'help_tour' => array('Registration_Form_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 
 			);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		//change the list table we're going to use so it's the NEW list table!
 		$this->_page_config['default']['list_table'] = 'Extend_Registration_Form_Questions_Admin_List_Table';
@@ -318,7 +318,7 @@ 
 			'edit_question_group' => __('Edit Question Group', 'event_espresso'),
 			'delete_question_group' => __('Delete Question Group', 'event_espresso'),
 			);
-		$this->_labels['buttons'] = array_merge( $this->_labels['buttons'], $new_labels );
+		$this->_labels['buttons'] = array_merge($this->_labels['buttons'], $new_labels);
 
 	}
 
@@ -327,14 +327,14 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_update_question_group_order', array( $this, 'update_question_group_order' ));
+		add_action('wp_ajax_espresso_update_question_group_order', array($this, 'update_question_group_order'));
 	}
 
 
 
 
 	public function load_scripts_styles_question_groups() {
-		wp_enqueue_script( 'espresso_ajax_table_sorting' );
+		wp_enqueue_script('espresso_ajax_table_sorting');
 	}
 
 
@@ -355,7 +355,7 @@ 
 	 * @return void
 	 */
 	public function load_sortable_question_script() {
-		wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL . 'ee_question_order.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
+		wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL.'ee_question_order.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
 		wp_enqueue_script('ee-question-sortable');
 	}
 
@@ -374,7 +374,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -404,7 +404,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_groups' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_groups')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -440,24 +440,24 @@ 
 
 
 
-	protected function _delete_question(){
-		$success = $this->_delete_items( $this->_question_model );
+	protected function _delete_question() {
+		$success = $this->_delete_items($this->_question_model);
 		$this->_redirect_after_action(
 			$success,
-			$this->_question_model->item_name( $success ),
+			$this->_question_model->item_name($success),
 			'deleted',
-			array( 'action' => 'default', 'status' => 'all' )
+			array('action' => 'default', 'status' => 'all')
 		);
 	}
 
 
 	protected function _delete_questions() {
-		$success = $this->_delete_items( $this->_question_model );
+		$success = $this->_delete_items($this->_question_model);
 		$this->_redirect_after_action(
 			$success,
-			$this->_question_model->item_name( $success ),
+			$this->_question_model->item_name($success),
 			'deleted permanently',
-			array( 'action' => 'default', 'status' => 'trash' )
+			array('action' => 'default', 'status' => 'trash')
 		);
 	}
 
@@ -468,26 +468,26 @@ 
  * @param EEM_Soft_Delete_Base $model
  * @return int number of items deleted permanently
  */
-	private function _delete_items(EEM_Soft_Delete_Base $model){
+	private function _delete_items(EEM_Soft_Delete_Base $model) {
 		$success = 0;
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru bulk action checkboxes
-			while (list( $ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $this->_delete_item( $ID, $model ) ) {
+			while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $this->_delete_item($ID, $model)) {
 					$success = 0;
 				}
 			}
 
-		}elseif( !empty($this->_req_data['QSG_ID'])){
-			$success = $this->_delete_item( $this->_req_data['QSG_ID'], $model );
+		}elseif ( ! empty($this->_req_data['QSG_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QSG_ID'], $model);
 
-		}elseif( !empty($this->_req_data['QST_ID'])){
-			$success = $this->_delete_item( $this->_req_data['QST_ID'], $model );
-		}else{
-			EE_Error::add_error( sprintf(__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__ );
+		}elseif ( ! empty($this->_req_data['QST_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QST_ID'], $model);
+		} else {
+			EE_Error::add_error(sprintf(__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $success;
 	}
@@ -498,11 +498,11 @@ 
 	 * @param EEM_Soft_Delete_Base $model
 	 * @return boolean
 	 */
-	protected function _delete_item( $id, $model ) {
-		if( $model instanceof EEM_Question ) {
-			EEM_Question_Option::instance()->delete_permanently( array( array( 'QST_ID' => absint( $id ) ) ) );
+	protected function _delete_item($id, $model) {
+		if ($model instanceof EEM_Question) {
+			EEM_Question_Option::instance()->delete_permanently(array(array('QST_ID' => absint($id))));
 		}
-		return $model->delete_permanently_by_ID( absint( $id ) );
+		return $model->delete_permanently_by_ID(absint($id));
 	}
 
 
@@ -514,29 +514,29 @@ 
 
 
 
-	protected function _edit_question_group( $type = 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QSG_ID'] ) && ! empty( $this->_req_data['QSG_ID'] ) ? absint( $this->_req_data['QSG_ID'] ) : FALSE;
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+	protected function _edit_question_group($type = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QSG_ID']) && ! empty($this->_req_data['QSG_ID']) ? absint($this->_req_data['QSG_ID']) : FALSE;
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
-			$questionGroup=$this->_question_group_model->get_one_by_ID($ID);
-			$additional_hidden_fields=array('QSG_ID'=>array('type'=>'hidden','value'=>$ID));
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
+			$questionGroup = $this->_question_group_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QSG_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question_group', $additional_hidden_fields);
-		}else{
+		} else {
 			$questionGroup = EEM_Question_Group::instance()->create_default_object();
 			$questionGroup->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question_group');
 		}
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['all_questions']=$questionGroup->questions_in_and_not_in_group();
-		$this->_template_args['QSG_ID']=$ID ? $ID : TRUE;
-		$this->_template_args['question_group']=$questionGroup;
+		$this->_template_args['all_questions'] = $questionGroup->questions_in_and_not_in_group();
+		$this->_template_args['QSG_ID'] = $ID ? $ID : TRUE;
+		$this->_template_args['question_group'] = $questionGroup;
 
-		$redirect_URL = add_query_arg( array( 'action' => 'question_groups'), $this->_admin_base_url );
-		$this->_set_publish_post_box_vars( 'id', $ID, FALSE, $redirect_URL  );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'question_groups_main_meta_box.template.php', $this->_template_args, TRUE );
+		$redirect_URL = add_query_arg(array('action' => 'question_groups'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $ID, FALSE, $redirect_URL);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH.'question_groups_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -547,76 +547,76 @@ 
 
 	protected function _delete_question_groups() {
 		$success = $this->_delete_items($this->_question_group_model);
-		$this->_redirect_after_action( $success, $this->_question_group_model->item_name($success), 'deleted permanently', array( 'action'=>'question_groups', 'status'=>'trash' ));
+		$this->_redirect_after_action($success, $this->_question_group_model->item_name($success), 'deleted permanently', array('action'=>'question_groups', 'status'=>'trash'));
 	}
 
 
 
-	protected function _insert_or_update_question_group( $new_question_group = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_group_model);
-		if ( $new_question_group ){
+	protected function _insert_or_update_question_group($new_question_group = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_group_model);
+		if ($new_question_group) {
 			$QSG_ID = $this->_question_group_model->insert($set_column_values);
 			$success = $QSG_ID ? 1 : 0;
 		} else {
 			$QSG_ID = absint($this->_req_data['QSG_ID']);
-			unset( $set_column_values[ 'QSG_ID' ] );
-			$success= $this->_question_group_model->update( $set_column_values, array( array( 'QSG_ID' => $QSG_ID )));
+			unset($set_column_values['QSG_ID']);
+			$success = $this->_question_group_model->update($set_column_values, array(array('QSG_ID' => $QSG_ID)));
 		}
-		$phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string( EEM_Attendee::system_question_phone );
+		$phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string(EEM_Attendee::system_question_phone);
 		// update the existing related questions
 		// BUT FIRST...  delete the phone question from the Question_Group_Question if it is being added to this question group (therefore removed from the existing group)
-		if ( isset( $this->_req_data['questions'], $this->_req_data['questions'][ $phone_question_id ] )) {
+		if (isset($this->_req_data['questions'], $this->_req_data['questions'][$phone_question_id])) {
 			// delete where QST ID = system phone question ID and Question Group ID is NOT this group
-			EEM_Question_Group_Question::instance()->delete( array( array( 'QST_ID' => $phone_question_id, 'QSG_ID' => array( '!=', $QSG_ID ))));
+			EEM_Question_Group_Question::instance()->delete(array(array('QST_ID' => $phone_question_id, 'QSG_ID' => array('!=', $QSG_ID))));
 		}
 		/** @type EE_Question_Group $question_group */
-		$question_group=$this->_question_group_model->get_one_by_ID( $QSG_ID );
+		$question_group = $this->_question_group_model->get_one_by_ID($QSG_ID);
 		$questions = $question_group->questions();
 		// make sure system phone question is added to list of questions for this group
-		if ( ! isset( $questions[$phone_question_id ] )) {
-			$questions[ $phone_question_id ] = EEM_Question::instance()->get_one_by_ID( $phone_question_id );
+		if ( ! isset($questions[$phone_question_id])) {
+			$questions[$phone_question_id] = EEM_Question::instance()->get_one_by_ID($phone_question_id);
 		}
 
-		foreach( $questions as $question_ID => $question ){
+		foreach ($questions as $question_ID => $question) {
 			// first we always check for order.
-			if ( ! empty( $this->_req_data['question_orders'][ $question_ID ] ) ){
+			if ( ! empty($this->_req_data['question_orders'][$question_ID])) {
 				//update question order
-				$question_group->update_question_order( $question_ID, $this->_req_data['question_orders'][ $question_ID ] );
+				$question_group->update_question_order($question_ID, $this->_req_data['question_orders'][$question_ID]);
 			}
 
 			// then we always check if adding or removing.
-			if ( isset( $this->_req_data['questions'], $this->_req_data['questions'][ $question_ID ] )) {
-				$question_group->add_question( $question_ID );
+			if (isset($this->_req_data['questions'], $this->_req_data['questions'][$question_ID])) {
+				$question_group->add_question($question_ID);
 			} else {
 				// not found, remove it (but only if not a system question for the personal group with the exception of lname system question - we allow removal of it)
 				if (
 					in_array(
 						$question->system_ID(),
-						EEM_Question::instance()->required_system_questions_in_system_question_group( $question_group->system_group() )
+						EEM_Question::instance()->required_system_questions_in_system_question_group($question_group->system_group())
 					)
 				) {
 					continue;
 				} else {
-					$question_group->remove_question( $question_ID );
+					$question_group->remove_question($question_ID);
 				}
 			}
 		}
 		// save new related questions
-		if ( isset( $this->_req_data['questions'] )) {
-			foreach( $this->_req_data['questions'] as $QST_ID ){
-				$question_group->add_question( $QST_ID );
-				if ( isset( $this->_req_data['question_orders'][ $QST_ID ] )) {
-					$question_group->update_question_order( $QST_ID, $this->_req_data['question_orders'][ $QST_ID ] );
+		if (isset($this->_req_data['questions'])) {
+			foreach ($this->_req_data['questions'] as $QST_ID) {
+				$question_group->add_question($QST_ID);
+				if (isset($this->_req_data['question_orders'][$QST_ID])) {
+					$question_group->update_question_order($QST_ID, $this->_req_data['question_orders'][$QST_ID]);
 				}
 			}
 		}
 
-		if ( $success !== FALSE ) {
-			$msg = $new_question_group ? sprintf( __('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name() ) : sprintf( __('The %s has been updated', 'event_espresso' ), $this->_question_group_model->item_name() );
-			EE_Error::add_success( $msg );
+		if ($success !== FALSE) {
+			$msg = $new_question_group ? sprintf(__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name()) : sprintf(__('The %s has been updated', 'event_espresso'), $this->_question_group_model->item_name());
+			EE_Error::add_success($msg);
 		}
-		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group','QSG_ID'=>$QSG_ID), TRUE);
+		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group', 'QSG_ID'=>$QSG_ID), TRUE);
 
 	}
 
@@ -624,39 +624,39 @@ 
 	 * duplicates a question and all its question options and redirects to the new question.
 	 */
 	public function _duplicate_question() {
-		$question_ID = intval( $this->_req_data[ 'QST_ID' ] );
-		$question = EEM_Question::instance()->get_one_by_ID( $question_ID );
-		if( $question instanceof EE_Question ) {
+		$question_ID = intval($this->_req_data['QST_ID']);
+		$question = EEM_Question::instance()->get_one_by_ID($question_ID);
+		if ($question instanceof EE_Question) {
 			$new_question = $question->duplicate();
-			if( $new_question instanceof EE_Question ) {
-				$this->_redirect_after_action( true, __( 'Question', 'event_espresso' ), __( 'Duplicated', 'event_espresso' ), array('action'=>'edit_question', 'QST_ID' => $new_question->ID() ), TRUE);
+			if ($new_question instanceof EE_Question) {
+				$this->_redirect_after_action(true, __('Question', 'event_espresso'), __('Duplicated', 'event_espresso'), array('action'=>'edit_question', 'QST_ID' => $new_question->ID()), TRUE);
 			} else {
 				global $wpdb;
-				EE_Error::add_error( sprintf( __( 'Could not duplicate question with ID %1$d because: %2$s', 'event_espresso' ), $question_ID, $wpdb->last_error ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false );
+				EE_Error::add_error(sprintf(__('Could not duplicate question with ID %1$d because: %2$s', 'event_espresso'), $question_ID, $wpdb->last_error), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false);
 			}
 		} else {
-			EE_Error::add_error( sprintf( __( 'Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso' ), $question_ID ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( false, '', '', array( 'action' => 'default' ), false );
+			EE_Error::add_error(sprintf(__('Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso'), $question_ID), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
 		}
 	}
 
 
 
 	protected function _trash_or_restore_question_groups($trash = TRUE) {
-		return $this->_trash_or_restore_items( $this->_question_group_model, $trash );
+		return $this->_trash_or_restore_items($this->_question_group_model, $trash);
 	}
 
-	protected function _trash_question(){
-		$success=$this->_question_model->delete_by_ID(intval($this->_req_data['QST_ID']));
-		$query_args=array('action'=>'default','status'=>'all');
+	protected function _trash_question() {
+		$success = $this->_question_model->delete_by_ID(intval($this->_req_data['QST_ID']));
+		$query_args = array('action'=>'default', 'status'=>'all');
 		$this->_redirect_after_action($success, $this->_question_model->item_name($success), 'trashed', $query_args);
 	}
 
 
 
-	protected function _trash_or_restore_questions($trash=TRUE){
-		$this->_trash_or_restore_items( $this->_question_model, $trash );
+	protected function _trash_or_restore_questions($trash = TRUE) {
+		$this->_trash_or_restore_items($this->_question_model, $trash);
 	}
 
 
@@ -667,21 +667,21 @@ 
 	 * @param EEM_Base $model
 	 * @param boolean $trash wehter to trash or restore
 	 */
-	private function _trash_or_restore_items( EEM_Base $model, $trash = TRUE ) {
+	private function _trash_or_restore_items(EEM_Base $model, $trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success = 1;
 		//Checkboxes
 		//echo "trash $trash";
 		//var_dump($this->_req_data['checkbox']);die;
-		if ( isset( $this->_req_data['checkbox'] )) {
-			if ( isset( $this->_req_data['checkbox'] ) && ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if (isset($this->_req_data['checkbox'])) {
+			if (isset($this->_req_data['checkbox']) && ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 				// if array has more than one element than success message should be plural
-				$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+				$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 				// cycle thru bulk action checkboxes
-				while (list( $ID, $value ) = each($this->_req_data['checkbox'])) {
-					if ( ! $model->delete_or_restore_by_ID($trash,absint($ID))) {
+				while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+					if ( ! $model->delete_or_restore_by_ID($trash, absint($ID))) {
 						$success = 0;
 					}
 				}
@@ -689,7 +689,7 @@ 
 			} else {
 				// grab single id and delete
 				$ID = absint($this->_req_data['checkbox']);
-				if ( ! $model->delete_or_restore_by_ID($trash,$ID)) {
+				if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
 					$success = 0;
 				}
 			}
@@ -697,53 +697,53 @@ 
 		} else {
 			// delete via trash link
 			// grab single id and delete
-			$ID = absint($this->_req_data[ $model->primary_key_name() ]);
-			if ( ! $model->delete_or_restore_by_ID($trash,$ID)) {
+			$ID = absint($this->_req_data[$model->primary_key_name()]);
+			if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
 				$success = 0;
 			}
 
 		}
 
 
-		$action = $model instanceof EEM_Question ? 'default' : 'question_groups';//strtolower( $model->item_name(2) );
+		$action = $model instanceof EEM_Question ? 'default' : 'question_groups'; //strtolower( $model->item_name(2) );
 		//echo "action :$action";
 		//$action = 'questions' ? 'default' : $action;
-		if($trash){
+		if ($trash) {
 			$action_desc = 'trashed';
 			$status = 'trash';
-		}else{
+		} else {
 			$action_desc = 'restored';
 			$status = 'all';
 		}
-		$this->_redirect_after_action( $success, $model->item_name($success), $action_desc, array( 'action' => $action, 'status'=>$status ) );
+		$this->_redirect_after_action($success, $model->item_name($success), $action_desc, array('action' => $action, 'status'=>$status));
 	}
 
 
 
 
-	public function get_trashed_questions( $per_page,$current_page = 1, $count = FALSE ) {
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
 		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
 
-		if( $count ){
+		if ($count) {
 			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
-			$results=$this->_question_model->count_deleted($where);
-		}else{
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
+			$results = $this->_question_model->count_deleted($where);
+		} else {
 			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-			$results=$this->_question_model->get_all_deleted($query_params);
+			$results = $this->_question_model->get_all_deleted($query_params);
 		}
 		return $results;
 	}
 
 
 
-	public function get_question_groups( $per_page, $current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $questionGroupModel->count($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all($query_params);
 		}
 		return $results;
@@ -751,14 +751,14 @@ 
 
 
 
-	public function get_trashed_question_groups( $per_page,$current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if($count){
-			$where = isset( $query_params[0] ) ? array($query_params[0]) : array();
+	public function get_trashed_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$query_params['limit'] = NULL;
 			$results = $questionGroupModel->count_deleted($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all_deleted($query_params);
 		}
 		return $results;
@@ -771,22 +771,22 @@ 
 	 */
 	public function update_question_group_order() {
 
-		$success = __( 'Question group order was updated successfully.', 'event_espresso' );
+		$success = __('Question group order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] ) ? explode( ',', rtrim( $this->_req_data['row_ids'], ',' )) : FALSE;
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids']) ? explode(',', rtrim($this->_req_data['row_ids'], ',')) : FALSE;
 
-		$perpage = !empty( $this->_req_data['perpage'] ) ? (int) $this->_req_data['perpage'] : NULL;
-		$curpage = !empty( $this->_req_data['curpage'] ) ? (int) $this->_req_data['curpage'] : NULL;
+		$perpage = ! empty($this->_req_data['perpage']) ? (int) $this->_req_data['perpage'] : NULL;
+		$curpage = ! empty($this->_req_data['curpage']) ? (int) $this->_req_data['curpage'] : NULL;
 
-		if ( is_array( $row_ids )) {
+		if (is_array($row_ids)) {
 			//figure out where we start the row_id count at for the current page.
-			$qsgcount = empty( $curpage ) ? 0 : ($curpage - 1 ) * $perpage;
+			$qsgcount = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
 
 			global $wpdb;
-			for ( $i = 0; $i < count($row_ids); $i++ ) {
+			for ($i = 0; $i < count($row_ids); $i++) {
 				//Update the questions when re-ordering
-				if ( EEM_Question_Group::instance()->update ( array( 'QSG_order' => $qsgcount ), array(array( 'QSG_ID' => $row_ids[$i] ))) === FALSE ) {
+				if (EEM_Question_Group::instance()->update(array('QSG_order' => $qsgcount), array(array('QSG_ID' => $row_ids[$i]))) === FALSE) {
 					$success = FALSE;
 				}
 				$qsgcount++;
@@ -795,9 +795,9 @@ 
 			$success = FALSE;
 		}
 
-		$errors = ! $success ? __( 'An error occurred. The question group order was not updated.', 'event_espresso' ) : FALSE;
+		$errors = ! $success ? __('An error occurred. The question group order was not updated.', 'event_espresso') : FALSE;
 
-		echo json_encode( array( 'return_data' => FALSE, 'success' => $success, 'errors' => $errors ));
+		echo json_encode(array('return_data' => FALSE, 'success' => $success, 'errors' => $errors));
 		die();
 
 	}
@@ -814,10 +814,10 @@ 
 
 	protected function _reg_form_settings() {
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args = apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args', $this->_template_args );
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'reg_form_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args = apply_filters('FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args', $this->_template_args);
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH.'reg_form_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -825,9 +825,9 @@ 
 
 
 	protected function _update_reg_form_settings() {
-		EE_Registry::instance()->CFG->registration = apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', EE_Registry::instance()->CFG->registration );
-		$success = $this->_update_espresso_configuration( __('Registration Form Options', 'event_espresso'), EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, __('Registration Form Options', 'event_espresso'), 'updated', array( 'action' => 'view_reg_form_settings' ) );
+		EE_Registry::instance()->CFG->registration = apply_filters('FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', EE_Registry::instance()->CFG->registration);
+		$success = $this->_update_espresso_configuration(__('Registration Form Options', 'event_espresso'), EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, __('Registration Form Options', 'event_espresso'), 'updated', array('action' => 'view_reg_form_settings'));
 	}
 
 }

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Spacing +51 added lines, -51 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Paypal_Pro extends EE_Onsite_Gateway{
+class EEG_Paypal_Pro extends EE_Onsite_Gateway {
 	/**
 	 *
 	 * @var $_paypal_api_username string
@@ -88,21 +88,21 @@ 
 	 * } @see parent::do_direct_payment for more info
 	 * @return \EE_Payment|\EEI_Payment
 	 */
-	public function do_direct_payment($payment,$billing_info = null){
+	public function do_direct_payment($payment, $billing_info = null) {
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
-		$order_description  = sprintf(__("Event Registrations from %s", "event_espresso"),get_bloginfo('name'));
+		$order_description  = sprintf(__("Event Registrations from %s", "event_espresso"), get_bloginfo('name'));
 		//charge for the full amount. Show itemized list
-		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$item_num = 1;
 			$total_line_item = $transaction->total_line_item();
 			$order_items = array();
 			foreach ($total_line_item->get_items() as $line_item) {
 				$item = array(
 						// Item Name.  127 char max.
-						'l_name' => substr($line_item->name(),0,127),
+						'l_name' => substr($line_item->name(), 0, 127),
 						// Item description.  127 char max.
-						'l_desc' => substr($line_item->desc(),0,127),
+						'l_desc' => substr($line_item->desc(), 0, 127),
 						// Cost of individual item.
 						'l_amt' => $line_item->unit_price(),
 						// Item Number.  127 char max.
@@ -123,14 +123,14 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else {
 			$order_items = array();
 			$item_amount = $payment->amount();
-			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			$tax_amount = 0;
-			array_push($order_items,array(
+			array_push($order_items, array(
 				// Item Name.  127 char max.
-				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'),$primary_registrant->reg_code()),
+				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'), $primary_registrant->reg_code()),
 				// Item description.  127 char max.
 				'l_desc' => $single_item_desc,
 				// Cost of individual item.
@@ -177,11 +177,11 @@ 
 			// Payer's salutation.  20 char max.
 			'salutation' => '',
 			// Payer's first name.  25 char max.
-			'firstname' => substr($billing_info['first_name'],0,25),
+			'firstname' => substr($billing_info['first_name'], 0, 25),
 			// Payer's middle name.  25 char max.
 			'middlename' => '',
 			// Payer's last name.  25 char max.
-			'lastname' => substr($billing_info['last_name'],0,25),
+			'lastname' => substr($billing_info['last_name'], 0, 25),
 			// Payer's suffix.  12 char max.
 			'suffix' => ''
 		);
@@ -194,13 +194,13 @@ 
 			// Required.  Name of City.
 			'city' => $billing_info['city'],
 			// Required. Name of State or Province.
-			'state' => substr( $billing_info['state'], 0, 40 ),
+			'state' => substr($billing_info['state'], 0, 40),
 			// Required.  Country code.
 			'countrycode' => $billing_info['country'],
 			// Required.  Postal code of payer.
 			'zip' => $billing_info['zip'],
 			// Phone Number of payer.  20 char max.
-			'shiptophonenum' => substr($billing_info['phone'],0,20)
+			'shiptophonenum' => substr($billing_info['phone'], 0, 20)
 		);
 
 
@@ -210,7 +210,7 @@ 
 			// Required.  Three-letter currency code.  Default is USD.
 			'currencycode' => $payment->currency_code(),
 			// Required if you include itemized cart details. (L_AMTn, etc.)  Subtotal of items not including S&H, or tax.
-			'itemamt' => $this->format_currency($item_amount),//
+			'itemamt' => $this->format_currency($item_amount), //
 			// Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
 			'shippingamt' => '',
 			// Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
@@ -222,10 +222,10 @@ 
 			// Free-form field for your own use.  256 char max.
 			'custom' => $primary_registrant ? $primary_registrant->ID() : '',
 			// Your own invoice or tracking number
-			'invnum' => wp_generate_password(12,false),//$transaction->ID(),
+			'invnum' => wp_generate_password(12, false), //$transaction->ID(),
 			// URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
 			'notifyurl' => '',
-			'buttonsource' => 'EventEspresso_SP',//EE will blow up if you change this
+			'buttonsource' => 'EventEspresso_SP', //EE will blow up if you change this
 		);
 		// Wrap all data arrays into a single, "master" array which will be passed into the class function.
 		$PayPalRequestData = array(
@@ -238,32 +238,32 @@ 
 				'OrderItems' => $order_items,
 		);
 		$this->_log_clean_request($PayPalRequestData, $payment);
-		try{
+		try {
 			$PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
 			//remove PCI-sensitive data so it doesn't get stored
-			$PayPalResult = $this->_log_clean_response($PayPalResult,$payment);
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
 
 			$message = isset($PayPalResult['L_LONGMESSAGE0']) ? $PayPalResult['L_LONGMESSAGE0'] : $PayPalResult['ACK'];
-			if( empty($PayPalResult[ 'RAWRESPONSE' ] ) ) {
-				$payment->set_status( $this->_pay_model->failed_status() ) ;
-				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
+			if (empty($PayPalResult['RAWRESPONSE'])) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response(__('No response received from Paypal Pro', 'event_espresso'));
 				$payment->set_details($PayPalResult);
-			}else{
-				if($this->_APICallSuccessful($PayPalResult)){
+			} else {
+				if ($this->_APICallSuccessful($PayPalResult)) {
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} else {
 					$payment->set_status($this->_pay_model->declined_status());
 				}
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval( $PayPalResult['AMT'] ) : 0);
+				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
 				$payment->set_gateway_response($message);
-				$payment->set_txn_id_chq_nmbr(isset( $PayPalResult['TRANSACTIONID'] )? $PayPalResult['TRANSACTIONID'] : null);
+				$payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID']) ? $PayPalResult['TRANSACTIONID'] : null);
 
 				$primary_registration_code = $primary_registrant instanceof EE_Registration ? $primary_registrant->reg_code() : '';
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -280,7 +280,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array
 	 */
-	private function _log_clean_request($request,$payment){
+	private function _log_clean_request($request, $payment) {
 		$cleaned_request_data = $request;
 		unset($cleaned_request_data['CCDetails']['acct']);
 		unset($cleaned_request_data['CCDetails']['cvv2']);
@@ -296,13 +296,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array cleaned
 	 */
-	private function _log_clean_response($response,$payment){
+	private function _log_clean_response($response, $payment) {
 		unset($response['REQUESTDATA']['CREDITCARDTYPE']);
 		unset($response['REQUESTDATA']['ACCT']);
 		unset($response['REQUESTDATA']['EXPDATE']);
 		unset($response['REQUESTDATA']['CVV2']);
 		unset($response['RAWREQUEST']);
-		$this->log(array('Paypal Response'=>$response),$payment);
+		$this->log(array('Paypal Response'=>$response), $payment);
 		return $response;
 	}
 
@@ -327,32 +327,32 @@ 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
 		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+			$DPFieldsNVP .= '&'.strtoupper($DPFieldsVar).'='.urlencode($DPFieldsVal);
 
 		// CC Details Fields
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
 		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+			$CCDetailsNVP .= '&'.strtoupper($CCDetailsVar).'='.urlencode($CCDetailsVal);
 
 		// PayerInfo Type Fields
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
 		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+			$PayerInfoNVP .= '&'.strtoupper($PayerInfoVar).'='.urlencode($PayerInfoVal);
 
 		// Payer Name Fields
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
 		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+			$PayerNameNVP .= '&'.strtoupper($PayerNameVar).'='.urlencode($PayerNameVal);
 
 		// Address Fields (Billing)
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
 		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+			$BillingAddressNVP .= '&'.strtoupper($BillingAddressVar).'='.urlencode($BillingAddressVal);
 
 		// Payment Details Type Fields
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
 		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+			$PaymentDetailsNVP .= '&'.strtoupper($PaymentDetailsVar).'='.urlencode($PaymentDetailsVal);
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
@@ -360,22 +360,22 @@ 
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
 			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+				$OrderItemsNVP .= '&'.strtoupper($CurrentItemVar).$n.'='.urlencode($CurrentItemVal);
 			$n++;
 		}
 
 		// Ship To Address Fields
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
 		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+			$ShippingAddressNVP .= '&'.strtoupper($ShippingAddressVar).'='.urlencode($ShippingAddressVal);
 
 		// 3D Secure Fields
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
 		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+			$Secure3DNVP .= '&'.strtoupper($Secure3DVar).'='.urlencode($Secure3DVal);
 
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
-		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
+		$NVPRequest = 'USER='.$this->_username.'&PWD='.$this->_password.'&VERSION=64.0'.'&SIGNATURE='.$this->_signature.$DPFieldsNVP.$CCDetailsNVP.$PayerInfoNVP.$PayerNameNVP.$BillingAddressNVP.$PaymentDetailsNVP.$OrderItemsNVP.$ShippingAddressNVP.$Secure3DNVP;
 		$NVPResponse = $this->_CURLRequest($NVPRequest);
 		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
 		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
@@ -399,7 +399,7 @@ 
 	private function _CURLRequest($Request) {
 		$EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
 		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE ) );
+		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE));
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
 		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
 		curl_setopt($curl, CURLOPT_URL, $EndPointURL);
@@ -449,9 +449,9 @@ 
 	private function _APICallSuccessful($PayPalResult) {
 		$approved = false;
 		// check main response message from PayPal
-		if (isset($PayPalResult['ACK']) && !empty($PayPalResult['ACK'])) {
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
 			$ack = strtoupper($PayPalResult['ACK']);
-			$approved = ( $ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS' ) ? true : false;
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
 		}
 
 		return $approved;
@@ -467,11 +467,11 @@ 
 
 		$Errors = array();
 		$n = 0;
-		while (isset($DataArray['L_ERRORCODE' . $n . ''])) {
-			$LErrorCode = isset($DataArray['L_ERRORCODE' . $n . '']) ? $DataArray['L_ERRORCODE' . $n . ''] : '';
-			$LShortMessage = isset($DataArray['L_SHORTMESSAGE' . $n . '']) ? $DataArray['L_SHORTMESSAGE' . $n . ''] : '';
-			$LLongMessage = isset($DataArray['L_LONGMESSAGE' . $n . '']) ? $DataArray['L_LONGMESSAGE' . $n . ''] : '';
-			$LSeverityCode = isset($DataArray['L_SEVERITYCODE' . $n . '']) ? $DataArray['L_SEVERITYCODE' . $n . ''] : '';
+		while (isset($DataArray['L_ERRORCODE'.$n.''])) {
+			$LErrorCode = isset($DataArray['L_ERRORCODE'.$n.'']) ? $DataArray['L_ERRORCODE'.$n.''] : '';
+			$LShortMessage = isset($DataArray['L_SHORTMESSAGE'.$n.'']) ? $DataArray['L_SHORTMESSAGE'.$n.''] : '';
+			$LLongMessage = isset($DataArray['L_LONGMESSAGE'.$n.'']) ? $DataArray['L_LONGMESSAGE'.$n.''] : '';
+			$LSeverityCode = isset($DataArray['L_SEVERITYCODE'.$n.'']) ? $DataArray['L_SEVERITYCODE'.$n.''] : '';
 
 			$CurrentItem = array(
 					'L_ERRORCODE' => $LErrorCode,
@@ -511,7 +511,7 @@ 
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
 					$CurrentVarName = 'Severity Code';
 
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
 			}
 		}
 		return $error;