eventespresso / event-espresso-core

core/libraries/batch/Helpers/JobStepResponse.php

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@
 	 * @param string $update_text
 	 * @param array $extra_data
 	 */
-	public function __construct(JobParameters $job_parameters, $update_text, $extra_data = array() ) {
-		$this->_job_parameters 	= $job_parameters;
+	public function __construct(JobParameters $job_parameters, $update_text, $extra_data = array()) {
+		$this->_job_parameters = $job_parameters;
 		$this->_update_text 	= $update_text;
-		$this->_extra_data 		= (array)$extra_data;
+		$this->_extra_data 		= (array) $extra_data;
 	}
 
 

core/libraries/batch/JobHandlerBaseClasses/JobHandlerInterface.php

Spacing +5 added lines, -5 removed lines

@@ -20,8 +20,8 @@ 
 use EventEspressoBatchRequest\Helpers\JobParameters;
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,7 +35,7 @@ 
 	 * @throws BatchRequestException
 	 * @return JobStepResponse
 	 */
-	public function create_job( JobParameters $job_parameters );
+	public function create_job(JobParameters $job_parameters);
 
 	/**
 	 * Performs another step of the job
@@ -44,7 +44,7 @@ 
 	 * @return JobStepResponse
 	 * @throws BatchRequestException
 	 */
-	public function continue_job( JobParameters $job_parameters, $batch_size = 50 );
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50);
 
 	/**
 	 * Performs any clean-up logic when we know the job is completed
@@ -52,5 +52,5 @@ 
 	 * @return JobStepResponse
 	 * @throws BatchRequestException
 	 */
-	public function cleanup_job( JobParameters $job_parameters );
+	public function cleanup_job(JobParameters $job_parameters);
 }

core/helpers/EEH_Tabbed_Content.helper.php

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -46,22 +46,22 @@ 
 	 * @return string the assembled html string containing the tabbed content for display.
 	 * @throws \EE_Error
 	 */
