eventespresso / event-espresso-core

admin_pages/registration_form/help_tabs/registration_form_reg_form_settings.help_tab.php

Spacing +3 added lines, -3 removed lines

@@ -3,15 +3,15 @@
 <?php _e('This page shows options for Email Validation, the EE "Bot Trap" and reCAPTCHA which can help prevent SPAM registrations on your site.', 'event_espresso'); ?>
 </p>
 <div id="email_validation_info">
-<p><strong><?php _e('Email Validation', 'event_espresso');?></strong></p>
+<p><strong><?php _e('Email Validation', 'event_espresso'); ?></strong></p>
 <p><?php _e("Validating an email address is extremely difficult to do correctly. Your server's configuration, as well as your own tolerances and needs, can affect the type of validation needed. We offer different types of validation so that you can control how strict your registration form responds to entered email addresses. If you are receiving too many bogus email addresses, then you can try the WordPress Default validation setting. If you find that the form validation is blocking a valid email address you can try the Basic setting, or if available, the International validation settings.", 'event_espresso'); ?>
 </p>
-<p><strong><?php _e('Validation Options:', 'event_espresso' );?></strong></p>
+<p><strong><?php _e('Validation Options:', 'event_espresso'); ?></strong></p>
 <ul>
 <li>
 	<?php _e('"Basic" - only checks that an email address follows the most basic structure guidelines ( ie: text@text.text ). Will work with the widest range of email addresses but will also allow the most garbage through.', 'event_espresso'); ?></li>
 <li>
-	<?php _e('"WordPress Default" - uses built in WordPress email validation, but does not support unicode characters (ie: international characters from non-latin based languages).','event_espresso'); ?></li>
+	<?php _e('"WordPress Default" - uses built in WordPress email validation, but does not support unicode characters (ie: international characters from non-latin based languages).', 'event_espresso'); ?></li>
 <li>
 	<?php _e('"International" - supports unicode characters but may not be supported by all server configurations. Try this first if you need to international language support, but drop back down to "Basic" if your server configuration conflicts.', 'event_espresso'); ?>
 </li>

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

Braces +8 added lines, -8 removed lines

@@ -487,12 +487,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(__("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;
@@ -531,7 +531,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();
@@ -734,7 +734,7 @@ 
 		if($trash){
 			$action_desc = 'trashed';
 			$status = 'trash';
-		}else{
+		} else{
 			$action_desc = 'restored';
 			$status = 'all';
 		}
@@ -756,7 +756,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);
 		}
@@ -777,7 +777,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;
@@ -798,7 +798,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;

Spacing +182 added lines, -182 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' => __('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' => __('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' => __('Edit Question Group', 'event_espresso'),
 					'order' => 5,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_edit_question_group_help_tab' => array(
 						'title' => __('Edit Question Group', 'event_espresso'),
 						'filename' => 'registration_form_edit_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Group_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -298,19 +298,19 @@ 
 				'labels' => array(
 					'publishbox' => __('Update Settings', 'event_espresso')
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_reg_form_settings_help_tab' => array(
 						'title' => __('Registration Form Settings', 'event_espresso'),
 						'filename' => 'registration_form_reg_form_settings'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Settings_Help_Tour'),
+                'help_tour' => array('Registration_Form_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 
 			);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		//change the list table we're going to use so it's the NEW list table!
 		$this->_page_config['default']['list_table'] = 'Extend_Registration_Form_Questions_Admin_List_Table';
@@ -324,7 +324,7 @@ 
 			'edit_question_group' => __('Edit Question Group', 'event_espresso'),
 			'delete_question_group' => __('Delete Question Group', 'event_espresso'),
 			);
-		$this->_labels['buttons'] = array_merge( $this->_labels['buttons'], $new_labels );
+		$this->_labels['buttons'] = array_merge($this->_labels['buttons'], $new_labels);
 
 	}
 
