eventespresso / event-espresso-core

core/db_classes/EE_Line_Item.class.php

Indentation +18 added lines, -18 removed lines

@@ -218,24 +218,24 @@
 	 * @return string
 	 */
 	function OBJ_type_i18n() {
-	    $obj_type = $this->OBJ_type();
-        switch ($obj_type) {
-            case 'Event':
-                $obj_type = __('Event', 'event_espresso');
-                break;
-            case 'Price':
-                $obj_type = __('Price', 'event_espresso');
-                break;
-            case 'Promotion':
-                $obj_type = __('Promotion', 'event_espresso');
-                break;
-            case 'Ticket':
-                $obj_type = __('Ticket', 'event_espresso');
-                break;
-            case 'Transaction':
-                $obj_type = __('Transaction', 'event_espresso');
-                break;
-        }
+		$obj_type = $this->OBJ_type();
+		switch ($obj_type) {
+			case 'Event':
+				$obj_type = __('Event', 'event_espresso');
+				break;
+			case 'Price':
+				$obj_type = __('Price', 'event_espresso');
+				break;
+			case 'Promotion':
+				$obj_type = __('Promotion', 'event_espresso');
+				break;
+			case 'Ticket':
+				$obj_type = __('Ticket', 'event_espresso');
+				break;
+			case 'Transaction':
+				$obj_type = __('Transaction', 'event_espresso');
+				break;
+		}
 		return apply_filters('FHEE__EE_Line_Item__OBJ_type_i18n', $obj_type, $this);
 	}
 

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

Spacing +185 added lines, -185 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -36,13 +36,13 @@ 
 	 * 		@param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * 		@access public
 	 */
-	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);
 	}
 
 
@@ -52,8 +52,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(
@@ -86,7 +86,7 @@ 
 				'func' => '_trash_or_restore_questions',
 				'capability' => 'ee_delete_question',
 				'obj_id' => $qst_id,
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'noheader' => TRUE
 				),
 
@@ -145,7 +145,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
@@ -153,7 +153,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
@@ -168,7 +168,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,
@@ -206,7 +206,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(
 
@@ -230,7 +230,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(
@@ -244,14 +244,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' => esc_html__('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
 				),
 
@@ -261,14 +261,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' => esc_html__('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
 				),
 
@@ -277,16 +277,16 @@ 
 					'label' => esc_html__('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' => esc_html__('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
 				),
 
@@ -298,19 +298,19 @@ 
 				'labels' => array(
 					'publishbox' => esc_html__('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' => esc_html__('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';
@@ -324,7 +324,7 @@ 
 			'edit_question_group' => esc_html__('Edit Question Group', 'event_espresso'),
 			'delete_question_group' => esc_html__('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);
 
 	}
 
@@ -333,14 +333,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');
 	}
 
 
@@ -361,7 +361,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');
 	}
 
@@ -380,7 +380,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' => esc_html__('Trash', 'event_espresso'),
@@ -410,7 +410,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' => esc_html__('Trash', 'event_espresso'),
@@ -446,24 +446,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')
 		);
 	}
 
@@ -474,26 +474,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(esc_html__("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(esc_html__("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;
 	}
@@ -504,11 +504,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));
 	}
 
 
@@ -520,41 +520,41 @@ 
 
 
 