-	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE ) {
+	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE) {
 
 		//first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-		if ( !empty( $tabs_names) && ( count( (array) $tabs_names) != count( (array) $tabs_content) ) ) {
-			throw new EE_Error( __('The count for $tabs_names and $tabs_content does not match.', 'event_espresso') );
+		if ( ! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
+			throw new EE_Error(__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso'));
 		}
 
 		//make sure we've got incoming data setup properly
-		$tabs = !empty( $tabs_names ) ? (array) $tabs_names : array_keys( (array) $tabs_contents );
-		$tabs_content = !empty( $tabs_names ) ? array_combine( (array) $tabs_names, (array) $tabs_content ) : $tabs_contents;
+		$tabs = ! empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
+		$tabs_content = ! empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
 		$all_tabs_content = '';
 
 		$index = 0;
-		foreach ( $tabs as $tab ) {
+		foreach ($tabs as $tab) {
 			$active = $index === 0 ? true : false;
 			$all_tabs .= self::tab($tab, $active);
 			$all_tabs_content .= self::tab_content($tab, $tabs_content[$tab], $active);
@@ -78,7 +78,7 @@ 
 
 		$tab_container_class = $small_tabs ? 'ee-nav-tabs ee-nav-tabs-small' : 'ee-nav-tabs';
 
-		return '<div class="'. $tab_container_class . '">' . "\n\t" . $all_tabs . $all_tabs_content . "\n" . '</div>';
+		return '<div class="'.$tab_container_class.'">'."\n\t".$all_tabs.$all_tabs_content."\n".'</div>';
 	}
 
 
@@ -102,11 +102,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if (empty($nav_tabs))
+			throw new EE_Error(__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso'));
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
-		foreach ( $nav_tabs as $slug => $tab ) {
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
+		foreach ($nav_tabs as $slug => $tab) {
 			$all_tabs .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
 		}
 		$all_tabs .= '</h2>';
@@ -122,13 +122,13 @@ 
 	 * @param bool|string $css If string given then the generated tab will include that as the class.
 	 * @return string          html for tab
 	 */
-	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE ) {
+	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE) {
 		$name = str_replace(' ', '-', $name);
 		$class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
-		$class = $css ? $class . ' ' . $css : $class;
-		$nice_name = $nice_name ? $nice_name : ucwords( preg_replace('/(-|_)/', ' ', $name) );
-		$url = $url ? $url : '#' . $name;
-		$tab = '<a class="' . $class . '" rel="ee-tab-' . $name . '" href="' . $url . '">' . $nice_name . '</a>' . "\n\t";
+		$class = $css ? $class.' '.$css : $class;
+		$nice_name = $nice_name ? $nice_name : ucwords(preg_replace('/(-|_)/', ' ', $name));
+		$url = $url ? $url : '#'.$name;
+		$tab = '<a class="'.$class.'" rel="ee-tab-'.$name.'" href="'.$url.'">'.$nice_name.'</a>'."\n\t";
 		return $tab;
 	}
 
@@ -144,9 +144,9 @@ 
 	 */
 	private static function tab_content($name, $tab_content, $active = false) {
 		$class = $active ? 'nav-tab-content' : 'nav-tab-content hidden';
-		$name = str_replace( ' ', '-', $name);
-		$content = "\t" . '<div class="'. $class . '" id="ee-tab-' . $name . '">' . "\n";
-		$content .= "\t" . $tab_content . "\n";
+		$name = str_replace(' ', '-', $name);
+		$content = "\t".'<div class="'.$class.'" id="ee-tab-'.$name.'">'."\n";
+		$content .= "\t".$tab_content."\n";
 		$content .= '<div style="clear:both"></div></div>';
 		return $content;
 	}
@@ -172,9 +172,9 @@ 
 	 * @param string $default 			You can include a string for the item that will receive the "item_display" class for the js.
 	 * @return string                  a html snippet of of all the formatted link elements.
 	 */
-	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
-		$item_array = apply_filters( 'FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class );
-		if ( !is_array($item_array) || empty( $item_array ) )
+	public static function tab_text_links($item_array, $container_class = '', $sep = '|', $default = '') {
+		$item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
+		if ( ! is_array($item_array) || empty($item_array))
 			return false; //get out we don't have even the basic thing we need!
 
 
@@ -185,15 +185,15 @@ 
 			'title' => esc_attr__('Link for Item', 'event_espresso'),
 			'slug' => 'item_slug'
 		);
-		$container_class = !empty($container_class) ? 'ee-text-links ' . $container_class : 'ee-text-links';
-		$list = '<ul class="' . $container_class . '">';
+		$container_class = ! empty($container_class) ? 'ee-text-links '.$container_class : 'ee-text-links';
+		$list = '<ul class="'.$container_class.'">';
 
 		$ci = 1;
-		foreach ( $item_array as $item ) {
-			$item = wp_parse_args( $item, $defaults );
-			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
+		foreach ($item_array as $item) {
+			$item = wp_parse_args($item, $defaults);
+			$item['class'] = ! empty($default) && $default == $item['slug'] ? 'item_display '.$item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
+			if ( ! empty($sep) && $ci != count($item_array))
 				$list .= self::_text_link_item($sep);
 			$ci++;
 		}
@@ -204,9 +204,9 @@ 
 
 
 
-	private static function _text_link_item( $item ) {
+	private static function _text_link_item($item) {
 		//if this isn't an array then we're doing a separator
-		if ( !is_array( $item ) ) {
+		if ( ! is_array($item)) {
 			$label = $item;
 			$class = 'ee-text-link-sep';
 			$href = '';
@@ -215,12 +215,12 @@ 
 			extract($item);
 		}
 
-		$class = $class != 'ee-text-link-sep'  ? 'class="ee-text-link-li ' . $class . '"' : 'class="ee-text-link-sep"';
+		$class = $class != 'ee-text-link-sep' ? 'class="ee-text-link-li '.$class.'"' : 'class="ee-text-link-sep"';
 
-		$content = '<li ' . $class . '>';
-		$content .= !empty($href) ? '<a class="ee-text-link" href="#' . $href . '" title="' . $title . '">' : '';
+		$content = '<li '.$class.'>';
+		$content .= ! empty($href) ? '<a class="ee-text-link" href="#'.$href.'" title="'.$title.'">' : '';
 		$content .= $label;
-		$content .= !empty($href) ? '</a>' : '';
+		$content .= ! empty($href) ? '</a>' : '';
 		$content .= '</li>';
 		return $content;
 	}

Braces +12 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -102,8 +103,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if ( empty($nav_tabs) ) {
+					throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		}
 
 		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
 		foreach ( $nav_tabs as $slug => $tab ) {
@@ -174,8 +176,10 @@ 
 	 */
 	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
 		$item_array = apply_filters( 'FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class );
-		if ( !is_array($item_array) || empty( $item_array ) )
-			return false; //get out we don't have even the basic thing we need!
+		if ( !is_array($item_array) || empty( $item_array ) ) {
+					return false;
+		}
+		//get out we don't have even the basic thing we need!
 
 
 		$defaults = array(
@@ -193,8 +197,9 @@ 
 			$item = wp_parse_args( $item, $defaults );
 			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
-				$list .= self::_text_link_item($sep);
+			if ( !empty($sep) && $ci != count($item_array) ) {
+							$list .= self::_text_link_item($sep);
+			}
 			$ci++;
 		}
 

caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Post.php

Indentation +32 added lines, -32 removed lines

@@ -34,37 +34,37 @@
  */
 class Post implements RequestMethod
 {
-    /**
-     * URL to which requests are POSTed.
-     * @const string
-     */
-    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
+	/**
+	 * URL to which requests are POSTed.
+	 * @const string
+	 */
+	const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
 
-    /**
-     * Submit the POST request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        /**
-         * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
-         * Using "CN_name" will still work, but it will raise deprecated errors.
-         */
-        $peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
-        $options = array(
-            'http' => array(
-                'header' => "Content-type: application/x-www-form-urlencoded\r\n",
-                'method' => 'POST',
-                'content' => $params->toQueryString(),
-                // Force the peer to validate (not needed in 5.6.0+, but still works
-                'verify_peer' => true,
-                // Force the peer validation to use www.google.com
-                $peer_key => 'www.google.com',
-            ),
-        );
-        $context = stream_context_create($options);
-        return file_get_contents(self::SITE_VERIFY_URL, false, $context);
-    }
+	/**
+	 * Submit the POST request with the specified parameters.
+	 *
+	 * @param RequestParameters $params Request parameters
+	 * @return string Body of the reCAPTCHA response
+	 */
+	public function submit(RequestParameters $params)
+	{
+		/**
+		 * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
+		 * Using "CN_name" will still work, but it will raise deprecated errors.
+		 */
+		$peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
+		$options = array(
+			'http' => array(
+				'header' => "Content-type: application/x-www-form-urlencoded\r\n",
+				'method' => 'POST',
+				'content' => $params->toQueryString(),
+				// Force the peer to validate (not needed in 5.6.0+, but still works
+				'verify_peer' => true,
+				// Force the peer validation to use www.google.com
+				$peer_key => 'www.google.com',
+			),
+		);
+		$context = stream_context_create($options);
+		return file_get_contents(self::SITE_VERIFY_URL, false, $context);
+	}
 }

admin_pages/registrations/templates/attendee_registrations_main_meta_box.template.php

Spacing +18 added lines, -18 removed lines

@@ -5,42 +5,42 @@
 		<table class="admin-primary-mbox-tbl">
 			<thead>
 				<tr>
-					<th class="jst-left"><?php esc_html_e( 'Event Name', 'event_espresso' );?></th>
-					<th class="jst-left"><?php esc_html_e( 'REG ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php esc_html_e( 'TXN ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php esc_html_e( 'Reg Code', 'event_espresso' );?></th>
-					<th class="jst-rght"><?php esc_html_e( 'Ticket Price', 'event_espresso' );?></th>
+					<th class="jst-left"><?php esc_html_e('Event Name', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php esc_html_e('REG ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php esc_html_e('TXN ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php esc_html_e('Reg Code', 'event_espresso'); ?></th>
+					<th class="jst-rght"><?php esc_html_e('Ticket Price', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-			<?php foreach( $registrations as $registration ) : ?>
+			<?php foreach ($registrations as $registration) : ?>
 				<tr>
 					<td class="jst-left">
 					<?php
-						$event_url = add_query_arg( array( 'action' => 'edit', 'post' => $registration->event_ID() ), admin_url( 'admin.php?page=espresso_events' ));
-						echo EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $registration->event_ID() ) ?  '<a href="'. $event_url .'"  title="'. esc_attr__( 'Edit Event', 'event_espresso' ) .'">' . $registration->event_name() . '</a>' : $registration->event_name();
+						$event_url = add_query_arg(array('action' => 'edit', 'post' => $registration->event_ID()), admin_url('admin.php?page=espresso_events'));
+						echo EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $registration->event_ID()) ? '<a href="'.$event_url.'"  title="'.esc_attr__('Edit Event', 'event_espresso').'">'.$registration->event_name().'</a>' : $registration->event_name();
 					?>
 					</td>
 					<td class="jst-left">
 					<?php
-							$reg_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-							echo EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $registration->ID() ) ? '
-							<a href="'.$reg_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . 
-								esc_html__( 'View Registration', 'event_espresso' ) .
+							$reg_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+							echo EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $registration->ID()) ? '
+							<a href="'.$reg_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'. 
+								esc_html__('View Registration', 'event_espresso').
 							'</a>' : $registration->ID();
 					?>
 					</td>
 					<td class="jst-left">
 					<?php
-						$txn_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$registration->transaction_ID() ), TXN_ADMIN_URL );
-						echo EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ? '
-						<a href="'.$txn_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '">' .
-							sprintf( esc_html__('View Transaction %d', 'event_espresso'), $registration->transaction_ID() ) .
+						$txn_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$registration->transaction_ID()), TXN_ADMIN_URL);
+						echo EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '
+						<a href="'.$txn_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'">'.
+							sprintf(esc_html__('View Transaction %d', 'event_espresso'), $registration->transaction_ID()).
 						'</a>' : $registration->transaction_ID();
 					?>
 					</td>
-					<td class="jst-left"><?php echo $registration->reg_code();?></td>
-					<td class="jst-rght"><?php echo EEH_Template::format_currency( $registration->final_price() );?></td>
+					<td class="jst-left"><?php echo $registration->reg_code(); ?></td>
+					<td class="jst-rght"><?php echo EEH_Template::format_currency($registration->final_price()); ?></td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>

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

Spacing +12 added lines, -12 removed lines

@@ -8,36 +8,36 @@
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
  * @author				Mike Nelson
  */
-class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	protected $_max_length;
 
-	public function __construct( $validation_error_message = NULL, $max_length = EE_INF ) {
+	public function __construct($validation_error_message = NULL, $max_length = EE_INF) {
 		$this->_max_length = $max_length;
-		if( $validation_error_message === null ) {
-			$validation_error_message = sprintf( __( 'Input is too long. Maximum number of characters is %1$s', 'event_espresso' ), $max_length );
+		if ($validation_error_message === null) {
+			$validation_error_message = sprintf(__('Input is too long. Maximum number of characters is %1$s', 'event_espresso'), $max_length);
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 	/**
 	 * @param $normalized_value
 	 */
 	public function validate($normalized_value) {
-		if( $this->_max_length !== EE_INF &&
+		if ($this->_max_length !== EE_INF &&
 				$normalized_value &&
-				is_string( $normalized_value ) &&
-				 strlen( $normalized_value ) > $this->_max_length){
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'maxlength' );
+				is_string($normalized_value) &&
+				 strlen($normalized_value) > $this->_max_length) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'maxlength');
 		}
 	}
 
 	/**
 	 * @return array
 	 */
-	function get_jquery_validation_rule_array(){
-		if( $this->_max_length !== EE_INF ) {
-			return array( 'maxlength'=> $this->_max_length, 'messages' => array( 'maxlength' => $this->get_validation_error_message() ) );
+	function get_jquery_validation_rule_array() {
+		if ($this->_max_length !== EE_INF) {
+			return array('maxlength'=> $this->_max_length, 'messages' => array('maxlength' => $this->get_validation_error_message()));
 		} else {
 			return array();
 		}

core/db_models/EEM_Extra_Join.model.php

Spacing +9 added lines, -9 removed lines

@@ -21,26 +21,26 @@
  * @since		 	   $VID:$
  *
  */
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
-class EEM_Extra_Join extends EEM_Base{
+class EEM_Extra_Join extends EEM_Base {
 	// private instance of the Extra Join object
 	protected static $_instance = NULL;
 	
 	public function __construct($timezone = NULL) {
-		$models_this_can_join = array_keys( EE_Registry::instance()->non_abstract_db_models );
+		$models_this_can_join = array_keys(EE_Registry::instance()->non_abstract_db_models);
 		$this->_tables = array(
-			'Extra_Join' => new EE_Primary_Table( 'esp_extra_join', 'EXJ_ID' ),
+			'Extra_Join' => new EE_Primary_Table('esp_extra_join', 'EXJ_ID'),
 		);
 		$this->_fields = array(
 			'Extra_Join' => array(
-				'EXJ_ID' => new EE_Primary_Key_Int_Field( 'EXJ_ID', __( 'Extra Join ID', 'event_espresso' ) ),
-				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_first_model_ID', __( 'First Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
-				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_first_model_name', __( 'First Model Name', 'event_espresso'), true, '', $models_this_can_join ),
-				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_second_model_ID', __( 'Second Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
-				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_second_model_name', __( 'Second Model Name', 'event_espresso'), true, '', $models_this_can_join ),
+				'EXJ_ID' => new EE_Primary_Key_Int_Field('EXJ_ID', __('Extra Join ID', 'event_espresso')),
+				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field('EXJ_first_model_ID', __('First Model ID', 'event_espresso'), true, 0, $models_this_can_join),
+				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_first_model_name', __('First Model Name', 'event_espresso'), true, '', $models_this_can_join),
+				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field('EXJ_second_model_ID', __('Second Model ID', 'event_espresso'), true, 0, $models_this_can_join),
+				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_second_model_name', __('Second Model Name', 'event_espresso'), true, '', $models_this_can_join),
 				
 			)
 		);

core/data_migration_scripts/4_9_0_stages/EE_DMS_4_9_0_Answers_With_No_Registration.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -14,7 +14,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_9_0_Answers_With_No_Registration extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_9_0_Answers_With_No_Registration extends EE_Data_Migration_Script_Stage {
 
 
 
@@ -24,7 +24,7 @@ 
 	 * @return EE_DMS_4_9_0_Answers_With_No_Registration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Answer Cleanup', 'event_espresso' );
+		$this->_pretty_name = __('Answer Cleanup', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -48,9 +48,9 @@ 
 	protected function _migration_step($num_items_to_migrate = 50) {
 		global $wpdb;
 		$wpdb->delete(
-			$wpdb->prefix . 'esp_answer',
-			array( 'REG_ID' => 0 ),
-			array( '%d' )
+			$wpdb->prefix.'esp_answer',
+			array('REG_ID' => 0),
+			array('%d')
 		);
 		$this->set_completed();
 		return 1;

core/db_models/EEM_Extra_Meta.model.php

Spacing +8 added lines, -8 removed lines

@@ -26,16 +26,16 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Extra_Meta extends EEM_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Extra Meta','event_espresso');
-		$this->plural_item = __('Extra Metas','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Extra Meta', 'event_espresso');
+		$this->plural_item = __('Extra Metas', 'event_espresso');
 		$this->_tables = array(
 			'Extra_Meta'=> new EE_Primary_Table('esp_extra_meta', 'EXM_ID')
 		);
@@ -50,13 +50,13 @@ 
 
 			));
 		$this->_model_relations = array();
-		foreach($models_this_can_attach_to as $model){
+		foreach ($models_this_can_attach_to as $model) {
 			$this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
 		}
-		foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ) {
-			$this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta( 'EXM_key', 'EXM_value' );
+		foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+			$this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta('EXM_key', 'EXM_value');
 		}
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

Braces +3 added lines, -1 removed lines

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