eventespresso / event-espresso-core

admin_pages/registration_form/RegistrationFormEditorFormDisplay.php

Spacing +48 added lines, -48 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\admin_pages\registration_form;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -44,7 +44,7 @@ 
 	 *
 	 * @param RegistrationFormEditorForm $RegistrationFormEditorFormInputForm
 	 */
-	public function __construct( RegistrationFormEditorForm $RegistrationFormEditorFormInputForm) {
+	public function __construct(RegistrationFormEditorForm $RegistrationFormEditorFormInputForm) {
 		$this->reg_form_editor_form = $RegistrationFormEditorFormInputForm;
 	}
 
@@ -57,23 +57,23 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function formHTML( $form_input, $form_input_class_name, \EE_Question $question = null ) {
-		if ( ! is_subclass_of( $form_input_class_name, 'EE_Form_Input_Base' ) ) {
+	public function formHTML($form_input, $form_input_class_name, \EE_Question $question = null) {
+		if ( ! is_subclass_of($form_input_class_name, 'EE_Form_Input_Base')) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'The class "%1$s" needs to be a sub class of  EE_Form_Input_Base.', 'event_espresso' ),
+					__('The class "%1$s" needs to be a sub class of  EE_Form_Input_Base.', 'event_espresso'),
 					$form_input_class_name
 				)
 			);
 		}
 		$identifier = $question instanceof \EE_Question ? $question->identifier() : 'clone';
