eventespresso / event-espresso-core

core/admin/EE_Help_Tour_final_stop.class.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -60,7 +60,7 @@ 
 			'action' => 'admin_option_settings',
 			'page' => 'espresso_general_settings'
 			);
-		return '<p>' . sprintf( __('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="' . EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php') ) . '">', '</a>' ) . '</p>';
+		return '<p>'.sprintf(__('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="'.EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')).'">', '</a>').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 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

core/admin/templates/about_admin_wrapper.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <div class="wrap espresso-admin about-wrap">
 
 	<h1><?php  echo $admin_page_title; ?></h1>
-	<div class="about-text"><?php echo !empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
-	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf( esc_attr__( '%s Logo', 'event_espresso' ), 'Event Espresso' ); ?>"/><br /><?php printf( __('Version %s', 'event_espresso' ),  EVENT_ESPRESSO_VERSION ); ?></div>
+	<div class="about-text"><?php echo ! empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
+	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf(esc_attr__('%s Logo', 'event_espresso'), 'Event Espresso'); ?>"/><br /><?php printf(__('Version %s', 'event_espresso'), EVENT_ESPRESSO_VERSION); ?></div>
 
 	<?php echo $nav_tabs; ?>
 
 
 <?php
-	do_action( 'AHEE__admin_wrapper__template__before_about_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__before_about_admin_page_content');
 	echo $about_admin_page_content;
-	do_action( 'AHEE__admin_wrapper__template__after_about_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__after_about_admin_page_content');
 ?>
 
 </div>

core/admin/templates/admin_details_metabox_column_wrapper.template.php

Spacing +4 added lines, -4 removed lines

@@ -10,13 +10,13 @@
 
 		<?php
 		//let's loop through the columns
-		 for ( $i = 1; $i <= $num_columns; $i++ ) {
-		 	$metaref = ( $i === 1 ) ? 'normal' : 'side';
-		 	$metaref = ( $i > 2 ) ? 'column'.$i : $metaref;
+		 for ($i = 1; $i <= $num_columns; $i++) {
+		 	$metaref = ($i === 1) ? 'normal' : 'side';
+		 	$metaref = ($i > 2) ? 'column'.$i : $metaref;
 		 ?>
 
 			<div id='postbox-container-<?php echo $i; ?>' class='postbox-container'>
-				<?php do_meta_boxes( $current_page, $metaref, NULL ); ?>
+				<?php do_meta_boxes($current_page, $metaref, NULL); ?>
 			</div>
 		<?php }// end column loop ?>
 	</div> <!-- post-body -->

core/admin/templates/admin_details_publish_metabox.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( $publish_box_extra_content ) : ?>
+<?php if ($publish_box_extra_content) : ?>
 <div id="minor-publishing">
 <?php echo $publish_box_extra_content; ?>
 </div>
@@ -13,7 +13,7 @@ 
 	
 	<div id="espresso_major_buttons_wrapper">
 	
-		<?php if ( $publish_delete_link ) : ?>
+		<?php if ($publish_delete_link) : ?>
 		<div id="delete-action">
 			<?php echo $publish_delete_link; ?>
 		</div>

core/admin/templates/admin_general_metabox_contents_espresso_links.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <div class="padding">
 	   	<ul class="infolinks">
 	   		<li>
-	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso') . '</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">' . __('Usage Guide').'</a>'; ?>
+	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso').'</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">'.__('Usage Guide').'</a>'; ?>
 	   		</li>
 	   		<li>
 		   		<a href="http://eventespresso.com/wiki/put-custom-templates/" target="_blank">
@@ -30,7 +30,7 @@ 
 	   			</a>
 	   		</li>
 	   		<li>
-	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso'). '</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">' .__('Add-ons', 'event_espresso').'</a>'; ?><br />
+	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso').'</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">'.__('Add-ons', 'event_espresso').'</a>'; ?><br />
 	   			<br />
 	   			<ol>
 	   				<li>

core/admin/templates/admin_reports.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php //EEH_Debug_Tools::printr( $admin_reports, '$admin_reports' ); ?>
 
-<?php foreach ( $admin_reports as $report) : ?>
+<?php foreach ($admin_reports as $report) : ?>
 
 	<div id="<?php echo $report; ?>" class="admin-report-chart-dv" style="width:95%; min-height:420px; margin:20px 4% 40px 1%;"></div>
 

core/admin/templates/status_dropdown.template.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 	<span id="localized_status_save"><?php echo $localized_status_save; ?></span>
 	<span id="cur_stat_id"><?php echo $cur_status; ?></span>
 	<select name='ee_post_status' id='ee_post_status'>
- 	<?php foreach ( $statuses as $status => $label ) : ?>
-		<option<?php selected( $cur_status, $status ); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
+ 	<?php foreach ($statuses as $status => $label) : ?>
+		<option<?php selected($cur_status, $status); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
 	<?php
 	endforeach;
 	?>

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_category_details.dmsstage.php

Spacing +7 added lines, -7 removed lines

@@ -6,16 +6,16 @@ 
  * Authorize.net AIM, Bank, Check, Invoice, Paypal Pro and Paypal Standard.
  * 
  */
-class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage {
 private $_old_table;
 private $_new_table;
 private $_new_term_table;
-function _migration_step($num_items=50){
+function _migration_step($num_items = 50) {
 	global $wpdb;
 	$start_at_record = $this->count_records_migrated();
-	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 	$items_actually_migrated = 0;
-	foreach($rows as $category_detail_row){
+	foreach ($rows as $category_detail_row) {
 		$term_and_taxonomy_ids = wp_insert_term(
 				stripslashes($category_detail_row['category_name']),
 				'espresso_event_categories',
@@ -23,8 +23,8 @@ 
 					'description'=>  stripslashes($category_detail_row['category_desc']),
 					'slug'=>$category_detail_row['category_identifier']
 				));
-		if($term_and_taxonomy_ids instanceof WP_Error){
-			$this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"),  $this->_json_encode($category_detail_row),$term_and_taxonomy_ids->get_error_message()));
+		if ($term_and_taxonomy_ids instanceof WP_Error) {
+			$this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"), $this->_json_encode($category_detail_row), $term_and_taxonomy_ids->get_error_message()));
 			$items_actually_migrated++;
 			continue;
 		}
@@ -34,7 +34,7 @@ 
 		$this->get_migration_script()->set_mapping($this->_old_table, $category_detail_row['id'], $this->_new_table, $term_taxonomy_id);
 		$items_actually_migrated++;
 	}
-	if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+	if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 		$this->set_completed();
 	}
 	return $items_actually_migrated;

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_event_category.dmsstage.php

Indentation -2 removed lines

@@ -24,8 +24,6 @@
 				'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
 				'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
 			));
-
-
  *
  */
 class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage{

Spacing +20 added lines, -20 removed lines

@@ -28,22 +28,22 @@ 
 
  *
  */
-class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $event_venue_rel){
+		foreach ($rows as $event_venue_rel) {
 			$term_relation_id = $this->_add_relation_from_event_to_term_taxonomy($event_venue_rel);
-			if($term_relation_id){
+			if ($term_relation_id) {
 				$this->get_migration_script()->set_mapping($this->_old_table, $event_venue_rel['id'], $this->_new_table, $term_relation_id);
 			}
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -67,16 +67,16 @@ 
 	 * @param array $old_event_cat_relation
 	 * @return int
 	 */
-	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation){
+	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation) {
 		global $wpdb;
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix."posts");
 		$new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix."term_taxonomy");
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$old_event_cat_relation['event_id']));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
 			return 0;
 		}
-		if( ! $new_term_taxonomy_id){
-			$this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"),$old_event_cat_relation['cat_id']));
+		if ( ! $new_term_taxonomy_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
 			return 0;
 		}
 		$cols_n_values = array(
@@ -85,19 +85,19 @@ 
 			'term_order'=>0
 		);
 		$datatypes = array(
-			'%d',//object_id
-			'%d',//term_taxonomy_id
-			'%d',//term_order
+			'%d', //object_id
+			'%d', //term_taxonomy_id
+			'%d', //term_order
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
-		}else{
+		} else {
 			//increment the term-taxonomie's count
-			$success = $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id ) );
-			if( ! $success ){
-				$this->add_error(sprintf( __( 'Could not increment term_taxonomy\'s count because %s', 'event_espresso' ),$wpdb->last_error));
+			$success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
 			}
 		}
 		return $wpdb->insert_id;

Braces +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		if ( ! $success){
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
-		}else{
+		} else{
 			//increment the term-taxonomie's count
 			$success = $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id ) );
 			if( ! $success ){