eventespresso / event-espresso-core

core/libraries/messages/EE_Messenger_Collection.lib.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -39,9 +39,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::add( $object, $info );
+	public function add($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::add($object, $info);
 	}
 
 
@@ -57,9 +57,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::set_info( $object, $info );
+	public function set_info($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::set_info($object, $info);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info ) {
-		return parent::get_by_info( str_replace( ' ', '_', strtolower( $info ) ) );
+	public function get_by_info($info) {
+		return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return parent::has( $object );
+	public function has($object) {
+		return parent::has($object);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $messenger_name
 	 * @return bool
 	 */
-	public function has_by_name( $messenger_name ) {
-		return $this->get_by_info( $messenger_name ) instanceof $this->interface ? true : false;
+	public function has_by_name($messenger_name) {
+		return $this->get_by_info($messenger_name) instanceof $this->interface ? true : false;
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		return parent::remove( $object );
+	public function remove($object) {
+		return parent::remove($object);
 	}
 
 
@@ -148,8 +148,8 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
-		parent::set_current( $object );
+	public function set_current($object) {
+		parent::set_current($object);
 	}
 
 
@@ -163,8 +163,8 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
-		parent::set_current_by_info( $info );
+	public function set_current_by_info($info) {
+		parent::set_current_by_info($info);
 	}
 
 
@@ -178,10 +178,10 @@ 
 	 * @return void
 	 */
 	public function show_collection_classes() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$this->rewind();
-			while ( $this->valid() ) {
-				echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : . <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : . <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
 				$this->next();
 			}
 		}

core/libraries/messages/data_class/EE_Messages_incoming_data.core.php

Spacing +65 added lines, -65 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -266,7 +266,7 @@ 
 	 * @param mixed $data incoming data object|array.  Suggested that child classes use type hinting for expected
 	 * data object.  But here parent will be generic because we don't know what's coming in.
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$this->_data = $data;
 		$this->_setup_data();
 	}
@@ -288,7 +288,7 @@ 
 	 *
 	 * @return mixed   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		return $data;
 	}
 
@@ -304,7 +304,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		return $data;
 	}
 
@@ -331,8 +331,8 @@ 
 	protected function _assemble_data() {
 		//verify that reg_objs is set
 		if (
-			! is_array( $this->reg_objs )
-			&& ! reset( $this->reg_objs ) instanceof EE_Registration
+			! is_array($this->reg_objs)
+			&& ! reset($this->reg_objs) instanceof EE_Registration
 		) {
 			throw new EE_Error(
 				__(
@@ -347,82 +347,82 @@ 
 		$answers = $questions = $attendees = $line_items = $registrations = array();
 		$total_ticket_count = 0;
 
-		if ( ! empty( $this->reg_objs ) ) {
+		if ( ! empty($this->reg_objs)) {
 			$event_attendee_count = array();
-			foreach ( $this->reg_objs as $reg ) {
+			foreach ($this->reg_objs as $reg) {
 				//account for filtered registrations by status.
-				if ( ! empty( $this->filtered_reg_status ) && $this->filtered_reg_status !== $reg->status_ID() ) {
+				if ( ! empty($this->filtered_reg_status) && $this->filtered_reg_status !== $reg->status_ID()) {
 					continue;
 				}
 
 				$evt_id = $reg->event_ID();
 				/** @type EE_Ticket $ticket */
-				$ticket = $reg->get_first_related( 'Ticket' );
+				$ticket = $reg->get_first_related('Ticket');
 				$relateddatetime = $ticket->datetimes();
 				$total_ticket_count++;
-				$tickets[ $ticket->ID() ]['ticket'] = $ticket;
-				$tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] )
-				                                     && isset( $tickets[ $ticket->ID() ]['count'] )
-					? $tickets[ $ticket->ID() ]['count'] + 1
+				$tickets[$ticket->ID()]['ticket'] = $ticket;
+				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()])
+				                                     && isset($tickets[$ticket->ID()]['count'])
+					? $tickets[$ticket->ID()]['count'] + 1
 					: 1;
-				$tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$tickets[ $ticket->ID() ]['dtt_objs'] = $relateddatetime;
-				$tickets[ $ticket->ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime;
+				$tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg;
 				$event = $reg->event();
-				$tickets[ $ticket->ID() ]['EE_Event'] = $event;
-				$evtcache[ $evt_id ] = $event;
-				$eventsetup[ $evt_id ]['reg_objs'][ $reg->ID() ] = $reg;
-				$eventsetup[ $evt_id ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$eventsetup[ $evt_id ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$event_attendee_count[ $evt_id ] = isset( $event_attendee_count[ $evt_id ] )
-					? $event_attendee_count[ $evt_id ] + 1
+				$tickets[$ticket->ID()]['EE_Event'] = $event;
+				$evtcache[$evt_id] = $event;
+				$eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg;
+				$eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket;
+				$eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id])
+					? $event_attendee_count[$evt_id] + 1
 					: 0;
-				$attendees[ $reg->attendee_ID() ]['line_ref'][] = $evt_id;
-				$attendees[ $reg->attendee_ID() ]['att_obj'] = $reg->attendee();
-				$attendees[ $reg->attendee_ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id;
+				$attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee();
+				$attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg;
 				//$attendees[ $reg->attendee_ID() ]['registration_id'] = $reg->ID();
-				$attendees[ $reg->attendee_ID() ]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
+				$attendees[$reg->attendee_ID()]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
 					? $reg->attendee()->email()
 					: '';
-				$attendees[ $reg->attendee_ID() ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$attendees[ $reg->attendee_ID() ]['evt_objs'][ $evt_id ] = $event;
+				$attendees[$reg->attendee_ID()]['tkt_objs'][$ticket->ID()] = $ticket;
+				$attendees[$reg->attendee_ID()]['evt_objs'][$evt_id] = $event;
 
 				//registrations
-				$registrations[ $reg->ID() ]['tkt_obj'] = $ticket;
-				$registrations[ $reg->ID() ]['evt_obj'] = $event;
-				$registrations[ $reg->ID() ]['reg_obj'] = $reg;
-				$registrations[ $reg->ID() ]['att_obj'] = $reg->attendee();
+				$registrations[$reg->ID()]['tkt_obj'] = $ticket;
+				$registrations[$reg->ID()]['evt_obj'] = $event;
+				$registrations[$reg->ID()]['reg_obj'] = $reg;
+				$registrations[$reg->ID()]['att_obj'] = $reg->attendee();
 
 				//set up answer objects
-				$rel_ans = $reg->get_many_related( 'Answer' );
-				foreach ( $rel_ans as $ansid => $answer ) {
-					if ( ! isset( $questions[ $ansid ] ) ) {
-						$questions[ $ansid ] = $answer->get_first_related( 'Question' );
+				$rel_ans = $reg->get_many_related('Answer');
+				foreach ($rel_ans as $ansid => $answer) {
+					if ( ! isset($questions[$ansid])) {
+						$questions[$ansid] = $answer->get_first_related('Question');
 					}
-					$answers[ $ansid ] = $answer;
-					$registrations[ $reg->ID() ]['ans_objs'][ $ansid ] = $answer;
+					$answers[$ansid] = $answer;
+					$registrations[$reg->ID()]['ans_objs'][$ansid] = $answer;
 				}
 
-				foreach ( $relateddatetime as $dtt_id => $datetime ) {
-					$eventsetup[ $evt_id ]['dtt_objs'][ $dtt_id ] = $datetime;
-					$registrations[ $reg->ID() ]['dtt_objs'][ $dtt_id ] = $datetime;
+				foreach ($relateddatetime as $dtt_id => $datetime) {
+					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
+					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[ $dtt_id ] ) ) {
+					if (isset($datetimes[$dtt_id])) {
 						continue; //already have this info in the datetimes array.
 					}
 
-					$datetimes[ $dtt_id ]['tkt_objs'][] = $ticket;
-					$datetimes[ $dtt_id ]['datetime'] = $datetime;
-					$datetimes[ $dtt_id ]['evt_objs'][ $evt_id ] = $event;
-					$datetimes[ $dtt_id ]['reg_objs'][ $reg->ID() ] = $reg;
+					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
+					$datetimes[$dtt_id]['datetime'] = $datetime;
+					$datetimes[$dtt_id]['evt_objs'][$evt_id] = $event;
+					$datetimes[$dtt_id]['reg_objs'][$reg->ID()] = $reg;
 				}
 			}
 
 			//let's loop through the unique event=>reg items and setup data on them
 
-			if ( ! empty( $eventsetup ) ) {
-				foreach ( $eventsetup as $evt_id => $items ) {
-					if ( $this->txn instanceof EE_Transaction ) {
+			if ( ! empty($eventsetup)) {
+				foreach ($eventsetup as $evt_id => $items) {
+					if ($this->txn instanceof EE_Transaction) {
 						$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(
 							array(
 								array(
@@ -435,25 +435,25 @@ 
 					} else {
 						$ticket_line_items_for_event = array();
 					}
-					$events[ $evt_id ] = array(
+					$events[$evt_id] = array(
 						'ID' => $evt_id,
-						'event' => $evtcache[ $evt_id ],
-						'name' => $evtcache[ $evt_id ] instanceof EE_Event ? $evtcache[ $evt_id ]->name() : '',
-						'total_attendees' => $event_attendee_count[ $evt_id ],
+						'event' => $evtcache[$evt_id],
+						'name' => $evtcache[$evt_id] instanceof EE_Event ? $evtcache[$evt_id]->name() : '',
+						'total_attendees' => $event_attendee_count[$evt_id],
 						'reg_objs' => $items['reg_objs'],
 						'tkt_objs' => $items['tkt_objs'],
 						'att_objs' => $items['att_objs'],
-						'dtt_objs' => isset( $items['dtt_objs'] ) ? $items['dtt_objs'] : array(),
+						'dtt_objs' => isset($items['dtt_objs']) ? $items['dtt_objs'] : array(),
 						'line_items' => $ticket_line_items_for_event,
 					);
 
 					//make sure the tickets have the line items setup for them.
-					foreach ( $ticket_line_items_for_event as $line_id => $line_item ) {
-						if ( $line_item instanceof EE_Line_Item ) {
-							$tickets[ $line_item->ticket()->ID() ]['line_item'] = $line_item;
-							$tickets[ $line_item->ticket()->ID() ]['sub_line_items'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['children'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['EE_Ticket'] = $line_item->ticket();
+					foreach ($ticket_line_items_for_event as $line_id => $line_item) {
+						if ($line_item instanceof EE_Line_Item) {
+							$tickets[$line_item->ticket()->ID()]['line_item'] = $line_item;
+							$tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children();
+							$line_items[$line_item->ID()]['children'] = $line_item->children();
+							$line_items[$line_item->ID()]['EE_Ticket'] = $line_item->ticket();
 						}
 					}
 				}
@@ -475,7 +475,7 @@ 
 		$this->total_ticket_count = $total_ticket_count;
 		$this->registrations = $registrations;
 
-		if ( $this->txn instanceof EE_Transaction ) {
+		if ($this->txn instanceof EE_Transaction) {
 			$this->tax_line_items        = $this->txn->tax_items();
 			$this->additional_line_items = $this->txn->non_ticket_line_items();
 			$this->payments              = $this->txn->payments();
@@ -485,10 +485,10 @@ 
 			//let's get just the primary_attendee_data!  First we get the primary registration object.
 			$primary_reg = $this->txn->primary_registration();
 			// verify
-			if ( $primary_reg instanceof EE_Registration ) {
+			if ($primary_reg instanceof EE_Registration) {
 
 				// get attendee object
-				if ( $primary_reg->attendee() instanceof EE_Attendee ) {
+				if ($primary_reg->attendee() instanceof EE_Attendee) {
 
 					//now we can setup the primary_attendee_data array
 					$this->primary_attendee_data = array(

core/EE_Dependency_Map.core.php

Spacing +29 added lines, -29 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -70,11 +70,11 @@ 
 	 * @param  \EE_Request  $request
 	 * @param  \EE_Response $response
 	 */
-	protected function __construct( EE_Request $request, EE_Response $response ) {
+	protected function __construct(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
-		add_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading', array( $this, 'initialize' ) );
-		do_action( 'EE_Dependency_Map____construct' );
+		add_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading', array($this, 'initialize'));
+		do_action('EE_Dependency_Map____construct');
 	}
 
 
@@ -95,10 +95,10 @@ 
 	 * @param  \EE_Response $response
 	 * @return \EE_Dependency_Map instance
 	 */
-	public static function instance( EE_Request $request = null, EE_Response $response = null ) {
+	public static function instance(EE_Request $request = null, EE_Response $response = null) {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Dependency_Map ) {
-			self::$_instance = new EE_Dependency_Map( $request, $response );
+		if ( ! self::$_instance instanceof EE_Dependency_Map) {
+			self::$_instance = new EE_Dependency_Map($request, $response);
 		}
 		return self::$_instance;
 	}
@@ -110,9 +110,9 @@ 
 	 * @param array  $dependencies
 	 * @return boolean
 	 */
-	public static function register_dependencies( $class, $dependencies ) {
-		if ( ! isset( self::$_instance->_dependency_map[ $class ] ) ) {
-			self::$_instance->_dependency_map[ $class ] = (array)$dependencies;
+	public static function register_dependencies($class, $dependencies) {
+		if ( ! isset(self::$_instance->_dependency_map[$class])) {
+			self::$_instance->_dependency_map[$class] = (array) $dependencies;
 			return true;
 		}
 		return false;
@@ -126,18 +126,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function register_class_loader( $class_name, $loader = 'load_core' ) {
+	public static function register_class_loader($class_name, $loader = 'load_core') {
 		// check that loader method starts with "load_" and exists in EE_Registry
-		if ( strpos( $loader, 'load_' ) !== 0 || ! method_exists( 'EE_Registry', $loader ) ) {
+		if (strpos($loader, 'load_') !== 0 || ! method_exists('EE_Registry', $loader)) {
 			throw new EE_Error(
 				sprintf(
-					__( '"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso' ),
+					__('"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso'),
 					$loader
 				)
 			);
 		}
-		if ( ! isset( self::$_instance->_class_loaders[ $class_name ] ) ) {
-			self::$_instance->_class_loaders[ $class_name ] = $loader;
+		if ( ! isset(self::$_instance->_class_loaders[$class_name])) {
+			self::$_instance->_class_loaders[$class_name] = $loader;
 			return true;
 		}
 		return false;
@@ -160,8 +160,8 @@ 
 	 * @param string $class_name
 	 * @return boolean
 	 */
-	public function has( $class_name = '' ) {
-		return isset( $this->_dependency_map[ $class_name ] ) ? true : false;
+	public function has($class_name = '') {
+		return isset($this->_dependency_map[$class_name]) ? true : false;
 	}
 
 
@@ -173,8 +173,8 @@ 
 	 * @param string $dependency
 	 * @return bool
 	 */
-	public function has_dependency_for_class( $class_name = '', $dependency = '' ) {
-		return isset( $this->_dependency_map[ $class_name ], $this->_dependency_map[ $class_name ][ $dependency ] )
+	public function has_dependency_for_class($class_name = '', $dependency = '') {
+		return isset($this->_dependency_map[$class_name], $this->_dependency_map[$class_name][$dependency])
 			? true
 			: false;
 	}
@@ -188,9 +188,9 @@ 
 	 * @param string $dependency
 	 * @return int
 	 */
-	public function loading_strategy_for_class_dependency( $class_name = '', $dependency = '' ) {
-		return $this->has_dependency_for_class( $class_name, $dependency )
-			? $this->_dependency_map[ $class_name ][ $dependency ]
+	public function loading_strategy_for_class_dependency($class_name = '', $dependency = '') {
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[$class_name][$dependency]
 			: EE_Dependency_Map::not_registered;
 	}
 
@@ -200,8 +200,8 @@ 
 	 * @param string $class_name
 	 * @return string | Closure
 	 */
-	public function class_loader( $class_name ) {
-		return isset( $this->_class_loaders[ $class_name ] ) ? $this->_class_loaders[ $class_name ] : '';
+	public function class_loader($class_name) {
+		return isset($this->_class_loaders[$class_name]) ? $this->_class_loaders[$class_name] : '';
 	}
 
 
@@ -339,17 +339,17 @@ 
 			'EE_Messages_Data_Handler_Collection'  => 'load_lib',
 			'EE_Message_Template_Group_Collection' => 'load_lib',
 			'EE_Messages_Generator' => function() {
-				return EE_Registry::instance()->load_lib( 'Messages_Generator', array(), false, false );
+				return EE_Registry::instance()->load_lib('Messages_Generator', array(), false, false);
 			},
-			'EE_Messages_Template_Defaults' => function( $arguments = array() ) {
-				return EE_Registry::instance()->load_lib( 'Messages_Template_Defaults', $arguments, false, false );
+			'EE_Messages_Template_Defaults' => function($arguments = array()) {
+				return EE_Registry::instance()->load_lib('Messages_Template_Defaults', $arguments, false, false);
 			},
 			//load_model
 			'EEM_Message_Template_Group'           => 'load_model',
 			'EEM_Message_Template'                 => 'load_model',
 			//load_helper
 			'EEH_Parse_Shortcodes'                 => function() {
-				if ( EE_Registry::instance()->load_helper( 'Parse_Shortcodes' ) ) {
+				if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
 					return new EEH_Parse_Shortcodes();
 				}
 				return null;

core/libraries/form_sections/inputs/EE_Year_Input.input.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -24,18 +24,18 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Year_Input extends EE_Select_Input{
+class EE_Year_Input extends EE_Select_Input {
 
-	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0 ){
-		if($four_digit_year){
+	function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0) {
+		if ($four_digit_year) {
 			$current_year_int = intval(date('Y'));
-		}else{
+		} else {
 			$current_year_int = intval(date('y'));
 		}
 		$answer_options = array();
-		for( $start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++){
+		for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
 			$answer_options[$start] = $start;
 		}
-		parent::__construct( $answer_options, $input_settings );
+		parent::__construct($answer_options, $input_settings);
 	}
 }

core/libraries/form_sections/strategies/validation/EE_Full_HTML_Validation_Strategy.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -10,21 +10,21 @@ 
  * @since 				4.6
  *
  */
-class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = NULL ) {
-		if ( ! $validation_error_message ) {
+	public function __construct($validation_error_message = NULL) {
+		if ( ! $validation_error_message) {
 			global $allowedposttags;
 			$validation_error_message = sprintf(
-				__( 'Only the following HTML tags are allowed:%1$s%2$s', "event_espresso" ),
+				__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
 				'<br />',
-				implode( ",", array_keys( $allowedposttags ) )
+				implode(",", array_keys($allowedposttags))
 			);
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -38,8 +38,8 @@ 
 	 */
 	public function get_list_of_allowed_tags() {
 		global $allowedposttags;
-		ksort( $allowedposttags );
-		return implode( ', ', array_keys( $allowedposttags ) );
+		ksort($allowedposttags);
+		return implode(', ', array_keys($allowedposttags));
 	}
 
 
@@ -50,10 +50,10 @@ 
 	 */
 	public function validate($normalized_value) {
 		global $allowedposttags;
-		parent::validate( $normalized_value );
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value", $allowedposttags );
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedposttags);
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
 		}
 	}
 }
\ No newline at end of file

core/libraries/form_sections/strategies/display/EE_Text_Area_Display_Strategy.strategy.php

Indentation +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
 
 
 	/**
-	*
-	* @return string of html to display the field
-	*/
+	 *
+	 * @return string of html to display the field
+	 */
 	function display(){
 		$input = $this->_input;
 		$raw_value = maybe_serialize($input->raw_value());

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base {
 
 
 
@@ -7,31 +7,31 @@ 
 	*
 	* @return string of html to display the field
 	*/
-	function display(){
+	function display() {
 		$input = $this->_input;
 		$raw_value = maybe_serialize($input->raw_value());
-		if( $input instanceof EE_Text_Area_Input ) {
+		if ($input instanceof EE_Text_Area_Input) {
 			$rows = $input->get_rows();
 			$cols = $input->get_cols();
-		}else{
+		} else {
 			$rows = 4;
 			$cols = 20;
 		}
 		$html = '<textarea';
-		$html .= ' id="' . $input->html_id() . '"';
-		$html .= ' name="' . $input->html_name() . '"';
-		$html .= ' class="' . $input->html_class() . '"' ;
-		$html .= ' style="' . $input->html_style() . '"';
-		$html .= ' rows= "' . $rows . '" cols="' . $cols . '">';
+		$html .= ' id="'.$input->html_id().'"';
+		$html .= ' name="'.$input->html_name().'"';
+		$html .= ' class="'.$input->html_class().'"';
+		$html .= ' style="'.$input->html_style().'"';
+		$html .= ' rows= "'.$rows.'" cols="'.$cols.'">';
 		$html .= $raw_value;
 		$html .= '</textarea>';
-		foreach ( $this->_input->get_validation_strategies() as $validation_strategy ) {
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
 			if (
 				$validation_strategy instanceof EE_Simple_HTML_Validation_Strategy
 				|| $validation_strategy instanceof EE_Full_HTML_Validation_Strategy
 			) {
 				$html .= sprintf(
-					__( '%1$s(allowed tags: %2$s)%3$s', 'event_espresso' ),
+					__('%1$s(allowed tags: %2$s)%3$s', 'event_espresso'),
 					'<p class="ee-question-desc">',
 					$validation_strategy->get_list_of_allowed_tags(),
 					'</p>'

admin_pages/messages/qtips/EE_Message_List_Table_Tips.lib.php

Spacing +24 added lines, -24 removed lines

@@ -18,9 +18,9 @@ 
 	protected function _set_tips_array() {
 		$this->_qtipsa = array(
 			0 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_sent,
-				'target' => '.msg-status-' . EEM_Message::status_sent,
-				'content' => $this->_message_status_legend( EEM_Message::status_sent ),
+				'content_id' => 'message_status-'.EEM_Message::status_sent,
+				'target' => '.msg-status-'.EEM_Message::status_sent,
+				'content' => $this->_message_status_legend(EEM_Message::status_sent),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -28,9 +28,9 @@ 
 					)
 				),
 			1 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_idle,
-				'target' => '.msg-status-' . EEM_Message::status_idle,
-				'content' => $this->_message_status_legend( EEM_Message::status_idle ),
+				'content_id' => 'message_status-'.EEM_Message::status_idle,
+				'target' => '.msg-status-'.EEM_Message::status_idle,
+				'content' => $this->_message_status_legend(EEM_Message::status_idle),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -38,9 +38,9 @@ 
 					)
 				),
 			2 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_failed,
-				'target' => '.msg-status-' . EEM_Message::status_failed,
-				'content' => $this->_message_status_legend( EEM_Message::status_failed ),
+				'content_id' => 'message_status-'.EEM_Message::status_failed,
+				'target' => '.msg-status-'.EEM_Message::status_failed,
+				'content' => $this->_message_status_legend(EEM_Message::status_failed),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -48,9 +48,9 @@ 
 					)
 				),
 			3 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_resend,
-				'target' => '.msg-status-' . EEM_Message::status_resend,
-				'content' => $this->_message_status_legend( EEM_Message::status_resend ),
+				'content_id' => 'message_status-'.EEM_Message::status_resend,
+				'target' => '.msg-status-'.EEM_Message::status_resend,
+				'content' => $this->_message_status_legend(EEM_Message::status_resend),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -58,9 +58,9 @@ 
 					)
 				),
 			4 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_incomplete,
-				'target' => '.msg-status-' . EEM_Message::status_incomplete,
-				'content' => $this->_message_status_legend( EEM_Message::status_incomplete ),
+				'content_id' => 'message_status-'.EEM_Message::status_incomplete,
+				'target' => '.msg-status-'.EEM_Message::status_incomplete,
+				'content' => $this->_message_status_legend(EEM_Message::status_incomplete),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -68,9 +68,9 @@ 
 					)
 				),
 			5 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_retry,
-				'target' => '.msg-status-' . EEM_Message::status_retry,
-				'content' => $this->_message_status_legend( EEM_Message::status_retry ),
+				'content_id' => 'message_status-'.EEM_Message::status_retry,
+				'target' => '.msg-status-'.EEM_Message::status_retry,
+				'content' => $this->_message_status_legend(EEM_Message::status_retry),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -78,9 +78,9 @@ 
 					)
 				),
 			6 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_debug_only,
-				'target' => '.msg-status-' . EEM_Message::status_debug_only,
-				'content' => $this->_message_status_legend( EEM_Message::status_debug_only ),
+				'content_id' => 'message_status-'.EEM_Message::status_debug_only,
+				'target' => '.msg-status-'.EEM_Message::status_debug_only,
+				'content' => $this->_message_status_legend(EEM_Message::status_debug_only),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -99,7 +99,7 @@ 
 	 * @param  EEM_Message constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _message_status_legend( $status ) {
+	private function _message_status_legend($status) {
 
 		$status_array = array(
 			'sent_status' => EEM_Message::status_sent,
@@ -110,10 +110,10 @@ 
 			'retry_status' => EEM_Message::status_retry,
 			);
 
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$status_array['debug_only_status'] = EEM_Message::status_debug_only;
 		}
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }
\ No newline at end of file

core/db_models/EEM_Status.model.php

Indentation +35 added lines, -35 removed lines

@@ -83,7 +83,7 @@ 
 	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
 		$translation_array = array(
-	     	EEM_Registration::status_id_pending_payment => array(
+		 	EEM_Registration::status_id_pending_payment => array(
 				__('pending payment', 'event_espresso'), //singular
 				__('pending payments', 'event_espresso') //plural
 			),
@@ -217,22 +217,22 @@ 
 				__('queued for sending', 'event_espresso'),
 				__('queued for sending', 'event_espresso'),
 			),
-	        EEM_Message::status_failed => array(
-		        __('failed', 'event_espresso'),
-		        __('failed', 'event_espresso'),
-	        ),
+			EEM_Message::status_failed => array(
+				__('failed', 'event_espresso'),
+				__('failed', 'event_espresso'),
+			),
 			EEM_Message::status_debug_only => array(
 				__( 'debug only', 'event_espresso' ),
 				__( 'debug only', 'event_espresso' )
 			),
-	        EEM_Message::status_resend => array(
-		        __('queued for resending', 'event_espresso'),
-		        __('queued for resending', 'event_espresso'),
-	        ),
-	        EEM_Message::status_incomplete => array(
-		        __('queued for generating', 'event_espresso'),
-		        __('queued for generating', 'event_espresso'),
-	        ),
+			EEM_Message::status_resend => array(
+				__('queued for resending', 'event_espresso'),
+				__('queued for resending', 'event_espresso'),
+			),
+			EEM_Message::status_incomplete => array(
+				__('queued for generating', 'event_espresso'),
+				__('queued for generating', 'event_espresso'),
+			),
 			EEM_Message::status_retry => array(
 				__('failed sending, can be retried', 'event_espresso'),
 				__('failed sending, can be retried', 'event_espresso'),
@@ -261,37 +261,37 @@ 
 	  			__('trashed', 'event_espresso'),
 	  			__('trashed', 'event_espresso')
   			),
-	    );
+		);
 
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
 
 		if ( !is_array($statuses) )
 			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
 
-	    $translation = array();
+		$translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
-	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
-	    	} else {
-	    		$translation[$id] = $code;
-	    	}
+		foreach ( $statuses as $id => $code ) {
+			if ( isset( $translation_array[$id] ) ) {
+				$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
+			} else {
+				$translation[$id] = $code;
+			}
 
-	    	//schema
-	    	switch ( $schema ) {
-	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
-	    			break;
-	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
-	    			break;
-	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
-	    			break;
-	    	}
-	    }
+			//schema
+			switch ( $schema ) {
+				case 'lower' :
+					$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+					break;
+				case 'sentence' :
+					$translation[$id] = ucwords( $translation[$id] );
+					break;
+				case 'upper' :
+					$translation[$id] = strtoupper( $translation[$id] );
+					break;
+			}
+		}
 
-	    return $translation;
+		return $translation;
 	}
 
 

Spacing +23 added lines, -23 removed lines

@@ -13,7 +13,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 /**
  *
  * Class EEM_Status
@@ -32,32 +32,32 @@ 
 	/**
 	 * @return EEM_Status
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Status','event_espresso');
-		$this->plural_item = __('Stati','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Status', 'event_espresso');
+		$this->plural_item = __('Stati', 'event_espresso');
 		$this->_tables = array(
 			'Status'=> new EE_Primary_Table('esp_status', 'STS_ID')
 		);
 		$this->_fields = array(
 			'Status'=>array(
-				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID','event_espresso')),
-				'STS_code'=>new EE_Plain_Text_Field('STS_code',__('Status Code','event_espresso'),false, ''),
+				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID', 'event_espresso')),
+				'STS_code'=>new EE_Plain_Text_Field('STS_code', __('Status Code', 'event_espresso'), false, ''),
 				'STS_type'=>new EE_Enum_Text_Field(
 					'STS_type',
 					__("Type", "event_espresso"),
 					false,
 					'event',
 						array(
-							'event'=> __("Event", "event_espresso"),//deprecated
+							'event'=> __("Event", "event_espresso"), //deprecated
 							'registration'=>  __("Registration", "event_espresso"),
 							'transaction'=>  __("Transaction", "event_espresso"),
 							'payment'=>  __("Payment", "event_espresso"),
 							'email'=>  __("Email", "event_espresso"),
 							'message' => __("Message", "event_espresso")
 						)),
-				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?','event_espresso'), false),
+				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?', 'event_espresso'), false),
 				'STS_desc'=>new EE_Simple_HTML_Field('STS_desc', __("Description", "event_espresso"), false, ''),
-				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false,false)
+				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false, false)
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
@@ -65,9 +65,9 @@ 
 			'Payment'=>new EE_Has_Many_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @throws EE_Error
 	 * @return array             an array of translated strings for the incoming status id.
 	 */
-	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
+	public function localized_status($statuses, $plural = FALSE, $schema = 'upper') {
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
 		$translation_array = array(
 	     	EEM_Registration::status_id_pending_payment => array(
@@ -222,8 +222,8 @@ 
 		        __('failed', 'event_espresso'),
 	        ),
 			EEM_Message::status_debug_only => array(
-				__( 'debug only', 'event_espresso' ),
-				__( 'debug only', 'event_espresso' )
+				__('debug only', 'event_espresso'),
+				__('debug only', 'event_espresso')
 			),
 	        EEM_Message::status_resend => array(
 		        __('queued for resending', 'event_espresso'),
@@ -263,30 +263,30 @@ 
   			),
 	    );
 
-		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
 
-		if ( !is_array($statuses) )
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		if ( ! is_array($statuses))
+			throw new EE_Error(__('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso'));
 
 	    $translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
+	    foreach ($statuses as $id => $code) {
+	    	if (isset($translation_array[$id])) {
 	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
 	    	} else {
 	    		$translation[$id] = $code;
 	    	}
 
 	    	//schema
-	    	switch ( $schema ) {
+	    	switch ($schema) {
 	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+	    			$translation[$id] = strtolower($translation[$id]); //even though these start in lower case, this will catch any statuses added via filter.
 	    			break;
 	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
+	    			$translation[$id] = ucwords($translation[$id]);
 	    			break;
 	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
+	    			$translation[$id] = strtoupper($translation[$id]);
 	    			break;
 	    	}
 	    }

caffeinated/admin/extend/about/templates/whats_new.template.php

Spacing +9 added lines, -9 removed lines

@@ -1,25 +1,25 @@
 <div class="changelog point-releases">
-	<!-- <h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3> -->
-	<h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>
+	<!-- <h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3> -->
+	<h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>
 	<?php //$type = 'minor'; ?>
 	<?php $type = 'major'; ?>
-	<p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?>
+	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?>
 		<?php
-			$ver = explode( '.', EVENT_ESPRESSO_VERSION );
-			array_pop( $ver );
-			$ver = implode( '.', $ver );
+			$ver = explode('.', EVENT_ESPRESSO_VERSION);
+			array_pop($ver);
+			$ver = implode('.', $ver);
 		?>
-		<?php printf( __( 'For more information, see <a href="%s" target="_blank">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?>
+		<?php printf(__('For more information, see <a href="%s" target="_blank">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?>
  	</p>
 </div>
 
 <div class="changelog">
 	<?php
 	//maintenance mode on?
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 		?>
 		<div class="ee-attention">
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
 			<p>
 			<?php
 				printf(