eventespresso / event-espresso-core

admin_pages/payments/templates/payment_settings.template.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options ); ?>
+					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options); ?>
 
 				</td>
 			</tr>

admin_pages/registration_form/Registration_Form_Admin_Page.core.php

Indentation +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
 					),
 				'list_table' => 'Registration_Form_Questions_Admin_List_Table',
 				'metaboxes' => $this->_default_espresso_metaboxes,
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registration_form_questions_overview_help_tab' => array(
 						'title' => __('Questions Overview', 'event_espresso'),
 						'filename' => 'registration_form_questions_overview'
@@ -190,7 +190,7 @@ 
 						'filename' => 'registration_form_edit_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
+				'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			);

Spacing +135 added lines, -135 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -58,12 +58,12 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		require_once( EE_MODELS . 'EEM_Question.model.php' );
-		require_once( EE_MODELS . 'EEM_Question_Group.model.php' );
-		$this->_question_model=  EEM_Question::instance();
-		$this->_question_group_model=EEM_Question_Group::instance();
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		require_once(EE_MODELS.'EEM_Question.model.php');
+		require_once(EE_MODELS.'EEM_Question_Group.model.php');
+		$this->_question_model = EEM_Question::instance();
+		$this->_question_group_model = EEM_Question_Group::instance();
+		parent::__construct($routing);
 	}
 
 