-		$this->form_input = $this->reg_form_editor_form->formInput( $form_input, $form_input_class_name, $question );
-		$this->input_has_options = $this->form_input instanceof \EE_Form_Input_With_Options_Base ? true :false;
-		$html = \EEH_HTML::div( '', '', 'ee-reg-form-editor-form-new-input-form' );
-		$html .= $this->reg_form_editor_form->formInputForm( $form_input, $identifier )->get_html();
-		$html .= \EEH_HTML::div( '', '', 'ee-new-form-input-settings-dv' );
-		$html .= $this->getTabs( $form_input, $identifier );
-		if ( $this->input_has_options ) {
+		$this->form_input = $this->reg_form_editor_form->formInput($form_input, $form_input_class_name, $question);
+		$this->input_has_options = $this->form_input instanceof \EE_Form_Input_With_Options_Base ? true : false;
+		$html = \EEH_HTML::div('', '', 'ee-reg-form-editor-form-new-input-form');
+		$html .= $this->reg_form_editor_form->formInputForm($form_input, $identifier)->get_html();
+		$html .= \EEH_HTML::div('', '', 'ee-new-form-input-settings-dv');
+		$html .= $this->getTabs($form_input, $identifier);
+		if ($this->input_has_options) {
 			// form input settings
 			$html .= \EEH_HTML::div(
 				'',
@@ -81,7 +81,7 @@ 
 				'ee-reg-form-input-settings-tab-panel-dv'
 			);
 			$html .= $this->getInputOptionsFormHeader();
-			$html .= $this->getInputOptionsForm( $form_input, $identifier );
+			$html .= $this->getInputOptionsForm($form_input, $identifier);
 			//$html .= $this->reg_form_editor_form->getInputOptions( $form_input )->get_html();
 			$html .= $this->getInputOptionsFormFooter();
 
@@ -93,7 +93,7 @@ 
 			"ee-reg-form-input-settings-tab-panel-1-{$identifier}-{$form_input}",
 			'ee-reg-form-input-settings-tab-panel-dv'
 		);
-		$html .= $this->reg_form_editor_form->getBasicSettings( $form_input, $identifier, $question )->get_html();
+		$html .= $this->reg_form_editor_form->getBasicSettings($form_input, $identifier, $question)->get_html();
 		$html .= \EEH_HTML::divx(); // end 'ee-reg-form-input-settings-tab-panel-dv'
 		// validation settings
 		$html .= \EEH_HTML::div(
@@ -102,7 +102,7 @@ 
 			'ee-reg-form-input-settings-tab-panel-dv'
 		);
 		$html .= $this->reg_form_editor_form
-			->getValidationSettings( $form_input, $identifier, $form_input_class_name, $question )
+			->getValidationSettings($form_input, $identifier, $form_input_class_name, $question)
 			->get_html();
 		$html .= \EEH_HTML::divx(); // end 'ee-reg-form-input-settings-tab-panel-dv'
 		$html .= \EEH_HTML::divx(); // end 'ee-new-form-input-settings-dv'
@@ -117,18 +117,18 @@ 
 	 * @param string  $identifier
 	 * @return string
 	 */
-	public function getTabs( $form_input, $identifier = 'clone' ) {
+	public function getTabs($form_input, $identifier = 'clone') {
 		$tabs = array(
 			0 => 'Input Options',
 			1 => 'Basic Settings',
 			2 => 'Validation Rules',
 		);
-		if ( ! $this->input_has_options ) {
-			unset( $tabs[0] );
+		if ( ! $this->input_has_options) {
+			unset($tabs[0]);
 		}
-		$html = \EEH_HTML::ul( '', 'ee-reg-form-input-settings-tab-ul');
+		$html = \EEH_HTML::ul('', 'ee-reg-form-input-settings-tab-ul');
 		$order = 1;
-		foreach ( $tabs as $panel => $tab_label ) {
+		foreach ($tabs as $panel => $tab_label) {
 			$active = $order === 1 ? ' ee-reg-form-input-settings-tab-active' : '';
 			$html .= \EEH_HTML::li(
 				\EEH_HTML::link(
@@ -153,24 +153,24 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function getInputOptionsForm( $form_input, $identifier = 'clone' ) {
+	public function getInputOptionsForm($form_input, $identifier = 'clone') {
 		$html = '';
-		if ( $this->form_input instanceof \EE_Form_Input_With_Options_Base ) {
-			$options = $this->reg_form_editor_form->getInputOptions( $form_input, $this->form_input->options(), $identifier );
+		if ($this->form_input instanceof \EE_Form_Input_With_Options_Base) {
+			$options = $this->reg_form_editor_form->getInputOptions($form_input, $this->form_input->options(), $identifier);
 			$order = 2;
-			foreach( (array)$options as $key => $input ) {
-				if ( $input instanceof \EE_Form_Input_Base ) {
-					$html .= $this->getInputOptionsInputs( $key, $input );
+			foreach ((array) $options as $key => $input) {
+				if ($input instanceof \EE_Form_Input_Base) {
+					$html .= $this->getInputOptionsInputs($key, $input);
 					$order++;
 				}
 			}
-			$order = floor( $order /2 );
+			$order = floor($order / 2);
 			$hidden = $order > 2 ? true : false;
-			$html .= $this->addEmptyInputOptionsInputs( $form_input, $identifier, 0, $hidden );
+			$html .= $this->addEmptyInputOptionsInputs($form_input, $identifier, 0, $hidden);
 			//if ( $order <= 2 ) {
 			//	$html .= $this->addEmptyInputOptionsInputs( $form_input, 0, true );
 			//}
-			$html .= $this->getNewInputOptionOrderInput( $order );
+			$html .= $this->getNewInputOptionOrderInput($order);
 		}
 		return $html;
 	}
@@ -184,13 +184,13 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	protected function getInputOptionsInputs( $key, \EE_Form_Input_Base $input, $hidden = false ) {
+	protected function getInputOptionsInputs($key, \EE_Form_Input_Base $input, $hidden = false) {
 		$html = '';
 		$hide_row = $hidden ? 'display:none;' : '';
 		$new_row = $hidden ? 'ee-input-option-new-row' : 'ee-input-option-sortable-row';
-		switch ( substr( $key, 0, 4 ) ) {
+		switch (substr($key, 0, 4)) {
 			case 'valu' :
-				$html .= \EEH_HTML::tr( '', '', $new_row, $hide_row );
+				$html .= \EEH_HTML::tr('', '', $new_row, $hide_row);
 				$html .= \EEH_HTML::td();
 				$html .= $input->get_html_for_input();
 				$html .= \EEH_HTML::tdx();
@@ -206,25 +206,25 @@ 
 						'',
 						'ee-input-option-add dashicons dashicons-plus-alt',
 						'',
-						'title="' . __( 'Click to Add a New Option', 'event_espresso' ) . '"'
-					) . \EEH_HTML::span(
+						'title="'.__('Click to Add a New Option', 'event_espresso').'"'
+					).\EEH_HTML::span(
 						'',
 						'',
 						'ee-input-option-delete dashicons dashicons-trash',
 						'',
-						'title="' . __( 'Click to Delete This Option', 'event_espresso' ) . '"'
-					) . \EEH_HTML::span(
+						'title="'.__('Click to Delete This Option', 'event_espresso').'"'
+					).\EEH_HTML::span(
 						'',
 						'',
 						'ee-input-option-sort dashicons dashicons-arrow-up-alt2',
 						'',
-						'title="' . __( 'Drag to Sort', 'event_espresso' ) . '"'
-					) . \EEH_HTML::span(
+						'title="'.__('Drag to Sort', 'event_espresso').'"'
+					).\EEH_HTML::span(
 						'',
 						'',
 						'ee-input-option-sort dashicons dashicons-arrow-down-alt2', //list-view
 						'',
-						'title="' . __( 'Drag to Sort', 'event_espresso' ) . '"'
+						'title="'.__('Drag to Sort', 'event_espresso').'"'
 					),
 					'',
 					'ee-input-option-controls'
@@ -246,7 +246,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function addEmptyInputOptionsInputs( $form_input, $identifier = 'clone', $order = 0, $hidden = true ) {
+	protected function addEmptyInputOptionsInputs($form_input, $identifier = 'clone', $order = 0, $hidden = true) {
 		$order = $order !== 0 ? $order : 'order';
 		$html = $this->getInputOptionsInputs(
 			'value',
@@ -280,7 +280,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function getNewInputOptionOrderInput( $order ) {
+	public function getNewInputOptionOrderInput($order) {
 		$order_input = new \EE_Hidden_Input(
 			array(
 				'html_name' => 'ee_new_input_option_order',
@@ -288,7 +288,7 @@ 
 				'default'   => $order,
 			)
 		);
-		$html = \EEH_HTML::tr( '', '', 'ee_new_input_option_order', 'display:none;' );
+		$html = \EEH_HTML::tr('', '', 'ee_new_input_option_order', 'display:none;');
 		$html .= \EEH_HTML::td();
 		$html .= $order_input->get_html_for_input();
 		$html .= \EEH_HTML::tdx();
@@ -302,18 +302,18 @@ 
 	 * @return string
 	 */
 	public function getInputOptionsFormHeader() {
-		$html = \EEH_HTML::table( '', '', 'input-options-table form-table' );
+		$html = \EEH_HTML::table('', '', 'input-options-table form-table');
 		$html .= \EEH_HTML::thead(
 			\EEH_HTML::tr(
-				\EEH_HTML::th( __( 'Value', 'event_espresso' ), '', 'option-value-header' ) .
+				\EEH_HTML::th(__('Value', 'event_espresso'), '', 'option-value-header').
 				\EEH_HTML::th(
-					__( 'Description (optional, only shown on registration form)', 'event_espresso' ),
+					__('Description (optional, only shown on registration form)', 'event_espresso'),
 					'',
 					'option-desc-header'
 				)
 			)
 		);
-		$html .= \EEH_HTML::tbody( '', '', 'ee-input-options-table-body' );
+		$html .= \EEH_HTML::tbody('', '', 'ee-input-options-table-body');
 		return $html;
 	}
 
@@ -325,7 +325,7 @@ 
 	 * @return string
 	 */
 	public function getInputOptionsFormFooter() {
-		return \EEH_HTML::tbodyx() . \EEH_HTML::tablex( '', 'question-options-table' );
+		return \EEH_HTML::tbodyx().\EEH_HTML::tablex('', 'question-options-table');
 	}
 
 

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

Spacing +211 added lines, -211 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
@@ -191,7 +191,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(
 
@@ -215,7 +215,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(
@@ -229,14 +229,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
 				),
 
@@ -246,14 +246,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
 				),
 
@@ -262,16 +262,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
 				),
 
@@ -283,19 +283,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';
@@ -309,7 +309,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);
 
 	}
 
@@ -318,14 +318,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');
 	}
 
 
@@ -346,7 +346,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');
 	}
 
@@ -365,7 +365,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'),
@@ -395,7 +395,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'),
@@ -421,8 +421,8 @@ 
 	 *_forms_overview_list_table
 	 */
 	protected function _forms_overview_list_table() {
-		$this->_search_btn_label = __( 'Forms', 'event_espresso' );
-		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+		$this->_search_btn_label = __('Forms', 'event_espresso');
+		$this->_admin_page_title .= ' '.$this->get_action_link_or_button(
 			'add_question_group',
 			'add_question_group',
 			array(),
@@ -440,7 +440,7 @@ 
 	 * @param bool $trashed
 	 * @return \EEM_Question_Group[]|int
 	 */
-	public function get_form_sections( $per_page = 10, $current_page = 1, $count = false, $trashed = false ) {
+	public function get_form_sections($per_page = 10, $current_page = 1, $count = false, $trashed = false) {
 		return $this->get_form_sections_or_inputs(
 			EEM_Question_Group::instance(),
 			$per_page,
@@ -459,7 +459,7 @@ 
 	 * @param bool $trashed
 	 * @return \EEM_Question_Group[]|int
 	 */
-	public function get_form_inputs( $per_page = 10, $current_page = 1, $count = false, $trashed = false ) {
+	public function get_form_inputs($per_page = 10, $current_page = 1, $count = false, $trashed = false) {
 		return $this->get_form_sections_or_inputs(
 			EEM_Question_Group::instance(),
 			$per_page,
@@ -487,65 +487,65 @@ 
 		$trashed = false
 	) {
 		$query_params = array();
-		$offset = ( $current_page - 1 ) * $per_page;
-		$query_params[ 'limit' ] = array( $offset, $per_page );
-		$order = ( isset( $this->_req_data[ 'order' ] ) && ! empty( $this->_req_data[ 'order' ] ) )
-			? $this->_req_data[ 'order' ]
+		$offset = ($current_page - 1) * $per_page;
+		$query_params['limit'] = array($offset, $per_page);
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order']))
+			? $this->_req_data['order']
 			: 'ASC';
 		$orderby_field = $model instanceof EEM_Question_Group
 			? 'QSG_order'
 			: 'QST_order';
-		$field_to_order_by = empty( $this->_req_data[ 'orderby' ] )
+		$field_to_order_by = empty($this->_req_data['orderby'])
 			? $orderby_field
-			: $this->_req_data[ 'orderby' ];
-		$query_params[ 'order_by' ] = array( $field_to_order_by => $order );
-		$search_string = isset( $this->_req_data[ 's' ] )
-			? $this->_req_data[ 's' ]
+			: $this->_req_data['orderby'];
+		$query_params['order_by'] = array($field_to_order_by => $order);
+		$search_string = isset($this->_req_data['s'])
+			? $this->_req_data['s']
 			: null;
-		if ( ! empty( $search_string ) ) {
-			if ( $model instanceof EEM_Question_Group ) {
-				$query_params[ 0 ] = array(
+		if ( ! empty($search_string)) {
+			if ($model instanceof EEM_Question_Group) {
+				$query_params[0] = array(
 					'OR' => array(
-						'QSG_name' => array( 'LIKE', "%$search_string%" ),
-						'QSG_desc' => array( 'LIKE', "%$search_string%" )
+						'QSG_name' => array('LIKE', "%$search_string%"),
+						'QSG_desc' => array('LIKE', "%$search_string%")
 					)
 				);
-			} elseif ( $model instanceof EEM_Question ) {
-				$query_params[ 0 ] = array(
-					'QST_display_text' => array( 'LIKE', "%$search_string%" )
+			} elseif ($model instanceof EEM_Question) {
+				$query_params[0] = array(
+					'QST_display_text' => array('LIKE', "%$search_string%")
 				);
 			}
 		}
-		if ( $model instanceof EEM_Question_Group ) {
-			$query_params[ 0 ][ 'QSG_parent' ] = array( 'IS NULL' );
+		if ($model instanceof EEM_Question_Group) {
+			$query_params[0]['QSG_parent'] = array('IS NULL');
 		}
-		$where = isset( $query_params[ 0 ] ) ? array( $query_params[ 0 ] ) : array();
-		if ( $trashed ) {
-			return $count ? $model->count_deleted( $where ) : $model->get_all_deleted( $query_params );
+		$where = isset($query_params[0]) ? array($query_params[0]) : array();
+		if ($trashed) {
+			return $count ? $model->count_deleted($where) : $model->get_all_deleted($query_params);
 		}
-		return $count ? $model->count( $where ) : $model->get_all( $query_params );
+		return $count ? $model->count($where) : $model->get_all($query_params);
 	}
 
 
 
-	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')
 		);
 	}
 
@@ -556,26 +556,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;
 	}
@@ -586,11 +586,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));
 	}
 
 
@@ -602,41 +602,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();
@@ -647,7 +647,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'));
 	}
 
 
@@ -655,71 +655,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);
 
 	}
 
@@ -727,20 +727,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);
 		}
 	}
 
@@ -749,8 +749,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);
 	}
 
 
@@ -758,9 +758,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);
 	}
 
@@ -769,8 +769,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);
 	}
 
 
@@ -782,21 +782,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;
 					}
 				}
@@ -804,7 +804,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;
 				}
 			}
@@ -812,25 +812,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));
 	}
 
 
@@ -841,16 +841,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;
 	}
@@ -863,13 +863,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;
@@ -883,14 +883,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;
@@ -906,28 +906,28 @@ 
 	 */
 	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.
-			$qsg_count = empty( $curpage ) ? 0 : ($curpage - 1 ) * $perpage;
-			foreach ( $row_ids as $row_id ) {
+			$qsg_count = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
+			foreach ($row_ids as $row_id) {
 				//Update the questions when re-ordering
 				$updated = EEM_Question_Group::instance()->update(
-					array( 'QSG_order' => $qsg_count ),
-					array( array( 'QSG_ID' => $row_id ) )
+					array('QSG_order' => $qsg_count),
+					array(array('QSG_ID' => $row_id))
 				);
 				$success = $updated === false ? false : $success;
 				$qsg_count++;
@@ -937,10 +937,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();
 
 	}
@@ -959,17 +959,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
 		);
@@ -990,7 +990,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'));
 	}
 
 
@@ -1023,20 +1023,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
@@ -1055,25 +1055,25 @@ 
 	 * @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) {
         $prev_email_validation_level = $EE_Registration_Config->email_validation_level;
         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'])) {
 					    $email_validation_level = $valid_data['email_validation_level'];
                         // now if they want to use international email addresses
-                        if ( $email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns' ) {
+                        if ($email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns') {
                             // in case we need to reset their email validation level,
                             // make sure that the previous value wasn't already set to one of the i18n options.
-                            if ( $prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns' ) {
+                            if ($prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns') {
                                 // if so, then reset it back to "basic" since that is the only other option that,
                                 // despite offering poor validation, supports i18n email addresses
                                 $prev_email_validation_level = 'basic';
@@ -1095,7 +1095,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__, __FUNCTION__, __LINE__
@@ -1103,7 +1103,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 ) {

Indentation +87 added lines, -87 removed lines

@@ -230,13 +230,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
 				),
 
@@ -253,7 +253,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
 				),
 
@@ -271,7 +271,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
 				),
 
@@ -290,7 +290,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
 				)
 
@@ -1016,7 +1016,7 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _email_validation_settings_form() {
-        return new EE_Form_Section_Proper(
+		return new EE_Form_Section_Proper(
 			array(
 				'name'            => 'email_validation_settings',
 				'html_id'         => 'email_validation_settings',
@@ -1034,7 +1034,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
@@ -1056,8 +1056,8 @@ 
 	 * @return \EE_Registration_Config
 	 */
 	public function update_email_validation_settings_form( EE_Registration_Config $EE_Registration_Config ) {
-        $prev_email_validation_level = $EE_Registration_Config->email_validation_level;
-        try {
+		$prev_email_validation_level = $EE_Registration_Config->email_validation_level;
+		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() ) {
@@ -1068,38 +1068,38 @@ 
 					// grab validated data from form
 					$valid_data = $email_validation_settings_form->valid_data();
 					if ( isset( $valid_data['email_validation_level'] ) ) {
-					    $email_validation_level = $valid_data['email_validation_level'];
-                        // now if they want to use international email addresses
-                        if ( $email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns' ) {
-                            // in case we need to reset their email validation level,
-                            // make sure that the previous value wasn't already set to one of the i18n options.
-                            if ( $prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns' ) {
-                                // if so, then reset it back to "basic" since that is the only other option that,
-                                // despite offering poor validation, supports i18n email addresses
-                                $prev_email_validation_level = 'basic';
-                            }
-                            // confirm our i18n email validation will work on the server
-                            if ( ! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
-                                // or reset email validation level to previous value
-                                $email_validation_level = $prev_email_validation_level;
-                            }
-                        }
-                        $EE_Registration_Config->email_validation_level = $email_validation_level;
-                    } else {
+						$email_validation_level = $valid_data['email_validation_level'];
+						// now if they want to use international email addresses
+						if ( $email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns' ) {
+							// in case we need to reset their email validation level,
+							// make sure that the previous value wasn't already set to one of the i18n options.
+							if ( $prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns' ) {
+								// if so, then reset it back to "basic" since that is the only other option that,
+								// despite offering poor validation, supports i18n email addresses
+								$prev_email_validation_level = 'basic';
+							}
+							// confirm our i18n email validation will work on the server
+							if ( ! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
+								// or reset email validation level to previous value
+								$email_validation_level = $prev_email_validation_level;
+							}
+						}
+						$EE_Registration_Config->email_validation_level = $email_validation_level;
+					} else {
 						EE_Error::add_error(
 							esc_html__(
 								'Invalid or missing Email Validation settings. Please refresh the form and try again.',
 								'event_espresso'
 							),
-                            __FILE__, __FUNCTION__, __LINE__
-                        );
+							__FILE__, __FUNCTION__, __LINE__
+						);
 					}
 				} else {
 					if ( $email_validation_settings_form->submission_error_message() !== '' ) {
 						EE_Error::add_error(
 							$email_validation_settings_form->submission_error_message(),
-                            __FILE__, __FUNCTION__, __LINE__
-                        );
+							__FILE__, __FUNCTION__, __LINE__
+						);
 					}
 				}
 			}
@@ -1111,61 +1111,61 @@ 
 
 
 
-    /**
-     * confirms that the server's PHP version has the PCRE module enabled,
-     * and that the PCRE version works with our i18n email validation
-     *
-     * @param \EE_Registration_Config $EE_Registration_Config
-     * @param string                  $email_validation_level
-     * @return bool
-     */
-    private function _verify_pcre_support(EE_Registration_Config $EE_Registration_Config, $email_validation_level)
-    {
-        // first check that PCRE is enabled
-        if ( ! defined('PREG_BAD_UTF8_ERROR')) {
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'We\'re sorry, but it appears that your server\'s version of PHP was not compiled with PCRE unicode support.%1$sPlease contact your hosting company and ask them whether the PCRE compiled with your version of PHP on your server can be been built with the "--enable-unicode-properties" and "--enable-utf8" configuration switches to enable more complex regex expressions.%1$sIf they are unable, or unwilling to do so, then your server will not support international email addresses using UTF-8 unicode characters. This means you will either have to lower your email validation level to "Basic" or "WordPress Default", or switch to a hosting company that has/can enable PCRE unicode support on the server.',
-                        'event_espresso'
-                    ),
-                    '<br />'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        } else {
-            // PCRE support is enabled, but let's still
-            // perform a test to see if the server will support it.
-            // but first, save the updated validation level to the config,
-            // so that the validation strategy picks it up.
-            // this will get bumped back down if it doesn't work
-            $EE_Registration_Config->email_validation_level = $email_validation_level;
-            try {
-                $email_validator = new EE_Email_Validation_Strategy();
-                $i18n_email_address = apply_filters(
-                    'FHEE__Extend_Registration_Form_Admin_Page__update_email_validation_settings_form__i18n_email_address',
-                    'jägerjürgen@deutschland.com'
-                );
-                $email_validator->validate($i18n_email_address);
-            } catch (Exception $e) {
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'We\'re sorry, but it appears that your server\'s configuration will not support the "International" or "International + DNS Check" email validation levels.%1$sTo correct this issue, please consult with your hosting company regarding your server\'s PCRE settings.%1$sIt is recommended that your PHP version be configured to use PCRE 8.10 or newer.%1$sMore information regarding PCRE versions and installation can be found here: %2$s',
-                            'event_espresso'
-                        ),
-                        '<br />',
-                        '<a href="http://php.net/manual/en/pcre.installation.php" target="_blank">http://php.net/manual/en/pcre.installation.php</a>'
-                    ),
-                    __FILE__, __FUNCTION__, __LINE__
-                );
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * confirms that the server's PHP version has the PCRE module enabled,
+	 * and that the PCRE version works with our i18n email validation
+	 *
+	 * @param \EE_Registration_Config $EE_Registration_Config
+	 * @param string                  $email_validation_level
+	 * @return bool
+	 */
+	private function _verify_pcre_support(EE_Registration_Config $EE_Registration_Config, $email_validation_level)
+	{
+		// first check that PCRE is enabled
+		if ( ! defined('PREG_BAD_UTF8_ERROR')) {
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'We\'re sorry, but it appears that your server\'s version of PHP was not compiled with PCRE unicode support.%1$sPlease contact your hosting company and ask them whether the PCRE compiled with your version of PHP on your server can be been built with the "--enable-unicode-properties" and "--enable-utf8" configuration switches to enable more complex regex expressions.%1$sIf they are unable, or unwilling to do so, then your server will not support international email addresses using UTF-8 unicode characters. This means you will either have to lower your email validation level to "Basic" or "WordPress Default", or switch to a hosting company that has/can enable PCRE unicode support on the server.',
+						'event_espresso'
+					),
+					'<br />'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		} else {
+			// PCRE support is enabled, but let's still
+			// perform a test to see if the server will support it.
+			// but first, save the updated validation level to the config,
+			// so that the validation strategy picks it up.
+			// this will get bumped back down if it doesn't work
+			$EE_Registration_Config->email_validation_level = $email_validation_level;
+			try {
+				$email_validator = new EE_Email_Validation_Strategy();
+				$i18n_email_address = apply_filters(
+					'FHEE__Extend_Registration_Form_Admin_Page__update_email_validation_settings_form__i18n_email_address',
+					'jägerjürgen@deutschland.com'
+				);
+				$email_validator->validate($i18n_email_address);
+			} catch (Exception $e) {
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'We\'re sorry, but it appears that your server\'s configuration will not support the "International" or "International + DNS Check" email validation levels.%1$sTo correct this issue, please consult with your hosting company regarding your server\'s PCRE settings.%1$sIt is recommended that your PHP version be configured to use PCRE 8.10 or newer.%1$sMore information regarding PCRE versions and installation can be found here: %2$s',
+							'event_espresso'
+						),
+						'<br />',
+						'<a href="http://php.net/manual/en/pcre.installation.php" target="_blank">http://php.net/manual/en/pcre.installation.php</a>'
+					),
+					__FILE__, __FUNCTION__, __LINE__
+				);
+				return false;
+			}
+		}
+		return true;
+	}
 
 }

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;

