eventespresso / event-espresso-core

core/db_models/EEM_Message_Template_Group.model.php

Doc Comments +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
 	 * @param        $messenger
 	 * @param string $orderby
 	 * @param string $order
-	 * @return array all (including trashed or inactive) message template group objects for the given messenger
+	 * @return EE_Base_Class[] all (including trashed or inactive) message template group objects for the given messenger
 	 */
 	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC' ) {
 		return $this->get_all_deleted_and_undeleted(
@@ -343,7 +343,7 @@ 
 	/**
 	 * This sends things to the validator for the given messenger and message type.
 	 *
-	 * @param  array $fields the incoming fields to check.
+	 * @param  string $fields the incoming fields to check.
 	 *                       Note this array is in the formatted fields from the form fields setup.
 	 *                       So we need to reformat this into an array of expected field refs by the validator.
 	 *                       Note also that this is not only the fields for the Message Template Group

Indentation +8 added lines, -8 removed lines

@@ -1,14 +1,14 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
 	exit('NO direct script access allowed');
 /**
- * EEM_Message_Template_Group
- *
- * @package		Event Espresso
- * @subpackage	includes/models/EEM_Message_Template_Group.model.php
- * @author		Darren Ethier
- *
- *
- */
+	 * EEM_Message_Template_Group
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/models/EEM_Message_Template_Group.model.php
+	 * @author		Darren Ethier
+	 *
+	 *
+	 */
 require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 

Spacing +61 added lines, -61 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * EEM_Message_Template_Group
@@ -9,7 +9,7 @@ 
  *
  *
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 
 	// private instance of the EEM_Message_Template_Group object
@@ -17,7 +17,7 @@ 
 
 
 
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 		$this->singular_item = __('Message Template Group', 'event_espresso');
 		$this->plural_item = __('Message Template Groups', 'event_espresso');
 		$this->_tables = array(
@@ -26,11 +26,11 @@ 
 		$this->_fields = array(
 			'Message_Template_Group' => array(
 				'GRP_ID' => new EE_Primary_Key_Int_Field('GRP_ID', __('Message Template Group ID', 'event_espresso')),
-				'MTP_name' => new EE_Plain_Text_Field( 'MTP_name', __('The name of the template group', 'event_espresso'), FALSE, '' ),
-				'MTP_description' => new EE_Simple_HTML_Field( 'MTP_description', __('A brief description about this template.', 'event_espresso' ), FALSE, '' ),
-				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id() ),
-				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email' ),
-				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'),false,'registration'),
+				'MTP_name' => new EE_Plain_Text_Field('MTP_name', __('The name of the template group', 'event_espresso'), FALSE, ''),
+				'MTP_description' => new EE_Simple_HTML_Field('MTP_description', __('A brief description about this template.', 'event_espresso'), FALSE, ''),
+				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id()),
+				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email'),
+				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'), false, 'registration'),
 				'MTP_is_global'=>new EE_Boolean_Field('MTP_is_global', __('Flag indicating if Template Group is Global', 'event_espresso'), false, true),
 				'MTP_is_override'=>new EE_Boolean_Field('MTP_is_override', __('Flag indicating if Template Group overrides any other Templates for the messenger/messagetype combination', 'event_espresso'), false, false),
 				'MTP_deleted'=>new EE_Trashed_Flag_Field('MTP_deleted', __('Flag indicating whether this has been trashed', 'event_espresso'), false, false),
@@ -43,12 +43,12 @@ 
 			'Event' => new EE_HABTM_Relation('Event_Message_Template'),
 			'WP_User' => new EE_Belongs_To_Relation()
 		);
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ){
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global( 'MTP_is_global');
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_Global('MTP_is_global');
 		}
 		$this->_caps_slug = 'messages';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -71,8 +71,8 @@ 
 		$limit = null,
 		$count = false
 	) {
-		$query_params = array( array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit );
-		return $count ? $this->count_deleted( $query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		$query_params = array(array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit);
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -86,9 +86,9 @@ 
 	 * @param string $order
 	 * @return array all (including trashed or inactive) message template group objects for the given messenger
 	 */
-	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC' ) {
+	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC') {
 		return $this->get_all_deleted_and_undeleted(
-			array( array( 'MTP_messenger' => $messenger ), 'order_by' => array( $orderby => $order ) )
+			array(array('MTP_messenger' => $messenger), 'order_by' => array($orderby => $order))
 		);
 	}
 
@@ -99,18 +99,18 @@ 
 	 * @param  array  $_where any existing where conditions to append these to.
 	 * @return array          original where conditions or original with additional filters.
 	 */
-	protected function _maybe_mtp_filters( $_where = array() ) {
+	protected function _maybe_mtp_filters($_where = array()) {
 		//account for messenger or message type filters
 		if (
-			isset( $_REQUEST[ 'ee_messenger_filter_by' ] )
-			&& $_REQUEST[ 'ee_messenger_filter_by' ] != 'none_selected'
-			&& $_REQUEST[ 'ee_messenger_filter_by' ] != 'all'
+			isset($_REQUEST['ee_messenger_filter_by'])
+			&& $_REQUEST['ee_messenger_filter_by'] != 'none_selected'
+			&& $_REQUEST['ee_messenger_filter_by'] != 'all'
 		) {
-			$_where['MTP_messenger'] =  $_REQUEST['ee_messenger_filter_by'] ;
+			$_where['MTP_messenger'] = $_REQUEST['ee_messenger_filter_by'];
 		}
 
 		if (
-			isset( $_REQUEST['ee_message_type_filter_by'])
+			isset($_REQUEST['ee_message_type_filter_by'])
 			&& $_REQUEST['ee_message_type_filter_by'] != 'none_selected'
 		) {
 			$_where['MTP_message_type'] = $_REQUEST['ee_message_type_filter_by'];
@@ -141,7 +141,7 @@ 
 		$global = true,
 		$user_check = false
 	) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
@@ -156,9 +156,9 @@ 
 			$_where['MTP_user_id'] = get_current_user_id();
 		}
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all($query_params);
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -173,14 +173,14 @@ 
 	 * @param bool   $count
 	 * @return mixed array on success, FALSE on fail
 	 */
-	public function get_all_message_templates( $orderby = 'GRP_ID', $order = 'ASC', $limit = null, $count = false ) {
+	public function get_all_message_templates($orderby = 'GRP_ID', $order = 'ASC', $limit = null, $count = false) {
 		$_where = $this->_maybe_mtp_filters();
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
 		$r_templates = $count
-			? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE )
-			: $this->get_all_deleted_and_undeleted( $query_params );
+			? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE)
+			: $this->get_all_deleted_and_undeleted($query_params);
 
 		return $r_templates;
 	}
@@ -194,10 +194,10 @@ 
 	 * @param  array  $query_params same as EEM_Base::get_all()
 	 * @return  EE_Message_Template_Group[]
 	 */
-	public function get_all_custom_templates_by_event( $EVT_ID, $query_params = array() ) {
-		$where = array_merge( $query_params, array( 'Event.EVT_ID' => $EVT_ID ) );
+	public function get_all_custom_templates_by_event($EVT_ID, $query_params = array()) {
+		$where = array_merge($query_params, array('Event.EVT_ID' => $EVT_ID));
 		return $this->get_all(
-			array( $where )
+			array($where)
 		);
 	}
 
@@ -222,13 +222,13 @@ 
 		$count = false,
 		$global = true
 	) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -264,9 +264,9 @@ 
 			'MTP_is_active' => $active
 		);
 
