Completed
Branch FET-10766-extract-activation-d... (a650cc)
by
unknown
87:01 queued 68:06
created
messages/templates/ee_msg_details_messenger_meta_box.template.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <div class="<?php echo $messenger; ?>-content">
2
-	<?php if (  empty( $inactive_message_types ) && empty( $active_message_types )  ) : echo '<p>' . __('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.') . '</p>'; else : ?>
2
+	<?php if (empty($inactive_message_types) && empty($active_message_types)) : echo '<p>'.__('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.').'</p>'; else : ?>
3 3
 		<p class="inactive-on-message <?php echo $hide_on_message; ?>">
4 4
 			<?php _e('Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.', 'event_espresso'); ?>
5 5
 		<p>
6 6
 		<p class="inactive-off-message <?php echo $hide_off_message; ?>">
7 7
 			<?php _e('This messenger is currently inactive.  Once the messenger is activated any inactive message types associated with the messenger will be shown here.', 'event_espresso'); ?>
8 8
 		</p>
9
-		<div<?php if ( $active ) : ?> id="inactive-message-types"<?php endif; ?> class="inactive-message-types mt-tab-container ui-widget-content-ui-state-default <?php echo $hide_on_message; ?>">
9
+		<div<?php if ($active) : ?> id="inactive-message-types"<?php endif; ?> class="inactive-message-types mt-tab-container ui-widget-content-ui-state-default <?php echo $hide_on_message; ?>">
10 10
 			<ul class="messenger-activation">
11 11
 				<?php echo $inactive_message_types; ?>
12 12
 			</ul>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,9 @@
 block discarded – undo
1 1
 <div class="<?php echo $messenger; ?>-content">
2
-	<?php if (  empty( $inactive_message_types ) && empty( $active_message_types )  ) : echo '<p>' . __('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.') . '</p>'; else : ?>
3
-		<p class="inactive-on-message <?php echo $hide_on_message; ?>">
2
+	<?php if (  empty( $inactive_message_types ) && empty( $active_message_types )  ) : echo '<p>' . __('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.') . '</p>'; else {
3
+	: ?>
4
+		<p class="inactive-on-message <?php echo $hide_on_message;
5
+}
6
+?>">
4 7
 			<?php _e('Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.', 'event_espresso'); ?>
5 8
 		<p>
6 9
 		<p class="inactive-off-message <?php echo $hide_off_message; ?>">
Please login to merge, or discard this patch.
messages/templates/ee_msg_details_messenger_mt_meta_box.template.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <div class="<?php echo $messenger; ?>-content">
2 2
 	<?php echo $content; ?>
3
-	<?php if (  empty( $inactive_message_types ) && empty( $active_message_types )  ) : echo '<p>' . __('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.') . '</p>'; else : ?>
3
+	<?php if (empty($inactive_message_types) && empty($active_message_types)) : echo '<p>'.__('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.').'</p>'; else : ?>
4 4
 		<p class="active-on-message <?php echo $hide_on_message; ?>">
5
-			<?php printf( __('Below are message types that are currently %sactive%s with this messenger. Drag them over to the "Inactive Message Types" box to deactivate them.', 'event_espresso'), '<strong>', '</strong>' ); ?>
5
+			<?php printf(__('Below are message types that are currently %sactive%s with this messenger. Drag them over to the "Inactive Message Types" box to deactivate them.', 'event_espresso'), '<strong>', '</strong>'); ?>
6 6
 		<p>
7
-		<div <?php if ( $active ) : ?> id="active-message-types"<?php endif; ?> class="mt-tab-container <?php echo $hide_on_message; ?>">
7
+		<div <?php if ($active) : ?> id="active-message-types"<?php endif; ?> class="mt-tab-container <?php echo $hide_on_message; ?>">
8 8
 			<ul class="messenger-activation">
9 9
 				<?php echo $active_message_types; ?>
10 10
 			</ul>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,10 @@
 block discarded – undo
1 1
 <div class="<?php echo $messenger; ?>-content">
2 2
 	<?php echo $content; ?>
