eventespresso / event-espresso-core

core/libraries/messages/defaults/default/email_payment_cancelled_content.template.php

Spacing +18 added lines, -18 removed lines

@@ -31,35 +31,35 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h2><?php printf( esc_html__( 'Hello, %s:', 'event_espresso' ), '[PRIMARY_REGISTRANT_FNAME] [PRIMARY_REGISTRANT_LNAME]' ); ?></h2>
-									<p class="lead"><?php printf( esc_html__( 'Your payment was %1$sCANCELLED%2$s for the following transaction and ticket purchases:', 'event_espresso' ), '<strong>', '</strong>'); ?></p>
-									<h3><?php esc_html_e( 'Payment Details:', 'event_espresso' ); ?></h3>
+									<h2><?php printf(esc_html__('Hello, %s:', 'event_espresso'), '[PRIMARY_REGISTRANT_FNAME] [PRIMARY_REGISTRANT_LNAME]'); ?></h2>
+									<p class="lead"><?php printf(esc_html__('Your payment was %1$sCANCELLED%2$s for the following transaction and ticket purchases:', 'event_espresso'), '<strong>', '</strong>'); ?></p>
+									<h3><?php esc_html_e('Payment Details:', 'event_espresso'); ?></h3>
 									<ul>
 										<li>
-											<strong><?php esc_html_e( 'Payment Status:', 'event_espresso' ); ?></strong> [PAYMENT_STATUS]
+											<strong><?php esc_html_e('Payment Status:', 'event_espresso'); ?></strong> [PAYMENT_STATUS]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Transaction ID:', 'event_espresso' ); ?></strong> [TXN_ID]
+											<strong><?php esc_html_e('Transaction ID:', 'event_espresso'); ?></strong> [TXN_ID]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Total Cost:', 'event_espresso' ); ?></strong> [TOTAL_COST]
+											<strong><?php esc_html_e('Total Cost:', 'event_espresso'); ?></strong> [TOTAL_COST]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Payment Method:', 'event_espresso' ); ?></strong> [PAYMENT_GATEWAY]
+											<strong><?php esc_html_e('Payment Method:', 'event_espresso'); ?></strong> [PAYMENT_GATEWAY]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Payment Amount:', 'event_espresso' ); ?></strong> [AMOUNT_PAID]
+											<strong><?php esc_html_e('Payment Amount:', 'event_espresso'); ?></strong> [AMOUNT_PAID]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Amount Due:', 'event_espresso' ); ?></strong> [TOTAL_OWING]
+											<strong><?php esc_html_e('Amount Due:', 'event_espresso'); ?></strong> [TOTAL_OWING]
 										</li>
 									</ul>
 									<p class="callout">
-										<?php printf( esc_html__( 'Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso' ), '<a href="[PAYMENT_URL]">', '</a>' ); ?>
+										<?php printf(esc_html__('Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso'), '<a href="[PAYMENT_URL]">', '</a>'); ?>
 									</p>
 									[EVENT_LIST]
 									<p class="callout">
-										<?php printf( esc_html__( 'Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso' ), '<a href="[PAYMENT_URL]">', '</a>' ); ?>
+										<?php printf(esc_html__('Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso'), '<a href="[PAYMENT_URL]">', '</a>'); ?>
 									</p>
 								</td>
 							</tr>
@@ -84,10 +84,10 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h3><?php esc_html_e( 'Connect with Us:', 'event_espresso' ); ?></h3>
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php esc_html_e( 'Facebook', 'event_espresso' ); ?></a>
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php esc_html_e( 'Twitter', 'event_espresso' ); ?></a>
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php esc_html_e( 'Google+', 'event_espresso' ); ?></a>
+												<h3><?php esc_html_e('Connect with Us:', 'event_espresso'); ?></h3>
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php esc_html_e('Facebook', 'event_espresso'); ?></a>
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php esc_html_e('Twitter', 'event_espresso'); ?></a>
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php esc_html_e('Google+', 'event_espresso'); ?></a>
 											</td>
 										</tr>
 									</tbody>
@@ -97,9 +97,9 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h3><?php esc_html_e( 'Contact Info:', 'event_espresso' ); ?></h3>
-												<?php esc_html_e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
-												<?php esc_html_e( 'Email:', 'event_espresso' ); ?> <strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
+												<h3><?php esc_html_e('Contact Info:', 'event_espresso'); ?></h3>
+												<?php esc_html_e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
+												<?php esc_html_e('Email:', 'event_espresso'); ?> <strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
 											</td>
 										</tr>
 									</tbody>

