eventespresso / event-espresso-core

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

Indentation +5 added lines, -5 removed lines

@@ -235,13 +235,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
 				),
 
@@ -258,7 +258,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
 				),
 
@@ -276,7 +276,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
 				),
 
@@ -295,7 +295,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
 				)
 

Spacing +144 added lines, -144 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,13 +30,13 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		define( 'REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND . 'registration_form' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN . 'assets' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/assets/' );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN . 'templates' . DS );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/templates/' );
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND.'registration_form'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN.'assets'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/assets/');
+		define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN.'templates'.DS);
+		define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/templates/');
+		parent::__construct($routing);
 	}
 
 
@@ -46,8 +46,8 @@ 
 
 	protected function _extend_page_config() {
 		$this->_admin_base_path = REGISTRATION_FORM_CAF_ADMIN;
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) && ! is_array( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
-		$qsg_id = ! empty( $this->_req_data['QSG_ID'] ) && ! is_array( $this->_req_data['QSG_ID'] ) ? $this->_req_data['QSG_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) && ! is_array($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
+		$qsg_id = ! empty($this->_req_data['QSG_ID']) && ! is_array($this->_req_data['QSG_ID']) ? $this->_req_data['QSG_ID'] : 0;
 
 		$new_page_routes = array(
 			'question_groups' => array(
@@ -76,7 +76,7 @@ 
 				'func' => '_trash_or_restore_questions',
 				'capability' => 'ee_delete_question',
 				'obj_id' => $qst_id,
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'noheader' => TRUE
 				),
 
@@ -135,7 +135,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
@@ -143,7 +143,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
@@ -158,7 +158,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,
@@ -196,7 +196,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(
 
@@ -220,7 +220,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(
@@ -234,14 +234,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
 				),
 
@@ -251,14 +251,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
 				),
 
@@ -267,16 +267,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
 				),
 
@@ -288,19 +288,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';
@@ -314,7 +314,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);
 
 	}
 
@@ -323,14 +323,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');
 	}
 
 
@@ -351,7 +351,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');
 	}
 
@@ -370,7 +370,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'),
@@ -400,7 +400,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'),
@@ -436,16 +436,16 @@ 
 
 
 
-	protected function _delete_question(){
-		$success=$this->_question_model->delete_permanently_by_ID(intval($this->_req_data['QST_ID']));
-		$query_args=array('action'=>'default','status'=>'all');
+	protected function _delete_question() {
+		$success = $this->_question_model->delete_permanently_by_ID(intval($this->_req_data['QST_ID']));
+		$query_args = array('action'=>'default', 'status'=>'all');
 		$this->_redirect_after_action($success, $this->_question_model->item_name($success), 'deleted', $query_args);
 	}
 
 
 	protected function _delete_questions() {
 		$success = $this->_delete_items($this->_question_model);
-		$this->_redirect_after_action( $success, $this->_question_model->item_name($success), 'deleted permanently', array( 'action'=>'default', 'status'=>'trash' ));
+		$this->_redirect_after_action($success, $this->_question_model->item_name($success), 'deleted permanently', array('action'=>'default', 'status'=>'trash'));
 	}
 
 
@@ -454,27 +454,27 @@ 
  * @param EEM_Base $model
  * @return int number of items deleted permanenetly
  */
-	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'])) {
+			while (list($ID, $value) = each($this->_req_data['checkbox'])) {
 
-				if (!$model->delete_permanently_by_ID(absint($ID))) {
+				if ( ! $model->delete_permanently_by_ID(absint($ID))) {
 					$success = 0;
 				}
 			}
 
-		}elseif( !empty($this->_req_data['QSG_ID'])){
+		}elseif ( ! empty($this->_req_data['QSG_ID'])) {
 			$success = $model->delete_permanently_by_ID($this->_req_data['QSG_ID']);
 
-		}elseif( !empty($this->_req_data['QST_ID'])){
+		}elseif ( ! empty($this->_req_data['QST_ID'])) {
 			$success = $model->delete_permanently_by_ID($this->_req_data['QST_ID']);
-		}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__ );
+		} 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;
 	}
@@ -488,29 +488,29 @@ 
 
 
 