-	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;
+	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;
 		
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_question_group' :
-				$this->_admin_page_title = esc_html__( 'Add Question Group', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add Question Group', 'event_espresso');
 				break;
 			case 'edit_question_group' :
-				$this->_admin_page_title = esc_html__( 'Edit Question Group', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Question Group', 'event_espresso');
 				break;
 			default :
-				$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+				$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){
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
 			/** @var EE_Question_Group $questionGroup */
-			$questionGroup=$this->_question_group_model->get_one_by_ID( $ID);
-			$additional_hidden_fields=array('QSG_ID'=>array('type'=>'hidden','value'=>$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 {
 			/** @var EE_Question_Group $questionGroup */
 			$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();
@@ -565,7 +565,7 @@ 
 
 	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'));
 	}
 
 
@@ -573,71 +573,71 @@ 
 	/**
 	 * @param bool $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 ){
+	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( esc_html__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name() ) : sprintf( esc_html__('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(esc_html__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name()) : sprintf(esc_html__('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);
 
 	}
 
@@ -645,20 +645,20 @@ 
 	 * duplicates a question and all its question options and redirects to the new question.
 	 */
 	public function _duplicate_question() {
-		$question_ID = (int)$this->_req_data[ 'QST_ID' ];
-		$question = EEM_Question::instance()->get_one_by_ID( $question_ID );
-		if( $question instanceof EE_Question ) {
+		$question_ID = (int) $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, esc_html__( 'Question', 'event_espresso' ), esc_html__( 'Duplicated', 'event_espresso' ), array('action'=>'edit_question', 'QST_ID' => $new_question->ID() ), TRUE);
+			if ($new_question instanceof EE_Question) {
+				$this->_redirect_after_action(true, esc_html__('Question', 'event_espresso'), esc_html__('Duplicated', 'event_espresso'), array('action'=>'edit_question', 'QST_ID' => $new_question->ID()), TRUE);
 			} else {
 				global $wpdb;
-				EE_Error::add_error( sprintf( esc_html__( '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(esc_html__('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( esc_html__( '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(esc_html__('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);
 		}
 	}
 
@@ -667,8 +667,8 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	protected function _trash_or_restore_question_groups( $trash = TRUE) {
-		$this->_trash_or_restore_items( $this->_question_group_model, $trash );
+	protected function _trash_or_restore_question_groups($trash = TRUE) {
+		$this->_trash_or_restore_items($this->_question_group_model, $trash);
 	}
 
 
@@ -676,9 +676,9 @@ 
 	/**
 	 *_trash_question
 	 */
-	protected function _trash_question(){
-		$success=$this->_question_model->delete_by_ID( (int)$this->_req_data['QST_ID'] );
-		$query_args=array('action'=>'default','status'=>'all');
+	protected function _trash_question() {
+		$success = $this->_question_model->delete_by_ID((int) $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);
 	}
 
@@ -687,8 +687,8 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	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);
 	}
 
 
@@ -700,21 +700,21 @@ 
 *@param EEM_Soft_Delete_Base $model
 	 * @param boolean $trash whether to trash or restore
 	 */
-	private function _trash_or_restore_items( EEM_Soft_Delete_Base $model, $trash = TRUE ) {
+	private function _trash_or_restore_items(EEM_Soft_Delete_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 ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if (isset($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( $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;
 					}
 				}
@@ -722,7 +722,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;
 				}
 			}
@@ -730,25 +730,25 @@ 
 		} 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));
 	}
 
 
@@ -759,16 +759,16 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	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;
 	}
@@ -781,13 +781,13 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]
 	 */
-	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;
@@ -801,14 +801,14 @@ 
 	 * @param bool $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	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;
@@ -821,32 +821,32 @@ 
 	 */
 	public function update_question_group_order() {
 
-		$success = esc_html__( 'Question group order was updated successfully.', 'event_espresso' );
+		$success = esc_html__('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'], ',' ))
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids'])
+			? explode(',', rtrim($this->_req_data['row_ids'], ','))
 			: array();
 
-		$perpage = !empty( $this->_req_data['perpage'] )
+		$perpage = ! empty($this->_req_data['perpage'])
 			? (int) $this->_req_data['perpage']
 			: NULL;
-		$curpage = !empty( $this->_req_data['curpage'] )
+		$curpage = ! empty($this->_req_data['curpage'])
 			? (int) $this->_req_data['curpage']
 			: NULL;
 
-		if ( ! empty( $row_ids ) ) {
+		if ( ! empty($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;
 
-			$row_count = count( $row_ids );
-			for( $i = 0; $i < $row_count; $i++ ) {
+			$row_count = count($row_ids);
+			for ($i = 0; $i < $row_count; $i++) {
 				//Update the questions when re-ordering
 				$updated = EEM_Question_Group::instance()->update(
-					array( 'QSG_order' => $qsgcount ),
-					array( array( 'QSG_ID' => $row_ids[ $i ] ) )
+					array('QSG_order' => $qsgcount),
+					array(array('QSG_ID' => $row_ids[$i]))
 				);
-				if ( $updated === false ) {
+				if ($updated === false) {
 					$success = false;
 				}
 				$qsgcount++;
@@ -856,10 +856,10 @@ 
 		}
 
 		$errors = ! $success
-			? esc_html__( 'An error occurred. The question group order was not updated.', 'event_espresso' )
+			? esc_html__('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();
 
 	}
@@ -878,17 +878,17 @@ 
 		$this->_template_args['values'] = $this->_yes_no_values;
 		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( $this, 'email_validation_settings_form' ),
+			array($this, 'email_validation_settings_form'),
 			2
 		);
-		$this->_template_args = (array)apply_filters(
+		$this->_template_args = (array) 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->_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',
+			REGISTRATION_FORM_CAF_TEMPLATE_PATH.'reg_form_settings.template.php',
 			$this->_template_args,
 			TRUE
 		);
@@ -909,7 +909,7 @@ 
 			EE_Registry::instance()->CFG,
 			__FILE__, __FUNCTION__, __LINE__
 		);
-		$this->_redirect_after_action( $success, esc_html__('Registration Form Options', 'event_espresso'), 'updated', array( 'action' => 'view_reg_form_settings' ) );
+		$this->_redirect_after_action($success, esc_html__('Registration Form Options', 'event_espresso'), 'updated', array('action' => 'view_reg_form_settings'));
 	}
 
 
@@ -940,20 +940,20 @@ 
 				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
 				'subsections'     => array(
 					'email_validation_hdr'           => new EE_Form_Section_HTML(
-						EEH_HTML::h2( esc_html__( 'Email Validation Settings', 'event_espresso' ) )
+						EEH_HTML::h2(esc_html__('Email Validation Settings', 'event_espresso'))
 					),
 					'email_validation_level' => new EE_Select_Input(
 						array(
-							'basic'      => esc_html__( 'Basic', 'event_espresso' ),
-							'wp_default' => esc_html__( 'WordPress Default', 'event_espresso' ),
-							'i18n'       => esc_html__( 'International', 'event_espresso' ),
-							'i18n_dns'   => esc_html__( 'International + DNS Check', 'event_espresso' ),
+							'basic'      => esc_html__('Basic', 'event_espresso'),
+							'wp_default' => esc_html__('WordPress Default', 'event_espresso'),
+							'i18n'       => esc_html__('International', 'event_espresso'),
+							'i18n_dns'   => esc_html__('International + DNS Check', 'event_espresso'),
 						),
 						array(
-							'html_label_text' => esc_html__( 'Email Validation Level', 'event_espresso' )
-							                     . EEH_Template::get_help_tab_link( 'email_validation_info' ),
-							'html_help_text'  => esc_html__( 'These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
-							'default' => isset( EE_Registry::instance()->CFG->registration->email_validation_level )
+							'html_label_text' => esc_html__('Email Validation Level', 'event_espresso')
+							                     . EEH_Template::get_help_tab_link('email_validation_info'),
+							'html_help_text'  => esc_html__('These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
+							'default' => isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 								? EE_Registry::instance()->CFG->registration->email_validation_level
 								: 'wp_default',
 							'required'        => false
@@ -972,18 +972,18 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public function update_email_validation_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public function update_email_validation_settings_form(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$email_validation_settings_form = $this->_email_validation_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $email_validation_settings_form->was_submitted() ) {
+			if ($email_validation_settings_form->was_submitted()) {
 				// capture form data
 				$email_validation_settings_form->receive_form_submission();
 				// validate form data
-				if ( $email_validation_settings_form->is_valid() ) {
+				if ($email_validation_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $email_validation_settings_form->valid_data();
-					if ( isset( $valid_data['email_validation_level'] ) ) {
+					if (isset($valid_data['email_validation_level'])) {
 						$EE_Registration_Config->email_validation_level = $valid_data['email_validation_level'];
 					} else {
 						EE_Error::add_error(
@@ -997,7 +997,7 @@ 
 						);
 					}
 				} else {
-					if ( $email_validation_settings_form->submission_error_message() !== '' ) {
+					if ($email_validation_settings_form->submission_error_message() !== '') {
 						EE_Error::add_error(
 							$email_validation_settings_form->submission_error_message(),
 							__FILE__,
@@ -1007,7 +1007,7 @@ 
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

Doc Comments +1 added lines, -1 removed lines

@@ -512,7 +512,7 @@
 	 * Deletes the specified question (and its associated question options) or question group
 	 * @param int $id
 	 * @param EEM_Soft_Delete_Base $model
-	 * @return boolean
+	 * @return integer
 	 */
 	protected function _delete_item( $id, $model ) {
 		if( $model instanceof EEM_Question ) {

Braces +8 added lines, -8 removed lines

@@ -497,12 +497,12 @@ 
 				}
 			}
 
-		}elseif( !empty($this->_req_data['QSG_ID'])){
+		} elseif( !empty($this->_req_data['QSG_ID'])){
 			$success = $this->_delete_item( $this->_req_data['QSG_ID'], $model );
 
-		}elseif( !empty($this->_req_data['QST_ID'])){
+		} elseif( !empty($this->_req_data['QST_ID'])){
 			$success = $this->_delete_item( $this->_req_data['QST_ID'], $model );
-		}else{
+		} else{
 			EE_Error::add_error( sprintf(esc_html__("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;
@@ -551,7 +551,7 @@ 
 			$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{
 			/** @var EE_Question_Group $questionGroup */
 			$questionGroup = EEM_Question_Group::instance()->create_default_object();
 			$questionGroup->set_order_to_latest();
@@ -754,7 +754,7 @@ 
 		if($trash){
 			$action_desc = 'trashed';
 			$status = 'trash';
-		}else{
+		} else{
 			$action_desc = 'restored';
 			$status = 'all';
 		}
@@ -776,7 +776,7 @@ 
 			//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{
+		} 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);
 		}
@@ -797,7 +797,7 @@ 
 		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;
@@ -818,7 +818,7 @@ 
 			$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;

Indentation +6 added lines, -6 removed lines

@@ -245,13 +245,13 @@ 
 					'persistent' => FALSE
 					),
 				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registration_form_add_question_help_tab' => array(
 						'title' => esc_html__('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
 				),
 
@@ -268,7 +268,7 @@ 
 						'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
 				),
 
@@ -286,7 +286,7 @@ 
 						'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
 				),
 
@@ -305,7 +305,7 @@ 
 						'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
 				)
 
@@ -951,7 +951,7 @@ 
 						),
 						array(
 							'html_label_text' => esc_html__( 'Email Validation Level', 'event_espresso' )
-							                     . EEH_Template::get_help_tab_link( 'email_validation_info' ),
+												 . EEH_Template::get_help_tab_link( 'email_validation_info' ),
 							'html_help_text'  => esc_html__( 'These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
 							'default' => isset( EE_Registry::instance()->CFG->registration->email_validation_level )
 								? EE_Registry::instance()->CFG->registration->email_validation_level

caffeinated/admin/extend/transactions/Extend_Transactions_Admin_Page.core.php

Spacing +43 added lines, -43 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -42,11 +42,11 @@ 
 	 * @param bool $routing
 	 * @return \Extend_Transactions_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-		define( 'TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-		define( 'TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/');
+		define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/');
+		define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/');
 	}
 
 
@@ -58,7 +58,7 @@ 
 	 * @return void
 	 */
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions';
 
 		$new_page_routes = array(
 			'reports' => array(
@@ -67,7 +67,7 @@ 
 			)
 		);
 
-		$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(
 			'reports' => array(
@@ -85,7 +85,7 @@ 
 				'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);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @return void
 	 */
 	public function load_scripts_styles_reports() {
-		wp_register_script( 'ee-txn-reports-js', TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true );
-		wp_enqueue_script( 'ee-txn-reports-js' );
+		wp_register_script('ee-txn-reports-js', TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('ee-txn-reports-js');
 		$this->_transaction_reports_js_setup();
 		EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts();
 	}
@@ -125,9 +125,9 @@ 
 	* @return void
 	*/
 	protected function _transaction_reports() {
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
 		$this->_admin_page_title = __('Transactions', 'event_espresso');
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, TRUE);
 
 		// the final template wrapper
 		$this->display_admin_page_with_no_sidebar();
@@ -142,42 +142,42 @@ 
 	 * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
 	 * @return string
 	 */
-	private function _revenue_per_day_report( $period = '-1 month' ) {
+	private function _revenue_per_day_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-day-report-dv';
 
 		$TXN = EEM_Transaction::instance();
 
-		$results = $TXN->get_revenue_per_day_report( $period );
+		$results = $TXN->get_revenue_per_day_report($period);
 		$results = (array) $results;
 		$revenue = array();
 		$subtitle = '';
 
-		if ( $results ) {
-			$revenue[] = array( __( 'Date (only shows dates that have a revenue greater than 1)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				if ( $result->revenue > 1 ) {
-					$revenue[] = array( $result->txnDate, (float) $result->revenue );
+		if ($results) {
+			$revenue[] = array(__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'), __('Total Revenue', 'event_espresso'));
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$revenue[] = array($result->txnDate, (float) $result->revenue);
 				}
 			}
 
 			//setup the date range.
-			$beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			$beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = esc_html__( 'Total Revenue per Day', 'event_espresso' );
+		$report_title = esc_html__('Total Revenue per Day', 'event_espresso');
 
 		$report_params = array(
 			'title' 		=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 			=> $report_ID,
 			'revenue' => $revenue,
-			'noResults' => empty( $revenue ),
-			'noTxnMsg'	=> sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' )
+			'noResults' => empty($revenue),
+			'noTxnMsg'	=> sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>')
 		);
-		wp_localize_script( 'ee-txn-reports-js', 'txnRevPerDay', $report_params );
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params);
 
 		return $report_ID;
 	}
@@ -191,43 +191,43 @@ 
 	 * @param string $period  The period (acceptable by PHP Datetime constructor) for which the report is generated.
 	 * @return int
 	 */
-	private function _revenue_per_event_report( $period = '-1 month' ) {
+	private function _revenue_per_event_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-event-report-dv';
 
 		$TXN = EEM_Transaction::instance();
-		$results = $TXN->get_revenue_per_event_report( $period );
+		$results = $TXN->get_revenue_per_event_report($period);
 		$results = (array) $results;
 		$revenue = array();
 		$subtitle = '';
 
-		if ( $results ) {
-			$revenue[] = array( __( 'Event (only events that have a revenue greater than 1 are shown)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				if ( $result->revenue > 1 ) {
-					$event_name = stripslashes( html_entity_decode( $result->event_name, ENT_QUOTES, 'UTF-8' ) );
-					$event_name = wp_trim_words( $event_name, 5, '...' );
-					$revenue[]  = array( $event_name, (float) $result->revenue );
+		if ($results) {
+			$revenue[] = array(__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'), __('Total Revenue', 'event_espresso'));
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
+					$event_name = wp_trim_words($event_name, 5, '...');
+					$revenue[]  = array($event_name, (float) $result->revenue);
 				}
 			}
 
 			//setup the date range.
-			$beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			$beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = esc_html__( 'Total Revenue per Event', 'event_espresso' );
+		$report_title = esc_html__('Total Revenue per Event', 'event_espresso');
 
 		$report_params = array(
 			'title' 		=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 			=> $report_ID,
 			'revenue' => $revenue,
-			'noResults' => empty( $revenue ),
-			'noTxnMsg'	=> sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' )
+			'noResults' => empty($revenue),
+			'noTxnMsg'	=> sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>')
 		);
-		wp_localize_script( 'ee-txn-reports-js', 'txnRevPerEvent', $report_params );
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params);
 
 		return $report_ID;
 	}

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso

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

Spacing +190 added lines, -190 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,49 +529,49 @@ 
 	*		@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
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_new_price' :
-				$this->_admin_page_title = esc_html__( 'Add New Price', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add New Price', 'event_espresso');
 				break;
 			case 'edit_price' :
-				$this->_admin_page_title = esc_html__( 'Edit Price', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Price', 'event_espresso');
 				break;
 			default :
-				$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) {
@@ -584,7 +584,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();
 	}
@@ -600,7 +600,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');
 	}
 
 
@@ -614,7 +614,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);
 	}
 
 
@@ -628,7 +628,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']),
@@ -656,12 +656,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 ???  : (
@@ -669,14 +669,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;
@@ -686,29 +686,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();
 				}
 			}
@@ -716,9 +716,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);
 
 	}
 
@@ -732,12 +732,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;
@@ -746,18 +746,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');
@@ -769,14 +769,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');
@@ -790,17 +790,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);
 
 	}
 
@@ -817,19 +817,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;
 				}
 			}
@@ -843,7 +843,7 @@ 
 
 		}
 
-		$this->_redirect_after_action( $success, 'Prices', 'deleted', array() );
+		$this->_redirect_after_action($success, 'Prices', 'deleted', array());
 
 	}
 
@@ -851,16 +851,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;
 				}
 			}
@@ -868,9 +868,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();
 	}
 
@@ -913,46 +913,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);
 		}
 
@@ -972,34 +972,34 @@ 
 	*/
 	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
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_new_price_type' :
-				$this->_admin_page_title = esc_html__( 'Add New Price Type', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add New Price Type', 'event_espresso');
 				break;
 			case 'edit_price_type' :
-				$this->_admin_page_title = esc_html__( 'Edit Price Type', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Price Type', 'event_espresso');
 				break;
 			default :
-				$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;
@@ -1008,19 +1008,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();
 
@@ -1037,7 +1037,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');
 	}
 
 
@@ -1050,7 +1050,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);
 	}
 
 
@@ -1063,9 +1063,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) {
 
@@ -1112,12 +1112,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 ???  : (
@@ -1125,24 +1125,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);
 
 	}
 
@@ -1156,49 +1156,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);
 
 	}
 
@@ -1215,19 +1215,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;
 				}
 			}