core/libraries/messages/defaults/default/email_payment_declined_content.template.php

Spacing +18 added lines, -18 removed lines

@@ -31,35 +31,35 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h2><?php printf( esc_html__( 'Hello, %s:', 'event_espresso' ), '[PRIMARY_REGISTRANT_FNAME] [PRIMARY_REGISTRANT_LNAME]' ); ?></h2>
-									<p class="lead"><?php printf( esc_html__( 'Your payment was %1$sDECLINED%2$s for the following transaction and ticket purchases:', 'event_espresso' ), '<strong>', '</strong>') ?></p>
-									<h3><?php esc_html_e( 'Payment Details:', 'event_espresso' ); ?></h3>
+									<h2><?php printf(esc_html__('Hello, %s:', 'event_espresso'), '[PRIMARY_REGISTRANT_FNAME] [PRIMARY_REGISTRANT_LNAME]'); ?></h2>
+									<p class="lead"><?php printf(esc_html__('Your payment was %1$sDECLINED%2$s for the following transaction and ticket purchases:', 'event_espresso'), '<strong>', '</strong>') ?></p>
+									<h3><?php esc_html_e('Payment Details:', 'event_espresso'); ?></h3>
 									<ul>
 										<li>
-											<strong><?php esc_html_e( 'Payment Status:', 'event_espresso' ); ?></strong> [PAYMENT_STATUS]
+											<strong><?php esc_html_e('Payment Status:', 'event_espresso'); ?></strong> [PAYMENT_STATUS]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Transaction ID:', 'event_espresso' ); ?></strong> [TXN_ID]
+											<strong><?php esc_html_e('Transaction ID:', 'event_espresso'); ?></strong> [TXN_ID]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Total Cost:', 'event_espresso' ); ?></strong> [TOTAL_COST]
+											<strong><?php esc_html_e('Total Cost:', 'event_espresso'); ?></strong> [TOTAL_COST]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Payment Method:', 'event_espresso' ); ?></strong> [PAYMENT_GATEWAY]
+											<strong><?php esc_html_e('Payment Method:', 'event_espresso'); ?></strong> [PAYMENT_GATEWAY]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Payment Amount:', 'event_espresso' ); ?></strong> [AMOUNT_PAID]
+											<strong><?php esc_html_e('Payment Amount:', 'event_espresso'); ?></strong> [AMOUNT_PAID]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Amount Due:', 'event_espresso' ); ?></strong> [TOTAL_OWING]
+											<strong><?php esc_html_e('Amount Due:', 'event_espresso'); ?></strong> [TOTAL_OWING]
 										</li>
 									</ul>
 									<p class="callout">
-										<?php printf( esc_html__( 'Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso' ), '<a href="[PAYMENT_URL]">', '</a>' ); ?>
+										<?php printf(esc_html__('Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso'), '<a href="[PAYMENT_URL]">', '</a>'); ?>
 									</p>
 									[EVENT_LIST]
 									<p class="callout">
-										<?php printf( esc_html__( 'Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso' ), '<a href="[PAYMENT_URL]">', '</a>' ); ?>
+										<?php printf(esc_html__('Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso'), '<a href="[PAYMENT_URL]">', '</a>'); ?>
 									</p>
 								</td>
 							</tr>
@@ -84,10 +84,10 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h3><?php esc_html_e( 'Connect with Us:', 'event_espresso' ); ?></h3>
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php esc_html_e( 'Facebook', 'event_espresso' ); ?></a>
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php esc_html_e( 'Twitter', 'event_espresso' ); ?></a>
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php esc_html_e( 'Google+', 'event_espresso' ); ?></a>
+												<h3><?php esc_html_e('Connect with Us:', 'event_espresso'); ?></h3>
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php esc_html_e('Facebook', 'event_espresso'); ?></a>
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php esc_html_e('Twitter', 'event_espresso'); ?></a>
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php esc_html_e('Google+', 'event_espresso'); ?></a>
 											</td>
 										</tr>
 									</tbody>