3
-	<?php if (  empty( $inactive_message_types ) && empty( $active_message_types )  ) : echo '<p>' . __('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.') . '</p>'; else : ?>
4
-		<p class="active-on-message <?php echo $hide_on_message; ?>">
3
+	<?php if (  empty( $inactive_message_types ) && empty( $active_message_types )  ) : echo '<p>' . __('This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.') . '</p>'; else {
4
+	: ?>
5
+		<p class="active-on-message <?php echo $hide_on_message;
6
+}
7
+?>">
5 8
 			<?php printf( __('Below are message types that are currently %sactive%s with this messenger. Drag them over to the "Inactive Message Types" box to deactivate them.', 'event_espresso'), '<strong>', '</strong>' ); ?>
6 9
 		<p>
7 10
 		<div <?php if ( $active ) : ?> id="active-message-types"<?php endif; ?> class="mt-tab-container <?php echo $hide_on_message; ?>">
Please login to merge, or discard this patch.
admin_pages/messages/templates/ee_msg_m_settings_content.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
 		<span id="has_form_class" class="hidden"><?php echo trim($show_hide_edit_form); ?></span>
20 20
 		<form method="POST" action="" class="mt-settings-form">
21 21
 			<?php echo $template_form_fields; ?>
22
-			<?php foreach ( $hidden_fields as $name => $field ) {
22
+			<?php foreach ($hidden_fields as $name => $field) {
23 23
 				echo $field['field'];
24 24
 			} ?>
25 25
 			<input type="submit" value="<?php _e('Submit', 'event_espresso'); ?>" class="button-secondary no-drag" />
Please login to merge, or discard this patch.
messages/templates/ee_msg_messages_settings_help_tab.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -8,10 +8,10 @@
 block discarded – undo
8 8
 <p><?php _e('There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.', 'event_espresso'); ?></p>
9 9
 <p><?php echo $img1; _e('The green colored gear indicates that this messenger is currently active.', 'event_espresso'); echo $img2; _e('Here the white colored gear indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.', 'event_espresso'); ?></p>
10 10
 <p><?php _e('The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:', 'event_espresso'); ?></p>
11
-<p><?php echo $img3; printf( __('On means of course that the messenger is active and %s means the messenger is inactive.', 'event_espresso'), $img4 ); ?></p>
12
-<p><?php _e( 'Incidentally, the on/off toggle is also what you use to activate or deactivate a messenger.', 'event_espresso' ); ?></p>
13
-<p><?php _e( 'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then.  Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.', 'event_espresso'); ?></p>
14
-<p><?php _e( 'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger.  If there are you will be unable to deactivate the messenger.  This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.', 'event_espresso'); ?></p>
15
-<p><?php printf( __('%sVery important!%s Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Keep that in mind. Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
11
+<p><?php echo $img3; printf(__('On means of course that the messenger is active and %s means the messenger is inactive.', 'event_espresso'), $img4); ?></p>
12
+<p><?php _e('Incidentally, the on/off toggle is also what you use to activate or deactivate a messenger.', 'event_espresso'); ?></p>
13
+<p><?php _e('What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then.  Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.', 'event_espresso'); ?></p>
14
+<p><?php _e('When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger.  If there are you will be unable to deactivate the messenger.  This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.', 'event_espresso'); ?></p>
15
+<p><?php printf(__('%sVery important!%s Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Keep that in mind. Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
16 16
 <h3><?php _e('3. Activating or Deactivating Message Types', 'event_espresso'); ?></h3>
17 17
 <p><?php _e('There may be times where you just want to deactivate (or activate new) message types for a particular messenger.  The messages system makes it super easy to do so.  To deactivate, what you do is drag the message type box from the "active area" below the messenger description (of an active messenger) into the "inactive" area in the right sidebar.  To activate you do the reverse.  Just remember that when you deactivate a message type, if that message type has any settings, the settings will be lost.  However, any message templates that match the messenger and message type you deactivated will be preserved, they are just marked "inactive" in the database', 'event_espresso'); ?></p>
18 18
\ No newline at end of file
Please login to merge, or discard this patch.
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.
admin_pages/payments/Payment_Log_Admin_List_Table.class.php 2 patches
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  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 6
 /**
6 7
  * Event Espresso
@@ -185,9 +186,9 @@  discard block
 block discarded – undo
185 186
 	public function column_PMD_ID(EE_Change_Log $item){
186 187
 		if($item->object() instanceof EE_Payment_Method){
187 188
 			return $item->object()->admin_name();
188
-		}elseif($item->object() instanceof EE_Payment && $item->object()->payment_method()){
189
+		} elseif($item->object() instanceof EE_Payment && $item->object()->payment_method()){
189 190
 			return $item->object()->payment_method()->admin_name();
190
-		}else{
191
+		} else{
191 192
 			return __("No longer exists", 'event_espresso');
192 193
 		}
193 194
 	}
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 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
 /**
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 * @param \EE_Admin_Page $admin_page
36 36
 	 * @return Payment_Log_Admin_List_Table
37 37
 	 */
38
-	public function __construct( $admin_page ) {
38
+	public function __construct($admin_page) {
39 39
 		parent::__construct($admin_page);
40 40
 	}
41 41
 
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 //		}else{
53 53
 //			$this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE );
54 54
 //		}
55
-		$this->_all_data_count = $this->_admin_page->get_payment_logs( $this->_per_page,$this->_current_page, TRUE );
56
-		add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons',array($this,'add_download_logs_checkbox'));
55
+		$this->_all_data_count = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page, TRUE);
56
+		add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array($this, 'add_download_logs_checkbox'));
57 57
 	}
58 58
 
59 59
 
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 	 * adds a checkbox to the bottom of the list table, instead of at the top with the rest of the filters
64 64
 	 * @return void
65 65
 	 */
66
-	public function add_download_logs_checkbox(){
67
-		echo "<input type='submit' class='button-primary' id='download_results' name='download_results' value='".  __( 'Download Results', 'event_espresso' )."'>";
66
+	public function add_download_logs_checkbox() {
67
+		echo "<input type='submit' class='button-primary' id='download_results' name='download_results' value='".__('Download Results', 'event_espresso')."'>";
68 68
 	}
69 69
 
70 70
 
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	 */
76 76
 	protected function _set_properties() {
77 77
 		$this->_wp_list_args = array(
78
-			'singular' => __('payment log', 'event_espresso' ),
79
-			'plural' => __('payment logs', 'event_espresso' ),
78
+			'singular' => __('payment log', 'event_espresso'),
79
+			'plural' => __('payment logs', 'event_espresso'),
80 80
 			'ajax' => TRUE, //for now,
81 81
 			'screen' => $this->_admin_page->get_current_screen()->id
82 82
 			);
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 			);
91 91
 
92 92
 		$this->_sortable_columns = array(
93
-			'LOG_time' => array( 'LOG_time' => TRUE ),
93
+			'LOG_time' => array('LOG_time' => TRUE),
94 94
 			);
95 95
 
96 96
 		$this->_hidden_columns = array(
@@ -108,18 +108,18 @@  discard block
 block discarded – undo
108 108
 		$filters = array();
109 109
 		//todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as methods.
110 110
 		$payment_methods = EEM_Payment_Method::instance()->get_all();
111
-		$payment_method_names = array(array('id'=>'all','text'=>  __("All", 'event_espresso')),array('id'=>'0','text'=>  __("Unknown Payment Method", 'event_espresso')));
112
-		foreach($payment_methods as $payment_method){
113
-			$payment_method_names[] = array('id'=>$payment_method->ID(),'text'=>$payment_method->admin_name());
111
+		$payment_method_names = array(array('id'=>'all', 'text'=>  __("All", 'event_espresso')), array('id'=>'0', 'text'=>  __("Unknown Payment Method", 'event_espresso')));
112
+		foreach ($payment_methods as $payment_method) {
113
+			$payment_method_names[] = array('id'=>$payment_method->ID(), 'text'=>$payment_method->admin_name());
114 114
 		}
115 115
 		$filters[] = EEH_Form_Fields::select_input('_payment_method', $payment_method_names, isset($this->_req_data['_payment_method']) ? $this->_req_data['_payment_method'] : 'all');
116
-		$start_date = isset( $this->_req_data['payment-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-6 months' ));
117
-		$end_date = isset( $this->_req_data['payment-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] ) : date( 'm/d/Y' );
116
+		$start_date = isset($this->_req_data['payment-filter-start-date']) ? wp_strip_all_tags($this->_req_data['payment-filter-start-date']) : date('m/d/Y', strtotime('-6 months'));
117
+		$end_date = isset($this->_req_data['payment-filter-end-date']) ? wp_strip_all_tags($this->_req_data['payment-filter-end-date']) : date('m/d/Y');
118 118
 		ob_start();
119 119
 		?>
120
-		<label for="txn-filter-start-date"><?php _e( 'Display Transactions from ', 'event_espresso' ); ?></label>
120
+		<label for="txn-filter-start-date"><?php _e('Display Transactions from ', 'event_espresso'); ?></label>
121 121
 		<input id="payment-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>" name="payment-filter-start-date" size="15"/>
122
-		<label for="txn-filter-end-date"><?php _e( ' until ', 'event_espresso' ); ?></label>
122
+		<label for="txn-filter-end-date"><?php _e(' until ', 'event_espresso'); ?></label>
123 123
 		<input id="payment-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>" name="payment-filter-end-date" size="15"/>
124 124
 		<?php
125 125
 		$filters[] = ob_get_clean();
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 * @return void
134 134
 	 */
135 135
 	protected function _add_view_counts() {
136
-		$this->_views['all']['count'] = $this->_admin_page->get_payment_logs( $this->_per_page,$this->_current_page, TRUE );
136
+		$this->_views['all']['count'] = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page, TRUE);
137 137
 	}
138 138
 
139 139
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 * @return string
145 145
 	 */
146 146
 	public function column_cb($item) {
147
-		return sprintf( '<input type="checkbox" class="option_id" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
147
+		return sprintf('<input type="checkbox" class="option_id" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
148 148
 	}
149 149
 
150 150
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	 * @param \EE_Change_Log $item
171 171
 	 * @return string
172 172
 	 */
173
-	public function column_LOG_time(EE_Change_Log $item){
173
+	public function column_LOG_time(EE_Change_Log $item) {
174 174
 		return $item->get_datetime('LOG_time');
175 175
 	}
176 176
 
@@ -181,12 +181,12 @@  discard block
 block discarded – undo
181 181
 	 * @param \EE_Change_Log $item
182 182
 	 * @return string
183 183
 	 */
184
-	public function column_PMD_ID(EE_Change_Log $item){
185
-		if($item->object() instanceof EE_Payment_Method){
184
+	public function column_PMD_ID(EE_Change_Log $item) {
185
+		if ($item->object() instanceof EE_Payment_Method) {
186 186
 			return $item->object()->admin_name();
187
-		}elseif($item->object() instanceof EE_Payment && $item->object()->payment_method()){
187
+		}elseif ($item->object() instanceof EE_Payment && $item->object()->payment_method()) {
188 188
 			return $item->object()->payment_method()->admin_name();
189
-		}else{
189
+		} else {
190 190
 			return __("No longer exists", 'event_espresso');
191 191
 		}
192 192
 	}
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
 	 * @param \EE_Change_Log $item
199 199
 	 * @return string
200 200
 	 */
201
-	public function column_TXN_ID(EE_Change_Log $item){
202
-		if($item->object() instanceof EE_Payment){
203
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction', $item->object()->TXN_ID() )) {
204
-				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->object()->TXN_ID() ), TXN_ADMIN_URL );
205
-				return '<a href="'.$view_txn_lnk_url.'"  title="' . sprintf( esc_attr__( 'click to view transaction #%s', 'event_espresso' ),  $item->object()->TXN_ID() ) . '">' . sprintf( __( 'view txn %s', 'event_espresso' ),  $item->object()->TXN_ID() ) . '</a>';
201
+	public function column_TXN_ID(EE_Change_Log $item) {
202
+		if ($item->object() instanceof EE_Payment) {
203
+			if (EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->object()->TXN_ID())) {
204
+				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->object()->TXN_ID()), TXN_ADMIN_URL);
205
+				return '<a href="'.$view_txn_lnk_url.'"  title="'.sprintf(esc_attr__('click to view transaction #%s', 'event_espresso'), $item->object()->TXN_ID()).'">'.sprintf(__('view txn %s', 'event_espresso'), $item->object()->TXN_ID()).'</a>';
206 206
 			}
207 207
 		} else {
208 208
 			return __("Unable to find transaction", 'event_espresso');
Please login to merge, or discard this patch.