@@ -1235,8 +1235,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);
 
 	}
 
@@ -1252,7 +1252,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>';
 	}
 
 

Braces +5 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -545,7 +547,7 @@ 
 
 		if($count){
 			return $trashed ? EEM_Price::instance()->count( array( $_where ) ) : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else{
 			return EEM_Price::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 	}
@@ -989,7 +991,7 @@ 
 			'limit'=>$limit);
 		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);
 		}
 

caffeinated/admin/new/pricing/templates/event_tickets_datetime_attached_tickets_row.template.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 				</table>
 				<div class="ee-editor-footer-container">
 					<div class="ee-editor-id-container">
-						<span class="ee-item-id"><?php echo $DTT_ID ? sprintf( esc_html__( 'Datetime ID: %d', 'event_espresso' ), $DTT_ID ) : ''; ?></span>
+						<span class="ee-item-id"><?php echo $DTT_ID ? sprintf(esc_html__('Datetime ID: %d', 'event_espresso'), $DTT_ID) : ''; ?></span>
 					</div>
 					<div class="save-cancel-button-container">
 						<button data-context="short-ticket" data-datetime-row="<?php echo $dtt_row; ?>" class="button-primary ee-create-button">

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_row.template.php

Spacing +16 added lines, -16 removed lines

@@ -3,7 +3,7 @@ 
 	<td class="ee-tkt-order-field"><span class="ee-status-strip-td ee-status-strip<?php echo $tkt_status_class; ?>"></span><input type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_order]" class="edit-ticket-TKT_order" value ="<?php echo $TKT_order; ?>"></td>
 	<td><input maxlength="245" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_name]" class="edit-ticket-TKT_name ee-large-text-inp" placeholder="Ticket Title" value="<?php echo $TKT_name; ?>"></td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input type="hidden" id="edit-ticket-TKT_start_date-<?php echo $tkt_row; ?>"  name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo $TKT_start_date; ?>" >
 			<input type="text" name="archived_ticket[TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo $TKT_start_date; ?>" disabled>
 		<?php else : ?>
@@ -11,7 +11,7 @@ 
 		<?php endif; ?>
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input type="hidden" id="edit-ticket-TKT_end_date-<?php echo $tkt_row; ?>"  name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo $TKT_end_date; ?>" >
 			<input type="text" name="archived_ticket[TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo $TKT_end_date; ?>" disabled>
 		<?php else : ?>
@@ -19,7 +19,7 @@ 
 		<?php endif; ?>
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input id="edit-ticket-TKT_base_price-<?php echo $tkt_row; ?>" type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>">
 			<input type="text" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>" disabled>
 		<?php else : ?>
@@ -28,7 +28,7 @@ 
 		<input type="hidden" id="edit-ticket-TKT_base_price_ID-<?php echo $tkt_row; ?>" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price_ID]" value="<?php echo $TKT_base_price_ID; ?>">
 	</td>
 	<td>
-		<?php if ( $disabled ) : ?>
+		<?php if ($disabled) : ?>
 			<input type="hidden" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>">
 			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>" disabled>
 		<?php else : ?>
@@ -49,10 +49,10 @@ 
 			<input type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_ID]" class="edit-ticket-TKT_ID" value="<?php echo $TKT_ID; ?>">
 			<input type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_row]" class="edit-ticket-TKT_row" value="<?php echo $tkt_row; ?>">
 
-			<!--<div class="total-price-container"><?php printf( esc_html__('Total Final Price: %s', 'event_espresso'), '<span class="ticket-price-amount">' . $TKT_price . '</span>'); ?> </div>-->
+			<!--<div class="total-price-container"><?php printf(esc_html__('Total Final Price: %s', 'event_espresso'), '<span class="ticket-price-amount">'.$TKT_price.'</span>'); ?> </div>-->
 			<textarea name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_description]" class="edit-ticket-TKT_description ee-full-textarea-inp" placeholder="Ticket Description"><?php echo $TKT_description; ?></textarea>
 
-			<?php do_action( 'AHEE__event_tickets_datetime_ticket_row_template_after_desc', $tkt_row, $TKT_ID ); ?>
+			<?php do_action('AHEE__event_tickets_datetime_ticket_row_template_after_desc', $tkt_row, $TKT_ID); ?>
 
 			<div class="basic-ticket-container">
 				<h4 class="tickets-heading"><?php esc_html_e('Ticket Details', 'event_espresso'); ?></h4>