-	protected function _edit_question_group( $type = 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QSG_ID'] ) && ! empty( $this->_req_data['QSG_ID'] ) ? absint( $this->_req_data['QSG_ID'] ) : FALSE;
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+	protected function _edit_question_group($type = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QSG_ID']) && ! empty($this->_req_data['QSG_ID']) ? absint($this->_req_data['QSG_ID']) : FALSE;
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
-			$questionGroup=$this->_question_group_model->get_one_by_ID($ID);
-			$additional_hidden_fields=array('QSG_ID'=>array('type'=>'hidden','value'=>$ID));
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
+			$questionGroup = $this->_question_group_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QSG_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question_group', $additional_hidden_fields);
-		}else{
+		} else {
 			$questionGroup = EEM_Question_Group::instance()->create_default_object();
 			$questionGroup->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question_group');
 		}
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['all_questions']=$questionGroup->questions_in_and_not_in_group();
-		$this->_template_args['QSG_ID']=$ID ? $ID : TRUE;
-		$this->_template_args['question_group']=$questionGroup;
+		$this->_template_args['all_questions'] = $questionGroup->questions_in_and_not_in_group();
+		$this->_template_args['QSG_ID'] = $ID ? $ID : TRUE;
+		$this->_template_args['question_group'] = $questionGroup;
 
-		$redirect_URL = add_query_arg( array( 'action' => 'question_groups'), $this->_admin_base_url );
-		$this->_set_publish_post_box_vars( 'id', $ID, FALSE, $redirect_URL  );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'question_groups_main_meta_box.template.php', $this->_template_args, TRUE );
+		$redirect_URL = add_query_arg(array('action' => 'question_groups'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $ID, FALSE, $redirect_URL);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH.'question_groups_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -521,87 +521,87 @@ 
 
 	protected function _delete_question_groups() {
 		$success = $this->_delete_items($this->_question_group_model);
-		$this->_redirect_after_action( $success, $this->_question_group_model->item_name($success), 'deleted permanently', array( 'action'=>'question_groups', 'status'=>'trash' ));
+		$this->_redirect_after_action($success, $this->_question_group_model->item_name($success), 'deleted permanently', array('action'=>'question_groups', 'status'=>'trash'));
 	}
 
 
 
-	protected function _insert_or_update_question_group( $new_question_group = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_group_model);
-		if ( $new_question_group ){
+	protected function _insert_or_update_question_group($new_question_group = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_group_model);
+		if ($new_question_group) {
 			$QSG_ID = $this->_question_group_model->insert($set_column_values);
 			$success = $QSG_ID ? 1 : 0;
 		} else {
 			$QSG_ID = absint($this->_req_data['QSG_ID']);
-			unset( $set_column_values[ 'QSG_ID' ] );
-			$success= $this->_question_group_model->update( $set_column_values, array( array( 'QSG_ID' => $QSG_ID )));
+			unset($set_column_values['QSG_ID']);
+			$success = $this->_question_group_model->update($set_column_values, array(array('QSG_ID' => $QSG_ID)));
 		}
 		// 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'][ EEM_Attendee::phone_question_id ] )) {
+		if (isset($this->_req_data['questions'], $this->_req_data['questions'][EEM_Attendee::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' => EEM_Attendee::phone_question_id, 'QSG_ID' => array( '!=', $QSG_ID ))));
+			EEM_Question_Group_Question::instance()->delete(array(array('QST_ID' => EEM_Attendee::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[ EEM_Attendee::phone_question_id ] )) {
-			$questions[ EEM_Attendee::phone_question_id ] = EEM_Question::instance()->get_one_by_ID( EEM_Attendee::phone_question_id );
+		if ( ! isset($questions[EEM_Attendee::phone_question_id])) {
+			$questions[EEM_Attendee::phone_question_id] = EEM_Question::instance()->get_one_by_ID(EEM_Attendee::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)
-				if ( ! ( $question->is_system_question() && $question_group->system_group() === EEM_Question_Group::system_personal )) {
-					$question_group->remove_question( $question_ID );
+				if ( ! ($question->is_system_question() && $question_group->system_group() === EEM_Question_Group::system_personal)) {
+					$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);
 
 	}
 
 
 
 	protected function _trash_or_restore_question_groups($trash = TRUE) {
-		return $this->_trash_or_restore_items( $this->_question_group_model, $trash );
+		return $this->_trash_or_restore_items($this->_question_group_model, $trash);
 	}
 
-	protected function _trash_question(){
-		$success=$this->_question_model->delete_by_ID(intval($this->_req_data['QST_ID']));
-		$query_args=array('action'=>'default','status'=>'all');
+	protected function _trash_question() {
+		$success = $this->_question_model->delete_by_ID(intval($this->_req_data['QST_ID']));
+		$query_args = array('action'=>'default', 'status'=>'all');
 		$this->_redirect_after_action($success, $this->_question_model->item_name($success), 'trashed', $query_args);
 	}
 
 
 
-	protected function _trash_or_restore_questions($trash=TRUE){
-		$this->_trash_or_restore_items( $this->_question_model, $trash );
+	protected function _trash_or_restore_questions($trash = TRUE) {
+		$this->_trash_or_restore_items($this->_question_model, $trash);
 	}
 
 
@@ -612,21 +612,21 @@ 
 	 * @param EEM_Base $model
 	 * @param boolean $trash wehter to trash or restore
 	 */
-	private function _trash_or_restore_items( EEM_Base $model, $trash = TRUE ) {
+	private function _trash_or_restore_items(EEM_Base $model, $trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success = 1;
 		//Checkboxes
 		//echo "trash $trash";
 		//var_dump($this->_req_data['checkbox']);die;
-		if ( isset( $this->_req_data['checkbox'] )) {
-			if ( isset( $this->_req_data['checkbox'] ) && ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if (isset($this->_req_data['checkbox'])) {
+			if (isset($this->_req_data['checkbox']) && ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 				// if array has more than one element than success message should be plural
-				$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+				$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 				// cycle thru bulk action checkboxes
-				while (list( $ID, $value ) = each($this->_req_data['checkbox'])) {
-					if ( ! $model->delete_or_restore_by_ID($trash,absint($ID))) {
+				while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+					if ( ! $model->delete_or_restore_by_ID($trash, absint($ID))) {
 						$success = 0;
 					}
 				}
@@ -634,7 +634,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;
 				}
 			}
@@ -642,53 +642,53 @@ 
 		} else {
 			// delete via trash link
 			// grab single id and delete
-			$ID = absint($this->_req_data[ $model->primary_key_name() ]);
-			if ( ! $model->delete_or_restore_by_ID($trash,$ID)) {
+			$ID = absint($this->_req_data[$model->primary_key_name()]);
+			if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
 				$success = 0;
 			}
 
 		}
 
 
-		$action = $model instanceof EEM_Question ? 'default' : 'question_groups';//strtolower( $model->item_name(2) );
+		$action = $model instanceof EEM_Question ? 'default' : 'question_groups'; //strtolower( $model->item_name(2) );
 		//echo "action :$action";
 		//$action = 'questions' ? 'default' : $action;
-		if($trash){
+		if ($trash) {
 			$action_desc = 'trashed';
 			$status = 'trash';
-		}else{
+		} else {
 			$action_desc = 'restored';
 			$status = 'all';
 		}
-		$this->_redirect_after_action( $success, $model->item_name($success), $action_desc, array( 'action' => $action, 'status'=>$status ) );
+		$this->_redirect_after_action($success, $model->item_name($success), $action_desc, array('action' => $action, 'status'=>$status));
 	}
 
 
 
 
-	public function get_trashed_questions( $per_page,$current_page = 1, $count = FALSE ) {
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
 		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
 
-		if( $count ){
+		if ($count) {
 			//note: this a subclass of EEM_Soft_Delete_Base, so thsi is actually only getting nontrashed 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 thsi is actually only getting nontrashed items
-			$results=$this->_question_model->get_all_deleted($query_params);
+			$results = $this->_question_model->get_all_deleted($query_params);
 		}
 		return $results;
 	}
 
 
 
-	public function get_question_groups( $per_page,$current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $questionGroupModel->count($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all($query_params);
 		}
 		return $results;
@@ -696,14 +696,14 @@ 
 
 
 
-	public function get_trashed_question_groups( $per_page,$current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if($count){
-			$where = isset( $query_params[0] ) ? array($query_params[0]) : array();
+	public function get_trashed_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$query_params['limit'] = NULL;
 			$results = $questionGroupModel->count_deleted($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all_deleted($query_params);
 		}
 		return $results;
@@ -716,22 +716,22 @@ 
 	 */
 	public function update_question_group_order() {
 
-		$success = __( 'Question group order was updated successfully.', 'event_espresso' );
+		$success = __('Question group order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] ) ? explode( ',', rtrim( $this->_req_data['row_ids'], ',' )) : FALSE;
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids']) ? explode(',', rtrim($this->_req_data['row_ids'], ',')) : FALSE;
 
-		$perpage = !empty( $this->_req_data['perpage'] ) ? (int) $this->_req_data['perpage'] : NULL;
-		$curpage = !empty( $this->_req_data['curpage'] ) ? (int) $this->_req_data['curpage'] : NULL;
+		$perpage = ! empty($this->_req_data['perpage']) ? (int) $this->_req_data['perpage'] : NULL;
+		$curpage = ! empty($this->_req_data['curpage']) ? (int) $this->_req_data['curpage'] : NULL;
 
-		if ( is_array( $row_ids )) {
+		if (is_array($row_ids)) {
 			//figure out where we start the row_id count at for the current page.
-			$qsgcount = empty( $curpage ) ? 0 : ($curpage - 1 ) * $perpage;
+			$qsgcount = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
 
 			global $wpdb;
-			for ( $i = 0; $i < count($row_ids); $i++ ) {
+			for ($i = 0; $i < count($row_ids); $i++) {
 				//Update the questions when re-ordering
-				if ( EEM_Question_Group::instance()->update ( array( 'QSG_order' => $qsgcount ), array(array( 'QSG_ID' => $row_ids[$i] ))) === FALSE ) {
+				if (EEM_Question_Group::instance()->update(array('QSG_order' => $qsgcount), array(array('QSG_ID' => $row_ids[$i]))) === FALSE) {
 					$success = FALSE;
 				}
 				$qsgcount++;
@@ -740,9 +740,9 @@ 
 			$success = FALSE;
 		}
 
-		$errors = ! $success ? __( 'An error occurred. The question group order was not updated.', 'event_espresso' ) : FALSE;
+		$errors = ! $success ? __('An error occurred. The question group order was not updated.', 'event_espresso') : FALSE;
 
-		echo json_encode( array( 'return_data' => FALSE, 'success' => $success, 'errors' => $errors ));
+		echo json_encode(array('return_data' => FALSE, 'success' => $success, 'errors' => $errors));
 		die();
 
 	}
@@ -759,10 +759,10 @@ 
 
 	protected function _reg_form_settings() {
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args = apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args', $this->_template_args );
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'reg_form_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args = apply_filters('FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args', $this->_template_args);
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH.'reg_form_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -770,9 +770,9 @@ 
 
 
 	protected function _update_reg_form_settings() {
-		EE_Registry::instance()->CFG->registration = apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', EE_Registry::instance()->CFG->registration );
-		$success = $this->_update_espresso_configuration( __('Registration Form Options', 'event_espresso'), EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, __('Registration Form Options', 'event_espresso'), 'updated', array( 'action' => 'view_reg_form_settings' ) );
+		EE_Registry::instance()->CFG->registration = apply_filters('FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', EE_Registry::instance()->CFG->registration);
+		$success = $this->_update_espresso_configuration(__('Registration Form Options', 'event_espresso'), EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, __('Registration Form Options', 'event_espresso'), 'updated', array('action' => 'view_reg_form_settings'));
 	}
 
 }

Braces +10 added lines, -9 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -468,12 +469,12 @@ 
 				}
 			}
 
-		}elseif( !empty($this->_req_data['QSG_ID'])){
+		} elseif( !empty($this->_req_data['QSG_ID'])){
 			$success = $model->delete_permanently_by_ID($this->_req_data['QSG_ID']);
 
-		}elseif( !empty($this->_req_data['QST_ID'])){
+		} elseif( !empty($this->_req_data['QST_ID'])){
 			$success = $model->delete_permanently_by_ID($this->_req_data['QST_ID']);
-		}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;
@@ -498,7 +499,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{
 			$questionGroup = EEM_Question_Group::instance()->create_default_object();
 			$questionGroup->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question_group');
@@ -656,7 +657,7 @@ 
 		if($trash){
 			$action_desc = 'trashed';
 			$status = 'trash';
-		}else{
+		} else{
 			$action_desc = 'restored';
 			$status = 'all';
 		}
@@ -673,7 +674,7 @@ 
 			//note: this a subclass of EEM_Soft_Delete_Base, so thsi is actually only getting nontrashed 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 thsi is actually only getting nontrashed items
 			$results=$this->_question_model->get_all_deleted($query_params);
 		}
@@ -688,7 +689,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;
@@ -703,7 +704,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;

caffeinated/admin/extend/registration_form/Extend_Registration_Form_Questions_Admin_List_Table.class.php

Spacing +18 added lines, -18 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,15 +31,15 @@ 
 
 class Extend_Registration_Form_Questions_Admin_List_Table extends Registration_Form_Questions_Admin_List_Table {
 
-	public function __construct( $admin_page ) {
-		parent::__construct( $admin_page );
+	public function __construct($admin_page) {
+		parent::__construct($admin_page);
 	}
 
 	public function column_display_text(EE_Question $item) {
 		$system_question = $item->is_system_question();
 		$actions = array();
 
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$edit_query_args = array(
@@ -63,31 +63,31 @@ 
 			);
 
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
-		$trash_link = EE_Admin_Page::add_query_args_and_nonce( $trash_query_args, EE_FORMS_ADMIN_URL );
-		$restore_link = EE_Admin_Page::add_query_args_and_nonce( $restore_query_args, EE_FORMS_ADMIN_URL );
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_FORMS_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID())) {
 			$actions = array(
-				'edit' => '<a href="' . $edit_link . '" title="' . __('Edit Question', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+				'edit' => '<a href="'.$edit_link.'" title="'.__('Edit Question', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
 			);
 		}
 
-		if ( ! $system_question && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question', 'espresso_registration_form_trash_question', $item->ID() ) ) {
-			$actions['delete'] = '<a href="' . $trash_link . '" title="' . __('Trash Question', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ( ! $system_question && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can('ee_delete_question', 'espresso_registration_form_trash_question', $item->ID())) {
+			$actions['delete'] = '<a href="'.$trash_link.'" title="'.__('Trash Question', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 		}
 
-		if ( $this->_view == 'trash' ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question', 'espresso_registration_form_restore_question', $item->ID() ) ) {
-				$actions['restore'] = '<a href="' . $restore_link . '" title="' . __('Restore Question', 'event_espresso') . '">' . __('Restore', 'event_espresso') . '</a>';
+		if ($this->_view == 'trash') {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question', 'espresso_registration_form_restore_question', $item->ID())) {
+				$actions['restore'] = '<a href="'.$restore_link.'" title="'.__('Restore Question', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
-			if ( $item->count_related('Answer') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question', 'espresso_registration_form_delete_questions', $item->ID() ) ) {
-				$actions['delete_permanently'] = '<a href="' . $delete_link . '" title="' . __('Delete Question Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+			if ($item->count_related('Answer') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_question', 'espresso_registration_form_delete_questions', $item->ID())) {
+				$actions['delete_permanently'] = '<a href="'.$delete_link.'" title="'.__('Delete Question Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		$content = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>' : $item->display_text();
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->display_text().'</a></strong>' : $item->display_text();
 		$content .= $this->row_actions($actions);
 		return $content;
 	}

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -125,8 +126,9 @@ 
 		$actions = array();
 
 		//return $item->name();
-		if ( !defined('REG_ADMIN_URL') )
-			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		if ( !defined('REG_ADMIN_URL') ) {
+					define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
 
 		$edit_query_args = array(
 				'action' => 'edit_question_group',

caffeinated/admin/extend/registration_form/Registration_Form_Question_Groups_Admin_List_Table.class.php

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -125,8 +126,9 @@ 
 		$actions = array();
 
 		//return $item->name();
-		if ( !defined('REG_ADMIN_URL') )
-			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		if ( !defined('REG_ADMIN_URL') ) {
+					define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
 
 		$edit_query_args = array(
 				'action' => 'edit_question_group',

Spacing +30 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,7 +31,7 @@ 
 class Registration_Form_Question_Groups_Admin_List_Table extends EE_Admin_List_Table {
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -39,8 +39,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, FALSE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, FALSE );
-		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, FALSE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, FALSE);
+		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 	}
 
 
@@ -49,8 +49,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('question group', 'event_espresso' ),
-			'plural' => __('question groups', 'event_espresso' ),
+			'singular' => __('question group', 'event_espresso'),
+			'plural' => __('question groups', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -65,8 +65,8 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'id' => array( 'QSG_ID' => FALSE ),
-			'name' => array( 'QSG_name' => FALSE )
+			'id' => array('QSG_ID' => FALSE),
+			'name' => array('QSG_name' => FALSE)
 			);
 
 		$this->_hidden_columns = array(
@@ -92,9 +92,9 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE );
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_group' ) ) {
-			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_views['all']['count'] = $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_group')) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		$system_group = $item->get('QSG_system');
 		$has_questions_with_answers = $item->has_questions_with_answers();
 		$lock_icon = $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-		return $system_group > 0 || ( $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_groups' ) ? '<span class="' . $lock_icon . '"></span>'  . sprintf( '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID() )  : sprintf( '<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
+		return $system_group > 0 || ($system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers) || ! EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_groups') ? '<span class="'.$lock_icon.'"></span>'.sprintf('<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID()) : sprintf('<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
 	}
 
 
@@ -117,7 +117,7 @@ 
 
 	public function column_id(EE_Question_Group $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' .$item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -127,7 +127,7 @@ 
 		$actions = array();
 
 		//return $item->name();
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$edit_query_args = array(
@@ -152,32 +152,32 @@ 
 
 
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
-		$trash_link = EE_Admin_Page::add_query_args_and_nonce( $trash_query_args, EE_FORMS_ADMIN_URL );
-		$restore_link = EE_Admin_Page::add_query_args_and_nonce( $restore_query_args, EE_FORMS_ADMIN_URL );
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_FORMS_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
 
-		if (  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID())) {
 			$actions = array(
-				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Question Group', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+				'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Question Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
 			);
 		}
-		if ( $item->get('QSG_system') < 1 && $this->_view != 'trash' &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID() ) ) {
-			$actions['delete'] = '<a href="' . $trash_link . '" title="' . esc_attr__('Delete Question Group', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->get('QSG_system') < 1 && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID())) {
+			$actions['delete'] = '<a href="'.$trash_link.'" title="'.esc_attr__('Delete Question Group', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 		}
 
-		if ( $this->_view == 'trash' ) {
+		if ($this->_view == 'trash') {
 
-			if (  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID() ) ) {
-				$actions['restore'] = '<a href="' . $restore_link . '" title="' . esc_attr__('Restore Question Group', 'event_espresso') . '">' . __('Restore', 'event_espresso') . '</a>';
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID())) {
+				$actions['restore'] = '<a href="'.$restore_link.'" title="'.esc_attr__('Restore Question Group', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
 
-			if ( !$item->has_questions_with_answers() &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID() ) ) {
-				$actions['delete_permanently'] = '<a href="' . $delete_link . '" title="' . esc_attr__('Delete Question Group Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+			if ( ! $item->has_questions_with_answers() && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID())) {
+				$actions['delete_permanently'] = '<a href="'.$delete_link.'" title="'.esc_attr__('Delete Question Group Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		$content =  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' : $item->name();
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>' : $item->name();
 		$content .= $this->row_actions($actions);
 		return $content;
 	}
@@ -198,13 +198,13 @@ 
 
 
 	public function column_show_group_name(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_name() ];
+		return $this->_yes_no[$item->show_group_name()];
 	}
 
 
 
 	public function column_show_group_desc(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_desc() ];
+		return $this->_yes_no[$item->show_group_desc()];
 	}
 
 

caffeinated/admin/extend/registration_form/espresso_events_Registration_Form_Hooks_Extend.class.php

Spacing +34 added lines, -34 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,7 +30,7 @@ 
 class espresso_events_Registration_Form_Hooks_Extend extends espresso_events_Registration_Form_Hooks {
 
 
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -54,31 +54,31 @@ 
 				)
 			);
 
-		$this->_metaboxes = array_merge( $this->_metaboxes, $new_metaboxes);
+		$this->_metaboxes = array_merge($this->_metaboxes, $new_metaboxes);
 	}
 
 
 
 
-	public function modify_callbacks( $callbacks ) {
-		$callbacks = parent::modify_callbacks( $callbacks );
-		$callbacks[] = array( $this, 'additional_question_group_update' );
+	public function modify_callbacks($callbacks) {
+		$callbacks = parent::modify_callbacks($callbacks);
+		$callbacks[] = array($this, 'additional_question_group_update');
 		return $callbacks;
 	}
 
 
 
-	public function restore_revision( $post_id, $revision_id ) {
-		$post_evt = parent::restore_revision( $post_id, $revision_id );
+	public function restore_revision($post_id, $revision_id) {
+		$post_evt = parent::restore_revision($post_id, $revision_id);
 
 		//restore revision for additional questions
-		$post_evt->restore_revision( $revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 0 ) ) );
+		$post_evt->restore_revision($revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 0)));
 	}
 
 
 
 
-	public function additional_questions( $post_id, $post ) {
+	public function additional_questions($post_id, $post) {
 		$this->_event = $this->_adminpage_obj->get_event_object();
 		$event_id = $this->_event->ID();
 		?>
@@ -95,25 +95,25 @@ 
 			<?php
 
 			$qsg_where['QSG_deleted'] = FALSE;
-			$query_params = array( $qsg_where, 'order_by' => array( 'QSG_order' => 'ASC' ) );
-			$QSGs = EEM_Question_Group::instance()->get_all( $query_params );
-			$EQGs = !empty( $event_id ) ? $this->_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0 )) ) : array();
+			$query_params = array($qsg_where, 'order_by' => array('QSG_order' => 'ASC'));
+			$QSGs = EEM_Question_Group::instance()->get_all($query_params);
+			$EQGs = ! empty($event_id) ? $this->_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0))) : array();
 			$EQGids = array_keys($EQGs);
 
-			if ( ! empty( $QSGs )) {
- 				$html = count( $QSGs ) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
-				foreach ( $QSGs as $QSG ) {
+			if ( ! empty($QSGs)) {
+ 				$html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
+				foreach ($QSGs as $QSG) {
 
-					$checked = in_array( $QSG->ID(), $EQGids ) ? ' checked="checked" ' : '';
-					$edit_link = $this->_adminpage_obj->add_query_args_and_nonce( array( 'action' => 'edit_question_group', 'QSG_ID' => $QSG->ID() ), EE_FORMS_ADMIN_URL );
+					$checked = in_array($QSG->ID(), $EQGids) ? ' checked="checked" ' : '';
+					$edit_link = $this->_adminpage_obj->add_query_args_and_nonce(array('action' => 'edit_question_group', 'QSG_ID' => $QSG->ID()), EE_FORMS_ADMIN_URL);
 
 					$html .= '
-					<p id="event-question-group-' . $QSG->ID() . '">
-						<input value="' . $QSG->ID() . '" type="checkbox" name="add_attendee_question_groups[' . $QSG->ID() . ']"' . $checked . ' />
-						<a href="' . $edit_link . '" title="' . sprintf( esc_attr__( 'Edit %s Group', 'event_espresso' ),  $QSG->get('QSG_name') ) . '" target="_blank">' . $QSG->get('QSG_name') . '</a>
+					<p id="event-question-group-' . $QSG->ID().'">
+						<input value="' . $QSG->ID().'" type="checkbox" name="add_attendee_question_groups['.$QSG->ID().']"'.$checked.' />
+						<a href="' . $edit_link.'" title="'.sprintf(esc_attr__('Edit %s Group', 'event_espresso'), $QSG->get('QSG_name')).'" target="_blank">'.$QSG->get('QSG_name').'</a>
 					</p>';
 				}
-				$html .= count( $QSGs ) > 10 ? '</div>' : '';
+				$html .= count($QSGs) > 10 ? '</div>' : '';
 
 				echo $html;
 
@@ -129,31 +129,31 @@ 
 
 
 
-	public function additional_question_group_update( $evtobj, $data ) {
-		$question_groups = !empty( $data['add_attendee_question_groups'] ) ? (array) $data['add_attendee_question_groups'] : array();
+	public function additional_question_group_update($evtobj, $data) {
+		$question_groups = ! empty($data['add_attendee_question_groups']) ? (array) $data['add_attendee_question_groups'] : array();
 		$added_qgs = array_keys($question_groups);
 		$success = array();
 
 		//let's get all current question groups associated with this event.
-		$current_qgs = $evtobj->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0) ) );
+		$current_qgs = $evtobj->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0)));
 		$current_qgs = array_keys($current_qgs); //we just want the ids
 
 		//now let's get the groups selected in the editor and update (IF we have data)
-		if ( !empty( $question_groups ) ) {
-			foreach ( $question_groups as $id => $val ) {
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $id => $val) {
 				//add to event
-				if ( $val )
-					$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 0) );
-				$success[] = !empty($qg) ? 1 : 0;
+				if ($val)
+					$qg = $evtobj->_add_relation_to($id, 'Question_Group', array('EQG_primary' => 0));
+				$success[] = ! empty($qg) ? 1 : 0;
 			}
 		}
 
 		//wait a minute... are there question groups missing in the saved groups that ARE with the current event?
-		$removed_qgs = array_diff( $current_qgs, $added_qgs );
+		$removed_qgs = array_diff($current_qgs, $added_qgs);
 
-		foreach ( $removed_qgs as $qgid ) {
-			$qg = $evtobj->_remove_relation_to( $qgid, 'Question_Group', array('EQG_primary' => 0 ) );
-			$success[] = !empty($qg) ? 1 : 0;
+		foreach ($removed_qgs as $qgid) {
+			$qg = $evtobj->_remove_relation_to($qgid, 'Question_Group', array('EQG_primary' => 0));
+			$success[] = ! empty($qg) ? 1 : 0;
 		}
 
 

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -142,8 +143,9 @@ 
 		if ( !empty( $question_groups ) ) {
 			foreach ( $question_groups as $id => $val ) {
 				//add to event
-				if ( $val )
-					$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 0) );
+				if ( $val ) {
+									$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 0) );
+				}
 				$success[] = !empty($qg) ? 1 : 0;
 			}
 		}

caffeinated/admin/extend/registration_form/help_tours/Registration_Form_Questions_Overview_Help_Tour.class.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -116,42 +116,42 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Questions Overview', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 
 		return $content;
 	}
 
 	protected function _display_text_stop() {
-		return '<p>' . __('View available questions. You can reorder your questions by dragging and dropping them.', 'event_espresso') . '</p>';
+		return '<p>'.__('View available questions. You can reorder your questions by dragging and dropping them.', 'event_espresso').'</p>';
 	}
 
 	protected function _admin_label_stop() {
-		return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the admin label for your questions.', 'event_espresso').'</p>';
 	}
 
 	protected function _type_stop() {
-		return '<p>' . __('View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso').'</p>';
 	}
 
 	protected function _values_stop() {
-		return '<p>' . __('View stored values for checkboxes, radio buttons, and select boxes.', 'event_espresso') . '</p>';
+		return '<p>'.__('View stored values for checkboxes, radio buttons, and select boxes.', 'event_espresso').'</p>';
 	}
 
 	protected function _required_stop() {
-		return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
+		return '<p>'.__('View if a question is required.', 'event_espresso').'</p>';
 	}
 
 	protected function _bulk_actions_stop() {
-		return '<p>' . __('Perform bulk actions to multiple questions.', 'event_espresso') . '</p>';
+		return '<p>'.__('Perform bulk actions to multiple questions.', 'event_espresso').'</p>';
 	}
 
 	protected function _search_stop() {
-		return '<p>' . __('Search through questions. The following sources will be searched: Name of Question (display text).', 'event_espresso') . '</p>';
+		return '<p>'.__('Search through questions. The following sources will be searched: Name of Question (display text).', 'event_espresso').'</p>';
 	}
 
 	protected function _add_new_question_stop() {
-		return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
+		return '<p>'.__('Click here to add a new question.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

caffeinated/admin/extend/registration_form/templates/question_groups_main_meta_box.template.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
                     <?php
 					$question_order = 0;
 					$question_group_questions = $question_group->questions();
-                    foreach( $all_questions as $question_ID => $question ){
+					foreach( $all_questions as $question_ID => $question ){
 						if ( $question instanceof EE_Question ) {
 							/*@var $question EE_Question*/
 							$checked = isset( $question_group_questions[ $question_ID ] ) ? ' checked="checked"' : '';

Spacing +25 added lines, -25 removed lines

@@ -9,8 +9,8 @@ 
 assert($question_group);
 assert($question_group instanceof EE_Question_Group);
 /* @var EE_Question[] $all_questions */
-assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));//list of unused questions
-foreach($all_questions as $unused_question){
+assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions))); //list of unused questions
+foreach ($all_questions as $unused_question) {
 	assert($unused_question);
 	assert($unused_question instanceof EE_Question);
 }
@@ -19,8 +19,8 @@ 
 
 $QSG_system = $question_group->system_group();
 
-$disabled = ! empty( $QSG_system ) ? ' disabled="disabled"' : '';
-$id =  ! empty( $QST_system ) ? '_disabled' : '';
+$disabled = ! empty($QSG_system) ? ' disabled="disabled"' : '';
+$id = ! empty($QST_system) ? '_disabled' : '';
 ?>
 
 <div id="group-details" class="edit-group padding">
@@ -30,7 +30,7 @@ 
 			<tr>
 				<th>
 					<label for="QSG_name">
-						<?php _e('Group Name','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_name_info');?>
+						<?php _e('Group Name', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_name_info'); ?>
 					</label>
 				</th>
 				<td>
@@ -42,14 +42,14 @@ 
 			<tr>
 				<th>
 					<label for="QSG_identifier">
-						<?php _e('Group Identifier','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_identifier_info');?>
+						<?php _e('Group Identifier', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_identifier_info'); ?>
 					</label>
 				</th>
 				<td>
 					<input id="QSG_identifier" name="QSG_identifier<?php echo $id; ?>" value="<?php echo $question_group->identifier()?>" type="text" class="regular-text"<?php echo $disabled; ?>>
-					<?php if ( ! empty( $QSG_system )) { ?>
+					<?php if ( ! empty($QSG_system)) { ?>
 					<p><span class="description" style="color:#D54E21;">
-							<?php _e('System question group! This field cannot be changed.','event_espresso')?>
+							<?php _e('System question group! This field cannot be changed.', 'event_espresso')?>
 					</span><br/></p>
 					<?php } ?>
 
@@ -58,7 +58,7 @@ 
 			<tr>
 				<th>
 					<label for="QSG_desc">
-						<?php _e('Description','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_description_info');?>
+						<?php _e('Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_description_info'); ?>
 					</label>
 				</th>
 				<td>
@@ -69,7 +69,7 @@ 
 			<tr>
 				<th>
 					<label for="QSG_order">
-						<?php _e('Question Group Order','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('group_order_info');?>
+						<?php _e('Question Group Order', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('group_order_info'); ?>
 					</label>
 				</th>
 				<td>
@@ -80,13 +80,13 @@ 
 			<tr>
 				<th>
 					<label>
-						<?php _e('Show Name','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('show_group_name_info');?>
+						<?php _e('Show Name', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('show_group_name_info'); ?>
 					</label>
 				</th>
 				<td>
 					<label for="QSG_show_group_name">
-                        <?php echo EEH_Form_Fields::select_input( 'QSG_show_group_name', $values, $question_group->show_group_name() ); ?>
-						<p class="description"><?php _e('Show Group Name on Registration Page?','event_espresso');?></p>
+                        <?php echo EEH_Form_Fields::select_input('QSG_show_group_name', $values, $question_group->show_group_name()); ?>
+						<p class="description"><?php _e('Show Group Name on Registration Page?', 'event_espresso'); ?></p>
 					</label>
 				</td>
 			</tr>
@@ -94,13 +94,13 @@ 
 			<tr>
 				<th>
 					<label>
-						<?php _e(' Show Description','event_espresso');?> <?php echo EEH_Template::get_help_tab_link('show_group_description_info');?>
+						<?php _e(' Show Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('show_group_description_info'); ?>
 					</label>
 				</th>
 				<td>
                     <label for="QSG_show_group_order">
-                        <?php echo EEH_Form_Fields::select_input( 'QSG_show_group_desc', $values, $question_group->show_group_desc() ); ?>
-                        <p class="description"><?php _e(' Show Group Description on Registration Page?','event_espresso');?></p>
+                        <?php echo EEH_Form_Fields::select_input('QSG_show_group_desc', $values, $question_group->show_group_desc()); ?>
+                        <p class="description"><?php _e(' Show Group Description on Registration Page?', 'event_espresso'); ?></p>
 					</label>
                     <input type="hidden" name="QSG_system" value="<?php echo $question_group->system_group(); ?>">
                 </td>
@@ -111,8 +111,8 @@ 
 </div>
 
 <div id="group-questions" class="edit-group padding question-group-questions-container postbox">
-    <div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'event_espresso' ); ?>"><br></div>
-    <h2 class="handle"><?php _e('Questions','event_espresso');?></h2>
+    <div class="handlediv" title="<?php esc_attr_e('Click to toggle', 'event_espresso'); ?>"><br></div>
+    <h2 class="handle"><?php _e('Questions', 'event_espresso'); ?></h2>
 	<div class="form-table question-group-questions inside">
         <div class="padding">
             <p><span class="description"><?php _e('Select which questions should be shown in this group by checking or unchecking boxes. You can drag and drop questions to reorder them. Your changes will be updated when you save.', 'event_espresso'); ?></span></p>
@@ -121,10 +121,10 @@ 
                     <?php
 					$question_order = 0;
 					$question_group_questions = $question_group->questions();
-                    foreach( $all_questions as $question_ID => $question ){
-						if ( $question instanceof EE_Question ) {
+                    foreach ($all_questions as $question_ID => $question) {
+						if ($question instanceof EE_Question) {
 							/*@var $question EE_Question*/
-							$checked = isset( $question_group_questions[ $question_ID ] ) ? ' checked="checked"' : '';
+							$checked = isset($question_group_questions[$question_ID]) ? ' checked="checked"' : '';
 							// disable questions from the personal information question group
 							$disabled = $question->is_system_question() && $QSG_system == EEM_Question_Group::system_personal ? ' disabled="disabled"' : '';
 							// make sure phone checkbox is enabled
@@ -134,14 +134,14 @@ 
 									$QSG_system === EEM_Question_Group::system_personal
 									&& $question->is_system_question()
 									&& (
-										empty( $checked )
+										empty($checked)
 										&& $question->ID() != EEM_Attendee::phone_question_id
 									)
 								)
 								||
 								(
 									$QSG_system == EEM_Question_Group::system_address
-									&& in_array( $question_ID, array( EEM_Attendee::fname_question_id, EEM_Attendee::lname_question_id, EEM_Attendee::email_question_id ))
+									&& in_array($question_ID, array(EEM_Attendee::fname_question_id, EEM_Attendee::lname_question_id, EEM_Attendee::email_question_id))
 								)
 								||
 								(
@@ -154,9 +154,9 @@ 
 						?>
                     <li class="ee-question-sortable">
                         <label for="question-<?php echo $question_ID?>">
-                            <input type="checkbox" name="questions[<?php echo $question_ID;?>]" id="question-<?php echo $question_ID; ?>" value="<?php echo $question_ID;?>"<?php echo $disabled; ?><?php echo $checked; ?>/>
+                            <input type="checkbox" name="questions[<?php echo $question_ID; ?>]" id="question-<?php echo $question_ID; ?>" value="<?php echo $question_ID; ?>"<?php echo $disabled; ?><?php echo $checked; ?>/>
                             <span class="question-text">
-								<?php echo trim( $question->display_text() ) . ( 95 <= strlen( trim( $question->display_text() ) ) ? "&hellip;" : '' ); ?>
+								<?php echo trim($question->display_text()).(95 <= strlen(trim($question->display_text())) ? "&hellip;" : ''); ?>
 							</span>
                             <input class="question-group-QGQ_order" type="hidden" name="question_orders[<?php echo $question_ID; ?>]" value="<?php echo $question_order; ?>">
                         </label>

caffeinated/admin/extend/registration_form/templates/questions_in_group_meta_box.template.php

Spacing +6 added lines, -6 removed lines

@@ -1,22 +1,22 @@
 <?php
 //required variables for template:
 assert($question_group instanceof EE_Question_Group);
-assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));//list of unused questions
-foreach($all_questions as $question_option){
+assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions))); //list of unused questions
+foreach ($all_questions as $question_option) {
 	assert($question_option);
 	assert($question_option instanceof EE_Question);
 }
 ?>
-<h4><?php _e('Check off all questions that you wish to appear in this group.','event_espresso');?></h4>
+<h4><?php _e('Check off all questions that you wish to appear in this group.', 'event_espresso'); ?></h4>
 <ul>
 	<?php 
-	foreach( $all_questions as $question_ID=>$question ){
+	foreach ($all_questions as $question_ID=>$question) {
 		/*@var $question EE_Question*/
-		$checked = array_key_exists( $question_ID, $question_group->questions() ) ? ' checked="checked"' : '';
+		$checked = array_key_exists($question_ID, $question_group->questions()) ? ' checked="checked"' : '';
 	?>
 	<li>
 		<label for="question-<?php echo $question_ID?>">
-			<input type="checkbox" name="questions[<?php echo $question_ID;?>]" id="question-<?php echo $question_ID;?>" value="<?php echo $question_ID;?>"<?php echo $checked;?>/>
+			<input type="checkbox" name="questions[<?php echo $question_ID; ?>]" id="question-<?php echo $question_ID; ?>" value="<?php echo $question_ID; ?>"<?php echo $checked; ?>/>
 			<?php echo $question->display_text()?>				
 		</label>
 	</li>

caffeinated/admin/extend/registration_form/templates/reg_form_settings.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <div class="padding">
-		<?php do_action( 'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template' ); ?>
+		<?php do_action('AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template'); ?>
 </div>

caffeinated/admin/extend/registrations/EE_Registration_CheckIn_List_Table.class.php

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -123,8 +125,9 @@ 
 		}
 
 		//if no reg id then get out cause need a reg id
-		if ( empty( $REG_ID ) || empty( $DTT_ID ) )
-			throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso') );
+		if ( empty( $REG_ID ) || empty( $DTT_ID ) ) {
+					throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso') );
+		}
 
 		//set orderby
 		$orderby = 'CHK_timestamp'; //note that with this table we're only providing the option to orderby the timestamp value.
@@ -147,8 +150,9 @@ 
 		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
 
 		//if no per_page value then we just want to return a count of all Check-ins
-		if ( $count )
-			return EEM_Checkin::instance()->count( array( $_where ) );
+		if ( $count ) {
+					return EEM_Checkin::instance()->count( array( $_where ) );
+		}
 
 		return $count ? EEM_Checkin::instance()->count( array( $_where ) ) : EEM_Checkin::instance()->get_all($query_params);
 	}

Spacing +28 added lines, -28 removed lines

@@ -28,7 +28,7 @@ 
 
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -36,8 +36,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_get_checkins( $this->_per_page );
-		$this->_all_data_count = $this->_get_checkins(  $this->_per_page, TRUE );
+		$this->_data = $this->_get_checkins($this->_per_page);
+		$this->_all_data_count = $this->_get_checkins($this->_per_page, TRUE);
 	}
 
 
@@ -58,7 +58,7 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'CHK_timestamp' => array( 'CHK_timestamp' => TRUE )
+			'CHK_timestamp' => array('CHK_timestamp' => TRUE)
 			);
 
 		$this->_primary_column = 'CHK_in';
@@ -82,25 +82,25 @@ 
 	}
 
 
-	function column_cb($item ) {
-		return sprintf( '<input type="checkbox" name="checkbox[%1$s]" />', $item->ID() );
+	function column_cb($item) {
+		return sprintf('<input type="checkbox" name="checkbox[%1$s]" />', $item->ID());
 	}
 
 
-	function column_CHK_in( EE_Checkin $item ) {
+	function column_CHK_in(EE_Checkin $item) {
 		$checkinstatus = $item->get('CHK_in');
 		$checkinstatus = $checkinstatus ? EE_Registration::checkin_status_in : EE_Registration::checkin_status_out;
-		return '<span class="checkin-icons checkedin-status-' . $checkinstatus . '"></span><span class="show-on-mobile-view-only">' . $item->get_datetime('CHK_timestamp') . '</span>';
+		return '<span class="checkin-icons checkedin-status-'.$checkinstatus.'"></span><span class="show-on-mobile-view-only">'.$item->get_datetime('CHK_timestamp').'</span>';
 	}
 
 
 
-	function column_CHK_timestamp( EE_Checkin $item ) {
+	function column_CHK_timestamp(EE_Checkin $item) {
 		$actions = array();
-		$delete_url = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'delete_checkin_row', 'DTT_ID' => $this->_req_data['DTT_ID'], '_REGID' => $this->_req_data['_REGID'], 'CHK_ID' => $item->ID() ) );
-		$actions['delete_checkin'] = EE_Registry::instance()->CAP->current_user_can( 'ee_delete_checkins', 'espresso_registrations_delete_checkin_row' ) ? '<a href="' . $delete_url . '" title="' . esc_attr__('Click here to delete this check-in record', 'event_espresso') . '">' . __('Delete', 'event_espresso') . '</a>' : '';
+		$delete_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'delete_checkin_row', 'DTT_ID' => $this->_req_data['DTT_ID'], '_REGID' => $this->_req_data['_REGID'], 'CHK_ID' => $item->ID()));
+		$actions['delete_checkin'] = EE_Registry::instance()->CAP->current_user_can('ee_delete_checkins', 'espresso_registrations_delete_checkin_row') ? '<a href="'.$delete_url.'" title="'.esc_attr__('Click here to delete this check-in record', 'event_espresso').'">'.__('Delete', 'event_espresso').'</a>' : '';
 
-		return sprintf( '%1$s %2$s', $item->get_datetime('CHK_timestamp'), $this->row_actions($actions) );
+		return sprintf('%1$s %2$s', $item->get_datetime('CHK_timestamp'), $this->row_actions($actions));
 	}
 
 
@@ -115,30 +115,30 @@ 
 	 * @param bool    $count        Whether to return a count or not
 	 * @return EE_Checkin[]|int
 	 */
-	protected function _get_checkins( $per_page = 10, $count = FALSE ) {
-		$REG_ID = isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : FALSE;
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : FALSE;
+	protected function _get_checkins($per_page = 10, $count = FALSE) {
+		$REG_ID = isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : FALSE;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : FALSE;
 
 		//if user does not have the capability for the checkins for this registration then get out!
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_checkin', 'espresso_registrations_registration_checkins', $REG_ID ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_checkin', 'espresso_registrations_registration_checkins', $REG_ID)) {
 			return $count ? 0 : array();
 		}
 
 		//if no reg id then get out cause need a reg id
-		if ( empty( $REG_ID ) || empty( $DTT_ID ) )
-			throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso') );
+		if (empty($REG_ID) || empty($DTT_ID))
+			throw new EE_Error(__('This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)', 'event_espresso'));
 
 		//set orderby
 		$orderby = 'CHK_timestamp'; //note that with this table we're only providing the option to orderby the timestamp value.
 
-		$order = !empty( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'ASC';
+		$order = ! empty($this->_req_data['order']) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 		$limit = NULL;
-		if ( !$count ) {
-			$offset = ($current_page-1)*$per_page;
-			$limit = array( $offset, $per_page );
+		if ( ! $count) {
+			$offset = ($current_page - 1) * $per_page;
+			$limit = array($offset, $per_page);
 		}
 
 		$_where = array(
@@ -146,13 +146,13 @@ 
 			'DTT_ID' => $DTT_ID
 			);
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
 		//if no per_page value then we just want to return a count of all Check-ins
-		if ( $count )
-			return EEM_Checkin::instance()->count( array( $_where ) );
+		if ($count)
+			return EEM_Checkin::instance()->count(array($_where));
 
-		return $count ? EEM_Checkin::instance()->count( array( $_where ) ) : EEM_Checkin::instance()->get_all($query_params);
+		return $count ? EEM_Checkin::instance()->count(array($_where)) : EEM_Checkin::instance()->get_all($query_params);
 	}
 
 } //end class EE_Registration_CheckIn_List_Table