@@ -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' => __('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' => __('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(__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__ );
+		}elseif ( ! empty($this->_req_data['QST_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QST_ID'], $model);
+		} else {
+			EE_Error::add_error(sprintf(__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $success;
 	}
@@ -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,31 +520,31 @@ 
 
 
 
-	protected function _edit_question_group( $type = 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QSG_ID'] ) && ! empty( $this->_req_data['QSG_ID'] ) ? absint( $this->_req_data['QSG_ID'] ) : FALSE;
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+	protected function _edit_question_group($type = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QSG_ID']) && ! empty($this->_req_data['QSG_ID']) ? absint($this->_req_data['QSG_ID']) : FALSE;
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
+		$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();
@@ -555,7 +555,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'));
 	}
 
 
@@ -563,71 +563,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( __('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name() ) : sprintf( __('The %s has been updated', 'event_espresso' ), $this->_question_group_model->item_name() );
-			EE_Error::add_success( $msg );
+		if ($success !== FALSE) {
+			$msg = $new_question_group ? sprintf(__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name()) : sprintf(__('The %s has been updated', 'event_espresso'), $this->_question_group_model->item_name());
+			EE_Error::add_success($msg);
 		}
-		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group','QSG_ID'=>$QSG_ID), TRUE);
+		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group', 'QSG_ID'=>$QSG_ID), TRUE);
 
 	}
 
@@ -635,20 +635,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, __( 'Question', 'event_espresso' ), __( 'Duplicated', 'event_espresso' ), array('action'=>'edit_question', 'QST_ID' => $new_question->ID() ), TRUE);
+			if ($new_question instanceof EE_Question) {
+				$this->_redirect_after_action(true, __('Question', 'event_espresso'), __('Duplicated', 'event_espresso'), array('action'=>'edit_question', 'QST_ID' => $new_question->ID()), TRUE);
 			} else {
 				global $wpdb;
-				EE_Error::add_error( sprintf( __( 'Could not duplicate question with ID %1$d because: %2$s', 'event_espresso' ), $question_ID, $wpdb->last_error ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false );
+				EE_Error::add_error(sprintf(__('Could not duplicate question with ID %1$d because: %2$s', 'event_espresso'), $question_ID, $wpdb->last_error), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false);
 			}
 		} else {
-			EE_Error::add_error( sprintf( __( 'Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso' ), $question_ID ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( false, '', '', array( 'action' => 'default' ), false );
+			EE_Error::add_error(sprintf(__('Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso'), $question_ID), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
 		}
 	}
 
@@ -657,8 +657,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);
 	}
 
 
@@ -666,9 +666,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);
 	}
 
@@ -677,8 +677,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);
 	}
 
 
@@ -690,21 +690,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;
 					}
 				}
@@ -712,7 +712,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;
 				}
 			}
@@ -720,25 +720,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));
 	}
 
 
@@ -749,16 +749,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;
 	}
@@ -771,13 +771,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;
@@ -791,14 +791,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;
@@ -811,32 +811,32 @@ 
 	 */
 	public function update_question_group_order() {
 
-		$success = __( 'Question group order was updated successfully.', 'event_espresso' );
+		$success = __('Question group order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] )
-			? explode( ',', rtrim( $this->_req_data['row_ids'], ',' ))
+		$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++;
@@ -846,10 +846,10 @@ 
 		}
 
 		$errors = ! $success
-			? __( 'An error occurred. The question group order was not updated.', 'event_espresso' )
+			? __('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();
 
 	}
@@ -868,17 +868,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
 		);
@@ -899,7 +899,7 @@ 
 			EE_Registry::instance()->CFG,
 			__FILE__, __FUNCTION__, __LINE__
 		);
-		$this->_redirect_after_action( $success, __('Registration Form Options', 'event_espresso'), 'updated', array( 'action' => 'view_reg_form_settings' ) );
+		$this->_redirect_after_action($success, __('Registration Form Options', 'event_espresso'), 'updated', array('action' => 'view_reg_form_settings'));
 	}
 
 