@@ -68,7 +68,7 @@ 
 					<tbody>
 						<tr>
 							<td>
-								<?php if ( $disabled ) : ?>
+								<?php if ($disabled) : ?>
 									<input type="hidden" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>">
 									<input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>" disabled>
 								<?php else : ?>
@@ -76,7 +76,7 @@ 
 								<?php endif; ?>
 							</td>
 							<td>
-								<?php if ( $disabled ) : ?>
+								<?php if ($disabled) : ?>
 									<input type="hidden" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>">
 									<input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>" disabled>
 								<?php else: ?>
@@ -84,7 +84,7 @@ 
 								<?php endif; ?>
 							</td>
 							<td>
-								<?php if ( $disabled ) : ?>
+								<?php if ($disabled) : ?>
 									<input type="hidden" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>">
 									<input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>" disabled>
 								<?php else : ?>
@@ -102,15 +102,15 @@ 
 					<label for="edit-ticket-TKT_required"><?php esc_html_e('This ticket is required (will appear first in frontend ticket lists).', 'event_espresso'); ?></label>
 				</div>
 				<div class="ticket-is-taxable-container">
-					<?php if ( !empty($tax_rows) ) { ?>
-						<?php if ( $disabled ) : ?>
+					<?php if ( ! empty($tax_rows)) { ?>
+						<?php if ($disabled) : ?>
 							<?php
-								$tax_value = !empty( $TKT_taxable ) ? 1 : 0;
+								$tax_value = ! empty($TKT_taxable) ? 1 : 0;
 							?>
-							<input class="TKT-taxable-checkbox" type="hidden" name="<?php echo $edit_tickets_name;?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="<?php echo $tax_value; ?>">
+							<input class="TKT-taxable-checkbox" type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="<?php echo $tax_value; ?>">
 							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?> disabled>
 						<?php else : ?>
-							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="<?php echo $edit_tickets_name;?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?>>
+							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?>>
 						<?php endif; ?>
 						<label for="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>"> <?php esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
 					<?php } //end tax_rows check ?>
@@ -167,10 +167,10 @@ 
 				<?php echo $ticket_datetimes_list; ?>
 			</ul>
 
-			<?php do_action( 'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end', $tkt_row, $TKT_ID ); ?>
+			<?php do_action('AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end', $tkt_row, $TKT_ID); ?>
 			<div class="ee-editor-footer-container">
 				<div class="ee-editor-id-container">
-					<span class="ee-item-id"><?php echo $TKT_ID ? sprintf( esc_html__( 'Ticket ID: %d', 'event_espresso' ), $TKT_ID ) : ''; ?></span>
+					<span class="ee-item-id"><?php echo $TKT_ID ? sprintf(esc_html__('Ticket ID: %d', 'event_espresso'), $TKT_ID) : ''; ?></span>
 				</div>
 				<div class="save-cancel-button-container">
 					<label for="edit-ticket-TKT_is_default_selector"><?php esc_html_e('use this new ticket as a default ticket for any new events', 'event_espresso'); ?></label>

Braces +40 added lines, -16 removed lines

@@ -6,24 +6,33 @@ 
 		<?php if ( $disabled ) : ?>
 			<input type="hidden" id="edit-ticket-TKT_start_date-<?php echo $tkt_row; ?>"  name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo $TKT_start_date; ?>" >
 			<input type="text" name="archived_ticket[TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo $TKT_start_date; ?>" disabled>
-		<?php else : ?>
-			<input id="edit-ticket-TKT_start_date-<?php echo $tkt_row; ?>" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp ee-datepicker" value="<?php echo $TKT_start_date; ?>" data-context="start-ticket" data-date-field-context="#display-ticketrow-<?php echo $tkt_row; ?>" data-related-field=".edit-ticket-TKT_end_date" data-next-field=".edit-ticket-TKT_end_date">
+		<?php else {
+	: ?>
+			<input id="edit-ticket-TKT_start_date-<?php echo $tkt_row;
+}
+?>" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp ee-datepicker" value="<?php echo $TKT_start_date; ?>" data-context="start-ticket" data-date-field-context="#display-ticketrow-<?php echo $tkt_row; ?>" data-related-field=".edit-ticket-TKT_end_date" data-next-field=".edit-ticket-TKT_end_date">
 		<?php endif; ?>
 	</td>
 	<td>
 		<?php if ( $disabled ) : ?>
 			<input type="hidden" id="edit-ticket-TKT_end_date-<?php echo $tkt_row; ?>"  name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo $TKT_end_date; ?>" >
 			<input type="text" name="archived_ticket[TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo $TKT_end_date; ?>" disabled>
-		<?php else : ?>
-			<input id="edit-ticket-TKT_end_date-<?php echo $tkt_row; ?>" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp ee-datepicker" value="<?php echo $TKT_end_date; ?>" data-context="end-ticket" data-date-field-context="#display-ticketrow-<?php echo $tkt_row; ?>" data-related-field=".edit-ticket-TKT_start_date" data-next-field=".edit-ticket-TKT_qty">
+		<?php else {
+	: ?>
+			<input id="edit-ticket-TKT_end_date-<?php echo $tkt_row;
+}
+?>" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp ee-datepicker" value="<?php echo $TKT_end_date; ?>" data-context="end-ticket" data-date-field-context="#display-ticketrow-<?php echo $tkt_row; ?>" data-related-field=".edit-ticket-TKT_start_date" data-next-field=".edit-ticket-TKT_qty">
 		<?php endif; ?>
 	</td>
 	<td>
 		<?php if ( $disabled ) : ?>
 			<input id="edit-ticket-TKT_base_price-<?php echo $tkt_row; ?>" type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>">
 			<input type="text" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>" disabled>
-		<?php else : ?>
-			<input id="edit-ticket-TKT_base_price-<?php echo $tkt_row; ?>" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>">
+		<?php else {
+	: ?>
+			<input id="edit-ticket-TKT_base_price-<?php echo $tkt_row;
+}
+?>" type="text" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price]" class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric" value="<?php echo $TKT_base_price; ?>">
 		<?php endif; ?>
 		<input type="hidden" id="edit-ticket-TKT_base_price_ID-<?php echo $tkt_row; ?>" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price_ID]" value="<?php echo $TKT_base_price_ID; ?>">
 	</td>
@@ -31,8 +40,11 @@ 
 		<?php if ( $disabled ) : ?>
 			<input type="hidden" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>">
 			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>" disabled>
-		<?php else : ?>
-			<input type="text" id="edit-ticket-TKT_qty-<?php echo $tkt_row; ?>"class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>">
+		<?php else {
+	: ?>
+			<input type="text" id="edit-ticket-TKT_qty-<?php echo $tkt_row;
+}
+?>"class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>">
 		<?php endif; ?>
 	</td>
 	<!--<td><span class="ticket-display-row-TKT_price"><?php echo $TKT_price; ?></span></td>-->
@@ -71,24 +83,33 @@ 
 								<?php if ( $disabled ) : ?>
 									<input type="hidden" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>">
 									<input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>" disabled>
-								<?php else : ?>
-									<input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>">
+								<?php else {
+	: ?>
+									<input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name;
+}
+?>[<?php echo $tkt_row; ?>][TKT_uses]" value="<?php echo $TKT_uses; ?>">
 								<?php endif; ?>
 							</td>
 							<td>
 								<?php if ( $disabled ) : ?>
 									<input type="hidden" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>">
 									<input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>" disabled>
-								<?php else: ?>
-									<input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>">
+								<?php else {
+	: ?>
+									<input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name;
+}
+?>[<?php echo $tkt_row; ?>][TKT_min]" value="<?php echo $TKT_min; ?>">
 								<?php endif; ?>
 							</td>
 							<td>
 								<?php if ( $disabled ) : ?>
 									<input type="hidden" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>">
 									<input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>" disabled>
-								<?php else : ?>
-									<input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>">
+								<?php else {
+	: ?>
+									<input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric" name="<?php echo $edit_tickets_name;
+}
+?>[<?php echo $tkt_row; ?>][TKT_max]" value="<?php echo $TKT_max; ?>">
 								<?php endif; ?>
 							</td>
 						</tr>
@@ -109,8 +130,11 @@ 
 							?>
 							<input class="TKT-taxable-checkbox" type="hidden" name="<?php echo $edit_tickets_name;?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="<?php echo $tax_value; ?>">
 							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?> disabled>