@@ -97,7 +97,7 @@ 
 
 
 	protected function _set_page_routes() {
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
 		$this->_page_routes = array(
 			'default' => array(
 				'func' => '_questions_overview_list_table',
@@ -118,7 +118,7 @@ 
 
 			'update_question' => array(
 				'func' => '_insert_or_update_question',
-				'args' => array('new_question' => FALSE ),
+				'args' => array('new_question' => FALSE),
 				'capability' => 'ee_edit_question',
 				'obj_id' => $qst_id,
 				'noheader' => TRUE,
@@ -153,7 +153,7 @@ 
 						'filename' => 'registration_form_questions_overview_views_bulk_actions_search'
 						)
 					),
-				'help_tour' => array( 'Registration_Form_Questions_Overview_Help_Tour'),
+				'help_tour' => array('Registration_Form_Questions_Overview_Help_Tour'),
 				'require_nonce' => FALSE,
 				'qtips' => array(
 					'EE_Registration_Form_Tips'
@@ -172,7 +172,7 @@ 
 						'filename' => 'registration_form_question_groups'
 						),
 					),
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -181,16 +181,16 @@ 
 					'label' => __('Edit Question', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_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', 'event_espresso'),
 						'filename' => 'registration_form_edit_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			);
@@ -218,7 +218,7 @@ 
 	//none of the below group are currently used for Event Categories
 	protected function _add_feature_pointers() {}
 	public function load_scripts_styles() {
-		wp_register_style( 'espresso_registration', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_registration', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_registration');
 	}
 	public function admin_init() {}
@@ -234,20 +234,20 @@ 
 
 	public function load_scripts_styles_add_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 	public function load_scripts_styles_edit_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 
 
 
 
 	public function recaptcha_info_help_tab() {
-		$template = REGISTRATION_FORM_TEMPLATE_PATH . 'recaptcha_info_help_tab.template.php';
+		$template = REGISTRATION_FORM_TEMPLATE_PATH.'recaptcha_info_help_tab.template.php';
 		EEH_Template::display_template($template, array());
 	}
 
@@ -279,7 +279,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'),
@@ -297,9 +297,9 @@ 
 	 */
 	protected function _questions_groups_preview() {
 		$this->_admin_page_title = __('Question Groups (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . REGISTRATION_FORM_ASSETS_URL . 'caf_reg_form_preview.jpg" alt="' . esc_attr__( 'Preview Question Groups Overview List Table screenshot', 'event_espresso' ) . '" />';
-		$this->_template_args['preview_text'] = '<strong>'.__( 'Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso' ).'</strong>';
-		$this->display_admin_caf_preview_page( 'question_groups_tab' );
+		$this->_template_args['preview_img'] = '<img src="'.REGISTRATION_FORM_ASSETS_URL.'caf_reg_form_preview.jpg" alt="'.esc_attr__('Preview Question Groups Overview List Table screenshot', 'event_espresso').'" />';
+		$this->_template_args['preview_text'] = '<strong>'.__('Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso').'</strong>';
+		$this->display_admin_caf_preview_page('question_groups_tab');
 	}
 
 
@@ -308,41 +308,41 @@ 
 	 * Extracts the question field's values from the POST request to update or insert them
 	 * @return array where each key is the name of a model's field/db column, and each value is its value.
 	 */
-	protected function _set_column_values_for(EEM_Base $model){
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=array();
+	protected function _set_column_values_for(EEM_Base $model) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = array();
 
 		//some initial checks for proper values.
 		//if QST_admin_only, then no matter what QST_required is we disable.
-		if ( !empty( $this->_req_data['QST_admin_only'] ) ) {
+		if ( ! empty($this->_req_data['QST_admin_only'])) {
 			$this->_req_data['QST_required'] = 0;
 		}
-		foreach($model->field_settings() as $fieldName=>$settings){
+		foreach ($model->field_settings() as $fieldName=>$settings) {
 			// basically if QSG_identifier is empty or not set
-			if ( $fieldName == 'QSG_identifier' && ( isset( $this->_req_data['QSG_identifier'] ) && empty( $this->_req_data['QSG_identifier'] ) )) {
-				$QSG_name = isset( $this->_req_data['QSG_name'] ) ? $this->_req_data['QSG_name'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title($QSG_name ) . '-' . uniqid();
+			if ($fieldName == 'QSG_identifier' && (isset($this->_req_data['QSG_identifier']) && empty($this->_req_data['QSG_identifier']))) {
+				$QSG_name = isset($this->_req_data['QSG_name']) ? $this->_req_data['QSG_name'] : '';
+				$set_column_values[$fieldName] = sanitize_title($QSG_name).'-'.uniqid();
 //				dd($set_column_values);
 			}
 			//if the admin label is blank, use a slug version of the question text
-			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
-				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
+			else if ($fieldName == 'QST_admin_label' && (isset($this->_req_data['QST_admin_label']) && empty($this->_req_data['QST_admin_label']))) {
+				$QST_text = isset($this->_req_data['QST_display_text']) ? $this->_req_data['QST_display_text'] : '';
+				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text, 10));
 			}
 
 
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			else if ($fieldName == 'QST_admin_only' && ( ! isset($this->_req_data['QST_admin_only']))) {
 				$set_column_values[$fieldName] = 0;
 			}
 
 
 			//only add a property to the array if it's not null (otherwise the model should just use the default value)
-			else if(isset($this->_req_data[$fieldName])){
-				$set_column_values[$fieldName]=$this->_req_data[$fieldName];
+			else if (isset($this->_req_data[$fieldName])) {
+				$set_column_values[$fieldName] = $this->_req_data[$fieldName];
 			}
 
 		}
-		return $set_column_values;//validation fo this data to be performed by the model before insertion.
+		return $set_column_values; //validation fo this data to be performed by the model before insertion.
 	}
 
 
@@ -355,29 +355,29 @@ 
 
 
 
-	protected function _edit_question( $action= 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QST_ID'] ) && ! empty( $this->_req_data['QST_ID'] ) ? absint( $this->_req_data['QST_ID'] ) : FALSE;
+	protected function _edit_question($action = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QST_ID']) && ! empty($this->_req_data['QST_ID']) ? absint($this->_req_data['QST_ID']) : FALSE;
 
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add PRC_ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QST_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
-			$question= EE_Question::new_instance();
+		} else {
+			$question = EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
 		}
-		$question_types = $question->has_answers() ?  $this->_question_model->question_types_in_same_category( $question->type() ) : $this->_question_model->allowed_question_types();
-		$this->_template_args['QST_ID']=$ID;
-		$this->_template_args['question']=$question;
-		$this->_template_args['question_types']= $question_types;;
+		$question_types = $question->has_answers() ? $this->_question_model->question_types_in_same_category($question->type()) : $this->_question_model->allowed_question_types();
+		$this->_template_args['QST_ID'] = $ID;
+		$this->_template_args['question'] = $question;
+		$this->_template_args['question_types'] = $question_types; ;
 
-		$this->_set_publish_post_box_vars( 'id', $ID );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'questions_main_meta_box.template.php', $this->_template_args, TRUE );
+		$this->_set_publish_post_box_vars('id', $ID);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'questions_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -395,57 +395,57 @@ 
 
 
 	protected function _insert_or_update_question($new_question = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_model);
-		if($new_question){
-			$ID=$this->_question_model->insert($set_column_values);
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_model);
+		if ($new_question) {
+			$ID = $this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
-			$ID=absint($this->_req_data['QST_ID']);
-			$pk=$this->_question_model->primary_key_name();
-			$wheres=array($pk=>$ID);
+		} else {
+			$ID = absint($this->_req_data['QST_ID']);
+			$pk = $this->_question_model->primary_key_name();
+			$wheres = array($pk=>$ID);
 			unset($set_column_values[$pk]);
-			$success= $this->_question_model->update($set_column_values,array($wheres));
-			$action_desc='updated';
+			$success = $this->_question_model->update($set_column_values, array($wheres));
+			$action_desc = 'updated';
 		}
 
-		if ($ID){
+		if ($ID) {
 			//save the related options
 			//trash removed options, save old ones
 			//get list of all options
 			/** @type EE_Question $question */
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$options=$question->options();
-			if(! empty($options)){
-				foreach($options as $option_ID=>$option){
-					$option_req_index=$this->_get_option_req_data_index($option_ID);
-					if($option_req_index!==FALSE){
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$options = $question->options();
+			if ( ! empty($options)) {
+				foreach ($options as $option_ID=>$option) {
+					$option_req_index = $this->_get_option_req_data_index($option_ID);
+					if ($option_req_index !== FALSE) {
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else {
 						//not found, remove it
 						$option->delete();
 					}
 				}
 			}
 			//save new related options
-			foreach($this->_req_data['question_options'] as $index=>$option_req_data){
-				if( empty($option_req_data['QSO_ID'] ) && (  ( isset( $option_req_data['QSO_value'] ) && $option_req_data['QSO_value'] !== '' ) || ! empty( $option_req_data['QSO_desc'] ) ) ) {//no ID! save it!
-					if( ! isset( $option_req_data['QSO_value'] ) || $option_req_data['QSO_value'] === ''  ){
-						$option_req_data['QSO_value']=$option_req_data['QSO_desc'];
+			foreach ($this->_req_data['question_options'] as $index=>$option_req_data) {
+				if (empty($option_req_data['QSO_ID']) && ((isset($option_req_data['QSO_value']) && $option_req_data['QSO_value'] !== '') || ! empty($option_req_data['QSO_desc']))) {//no ID! save it!
+					if ( ! isset($option_req_data['QSO_value']) || $option_req_data['QSO_value'] === '') {
+						$option_req_data['QSO_value'] = $option_req_data['QSO_desc'];
 					}
-					$new_option=EE_Question_Option::new_instance( array( 'QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
+					$new_option = EE_Question_Option::new_instance(array('QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
 					$new_option->save();
 				}
 			}
 		}
-		$query_args = array( 'action' => 'edit_question', 'QST_ID' => $ID );
-		if ( $success !== FALSE ) {
-			$msg = $new_question ? sprintf( __('The %s has been created', 'event_espresso'), $this->_question_model->item_name() ) : sprintf( __('The %s has been updated', 'event_espresso' ), $this->_question_model->item_name() );
-			EE_Error::add_success( $msg );
+		$query_args = array('action' => 'edit_question', 'QST_ID' => $ID);
+		if ($success !== FALSE) {
+			$msg = $new_question ? sprintf(__('The %s has been created', 'event_espresso'), $this->_question_model->item_name()) : sprintf(__('The %s has been updated', 'event_espresso'), $this->_question_model->item_name());
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', $action_desc, $query_args, TRUE);
+		$this->_redirect_after_action(FALSE, '', $action_desc, $query_args, TRUE);
 	}
 
 
@@ -458,10 +458,10 @@ 
 	 * @param int $ID of the question option to find
 	 * @return int index in question_options array if successful, FALSE if unsuccessful
 	 */
-	protected function _get_option_req_data_index($ID){
-		$req_data_for_question_options=$this->_req_data['question_options'];
-		foreach($req_data_for_question_options as $num=>$option_data){
-			if(array_key_exists('QSO_ID',$option_data) && intval($option_data['QSO_ID'])==$ID){
+	protected function _get_option_req_data_index($ID) {
+		$req_data_for_question_options = $this->_req_data['question_options'];
+		foreach ($req_data_for_question_options as $num=>$option_data) {
+			if (array_key_exists('QSO_ID', $option_data) && intval($option_data['QSO_ID']) == $ID) {
 				return $num;
 			}
 		}
@@ -482,25 +482,25 @@ 
 	 * @param EEM_Base $model either EEM_Question or EEM_Question_Group
 	 * @return array lik EEM_Base::get_all's $query_params parameter
 	 */
-	protected function get_query_params($model, $per_page=10,$current_page=10){
+	protected function get_query_params($model, $per_page = 10, $current_page = 10) {
 		$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'] : 'ASC';
+		$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 ? 'QST_ID' : 'QSG_order';
 		$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 = array_key_exists('s',$this->_req_data) ? $this->_req_data['s'] : null;
-		if(! empty($search_string)){
-			if($model instanceof EEM_Question_Group){
-				$query_params[0]=array(
+		$query_params['order_by'] = array($field_to_order_by => $order);
+		$search_string = array_key_exists('s', $this->_req_data) ? $this->_req_data['s'] : null;
+		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%"))
 					);
-			}else{
-				$query_params[0]=array(
-					'QST_display_text'=>array('LIKE',"%$search_string%")
+			} else {
+				$query_params[0] = array(
+					'QST_display_text'=>array('LIKE', "%$search_string%")
 					);
 			}
 		}
@@ -542,13 +542,13 @@ 
 
 
 
-	public function get_questions( $per_page=10,$current_page = 1, $count = FALSE ) {
+	public function get_questions($per_page = 10, $current_page = 1, $count = FALSE) {
 		$QST = EEM_Question::instance();
 		$query_params = $this->get_query_params($QST, $per_page, $current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $QST->count($where);
-		}else{
+		} else {
 			$results = $QST->get_all($query_params);
 		}
 		return $results;
@@ -557,20 +557,20 @@ 
 
 
 
-	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);
-		$where = isset( $query_params[0] ) ? array($query_params[0]) : array();
-		$questions=$count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
+	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);
+		$where = isset($query_params[0]) ? array($query_params[0]) : array();
+		$questions = $count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
 		return $questions;
 	}
 
 
 
-	public function get_question_groups( $per_page,$current_page = 1, $count = FALSE ) {
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
 		/** @type EEM_Question_Group $questionGroupModel */
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params( $questionGroupModel, $per_page, $current_page );
-		$questionGroups=$questionGroupModel->get_all($query_params);//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		$questionGroups = $questionGroupModel->get_all($query_params); //note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
 		return $questionGroups;
 	}
 
@@ -587,36 +587,36 @@ 
 
 		$this->_template_args['values'] = $this->_yes_no_values;
 
-		$this->_template_args['use_captcha'] = isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
-		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"': '';
+		$this->_template_args['use_captcha'] = isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
+		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"' : '';
 
-		$this->_template_args['recaptcha_publickey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : '';
-		$this->_template_args['recaptcha_privatekey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : '';
-		$this->_template_args['recaptcha_width'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_width ) ? absint( EE_Registry::instance()->CFG->registration->recaptcha_width ) : 500;
+		$this->_template_args['recaptcha_publickey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : '';
+		$this->_template_args['recaptcha_privatekey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : '';
+		$this->_template_args['recaptcha_width'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_width) ? absint(EE_Registry::instance()->CFG->registration->recaptcha_width) : 500;
 
 		$this->_template_args['recaptcha_theme_options'] = array(
-				array('id'  => 'red','text'=> __('Red', 'event_espresso')),
-				array('id'  => 'white','text'=> __('White', 'event_espresso')),
-				array('id'  => 'blackglass','text'=> __('Blackglass', 'event_espresso')),
-				array('id'  => 'clean','text'=> __('Clean', 'event_espresso'))
+				array('id'  => 'red', 'text'=> __('Red', 'event_espresso')),
+				array('id'  => 'white', 'text'=> __('White', 'event_espresso')),
+				array('id'  => 'blackglass', 'text'=> __('Blackglass', 'event_espresso')),
+				array('id'  => 'clean', 'text'=> __('Clean', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_theme'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->get_pretty( 'recaptcha_theme' ) : 'clean';
+		$this->_template_args['recaptcha_theme'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->get_pretty('recaptcha_theme') : 'clean';
 
 		$this->_template_args['recaptcha_language_options'] = array(
-				array('id'  => 'en','text'=> __('English', 'event_espresso')),
-				array('id'  => 'es','text'=> __('Spanish', 'event_espresso')),
-				array('id'  => 'nl','text'=> __('Dutch', 'event_espresso')),
-				array('id'  => 'fr','text'=> __('French', 'event_espresso')),
-				array('id'  => 'de','text'=> __('German', 'event_espresso')),
-				array('id'  => 'pt','text'=> __('Portuguese', 'event_espresso')),
-				array('id'  => 'ru','text'=> __('Russian', 'event_espresso')),
-				array('id'  => 'tr','text'=> __('Turkish', 'event_espresso'))
+				array('id'  => 'en', 'text'=> __('English', 'event_espresso')),
+				array('id'  => 'es', 'text'=> __('Spanish', 'event_espresso')),
+				array('id'  => 'nl', 'text'=> __('Dutch', 'event_espresso')),
+				array('id'  => 'fr', 'text'=> __('French', 'event_espresso')),
+				array('id'  => 'de', 'text'=> __('German', 'event_espresso')),
+				array('id'  => 'pt', 'text'=> __('Portuguese', 'event_espresso')),
+				array('id'  => 'ru', 'text'=> __('Russian', 'event_espresso')),
+				array('id'  => 'tr', 'text'=> __('Turkish', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_language'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
+		$this->_template_args['recaptcha_language'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
 
-		$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_TEMPLATE_PATH . 'reg_form_settings.template.php', $this->_template_args, TRUE );
+		$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_TEMPLATE_PATH.'reg_form_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 

Braces +8 added lines, -10 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
@@ -328,10 +329,7 @@ 
 			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
 				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
 				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
-			}
-
-
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			} else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
 				$set_column_values[$fieldName] = 0;
 			}
 
@@ -366,7 +364,7 @@ 
 			$question=$this->_question_model->get_one_by_ID($ID);
 			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
+		} else{
 			$question= EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
@@ -401,7 +399,7 @@ 
 			$ID=$this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
+		} else{
 			$ID=absint($this->_req_data['QST_ID']);
 			$pk=$this->_question_model->primary_key_name();
 			$wheres=array($pk=>$ID);
@@ -422,7 +420,7 @@ 
 					$option_req_index=$this->_get_option_req_data_index($option_ID);
 					if($option_req_index!==FALSE){
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else{
 						//not found, remove it
 						$option->delete();
 					}
@@ -498,7 +496,7 @@ 
 						'QSG_name'=>array('LIKE',"%$search_string%"),
 						'QSG_desc'=>array('LIKE',"%$search_string%"))
 					);
-			}else{
+			} else{
 				$query_params[0]=array(
 					'QST_display_text'=>array('LIKE',"%$search_string%")
 					);
@@ -548,7 +546,7 @@ 
 		if ($count){
 			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
 			$results = $QST->count($where);
-		}else{
+		} else{
 			$results = $QST->get_all($query_params);
 		}
 		return $results;

admin_pages/registration_form/Registration_Form_Admin_Page_Init.core.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -33,16 +33,16 @@ 
 
 	public function __construct() {
 		//define some constants
-		define( 'REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form' );
-		define( 'REGISTRATION_FORM_LABEL', __('Registration Form', 'event_espresso'));
-		define( 'REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL );
-		define( 'REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES . 'registration_form' . DS );
-		define( 'REGISTRATION_FORM_ADMIN_URL', admin_url( 'admin.php?page=' . REGISTRATION_FORM_PG_SLUG ));
-		define( 'EE_FORMS_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG ));
-		define( 'REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN . 'assets' . DS );
-		define( 'REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registration_form/assets/' );
-		define( 'REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN . 'templates' . DS );
-		define( 'REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registration_form/templates/' );
+		define('REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form');
+		define('REGISTRATION_FORM_LABEL', __('Registration Form', 'event_espresso'));
+		define('REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL);
+		define('REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES.'registration_form'.DS);
+		define('REGISTRATION_FORM_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG));
+		define('EE_FORMS_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG));
+		define('REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN.'assets'.DS);
+		define('REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL.'registration_form/assets/');
+		define('REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN.'templates'.DS);
+		define('REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'registration_form/templates/');
 		parent::__construct();
 	}
 
@@ -53,7 +53,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 30,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

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');
+}
 
 /**
  *

admin_pages/registration_form/Registration_Form_Questions_Admin_List_Table.class.php

Braces +7 added lines, -5 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
@@ -42,7 +43,7 @@ 
 	protected function _setup_data() {
 		if(isset($this->_req_data['status'] ) && $this->_req_data['status'] == 'trash'){
 			$this->_data = $this->_admin_page->get_trashed_questions( $this->_per_page,$this->_current_page, FALSE );
-		}else{
+		} else{
 			$this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE );
 		}
 		$this->_all_data_count = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE );
@@ -117,8 +118,9 @@ 
 	public function column_display_text(EE_Question $item) {
 		$system_question = $item->is_system_question();
 
-		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',
@@ -152,7 +154,7 @@ 
 		$options= $item->options();
 		if(empty($options)){
 			return "N/A";
-		}else{
+		} else{
 			foreach($options as $optionID=>$option){
 				/* @var $option EE_Question_Option */
 				$optionNames[]=$option->value();

Spacing +28 added lines, -28 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -32,7 +32,7 @@ 
 class Registration_Form_Questions_Admin_List_Table extends EE_Admin_List_Table {
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -40,12 +40,12 @@ 
 
 
 	protected function _setup_data() {
-		if(isset($this->_req_data['status'] ) && $this->_req_data['status'] == 'trash'){
-			$this->_data = $this->_admin_page->get_trashed_questions( $this->_per_page,$this->_current_page, FALSE );
-		}else{
-			$this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE );
+		if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
+			$this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, FALSE);
+		} else {
+			$this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, FALSE);
 		}
-		$this->_all_data_count = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE );
+		$this->_all_data_count = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, TRUE);
 	}
 
 
@@ -54,8 +54,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('question', 'event_espresso' ),
-			'plural' => __('questions', 'event_espresso' ),
+			'singular' => __('question', 'event_espresso'),
+			'plural' => __('questions', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -71,8 +71,8 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'id' => array( 'QST_ID' => FALSE ),
-			'display_text' => array( 'QST_display_text' => FALSE )
+			'id' => array('QST_ID' => FALSE),
+			'display_text' => array('QST_display_text' => FALSE)
 			);
 
 		$this->_hidden_columns = array(
@@ -90,8 +90,8 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE );
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_questions', 'espresso_registration_form_trash_question' ) ) {
+		$this->_views['all']['count'] = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, TRUE);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_question')) {
 			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_questions( -1, $this->_current_page, TRUE);
 		}
 	}
@@ -101,8 +101,8 @@ 
 	public function column_cb($item) {
 		$system_question = $item->is_system_question();
 		$related_answer_count = $item->count_related('Answer');
-		$lock_icon = ( !$system_question && $related_answer_count > 0 && $this->_view == 'trash' ) ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-		return $system_question || (!$system_question && $related_answer_count > 0 && $this->_view == 'trash' ) ? '<span class="' . $lock_icon . '"></span>' . sprintf( '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID() )  : sprintf( '<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
+		$lock_icon = ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash') ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
+		return $system_question || ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash') ? '<span class="'.$lock_icon.'"></span>'.sprintf('<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID()) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
 	}
 
 
@@ -110,7 +110,7 @@ 
 
 	public function column_id(EE_Question $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->display_text().'</span>';
 		return $content;
 	}
 
@@ -119,7 +119,7 @@ 
 	public function column_display_text(EE_Question $item) {
 		$system_question = $item->is_system_question();
 
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$edit_query_args = array(
@@ -127,16 +127,16 @@ 
 				'QST_ID' => $item->ID()
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ) {
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID())) {
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
 
 			$actions = array(
-				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+				'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', '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;
 	}
@@ -150,16 +150,16 @@ 
 
 
 	public function column_values(EE_Question $item) {
-		$optionNames=array();
-		$options= $item->options();
-		if(empty($options)){
+		$optionNames = array();
+		$options = $item->options();
+		if (empty($options)) {
 			return "N/A";
-		}else{
-			foreach($options as $optionID=>$option){
+		} else {
+			foreach ($options as $optionID=>$option) {
 				/* @var $option EE_Question_Option */
-				$optionNames[]=$option->value();
+				$optionNames[] = $option->value();
 			}
-			return implode(', ',$optionNames);
+			return implode(', ', $optionNames);
 		}
 	}
 

admin_pages/registration_form/espresso_events_Registration_Form_Hooks.class.php

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -35,7 +35,7 @@ 
 
 
 
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -46,7 +46,7 @@ 
 		$this->_name = 'registration_form';
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array( 'edit', 'create_new' ),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'primary_questions',
 				'label' => __('Questions for Primary Registrant', 'event_espresso'),
 				'priority' => 'default',
@@ -55,28 +55,28 @@ 
 		);
 
 		//hook into the handler for saving question groups
-		add_filter( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'modify_callbacks'), 10 );
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'modify_callbacks'), 10);
 
 		//hook into revision restores (we're hooking into the global action because EE_Admin_Hooks classes are already restricted by page)
-		add_action( 'AHEE_EE_Admin_Page_CPT__restore_revision', array($this, 'restore_revision' ), 10, 2 );
+		add_action('AHEE_EE_Admin_Page_CPT__restore_revision', array($this, 'restore_revision'), 10, 2);
 	}
 
 
 
 
 
-	public function modify_callbacks( $callbacks ) {
+	public function modify_callbacks($callbacks) {
 		//now let's add the question group callback
-		$callbacks[] = array( $this, 'primary_question_group_update' );
+		$callbacks[] = array($this, 'primary_question_group_update');
 		return $callbacks;
 	}
 
 
-	public function restore_revision( $post_id, $revision_id ) {
+	public function restore_revision($post_id, $revision_id) {
 		$EVT_MDL = EE_Registry::instance()->load_model('Event');
-		$post_evt = $EVT_MDL->get_one_by_ID( $post_id );
+		$post_evt = $EVT_MDL->get_one_by_ID($post_id);
 		//restore revision for primary questions
-		$post_evt->restore_revision($revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 1 ) ) );
+		$post_evt->restore_revision($revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 1)));
 		return $post_evt; //for any caffeinated functionality extending.
 	}
 
@@ -100,35 +100,35 @@ 
 			<?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' => 1 )) ) : 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' => 1))) : array();
 			$EQGids = array_keys($EQGs);
 
 			//EEH_Debug_Tools::printr( $QSGs, '$QSGs  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
-			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 ) || $QSG->get('QSG_system') == 1 ) ? ' checked="checked"' : '';
+					$checked = (in_array($QSG->ID(), $EQGids) || $QSG->get('QSG_system') == 1) ? ' checked="checked"' : '';
 					$visibility = $QSG->get('QSG_system') == 1 ? ' style="visibility:hidden"' : '';
-					$edit_query_args = $this->_adminpage_obj->is_caf() ? array( 'action' => 'edit_question_group', 'QSG_ID' => $QSG->ID() ) : array( 'action' => 'question_groups' );
-					$edit_link = $this->_adminpage_obj->add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
+					$edit_query_args = $this->_adminpage_obj->is_caf() ? array('action' => 'edit_question_group', 'QSG_ID' => $QSG->ID()) : array('action' => 'question_groups');
+					$edit_link = $this->_adminpage_obj->add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
 
 					$html .= '
-					<p id="event-question-group-' . $QSG->ID() . '">
-						<input value="' . $QSG->ID() . '" type="checkbox"' . $visibility . ' name="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"'.$visibility.' name="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;
 			} else {
 				echo __('There seems to be a problem with your questions. Please contact support@eventespresso.com', 'event_espresso');
 			}
-			do_action( 'AHEE_event_editor_questions_notice' );
+			do_action('AHEE_event_editor_questions_notice');
 			?>
 		</div>
 		<?php
@@ -138,31 +138,31 @@ 
 
 
 
-	public function primary_question_group_update( $evtobj, $data ) {
-		$question_groups = !empty( $data['question_groups'] ) ? (array) $data['question_groups'] : array();
+	public function primary_question_group_update($evtobj, $data) {
+		$question_groups = ! empty($data['question_groups']) ? (array) $data['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' => 1) ));
+		$current_qgs = $evtobj->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1)));
 		$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' => 1) );
-				$success[] = !empty($qg) ? 1 : 0;
+				if ($val)
+					$qg = $evtobj->_add_relation_to($id, 'Question_Group', array('EQG_primary' => 1));
+				$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' => 1 ) );
-			$success[] = !empty($qg) ? 1 : 0;
+		foreach ($removed_qgs as $qgid) {
+			$qg = $evtobj->_remove_relation_to($qgid, 'Question_Group', array('EQG_primary' => 1));
+			$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
@@ -151,8 +152,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' => 1) );
+				if ( $val ) {
+									$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 1) );
+				}
 				$success[] = !empty($qg) ? 1 : 0;
 			}
 		}

admin_pages/registration_form/help_tabs/registration_form_add_question.help_tab.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 <?php _e('This shows the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso'); ?>
 </li>
 <li>
-<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso');?></strong><br/>
-<?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso');?>
+<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso'); ?></strong><br/>
+<?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('Required Question', 'event_espresso'); ?></strong><br />

admin_pages/registration_form/help_tabs/registration_form_edit_question.help_tab.php

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
 <?php _e('This shows the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso'); ?>
 </li>
 <li>
-<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso');?></strong>
-<strong><?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso');?></strong>
+<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso'); ?></strong>
+<strong><?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso'); ?></strong>
 </li>
 <li>
 <strong><?php _e('Required Question', 'event_espresso'); ?></strong><br />

admin_pages/registration_form/help_tours/Registration_Form_Add_Question_Group_Help_Tour.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -98,34 +98,34 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Add Question Group', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Add Question Group page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Add Question Group', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Add Question Group 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 _qsg_name_stop() {
-		return '<p>' . __('The name of the question group.', 'event_espresso') . '</p>';
+		return '<p>'.__('The name of the question group.', 'event_espresso').'</p>';
 	}
 
 	protected function _qsg_identifier_stop() {
-		return '<p>' . __('A unique name for your question group.', 'event_espresso') . '</p>';
+		return '<p>'.__('A unique name for your question group.', 'event_espresso').'</p>';
 	}
 
 	protected function _qsg_desc_stop() {
-		return '<p>' . __('A description of the question group.', 'event_espresso') . '</p>';
+		return '<p>'.__('A description of the question group.', 'event_espresso').'</p>';
 	}
 
 	protected function _qsg_order_stop() {
-		return '<p>' . __('Set the order that you want your question group to appear in.', 'event_espresso') . '</p>';
+		return '<p>'.__('Set the order that you want your question group to appear in.', 'event_espresso').'</p>';
 	}
 
 	protected function _qsg_show_group_name_stop() {
-		return '<p>' . __('Specify whether the group name should be shown on the registration page.', 'event_espresso') . '</p>';
+		return '<p>'.__('Specify whether the group name should be shown on the registration page.', 'event_espresso').'</p>';
 	}
 
 	protected function _qsg_show_group_desc_stop() {
-		return '<p>' . __('Specify whether the group description should be shown on the registration page.', 'event_espresso') . '</p>';
+		return '<p>'.__('Specify whether the group description should be shown on the registration page.', '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');
+}
 
 /**
  *

admin_pages/registration_form/help_tours/Registration_Form_Add_Question_Help_Tour.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -98,34 +98,34 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Add New Question', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Add New Question page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Add New Question', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Add New Question 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 _qst_display_text_stop() {
-		return '<p>' . __('This is the question that is displayed to registrants who are signing up for events.', 'event_espresso') . '</p>';
+		return '<p>'.__('This is the question that is displayed to registrants who are signing up for events.', 'event_espresso').'</p>';
 	}
 
 	protected function _qst_admin_label_stop() {
-		return '<p>' . __('Helps you understand the difference between questions that may appear similar but are actually different.', 'event_espresso') . '</p>';
+		return '<p>'.__('Helps you understand the difference between questions that may appear similar but are actually different.', 'event_espresso').'</p>';
 	}
 
 	protected function _qst_admin_only_stop() {
-		return '<p>' . __('Specify whether this question should be shown only to admins.', 'event_espresso') . '</p>';
+		return '<p>'.__('Specify whether this question should be shown only to admins.', 'event_espresso').'</p>';
 	}
 
 	protected function _qst_type_stop() {
-		return '<p>' . __('Select the type of question. Available options are Text, Textarea, Single, Multiple, Dropdown, and Date.', 'event_espresso') . '</p>';
+		return '<p>'.__('Select the type of question. Available options are Text, Textarea, Single, Multiple, Dropdown, and Date.', 'event_espresso').'</p>';
 	}
 
 	protected function _qst_required_stop() {
-		return '<p>' . __('Specify whether this question should be required.', 'event_espresso') . '</p>';
+		return '<p>'.__('Specify whether this question should be required.', 'event_espresso').'</p>';
 	}
 
 	protected function _qst_required_text_stop() {
-		return '<p>' . __('Text to display when registrant does not answer question but is required to.', 'event_espresso') . '</p>';
+		return '<p>'.__('Text to display when registrant does not answer question but is required to.', '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');
+}
 
 /**
  *