-		$query_params = array( $_where, 'order_by' => array($orderby=>$order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby=>$order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -300,13 +300,13 @@ 
 			'MTP_is_global' => TRUE,
 		);
 
-		if ( $active != 'all' ) {
+		if ($active != 'all') {
 			$_where['MTP_is_active'] = $active;
 		}
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count( $query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @param  array  $query_params same as EEM_Base->get_all()
 	 * @return EE_Message_Template_Group[]
 	 */
-	public function get_custom_message_template_by_m_and_mt( $messenger, $message_type, $query_params = array() ) {
+	public function get_custom_message_template_by_m_and_mt($messenger, $message_type, $query_params = array()) {
 		return $this->get_all(
 			array_merge(
 				$query_params,
@@ -356,14 +356,14 @@ 
 		$assembled_fields = array();
 
 		//let's loop through all the fields and set them up in the right format
-		foreach ( $fields as $index => $value ) {
+		foreach ($fields as $index => $value) {
 			// first let's figure out if the value['content'] in the current index is an array.
 			//  If it is then this is special fields that are used in parsing special shortcodes (i.e. 'attendee_list').
-			if ( is_array($value['content']) ) {
+			if (is_array($value['content'])) {
 				$assembled_fields[$value['name']] = $value['content']['main'];
 				//loop through the content and get the other fields.
-				foreach ( $value['content'] as $name => $val ) {
-					if ( $name == 'main' ) continue;
+				foreach ($value['content'] as $name => $val) {
+					if ($name == 'main') continue;
 					$assembled_fields[$name] = $val;
 				}
 				continue;
@@ -375,15 +375,15 @@ 
 
 		// now we've got the assembled_fields.
 		// We need to setup the string for the appropriate validator class and call that.
-		$m_ref = ucwords( str_replace('_',' ', $messenger ) );
-		$m_ref = str_replace( ' ', '_', $m_ref );
-		$mt_ref = ucwords( str_replace('_', ' ', $message_type ) );
-		$mt_ref = str_replace( ' ', '_', $mt_ref );
+		$m_ref = ucwords(str_replace('_', ' ', $messenger));
+		$m_ref = str_replace(' ', '_', $m_ref);
+		$mt_ref = ucwords(str_replace('_', ' ', $message_type));
+		$mt_ref = str_replace(' ', '_', $mt_ref);
 
-		$classname = 'EE_Messages_' . $m_ref . '_' . $mt_ref . '_Validator';
+		$classname = 'EE_Messages_'.$m_ref.'_'.$mt_ref.'_Validator';
 
-		if ( !class_exists( $classname ) ) {
-			$msg[] = __( 'The Validator class was unable to load', 'event_espresso');
+		if ( ! class_exists($classname)) {
+			$msg[] = __('The Validator class was unable to load', 'event_espresso');
 			$msg[] = sprintf(
 				__(
 					'The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class',
@@ -391,11 +391,11 @@ 
 				),
 				$classname
 			);
-			throw new EE_Error( implode( '||', $msg ) );
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$a = new ReflectionClass( $classname );
-		$_VLD = $a->newInstance( $assembled_fields, $context );
+		$a = new ReflectionClass($classname);
+		$_VLD = $a->newInstance($assembled_fields, $context);
 		$result = $_VLD->validate();
 		return $result;
 	}
@@ -414,18 +414,18 @@ 
 	 *
 	 * @return int  count of updated records.
 	 */
-	public function deactivate_message_template_groups_for( $messenger_names = array(), $message_type_names = array() ) {
+	public function deactivate_message_template_groups_for($messenger_names = array(), $message_type_names = array()) {
 		$query_args = array();
-		if ( empty( $messenger_names ) && empty( $message_type_names ) ) {
+		if (empty($messenger_names) && empty($message_type_names)) {
 			return 0;
 		}
-		if ( ! empty( $messenger_names ) ) {
-			$query_args[ 0 ][ 'MTP_messenger' ] = array( 'IN', (array) $messenger_names );
+		if ( ! empty($messenger_names)) {
+			$query_args[0]['MTP_messenger'] = array('IN', (array) $messenger_names);
 		}
-		if ( ! empty( $message_type_names ) ) {
-			$query_args[ 0 ][ 'MTP_message_type' ] = array( 'IN', (array) $message_type_names );
+		if ( ! empty($message_type_names)) {
+			$query_args[0]['MTP_message_type'] = array('IN', (array) $message_type_names);
 		}
-		return $this->update( array( 'MTP_is_active' => false ), $query_args );
+		return $this->update(array('MTP_is_active' => false), $query_args);
 	}
 
 

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,6 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 /**
  * EEM_Message_Template_Group
  *
@@ -363,7 +364,9 @@ 
 				$assembled_fields[$value['name']] = $value['content']['main'];
 				//loop through the content and get the other fields.
 				foreach ( $value['content'] as $name => $val ) {
-					if ( $name == 'main' ) continue;
+					if ( $name == 'main' ) {
+						continue;
+					}
 					$assembled_fields[$name] = $val;
 				}
 				continue;

admin_pages/registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php

Braces +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 			if( $subsection->form_data_present_in( $req_data ) ) {
 				try{
 					$subsection->_normalize($req_data);
-				}catch( EE_Validation_Error $e ){
+				} catch( EE_Validation_Error $e ){
 					$subsection->add_validation_error( $e );
 				}
 			}

Spacing +37 added lines, -37 removed lines

@@ -13,11 +13,11 @@ 
  * @since		 	   4.8.30.rc.009
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
-class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper{
+class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper {
 	/**
 	 *
 	 * @var EE_Registration
@@ -29,16 +29,16 @@ 
 	 * @param EE_Registration $reg
 	 * @param array $options
 	 */
-	public function __construct( EE_Registration $reg, $options = array() ) {
+	public function __construct(EE_Registration $reg, $options = array()) {
 		$this->_registration = $reg;
-		if( ! isset( $options[ 'layout_strategy' ] ) ) {
-			$options[ 'layout_strategy' ] = new EE_Admin_Two_Column_Layout();
+		if ( ! isset($options['layout_strategy'])) {
+			$options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
 		}
-		if( ! isset( $options[ 'html_id' ] ) ) {
-			$options[ 'html_id' ] = 'reg-admin-attendee-questions-frm';
+		if ( ! isset($options['html_id'])) {
+			$options['html_id'] = 'reg-admin-attendee-questions-frm';
 		}
 		$this->build_form_from_registration();
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 
@@ -52,8 +52,8 @@ 
 
 	public function build_form_from_registration() {
 		$reg = $this->get_registration();
-		if( ! $reg instanceof EE_Registration ) {
-			throw new EE_Error( __( 'We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso') );
+		if ( ! $reg instanceof EE_Registration) {
+			throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
 		}
 		//we want to get all their question groups
 		$question_groups = EEM_Question_Group::instance()->get_all(
@@ -63,16 +63,16 @@ 
 					'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? TRUE : FALSE,
 					'OR' => array(
 						'Question.QST_system*blank' =>  '',
-						'Question.QST_system*null' => array( 'IS_NULL' ) 
+						'Question.QST_system*null' => array('IS_NULL') 
 					)
 				),
-				'order_by' => array( 'QSG_order' => 'ASC' )
+				'order_by' => array('QSG_order' => 'ASC')
 			)
 		);
 		//get each question groups questions
-		foreach( $question_groups as $question_group ) {
-			if ( $question_group instanceof EE_Question_Group ) {
-				$this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
+		foreach ($question_groups as $question_group) {
+			if ($question_group instanceof EE_Question_Group) {
+				$this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group(
 					$question_group,
 					$reg
 				);
@@ -89,16 +89,16 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function build_subform_from_question_group( $question_group, $registration ) {
-		if( ! $question_group instanceof EE_Question_Group ||
+	public function build_subform_from_question_group($question_group, $registration) {
+		if ( ! $question_group instanceof EE_Question_Group ||
 			! $registration instanceof EE_Registration) {
-			throw new EE_Error( __( 'A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso' ) );
+			throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
 		}
 		$parts_of_subsection = array(
 			'title' => new EE_Form_Section_HTML(
-					EEH_HTML::h5( $question_group->name(),
+					EEH_HTML::h5($question_group->name(),
 					$question_group->identifier(),
-					'espresso-question-group-title-h5 section-title' )
+					'espresso-question-group-title-h5 section-title')
 				)
 		);
 		$questions = $question_group->questions( 
@@ -106,17 +106,17 @@ 
 				array( 
 					'OR' => array(
 						'QST_system*blank' => '',
-						'QST_system*null' => array( 'IS_NULL' )
+						'QST_system*null' => array('IS_NULL')
 					)
 				)
 			)
 		);
-		foreach( $questions as $question ) {
-			$parts_of_subsection[ $question->ID() ] = $question->generate_form_input( $registration );
+		foreach ($questions as $question) {
+			$parts_of_subsection[$question->ID()] = $question->generate_form_input($registration);
 		}
-		$parts_of_subsection[ 'edit_link' ] = new EE_Form_Section_HTML(
-				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '">
-					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
+		$parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
+				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="'.esc_attr__('click to edit question', 'event_espresso').'">
+					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span>
 					<div class="dashicons dashicons-edit"></div>
 				</a></td></tr>'
 			);
@@ -136,12 +136,12 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			if( $subsection->form_data_present_in( $req_data ) ) {
-				try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection->form_data_present_in($req_data)) {
+				try {
 					$subsection->_normalize($req_data);
-				}catch( EE_Validation_Error $e ){
-					$subsection->add_validation_error( $e );
+				} catch (EE_Validation_Error $e) {
+					$subsection->add_validation_error($e);
 				}
 			}
 		}
@@ -156,13 +156,13 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if( $subsection->form_data_present_in( array_merge( $_GET, $_POST ) ) ) {
-				if(method_exists($this,'_validate_'.$subsection_name)){
-					call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) {
+				if (method_exists($this, '_validate_'.$subsection_name)) {
+					call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 				}
 				$subsection->_validate();
-			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$subsection->_received_submission = true;
 			}
 		}

core/admin/templates/admin_wrapper.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,17 +1,17 @@
 <div class="wrap espresso-admin">
 
-	<h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
+	<h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
 
 	<div id="ajax-notices-container"></div>
 
 	<?php echo $nav_tabs; ?>
 
 	<?php
-	do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
 	echo $before_admin_page_content;
 	echo $admin_page_content;
 	echo $after_admin_page_content;
-	do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
 	?>
 
 </div>

core/admin/templates/admin_wrapper_ajax.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
 <div class="wrap espresso-admin">
-	<h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
+	<h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
 
-	<div class="ee-notices"><?php echo isset( $ajax_notices ) ? $ajax_notices : ''; ?></div>
+	<div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices : ''; ?></div>
 	<?php
-	do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
 	echo $before_admin_page_content;
 	echo $admin_page_content;
 	echo $after_admin_page_content;
-	do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
 	?>
 </div>
 <!-- espresso-admin -->
\ No newline at end of file

admin_pages/transactions/templates/txn_admin_details_header.template.php

Spacing +5 added lines, -5 removed lines

@@ -1,19 +1,19 @@
 
-		<h3 class="txn-navigation-strip"><?php echo $previous_transaction . '&nbsp;'; echo __( 'Transaction # ', 'event_espresso' ) . $txn_nmbr['value']; echo '&nbsp;' . $next_transaction; ?></h3>
-		<h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value'];?></h2>
+		<h3 class="txn-navigation-strip"><?php echo $previous_transaction.'&nbsp;'; echo __('Transaction # ', 'event_espresso').$txn_nmbr['value']; echo '&nbsp;'.$next_transaction; ?></h3>
+		<h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value']; ?></h2>
 
 		<?php echo $send_payment_reminder_button; ?>
 		<h2 id="txn-status-h2" class="txn-status-h2">
-			<?php echo __( 'Transaction Status: ', 'event_espresso' );?><span id="txn-status" class="<?php echo $txn_status['class'];?>"><?php echo $txn_status['value'];?></span>
+			<?php echo __('Transaction Status: ', 'event_espresso'); ?><span id="txn-status" class="<?php echo $txn_status['class']; ?>"><?php echo $txn_status['value']; ?></span>
 		</h2>
 
 	<?php $attributes = $amount_due ? 'class="txn-amount-due-h2"' : 'class="txn-amount-due-h2 hidden"'; ?>
 		<h2 id="txn-amount-due-h2" <?php echo $attributes; ?>>
-			<?php echo __( 'Total Amount Due: ', 'event_espresso' );?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class;?>"><?php echo $amount_due;?></span>
+			<?php echo __('Total Amount Due: ', 'event_espresso'); ?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class; ?>"><?php echo $amount_due; ?></span>
 		</h2>
 
 		<h3 id="txn-selected-method-of-payment-h3" class="txn-selected-method-of-payment-h3">
-			<?php echo __( 'Last Method of Payment: ', 'event_espresso' );?><?php echo $method_of_payment_name;?>
+			<?php echo __('Last Method of Payment: ', 'event_espresso'); ?><?php echo $method_of_payment_name; ?>
 		</h3>
 
 

admin_pages/payments/help_tabs/payment_methods_overview.help_tab.php

Spacing +19 added lines, -19 removed lines

@@ -2,40 +2,40 @@
 <p>
 <?php _e('This page shows all available payment methods for Event Espresso.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e('Common Settings', 'event_espresso' )?></strong></p>
+<p><strong><?php _e('Common Settings', 'event_espresso')?></strong></p>
 <ul>
 	<li>
-		<strong><?php _e( 'Name', 'event_espresso' );?></strong><br>
-		<?php _e( 'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso' );?>
+		<strong><?php _e('Name', 'event_espresso'); ?></strong><br>
+		<?php _e('The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Description', 'event_espresso' );?></strong><br/>
-		<?php _e( 'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso' );?>
+		<strong><?php _e('Description', 'event_espresso'); ?></strong><br/>
+		<?php _e('The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso'); ?>
 	</li>
-	<li><strong><?php _e( 'Admin-Only Name', 'event_espresso' );?></strong><br/>
-		<?php _e( 'The name of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?>
+	<li><strong><?php _e('Admin-Only Name', 'event_espresso'); ?></strong><br/>
+		<?php _e('The name of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Admin-Only Description', 'event_espresso' );?></strong><br/>
-		<?php _e( 'The description of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?>
+		<strong><?php _e('Admin-Only Description', 'event_espresso'); ?></strong><br/>
+		<?php _e('The description of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Debug (sandbox) Mode', 'event_espresso' );?></strong><br/>
-		<?php _e( 'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso' );?>
+		<strong><?php _e('Debug (sandbox) Mode', 'event_espresso'); ?></strong><br/>
+		<?php _e('Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Open by Default', 'event_espresso' );?></strong><br/>
-		<?php _e( 'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso' );?>
+		<strong><?php _e('Open by Default', 'event_espresso'); ?></strong><br/>
+		<?php _e('If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Button URL', 'event_espresso' );?></strong><br/>
-		<?php printf( __( 'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso' ), '<img src="' . admin_url('images/media-button-image.gif') . '">' );?>
+		<strong><?php _e('Button URL', 'event_espresso'); ?></strong><br/>
+		<?php printf(__('The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso'), '<img src="'.admin_url('images/media-button-image.gif').'">'); ?>
 	</li>
-	<li><strong><?php _e( 'Usable From', 'event_espresso' );?></strong><br/>
-	<?php _e( 'Where this payment method can be used from.', 'event_espresso' );?>
+	<li><strong><?php _e('Usable From', 'event_espresso'); ?></strong><br/>
+	<?php _e('Where this payment method can be used from.', 'event_espresso'); ?>
 		<ul>
-			<li><?php _e( 'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso' );?></li>
-			<li><?php _e( 'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso' );?></li>
+			<li><?php _e('Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso'); ?></li>
+			<li><?php _e('Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso'); ?></li>
 		</ul>
 	</li>
 </ul>

caffeinated/payment_methods/Mijireh/help_tabs/payment_methods_overview_mijireh.help_tab.php

Spacing +11 added lines, -11 removed lines

@@ -1,11 +1,11 @@ 
-<p><strong><?php _e( 'Mijireh', 'event_espresso' ); ?></strong></p>
+<p><strong><?php _e('Mijireh', 'event_espresso'); ?></strong></p>
 <p>
-	<?php _e( 'Adjust the settings for the Mijireh payment gateway.', 'event_espresso' ); ?>
+	<?php _e('Adjust the settings for the Mijireh payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
 	<?php
 	printf(
-		__( 'Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %1$sMijireh\' website%2$s, where you configure your Mijireh store with the %3$spayment gateway of your choice%4$s.', 'event_espresso' ),
+		__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %1$sMijireh\' website%2$s, where you configure your Mijireh store with the %3$spayment gateway of your choice%4$s.', 'event_espresso'),
 		'<a href="http://www.mijireh.com/" target="_blank">',
 		'</a>',
 		'<a href="http://www.mijireh.com/docs/payment-gateways/" target="_blank">',
@@ -14,26 +14,26 @@ 
 	?>
 </p>
 <p>
-	<?php _e( 'For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso' ) ?>
+	<?php _e('For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso') ?>
 </p>
 <ul>
 	<li>
-		<strong><?php _e( 'Mijireh Access Key', 'event_espresso' ); ?></strong><br/>
+		<strong><?php _e('Mijireh Access Key', 'event_espresso'); ?></strong><br/>
 		<?php
 		printf(
-			__( 'Enter your Access Key for Mijireh. Your Access Key can be found in your %1$sMijireh account dashboard%2$s.', 'event_espresso' ),
+			__('Enter your Access Key for Mijireh. Your Access Key can be found in your %1$sMijireh account dashboard%2$s.', 'event_espresso'),
 			'<a href="https://secure.mijireh.com/login" target="_blank">',
 			'</a>'
 		);
 		?>
 	</li>
 	<li>
-		<strong><?php _e( 'Button Image URL', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Change the image that is used for this payment gateway.', 'event_espresso' ); ?>
+		<strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br/>
+		<?php _e('Change the image that is used for this payment gateway.', 'event_espresso'); ?>
 	</li>
 </ul>
-<p><strong><?php _e( 'Mijireh Checkout Page Design', 'event_espresso' ); ?></strong></p>
+<p><strong><?php _e('Mijireh Checkout Page Design', 'event_espresso'); ?></strong></p>
 <p>
-	<?php _e( "As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso' ); ?>
-	<?php printf( __( "In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso' ), '<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">', '</a>' ); ?>
+	<?php _e("As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso'); ?>
+	<?php printf(__("In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso'), '<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">', '</a>'); ?>
 </p>
\ No newline at end of file

caffeinated/admin/hooks/Global_EE_Caf_Hooks.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');
 
 /**
@@ -36,25 +36,25 @@ 
 
 
 	private function _do_hooks() {
-		add_filter('FHEE_show_sponsors_meta_box', '__return_false', 10 );
-		add_filter('FHEE_show_ratings_request_meta_box', '__return_false', 10 );
-		add_filter('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array( $this, 'forums_lazy_loading'), 10 );
-		add_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content', array( $this, 'extra_news_box_content' ), 10 );
+		add_filter('FHEE_show_sponsors_meta_box', '__return_false', 10);
+		add_filter('FHEE_show_ratings_request_meta_box', '__return_false', 10);
+		add_filter('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array($this, 'forums_lazy_loading'), 10);
+		add_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content', array($this, 'extra_news_box_content'), 10);
 	}
 
 
 
 
-	public function extra_news_box_content( $content ) {
-		echo '<h3 style="margin:0">' . __('From the Forums', 'event_espresso') . '</h3>';
+	public function extra_news_box_content($content) {
+		echo '<h3 style="margin:0">'.__('From the Forums', 'event_espresso').'</h3>';
 		echo '<div id="ee_forum_posts_content">';
 		$url = 'http://eventespresso.com/forum/event-espresso-support/feed/';
-		EE_Admin_Page::cached_rss_display( 'ee_forum_posts_content', $url);
+		EE_Admin_Page::cached_rss_display('ee_forum_posts_content', $url);
 		echo '</div>';
 	}
 
 
-	public function forums_lazy_loading( $ids ) {
+	public function forums_lazy_loading($ids) {
 		$ids[] = 'ee_forum_posts_content';
 		return $ids;
 	}

Braces +2 added lines, -1 removed lines

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

caffeinated/admin/extend/events/help_tabs/import_page.help_tab.php

Spacing +8 added lines, -8 removed lines

@@ -2,18 +2,18 @@
 <p>
 <?php _e('The importer can be used to import event information into Event Espresso using a CSV file.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso');?></strong></p>
+<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso'); ?></strong></p>
 <p>
 <?php _e('To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).', 'event_espresso'); ?>
 </p>
 <p>
 <?php _e('Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e("Importing from this Site", 'event_espresso');?></strong></p>
-<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso');?></p>
+<p><strong><?php _e("Importing from this Site", 'event_espresso'); ?></strong></p>
+<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso'); ?></p>
 
-	<p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso");?></strong></p>
-	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso");?></p>
-	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso");?></p>
-	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso");?></p>
-	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso");?></p>
\ No newline at end of file
+	<p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso"); ?></strong></p>
+	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso"); ?></p>
+	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso"); ?></p>
+	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso"); ?></p>
+	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso"); ?></p>
\ No newline at end of file