-						<?php else : ?>
-							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>" type="checkbox" name="<?php echo $edit_tickets_name;?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?>>
+						<?php else {
+	: ?>
+							<input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row;
+}
+?>" type="checkbox" name="<?php echo $edit_tickets_name;?>[<?php echo $tkt_row; ?>][TKT_taxable]" value="1"<?php echo $TKT_taxable; ?>>
 						<?php endif; ?>
 						<label for="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>"> <?php esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
 					<?php } //end tax_rows check ?>

core/libraries/payment_methods/EE_PMT_Base.lib.php

Spacing +107 added lines, -107 removed lines

@@ -14,7 +14,7 @@ 
  * @since 				$VID:$
  *
  */
-abstract class EE_PMT_Base{
+abstract class EE_PMT_Base {
 
 	const onsite = 'on-site';
 	const offsite = 'off-site';
@@ -95,31 +95,31 @@ 
 	 * @return EE_PMT_Base
 	 */
 	function __construct($pm_instance = NULL) {
-		if ( $pm_instance instanceof EE_Payment_Method ){
+		if ($pm_instance instanceof EE_Payment_Method) {
 			$this->set_instance($pm_instance);
 		}
-		if($this->_gateway){
-			$this->_gateway->set_payment_model( EEM_Payment::instance() );
-			$this->_gateway->set_payment_log( EEM_Change_Log::instance() );
-			$this->_gateway->set_template_helper( new EEH_Template() );
-			$this->_gateway->set_line_item_helper( new EEH_Line_Item() );
-			$this->_gateway->set_money_helper( new EEH_Money() );
+		if ($this->_gateway) {
+			$this->_gateway->set_payment_model(EEM_Payment::instance());
+			$this->_gateway->set_payment_log(EEM_Change_Log::instance());
+			$this->_gateway->set_template_helper(new EEH_Template());
+			$this->_gateway->set_line_item_helper(new EEH_Line_Item());
+			$this->_gateway->set_money_helper(new EEH_Money());
 		}
-		if ( ! isset( $this->_has_billing_form ) ) {
+		if ( ! isset($this->_has_billing_form)) {
 			// by default, On Site gateways have a billing form
-			if ( $this->payment_occurs() == EE_PMT_Base::onsite ) {
-				$this->set_has_billing_form( true );
+			if ($this->payment_occurs() == EE_PMT_Base::onsite) {
+				$this->set_has_billing_form(true);
 			} else {
-				$this->set_has_billing_form( false );
+				$this->set_has_billing_form(false);
 			}
 		}
 
-		if( ! $this->_pretty_name){
+		if ( ! $this->_pretty_name) {
 			throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
 		}
 		//if the child didn't specify a default button, use the credit card one
-		if( $this->_default_button_url === NULL){
-			$this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
+		if ($this->_default_button_url === NULL) {
+			$this->_default_button_url = EE_PLUGIN_DIR_URL.'payment_methods'.DS.'pay-by-credit-card.png';
 		}
 	}
 
@@ -128,8 +128,8 @@ 
 	/**
 	 * @param boolean $has_billing_form
 	 */
-	public function set_has_billing_form( $has_billing_form ) {
-		$this->_has_billing_form = filter_var( $has_billing_form, FILTER_VALIDATE_BOOLEAN );
+	public function set_has_billing_form($has_billing_form) {
+		$this->_has_billing_form = filter_var($has_billing_form, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -137,10 +137,10 @@ 
 	/**
 	 * sets the file_folder property
 	 */
-	protected function _set_file_folder(){
+	protected function _set_file_folder() {
 		$reflector = new ReflectionClass(get_class($this));
 		$fn = $reflector->getFileName();
-		$this->_file_folder =  dirname($fn).DS;
+		$this->_file_folder = dirname($fn).DS;
 	}
 
 
@@ -148,10 +148,10 @@ 
 	/**
 	 * sets the file URL with a trailing slash for this PMT
 	 */
-	protected function _set_file_url(){
-		$plugins_dir_fixed = str_replace('\\',DS,WP_PLUGIN_DIR);
-		$file_folder_fixed = str_replace('\\',DS,$this->file_folder());
-		$file_path = str_replace($plugins_dir_fixed,WP_PLUGIN_URL,$file_folder_fixed);
+	protected function _set_file_url() {
+		$plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR);
+		$file_folder_fixed = str_replace('\\', DS, $this->file_folder());
+		$file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed);
 		$this->_file_url = $file_path;
 	}
 
@@ -159,7 +159,7 @@ 
 	 * Gets the default description on all payment methods of this type
 	 * @return string
 	 */
-	public function default_description(){
+	public function default_description() {
 		return $this->_default_description;
 	}
 
@@ -169,8 +169,8 @@ 
 	 * Returns the folder containing the PMT child class, with a trailing slash
 	 * @return string
 	 */
-	public function file_folder(){
-		if( ! $this->_file_folder ) {
+	public function file_folder() {
+		if ( ! $this->_file_folder) {
 			$this->_set_file_folder();
 		}
 		return $this->_file_folder;
@@ -181,8 +181,8 @@ 
 	/**
 	 * @return string
 	 */
-	public function file_url(){
-		if( ! $this->_file_url ) {
+	public function file_url() {
+		if ( ! $this->_file_url) {
 			$this->_set_file_url();
 		}
 		return $this->_file_url;
@@ -195,14 +195,14 @@ 
 	 * Its important teh payment method instance is set before
 	 * @param EE_Payment_Method $payment_method_instance
 	 */
-	function set_instance($payment_method_instance){
+	function set_instance($payment_method_instance) {
 		$this->_pm_instance = $payment_method_instance;
 		//if they have already requested the settings form, make sure its
 		//data matches this model object
-		if($this->_settings_form){
+		if ($this->_settings_form) {
 			$this->settings_form()->populate_model_obj($payment_method_instance);
 		}
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			$this->_gateway->set_settings($payment_method_instance->settings_array());
 		}
 	}
@@ -213,14 +213,14 @@ 
 	 * Gets teh form for displaying to admins where they setup the payment method
 	 * @return EE_Payment_Method_Form
 	 */
-	function settings_form(){
-		if( ! $this->_settings_form){
+	function settings_form() {
+		if ( ! $this->_settings_form) {
 			$this->_settings_form = $this->generate_new_settings_form();
-			$this->_settings_form->set_payment_method_type( $this );
-			$this->_settings_form->_construct_finalize(NULL, NULL );
+			$this->_settings_form->set_payment_method_type($this);
+			$this->_settings_form->_construct_finalize(NULL, NULL);
 			//if we have already assigned a model object to this pmt, make
 			//sure its reflected in teh form we just generated
-			if($this->_pm_instance){
+			if ($this->_pm_instance) {
 				$this->_settings_form->populate_model_obj($this->_pm_instance);
 			}
 		}
@@ -246,7 +246,7 @@ 
 	 * this payment method type's settings form later in the request
 	 * @param EE_Payment_Method_Form $form
 	 */
-	public function set_settings_form($form){
+	public function set_settings_form($form) {
 		$this->_settings_form = $form;
 	}
 
@@ -269,10 +269,10 @@ 
 	 * @param array $extra_args
 	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
 	 */
-	public function billing_form( EE_Transaction $transaction = NULL, $extra_args = array() ){
+	public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array()) {
 		// has billing form already been regenerated ? or overwrite cache?
-		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form ){
-			$this->_billing_form = $this->generate_new_billing_form( $transaction, $extra_args );
+		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form) {
+			$this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args);
 		}
 		//if we know who the attendee is, and this is a billing form
 		//that uses attendee info, populate it
@@ -281,8 +281,8 @@ 
 			$transaction instanceof EE_Transaction &&
 			$transaction->primary_registration() instanceof EE_Registration &&
 			$transaction->primary_registration()->attendee() instanceof EE_Attendee
-		){
-			$this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() );
+		) {
+			$this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee());
 		}
 		return $this->_billing_form;
 	}
@@ -293,7 +293,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return \EE_Billing_Info_Form
 	 */
-	abstract function generate_new_billing_form( EE_Transaction $transaction = NULL );
+	abstract function generate_new_billing_form(EE_Transaction $transaction = NULL);
 
 
 
@@ -304,7 +304,7 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
 		return $billing_form;
 	}
 
@@ -315,7 +315,7 @@ 
 	 * if you have form
 	 * @param EE_Payment_Method $form
 	 */
-	public function set_billing_form($form){
+	public function set_billing_form($form) {
 		$this->_billing_form = $form;
 	}
 
@@ -325,7 +325,7 @@ 
 	 * Returns whether or not this payment method requires HTTPS to be used
 	 * @return boolean
 	 */
-	function requires_https(){
+	function requires_https() {
 		return $this->_requires_https;
 	}
 
@@ -343,9 +343,9 @@ 
 	 * @return EE_Payment
 	 * @throws EE_Error
 	 */
-	function process_payment( EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null,$fail_url = '', $method = 'CART', $by_admin = false ){
+	function process_payment(EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null, $fail_url = '', $method = 'CART', $by_admin = false) {
 		// @todo: add surcharge for the payment method, if any
-		if ( $this->_gateway ) {
+		if ($this->_gateway) {
 			//there is a gateway, so we're going to make a payment object
 			//but wait! do they already have a payment in progress that we thought was failed?
 			$duplicate_properties = array(
@@ -356,10 +356,10 @@ 
 				'PAY_amount' 					=> $amount !== null ? $amount : $transaction->remaining(),
 				'PAY_gateway_response' 	=> null,
 			);
-			$payment = EEM_Payment::instance()->get_one( array( $duplicate_properties ));
+			$payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
 			//if we didn't already have a payment in progress for the same thing,
 			//then we actually want to make a new payment
-			if ( ! $payment instanceof EE_Payment ){
+			if ( ! $payment instanceof EE_Payment) {
 				$payment = EE_Payment::new_instance(
 					array_merge(
 						$duplicate_properties,
@@ -375,10 +375,10 @@ 
 			}
 			//make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it
 			$payment->save();
-			$billing_values = $this->_get_billing_values_from_form( $billing_info );
+			$billing_values = $this->_get_billing_values_from_form($billing_info);
 
 			//  Offsite Gateway
-			if( $this->_gateway instanceof EE_Offsite_Gateway ){
+			if ($this->_gateway instanceof EE_Offsite_Gateway) {
 
 				$payment = $this->_gateway->set_redirection_info(
 					$payment,
@@ -394,17 +394,17 @@ 
 				);
 				$payment->save();
 			//  Onsite Gateway
-			} elseif ( $this->_gateway instanceof EE_Onsite_Gateway ) {
+			} elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 
-				$payment = $this->_gateway->do_direct_payment($payment,$billing_values);
+				$payment = $this->_gateway->do_direct_payment($payment, $billing_values);
 				$payment->save();
 
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso' ),
+						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso'),
 						get_class($this),
-						gettype( $this->_gateway )
+						gettype($this->_gateway)
 					)
 				);
 			}
@@ -426,8 +426,8 @@ 
 		}
 
 		// if there is billing info, clean it and save it now
-		if( $billing_info instanceof EE_Billing_Attendee_Info_Form ){
-			$this->_save_billing_info_to_attendee( $billing_info, $transaction );
+		if ($billing_info instanceof EE_Billing_Attendee_Info_Form) {
+			$this->_save_billing_info_to_attendee($billing_info, $transaction);
 		}
 
 		return $payment;
@@ -440,10 +440,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		if($billing_form instanceof EE_Form_Section_Proper ){
-			return $billing_form->input_pretty_values( true );
-		}else{
+	protected function _get_billing_values_from_form($billing_form) {
+		if ($billing_form instanceof EE_Form_Section_Proper) {
+			return $billing_form->input_pretty_values(true);
+		} else {
 			return NULL;
 		}
 	}
@@ -457,13 +457,13 @@ 
 	 * @return EE_Payment
 	 * @throws EE_Error
 	 */
-	public function handle_ipn($req_data,$transaction){
+	public function handle_ipn($req_data, $transaction) {
 		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
-		if( ! $this->_gateway instanceof EE_Offsite_Gateway){
-			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r( $this->_gateway, TRUE )));
+		if ( ! $this->_gateway instanceof EE_Offsite_Gateway) {
+			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
 
 		}
-		$payment = $this->_gateway->handle_payment_update( $req_data, $transaction );
+		$payment = $this->_gateway->handle_payment_update($req_data, $transaction);
 		return $payment;
 	}
 
@@ -476,22 +476,22 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean success
 	 */
-	protected function _save_billing_info_to_attendee($billing_form, $transaction){
-		if( ! $transaction || ! $transaction instanceof EE_Transaction){
+	protected function _save_billing_info_to_attendee($billing_form, $transaction) {
+		if ( ! $transaction || ! $transaction instanceof EE_Transaction) {
 			EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg ){
+		if ( ! $primary_reg) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$attendee = $primary_reg->attendee();
-		if( ! $attendee ){
+		if ( ! $attendee) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method() );
+		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method());
 
 	}
 
@@ -504,7 +504,7 @@ 
 	 * @param array $req_data
 	 * @return EE_Payment
 	 */
-	protected function find_payment_for_ipn( EE_Transaction $transaction, $req_data = array() ){
+	protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array()) {
 		return $transaction->last_payment();
 	}
 
@@ -521,8 +521,8 @@ 
 	 * and identifies the IPN as being for this payment method (not just fo ra payment method of this type)
 	 * @throws EE_Error
 	 */
-	public function handle_unclaimed_ipn( $req_data = array() ){
-		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this) ));
+	public function handle_unclaimed_ipn($req_data = array()) {
+		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this)));
 	}
 
 
@@ -538,7 +538,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Payment
 	 */
-	public function finalize_payment_for($transaction){
+	public function finalize_payment_for($transaction) {
 		return $transaction->last_payment();
 	}
 
@@ -548,10 +548,10 @@ 
 	 * Whether or not this payment method's gateway supports sending refund requests
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+	public function supports_sending_refunds() {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			return $this->_gateway->supports_sending_refunds();
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -565,14 +565,14 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment
 	 */
-	public function process_refund( EE_Payment $payment, $refund_info = array()){
-		if ( $this->_gateway && $this->_gateway instanceof EE_Gateway ) {
-			return $this->_gateway->do_direct_refund( $payment, $refund_info );
+	public function process_refund(EE_Payment $payment, $refund_info = array()) {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
+			return $this->_gateway->do_direct_refund($payment, $refund_info);
 		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'Payment Method Type "%s" does not support sending refund requests', 'event_espresso' ),
-					get_class( $this )
+					__('Payment Method Type "%s" does not support sending refund requests', 'event_espresso'),
+					get_class($this)
 				)
 			);
 		}
@@ -586,15 +586,15 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_occurs(){
-		if( ! $this->_gateway){
+	public function payment_occurs() {
+		if ( ! $this->_gateway) {
 			return EE_PMT_Base::offline;
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 			return EE_PMT_Base::onsite;
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Offsite_Gateway) {
 			return EE_PMT_Base::offsite;
-		}else{
-			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -607,8 +607,8 @@ 
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
-		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance,'payment'=>$payment) , true);
+	public function payment_overview_content(EE_Payment $payment) {
+		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance, 'payment'=>$payment), true);
 	}
 
 
@@ -621,7 +621,7 @@ 
 	 *	@type array $template_args any arguments you want passed to the template file while rendering.
 	 *				Keys will be variable names and values with be their values.
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array();
 	}
 
@@ -632,9 +632,9 @@ 
 	 * the payment method's table's PMT_type column)
 	 * @return string
 	 */
-	public function system_name(){
+	public function system_name() {
 		$classname = get_class($this);
-		return str_replace("EE_PMT_",'',$classname);
+		return str_replace("EE_PMT_", '', $classname);
 	}
 
 
@@ -643,7 +643,7 @@ 
 	 * A pretty i18n version of the PMT name
 	 * @return string
 	 */
-	public function pretty_name(){
+	public function pretty_name() {
 		return $this->_pretty_name;
 	}
 
@@ -653,7 +653,7 @@ 
 	 * Gets the default absolute URL to the payment method type's button
 	 * @return string
 	 */
-	public function default_button_url(){
+	public function default_button_url() {
 		return $this->_default_button_url;
 	}
 
@@ -663,7 +663,7 @@ 
 	 * Gets the gateway used by this payment method (if any)
 	 * @return EE_Gateway
 	 */
-	public function get_gateway(){
+	public function get_gateway() {
 		return $this->_gateway;
 	}
 
@@ -672,8 +672,8 @@ 
 	/**
 	 * @return string html for the link to a help tab
 	 */
-	public function get_help_tab_link(){
-		return EEH_Template::get_help_tab_link( $this->get_help_tab_name() );
+	public function get_help_tab_link() {
+		return EEH_Template::get_help_tab_link($this->get_help_tab_name());
 	}
 
 
@@ -682,8 +682,8 @@ 
 	 * Returns the name of the help tab for this PMT
 	 * @return string
 	 */
-	public function get_help_tab_name(){
-		return 'ee_' . strtolower( $this->system_name() ) . '_help_tab';
+	public function get_help_tab_name() {
+		return 'ee_'.strtolower($this->system_name()).'_help_tab';
 	}
 
 	/**
@@ -691,8 +691,8 @@ 
 	 * this PMT by an admin
 	 * @return string
 	 */
-	public function cap_name(){
-		return 'ee_payment_method_' . strtolower( $this->system_name() );
+	public function cap_name() {
+		return 'ee_payment_method_'.strtolower($this->system_name());
 	}
 
 	/**
@@ -704,9 +704,9 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
-		if( $this->_gateway instanceof EE_Gateway ){
-			$this->_gateway->update_txn_based_on_payment( $payment );
+	public function update_txn_based_on_payment($payment) {
+		if ($this->_gateway instanceof EE_Gateway) {
+			$this->_gateway->update_txn_based_on_payment($payment);
 		}
 	}
 	
@@ -721,7 +721,7 @@ 
 	 * @return string
 	 */
 	public function introductory_html() {
-		return EEH_Template::locate_template( $this->file_folder() . 'templates' . DS . strtolower( $this->system_name() ) . '_intro.template.php', array( 'pmt_obj' => $this, 'pm_instance' => $this->_pm_instance ) );
+		return EEH_Template::locate_template($this->file_folder().'templates'.DS.strtolower($this->system_name()).'_intro.template.php', array('pmt_obj' => $this, 'pm_instance' => $this->_pm_instance));
 	}
 
 

admin_pages/messages/EE_Message_List_Table.class.php

Spacing +116 added lines, -116 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -26,8 +26,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_get_messages( $this->_per_page, $this->_view );
-		$this->_all_data_count = $this->_get_messages( $this->_per_page, $this->_view, true );
+		$this->_data = $this->_get_messages($this->_per_page, $this->_view);
+		$this->_all_data_count = $this->_get_messages($this->_per_page, $this->_view, true);
 	}
 
 
@@ -35,32 +35,32 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __( 'Message', 'event_espresso' ),
-			'plural' => __( 'Messages', 'event_espresso' ),
+			'singular' => __('Message', 'event_espresso'),
+			'plural' => __('Messages', 'event_espresso'),
 			'ajax' => true,
 			'screen' => $this->get_admin_page()->get_current_screen()->id
 		);
 
 		$this->_columns = array(
 			'cb' => '<input type="checkbox" />',
-			'to' => __( 'To', 'event_espresso' ),
-			'from' => __( 'From', 'event_espresso' ),
-			'messenger' => __( 'Messenger', 'event_espresso' ),
-			'message_type' => __( 'Message Type', 'event_espresso' ),
-			'context' => __( 'Context', 'event_espresso' ),
-			'modified' => __( 'Modified', 'event_espresso' ),
-			'action' => __( 'Actions', 'event_espresso' ),
-			'msg_id' => __( 'ID', 'event_espresso' ),
+			'to' => __('To', 'event_espresso'),
+			'from' => __('From', 'event_espresso'),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'message_type' => __('Message Type', 'event_espresso'),
+			'context' => __('Context', 'event_espresso'),
+			'modified' => __('Modified', 'event_espresso'),
+			'action' => __('Actions', 'event_espresso'),
+			'msg_id' => __('ID', 'event_espresso'),
 		);
 
 		$this->_sortable_columns = array(
-			'modified' => array( 'MSG_modified' => true ),
-			'message_type' => array( 'MSG_message_type' => false ),
-			'messenger' => array( 'MSG_messenger' => false ),
-			'to' => array( 'MSG_to' => false ),
-			'from' => array( 'MSG_from' => false ),
-			'context' => array( 'MSG_context' => false ),
-			'msg_id' => array( 'MSG_ID', false ),
+			'modified' => array('MSG_modified' => true),
+			'message_type' => array('MSG_message_type' => false),
+			'messenger' => array('MSG_messenger' => false),
+			'to' => array('MSG_to' => false),
+			'from' => array('MSG_from' => false),
+			'context' => array('MSG_context' => false),
+			'msg_id' => array('MSG_ID', false),
 		);
 
 		$this->_primary_column = 'to';
@@ -78,11 +78,11 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip msg-status-' . $item->STS_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip msg-status-'.$item->STS_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -101,7 +101,7 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 		//setup messengers for selects
 		$m_values = $this->get_admin_page()->get_messengers_for_list_table();
 		//lets do the same for message types
@@ -110,88 +110,88 @@ 
 		$contexts = $this->get_admin_page()->get_contexts_for_message_types_for_list_table();
 		$i = 1;
 		$labels = $c_values = array();
-		foreach ( $contexts as $context => $label ) {
+		foreach ($contexts as $context => $label) {
 			//some message types may have the same label for a different context, so we're grouping these together so the end user
 			//doesn't get confused.
-			if ( isset( $labels[ $label ] ) ) {
-				$c_values[ $labels[ $label ] ]['id'] .= ',' . $context;
+			if (isset($labels[$label])) {
+				$c_values[$labels[$label]]['id'] .= ','.$context;
 				continue;
 			}
-			$c_values[ $i ]['id'] = $context;
-			$c_values[ $i ]['text'] = $label;
-			$labels[ $label ] = $i;
+			$c_values[$i]['id'] = $context;
+			$c_values[$i]['text'] = $label;
+			$labels[$label] = $i;
 			$i++;
 		}
 
 		$msgr_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Messengers', 'event_espresso' )
+			'text' => __('All Messengers', 'event_espresso')
 		);
 
 		$mt_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Message Types', 'event_espresso' )
+			'text' => __('All Message Types', 'event_espresso')
 		);
 
 		$c_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Contexts', 'event_espresso' )
+			'text' => __('All Contexts', 'event_espresso')
 		);
 
-		$msgr_filters = count( $m_values ) > 1
-			? array_merge( $msgr_default, $m_values )
+		$msgr_filters = count($m_values) > 1
+			? array_merge($msgr_default, $m_values)
 			: $m_values;
-		$mt_filters = ! empty( $mt_values ) && count( $mt_values ) > 1
-			? array_merge( $mt_default, $mt_values )
+		$mt_filters = ! empty($mt_values) && count($mt_values) > 1
+			? array_merge($mt_default, $mt_values)
 			: (array) $mt_values;
-		$c_filters = ! empty( $c_values ) && count( $c_values ) > 1
-			? array_merge( $c_default, $c_values )
+		$c_filters = ! empty($c_values) && count($c_values) > 1
+			? array_merge($c_default, $c_values)
 			: (array) $c_values;
 
-		if ( empty( $msgr_filters ) ) {
+		if (empty($msgr_filters)) {
 			$msgr_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Messengers active', 'event_espresso' )
+				'text' => __('No Messengers active', 'event_espresso')
 			);
 		}
 
-		if ( empty( $mt_filters ) ) {
+		if (empty($mt_filters)) {
 			$mt_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Message Types active', 'event_espresso' )
+				'text' => __('No Message Types active', 'event_espresso')
 			);
 		}
 
-		if ( empty( $c_filters ) ) {
+		if (empty($c_filters)) {
 			$c_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Contexts (because no message types active)', 'event_espresso' )
+				'text' => __('No Contexts (because no message types active)', 'event_espresso')
 			);
 		}
 
-		if ( count ( $msgr_filters ) > 1 ) {
+		if (count($msgr_filters) > 1) {
 			$filters[] = EEH_Form_Fields::select_input(
 				'ee_messenger_filter_by',
-				array_values( $msgr_filters ),
-				isset( $this->_req_data['ee_messenger_filter_by'] )
-					? sanitize_title( $this->_req_data['ee_messenger_filter_by'] )
+				array_values($msgr_filters),
+				isset($this->_req_data['ee_messenger_filter_by'])
+					? sanitize_title($this->_req_data['ee_messenger_filter_by'])
 					: ''
 			);
 		}
-		if ( count( $mt_filters ) > 1 ) {
+		if (count($mt_filters) > 1) {
 		$filters[] = EEH_Form_Fields::select_input(
 				'ee_message_type_filter_by',
-				array_values( $mt_filters ),
-				isset( $this->_req_data['ee_message_type_filter_by'] ) ? sanitize_title(
+				array_values($mt_filters),
+				isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_title(
 					$this->_req_data['ee_message_type_filter_by']
 				) : ''
 			);
 		}
-		if ( count( $c_filters ) > 1 ) {
+		if (count($c_filters) > 1) {
 			$filters[] = EEH_Form_Fields::select_input(
 				'ee_context_filter_by',
-				array_values( $c_filters ),
-				isset( $this->_req_data['ee_context_filter_by'] ) ? sanitize_text_field(
+				array_values($c_filters),
+				isset($this->_req_data['ee_context_filter_by']) ? sanitize_text_field(
 					$this->_req_data['ee_context_filter_by']
 				) : ''
 			);
@@ -202,8 +202,8 @@ 
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args ) {
-			$this->_views[ $view ]['count'] = $this->_get_messages( $this->_per_page, $view, true, true );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
 		}
 	}
 
@@ -214,8 +214,8 @@ 
 	 * @return string   checkbox
 	 * @throws \EE_Error
 	 */
-	public function column_cb( $message ) {
-		return sprintf( '<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID() );
+	public function column_cb($message) {
+		return sprintf('<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID());
 	}
 
 
@@ -225,7 +225,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_msg_id( EE_Message $message ) {
+	public function column_msg_id(EE_Message $message) {
 		return $message->ID();
 	}
 
@@ -236,8 +236,8 @@ 
 	 * @return string    The recipient of the message
 	 * @throws \EE_Error
 	 */
-	public function column_to( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'URL' );
+	public function column_to(EE_Message $message) {
+		EE_Registry::instance()->load_helper('URL');
 		$actions = array();
 		$actions['delete'] = '<a href="'
 			. EEH_URL::add_query_args_and_nonce(
@@ -246,10 +246,10 @@ 
 					'action' => 'delete_ee_message',
 					'MSG_ID' => $message->ID()
 				),
-				admin_url( 'admin.php' )
+				admin_url('admin.php')
 			)
-			. '">' . __( 'Delete', 'event_espresso' ) . '</a>';
-		return $message->to() . $this->row_actions( $actions );
+			. '">'.__('Delete', 'event_espresso').'</a>';
+		return $message->to().$this->row_actions($actions);
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @param EE_Message $message
 	 * @return string   The sender of the message
 	 */
-	public function column_from( EE_Message $message ) {
+	public function column_from(EE_Message $message) {
 		return $message->from();
 	}
 
@@ -267,8 +267,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The messenger used to send the message.
 	 */
-	public function column_messenger( EE_Message $message ) {
-		return ucwords( $message->messenger_label() );
+	public function column_messenger(EE_Message $message) {
+		return ucwords($message->messenger_label());
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The message type used to generate the message.
 	 */
-	public function column_message_type( EE_Message $message ) {
-		return ucwords( $message->message_type_label() );
+	public function column_message_type(EE_Message $message) {
+		return ucwords($message->message_type_label());
 	}
 
 
@@ -285,7 +285,7 @@ 
 	 * @param EE_Message $message
 	 * @return string  The context the message was generated for.
 	 */
-	public function column_context( EE_Message $message ) {
+	public function column_context(EE_Message $message) {
 		return $message->context_label();
 	}
 
@@ -294,7 +294,7 @@ 
 	 * @param EE_Message $message
 	 * @return string    The timestamp when this message was last modified.
 	 */
-	public function column_modified( EE_Message $message ) {
+	public function column_modified(EE_Message $message) {
 		return $message->modified();
 	}
 
@@ -303,36 +303,36 @@ 
 	 * @param EE_Message $message
 	 * @return string   Actions that can be done on the current message.
 	 */
-	public function column_action( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public function column_action(EE_Message $message) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$action_links = array(
-			'view' => EEH_MSG_Template::get_message_action_link( 'view', $message ),
-			'error' => EEH_MSG_Template::get_message_action_link( 'error', $message ),
-			'generate_now' => EEH_MSG_Template::get_message_action_link( 'generate_now', $message ),
-			'send_now' => EEH_MSG_Template::get_message_action_link( 'send_now', $message ),
-			'queue_for_resending' => EEH_MSG_Template::get_message_action_link( 'queue_for_resending', $message ),
-			'view_transaction' => EEH_MSG_Template::get_message_action_link( 'view_transaction', $message ),
+			'view' => EEH_MSG_Template::get_message_action_link('view', $message),
+			'error' => EEH_MSG_Template::get_message_action_link('error', $message),
+			'generate_now' => EEH_MSG_Template::get_message_action_link('generate_now', $message),
+			'send_now' => EEH_MSG_Template::get_message_action_link('send_now', $message),
+			'queue_for_resending' => EEH_MSG_Template::get_message_action_link('queue_for_resending', $message),
+			'view_transaction' => EEH_MSG_Template::get_message_action_link('view_transaction', $message),
 		);
 		$content = '';
-		switch ( $message->STS_ID() ) {
+		switch ($message->STS_ID()) {
 			case EEM_Message::status_sent :
-				$content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['queue_for_resending'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_resend :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_retry :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_failed :
 			case EEM_Message::status_debug_only :
-				$content = $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_idle :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_incomplete;
-				$content = $action_links['generate_now'] . $action_links['view_transaction'];
+				$content = $action_links['generate_now'].$action_links['view_transaction'];
 				break;
 		}
 		return $content;
@@ -350,54 +350,54 @@ 
 	 * @return int | EE_Message[]
 	 * @throws \EE_Error
 	 */
-	protected function _get_messages( $perpage = 10, $view = 'all', $count = false, $all = false ) {
+	protected function _get_messages($perpage = 10, $view = 'all', $count = false, $all = false) {
 
-		$current_page = isset( $this->_req_data['paged'] ) && ! empty( $this->_req_data['paged'] )
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
 			? $this->_req_data['paged']
 			: 1;
 
-		$per_page = isset( $this->_req_data['perpage'] ) && ! empty( $this->_req_data['perpage'] )
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
 			? $this->_req_data['perpage']
 			: $perpage;
 
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $all || $count ? null : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all || $count ? null : array($offset, $per_page);
 		$query_params = array(
-			'order_by' => empty( $this->_req_data[ 'orderby' ] ) ? 'MSG_modified' : $this->_req_data[ 'orderby' ],
-			'order'    => empty( $this->_req_data[ 'order' ] ) ? 'DESC' : $this->_req_data[ 'order' ],
+			'order_by' => empty($this->_req_data['orderby']) ? 'MSG_modified' : $this->_req_data['orderby'],
+			'order'    => empty($this->_req_data['order']) ? 'DESC' : $this->_req_data['order'],
 			'limit'    => $limit,
 		);
 
 		/**
 		 * Any filters coming in from other routes?
 		 */
-		if ( isset( $this->_req_data['filterby'] ) ) {
-			$query_params = array_merge( $query_params, EEM_Message::instance()->filter_by_query_params() );
-			if ( ! $count ) {
+		if (isset($this->_req_data['filterby'])) {
+			$query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
+			if ( ! $count) {
 				$query_params['group_by'] = 'MSG_ID';
 			}
 		}
 
 		//view conditionals
-		if ( $view !== 'all' && $count && $all ) {
+		if ($view !== 'all' && $count && $all) {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $view ),
+				'STS_ID' => strtoupper($view),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] !== 'all' ) {
+		if ( ! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $this->_req_data['status'] ),
+				'STS_ID' => strtoupper($this->_req_data['status']),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if ( ! $all && ! empty($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'MSG_to' => array( 'LIKE', $search_string ),
-				'MSG_from' => array( 'LIKE', $search_string ),
-				'MSG_subject' => array( 'LIKE', $search_string ),
-				'MSG_content' => array( 'LIKE', $search_string ),
+				'MSG_to' => array('LIKE', $search_string),
+				'MSG_from' => array('LIKE', $search_string),
+				'MSG_subject' => array('LIKE', $search_string),
+				'MSG_content' => array('LIKE', $search_string),
 			);
 		}
 
@@ -405,16 +405,16 @@ 
 		//the messages system is in debug mode.
 		//Note: for backward compat with previous iterations, this is necessary because there may be EEM_Message::status_debug_only
 		//messages in the database.
-		if ( ! EEM_Message::debug() ) {
+		if ( ! EEM_Message::debug()) {
 			$query_params[0]['AND*debug_only_conditional'] = array(
-				'STS_ID' => array( '!=', EEM_Message::status_debug_only )
+				'STS_ID' => array('!=', EEM_Message::status_debug_only)
 			);
 		}
 
 		//account for filters
 		if (
 			! $all
-			&& isset( $this->_req_data['ee_messenger_filter_by'] )
+			&& isset($this->_req_data['ee_messenger_filter_by'])
 			&& $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*messenger_filter'] = array(
@@ -423,7 +423,7 @@ 
 		}
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_message_type_filter_by'] )
+			&& ! empty($this->_req_data['ee_message_type_filter_by'])
 			&& $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*message_type_filter'] = array(
@@ -433,17 +433,17 @@ 
 
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_context_filter_by'] )
+			&& ! empty($this->_req_data['ee_context_filter_by'])
 			&& $this->_req_data['ee_context_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*context_filter'] = array(
-				'MSG_context' => array( 'IN', explode( ',', $this->_req_data['ee_context_filter_by'] ) )
+				'MSG_context' => array('IN', explode(',', $this->_req_data['ee_context_filter_by']))
 			);
 		}
 
 		return $count
-			? EEM_Message::instance()->count( $query_params, null, true )
-			: EEM_Message::instance()->get_all( $query_params );
+			? EEM_Message::instance()->count($query_params, null, true)
+			: EEM_Message::instance()->get_all($query_params);
 
 	}
 } //end EE_Message_List_Table class
\ No newline at end of file

admin_pages/payments/Payments_Admin_Page.core.php

Spacing +168 added lines, -168 removed lines

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