@@ -930,20 +930,20 @@ 
 				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
 				'subsections'     => array(
 					'email_validation_hdr'           => new EE_Form_Section_HTML(
-						EEH_HTML::h2( __( 'Email Validation Settings', 'event_espresso' ) )
+						EEH_HTML::h2(__('Email Validation Settings', 'event_espresso'))
 					),
 					'email_validation_level' => new EE_Select_Input(
 						array(
-							'basic'      => __( 'Basic', 'event_espresso' ),
-							'wp_default' => __( 'WordPress Default', 'event_espresso' ),
-							'i18n'       => __( 'International', 'event_espresso' ),
-							'i18n_dns'   => __( 'International + DNS Check', 'event_espresso' ),
+							'basic'      => __('Basic', 'event_espresso'),
+							'wp_default' => __('WordPress Default', 'event_espresso'),
+							'i18n'       => __('International', 'event_espresso'),
+							'i18n_dns'   => __('International + DNS Check', 'event_espresso'),
 						),
 						array(
-							'html_label_text' => __( 'Email Validation Level', 'event_espresso' )
-							                     . EEH_Template::get_help_tab_link( 'email_validation_info' ),
-							'html_help_text'  => __( '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' => __('Email Validation Level', 'event_espresso')
+							                     . EEH_Template::get_help_tab_link('email_validation_info'),
+							'html_help_text'  => __('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
@@ -962,18 +962,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(
@@ -987,7 +987,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__,
@@ -997,7 +997,7 @@ 
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

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' => __('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
 				)
 
@@ -941,7 +941,7 @@ 
 						),
 						array(
 							'html_label_text' => __( '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'  => __( '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

core/db_models/EEM_Question.model.php

Spacing +58 added lines, -58 removed lines

@@ -1,8 +1,8 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
-require_once( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question.class.php' );
+require_once(EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question.class.php');
 
 
 
@@ -74,24 +74,24 @@ 
 	/**
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question','event_espresso');
-		$this->plural_item = __('Questions','event_espresso');
-		$this->_allowed_question_types=apply_filters(
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question', 'event_espresso');
+		$this->plural_item = __('Questions', 'event_espresso');
+		$this->_allowed_question_types = apply_filters(
 			'FHEE__EEM_Question__construct__allowed_question_types',
 			array(
-				EEM_Question::QST_type_text =>__('Text','event_espresso'),
-				EEM_Question::QST_type_textarea =>__('Textarea','event_espresso'),
-				EEM_Question::QST_type_checkbox =>__('Checkboxes','event_espresso'),
-				EEM_Question::QST_type_radio =>__('Radio Buttons','event_espresso'),
-				EEM_Question::QST_type_dropdown =>__('Dropdown','event_espresso'),
-				EEM_Question::QST_type_state =>__('State/Province Dropdown','event_espresso'),
-				EEM_Question::QST_type_country =>__('Country Dropdown','event_espresso'),
-				EEM_Question::QST_type_date =>__('Date Picker','event_espresso'),
-				EEM_Question::QST_type_html_textarea => __( 'HTML Textarea', 'event_espresso' ),
+				EEM_Question::QST_type_text =>__('Text', 'event_espresso'),
+				EEM_Question::QST_type_textarea =>__('Textarea', 'event_espresso'),
+				EEM_Question::QST_type_checkbox =>__('Checkboxes', 'event_espresso'),
+				EEM_Question::QST_type_radio =>__('Radio Buttons', 'event_espresso'),
+				EEM_Question::QST_type_dropdown =>__('Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_state =>__('State/Province Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_country =>__('Country Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_date =>__('Date Picker', 'event_espresso'),
+				EEM_Question::QST_type_html_textarea => __('HTML Textarea', 'event_espresso'),
 			)
 		);
-		$this->_question_type_categories = (array)apply_filters(
+		$this->_question_type_categories = (array) apply_filters(
 				'FHEE__EEM_Question__construct__question_type_categories',
 				array(
 				'text' => array(
@@ -107,22 +107,22 @@ 
 		);
 
 		$this->_tables = array(
-			'Question'=>new EE_Primary_Table('esp_question','QST_ID')
+			'Question'=>new EE_Primary_Table('esp_question', 'QST_ID')
 		);
 		$this->_fields = array(
 			'Question'=>array(
-				'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID','event_espresso')),
-				'QST_display_text'=>new EE_Full_HTML_Field('QST_display_text', __('Question Text','event_espresso'), true, ''),
-				'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)','event_espresso'), true, ''),
-				'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question','event_espresso'), TRUE, NULL ),
-				'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type','event_espresso'),false, 'TEXT',$this->_allowed_question_types),
-				'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?','event_espresso'), false, false),
-				'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided','event_espresso'), true, ''),
-				'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order','event_espresso'), false, 0),
-				'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?','event_espresso'), false, false),
-				'QST_max' => new EE_Infinite_Integer_Field( 'QST_max', __( 'Max Size', 'event_espresso'	), false, EE_INF ),
-				'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID','event_espresso'), false ),
-				'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted','event_espresso'), false, false)
+				'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso')),
+				'QST_display_text'=>new EE_Full_HTML_Field('QST_display_text', __('Question Text', 'event_espresso'), true, ''),
+				'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)', 'event_espresso'), true, ''),
+				'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question', 'event_espresso'), TRUE, NULL),
+				'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type', 'event_espresso'), false, 'TEXT', $this->_allowed_question_types),
+				'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?', 'event_espresso'), false, false),
+				'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided', 'event_espresso'), true, ''),
+				'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order', 'event_espresso'), false, 0),
+				'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?', 'event_espresso'), false, false),
+				'QST_max' => new EE_Infinite_Integer_Field('QST_max', __('Max Size', 'event_espresso'), false, EE_INF),
+				'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID', 'event_espresso'), false),
+				'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -134,11 +134,11 @@ 
 			'Question_Group_Question'=>new EE_Has_Many_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 * but they can be extended
 	 * @return string[]
 	 */
-	public function allowed_question_types(){
+	public function allowed_question_types() {
 		return $this->_allowed_question_types;
 	}
 	/**
@@ -154,16 +154,16 @@ 
 	 * @param string $question_type one of EEM_Question::allowed_question_types(
 	 * @return string[] like EEM_Question::allowed_question_types()
 	 */
-	public function question_types_in_same_category( $question_type ) {
-		$question_types = array( $question_type );
-		foreach( $this->_question_type_categories as $category => $question_types_in_category ) {
-			if( in_array( $question_type, $question_types_in_category ) ) {
+	public function question_types_in_same_category($question_type) {
+		$question_types = array($question_type);
+		foreach ($this->_question_type_categories as $category => $question_types_in_category) {
+			if (in_array($question_type, $question_types_in_category)) {
 				$question_types = $question_types_in_category;
 				break;
 			}
 		}
 
-		return array_intersect_key( $this->allowed_question_types(), array_flip( $question_types ) );
+		return array_intersect_key($this->allowed_question_types(), array_flip($question_types));
 	}
 
 	/**
@@ -172,11 +172,11 @@ 
 	 * @param string $category one of the top-level keys of EEM_Question::question_type_categories()
 	 * @return boolean
 	 */
-	public function question_type_is_in_category( $question_type, $category ) {
-		if( ! isset( $this->_question_type_categories[ $category ] ) ) {
+	public function question_type_is_in_category($question_type, $category) {
+		if ( ! isset($this->_question_type_categories[$category])) {
 			return false;
 		}
-		return in_array( $question_type, $this->_question_type_categories[ $category ] );
+		return in_array($question_type, $this->_question_type_categories[$category]);
 	}
 
 	/**
@@ -193,9 +193,9 @@ 
 	 * @param string $system_question_group_id QSG_system
 	 * @return array of system question names (QST_system)
 	 */
-	public function allowed_system_questions_in_system_question_group( $system_question_group_id ) {
+	public function allowed_system_questions_in_system_question_group($system_question_group_id) {
 		$question_system_ids = array();
-		switch( $system_question_group_id ) {
+		switch ($system_question_group_id) {
 			case EEM_Question_Group::system_personal:
 				$question_system_ids = array(
 					EEM_Attendee::system_question_fname,
@@ -216,7 +216,7 @@ 
 				);
 				break;
 		}
-		return apply_filters( 'FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id );
+		return apply_filters('FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id);
 	}
 
 	/**
@@ -225,11 +225,11 @@ 
 	 * @param string $system_question_group_id QSG_system
 	 * @return array of system question names (QST_system)
 	 */
-	public function required_system_questions_in_system_question_group( $system_question_group_id ) {
+	public function required_system_questions_in_system_question_group($system_question_group_id) {
 		$question_system_ids = null;
-		switch( $system_question_group_id ) {
+		switch ($system_question_group_id) {
 			case EEM_Question_Group::system_personal:
-				$question_system_ids =  array(
+				$question_system_ids = array(
 					EEM_Attendee::system_question_fname,
 					EEM_Attendee::system_question_email,
 				);
@@ -237,7 +237,7 @@ 
 			default:
 				$question_system_ids = array();
 		}
-		return apply_filters( 'FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id );
+		return apply_filters('FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id);
 	}
 
 
@@ -248,8 +248,8 @@ 
 	 * @param $QST_system
 	 * @return int of QST_ID for the question that corresponds to that QST_system
 	 */
-	public function get_Question_ID_from_system_string( $QST_system ){
-		 return $this->get_var( array( array( 'QST_system' => $QST_system ) ) );
+	public function get_Question_ID_from_system_string($QST_system) {
+		 return $this->get_var(array(array('QST_system' => $QST_system)));
 	}
 
 
@@ -261,10 +261,10 @@ 
 	 */
 	public function get_latest_question_order() {
 		$columns_to_select = array(
-			'max_order' => array("MAX(QST_order)","%d")
+			'max_order' => array("MAX(QST_order)", "%d")
 		);
-		$max = $this->_get_all_wpdb_results( array(), ARRAY_A, $columns_to_select );
-		return isset( $max[0], $max[0]['max_order'] ) ? $max[0]['max_order'] : 0;
+		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
+		return isset($max[0], $max[0]['max_order']) ? $max[0]['max_order'] : 0;
 	}
 
 	/**
@@ -293,10 +293,10 @@ 
 	 * @param string $system_question_value
 	 * @return int|float
 	 */
-	public function absolute_max_for_system_question( $system_question_value ) {
+	public function absolute_max_for_system_question($system_question_value) {
 		$maxes = $this->system_question_maxes();
-		if( isset( $maxes[ $system_question_value ] ) ) {
-			return $maxes[ $system_question_value ];
+		if (isset($maxes[$system_question_value])) {
+			return $maxes[$system_question_value];
 		} else {
 			return EE_INF;
 		}

core/EE_Load_Espresso_Core.core.php

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -53,7 +53,7 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		// central repository for classes
@@ -61,15 +61,15 @@ 
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// PSR4 Autoloaders
-		EE_Registry::instance()->load_core( 'EE_Psr4AutoloaderInit' );
+		EE_Registry::instance()->load_core('EE_Psr4AutoloaderInit');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		//// WP cron jobs
-		EE_Registry::instance()->load_core( 'Cron_Tasks' );
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'EE_System' );
+		EE_Registry::instance()->load_core('Cron_Tasks');
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -83,12 +83,12 @@ 
 	 * 	@return void
 	 */
 	private function _load_registry() {
-		if ( is_readable( EE_CORE . 'EE_Registry.core.php' )) {
-			require_once( EE_CORE . 'EE_Registry.core.php' );
+		if (is_readable(EE_CORE.'EE_Registry.core.php')) {
+			require_once(EE_CORE.'EE_Registry.core.php');
 		} else {
-			$msg = __( 'The EE_Registry core class could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-			wp_die( EE_Error::get_notices() );
+			$msg = __('The EE_Registry core class could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			wp_die(EE_Error::get_notices());
 		}
 	}
 
@@ -100,11 +100,11 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
-			require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		if (is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 		} else {
-			$msg = __( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('The EEH_Class_Tools helper could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -119,13 +119,13 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//\EEH_Debug_Tools::printr( __FUNCTION__, __CLASS__, __FILE__, __LINE__, 2 );
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();
-		if ( $response->plugin_deactivated() ) {
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
 		}
 	}
 

core/middleware/EE_Middleware.core.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	 * @access 	public
 	 * @param 	\EEI_Request_Decorator $request_stack
 	 */
-	public function __construct( EEI_Request_Decorator $request_stack ) {
+	public function __construct(EEI_Request_Decorator $request_stack) {
 		$this->_request_stack = $request_stack;
 	}
 
@@ -57,11 +57,11 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	protected function process_request_stack( EE_Request $request, EE_Response $response ) {
+	protected function process_request_stack(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
-		if ( ! $this->_response->request_terminated() ) {
-			$this->_response = $this->_request_stack->handle_request( $this->_request, $this->_response );
+		if ( ! $this->_response->request_terminated()) {
+			$this->_response = $this->_request_stack->handle_request($this->_request, $this->_response);
 		}
 		return $this->_response;
 	}

core/middleware/EE_Alpha_Banner_Warning.core.php

Spacing +10 added lines, -10 removed lines

@@ -21,11 +21,11 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		$this->display_alpha_banner_warning();
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		return $this->_response;
 	}
 
@@ -41,22 +41,22 @@ 
 	 */
 	public function display_alpha_banner_warning() {
 		// skip AJAX requests
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			return;
 		}
 		// skip stable releases
-		if ( strpos( EVENT_ESPRESSO_VERSION, '.alpha' ) === false ) {
+		if (strpos(EVENT_ESPRESSO_VERSION, '.alpha') === false) {
 			return;
 		}
 		// post release candidate warning
-		if ( is_admin() ) {
-			add_action( 'admin_notices', array( $this, 'alpha_banner_admin_notice' ), -999 );
+		if (is_admin()) {
+			add_action('admin_notices', array($this, 'alpha_banner_admin_notice'), -999);
 		} else {
 			// site admin has authorized use of non-stable release candidate for production
-			if ( defined( 'ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE' ) && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE ) {
+			if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
 				return;
 			}
-			add_action( 'shutdown', array( $this, 'alpha_banner_warning_notice' ), 10 );
+			add_action('shutdown', array($this, 'alpha_banner_warning_notice'), 10);
 		}
 	}
 
@@ -72,7 +72,7 @@ 
 	public function alpha_banner_admin_notice() {
 		EE_Error::add_attention(
 			sprintf(
-				__( 'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso' ),
+				__('This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso'),
 				'<strong>',
 				'</strong>'
 			),
@@ -91,7 +91,7 @@ 
 	 */
 	public function alpha_banner_warning_notice() {
 		printf(
-			__( '%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso' ),
+			__('%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso'),
 			'<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>',
 			'<strong>',
 			'</strong>',

core/middleware/EE_Detect_Login.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -26,14 +26,14 @@ 
 	 * @param    EE_Response $response
 	 * @return    EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		global $pagenow;
-		if ( in_array( $pagenow, array( 'wp-login.php', 'wp-register.php' ) ) ) {
+		if (in_array($pagenow, array('wp-login.php', 'wp-register.php'))) {
 			$this->_response->terminate_request();
 		}
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		return $this->_response;
 	}
 

core/request_stack/EE_Request_Stack.core.php

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
 	 * @param 	EEI_Request_Decorator $application
 	 * @param 	array $middlewares
 	 */
-	public function __construct( EEI_Request_Decorator $application, $middlewares = array() ) {
+	public function __construct(EEI_Request_Decorator $application, $middlewares = array()) {
 		$this->_application = $application;
 		$this->_middlewares = $middlewares;
 	}
@@ -55,10 +55,10 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
-		return $this->_application->handle_request( $request, $response );
+		return $this->_application->handle_request($request, $response);
 	}
 
 
@@ -69,9 +69,9 @@ 
 	 * after the request stack has been fully processed
 	 */
 	public function handle_response() {
-		foreach ( $this->_middlewares as $middleware ) {
-			if ( $middleware instanceof EEI_Request_Stack_Core_App ) {
-				$middleware->handle_response( $this->_request, $this->_response );
+		foreach ($this->_middlewares as $middleware) {
+			if ($middleware instanceof EEI_Request_Stack_Core_App) {
+				$middleware->handle_response($this->_request, $this->_response);
 				// exit loop since we should be done
 				// (also in case someone has accidentally labeled multiple apps as the EEI_Request_Stack_Core_App )
 				break;

core/libraries/batch/JobHandlerBaseClasses/JobHandlerFile.php

Spacing +22 added lines, -22 removed lines

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