Completed
Branch FET/rule-specific-exclusions-l... (334422)
by
unknown
17:10 queued 32s
created
support/templates/support_admin_details_important_information.template.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,14 +7,14 @@
 block discarded – undo
7 7
 	$is_php_valid = version_compare(phpversion(), $php_req_version, '>');
8 8
 	$is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>');
9 9
 
10
-	if (!version_compare($wp_version, $wp_req_version, '>=')) {
11
-		echo '<p class="red_alert">' . __('This version of Event Espresso requires WordPress version', 'event_espresso') . ' ' . $wp_req_version . '+. ' . __('Please upgrade to the latest version of WordPress.', 'event_espresso') . '</p>';
10
+	if ( ! version_compare($wp_version, $wp_req_version, '>=')) {
11
+		echo '<p class="red_alert">'.__('This version of Event Espresso requires WordPress version', 'event_espresso').' '.$wp_req_version.'+. '.__('Please upgrade to the latest version of WordPress.', 'event_espresso').'</p>';
12 12
 	}
13
-	if (!$is_php_valid) {
14
-		echo '<p class="red_alert">' . __('Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:', 'event_espresso') . ' ' . $php_req_version . '</p>';
13
+	if ( ! $is_php_valid) {
14
+		echo '<p class="red_alert">'.__('Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:', 'event_espresso').' '.$php_req_version.'</p>';
15 15
 	}
16
-	if (!$is_mysql_valid) {
17
-		echo '<p class="red_alert">' . __('Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:', 'event_espresso') . ' ' . $mysql_req_version . '</p>';
16
+	if ( ! $is_mysql_valid) {
17
+		echo '<p class="red_alert">'.__('Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:', 'event_espresso').' '.$mysql_req_version.'</p>';
18 18
 	}
19 19
 	
20 20
 	$query_args = array(
Please login to merge, or discard this patch.
support/templates/support_admin_details_shortcodes_attendee.template.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,42 +6,42 @@
 block discarded – undo
6 6
 			<li>
7 7
 				<strong>[ESPRESSO_EVENT_ATTENDEES]</strong><br>
8 8
 				<p class="description">
9
-					<?php _e('With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event.  If it is used in Event Description, then it will show the attendees for that event.', 'event_espresso' ); ?>
9
+					<?php _e('With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event.  If it is used in Event Description, then it will show the attendees for that event.', 'event_espresso'); ?>
10 10
 				</p>
11 11
 				<br>
12 12
 			</li>
13 13
 			<li>
14 14
 				<strong>[ESPRESSO_EVENT_ATTENDEES event_id=30]</strong><br>
15 15
 				<p class="description">
16
-					<?php _e('Will list the attendees for a specific event.', 'event_espresso' ); ?>
16
+					<?php _e('Will list the attendees for a specific event.', 'event_espresso'); ?>
17 17
 				</p>
18 18
 				<br>
19 19
 			</li>
20 20
 			<li>
21 21
 				<strong>[ESPRESSO_EVENT_ATTENDEES datetime_id=245]</strong><br>
22 22
 				<p class="description">
23
-					<?php _e('Will list the attendees for a specific datetime.', 'event_espresso' ); ?>
23
+					<?php _e('Will list the attendees for a specific datetime.', 'event_espresso'); ?>
24 24
 				</p>
25 25
 				<br>
26 26
 			</li>
27 27
 			<li>
28 28
 				<strong>[ESPRESSO_EVENT_ATTENDEES ticket_id=34]</strong><br>
29 29
 				<p class="description">
30
-					<?php _e('Will list the attendees for a specific ticket.', 'event_espresso' ); ?>
30
+					<?php _e('Will list the attendees for a specific ticket.', 'event_espresso'); ?>
31 31
 				</p>
32 32
 				<br>
33 33
 			</li>
34 34
 			<li>
35 35
 				<strong>[ESPRESSO_EVENT_ATTENDEES status=RAP]</strong><br>
36 36
 				<p class="description">
37
-					<?php _e('You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status.  Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.', 'event_espresso' ); ?>
37
+					<?php _e('You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status.  Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.', 'event_espresso'); ?>
38 38
 				</p>
39 39
 				<p>
40 40
 					<?php _e('The statuses you can use are:', 'event_espresso'); ?>
41 41
 					<br>
42 42
 					<?php
43
-						foreach ( EEM_Registration::reg_status_array( array(), true ) as $status_code => $status_label ) {
44
-							echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>';
43
+						foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) {
44
+							echo '<strong>'.$status_code.':</strong>'.' '.$status_label.'<br>';
45 45
 						}
46 46
 					?>
47 47
 
Please login to merge, or discard this patch.
help_tabs/transactions_overview_table_column_headings.help_tab.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,11 +67,11 @@
 block discarded – undo
67 67
 </li>
68 68
 <li style="list-style-type: none;">
69 69
 <strong><?php _e('View Registration Details <span class="dashicons dashicons-clipboard"></span>', 'event_espresso'); ?></strong><br />
70
-<?php echo sprintf(__('Clicking this icon will take you to the registration page for this transaction. You can also get there via the %sRegistrations page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_registrations">','</a>'); ?>
70
+<?php echo sprintf(__('Clicking this icon will take you to the registration page for this transaction. You can also get there via the %sRegistrations page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_registrations">', '</a>'); ?>
71 71
 </li>
72 72
 <li style="list-style-type: none;">
73 73
 <strong><?php _e('Send Payment Reminder <span class="dashicons dashicons-email-alt"></span>', 'event_espresso'); ?></strong><br />
74
-<?php echo sprintf(__('Emails the primary registrant the Payment Reminder message. This is set up in the %sMessages page%s.', 'event_espresso'),'<a href="admin.php?page=espresso_messages">','</a>'); ?>
74
+<?php echo sprintf(__('Emails the primary registrant the Payment Reminder message. This is set up in the %sMessages page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_messages">', '</a>'); ?>
75 75
 </li>
76 76
 </ul>
77 77
 </li>
Please login to merge, or discard this patch.
admin_pages/transactions/qtips/Transaction_Details_Tips.lib.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 	protected function _set_tips_array() {
32 32
 		$this->_qtipsa = array(
33 33
 			0 => array(
34
-				'content_id' => 'payment-status-' . EEM_Payment::status_id_approved,
35
-				'target' => '.pymt-status-' . EEM_Payment::status_id_approved,
34
+				'content_id' => 'payment-status-'.EEM_Payment::status_id_approved,
35
+				'target' => '.pymt-status-'.EEM_Payment::status_id_approved,
36 36
 				'content' => $this->_payment_status_legend(EEM_Payment::status_id_approved),
37 37
 				'options' => array(
38 38
 					'position' => array(
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 					)
42 42
 				),
43 43
 			1 => array(
44
-				'content_id' => 'payment-status-' . EEM_Payment::status_id_pending,
45
-				'target' => '.pymt-status-' . EEM_Payment::status_id_pending,
44
+				'content_id' => 'payment-status-'.EEM_Payment::status_id_pending,
45
+				'target' => '.pymt-status-'.EEM_Payment::status_id_pending,
46 46
 				'content' => $this->_payment_status_legend(EEM_Payment::status_id_pending),
47 47
 				'options' => array(
48 48
 					'position' => array(
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 					)
52 52
 				),
53 53
 			2 => array(
54
-				'content_id' => 'payment-status-' . EEM_Payment::status_id_cancelled,
55
-				'target' => '.pymt-status-' . EEM_Payment::status_id_cancelled,
54
+				'content_id' => 'payment-status-'.EEM_Payment::status_id_cancelled,
55
+				'target' => '.pymt-status-'.EEM_Payment::status_id_cancelled,
56 56
 				'content' => $this->_payment_status_legend(EEM_Payment::status_id_cancelled),
57 57
 				'options' => array(
58 58
 					'position' => array(
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 					)
62 62
 				),
63 63
 			3 => array(
64
-				'content_id' => 'payment-status-' . EEM_Payment::status_id_declined,
65
-				'target' => '.pymt-status-' . EEM_Payment::status_id_declined,
64
+				'content_id' => 'payment-status-'.EEM_Payment::status_id_declined,
65
+				'target' => '.pymt-status-'.EEM_Payment::status_id_declined,
66 66
 				'content' => $this->_payment_status_legend(EEM_Payment::status_id_declined),
67 67
 				'options' => array(
68 68
 					'position' => array(
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
 					)
72 72
 				),
73 73
 			4 => array(
74
-				'content_id' => 'payment-status-' . EEM_Payment::status_id_failed,
75
-				'target' => '.pymt-status-' . EEM_Payment::status_id_failed,
74
+				'content_id' => 'payment-status-'.EEM_Payment::status_id_failed,
75
+				'target' => '.pymt-status-'.EEM_Payment::status_id_failed,
76 76
 				'content' => $this->_payment_status_legend(EEM_Payment::status_id_failed),
77 77
 				'options' => array(
78 78
 					'position' => array(
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @param  EEM_Payment constant $status What status is set (by class)
93 93
 	 * @return string         The status legend with the related status highlighted
94 94
 	 */
95
-	private function _payment_status_legend( $status ) {
95
+	private function _payment_status_legend($status) {
96 96
 
97 97
 		$status_array = array(
98 98
 			'approved' => EEM_Payment::status_id_approved,
@@ -102,6 +102,6 @@  discard block
 block discarded – undo
102 102
 			'failed' => EEM_Payment::status_id_failed,
103 103
 			);
104 104
 
105
-		return EEH_Template::status_legend( $status_array, $status );
105
+		return EEH_Template::status_legend($status_array, $status);
106 106
 	}
107 107
 }
108 108
\ No newline at end of file
Please login to merge, or discard this patch.
templates/txn_admin_details_side_meta_box_txn_number.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@
 block discarded – undo
2 2
 
3 3
 	<table id="admin-primary-mbox-txn-details-tbl" class="form-table">
4 4
 		<tbody>
5
-		<?php foreach ( $txn_details as $key => $txn_detail ) : ?>
5
+		<?php foreach ($txn_details as $key => $txn_detail) : ?>
6 6
 			<tr>
7 7
 				<th>
8
-					<label for="<?php echo $key;?>"><?php echo $txn_detail['label'];?></label>
8
+					<label for="<?php echo $key; ?>"><?php echo $txn_detail['label']; ?></label>
9 9
 				</th>
10 10
 				<td>
11
-					<?php echo $txn_detail['value'];?>
11
+					<?php echo $txn_detail['value']; ?>
12 12
 				</td>
13 13
 			</tr>
14 14
 		<?php endforeach; // $txn_details?>
Please login to merge, or discard this patch.
admin_pages/transactions/templates/txn_admin_overview.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 
2 2
 		<ul class="subsubsub">
3
-			<li class="all"><a class="current" href="<?php echo $view_all_url;?>">View All <span class="count">(<?php echo $table_rows; ?>)</span></a></li>
3
+			<li class="all"><a class="current" href="<?php echo $view_all_url; ?>">View All <span class="count">(<?php echo $table_rows; ?>)</span></a></li>
4 4
 		</ul>
5 5
 
6 6
 		<div id="txn-filters-dv">
7
-			<form id="txn-filters-frm" action="<?php echo $txn_overview_url;?>" method="post" name="txn-filters-frm">
8
-				<label for="txn-filter-start-date"><?php _e( 'Display Transactions from ', 'event_espresso' ); ?></label>
7
+			<form id="txn-filters-frm" action="<?php echo $txn_overview_url; ?>" method="post" name="txn-filters-frm">
8
+				<label for="txn-filter-start-date"><?php _e('Display Transactions from ', 'event_espresso'); ?></label>
9 9
 				<input id="txn-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>" name="txn-filter-start-date" size="15"/>	
10
-				<label for="txn-filter-end-date"> <?php _e( 'until', 'event_espresso' ); ?> </label>
10
+				<label for="txn-filter-end-date"> <?php _e('until', 'event_espresso'); ?> </label>
11 11
 				<input id="txn-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>" name="txn-filter-end-date" size="15"/>	
12 12
 				<input id="submit-txn-filters-sbmt" class="button-secondary" type="submit" value="Filter Months">
13 13
 			</form>
14 14
 		</div>
15 15
 
16
-        <form id="transactions-overview-frm" action="<?php echo $txn_overview_url;?>" method="get">
16
+        <form id="transactions-overview-frm" action="<?php echo $txn_overview_url; ?>" method="get">
17 17
             <input type="hidden" name="page" value="<?php echo $_REQUEST['page'] ?>" />
18 18
             <input type="hidden" id="per_page" name="per_page" value="" />
19 19
             <?php echo $list_table->display(); ?>
Please login to merge, or discard this patch.
admin_pages/transactions/templates/txn_admin_wrapper.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <div class="wrap">
2 2
 
3
-	<h2><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php esc_attr_e( $admin_page_title, 'event_espresso' ); ?></h2>
3
+	<h2><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php esc_attr_e($admin_page_title, 'event_espresso'); ?></h2>
4 4
 
5 5
 	<h2 class="nav-tab-wrapper">
6 6
 		<a class="nav-tab<?php echo $tab_active_overview; ?>" href="<?php echo $tab_url_overview; ?>"><?php echo $tab_lnk_overview; ?></a>
7
-		<?php if ( $tab_details ) : ?>
7
+		<?php if ($tab_details) : ?>
8 8
 			<a class="nav-tab<?php echo $tab_active_details; ?>" href="<?php echo $tab_url_details; ?>"><?php echo $tab_lnk_details; ?></a>
9 9
 		<?php endif; ?>
10 10
 		<a class="nav-tab<?php echo $tab_active_reports; ?>" href="<?php echo $tab_url_reports; ?>"><?php echo $tab_lnk_reports; ?></a>
Please login to merge, or discard this patch.
caffeinated/admin/extend/events/qtips/EE_Event_Editor_Tips.lib.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 				),
84 84
 			7 => array(
85 85
 				'content_id' => 'tkt-status-archived',
86
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::archived,
86
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::archived,
87 87
 				'content' => $this->_ticket_status_legend(EE_Ticket::archived),
88 88
 				'options' => array(
89 89
 					'position' => array(
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 				),
97 97
 			8 => array(
98 98
 				'content_id' => 'tkt-status-expired',
99
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::expired,
99
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::expired,
100 100
 				'content' => $this->_ticket_status_legend(EE_Ticket::expired),
101 101
 				'options' => array(
102 102
 					'position' => array(
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 				),
110 110
 			9 => array(
111 111
 				'content_id' => 'tkt-status-sold_out',
112
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::sold_out,
112
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::sold_out,
113 113
 				'content' => $this->_ticket_status_legend(EE_Ticket::sold_out),
114 114
 				'options' => array(
115 115
 					'position' => array(
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 				),
123 123
 			10 => array(
124 124
 				'content_id' => 'tkt-status-pending',
125
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::pending,
125
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::pending,
126 126
 				'content' => $this->_ticket_status_legend(EE_Ticket::pending),
127 127
 				'options' => array(
128 128
 					'position' => array(
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 				),
136 136
 			11 => array(
137 137
 				'content_id' => 'tkt-status-onsale',
138
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::onsale,
138
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::onsale,
139 139
 				'content' => $this->_ticket_status_legend(EE_Ticket::onsale),
140 140
 				'options' => array(
141 141
 					'position' => array(
@@ -178,8 +178,8 @@  discard block
 block discarded – undo
178 178
 
179 179
 
180 180
 	private function _get_taxable_info_content() {
181
-		$price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL );
182
-		return '<p>' . sprintf( __('Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)', 'event_espresso'), '<a href="' . $price_admin_link . '" title="' . esc_attr__('Pricing Admin Page', 'event_espresso') . '">', '</a>' ) . '</p>';
181
+		$price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL);
182
+		return '<p>'.sprintf(__('Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)', 'event_espresso'), '<a href="'.$price_admin_link.'" title="'.esc_attr__('Pricing Admin Page', 'event_espresso').'">', '</a>').'</p>';
183 183
 	}
184 184
 
185 185
 	/**
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 	 * @param  EE_Ticket constant $status What status is set (by class)
188 188
 	 * @return string         The status legend with the related status highlighted
189 189
 	 */
190
-	private function _ticket_status_legend( $status ) {
190
+	private function _ticket_status_legend($status) {
191 191
 
192 192
 		$status_array = array(
193 193
 			'archived' => EE_Ticket::archived,
@@ -197,6 +197,6 @@  discard block
 block discarded – undo
197 197
 			'onsale' => EE_Ticket::onsale
198 198
 			);
199 199
 
200
-		return EEH_Template::status_legend( $status_array, $status );
200
+		return EEH_Template::status_legend($status_array, $status);
201 201
 	}
202 202
 }
Please login to merge, or discard this patch.
extend/events/templates/event_datetime_metabox_clone_button.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <a class='clone-date-time dtm-inp-btn' rel='<?php echo $row; ?>' title='<?php esc_attr_e('Clone this Event Date and Time', 'event_espresso'); ?>' style='position:relative; top:5px; margin:0 0 0 10px; font-size:.9em; cursor:pointer;'>
2
-	<img src='<?php echo EE_IMAGES_URL;?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
2
+	<img src='<?php echo EE_IMAGES_URL; ?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
3 3
 </a>
Please login to merge, or discard this patch.