core/libraries/form_sections/strategies/validation/ValidationStrategiesLoader.php

Spacing +36 added lines, -36 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\form_sections\strategies\validation;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -41,17 +41,17 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function get( $exclude = array(), $include = false ) {
-		if ( empty( ValidationStrategiesLoader::$_loaded ) ) {
+	public static function get($exclude = array(), $include = false) {
+		if (empty(ValidationStrategiesLoader::$_loaded)) {
 			ValidationStrategiesLoader::load();
 		}
 		// make sure $exclude is an array
-		$exclude = is_array( $exclude ) ? $exclude : array( $exclude );
+		$exclude = is_array($exclude) ? $exclude : array($exclude);
 		// and not numerically indexed
-		$exclude = array_key_exists( 0, $exclude ) ? array_flip( $exclude ) : $exclude;
+		$exclude = array_key_exists(0, $exclude) ? array_flip($exclude) : $exclude;
 		return $include
-			? array_intersect_key( ValidationStrategiesLoader::$_loaded, $exclude )
-			: array_diff_key( ValidationStrategiesLoader::$_loaded, $exclude );
+			? array_intersect_key(ValidationStrategiesLoader::$_loaded, $exclude)
+			: array_diff_key(ValidationStrategiesLoader::$_loaded, $exclude);
 	}
 
 
@@ -65,11 +65,11 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function add( $validation_strategy_slug = '', array $existing_validation_strategies = array() ) {
-		ValidationStrategiesLoader::validateSlug( $validation_strategy_slug );
+	public static function add($validation_strategy_slug = '', array $existing_validation_strategies = array()) {
+		ValidationStrategiesLoader::validateSlug($validation_strategy_slug);
 		return array_merge(
 			$existing_validation_strategies,
-			array( $validation_strategy_slug => ValidationStrategiesLoader::$_loaded[ $validation_strategy_slug ] )
+			array($validation_strategy_slug => ValidationStrategiesLoader::$_loaded[$validation_strategy_slug])
 		);
 	}
 
@@ -84,9 +84,9 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function remove( $validation_strategy_slug = '', array $existing_validation_strategies = array() ) {
-		ValidationStrategiesLoader::validateSlug( $validation_strategy_slug, false );
-		unset( $existing_validation_strategies[ $validation_strategy_slug ] );
+	public static function remove($validation_strategy_slug = '', array $existing_validation_strategies = array()) {
+		ValidationStrategiesLoader::validateSlug($validation_strategy_slug, false);
+		unset($existing_validation_strategies[$validation_strategy_slug]);
 		return $existing_validation_strategies;
 	}
 
@@ -100,12 +100,12 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function remove_missing_validation_strategies( array $existing_validation_strategies = array() ) {
-		foreach ( $existing_validation_strategies as $validation_strategy_slug => $existing_validation_strategy ) {
+	public static function remove_missing_validation_strategies(array $existing_validation_strategies = array()) {
+		foreach ($existing_validation_strategies as $validation_strategy_slug => $existing_validation_strategy) {
 			try {
-				ValidationStrategiesLoader::validateSlug( $validation_strategy_slug );
-			} catch ( \Exception $e ) {
-				unset( $existing_validation_strategies[ $validation_strategy_slug ] );
+				ValidationStrategiesLoader::validateSlug($validation_strategy_slug);
+			} catch (\Exception $e) {
+				unset($existing_validation_strategies[$validation_strategy_slug]);
 			}
 		}
 		return $existing_validation_strategies;
@@ -119,22 +119,22 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	protected static function validateSlug( $validation_strategy_slug = '', $load_strategies = true ) {
-		if ( empty( $validation_strategy_slug ) ) {
+	protected static function validateSlug($validation_strategy_slug = '', $load_strategies = true) {
+		if (empty($validation_strategy_slug)) {
 			throw new \EE_Error(
-				__( 'You must supply a slug in order to add a validation strategy.', 'event_espresso' )
+				__('You must supply a slug in order to add a validation strategy.', 'event_espresso')
 			);
 		}
-		if ( ! $load_strategies ) {
+		if ( ! $load_strategies) {
 			return true;
 		}
-		if ( empty( ValidationStrategiesLoader::$_loaded ) ) {
+		if (empty(ValidationStrategiesLoader::$_loaded)) {
 			ValidationStrategiesLoader::load();
 		}
-		if ( ! isset( ValidationStrategiesLoader::$_loaded[ $validation_strategy_slug ] ) ) {
+		if ( ! isset(ValidationStrategiesLoader::$_loaded[$validation_strategy_slug])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'The "%1$s" validation strategy was not found or could not be loaded.', 'event_espresso' ),
+					__('The "%1$s" validation strategy was not found or could not be loaded.', 'event_espresso'),
 					$validation_strategy_slug
 				)
 			);
@@ -151,21 +151,21 @@ 
 		// get all the files in that folder matching the mask
 		$filepaths = apply_filters(
 			'FHEE__ValidationStrategiesLoader__load__validation_strategies',
-			glob( __DIR__ . DS . 'EE_*_Validation_Strategy.strategy.php' )
+			glob(__DIR__.DS.'EE_*_Validation_Strategy.strategy.php')
 		);
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
-		foreach ( (array)$filepaths as $file_path ) {
+		foreach ((array) $filepaths as $file_path) {
 			// extract filename from path
-			$file_path = basename( $file_path );
+			$file_path = basename($file_path);
 			// now remove any file extensions
-			$validation_strategy_name = '\\' . substr( $file_path, 0, strpos( $file_path, '.' ) );
+			$validation_strategy_name = '\\'.substr($file_path, 0, strpos($file_path, '.'));
 			// first check to see if the class name represents an actual validation strategy class.
-			if ( strpos( strtolower( $validation_strategy_name ), 'validation_strategy' ) === false ) {
+			if (strpos(strtolower($validation_strategy_name), 'validation_strategy') === false) {
 				continue;
 			}
-			if ( ! class_exists( $validation_strategy_name ) ) {
+			if ( ! class_exists($validation_strategy_name)) {
 				throw new \EE_Error(
 					sprintf(
 						__(
@@ -177,7 +177,7 @@ 
 					)
 				);
 			}
-			if ( ! is_subclass_of( $validation_strategy_name, 'EE_Validation_Strategy_Base' ) ) {
+			if ( ! is_subclass_of($validation_strategy_name, 'EE_Validation_Strategy_Base')) {
 				throw new \EE_Error(
 					sprintf(
 						__(
@@ -189,9 +189,9 @@ 
 				);
 			}
 			$slug = strtolower(
-				str_replace( array( '\EE_', '_Validation_Strategy' ), array( '', '' ), $validation_strategy_name )
+				str_replace(array('\EE_', '_Validation_Strategy'), array('', ''), $validation_strategy_name)
 			);
-			ValidationStrategiesLoader::$_loaded[ $slug ] = $validation_strategy_name;
+			ValidationStrategiesLoader::$_loaded[$slug] = $validation_strategy_name;
 		}
 	}