eventespresso / event-espresso-core

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 paymetn 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_Shortcode.lib.php

Spacing +15 added lines, -15 removed lines

@@ -44,33 +44,33 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $shortcode_id = NULL, $setup_args = array()  ) {
+	public static function register($shortcode_id = NULL, $setup_args = array()) {
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $shortcode_id ) || ! is_array( $setup_args ) || empty( $setup_args['shortcode_paths'] )) {
-			throw new EE_Error( __( 'In order to register Modules with EE_Register_Shortcode::register(), you must include a "shortcode_id" (a unique identifier for this set of shortcodes), and an array containing the following keys: "shortcode_paths" (an array of full server paths to folders that contain shortcodes, or to the shortcode files themselves)', 'event_espresso' ));
+		if (empty($shortcode_id) || ! is_array($setup_args) || empty($setup_args['shortcode_paths'])) {
+			throw new EE_Error(__('In order to register Modules with EE_Register_Shortcode::register(), you must include a "shortcode_id" (a unique identifier for this set of shortcodes), and an array containing the following keys: "shortcode_paths" (an array of full server paths to folders that contain shortcodes, or to the shortcode files themselves)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_settings[ $shortcode_id ] ) ){
+		if (isset(self::$_settings[$shortcode_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 shortcodes 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 shortcodes.','event_espresso'),
+				__('An attempt to register shortcodes 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 shortcodes.', 'event_espresso'),
 				'4.3.0'
 			);
 		}
 		//setup $_settings array from incoming values.
-		self::$_settings[ $shortcode_id ] = array(
+		self::$_settings[$shortcode_id] = array(
 			// array of full server paths to any EES_Shortcodes used by the shortcode
-			'shortcode_paths'  => isset( $setup_args['shortcode_paths'] ) ? (array)$setup_args['shortcode_paths'] : array(),
+			'shortcode_paths'  => isset($setup_args['shortcode_paths']) ? (array) $setup_args['shortcode_paths'] : array(),
 		);
 		// add to list of shortcodes to be registered
-		add_filter( 'FHEE__EE_Config__register_shortcodes__shortcodes_to_register', array( 'EE_Register_Shortcode', 'add_shortcodes' ));
+		add_filter('FHEE__EE_Config__register_shortcodes__shortcodes_to_register', array('EE_Register_Shortcode', 'add_shortcodes'));
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @param array $shortcodes_to_register  array of paths to all shortcodes that require registering
 	 * @return array
 	 */
-	public static function add_shortcodes( $shortcodes_to_register ){
-		foreach( self::$_settings as $settings ) {
-			$shortcodes_to_register = array_merge( $shortcodes_to_register, $settings['shortcode_paths'] );
+	public static function add_shortcodes($shortcodes_to_register) {
+		foreach (self::$_settings as $settings) {
+			$shortcodes_to_register = array_merge($shortcodes_to_register, $settings['shortcode_paths']);
 		}
 		return $shortcodes_to_register;
 	}
@@ -100,9 +100,9 @@ 
 	 * @param string  $shortcode_id the name for the shortcode that was previously registered
 	 * @return void
 	 */
-	public static function deregister( $shortcode_id = NULL ) {
-		if ( isset( self::$_settings[ $shortcode_id ] )) {
-			unset( self::$_settings[ $shortcode_id ] );
+	public static function deregister($shortcode_id = NULL) {
+		if (isset(self::$_settings[$shortcode_id])) {
+			unset(self::$_settings[$shortcode_id]);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Widget.lib.php

Spacing +15 added lines, -15 removed lines

@@ -44,34 +44,34 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $widget_id = NULL, $setup_args = array()  ) {
+	public static function register($widget_id = NULL, $setup_args = array()) {
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $widget_id ) || ! is_array( $setup_args ) || empty( $setup_args['widget_paths'] )) {
-			throw new EE_Error( __( 'In order to register Widgets with EE_Register_Widget::register(), you must include a "widget_id" (a unique identifier for this set of widgets), and an array containing the following keys: "widget_paths" (an array of full server paths to folders that contain widgets, or to the widget files themselves)', 'event_espresso' ));
+		if (empty($widget_id) || ! is_array($setup_args) || empty($setup_args['widget_paths'])) {
+			throw new EE_Error(__('In order to register Widgets with EE_Register_Widget::register(), you must include a "widget_id" (a unique identifier for this set of widgets), and an array containing the following keys: "widget_paths" (an array of full server paths to folders that contain widgets, or to the widget files themselves)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_settings[ $widget_id ] ) ){
+		if (isset(self::$_settings[$widget_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 widgets 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 widgets.','event_espresso'),
+				__('An attempt to register widgets 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 widgets.', 'event_espresso'),
 				'4.3.0'
 			);
 		}
 		//setup $_settings array from incoming values.
-		self::$_settings[ $widget_id ] = array(
+		self::$_settings[$widget_id] = array(
 			// array of full server paths to any EED_Widgets used by the widget
-			'widget_paths'  => isset( $setup_args['widget_paths'] ) ? (array)$setup_args['widget_paths'] : array(),
+			'widget_paths'  => isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
 		);
 		// add to list of widgets to be registered
-		add_filter( 'FHEE__EE_Config__register_widgets__widgets_to_register', array( 'EE_Register_Widget', 'add_widgets' ));
+		add_filter('FHEE__EE_Config__register_widgets__widgets_to_register', array('EE_Register_Widget', 'add_widgets'));
 	}
 
 
@@ -83,9 +83,9 @@ 
 	 * @param array $widgets_to_register  array of paths to all widgets that require registering
 	 * @return array
 	 */
-	public static function add_widgets( $widgets_to_register = array() ) {
-		foreach( self::$_settings as $settings ) {
-			$widgets_to_register = array_merge( $widgets_to_register, $settings['widget_paths'] );
+	public static function add_widgets($widgets_to_register = array()) {
+		foreach (self::$_settings as $settings) {
+			$widgets_to_register = array_merge($widgets_to_register, $settings['widget_paths']);
 		}
 		return $widgets_to_register;
 	}
@@ -101,9 +101,9 @@ 
 	 * @param string  $widget_id the name for the widget that was previously registered
 	 * @return void
 	 */
-	public static function deregister( $widget_id = NULL ) {
-		if ( isset( self::$_settings[ $widget_id ] )) {
-			unset( self::$_settings[ $widget_id ] );
+	public static function deregister($widget_id = NULL) {
+		if (isset(self::$_settings[$widget_id])) {
+			unset(self::$_settings[$widget_id]);
 		}
 	}
 

core/libraries/plugin_api/db/EEE_Base_Class.lib.php

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -47,12 +47,12 @@ 
 	 */
 	protected $_ = NULL;
 
-	public function __construct(){
-		if( ! $this->_model_name_extended){
+	public function __construct() {
+		if ( ! $this->_model_name_extended) {
 			throw new EE_Error(sprintf(__("When declaring a class extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'", "event_espresso")));
 		}
-		if(did_action('AHEE__EE_'.$this->_model_name_extended.'__construct__end')){
-			throw new EE_Error(sprintf(__("Hooked in model object extension '%s' too late! The model object %s has already been used!", "event_espresso"),get_class($this),$this->_model_name_extended));
+		if (did_action('AHEE__EE_'.$this->_model_name_extended.'__construct__end')) {
+			throw new EE_Error(sprintf(__("Hooked in model object extension '%s' too late! The model object %s has already been used!", "event_espresso"), get_class($this), $this->_model_name_extended));
 		}
 		$this->_register_extending_methods();
 	}
@@ -61,13 +61,13 @@ 
 	 * scans the child of EEME_Base for functions starting with ext_, and magically makes them functions on the
 	 * model extended. (Internally uses filters, and the __call magic method)
 	 */
-	protected function _register_extending_methods(){
+	protected function _register_extending_methods() {
 		$all_methods = get_class_methods(get_class($this));
-		foreach($all_methods as $method_name){
-			if(strpos($method_name, self::extending_method_prefix) === 0){
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
 				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
 				$callback_name = "FHEE__EE_{$this->_model_name_extended}__$method_name_on_model";
-				add_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10,10);
+				add_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10, 10);
 			}
 		}
 	}
@@ -75,20 +75,20 @@ 
 	 * scans the child of EEME_Base for functions starting with ext_, and magically REMOVES them as functions on the
 	 * model extended. (Internally uses filters, and the __call magic method)
 	 */
-	public function deregister(){
+	public function deregister() {
 		$all_methods = get_class_methods(get_class($this));
-		foreach($all_methods as $method_name){
-			if(strpos($method_name, self::extending_method_prefix) === 0){
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
 				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
 				$callback_name = "FHEE__EE_{$this->_model_name_extended}__$method_name_on_model";
-				remove_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10);
+				remove_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10);
 			}
 		}
 	}
 
 
-	public function __call($callback_method_name,$args){
-		if(strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0){
+	public function __call($callback_method_name, $args) {
+		if (strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0) {
 			//it's a dynamic callback for a method name
 			$method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
 			$original_return_val = $args[0];
@@ -96,14 +96,14 @@ 
 			$this->_ = $model_called;
 			$args_provided_to_method_on_model = $args[2];
 			$extending_method = self::extending_method_prefix.$method_called_on_model;
-			if(method_exists($this, $extending_method)){
-				return call_user_func_array(array($this,$extending_method), $args_provided_to_method_on_model);
-			}else{
-				throw new EE_Error(sprintf(__("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"),$this->_model_name_extended,get_class($this),$extending_method,$extending_method));
+			if (method_exists($this, $extending_method)) {
+				return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
+			} else {
+				throw new EE_Error(sprintf(__("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"), $this->_model_name_extended, get_class($this), $extending_method, $extending_method));
 			}
 
-		}else{
-			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"),$callback_method_name,get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"), $callback_method_name, get_class($this)));
 		}
 	}
 

Braces +4 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  *
@@ -159,11 +160,11 @@ 
 			$extending_method = self::extending_method_prefix.$method_called_on_model;
 			if(method_exists($this, $extending_method)){
 				return call_user_func_array(array($this,$extending_method), $args_provided_to_method_on_model);
-			}else{
+			} else{
 				throw new EE_Error(sprintf(__("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"),$this->_model_name_extended,get_class($this),$extending_method,$extending_method));
 			}
 
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"),$callback_method_name,get_class($this)));
 		}
 	}

core/libraries/plugin_api/db/EEME_Base.lib.php

Braces +4 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  *
@@ -159,11 +160,11 @@ 
 			$extending_method = self::extending_method_prefix.$method_called_on_model;
 			if(method_exists($this, $extending_method)){
 				return call_user_func_array(array($this,$extending_method), $args_provided_to_method_on_model);
-			}else{
+			} else{
 				throw new EE_Error(sprintf(__("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"),$this->_model_name_extended,get_class($this),$extending_method,$extending_method));
 			}
 
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"),$callback_method_name,get_class($this)));
 		}
 	}

Spacing +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -69,58 +69,58 @@ 
 	/**
 	 * @throws \EE_Error
 	 */
-	public function __construct(){
-		if( ! $this->_model_name_extended){
+	public function __construct() {
+		if ( ! $this->_model_name_extended) {
 			throw new EE_Error(sprintf(__("When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'", "event_espresso")));
 		}
 		$construct_end_action = 'AHEE__EEM_'.$this->_model_name_extended.'__construct__end';
-		if ( did_action( $construct_end_action )) {
+		if (did_action($construct_end_action)) {
 			throw new EE_Error(
 				sprintf(
-					__( "Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired", "event_espresso"),
+					__("Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired", "event_espresso"),
 					get_class($this),
 					$this->_model_name_extended,
 					$construct_end_action
 				)
 			);
 		}
-		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',array($this,'add_extra_tables_on_filter'));
-		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',array($this,'add_extra_fields_on_filter'));
-		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',array($this,'add_extra_relations_on_filter'));
+		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables', array($this, 'add_extra_tables_on_filter'));
+		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields', array($this, 'add_extra_fields_on_filter'));
+		add_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations', array($this, 'add_extra_relations_on_filter'));
 		$this->_register_extending_methods();
 	}
 
-	public function add_extra_tables_on_filter( $existing_tables ){
-		$tables = array_merge( $existing_tables, $this->_extra_tables );
+	public function add_extra_tables_on_filter($existing_tables) {
+		$tables = array_merge($existing_tables, $this->_extra_tables);
 		return $tables;
 	}
-	public function add_extra_fields_on_filter($existing_fields){
-		if( $this->_extra_fields){
-			foreach($this->_extra_fields as $table_alias => $fields){
-				if( ! isset( $existing_fields[ $table_alias ] ) ){
-					$existing_fields[ $table_alias ] = array();
+	public function add_extra_fields_on_filter($existing_fields) {
+		if ($this->_extra_fields) {
+			foreach ($this->_extra_fields as $table_alias => $fields) {
+				if ( ! isset($existing_fields[$table_alias])) {
+					$existing_fields[$table_alias] = array();
 				}
-				$existing_fields[$table_alias] = array_merge($existing_fields[$table_alias],$this->_extra_fields[$table_alias]);
+				$existing_fields[$table_alias] = array_merge($existing_fields[$table_alias], $this->_extra_fields[$table_alias]);
 
 			}
 		}
 		return $existing_fields;
 	}
-	public function add_extra_relations_on_filter($existing_relations){
-		$relations =  array_merge($existing_relations,$this->_extra_relations);
+	public function add_extra_relations_on_filter($existing_relations) {
+		$relations = array_merge($existing_relations, $this->_extra_relations);
 		return $relations;
 	}
 	/**
 	 * scans the child of EEME_Base for functions starting with ext_, and magically makes them functions on the
 	 * model extended. (Internally uses filters, and the __call magic method)
 	 */
-	protected function _register_extending_methods(){
+	protected function _register_extending_methods() {
 		$all_methods = get_class_methods(get_class($this));
-		foreach($all_methods as $method_name){
-			if(strpos($method_name, self::extending_method_prefix) === 0){
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
 				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
 				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-				add_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10,10);
+				add_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10, 10);
 			}
 		}
 	}
@@ -129,27 +129,27 @@ 
 	 * scans the child of EEME_Base for functions starting with ext_, and magically REMOVES them as functions on the
 	 * model extended. (Internally uses filters, and the __call magic method)
 	 */
-	public function deregister(){
-		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',array($this,'add_extra_tables_on_filter'));
-		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',array($this,'add_extra_fields_on_filter'));
-		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',array($this,'add_extra_relations_on_filter'));
+	public function deregister() {
+		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__tables', array($this, 'add_extra_tables_on_filter'));
+		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__fields', array($this, 'add_extra_fields_on_filter'));
+		remove_filter('FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations', array($this, 'add_extra_relations_on_filter'));
 		$all_methods = get_class_methods(get_class($this));
-		foreach($all_methods as $method_name){
-			if(strpos($method_name, self::extending_method_prefix) === 0){
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
 				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
 				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-				remove_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10);
+				remove_filter($callback_name, array($this, self::dynamic_callback_method_prefix.$method_name_on_model), 10);
 			}
 		}
-		$model_to_reset = 'EEM_' . $this->_model_name_extended;
-		if ( class_exists( $model_to_reset ) ) {
+		$model_to_reset = 'EEM_'.$this->_model_name_extended;
+		if (class_exists($model_to_reset)) {
 			$model_to_reset::reset();
 		}
 	}
 
 
-	public function __call($callback_method_name,$args){
-		if(strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0){
+	public function __call($callback_method_name, $args) {
+		if (strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0) {
 			//it's a dynamic callback for a method name
 			$method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
 			$original_return_val = $args[0];
@@ -157,14 +157,14 @@ 
 			$this->_ = $model_called;
 			$args_provided_to_method_on_model = $args[2];
 			$extending_method = self::extending_method_prefix.$method_called_on_model;
-			if(method_exists($this, $extending_method)){
-				return call_user_func_array(array($this,$extending_method), $args_provided_to_method_on_model);
-			}else{
-				throw new EE_Error(sprintf(__("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"),$this->_model_name_extended,get_class($this),$extending_method,$extending_method));
+			if (method_exists($this, $extending_method)) {
+				return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
+			} else {
+				throw new EE_Error(sprintf(__("An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)", "event_espresso"), $this->_model_name_extended, get_class($this), $extending_method, $extending_method));
 			}
 
-		}else{
-			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"),$callback_method_name,get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("There is no method named '%s' on '%s'", "event_espresso"), $callback_method_name, get_class($this)));
 		}
 	}
 

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;
@@ -67,13 +67,13 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		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
@@ -93,7 +93,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);
 		}
 
@@ -107,8 +107,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.
@@ -119,7 +119,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);
 		}
 
@@ -133,8 +133,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.
@@ -144,10 +144,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);
 		}
 
@@ -157,7 +157,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
@@ -67,18 +68,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		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_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;
@@ -63,13 +63,13 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		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();
 		}
 
@@ -86,7 +86,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.
@@ -94,7 +94,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);
 		}
 
@@ -110,7 +110,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.
@@ -118,7 +118,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);
 		}
 
@@ -143,11 +143,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
@@ -63,19 +64,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		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_Email_Shortcodes.lib.php

Braces +8 added lines, -4 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
@@ -101,8 +102,9 @@ 
 	private function _get_event_admin_emails( $fancy_headers = TRUE ) {
 
 		if ( !empty( $this->_data->admin_email ) ) {
-			if ( ! $fancy_headers )
-				return $this->_data->admin_email;
+			if ( ! $fancy_headers ) {
+							return $this->_data->admin_email;
+			}
 			return !empty( $this->_data->fname ) ? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $this->_data->admin_email . '>';
 		}
 
@@ -142,7 +144,9 @@ 
 
 		foreach ( $admin_details as $admin ) {
 			//only add an admin email if it is present.
-			if ( empty( $admin->email ) || $admin->email == '' ) continue;
+			if ( empty( $admin->email ) || $admin->email == '' ) {
+				continue;
+			}
 
 			if ( ! $fancy_headers ) {
 				$admin_email[] = $admin->email;

Spacing +29 added lines, -29 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,19 +43,19 @@ 
 		$this->description = esc_html__('All shortcodes related to emails', 'event_espresso');
 		$this->_shortcodes = array(
 			'[SITE_ADMIN_EMAIL]' => esc_html__('Will be replaced with the admin email for the site that Event Espresso is installed on', 'event_espresso'),
-			'[EVENT_AUTHOR_FORMATTED_EMAIL]' => sprintf( esc_html__('This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.', 'event_espresso'),'<strong>','</strong>' ),
-			'[EVENT_AUTHOR_EMAIL]' => sprintf( esc_html__('This is the same as %1$s shortcode except it is just a list of emails (not fancy headers).', 'event_espresso'), '[EVENT_AUTHOR_FORMATTED_EMAIL]' ),
-			'[CO_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso' ),
+			'[EVENT_AUTHOR_FORMATTED_EMAIL]' => sprintf(esc_html__('This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.', 'event_espresso'), '<strong>', '</strong>'),
+			'[EVENT_AUTHOR_EMAIL]' => sprintf(esc_html__('This is the same as %1$s shortcode except it is just a list of emails (not fancy headers).', 'event_espresso'), '[EVENT_AUTHOR_FORMATTED_EMAIL]'),
+			'[CO_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso'),
 			'[CO_EMAIL]' => esc_html__('This will parse to the email address only for the organization set in Your Organization Settings.', 'event_espresso'),
-			'[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso' ),
+			'[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso'),
 			'[ESPRESSO_ADMIN_EMAIL]' => esc_html__('This parses to the email address only for the organization set in Your Organization Settings page.', 'event_espresso')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[SITE_ADMIN_EMAIL]' :
 				return $this->_get_site_admin_email();
@@ -66,17 +66,17 @@ 
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
-				return $this->_get_event_admin_emails( FALSE );
+				return $this->_get_event_admin_emails(FALSE);
 				break;
 
 			case '[CO_FORMATTED_EMAIL]' :
 			case '[ESPRESSO_ADMIN_FORMATTED_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) . '>';
+				return EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.EE_Registry::instance()->CFG->organization->get_pretty('email').'>';
 				break;
 
 			case '[CO_EMAIL]' :
 			case '[ESPRESSO_ADMIN_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
 				break;
 
 			default :
@@ -98,12 +98,12 @@ 
 	}
 
 
-	private function _get_event_admin_emails( $fancy_headers = TRUE ) {
+	private function _get_event_admin_emails($fancy_headers = TRUE) {
 
-		if ( !empty( $this->_data->admin_email ) ) {
-			if ( ! $fancy_headers )
+		if ( ! empty($this->_data->admin_email)) {
+			if ( ! $fancy_headers)
 				return $this->_data->admin_email;
-			return !empty( $this->_data->fname ) ? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $this->_data->admin_email . '>';
+			return ! empty($this->_data->fname) ? $this->_data->fname.' '.$this->_data->lname.' <'.$this->_data->admin_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.$this->_data->admin_email.'>';
 		}
 
 		//k this shortcode has been used else where.  Since we don't know what particular event this is for, let's loop through the events and get an array of event admins for the events.  We'll return the formatted list of admin emails and let the messenger make sure we only pick one if this is for a field that can only have ONE!.
@@ -111,18 +111,18 @@ 
 		$admin_email = array();
 
 		//loop through events and set the list of event_ids to retrieve so we can do ONE query.
-		foreach ( $this->_data->events as $event ) {
+		foreach ($this->_data->events as $event) {
 			$ids[] = $event['ID'];
 		}
 
 		//get all the events
-		$events = EE_Registry::instance()->load_model('Event')->get_all( array(array('EVT_ID' => array('IN', $ids ) ) ) );
+		$events = EE_Registry::instance()->load_model('Event')->get_all(array(array('EVT_ID' => array('IN', $ids))));
 
 		//now loop through each event and setup the details
 		$admin_details = array();
 		$cnt = 0;
-		foreach ( $events as $event ) {
-			$user = get_userdata($event->get('EVT_wp_user') );
+		foreach ($events as $event) {
+			$user = get_userdata($event->get('EVT_wp_user'));
 			$admin_details[$cnt] = new stdClass();
 			$admin_details[$cnt]->email = $user->user_email;
 			$admin_details[$cnt]->first_name = $user->user_firstname;
@@ -131,28 +131,28 @@ 
 		}
 
 		//results?
-		if ( empty($admin_details) || !is_array($admin_details) ) {
+		if (empty($admin_details) || ! is_array($admin_details)) {
 			$msg[] = esc_html__('The admin details could not be retrieved from the database.', 'event_espresso');
-			$msg[] = sprintf( esc_html__('Query: %s', 'event_espresso'), $sql );
-			$msg[] = sprintf( esc_html__('Events Data: %s', 'event_espresso'), var_export($this->_data->events, TRUE) );
-			$msg[] = sprintf( esc_html__('Event IDS: %s', 'event_espresso'), var_export($ids, TRUE) );
-			$msg[] = sprintf( esc_html__('Query Results: %s', 'event_espresso'), var_export($admin_details) );
-			do_action( 'AHEE_log', __FILE__, __FUNCTION__, implode( PHP_EOL, $msg ), 'shortcode_parser' );
+			$msg[] = sprintf(esc_html__('Query: %s', 'event_espresso'), $sql);
+			$msg[] = sprintf(esc_html__('Events Data: %s', 'event_espresso'), var_export($this->_data->events, TRUE));
+			$msg[] = sprintf(esc_html__('Event IDS: %s', 'event_espresso'), var_export($ids, TRUE));
+			$msg[] = sprintf(esc_html__('Query Results: %s', 'event_espresso'), var_export($admin_details));
+			do_action('AHEE_log', __FILE__, __FUNCTION__, implode(PHP_EOL, $msg), 'shortcode_parser');
 		}
 
-		foreach ( $admin_details as $admin ) {
+		foreach ($admin_details as $admin) {
 			//only add an admin email if it is present.
-			if ( empty( $admin->email ) || $admin->email == '' ) continue;
+			if (empty($admin->email) || $admin->email == '') continue;
 
-			if ( ! $fancy_headers ) {
+			if ( ! $fancy_headers) {
 				$admin_email[] = $admin->email;
 				continue;
 			}
 
-			$admin_email[] = !empty( $admin->first_name ) ? $admin->first_name . ' ' . $admin->last_name . ' <' . $admin->email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $admin->email . '>';
+			$admin_email[] = ! empty($admin->first_name) ? $admin->first_name.' '.$admin->last_name.' <'.$admin->email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.$admin->email.'>';
 		}
 
-		$admin_email = implode( ',', $admin_email );
+		$admin_email = implode(',', $admin_email);
 		return $admin_email;
 	}
 

core/libraries/shortcodes/EE_Event_Author_Shortcodes.lib.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -49,54 +49,54 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[EVENT_AUTHOR_FNAME]' :
-				$fname =  !empty( $recipient ) ? $recipient->fname : NULL;
-				if ( empty( $fname ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$fname = ! empty($recipient) ? $recipient->fname : NULL;
+				if (empty($fname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$fname = $user->first_name;
 				}
 				return $fname;
 				break;
 
 			case '[EVENT_AUTHOR_LNAME]' :
-				$lname =  !empty( $recipient ) ? $recipient->lname : NULL;
-				if ( empty( $lname ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$lname = ! empty($recipient) ? $recipient->lname : NULL;
+				if (empty($lname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$lname = $user->last_name;
 				}
 				return $lname;
 				break;
 
 			case '[EVENT_AUTHOR_FORMATTED_EMAIL]' :
-				if ( !empty( $recipient ) ) {
-					$email =  !empty( $recipient->fname ) ? $recipient->fname . ' ' . $recipient->lname . '<' . $recipient->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $recipient->admin_email . '>';
+				if ( ! empty($recipient)) {
+					$email = ! empty($recipient->fname) ? $recipient->fname.' '.$recipient->lname.'<'.$recipient->admin_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$recipient->admin_email.'>';
 				} else {
 					$email = NULL;
 				}
-				if ( empty( $email ) && ! empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
-					$email = ! empty( $user->first_name ) ? $user->first_name . ' ' . $user->last_name . '<' . $user->user_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $user->user_email . '>';
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
+					$email = ! empty($user->first_name) ? $user->first_name.' '.$user->last_name.'<'.$user->user_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$user->user_email.'>';
 				}
 				return $email;
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
-				$email = ! empty( $recipient ) ? $recipient->admin_email : NULL;
-				if ( empty( $email ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$email = ! empty($recipient) ? $recipient->admin_email : NULL;
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$email = $user->user_email;
 				}
 				return $email;
@@ -117,9 +117,9 @@ 
 	 *
 	 * @return WP_User
 	 */
-	private function _get_author_for_event( EE_Event $event ) {
+	private function _get_author_for_event(EE_Event $event) {
 		$author_id = $event->wp_user();
-		$user_data = get_userdata( (int) $author_id );
+		$user_data = get_userdata((int) $author_id);
 		return $user_data;
 		break;
 	}

Braces +5 added lines, -3 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
@@ -58,8 +59,9 @@ 
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
-			return '';
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[EVENT_AUTHOR_FNAME]' :