@@ -97,9 +97,9 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h3><?php esc_html_e( 'Contact Info:', 'event_espresso' ); ?></h3>
-												<?php esc_html_e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
-												<?php esc_html_e( 'Email:', 'event_espresso' ); ?> <strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
+												<h3><?php esc_html_e('Contact Info:', 'event_espresso'); ?></h3>
+												<?php esc_html_e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
+												<?php esc_html_e('Email:', 'event_espresso'); ?> <strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
 											</td>
 										</tr>
 									</tbody>

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

Indentation +46 added lines, -46 removed lines

@@ -71,10 +71,10 @@ 
 	 */
 	public function __construct(){
 		if( ! $this->_model_name_extended){
-            throw new EE_Error(
-                __( "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" )
-            );
+			throw new EE_Error(
+				__( "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 )) {
@@ -95,30 +95,30 @@ 
 
 
 
-    /**
-     * @param array $existing_tables
-     * @return array
-     */
-    public function add_extra_tables_on_filter( $existing_tables ){
-        return array_merge( (array)$existing_tables, $this->_extra_tables );
+	/**
+	 * @param array $existing_tables
+	 * @return array
+	 */
+	public function add_extra_tables_on_filter( $existing_tables ){
+		return array_merge( (array)$existing_tables, $this->_extra_tables );
 	}
 
 
 
-    /**
-     * @param array $existing_fields
-     * @return array
-     */
-    public function add_extra_fields_on_filter( $existing_fields ){
+	/**
+	 * @param array $existing_fields
+	 * @return 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(
-                    (array)$existing_fields[$table_alias],
-                    $this->_extra_fields[$table_alias]
-                );
+					(array)$existing_fields[$table_alias],
+					$this->_extra_fields[$table_alias]
+				);
 
 			}
 		}
@@ -127,12 +127,12 @@ 
 
 
 
-    /**
-     * @param array $existing_relations
-     * @return array
-     */
-    public function add_extra_relations_on_filter( $existing_relations ){
-        return  array_merge((array)$existing_relations,$this->_extra_relations);
+	/**
+	 * @param array $existing_relations
+	 * @return array
+	 */
+	public function add_extra_relations_on_filter( $existing_relations ){
+		return  array_merge((array)$existing_relations,$this->_extra_relations);
 	}
 
 
@@ -168,8 +168,8 @@ 
 				remove_filter($callback_name,array($this,self::dynamic_callback_method_prefix.$method_name_on_model),10);
 			}
 		}
-        /** @var EEM_Base $model_to_reset */
-        $model_to_reset = 'EEM_' . $this->_model_name_extended;
+		/** @var EEM_Base $model_to_reset */
+		$model_to_reset = 'EEM_' . $this->_model_name_extended;
 		if ( class_exists( $model_to_reset ) ) {
 			$model_to_reset::reset();
 		}
@@ -177,13 +177,13 @@ 
 
 
 
-    /**
-     * @param string $callback_method_name
-     * @param array  $args
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function __call( $callback_method_name, $args){
+	/**
+	 * @param string $callback_method_name
+	 * @param array  $args
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	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);
@@ -194,23 +194,23 @@ 
 				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
-                    )
-                );
+					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)
-                )
-            );
+				sprintf(
+					__("There is no method named '%s' on '%s'", "event_espresso"),
+					$callback_method_name,
+					get_class($this)
+				)
+			);
 		}
 	}
 

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -69,27 +69,27 @@ 
 	/**
 	 * @throws \EE_Error
 	 */
-	public function __construct(){
-		if( ! $this->_model_name_extended){
+	public function __construct() {
+		if ( ! $this->_model_name_extended) {
             throw new EE_Error(
-                __( "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" )
+                __("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();
 	}
 
@@ -99,8 +99,8 @@ 
      * @param array $existing_tables
      * @return array
      */
-    public function add_extra_tables_on_filter( $existing_tables ){
-        return array_merge( (array)$existing_tables, $this->_extra_tables );
+    public function add_extra_tables_on_filter($existing_tables) {
+        return array_merge((array) $existing_tables, $this->_extra_tables);
 	}
 
 
@@ -109,14 +109,14 @@ 
      * @param array $existing_fields
      * @return 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();
+    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(
-                    (array)$existing_fields[$table_alias],
+                    (array) $existing_fields[$table_alias],
                     $this->_extra_fields[$table_alias]
                 );
 
@@ -131,8 +131,8 @@ 
      * @param array $existing_relations
      * @return array
      */
-    public function add_extra_relations_on_filter( $existing_relations ){
-        return  array_merge((array)$existing_relations,$this->_extra_relations);
+    public function add_extra_relations_on_filter($existing_relations) {
+        return  array_merge((array) $existing_relations, $this->_extra_relations);
 	}
 
 
@@ -141,13 +141,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__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);
 			}
 		}
 	}
@@ -156,21 +156,21 @@ 
 	 * 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);
 			}
 		}
         /** @var EEM_Base $model_to_reset */
-        $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();
 		}
 	}
@@ -183,27 +183,27 @@ 
      * @return mixed
      * @throws EE_Error
      */
-    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);
-			list( $original_return_val, $model_called, $args_provided_to_method_on_model ) = (array) $args;
+			list($original_return_val, $model_called, $args_provided_to_method_on_model) = (array) $args;
 			$this->_ = $model_called;
 			$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{
+			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
+                        $extending_method, $extending_method
                     )
                 );
 			}
 
