eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Datetime_List_Shortcodes.lib.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[DATETIME_LIST]' :
 				return $this->_get_datetime_list();
 				break;
@@ -62,13 +62,13 @@ 
 	private function _get_datetime_list() {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Ticket )
+		if ($this->_data['data'] instanceof EE_Ticket)
 			return $this->_get_datetime_list_for_ticket();
 
-		else if ( $this->_data['data'] instanceof EE_Event )
+		else if ($this->_data['data'] instanceof EE_Event)
 			return $this->_get_datetime_list_for_event();
 
-		else if ( $this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration ) {
+		else if ($this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration) {
 			return $this->_get_datetime_list_for_registration();
 		}
 
@@ -85,7 +85,7 @@ 
 	 */
 	private function _get_datetime_list_for_event() {
 		$valid_shortcodes = array('datetime', 'attendee');
-		$template = is_array($this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
 		$event = $this->_data['data'];
 
 		//here we're setting up the datetimes for the datetime list template for THIS event.
@@ -93,7 +93,7 @@ 
 		$datetimes = $this->_get_datetimes_from_event($event);
 
 		//each datetime in this case should be an datetime object.
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -109,7 +109,7 @@ 
 	private function _get_datetime_list_for_ticket() {
 		$valid_shortcodes = array('datetime', 'attendee');
 
-		$template = is_array($this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
 		$ticket = $this->_data['data'];
 
 		//here we're setting up the datetimes for the datetime list template for THIS ticket.
@@ -117,7 +117,7 @@ 
 		$datetimes = $this->_get_datetimes_from_ticket($ticket);
 
 		//each datetime in this case should be an datetime object.
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -142,11 +142,11 @@ 
 
 
 
-	private function _get_datetimes_from_event( EE_Event $event, $att = NULL ) {
+	private function _get_datetimes_from_event(EE_Event $event, $att = NULL) {
 		 return isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 	}
 
-	private function _get_datetimes_from_ticket( EE_Ticket $ticket, $att = NULL ) {
+	private function _get_datetimes_from_ticket(EE_Ticket $ticket, $att = NULL) {
 		return isset($this->_extra_data['data']->tickets) ? $this->_extra_data['data']->tickets[$ticket->ID()]['dtt_objs'] : array();
 	}
 

Braces +10 added lines, -10 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -62,19 +63,18 @@ 
 	private function _get_datetime_list() {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Ticket )
-			return $this->_get_datetime_list_for_ticket();
-
-		else if ( $this->_data['data'] instanceof EE_Event )
-			return $this->_get_datetime_list_for_event();
-
-		else if ( $this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration ) {
+		if ( $this->_data['data'] instanceof EE_Ticket ) {
+					return $this->_get_datetime_list_for_ticket();
+		} else if ( $this->_data['data'] instanceof EE_Event ) {
+					return $this->_get_datetime_list_for_event();
+		} else if ( $this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration ) {
 			return $this->_get_datetime_list_for_registration();
 		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

core/libraries/shortcodes/EE_Attendee_List_Shortcodes.lib.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -48,8 +48,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[ATTENDEE_LIST]' :
 				return $this->_get_attendee_list();
 				break;
@@ -66,13 +66,13 @@ 
 	private function _get_attendee_list() {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
 			return $this->_get_attendee_list_for_main();
 
-		else if ( $this->_data['data'] instanceof EE_Event )
+		else if ($this->_data['data'] instanceof EE_Event)
 			return $this->_get_attendee_list_for_event();
 
-		else if ( $this->_data['data'] instanceof EE_Ticket )
+		else if ($this->_data['data'] instanceof EE_Ticket)
 			return $this->_get_registration_list_for_ticket();
 
 		//prevent recursive loop
@@ -92,7 +92,7 @@ 
 
 
 		//now we need to loop through the attendee list and send data to the EE_Parser helper.
-		foreach ( $data->reg_objs as $registration ) {
+		foreach ($data->reg_objs as $registration) {
 			$attnds .= $this->_shortcode_helper->parse_attendee_list_template($template, $registration, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -106,8 +106,8 @@ 
 	 * @return string
 	 */
 	private function _get_attendee_list_for_event() {
-		$valid_shortcodes = array('attendee', 'ticket_list', 'question_list', 'recipient_details' );
-		$template = is_array( $this->_data['template'] ) && isset($this->_data['template']['attendee_list']) ? $this->_data['template']['attendee_list'] : $this->_extra_data['template']['attendee_list'];
+		$valid_shortcodes = array('attendee', 'ticket_list', 'question_list', 'recipient_details');
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['attendee_list']) ? $this->_data['template']['attendee_list'] : $this->_extra_data['template']['attendee_list'];
 		$event = $this->_data['data'];
 
 		//let's remove any existing [EVENT_LIST] shortcode from the attendee list template so that we don't get recursion.
@@ -118,7 +118,7 @@ 
 		$registrations = $this->_get_registrations_from_event($event);
 
 		//each attendee in this case should be an attendee object.
-		foreach ( $registrations as $registration ) {
+		foreach ($registrations as $registration) {
 			$att_result .= $this->_shortcode_helper->parse_attendee_list_template($template, $registration, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -132,8 +132,8 @@ 
 	 * @return string
 	 */
 	private function _get_registration_list_for_ticket() {
-		$valid_shortcodes = array( 'attendee', 'event_list', 'question_list', 'recipient_details' );
-		$template = is_array( $this->_data['template'] ) && isset($this->_data['template']['attendee_list']) ? $this->_data['template']['attendee_list'] : $this->_extra_data['template']['attendee_list'];
+		$valid_shortcodes = array('attendee', 'event_list', 'question_list', 'recipient_details');
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['attendee_list']) ? $this->_data['template']['attendee_list'] : $this->_extra_data['template']['attendee_list'];
 		$ticket = $this->_data['data'];
 
 		//let's remove any existing [TICKET_LIST] (or related) shortcode from the attendee list template so that we don't get recursion.
@@ -143,10 +143,10 @@ 
 
 		//here we're setting up the attendees for the attendee_list template for THIS ticket.
 		$att_result = '';
-		$registrations = isset( $this->_extra_data['data']->tickets ) ? $this->_extra_data['data']->tickets[$ticket->ID()]['reg_objs'] : array();
+		$registrations = isset($this->_extra_data['data']->tickets) ? $this->_extra_data['data']->tickets[$ticket->ID()]['reg_objs'] : array();
 
 		//each attendee in this case should be an attendee object.
-		foreach ( $registrations as $registration ) {
+		foreach ($registrations as $registration) {
 			$att_result .= $this->_shortcode_helper->parse_attendee_list_template($template, $registration, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -156,7 +156,7 @@ 
 
 
 
-	private function _get_registrations_from_event( EE_Event $event ) {
+	private function _get_registrations_from_event(EE_Event $event) {
 		return isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['reg_objs'] : array();
 	}
 

Braces +12 added lines, -11 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -66,18 +67,18 @@ 
 	private function _get_attendee_list() {
 		$this->_validate_list_requirements();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_attendee_list_for_main();
-
-		else if ( $this->_data['data'] instanceof EE_Event )
-			return $this->_get_attendee_list_for_event();
-
-		else if ( $this->_data['data'] instanceof EE_Ticket )
-			return $this->_get_registration_list_for_ticket();
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_attendee_list_for_main();
+		} else if ( $this->_data['data'] instanceof EE_Event ) {
+					return $this->_get_attendee_list_for_event();
+		} else if ( $this->_data['data'] instanceof EE_Ticket ) {
+					return $this->_get_registration_list_for_ticket();
+		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

core/libraries/shortcodes/EE_Line_Item_List_Shortcodes.lib.php

Spacing +24 added lines, -24 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -34,16 +34,16 @@ 
 		$this->_shortcodes = array(
 			'[TICKET_LINE_ITEM_LIST]' => __('Outputs a list of ticket line items.', 'event_espresso'),
 			'[TAX_LINE_ITEM_LIST]' => __('Outputs a list of tax line items.', 'event_espresso'),
-			'[ADDITIONAL_LINE_ITEM_LIST]' => __( 'Outputs a list of additional line items (other charges or discounts)', 'event_espresso' ),
+			'[ADDITIONAL_LINE_ITEM_LIST]' => __('Outputs a list of additional line items (other charges or discounts)', 'event_espresso'),
 			'[PRICE_MODIFIER_LINE_ITEM_LIST]' => __('Outputs a list of price modifier line items', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[TICKET_LINE_ITEM_LIST]' :
 				return $this->_get_ticket_line_item_list();
 				break;
@@ -79,28 +79,28 @@ 
 	private function _get_ticket_line_item_list() {
 		$this->_validate_list_requirements();
 
-		if ( ! $this->_data['data'] instanceof EE_Ticket ) {
+		if ( ! $this->_data['data'] instanceof EE_Ticket) {
 			return '';
 		}
 
-		$valid_shortcodes = array( 'line_item', 'line_item_list', 'ticket' );
+		$valid_shortcodes = array('line_item', 'line_item_list', 'ticket');
 
 		$ticket = $this->_data['data'];
 		$templates = $this->_extra_data['template'];
 		$addressee_obj = $this->_extra_data['data'];
 
 		//made it here so we have an EE_Ticket, so we should have what we need.
-		$ticket_line_item = isset( $addressee_obj->tickets[$ticket->ID()]['line_item'] ) ? $addressee_obj->tickets[$ticket->ID()]['line_item'] : null;
-		$sub_line_items = isset( $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] ) ? $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] : array();
+		$ticket_line_item = isset($addressee_obj->tickets[$ticket->ID()]['line_item']) ? $addressee_obj->tickets[$ticket->ID()]['line_item'] : null;
+		$sub_line_items = isset($addressee_obj->tickets[$ticket->ID()]['sub_line_items']) ? $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] : array();
 
-		$template = count( $sub_line_items ) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
+		$template = count($sub_line_items) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
 
-		if ( empty( $ticket_line_item ) || empty( $sub_line_items ) ) {
+		if (empty($ticket_line_item) || empty($sub_line_items)) {
 			return '';
 		}
 
 		//now we just return the appropriate template parsed for each ticket.
-		return $this->_shortcode_helper->parse_line_item_list_template( $template, $ticket_line_item, $valid_shortcodes, $this->_extra_data );
+		return $this->_shortcode_helper->parse_line_item_list_template($template, $ticket_line_item, $valid_shortcodes, $this->_extra_data);
 	}
 
 
@@ -117,18 +117,18 @@ 
 
 		$this->_validate_list_requirements();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$tax_line_items = $this->_data['data']->tax_line_items;
 		$line_item_list = '';
-		foreach ( $tax_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($tax_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;
@@ -145,18 +145,18 @@ 
 
 		$this->_validate_list_requirements();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$additional_line_items = $this->_data['data']->additional_line_items;
 		$line_item_list = '';
-		foreach ( $additional_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($additional_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 
@@ -178,7 +178,7 @@ 
 	private function _get_price_mod_line_item_list() {
 		$this->_validate_list_requirements();
 
-		if ( ! $this->_data['data'] instanceof EE_Line_Item ) {
+		if ( ! $this->_data['data'] instanceof EE_Line_Item) {
 			return '';
 		}
 
@@ -187,16 +187,16 @@ 
 		$templates = $this->_extra_data['template'];
 		$addressee_obj = $this->_extra_data['data'];
 
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 
 		$main_line_item_id = $main_line_item->ID();
 
-		$price_mod_line_items = ! empty( $addressee_obj->line_items_with_children[$main_line_item_id]['children'] ) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
+		$price_mod_line_items = ! empty($addressee_obj->line_items_with_children[$main_line_item_id]['children']) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
 
 		$line_item_list = '';
 
-		foreach( $price_mod_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data  );
+		foreach ($price_mod_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;

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

core/libraries/batch/JobHandlerBaseClasses/JobHandler.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  */
 namespace EventEspressoBatchRequest\JobHandlerBaseClasses;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 

core/libraries/plugin_api/EE_Register_Module.lib.php

Spacing +15 added lines, -15 removed lines

@@ -44,33 +44,33 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $module_id = NULL, $setup_args = array()  ) {
+	public static function register($module_id = NULL, $setup_args = array()) {
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $module_id ) || ! is_array( $setup_args ) || empty( $setup_args['module_paths'] )) {
-			throw new EE_Error( __( 'In order to register Modules with EE_Register_Module::register(), you must include a "module_id" (a unique identifier for this set of modules), and an array containing the following keys: "module_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)', 'event_espresso' ));
+		if (empty($module_id) || ! is_array($setup_args) || empty($setup_args['module_paths'])) {
+			throw new EE_Error(__('In order to register Modules with EE_Register_Module::register(), you must include a "module_id" (a unique identifier for this set of modules), and an array containing the following keys: "module_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_settings[ $module_id ] ) ){
+		if (isset(self::$_settings[$module_id])) {
 			return;
 		}
 
 		//make sure this was called in the right place!
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' )) {
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
-				__( 'An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.','event_espresso'),
+				__('An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.', 'event_espresso'),
 				'4.3.0'
 			);
 		}
 		//setup $_settings array from incoming values.
-		self::$_settings[ $module_id ] = array(
+		self::$_settings[$module_id] = array(
 			// array of full server paths to any EED_Modules used by the module
-			'module_paths'  => isset( $setup_args['module_paths'] ) ? (array)$setup_args['module_paths'] : array(),
+			'module_paths'  => isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
 		);
 		// add to list of modules to be registered
-		add_filter( 'FHEE__EE_Config__register_modules__modules_to_register', array( 'EE_Register_Module', 'add_modules' ));
+		add_filter('FHEE__EE_Config__register_modules__modules_to_register', array('EE_Register_Module', 'add_modules'));
 	}
 
 
@@ -83,9 +83,9 @@ 
 	 * @param array $modules_to_register  array of paths to all modules that require registering
 	 * @return array
 	 */
-	public static function add_modules( $modules_to_register ){
-		foreach( self::$_settings as $settings ) {
-			$modules_to_register = array_merge( $modules_to_register, $settings['module_paths'] );
+	public static function add_modules($modules_to_register) {
+		foreach (self::$_settings as $settings) {
+			$modules_to_register = array_merge($modules_to_register, $settings['module_paths']);
 		}
 		return $modules_to_register;
 	}
@@ -101,9 +101,9 @@ 
 	 * @param string  $module_id the name for the module that was previously registered
 	 * @return void
 	 */
-	public static function deregister( $module_id = NULL ) {
-		if ( isset( self::$_settings[ $module_id ] )) {
-			unset( self::$_settings[ $module_id ] );
+	public static function deregister($module_id = NULL) {
+		if (isset(self::$_settings[$module_id])) {
+			unset(self::$_settings[$module_id]);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Payment_Method.lib.php

Spacing +17 added lines, -17 removed lines

@@ -48,33 +48,33 @@ 
 	 * @type array payment_method_paths 	an array of full server paths to folders containing any EE_PMT_Base children, or to the EED_Module files themselves
 	 * @return void
 	 */
-	public static function register( $payment_method_id = NULL, $setup_args = array()  ) {
+	public static function register($payment_method_id = NULL, $setup_args = array()) {
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $payment_method_id ) || ! is_array( $setup_args ) || empty( $setup_args['payment_method_paths'] )) {
-			throw new EE_Error( __( 'In order to register Payment Methods with EE_Register_Payment_Method::register(), you must include a "payment_method_id" (a unique identifier for this set of modules), and an array containing the following keys: "payment_method_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)', 'event_espresso' ));
+		if (empty($payment_method_id) || ! is_array($setup_args) || empty($setup_args['payment_method_paths'])) {
+			throw new EE_Error(__('In order to register Payment Methods with EE_Register_Payment_Method::register(), you must include a "payment_method_id" (a unique identifier for this set of modules), and an array containing the following keys: "payment_method_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_settings[ $payment_method_id ] ) ){
+		if (isset(self::$_settings[$payment_method_id])) {
 			return;
 		}
 
 		//make sure this was called in the right place!
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' )) {
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
-				__( 'An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.','event_espresso'),
+				__('An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.', 'event_espresso'),
 				'4.3.0'
 			);
 		}
 		//setup $_settings array from incoming values.
-		self::$_settings[ $payment_method_id ] = array(
+		self::$_settings[$payment_method_id] = array(
 			// array of full server paths to any EE_PMT_Base children used
-			'payment_method_paths'  => isset( $setup_args['payment_method_paths'] ) ? (array)$setup_args['payment_method_paths'] : array(),
+			'payment_method_paths'  => isset($setup_args['payment_method_paths']) ? (array) $setup_args['payment_method_paths'] : array(),
 		);
 		// add to list of modules to be registered
-		add_filter( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array( 'EE_Register_Payment_Method', 'add_payment_methods' ));
+		add_filter('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array('EE_Register_Payment_Method', 'add_payment_methods'));
 
 		/**
 		 * If EE_Payment_Method_Manager::register_payment_methods has already been called, we need it to be called again
@@ -82,9 +82,9 @@ 
 		 * will be called only once per payment method from an addon, so going with that assumption we should always do this.
 		 * If that assumption is false, we should verify this newly-registered payment method isn't on the EE_Payment_Method_Manager::_payment_method_types array before calling this (this code should be changed to improve performance)
 		 */
-		if ( did_action( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods' ) ) {
+		if (did_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods')) {
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			EE_Payment_Method_Manager::instance()->maybe_register_payment_methods( TRUE );
+			EE_Payment_Method_Manager::instance()->maybe_register_payment_methods(TRUE);
 		}
 	}
 
@@ -97,9 +97,9 @@ 
 	 * @param array $payment_method_folders  array of paths to all payment methods that require registering
 	 * @return array
 	 */
-	public static function add_payment_methods( $payment_method_folders ){
-		foreach( self::$_settings as $settings ) {
-			$payment_method_folders = array_merge( $payment_method_folders, $settings['payment_method_paths'] );
+	public static function add_payment_methods($payment_method_folders) {
+		foreach (self::$_settings as $settings) {
+			$payment_method_folders = array_merge($payment_method_folders, $settings['payment_method_paths']);
 		}
 		return $payment_method_folders;
 	}
@@ -114,9 +114,9 @@ 
 	 * @param string  $module_id the name for the module that was previously registered
 	 * @return void
 	 */
-	public static function deregister( $module_id = NULL ) {
-		if ( isset( self::$_settings[ $module_id ] )) {
-			unset( self::$_settings[ $module_id ] );
+	public static function deregister($module_id = NULL) {
+		if (isset(self::$_settings[$module_id])) {
+			unset(self::$_settings[$module_id]);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Model_Extensions.lib.php

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage plugin api
  */
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit('NO direct script access allowed'); }
+if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 
 /**
  * EE_Register_Model_Extensions
@@ -34,26 +34,26 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register( $model_id = NULL, $config = array() ) {
+	public static function register($model_id = NULL, $config = array()) {
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $model_id ) || ! is_array( $config ) || ( empty( $config['model_extension_paths'] ) && empty( $config['class_extension_paths'] ) ) ) {
-			throw new EE_Error( __( 'In order to register Model extensions with EE_Register_Model_Extensions::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_extension_paths" (an array of full server paths to folders that contain model extensions), and "class_extension_paths" (an array of full server paths to folders that contain class extensions)', 'event_espresso' ));
+		if (empty($model_id) || ! is_array($config) || (empty($config['model_extension_paths']) && empty($config['class_extension_paths']))) {
+			throw new EE_Error(__('In order to register Model extensions with EE_Register_Model_Extensions::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_extension_paths" (an array of full server paths to folders that contain model extensions), and "class_extension_paths" (an array of full server paths to folders that contain class extensions)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $model_id ] ) ){
+		if (isset(self::$_registry[$model_id])) {
 			return;
 		}
 		//check correct loading
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_Admin__loaded'  )) {
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('An attempt was made to register "%1$s" as a Model extension has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.%2$s Hook Status: %2$s "AHEE__EE_System__load_espresso_addons" : %3$s %2$s "AHEE__EE_Admin__loaded" : %4$s%2$s','event_espresso'),
+					__('An attempt was made to register "%1$s" as a Model extension has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.%2$s Hook Status: %2$s "AHEE__EE_System__load_espresso_addons" : %3$s %2$s "AHEE__EE_Admin__loaded" : %4$s%2$s', 'event_espresso'),
 					$model_id,
 					'<br />',
-					did_action( 'AHEE__EE_System__load_espresso_addons' ) ? 'action done' : 'action NOT done',
-					did_action( 'AHEE__EE_Admin__loaded' ) ? 'action done' : 'action NOT done'
+					did_action('AHEE__EE_System__load_espresso_addons') ? 'action done' : 'action NOT done',
+					did_action('AHEE__EE_Admin__loaded') ? 'action done' : 'action NOT done'
 				),
 				'4.3'
 			);
@@ -62,26 +62,26 @@ 
 		self::$_registry[$model_id] = $config;
 		self::$_extensions[$model_id] = array();
 
-		if(isset($config['model_extension_paths'])){
+		if (isset($config['model_extension_paths'])) {
 			require_once(EE_LIBRARIES.'plugin_api/db/EEME_Base.lib.php');
 			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['model_extension_paths']);
 			EEH_Autoloader::register_autoloader($class_to_filepath_map);
-			foreach(array_keys($class_to_filepath_map) as $classname){
+			foreach (array_keys($class_to_filepath_map) as $classname) {
 				self::$_extensions[$model_id]['models'][$classname] = new $classname;
 			}
 			unset($config['model_extension_paths']);
 		}
-		if(isset($config['class_extension_paths'])){
+		if (isset($config['class_extension_paths'])) {
 			require_once(EE_LIBRARIES.'plugin_api/db/EEE_Base_Class.lib.php');
 			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_extension_paths']);
 			EEH_Autoloader::register_autoloader($class_to_filepath_map);
-			foreach(array_keys($class_to_filepath_map) as $classname){
+			foreach (array_keys($class_to_filepath_map) as $classname) {
 				self::$_extensions[$model_id]['classes'][$classname] = new $classname;
 			}
 			unset($config['class_extension_paths']);
 		}
-		foreach($config as $unknown_key => $unknown_config){
-			throw new EE_Error(sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"),$unknown_key));
+		foreach ($config as $unknown_key => $unknown_config) {
+			throw new EE_Error(sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key));
 		}
 	}
 
@@ -90,11 +90,11 @@ 
 	 * deregister
 	 * @param string $model_id
 	 */
-	public static function deregister( $model_id = NULL ){
-		if(isset(self::$_registry[$model_id])){
+	public static function deregister($model_id = NULL) {
+		if (isset(self::$_registry[$model_id])) {
 			unset(self::$_registry[$model_id]);
-			foreach(self::$_extensions[$model_id] as $extension_of_type){
-				foreach($extension_of_type as $extension ){
+			foreach (self::$_extensions[$model_id] as $extension_of_type) {
+				foreach ($extension_of_type as $extension) {
 					$extension->deregister();
 				}
 			}

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

Spacing +6 added lines, -6 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');
 }
 
 /**
@@ -15,18 +15,18 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Phone_Input extends EE_Text_Input{
+class EE_Phone_Input extends EE_Text_Input {
 	/**
 	 * @param array $options
 	 */
-	function __construct($options = array()){
+	function __construct($options = array()) {
 		$this->_add_validation_strategy(
 			new EE_Text_Validation_Strategy(
-				__( 'Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso' ),
+				__('Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso'),
 				'~^(([\d]{10})|(^[\d]{3}-[\d]{3}-[\d]{4}))$~'
 			)
 		);
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 }
 

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

Spacing +4 added lines, -4 removed lines

@@ -7,16 +7,16 @@
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Credit_Card_Input extends EE_Form_Input_Base{
+class EE_Credit_Card_Input extends EE_Form_Input_Base {
 
 	/**
 	 * @param array $input_settings
 	 */
-	function __construct($input_settings = array()){
-		$input_settings['required'] = isset( $input_settings['required'] ) ? $input_settings['required'] : TRUE;
+	function __construct($input_settings = array()) {
+		$input_settings['required'] = isset($input_settings['required']) ? $input_settings['required'] : TRUE;
 		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
 		$this->_set_normalization_strategy(new EE_Credit_Card_Normalization());
-		$this->_add_validation_strategy(new EE_Credit_Card_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ));
+		$this->_add_validation_strategy(new EE_Credit_Card_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
 		$this->set_sensitive_data_removal_strategy(new EE_Credit_Card_Sensitive_Data_Removal());
 		parent::__construct($input_settings);
 	}