Completed
Branch BUG-10980-api-calculated-field... (193431)
by
unknown
106:45 queued 95:53
created
admin_pages/messages/templates/ee_msg_messenger_help_tab.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1 1
 <h2><?php _e('What are Messengers?', 'event_espresso'); ?></h2>
2
-<p><?php printf( __('Messengers are the vehicles that deliver messages to people.  By default, every Event Espresso install has the %sEmail%s messenger already active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd Party API\'s etc.', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
3 2
\ No newline at end of file
3
+<p><?php printf(__('Messengers are the vehicles that deliver messages to people.  By default, every Event Espresso install has the %sEmail%s messenger already active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd Party API\'s etc.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
4 4
\ No newline at end of file
Please login to merge, or discard this patch.
admin_pages/messages/templates/ee_msg_mt_settings_content.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 	<div class"mt-settings">
6 6
 		<form method="POST" action="" class="mt-settings-form<?php echo $show_form; ?>">
7 7
 			<?php echo $template_form_fields; ?>
8
-			<?php foreach ( $hidden_fields as $name => $field ) {
8
+			<?php foreach ($hidden_fields as $name => $field) {
9 9
 				echo $field['field'];
10 10
 			} ?> 
11 11
 			<input type="submit" value="<?php _e('Submit', 'event_espresso'); ?>" class="button-secondary mt-settings-submit no-drag" />
Please login to merge, or discard this patch.
admin_pages/other_services/Other_Services_Admin_Page.core.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
87 87
 
88 88
 
89 89
 	public function load_scripts_styles() {
90
-		wp_register_style( 'ee-other-services-css', EE_OTHER_SERVICES_ASSETS_URL . 'other-services.css' , array('ee-admin-css') , EVENT_ESPRESSO_VERSION );
91
-		wp_enqueue_style( 'ee-other-services-css' );
90
+		wp_register_style('ee-other-services-css', EE_OTHER_SERVICES_ASSETS_URL.'other-services.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
91
+		wp_enqueue_style('ee-other-services-css');
92 92
 	}
93 93
 
94 94
 
95 95
 	protected function _other_services() {
96
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH . 'other_services_content.template.php', array(), true );
96
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH.'other_services_content.template.php', array(), true);
97 97
 		$this->display_admin_page_with_no_sidebar();
98 98
 	}
99 99
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
admin_pages/other_services/Other_Services_Admin_Page_Init.core.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 
33 33
 	public function __construct() {
34 34
 		//define some help/support page related constants
35
-		define( 'EE_OTHER_SERVICES_PG_SLUG', 'espresso_packages' );
36
-		define( 'EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page=' . EE_OTHER_SERVICES_PG_SLUG ));
37
-		define( 'EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'other_services/templates/');
38
-		define( 'EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES . 'other_services/' );
39
-		define( 'EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'other_services/assets/');
35
+		define('EE_OTHER_SERVICES_PG_SLUG', 'espresso_packages');
36
+		define('EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page='.EE_OTHER_SERVICES_PG_SLUG));
37
+		define('EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'other_services/templates/');
38
+		define('EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES.'other_services/');
39
+		define('EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL.'other_services/assets/');
40 40
 
41 41
 		parent::__construct();
42 42
 	}
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	}
47 47
 
48 48
 	protected function _set_menu_map() {
49
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
49
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
50 50
 			'menu_group' => 'extras',
51 51
 			'menu_order' => 30,
52 52
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
payments/help_tours/Payment_Methods_Selection_Help_Tour.class.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -68,21 +68,21 @@  discard block
 block discarded – undo
68 68
 
69 69
 
70 70
 	protected function _start() {
71
-		$content = '<h3>' . __('Payment Methods', 'event_espresso') . '</h3>';
72
-		$content .= '<p>' . __('This tour of the Payment Methods page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
71
+		$content = '<h3>'.__('Payment Methods', 'event_espresso').'</h3>';
72
+		$content .= '<p>'.__('This tour of the Payment Methods page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
73 73
 		return $content;
74 74
 	}
75 75
 
76 76
 	protected function _gateway_links_stop() {
77
-		return '<p>' . __('Available payment methods are shown here. Clicking on a payment method will provide you with an option to activate that payment gateway.', 'event_espresso') . '</p>';
77
+		return '<p>'.__('Available payment methods are shown here. Clicking on a payment method will provide you with an option to activate that payment gateway.', 'event_espresso').'</p>';
78 78
 	}
79 79
 
80 80
 	protected function _gateway_settings_metabox_stop() {
81
-		return '<p>' . __('A payment gateway must first be enabled. You will then be able to configure the payment gateway. Be sure to save settings after configuring your payment gateway.', 'event_espresso') . '</p>';
81
+		return '<p>'.__('A payment gateway must first be enabled. You will then be able to configure the payment gateway. Be sure to save settings after configuring your payment gateway.', 'event_espresso').'</p>';
82 82
 	}
83 83
 
84 84
 	protected function _end_tour_stop() {
85
-		return '<p>' . __('After configuring your payment gateway, go to the Event Editor to create your first event with Event Espresso.', 'event_espresso') . '</p>';
85
+		return '<p>'.__('After configuring your payment gateway, go to the Event Editor to create your first event with Event Espresso.', 'event_espresso').'</p>';
86 86
 	}
87 87
 
88 88
 }
89 89
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
payments/help_tours/Payment_Methods_Settings_Help_Tour.class.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 
54 54
 
55 55
 	protected function _start() {
56
-		$content = '<h3>' . __('Payment Settings', 'event_espresso') . '</h3>';
57
-		$content .= '<p>' . __('This tour of the Payment Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
56
+		$content = '<h3>'.__('Payment Settings', 'event_espresso').'</h3>';
57
+		$content .= '<p>'.__('This tour of the Payment Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
58 58
 		return $content;
59 59
 	}
60 60
 
61 61
 	protected function _show_pending_options_stop() {
62
-		return '<p>' . __('Specify whether to provide your registrants with the option to retry payments.', 'event_espresso') . '</p>';
62
+		return '<p>'.__('Specify whether to provide your registrants with the option to retry payments.', 'event_espresso').'</p>';
63 63
 	}
64 64
 }
65 65
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
admin_pages/payments/templates/payment_log_details.template.php 3 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,27 +3,27 @@
 block discarded – undo
3 3
 if (!defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6
- * Event Espresso
7
- *
8
- * Event Registration and Management Plugin for WordPress
9
- *
10
- * @ package			Event Espresso
11
- * @ author			Seth Shoultes
12
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
- * @ link					http://www.eventespresso.com
15
- * @ version		 	4.3
16
- *
17
- * ------------------------------------------------------------------------
18
- *
19
- * payment_log_details
20
- *
21
- * @package			Event Espresso
22
- * @subpackage
23
- * @author				Mike Nelson
24
- *
25
- * ------------------------------------------------------------------------
26
- */
6
+	 * Event Espresso
7
+	 *
8
+	 * Event Registration and Management Plugin for WordPress
9
+	 *
10
+	 * @ package			Event Espresso
11
+	 * @ author			Seth Shoultes
12
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
+	 * @ link					http://www.eventespresso.com
15
+	 * @ version		 	4.3
16
+	 *
17
+	 * ------------------------------------------------------------------------
18
+	 *
19
+	 * payment_log_details
20
+	 *
21
+	 * @package			Event Espresso
22
+	 * @subpackage
23
+	 * @author				Mike Nelson
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 /*@var EE_Change_Log $payment_Log */
28 28
 /*@var EE_Payment_Method $payment_Method*/
29 29
 /*@var EE_Transaction $transaction*/
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6 6
  * Event Espresso
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 					</label>
62 62
 				</th>
63 63
 				<td>
64
-					<?php echo $transaction ? $transaction->ID() : __("Could not be determined", 'event_espresso');?>
64
+					<?php echo $transaction ? $transaction->ID() : __("Could not be determined", 'event_espresso'); ?>
65 65
 
66 66
 				</td>
67 67
 			</tr>
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 					</label>
73 73
 				</th>
74 74
 				<td>
75
-					<?php echo $payment_log->e('LOG_message','as_table');//EEH_Template::layout_array_as_table($payment_log->content())?>
75
+					<?php echo $payment_log->e('LOG_message', 'as_table'); //EEH_Template::layout_array_as_table($payment_log->content())?>
76 76
 				</td>
77 77
 			</tr>
78 78
 		</tbody>
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
admin_pages/payments/templates/payment_method_activate.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 				<td>
15 15
 					
16 16
 					<a id="activate_<?php echo $payment_method->slug()?>" class="espresso-button-green button-primary" href="<?php echo $activate_url?>">
17
-						<?php printf(__("Activate %s Payment Method?", "event_espresso"),$payment_method->admin_name()); ?>
17
+						<?php printf(__("Activate %s Payment Method?", "event_espresso"), $payment_method->admin_name()); ?>
18 18
 					</a>
19 19
 				</td>
20 20
 			</tr>
Please login to merge, or discard this patch.
admin_pages/payments/templates/payment_settings.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 					</label>
10 10
 				</th>
11 11
 				<td>
12
-					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options ); ?>
12
+					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options); ?>
13 13
 
14 14
 				</td>
15 15
 			</tr>
Please login to merge, or discard this patch.