-		}else{
+		} else {
 			throw new EE_Error(
 			    sprintf(
 			        __("There is no method named '%s' on '%s'", "event_espresso"),

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');
+}
 
 /**
  *
@@ -192,7 +193,7 @@ 
 			$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"),
@@ -203,7 +204,7 @@ 
                 );
 			}
 
-		}else{
+		} else{
 			throw new EE_Error(
 			    sprintf(
 			        __("There is no method named '%s' on '%s'", "event_espresso"),

admin_pages/messages/help_tabs/messages_overview_types.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <p><strong><?php esc_html_e('Message Types', 'event_espresso'); ?></strong></p>
-<p><?php printf( esc_html__('Messages are email notifications that are sent out by Event Espresso. Message Types are the %1$skinds%2$s of messages that get delivered.  They can be thought of as the "type" of package that is being delivered by the messenger. For example, Event Espresso comes with two Message Types attached to the Email Messenger:', 'event_espresso'), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Messages are email notifications that are sent out by Event Espresso. Message Types are the %1$skinds%2$s of messages that get delivered.  They can be thought of as the "type" of package that is being delivered by the messenger. For example, Event Espresso comes with two Message Types attached to the Email Messenger:', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p>
 <ul>
 <li>

admin_pages/messages/help_tabs/messages_templates.help_tab.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <p><strong><?php esc_html_e('Message Templates', 'event_espresso'); ?></strong></p>
-<p><?php printf( esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.', 'event_espresso'), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('There is a template created for each Messenger / Message Type and context combination. For example, messages that are sent for Payment Confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, messages that are sent for the Registration confirmation have 3 templates: one for Event Administrator, one for the Primary Registrant, and another for each additional Registrant(s).', 'event_espresso'); ?></p>
-<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso' ); ?></p>
\ No newline at end of file
+<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso'); ?></p>
\ No newline at end of file

admin_pages/messages/templates/ee_msg_message_templates_help_tab.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <h2><?php esc_html_e('What are Message Templates', 'event_espresso'); ?></h2>
-<p><?php printf( esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them like a “Form letter”. Templates are used to tell the system what you want your messages to look like and the content they will have when they are delivered.', 'event_espresso'), '<em>', '</em>' ); ?></p>
+<p><?php printf(esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them like a “Form letter”. Templates are used to tell the system what you want your messages to look like and the content they will have when they are delivered.', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('There is a template created for each messenger/message type AND context combination. So example, Emails that are sent for the Payment confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, emails that are sent for the Registration confirmation have 3 templates, one for Event Administrator, Primary Registrant, and Registrant.', 'event_espresso'); ?></p>
-<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type and Context will have a global template created with some default content on creation.  You have the ability to edit this global template that will be used for all events you create.  However, you also have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso' ); ?></p>
\ No newline at end of file
+<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type and Context will have a global template created with some default content on creation.  You have the ability to edit this global template that will be used for all events you create.  However, you also have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso'); ?></p>
\ No newline at end of file

admin_pages/messages/templates/ee_msg_messages_templates_editor_help_tab.template.php

Spacing +5 added lines, -5 removed lines

@@ -2,29 +2,29 @@
 <p><?php _e('Here are a few things that you should know about the Message Template Editor:', 'event_espresso'); ?></p>
 <p><strong><?php esc_html_e('1. The Event Editor Title', 'event_espresso'); ?></strong></p>
 <p><?php echo $img1; ?></p>
-<p><?php printf( esc_html__( 'The Event Editor title is very helpful in indicating which template you are currently editing.  In the example above, we can see that we are editing the template that for the %1$sEmail%2$s messenger, the %1$sPayment%2$s message type, and the %1$sEvent Admin%2$s context (which for this message type means "recipient").', 'event_espresso'), '<strong>','</strong>' ); ?></p>
+<p><?php printf(esc_html__('The Event Editor title is very helpful in indicating which template you are currently editing.  In the example above, we can see that we are editing the template that for the %1$sEmail%2$s messenger, the %1$sPayment%2$s message type, and the %1$sEvent Admin%2$s context (which for this message type means "recipient").', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 <p><strong><?php esc_html_e('2. "Context Switcher" and Preview Button', 'event_espresso'); ?></strong></p>
 <p><?php echo $img2; ?></p>
 <p><?php esc_html_e('The context switcher allows you to quickly switch between templates. The current context you are working on is displayed in the dropdown. You can switch to any other template for contexts available to the messenger and message type template group you are working on.', 'event_espresso'); ?></p>
 <p><?php esc_html_e('Remember that contexts can represent different things. In this example they represent "recipients" and so they are labelled as such. In this example (for email payment confirmations), you may want Event Administrators to receive different information than Primary Registrants (the other context available to edit).', 'event_espresso'); ?></p>
-<p><?php printf( esc_html__('The %sPreview%s button is simply a link to a special view of the current template displayed to give you an idea of how the actual message will look when delivered. More information on what the preview displays is available in the content of the help tab on the preview page.', 'event_espresso'), '<strong>', '</strong>' ); ?>
+<p><?php printf(esc_html__('The %sPreview%s button is simply a link to a special view of the current template displayed to give you an idea of how the actual message will look when delivered. More information on what the preview displays is available in the content of the help tab on the preview page.', 'event_espresso'), '<strong>', '</strong>'); ?>
 </p>
 <p><strong><?php esc_html_e('3. Template Form Fields', 'event_espresso'); ?></strong></p>
 <p><?php echo $img3; ?><?php esc_html_e('The middle area of the page is dedicated to all the fields related to the message template. These fields are dynamic in the sense that different messengers may require different fields (and sometimes different message types will add or subtract fields as well.', 'event_espresso'); ?></p>
-<p><?php printf( esc_html__('When editing a "Email Payment Template", you will notice that there is a field labelled "Event List" along with "Main Content". The Event List field is a special field that holds the template for whenever the %1$s[EVENT_LIST]%2$s shortcode is used in the "Main Content" field. This is so you can more finely control how each "event" in the event list displays when shown in the Main content. The "Email Registration Template", has an additional field called "Registration List". It functions much the same except that the contents of the "Registration List" field are used to indicate how each registrant is listed in the Main Content when the %1$s[ATTENDEE_LIST]%2$s shortcode is parsed.', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
+<p><?php printf(esc_html__('When editing a "Email Payment Template", you will notice that there is a field labelled "Event List" along with "Main Content". The Event List field is a special field that holds the template for whenever the %1$s[EVENT_LIST]%2$s shortcode is used in the "Main Content" field. This is so you can more finely control how each "event" in the event list displays when shown in the Main content. The "Email Registration Template", has an additional field called "Registration List". It functions much the same except that the contents of the "Registration List" field are used to indicate how each registrant is listed in the Main Content when the %1$s[ATTENDEE_LIST]%2$s shortcode is parsed.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 <div style="clear:both"></div>
 <p><strong><?php esc_html_e('4. Valid Shortcodes Metabox', 'event_espresso'); ?></strong></p>
 <p>
 	<?php echo $img4; ?><?php esc_html_e('The "Valid Shortcodes" metabox contains a list of all the shortcodes that can be used for the displayed template. This list is dynamic and will vary between templates.', 'event_espresso'); ?>
 </p>
 <p><?php _e('This box is at a fixed height, but contents are scrollable. You can click the question mark to find out what the given shortcode will parse to when used in your template.', 'event_espresso'); ?></p>
-<p><?php printf( esc_html__('%sAn important note:%s The system has been designed so that when you save the template, checks will be performed on each field to make sure that only valid shortcodes (or values) are used within them.  You will get a warning box with clear instructions if you\'ve tried to use a particular shortcode in a field that does not support it.  Also, you\'ll want to try the Preview button if you\'ve made any changes to the template to see if the changes are as you expected!', 'event_espresso'), '<strong>', '</strong>' ); ?>
+<p><?php printf(esc_html__('%sAn important note:%s The system has been designed so that when you save the template, checks will be performed on each field to make sure that only valid shortcodes (or values) are used within them.  You will get a warning box with clear instructions if you\'ve tried to use a particular shortcode in a field that does not support it.  Also, you\'ll want to try the Preview button if you\'ve made any changes to the template to see if the changes are as you expected!', 'event_espresso'), '<strong>', '</strong>'); ?>
 </p>
 <div style="clear:both"></div>
 <p><strong><?php esc_html_e('5. Override All Custom', 'event_espresso'); ?></strong></p>
 <p>
 	<?php echo $img5; ?>
-	<?php printf( esc_html__( 'When you are editing a template that is a global template (not a custom event template), you\'ll see an option in the Publish metabox in the right column labelled "Override all custom". When this option is selected, custom event templates for that %1$smessenger%2$s, %1$smessage type%2$s, and %1$scontext%2$s will be ignored and the global template will be used. Why would you want to do this? For this given example, you may want to be able to allow custom event templates to be able to modify the looks and content of what goes out to Primary Registrant but to never affect what the Event Administrator receives (as set by the global template).', 'event_espresso'), '<em>', '</em>' ); ?>
+	<?php printf(esc_html__('When you are editing a template that is a global template (not a custom event template), you\'ll see an option in the Publish metabox in the right column labelled "Override all custom". When this option is selected, custom event templates for that %1$smessenger%2$s, %1$smessage type%2$s, and %1$scontext%2$s will be ignored and the global template will be used. Why would you want to do this? For this given example, you may want to be able to allow custom event templates to be able to modify the looks and content of what goes out to Primary Registrant but to never affect what the Event Administrator receives (as set by the global template).', 'event_espresso'), '<em>', '</em>'); ?>
 </p>
 <p>
 <strong><?php esc_html_e('Recommendations', 'event_espresso'); ?></strong><br />

admin_pages/messages/templates/ee_msg_overview_help_tab.template.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		</li>
 		<li>
 			<?php esc_html_e('Messenger', 'event_espresso'); ?><br />
-			<?php printf( esc_html__('This column displays a number of different elements for the listed template.  First is the messenger that this template is delivered by.  The messenger title is linked to the editor for the first %1$scontext%2$s listed (context is labelled "recipients" for payment message types)', 'event_espresso'), '<em>', '</em>'); ?><br />
+			<?php printf(esc_html__('This column displays a number of different elements for the listed template.  First is the messenger that this template is delivered by.  The messenger title is linked to the editor for the first %1$scontext%2$s listed (context is labelled "recipients" for payment message types)', 'event_espresso'), '<em>', '</em>'); ?><br />
 			<?php esc_html_e('Below the Messenger title, is a list of different contexts.  The context label varies for each message type but it is usually labelled "Recipients".  You can click on each context title to go to the specific template for that context and edit it as desired.', 'event_espresso'); ?>
 		</li>
 	</ul>

admin_pages/messages/templates/ee_msg_message_type_help_tab.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <h2><?php esc_html_e('What are Message Types?', 'event_espresso'); ?></h2>
-<p><?php printf( esc_html__('Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).', 'event_espresso'), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('Future iterations of Event Espresso 4.0 (premium versions), will include more and more different message types that can be attached to the various messengers that are available', 'event_espresso'); ?></p>
 
 <h3><?php esc_html_e('Contexts', 'event_espresso'); ?></h3>
-<p><?php printf( esc_html__('Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).', 'event_espresso' ), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('You will most likely never see the word "context" in any of the Messages system labelling because they are dynamic per message type.  Usually, contexts will be labelled "Recipients" but there may be cases down the road where a message type might use contexts to represent something totally different', 'event_espresso'); ?></p>
\ No newline at end of file