Completed
Pull Request — master (#686)
by Devin
42:59 queued 23:02
created
includes/forms/functions.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
  * Used to redirect a user back to the purchase
155 155
  * page if there are errors present.
156 156
  *
157
- * @param array $args
157
+ * @param string $args
158 158
  *
159 159
  * @access public
160 160
  * @since  1.0
@@ -773,7 +773,7 @@  discard block
 block discarded – undo
773 773
  *
774 774
  * @param int $form_id ID number of the form to retrieve the minimum price for
775 775
  *
776
- * @return mixed string|int Minimum price of the form
776
+ * @return string string|int Minimum price of the form
777 777
  */
778 778
 function give_get_form_minimum_price( $form_id = 0 ) {
779 779
 
@@ -878,7 +878,7 @@  discard block
 block discarded – undo
878 878
  *
879 879
  * @param int $form_id ID number of the form to retrieve a goal for
880 880
  *
881
- * @return mixed string|int Goal of the form
881
+ * @return string string|int Goal of the form
882 882
  */
883 883
 function give_get_form_goal( $form_id = 0 ) {
884 884
 
Please login to merge, or discard this patch.
Spacing   +183 added lines, -183 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 // Exit if accessed directly
13
-if ( ! defined( 'ABSPATH' ) ) {
13
+if ( ! defined('ABSPATH')) {
14 14
 	exit;
15 15
 }
16 16
 
@@ -23,14 +23,14 @@  discard block
 block discarded – undo
23 23
 
24 24
 	global $typenow;
25 25
 
26
-	if ( $typenow != 'give_forms' ) {
26
+	if ($typenow != 'give_forms') {
27 27
 		return true;
28 28
 	}
29 29
 
30 30
 	return false;
31 31
 }
32 32
 
33
-add_filter( 'give_shortcode_button_condition', 'give_shortcode_button_condition' );
33
+add_filter('give_shortcode_button_condition', 'give_shortcode_button_condition');
34 34
 
35 35
 
36 36
 /**
@@ -40,11 +40,11 @@  discard block
 block discarded – undo
40 40
  *
41 41
  * @return int|false
42 42
  */
43
-function get_form_id_from_args( $args ) {
43
+function get_form_id_from_args($args) {
44 44
 
45
-	if ( isset( $args['form_id'] ) && $args['form_id'] != 0 ) {
45
+	if (isset($args['form_id']) && $args['form_id'] != 0) {
46 46
 
47
-		return intval( $args['form_id'] );
47
+		return intval($args['form_id']);
48 48
 	}
49 49
 
50 50
 	return false;
@@ -59,23 +59,23 @@  discard block
 block discarded – undo
59 59
  *
60 60
  * @return bool
61 61
  */
62
-function give_is_float_labels_enabled( $args ) {
62
+function give_is_float_labels_enabled($args) {
63 63
 
64 64
 	$float_labels = '';
65 65
 
66
-	if ( ! empty( $args['float_labels'] ) ) {
66
+	if ( ! empty($args['float_labels'])) {
67 67
 		$float_labels = $args['float_labels'];
68 68
 	}
69 69
 
70
-	if ( empty( $float_labels ) ) {
71
-		$float_labels = get_post_meta( $args['form_id'], '_give_form_floating_labels', true );
70
+	if (empty($float_labels)) {
71
+		$float_labels = get_post_meta($args['form_id'], '_give_form_floating_labels', true);
72 72
 	}
73 73
 
74
-	if ( empty( $float_labels ) ) {
75
-		$float_labels = give_get_option( 'enable_floatlabels' ) ? 'enabled' : 'disabled';
74
+	if (empty($float_labels)) {
75
+		$float_labels = give_get_option('enable_floatlabels') ? 'enabled' : 'disabled';
76 76
 	}
77 77
 
78
-	return ( $float_labels == 'enabled' ) ? true : false;
78
+	return ($float_labels == 'enabled') ? true : false;
79 79
 }
80 80
 
81 81
 /**
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
 	$can_checkout = true;
92 92
 
93
-	return (bool) apply_filters( 'give_can_checkout', $can_checkout );
93
+	return (bool) apply_filters('give_can_checkout', $can_checkout);
94 94
 }
95 95
 
96 96
 /**
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
 function give_get_success_page_uri() {
104 104
 	global $give_options;
105 105
 
106
-	$success_page = isset( $give_options['success_page'] ) ? get_permalink( absint( $give_options['success_page'] ) ) : get_bloginfo( 'url' );
106
+	$success_page = isset($give_options['success_page']) ? get_permalink(absint($give_options['success_page'])) : get_bloginfo('url');
107 107
 
108
-	return apply_filters( 'give_get_success_page_uri', $success_page );
108
+	return apply_filters('give_get_success_page_uri', $success_page);
109 109
 }
110 110
 
111 111
 /**
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
  */
117 117
 function give_is_success_page() {
118 118
 	global $give_options;
119
-	$is_success_page = isset( $give_options['success_page'] ) ? is_page( $give_options['success_page'] ) : false;
119
+	$is_success_page = isset($give_options['success_page']) ? is_page($give_options['success_page']) : false;
120 120
 
121
-	return apply_filters( 'give_is_success_page', $is_success_page );
121
+	return apply_filters('give_is_success_page', $is_success_page);
122 122
 }
123 123
 
124 124
 /**
@@ -132,17 +132,17 @@  discard block
 block discarded – undo
132 132
  * @since       1.0
133 133
  * @return      void
134 134
  */
135
-function give_send_to_success_page( $query_string = null ) {
135
+function give_send_to_success_page($query_string = null) {
136 136
 
137 137
 	$redirect = give_get_success_page_uri();
138 138
 
139
-	if ( $query_string ) {
139
+	if ($query_string) {
140 140
 		$redirect .= $query_string;
141 141
 	}
142 142
 
143
-	$gateway = isset( $_REQUEST['give-gateway'] ) ? $_REQUEST['give-gateway'] : '';
143
+	$gateway = isset($_REQUEST['give-gateway']) ? $_REQUEST['give-gateway'] : '';
144 144
 
145
-	wp_redirect( apply_filters( 'give_success_page_redirect', $redirect, $gateway, $query_string ) );
145
+	wp_redirect(apply_filters('give_success_page_redirect', $redirect, $gateway, $query_string));
146 146
 	give_die();
147 147
 }
148 148
 
@@ -159,25 +159,25 @@  discard block
 block discarded – undo
159 159
  * @since  1.0
160 160
  * @return Void
161 161
  */
162
-function give_send_back_to_checkout( $args = array() ) {
162
+function give_send_back_to_checkout($args = array()) {
163 163
 
164
-	$redirect = ( isset( $_POST['give-current-url'] ) ) ? $_POST['give-current-url'] : '';
165
-	$form_id  = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : 0;
164
+	$redirect = (isset($_POST['give-current-url'])) ? $_POST['give-current-url'] : '';
165
+	$form_id  = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : 0;
166 166
 
167 167
 	$defaults = array(
168 168
 		'form-id' => (int) $form_id
169 169
 	);
170 170
 
171 171
 	// Check for backward compatibility
172
-	if ( is_string( $args ) ) {
173
-		$args = str_replace( '?', '', $args );
172
+	if (is_string($args)) {
173
+		$args = str_replace('?', '', $args);
174 174
 	}
175 175
 
176
-	$args = wp_parse_args( $args, $defaults );
176
+	$args = wp_parse_args($args, $defaults);
177 177
 
178
-	$redirect = add_query_arg( $args, $redirect ) . '#give-form-' . $form_id . '-wrap';
178
+	$redirect = add_query_arg($args, $redirect).'#give-form-'.$form_id.'-wrap';
179 179
 
180
-	wp_redirect( apply_filters( 'give_send_back_to_checkout', $redirect, $args ) );
180
+	wp_redirect(apply_filters('give_send_back_to_checkout', $redirect, $args));
181 181
 	give_die();
182 182
 }
183 183
 
@@ -192,16 +192,16 @@  discard block
 block discarded – undo
192 192
  * @since       1.0
193 193
  * @return      string
194 194
  */
195
-function give_get_success_page_url( $query_string = null ) {
195
+function give_get_success_page_url($query_string = null) {
196 196
 
197
-	$success_page = give_get_option( 'success_page', 0 );
198
-	$success_page = get_permalink( $success_page );
197
+	$success_page = give_get_option('success_page', 0);
198
+	$success_page = get_permalink($success_page);
199 199
 
200
-	if ( $query_string ) {
200
+	if ($query_string) {
201 201
 		$success_page .= $query_string;
202 202
 	}
203 203
 
204
-	return apply_filters( 'give_success_page_url', $success_page );
204
+	return apply_filters('give_success_page_url', $success_page);
205 205
 
206 206
 }
207 207
 
@@ -215,15 +215,15 @@  discard block
 block discarded – undo
215 215
  *
216 216
  * @return mixed|void Full URL to the Transaction Failed page, if present, home page if it doesn't exist
217 217
  */
218
-function give_get_failed_transaction_uri( $extras = false ) {
218
+function give_get_failed_transaction_uri($extras = false) {
219 219
 	global $give_options;
220 220
 
221
-	$uri = ! empty( $give_options['failure_page'] ) ? trailingslashit( get_permalink( $give_options['failure_page'] ) ) : home_url();
222
-	if ( $extras ) {
221
+	$uri = ! empty($give_options['failure_page']) ? trailingslashit(get_permalink($give_options['failure_page'])) : home_url();
222
+	if ($extras) {
223 223
 		$uri .= $extras;
224 224
 	}
225 225
 
226
-	return apply_filters( 'give_get_failed_transaction_uri', $uri );
226
+	return apply_filters('give_get_failed_transaction_uri', $uri);
227 227
 }
228 228
 
229 229
 /**
@@ -234,9 +234,9 @@  discard block
 block discarded – undo
234 234
  */
235 235
 function give_is_failed_transaction_page() {
236 236
 	global $give_options;
237
-	$ret = isset( $give_options['failure_page'] ) ? is_page( $give_options['failure_page'] ) : false;
237
+	$ret = isset($give_options['failure_page']) ? is_page($give_options['failure_page']) : false;
238 238
 
239
-	return apply_filters( 'give_is_failure_page', $ret );
239
+	return apply_filters('give_is_failure_page', $ret);
240 240
 }
241 241
 
242 242
 /**
@@ -248,18 +248,18 @@  discard block
 block discarded – undo
248 248
  */
249 249
 function give_listen_for_failed_payments() {
250 250
 
251
-	$failed_page = give_get_option( 'failure_page', 0 );
251
+	$failed_page = give_get_option('failure_page', 0);
252 252
 
253
-	if ( ! empty( $failed_page ) && is_page( $failed_page ) && ! empty( $_GET['payment-id'] ) ) {
253
+	if ( ! empty($failed_page) && is_page($failed_page) && ! empty($_GET['payment-id'])) {
254 254
 
255
-		$payment_id = absint( $_GET['payment-id'] );
256
-		give_update_payment_status( $payment_id, 'failed' );
255
+		$payment_id = absint($_GET['payment-id']);
256
+		give_update_payment_status($payment_id, 'failed');
257 257
 
258 258
 	}
259 259
 
260 260
 }
261 261
 
262
-add_action( 'template_redirect', 'give_listen_for_failed_payments' );
262
+add_action('template_redirect', 'give_listen_for_failed_payments');
263 263
 
264 264
 
265 265
 /**
@@ -272,11 +272,11 @@  discard block
 block discarded – undo
272 272
  * @since       1.0
273 273
  * @return      bool
274 274
  */
275
-function give_field_is_required( $field = '', $form_id ) {
275
+function give_field_is_required($field = '', $form_id) {
276 276
 
277
-	$required_fields = give_purchase_form_required_fields( $form_id );
277
+	$required_fields = give_purchase_form_required_fields($form_id);
278 278
 
279
-	return array_key_exists( $field, $required_fields );
279
+	return array_key_exists($field, $required_fields);
280 280
 }
281 281
 
282 282
 /**
@@ -294,14 +294,14 @@  discard block
 block discarded – undo
294 294
  *
295 295
  * @return void
296 296
  */
297
-function give_record_sale_in_log( $give_form_id = 0, $payment_id, $price_id = false, $sale_date = null ) {
297
+function give_record_sale_in_log($give_form_id = 0, $payment_id, $price_id = false, $sale_date = null) {
298 298
 	global $give_logs;
299 299
 
300 300
 	$log_data = array(
301 301
 		'post_parent'   => $give_form_id,
302 302
 		'log_type'      => 'sale',
303
-		'post_date'     => isset( $sale_date ) ? $sale_date : null,
304
-		'post_date_gmt' => isset( $sale_date ) ? $sale_date : null
303
+		'post_date'     => isset($sale_date) ? $sale_date : null,
304
+		'post_date_gmt' => isset($sale_date) ? $sale_date : null
305 305
 	);
306 306
 
307 307
 	$log_meta = array(
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 		'price_id'   => (int) $price_id
310 310
 	);
311 311
 
312
-	$give_logs->insert_log( $log_data, $log_meta );
312
+	$give_logs->insert_log($log_data, $log_meta);
313 313
 }
314 314
 
315 315
 
@@ -323,11 +323,11 @@  discard block
 block discarded – undo
323 323
  *
324 324
  * @return bool|int
325 325
  */
326
-function give_increase_purchase_count( $form_id = 0, $quantity = 1 ) {
326
+function give_increase_purchase_count($form_id = 0, $quantity = 1) {
327 327
 	$quantity = (int) $quantity;
328
-	$form     = new Give_Donate_Form( $form_id );
328
+	$form     = new Give_Donate_Form($form_id);
329 329
 
330
-	return $form->increase_sales( $quantity );
330
+	return $form->increase_sales($quantity);
331 331
 }
332 332
 
333 333
 /**
@@ -340,11 +340,11 @@  discard block
 block discarded – undo
340 340
  *
341 341
  * @return bool|int
342 342
  */
343
-function give_decrease_purchase_count( $form_id = 0, $quantity = 1 ) {
343
+function give_decrease_purchase_count($form_id = 0, $quantity = 1) {
344 344
 	$quantity = (int) $quantity;
345
-	$form     = new Give_Donate_Form( $form_id );
345
+	$form     = new Give_Donate_Form($form_id);
346 346
 
347
-	return $form->decrease_sales( $quantity );
347
+	return $form->decrease_sales($quantity);
348 348
 }
349 349
 
350 350
 /**
@@ -357,10 +357,10 @@  discard block
 block discarded – undo
357 357
  *
358 358
  * @return bool|int
359 359
  */
360
-function give_increase_earnings( $give_form_id = 0, $amount ) {
361
-	$form = new Give_Donate_Form( $give_form_id );
360
+function give_increase_earnings($give_form_id = 0, $amount) {
361
+	$form = new Give_Donate_Form($give_form_id);
362 362
 
363
-	return $form->increase_earnings( $amount );
363
+	return $form->increase_earnings($amount);
364 364
 }
365 365
 
366 366
 /**
@@ -373,10 +373,10 @@  discard block
 block discarded – undo
373 373
  *
374 374
  * @return bool|int
375 375
  */
376
-function give_decrease_earnings( $form_id = 0, $amount ) {
377
-	$form = new Give_Donate_Form( $form_id );
376
+function give_decrease_earnings($form_id = 0, $amount) {
377
+	$form = new Give_Donate_Form($form_id);
378 378
 
379
-	return $form->decrease_earnings( $amount );
379
+	return $form->decrease_earnings($amount);
380 380
 }
381 381
 
382 382
 
@@ -389,8 +389,8 @@  discard block
 block discarded – undo
389 389
  *
390 390
  * @return int $earnings Earnings for a certain form
391 391
  */
392
-function give_get_form_earnings_stats( $form_id = 0 ) {
393
-	$give_form = new Give_Donate_Form( $form_id );
392
+function give_get_form_earnings_stats($form_id = 0) {
393
+	$give_form = new Give_Donate_Form($form_id);
394 394
 
395 395
 	return $give_form->earnings;
396 396
 }
@@ -405,8 +405,8 @@  discard block
 block discarded – undo
405 405
  *
406 406
  * @return int $sales Amount of sales for a certain form
407 407
  */
408
-function give_get_form_sales_stats( $give_form_id = 0 ) {
409
-	$give_form = new Give_Donate_Form( $give_form_id );
408
+function give_get_form_sales_stats($give_form_id = 0) {
409
+	$give_form = new Give_Donate_Form($give_form_id);
410 410
 
411 411
 	return $give_form->sales;
412 412
 }
@@ -421,16 +421,16 @@  discard block
 block discarded – undo
421 421
  *
422 422
  * @return float $sales Average monthly sales
423 423
  */
424
-function give_get_average_monthly_form_sales( $form_id = 0 ) {
425
-	$sales        = give_get_form_sales_stats( $form_id );
426
-	$release_date = get_post_field( 'post_date', $form_id );
424
+function give_get_average_monthly_form_sales($form_id = 0) {
425
+	$sales        = give_get_form_sales_stats($form_id);
426
+	$release_date = get_post_field('post_date', $form_id);
427 427
 
428
-	$diff = abs( current_time( 'timestamp' ) - strtotime( $release_date ) );
428
+	$diff = abs(current_time('timestamp') - strtotime($release_date));
429 429
 
430
-	$months = floor( $diff / ( 30 * 60 * 60 * 24 ) ); // Number of months since publication
430
+	$months = floor($diff / (30 * 60 * 60 * 24)); // Number of months since publication
431 431
 
432
-	if ( $months > 0 ) {
433
-		$sales = ( $sales / $months );
432
+	if ($months > 0) {
433
+		$sales = ($sales / $months);
434 434
 	}
435 435
 
436 436
 	return $sales;
@@ -446,16 +446,16 @@  discard block
 block discarded – undo
446 446
  *
447 447
  * @return float $earnings Average monthly earnings
448 448
  */
449
-function give_get_average_monthly_form_earnings( $form_id = 0 ) {
450
-	$earnings     = give_get_form_earnings_stats( $form_id );
451
-	$release_date = get_post_field( 'post_date', $form_id );
449
+function give_get_average_monthly_form_earnings($form_id = 0) {
450
+	$earnings     = give_get_form_earnings_stats($form_id);
451
+	$release_date = get_post_field('post_date', $form_id);
452 452
 
453
-	$diff = abs( current_time( 'timestamp' ) - strtotime( $release_date ) );
453
+	$diff = abs(current_time('timestamp') - strtotime($release_date));
454 454
 
455
-	$months = floor( $diff / ( 30 * 60 * 60 * 24 ) ); // Number of months since publication
455
+	$months = floor($diff / (30 * 60 * 60 * 24)); // Number of months since publication
456 456
 
457
-	if ( $months > 0 ) {
458
-		$earnings = ( $earnings / $months );
457
+	if ($months > 0) {
458
+		$earnings = ($earnings / $months);
459 459
 	}
460 460
 
461 461
 	return $earnings < 0 ? 0 : $earnings;
@@ -475,25 +475,25 @@  discard block
 block discarded – undo
475 475
  *
476 476
  * @return string $price_name Name of the price option
477 477
  */
478
-function give_get_price_option_name( $form_id = 0, $price_id = 0, $payment_id = 0 ) {
478
+function give_get_price_option_name($form_id = 0, $price_id = 0, $payment_id = 0) {
479 479
 
480
-	$prices     = give_get_variable_prices( $form_id );
480
+	$prices     = give_get_variable_prices($form_id);
481 481
 	$price_name = '';
482 482
 
483
-	foreach ( $prices as $price ) {
483
+	foreach ($prices as $price) {
484 484
 
485
-		if ( intval( $price['_give_id']['level_id'] ) == intval( $price_id ) ) {
485
+		if (intval($price['_give_id']['level_id']) == intval($price_id)) {
486 486
 
487
-			$price_text     = isset( $price['_give_text'] ) ? $price['_give_text'] : '';
488
-			$price_fallback = give_currency_filter( give_format_amount( $price['_give_amount'] ) );
489
-			$price_name     = ! empty( $price_text ) ? $price_text : $price_fallback;
487
+			$price_text     = isset($price['_give_text']) ? $price['_give_text'] : '';
488
+			$price_fallback = give_currency_filter(give_format_amount($price['_give_amount']));
489
+			$price_name     = ! empty($price_text) ? $price_text : $price_fallback;
490 490
 
491 491
 		}
492 492
 
493 493
 	}
494 494
 
495 495
 
496
-	return apply_filters( 'give_get_price_option_name', $price_name, $form_id, $payment_id, $price_id );
496
+	return apply_filters('give_get_price_option_name', $price_name, $form_id, $payment_id, $price_id);
497 497
 }
498 498
 
499 499
 
@@ -506,14 +506,14 @@  discard block
 block discarded – undo
506 506
  *
507 507
  * @return string $range A fully formatted price range
508 508
  */
509
-function give_price_range( $form_id = 0 ) {
510
-	$low   = give_get_lowest_price_option( $form_id );
511
-	$high  = give_get_highest_price_option( $form_id );
512
-	$range = '<span class="give_price_range_low">' . give_currency_filter( give_format_amount( $low ) ) . '</span>';
509
+function give_price_range($form_id = 0) {
510
+	$low   = give_get_lowest_price_option($form_id);
511
+	$high  = give_get_highest_price_option($form_id);
512
+	$range = '<span class="give_price_range_low">'.give_currency_filter(give_format_amount($low)).'</span>';
513 513
 	$range .= '<span class="give_price_range_sep">&nbsp;&ndash;&nbsp;</span>';
514
-	$range .= '<span class="give_price_range_high">' . give_currency_filter( give_format_amount( $high ) ) . '</span>';
514
+	$range .= '<span class="give_price_range_high">'.give_currency_filter(give_format_amount($high)).'</span>';
515 515
 
516
-	return apply_filters( 'give_price_range', $range, $form_id, $low, $high );
516
+	return apply_filters('give_price_range', $range, $form_id, $low, $high);
517 517
 }
518 518
 
519 519
 
@@ -528,36 +528,36 @@  discard block
 block discarded – undo
528 528
  *
529 529
  * @return int ID of the lowest price
530 530
  */
531
-function give_get_lowest_price_id( $form_id = 0 ) {
531
+function give_get_lowest_price_id($form_id = 0) {
532 532
 
533
-	if ( empty( $form_id ) ) {
533
+	if (empty($form_id)) {
534 534
 		$form_id = get_the_ID();
535 535
 	}
536 536
 
537
-	if ( ! give_has_variable_prices( $form_id ) ) {
538
-		return give_get_form_price( $form_id );
537
+	if ( ! give_has_variable_prices($form_id)) {
538
+		return give_get_form_price($form_id);
539 539
 	}
540 540
 
541
-	$prices = give_get_variable_prices( $form_id );
541
+	$prices = give_get_variable_prices($form_id);
542 542
 
543 543
 	$low    = 0.00;
544 544
 	$min_id = 1;
545 545
 
546
-	if ( ! empty( $prices ) ) {
546
+	if ( ! empty($prices)) {
547 547
 
548
-		foreach ( $prices as $key => $price ) {
548
+		foreach ($prices as $key => $price) {
549 549
 
550
-			if ( empty( $price['_give_amount'] ) ) {
550
+			if (empty($price['_give_amount'])) {
551 551
 				continue;
552 552
 			}
553 553
 
554
-			if ( ! isset( $min ) ) {
554
+			if ( ! isset($min)) {
555 555
 				$min = $price['_give_amount'];
556 556
 			} else {
557
-				$min = min( $min, $price['_give_amount'] );
557
+				$min = min($min, $price['_give_amount']);
558 558
 			}
559 559
 
560
-			if ( $price['_give_amount'] == $min ) {
560
+			if ($price['_give_amount'] == $min) {
561 561
 				$min_id = $price['_give_id']['level_id'];
562 562
 			}
563 563
 		}
@@ -575,43 +575,43 @@  discard block
 block discarded – undo
575 575
  *
576 576
  * @return float Amount of the lowest price
577 577
  */
578
-function give_get_lowest_price_option( $form_id = 0 ) {
579
-	if ( empty( $form_id ) ) {
578
+function give_get_lowest_price_option($form_id = 0) {
579
+	if (empty($form_id)) {
580 580
 		$form_id = get_the_ID();
581 581
 	}
582 582
 
583
-	if ( ! give_has_variable_prices( $form_id ) ) {
584
-		return give_get_form_price( $form_id );
583
+	if ( ! give_has_variable_prices($form_id)) {
584
+		return give_get_form_price($form_id);
585 585
 	}
586 586
 
587
-	$prices = give_get_variable_prices( $form_id );
587
+	$prices = give_get_variable_prices($form_id);
588 588
 
589 589
 	$low = 0.00;
590 590
 
591
-	if ( ! empty( $prices ) ) {
591
+	if ( ! empty($prices)) {
592 592
 
593
-		foreach ( $prices as $key => $price ) {
593
+		foreach ($prices as $key => $price) {
594 594
 
595
-			if ( empty( $price['_give_amount'] ) ) {
595
+			if (empty($price['_give_amount'])) {
596 596
 				continue;
597 597
 			}
598 598
 
599
-			if ( ! isset( $min ) ) {
599
+			if ( ! isset($min)) {
600 600
 				$min = $price['_give_amount'];
601 601
 			} else {
602
-				$min = min( $min, give_sanitize_amount( $price['_give_amount'] ) );
602
+				$min = min($min, give_sanitize_amount($price['_give_amount']));
603 603
 			}
604 604
 
605
-			if ( $price['_give_amount'] == $min ) {
605
+			if ($price['_give_amount'] == $min) {
606 606
 				$min_id = $key;
607 607
 			}
608 608
 		}
609 609
 
610
-		$low = $prices[ $min_id ]['_give_amount'];
610
+		$low = $prices[$min_id]['_give_amount'];
611 611
 
612 612
 	}
613 613
 
614
-	return give_sanitize_amount( $low );
614
+	return give_sanitize_amount($low);
615 615
 }
616 616
 
617 617
 /**
@@ -623,41 +623,41 @@  discard block
 block discarded – undo
623 623
  *
624 624
  * @return float Amount of the highest price
625 625
  */
626
-function give_get_highest_price_option( $form_id = 0 ) {
626
+function give_get_highest_price_option($form_id = 0) {
627 627
 
628
-	if ( empty( $form_id ) ) {
628
+	if (empty($form_id)) {
629 629
 		$form_id = get_the_ID();
630 630
 	}
631 631
 
632
-	if ( ! give_has_variable_prices( $form_id ) ) {
633
-		return give_get_form_price( $form_id );
632
+	if ( ! give_has_variable_prices($form_id)) {
633
+		return give_get_form_price($form_id);
634 634
 	}
635 635
 
636
-	$prices = give_get_variable_prices( $form_id );
636
+	$prices = give_get_variable_prices($form_id);
637 637
 
638 638
 	$high = 0.00;
639 639
 
640
-	if ( ! empty( $prices ) ) {
640
+	if ( ! empty($prices)) {
641 641
 
642 642
 		$max = 0;
643 643
 
644
-		foreach ( $prices as $key => $price ) {
645
-			if ( empty( $price['_give_amount'] ) ) {
644
+		foreach ($prices as $key => $price) {
645
+			if (empty($price['_give_amount'])) {
646 646
 				continue;
647 647
 			}
648
-			$give_amount = give_sanitize_amount( $price['_give_amount'] );
648
+			$give_amount = give_sanitize_amount($price['_give_amount']);
649 649
 
650
-			$max = max( $max, $give_amount );
650
+			$max = max($max, $give_amount);
651 651
 
652
-			if ( $give_amount == $max ) {
652
+			if ($give_amount == $max) {
653 653
 				$max_id = $key;
654 654
 			}
655 655
 		}
656 656
 
657
-		$high = $prices[ $max_id ]['_give_amount'];
657
+		$high = $prices[$max_id]['_give_amount'];
658 658
 	}
659 659
 
660
-	return give_sanitize_amount( $high );
660
+	return give_sanitize_amount($high);
661 661
 }
662 662
 
663 663
 /**
@@ -669,15 +669,15 @@  discard block
 block discarded – undo
669 669
  *
670 670
  * @return mixed string|int Price of the form
671 671
  */
672
-function give_get_form_price( $form_id = 0 ) {
672
+function give_get_form_price($form_id = 0) {
673 673
 
674
-	if ( empty( $form_id ) ) {
674
+	if (empty($form_id)) {
675 675
 		return false;
676 676
 	}
677 677
 
678
-	$form = new Give_Donate_Form( $form_id );
678
+	$form = new Give_Donate_Form($form_id);
679 679
 
680
-	return $form->__get( 'price' );
680
+	return $form->__get('price');
681 681
 }
682 682
 
683 683
 /**
@@ -689,15 +689,15 @@  discard block
 block discarded – undo
689 689
  *
690 690
  * @return mixed string|int Minimum price of the form
691 691
  */
692
-function give_get_form_minimum_price( $form_id = 0 ) {
692
+function give_get_form_minimum_price($form_id = 0) {
693 693
 
694
-	if ( empty( $form_id ) ) {
694
+	if (empty($form_id)) {
695 695
 		return false;
696 696
 	}
697 697
 
698
-	$form = new Give_Donate_Form( $form_id );
698
+	$form = new Give_Donate_Form($form_id);
699 699
 
700
-	return $form->__get( 'minimum_price' );
700
+	return $form->__get('minimum_price');
701 701
 
702 702
 }
703 703
 
@@ -712,52 +712,52 @@  discard block
 block discarded – undo
712 712
  *
713 713
  * @return int $formatted_price
714 714
  */
715
-function give_price( $form_id = 0, $echo = true, $price_id = false ) {
715
+function give_price($form_id = 0, $echo = true, $price_id = false) {
716 716
 
717
-	if ( empty( $form_id ) ) {
717
+	if (empty($form_id)) {
718 718
 		$form_id = get_the_ID();
719 719
 	}
720 720
 
721
-	if ( give_has_variable_prices( $form_id ) ) {
721
+	if (give_has_variable_prices($form_id)) {
722 722
 
723
-		$prices = give_get_variable_prices( $form_id );
723
+		$prices = give_get_variable_prices($form_id);
724 724
 
725
-		if ( false !== $price_id ) {
725
+		if (false !== $price_id) {
726 726
 
727 727
 			//loop through multi-prices to see which is default
728
-			foreach ( $prices as $price ) {
728
+			foreach ($prices as $price) {
729 729
 				//this is the default price
730
-				if ( isset( $price['_give_default'] ) && $price['_give_default'] === 'default' ) {
730
+				if (isset($price['_give_default']) && $price['_give_default'] === 'default') {
731 731
 					$price = (float) $price['_give_amount'];
732 732
 				};
733 733
 			}
734 734
 
735 735
 		} else {
736 736
 
737
-			$price = give_get_lowest_price_option( $form_id );
737
+			$price = give_get_lowest_price_option($form_id);
738 738
 		}
739 739
 
740
-		$price = give_sanitize_amount( $price );
740
+		$price = give_sanitize_amount($price);
741 741
 
742 742
 	} else {
743 743
 
744
-		$price = give_get_form_price( $form_id );
744
+		$price = give_get_form_price($form_id);
745 745
 
746 746
 	}
747 747
 
748
-	$price           = apply_filters( 'give_form_price', give_sanitize_amount( $price ), $form_id );
749
-	$formatted_price = '<span class="give_price" id="give_price_' . $form_id . '">' . $price . '</span>';
750
-	$formatted_price = apply_filters( 'give_form_price_after_html', $formatted_price, $form_id, $price );
748
+	$price           = apply_filters('give_form_price', give_sanitize_amount($price), $form_id);
749
+	$formatted_price = '<span class="give_price" id="give_price_'.$form_id.'">'.$price.'</span>';
750
+	$formatted_price = apply_filters('give_form_price_after_html', $formatted_price, $form_id, $price);
751 751
 
752
-	if ( $echo ) {
752
+	if ($echo) {
753 753
 		echo $formatted_price;
754 754
 	} else {
755 755
 		return $formatted_price;
756 756
 	}
757 757
 }
758 758
 
759
-add_filter( 'give_form_price', 'give_format_amount', 10 );
760
-add_filter( 'give_form_price', 'give_currency_filter', 20 );
759
+add_filter('give_form_price', 'give_format_amount', 10);
760
+add_filter('give_form_price', 'give_currency_filter', 20);
761 761
 
762 762
 
763 763
 /**
@@ -771,18 +771,18 @@  discard block
 block discarded – undo
771 771
  *
772 772
  * @return float $amount Amount of the price option
773 773
  */
774
-function give_get_price_option_amount( $form_id = 0, $price_id = 0 ) {
775
-	$prices = give_get_variable_prices( $form_id );
774
+function give_get_price_option_amount($form_id = 0, $price_id = 0) {
775
+	$prices = give_get_variable_prices($form_id);
776 776
 
777 777
 	$amount = 0.00;
778 778
 
779
-	foreach ( $prices as $price ) {
780
-		if ( isset( $price['_give_id']['level_id'] ) && $price['_give_id']['level_id'] === $price_id ) {
781
-			$amount = isset( $price['_give_amount'] ) ? $price['_give_amount'] : 0.00;
779
+	foreach ($prices as $price) {
780
+		if (isset($price['_give_id']['level_id']) && $price['_give_id']['level_id'] === $price_id) {
781
+			$amount = isset($price['_give_amount']) ? $price['_give_amount'] : 0.00;
782 782
 		};
783 783
 	}
784 784
 
785
-	return apply_filters( 'give_get_price_option_amount', give_sanitize_amount( $amount ), $form_id, $price_id );
785
+	return apply_filters('give_get_price_option_amount', give_sanitize_amount($amount), $form_id, $price_id);
786 786
 }
787 787
 
788 788
 /**
@@ -794,13 +794,13 @@  discard block
 block discarded – undo
794 794
  *
795 795
  * @return mixed string|int Goal of the form
796 796
  */
797
-function give_get_form_goal( $form_id = 0 ) {
797
+function give_get_form_goal($form_id = 0) {
798 798
 
799
-	if ( empty( $form_id ) ) {
799
+	if (empty($form_id)) {
800 800
 		return false;
801 801
 	}
802 802
 
803
-	$form = new Give_Donate_Form( $form_id );
803
+	$form = new Give_Donate_Form($form_id);
804 804
 
805 805
 	return $form->goal;
806 806
 
@@ -816,27 +816,27 @@  discard block
 block discarded – undo
816 816
  *
817 817
  * @return string $formatted_goal
818 818
  */
819
-function give_goal( $form_id = 0, $echo = true ) {
819
+function give_goal($form_id = 0, $echo = true) {
820 820
 
821
-	if ( empty( $form_id ) ) {
821
+	if (empty($form_id)) {
822 822
 		$form_id = get_the_ID();
823 823
 	}
824 824
 
825
-	$goal = give_get_form_goal( $form_id );
825
+	$goal = give_get_form_goal($form_id);
826 826
 
827
-	$goal           = apply_filters( 'give_form_goal', give_sanitize_amount( $goal ), $form_id );
828
-	$formatted_goal = '<span class="give_price" id="give_price_' . $form_id . '">' . $goal . '</span>';
829
-	$formatted_goal = apply_filters( 'give_form_price_after_html', $formatted_goal, $form_id, $goal );
827
+	$goal           = apply_filters('give_form_goal', give_sanitize_amount($goal), $form_id);
828
+	$formatted_goal = '<span class="give_price" id="give_price_'.$form_id.'">'.$goal.'</span>';
829
+	$formatted_goal = apply_filters('give_form_price_after_html', $formatted_goal, $form_id, $goal);
830 830
 
831
-	if ( $echo ) {
831
+	if ($echo) {
832 832
 		echo $formatted_goal;
833 833
 	} else {
834 834
 		return $formatted_goal;
835 835
 	}
836 836
 }
837 837
 
838
-add_filter( 'give_form_goal', 'give_format_amount', 10 );
839
-add_filter( 'give_form_goal', 'give_currency_filter', 20 );
838
+add_filter('give_form_goal', 'give_format_amount', 10);
839
+add_filter('give_form_goal', 'give_currency_filter', 20);
840 840
 
841 841
 
842 842
 /**
@@ -846,13 +846,13 @@  discard block
 block discarded – undo
846 846
  * @global $give_options
847 847
  * @return bool $ret Whether or not the logged_in_only setting is set
848 848
  */
849
-function give_logged_in_only( $form_id ) {
849
+function give_logged_in_only($form_id) {
850 850
 
851
-	$form_option = get_post_meta( $form_id, '_give_logged_in_only', true );
851
+	$form_option = get_post_meta($form_id, '_give_logged_in_only', true);
852 852
 
853
-	$ret = ! empty( $form_option ) ? $form_option : false;
853
+	$ret = ! empty($form_option) ? $form_option : false;
854 854
 
855
-	return (bool) apply_filters( 'give_logged_in_only', $ret, $form_id );
855
+	return (bool) apply_filters('give_logged_in_only', $ret, $form_id);
856 856
 
857 857
 }
858 858
 
@@ -864,10 +864,10 @@  discard block
 block discarded – undo
864 864
  *
865 865
  * @param $form_id
866 866
  */
867
-function give_show_login_register_option( $form_id ) {
867
+function give_show_login_register_option($form_id) {
868 868
 
869
-	$show_register_form = get_post_meta( $form_id, '_give_show_register_form', true );
869
+	$show_register_form = get_post_meta($form_id, '_give_show_register_form', true);
870 870
 
871
-	return apply_filters( 'give_show_register_form', $show_register_form, $form_id );
871
+	return apply_filters('give_show_register_form', $show_register_form, $form_id);
872 872
 
873 873
 }
874 874
\ No newline at end of file
Please login to merge, or discard this patch.
includes/admin/plugins.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 
13 13
 // Exit if accessed directly
14
-if ( ! defined( 'ABSPATH' ) ) {
14
+if ( ! defined('ABSPATH')) {
15 15
 	exit;
16 16
 }
17 17
 
@@ -26,16 +26,16 @@  discard block
 block discarded – undo
26 26
  *
27 27
  * @return array $links
28 28
  */
29
-function give_plugin_action_links( $links, $file ) {
30
-	$settings_link = '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-settings' ) . '">' . esc_html__( 'Settings', 'give' ) . '</a>';
31
-	if ( $file == 'give/give.php' ) {
32
-		array_unshift( $links, $settings_link );
29
+function give_plugin_action_links($links, $file) {
30
+	$settings_link = '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-settings').'">'.esc_html__('Settings', 'give').'</a>';
31
+	if ($file == 'give/give.php') {
32
+		array_unshift($links, $settings_link);
33 33
 	}
34 34
 
35 35
 	return $links;
36 36
 }
37 37
 
38
-add_filter( 'plugin_action_links', 'give_plugin_action_links', 10, 2 );
38
+add_filter('plugin_action_links', 'give_plugin_action_links', 10, 2);
39 39
 
40 40
 
41 41
 /**
@@ -48,33 +48,33 @@  discard block
 block discarded – undo
48 48
  *
49 49
  * @return array $input
50 50
  */
51
-function give_plugin_row_meta( $input, $file ) {
52
-	if ( $file != 'give/give.php' ) {
51
+function give_plugin_row_meta($input, $file) {
52
+	if ($file != 'give/give.php') {
53 53
 		return $input;
54 54
 	}
55 55
 
56
-	$give_addons_link = esc_url( add_query_arg( array(
56
+	$give_addons_link = esc_url(add_query_arg(array(
57 57
 			'utm_source'   => 'plugins-page',
58 58
 			'utm_medium'   => 'plugin-row',
59 59
 			'utm_campaign' => 'admin',
60
-		), 'https://givewp.com/addons/' )
60
+		), 'https://givewp.com/addons/')
61 61
 	);
62 62
 
63
-	$give_docs_link = esc_url( add_query_arg( array(
63
+	$give_docs_link = esc_url(add_query_arg(array(
64 64
 			'utm_source'   => 'plugins-page',
65 65
 			'utm_medium'   => 'plugin-row',
66 66
 			'utm_campaign' => 'admin',
67
-		), 'https://givewp.com/documentation/' )
67
+		), 'https://givewp.com/documentation/')
68 68
 	);
69 69
 
70 70
 	$links = array(
71
-		'<a href="' . $give_docs_link . '" target="_blank">' . esc_html__( 'Documentation', 'give' ) . '</a>',
72
-		'<a href="' . $give_addons_link . '" target="_blank">' . esc_html__( 'Add-ons', 'give' ) . '</a>',
71
+		'<a href="'.$give_docs_link.'" target="_blank">'.esc_html__('Documentation', 'give').'</a>',
72
+		'<a href="'.$give_addons_link.'" target="_blank">'.esc_html__('Add-ons', 'give').'</a>',
73 73
 	);
74 74
 
75
-	$input = array_merge( $input, $links );
75
+	$input = array_merge($input, $links);
76 76
 
77 77
 	return $input;
78 78
 }
79 79
 
80
-add_filter( 'plugin_row_meta', 'give_plugin_row_meta', 10, 2 );
80
+add_filter('plugin_row_meta', 'give_plugin_row_meta', 10, 2);
Please login to merge, or discard this patch.
includes/plugin-compatibility.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,6 +19,6 @@
 block discarded – undo
19 19
  * @return void
20 20
  */
21 21
 function give_disable_mandrill_nl2br() {
22
-	add_filter( 'mandrill_nl2br', '__return_false' );
22
+	add_filter('mandrill_nl2br', '__return_false');
23 23
 }
24
-add_action( 'give_email_send_before', 'give_disable_mandrill_nl2br');
24
+add_action('give_email_send_before', 'give_disable_mandrill_nl2br');
Please login to merge, or discard this patch.
includes/class-give-session.php 2 patches
Doc Comments   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -165,10 +165,9 @@  discard block
 block discarded – undo
165 165
 	 *
166 166
 	 * @since 1.0
167 167
 	 *
168
-	 * @param $key $_SESSION key
169
-	 * @param $value $_SESSION variable
170 168
 	 *
171
-	 * @return mixed Session variable
169
+	 * @param string $key
170
+	 * @return string Session variable
172 171
 	 */
173 172
 	public function set( $key, $value ) {
174 173
 
@@ -220,12 +219,12 @@  discard block
 block discarded – undo
220 219
 	/**
221 220
 	 * Starts a new session if one hasn't started yet.
222 221
 	 *
223
-	 * @return null
222
+	 * @return boolean
224 223
 	 * Checks to see if the server supports PHP sessions or if the GIVE_USE_PHP_SESSIONS constant is defined
225 224
 	 *
226 225
 	 * @access public
227 226
 	 * @since  1.0
228
-	 * @return bool $ret True if we are using PHP sessions, false otherwise
227
+	 * @return boolean $ret True if we are using PHP sessions, false otherwise
229 228
 	 */
230 229
 	public function use_php_sessions() {
231 230
 
Please login to merge, or discard this patch.
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  */
13 13
 
14 14
 // Exit if accessed directly
15
-if ( ! defined( 'ABSPATH' ) ) {
15
+if ( ! defined('ABSPATH')) {
16 16
 	exit;
17 17
 }
18 18
 
@@ -70,53 +70,53 @@  discard block
 block discarded – undo
70 70
 	public function __construct() {
71 71
 
72 72
 		$this->use_php_sessions = $this->use_php_sessions();
73
-		$this->exp_option       = give_get_option( 'session_lifetime' );
73
+		$this->exp_option       = give_get_option('session_lifetime');
74 74
 
75 75
 		//PHP Sessions
76
-		if ( $this->use_php_sessions ) {
76
+		if ($this->use_php_sessions) {
77 77
 
78
-			if ( is_multisite() ) {
78
+			if (is_multisite()) {
79 79
 
80
-				$this->prefix = '_' . get_current_blog_id();
80
+				$this->prefix = '_'.get_current_blog_id();
81 81
 
82 82
 			}
83 83
 
84
-			add_action( 'init', array( $this, 'maybe_start_session' ), - 2 );
84
+			add_action('init', array($this, 'maybe_start_session'), - 2);
85 85
 
86 86
 		} else {
87 87
 
88
-			if ( ! $this->should_start_session() ) {
88
+			if ( ! $this->should_start_session()) {
89 89
 				return;
90 90
 			}
91 91
 
92 92
 			// Use WP_Session
93
-			if ( ! defined( 'WP_SESSION_COOKIE' ) ) {
94
-				define( 'WP_SESSION_COOKIE', 'give_wp_session' );
93
+			if ( ! defined('WP_SESSION_COOKIE')) {
94
+				define('WP_SESSION_COOKIE', 'give_wp_session');
95 95
 			}
96 96
 
97
-			if ( ! class_exists( 'Recursive_ArrayAccess' ) ) {
98
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/class-recursive-arrayaccess.php';
97
+			if ( ! class_exists('Recursive_ArrayAccess')) {
98
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/class-recursive-arrayaccess.php';
99 99
 			}
100 100
 
101
-			if ( ! class_exists( 'WP_Session' ) ) {
102
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/class-wp-session.php';
103
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/wp-session.php';
101
+			if ( ! class_exists('WP_Session')) {
102
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/class-wp-session.php';
103
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/wp-session.php';
104 104
 			}
105 105
 
106
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
107
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
106
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
107
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
108 108
 
109 109
 		}
110 110
 
111 111
 		//Init Session
112
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
113
-			add_action( 'plugins_loaded', array( $this, 'init' ), - 1 );
112
+		if (empty($this->session) && ! $this->use_php_sessions) {
113
+			add_action('plugins_loaded', array($this, 'init'), - 1);
114 114
 		} else {
115
-			add_action( 'init', array( $this, 'init' ), - 1 );
115
+			add_action('init', array($this, 'init'), - 1);
116 116
 		}
117 117
 
118 118
 		//Set cookie on Donation Completion page
119
-		add_action( 'give_pre_process_purchase', array( $this, 'set_session_cookies' ) );
119
+		add_action('give_pre_process_purchase', array($this, 'set_session_cookies'));
120 120
 
121 121
 	}
122 122
 
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
 	 */
130 130
 	public function init() {
131 131
 
132
-		if ( $this->use_php_sessions ) {
133
-			$this->session = isset( $_SESSION[ 'give' . $this->prefix ] ) && is_array( $_SESSION[ 'give' . $this->prefix ] ) ? $_SESSION[ 'give' . $this->prefix ] : array();
132
+		if ($this->use_php_sessions) {
133
+			$this->session = isset($_SESSION['give'.$this->prefix]) && is_array($_SESSION['give'.$this->prefix]) ? $_SESSION['give'.$this->prefix] : array();
134 134
 		} else {
135 135
 			$this->session = WP_Session::get_instance();
136 136
 		}
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
162 162
 	 *
163 163
 	 * @return string Session variable
164 164
 	 */
165
-	public function get( $key ) {
166
-		$key = sanitize_key( $key );
165
+	public function get($key) {
166
+		$key = sanitize_key($key);
167 167
 
168
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
168
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
169 169
 
170 170
 	}
171 171
 
@@ -179,21 +179,21 @@  discard block
 block discarded – undo
179 179
 	 *
180 180
 	 * @return mixed Session variable
181 181
 	 */
182
-	public function set( $key, $value ) {
182
+	public function set($key, $value) {
183 183
 
184
-		$key = sanitize_key( $key );
184
+		$key = sanitize_key($key);
185 185
 
186
-		if ( is_array( $value ) ) {
187
-			$this->session[ $key ] = serialize( $value );
186
+		if (is_array($value)) {
187
+			$this->session[$key] = serialize($value);
188 188
 		} else {
189
-			$this->session[ $key ] = $value;
189
+			$this->session[$key] = $value;
190 190
 		}
191 191
 
192
-		if ( $this->use_php_sessions ) {
193
-			$_SESSION[ 'give' . $this->prefix ] = $this->session;
192
+		if ($this->use_php_sessions) {
193
+			$_SESSION['give'.$this->prefix] = $this->session;
194 194
 		}
195 195
 
196
-		return $this->session[ $key ];
196
+		return $this->session[$key];
197 197
 	}
198 198
 
199 199
 	/**
@@ -206,10 +206,10 @@  discard block
 block discarded – undo
206 206
 	 * @since 1.4
207 207
 	 */
208 208
 	public function set_session_cookies() {
209
-		if( ! headers_sent() ) {
210
-			$lifetime = current_time( 'timestamp' ) + $this->set_expiration_time();
211
-			@setcookie( session_name(), session_id(), $lifetime, COOKIEPATH, COOKIE_DOMAIN, false  );
212
-			@setcookie( session_name() . '_expiration', $lifetime, $lifetime,  COOKIEPATH, COOKIE_DOMAIN, false  );
209
+		if ( ! headers_sent()) {
210
+			$lifetime = current_time('timestamp') + $this->set_expiration_time();
211
+			@setcookie(session_name(), session_id(), $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
212
+			@setcookie(session_name().'_expiration', $lifetime, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
213 213
 		}
214 214
 	}
215 215
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	 */
226 226
 	public function set_expiration_variant_time() {
227 227
 
228
-		return ( ! empty( $this->exp_option ) ? ( intval( $this->exp_option ) - 3600 ) : 30 * 60 * 23 );
228
+		return ( ! empty($this->exp_option) ? (intval($this->exp_option) - 3600) : 30 * 60 * 23);
229 229
 	}
230 230
 
231 231
 	/**
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	 */
241 241
 	public function set_expiration_time() {
242 242
 
243
-		return ( ! empty( $this->exp_option ) ? intval( $this->exp_option ) : 30 * 60 * 24 );
243
+		return ( ! empty($this->exp_option) ? intval($this->exp_option) : 30 * 60 * 24);
244 244
 	}
245 245
 
246 246
 	/**
@@ -258,21 +258,21 @@  discard block
 block discarded – undo
258 258
 		$ret = false;
259 259
 
260 260
 		// If the database variable is already set, no need to run autodetection
261
-		$give_use_php_sessions = (bool) get_option( 'give_use_php_sessions' );
261
+		$give_use_php_sessions = (bool) get_option('give_use_php_sessions');
262 262
 
263
-		if ( ! $give_use_php_sessions ) {
263
+		if ( ! $give_use_php_sessions) {
264 264
 
265 265
 			// Attempt to detect if the server supports PHP sessions
266
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
266
+			if (function_exists('session_start') && ! ini_get('safe_mode')) {
267 267
 
268
-				$this->set( 'give_use_php_sessions', 1 );
268
+				$this->set('give_use_php_sessions', 1);
269 269
 
270
-				if ( $this->get( 'give_use_php_sessions' ) ) {
270
+				if ($this->get('give_use_php_sessions')) {
271 271
 
272 272
 					$ret = true;
273 273
 
274 274
 					// Set the database option
275
-					update_option( 'give_use_php_sessions', true );
275
+					update_option('give_use_php_sessions', true);
276 276
 
277 277
 				}
278 278
 
@@ -284,13 +284,13 @@  discard block
 block discarded – undo
284 284
 		}
285 285
 
286 286
 		// Enable or disable PHP Sessions based on the GIVE_USE_PHP_SESSIONS constant
287
-		if ( defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ) {
287
+		if (defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS) {
288 288
 			$ret = true;
289
-		} else if ( defined( 'GIVE_USE_PHP_SESSIONS' ) && ! GIVE_USE_PHP_SESSIONS ) {
289
+		} else if (defined('GIVE_USE_PHP_SESSIONS') && ! GIVE_USE_PHP_SESSIONS) {
290 290
 			$ret = false;
291 291
 		}
292 292
 
293
-		return (bool) apply_filters( 'give_use_php_sessions', $ret );
293
+		return (bool) apply_filters('give_use_php_sessions', $ret);
294 294
 	}
295 295
 
296 296
 	/**
@@ -303,9 +303,9 @@  discard block
 block discarded – undo
303 303
 
304 304
 		$start_session = true;
305 305
 
306
-		if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
306
+		if ( ! empty($_SERVER['REQUEST_URI'])) {
307 307
 
308
-			$blacklist = apply_filters( 'give_session_start_uri_blacklist', array(
308
+			$blacklist = apply_filters('give_session_start_uri_blacklist', array(
309 309
 				'feed',
310 310
 				'feed',
311 311
 				'feed/rss',
@@ -313,21 +313,21 @@  discard block
 block discarded – undo
313 313
 				'feed/rdf',
314 314
 				'feed/atom',
315 315
 				'comments/feed/'
316
-			) );
317
-			$uri       = ltrim( $_SERVER['REQUEST_URI'], '/' );
318
-			$uri       = untrailingslashit( $uri );
319
-			if ( in_array( $uri, $blacklist ) ) {
316
+			));
317
+			$uri       = ltrim($_SERVER['REQUEST_URI'], '/');
318
+			$uri       = untrailingslashit($uri);
319
+			if (in_array($uri, $blacklist)) {
320 320
 				$start_session = false;
321 321
 			}
322
-			if ( false !== strpos( $uri, 'feed=' ) ) {
322
+			if (false !== strpos($uri, 'feed=')) {
323 323
 				$start_session = false;
324 324
 			}
325
-			if ( is_admin() ) {
325
+			if (is_admin()) {
326 326
 				$start_session = false;
327 327
 			}
328 328
 		}
329 329
 
330
-		return apply_filters( 'give_start_session', $start_session );
330
+		return apply_filters('give_start_session', $start_session);
331 331
 	}
332 332
 
333 333
 	/**
@@ -338,11 +338,11 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function maybe_start_session() {
340 340
 
341
-		if ( ! $this->should_start_session() ) {
341
+		if ( ! $this->should_start_session()) {
342 342
 			return;
343 343
 		}
344 344
 
345
-		if ( ! session_id() && ! headers_sent() ) {
345
+		if ( ! session_id() && ! headers_sent()) {
346 346
 			session_start();
347 347
 		}
348 348
 
@@ -358,9 +358,9 @@  discard block
 block discarded – undo
358 358
 
359 359
 		$expiration = false;
360 360
 
361
-		if ( session_id() && isset( $_COOKIE[ session_name() . '_expiration' ] ) ) {
361
+		if (session_id() && isset($_COOKIE[session_name().'_expiration'])) {
362 362
 
363
-			$expiration = date( 'D, d M Y h:i:s', intval( $_COOKIE[ session_name() . '_expiration' ] ) );
363
+			$expiration = date('D, d M Y h:i:s', intval($_COOKIE[session_name().'_expiration']));
364 364
 
365 365
 		}
366 366
 
Please login to merge, or discard this patch.
includes/template-functions.php 1 patch
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 // Exit if accessed directly
13
-if ( ! defined( 'ABSPATH' ) ) {
13
+if ( ! defined('ABSPATH')) {
14 14
 	exit;
15 15
 }
16 16
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @return string
22 22
  */
23 23
 function give_get_templates_dir() {
24
-	return GIVE_PLUGIN_DIR . 'templates';
24
+	return GIVE_PLUGIN_DIR.'templates';
25 25
 }
26 26
 
27 27
 /**
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
  * @return string
32 32
  */
33 33
 function give_get_templates_url() {
34
-	return GIVE_PLUGIN_URL . 'templates';
34
+	return GIVE_PLUGIN_URL.'templates';
35 35
 }
36 36
 
37 37
 /**
@@ -51,23 +51,23 @@  discard block
 block discarded – undo
51 51
  * @uses  load_template()
52 52
  * @uses  get_template_part()
53 53
  */
54
-function give_get_template_part( $slug, $name = null, $load = true ) {
54
+function give_get_template_part($slug, $name = null, $load = true) {
55 55
 
56 56
 	// Execute code for this part
57
-	do_action( 'get_template_part_' . $slug, $slug, $name );
57
+	do_action('get_template_part_'.$slug, $slug, $name);
58 58
 
59 59
 	// Setup possible parts
60 60
 	$templates = array();
61
-	if ( isset( $name ) ) {
62
-		$templates[] = $slug . '-' . $name . '.php';
61
+	if (isset($name)) {
62
+		$templates[] = $slug.'-'.$name.'.php';
63 63
 	}
64
-	$templates[] = $slug . '.php';
64
+	$templates[] = $slug.'.php';
65 65
 
66 66
 	// Allow template parts to be filtered
67
-	$templates = apply_filters( 'give_get_template_part', $templates, $slug, $name );
67
+	$templates = apply_filters('give_get_template_part', $templates, $slug, $name);
68 68
 
69 69
 	// Return the part that is found
70
-	return give_locate_template( $templates, $load, false );
70
+	return give_locate_template($templates, $load, false);
71 71
 }
72 72
 
73 73
 /**
@@ -88,37 +88,37 @@  discard block
 block discarded – undo
88 88
  *
89 89
  * @return string The template filename if one is located.
90 90
  */
91
-function give_locate_template( $template_names, $load = false, $require_once = true ) {
91
+function give_locate_template($template_names, $load = false, $require_once = true) {
92 92
 	// No file found yet
93 93
 	$located = false;
94 94
 
95 95
 	// Try to find a template file
96
-	foreach ( (array) $template_names as $template_name ) {
96
+	foreach ((array) $template_names as $template_name) {
97 97
 
98 98
 		// Continue if template is empty
99
-		if ( empty( $template_name ) ) {
99
+		if (empty($template_name)) {
100 100
 			continue;
101 101
 		}
102 102
 
103 103
 		// Trim off any slashes from the template name
104
-		$template_name = ltrim( $template_name, '/' );
104
+		$template_name = ltrim($template_name, '/');
105 105
 
106 106
 		// try locating this template file by looping through the template paths
107
-		foreach ( give_get_theme_template_paths() as $template_path ) {
107
+		foreach (give_get_theme_template_paths() as $template_path) {
108 108
 
109
-			if ( file_exists( $template_path . $template_name ) ) {
110
-				$located = $template_path . $template_name;
109
+			if (file_exists($template_path.$template_name)) {
110
+				$located = $template_path.$template_name;
111 111
 				break;
112 112
 			}
113 113
 		}
114 114
 
115
-		if ( $located ) {
115
+		if ($located) {
116 116
 			break;
117 117
 		}
118 118
 	}
119 119
 
120
-	if ( ( true == $load ) && ! empty( $located ) ) {
121
-		load_template( $located, $require_once );
120
+	if ((true == $load) && ! empty($located)) {
121
+		load_template($located, $require_once);
122 122
 	}
123 123
 
124 124
 	return $located;
@@ -135,17 +135,17 @@  discard block
 block discarded – undo
135 135
 	$template_dir = give_get_theme_template_dir_name();
136 136
 
137 137
 	$file_paths = array(
138
-		1   => trailingslashit( get_stylesheet_directory() ) . $template_dir,
139
-		10  => trailingslashit( get_template_directory() ) . $template_dir,
138
+		1   => trailingslashit(get_stylesheet_directory()).$template_dir,
139
+		10  => trailingslashit(get_template_directory()).$template_dir,
140 140
 		100 => give_get_templates_dir()
141 141
 	);
142 142
 
143
-	$file_paths = apply_filters( 'give_template_paths', $file_paths );
143
+	$file_paths = apply_filters('give_template_paths', $file_paths);
144 144
 
145 145
 	// sort the file paths based on priority
146
-	ksort( $file_paths, SORT_NUMERIC );
146
+	ksort($file_paths, SORT_NUMERIC);
147 147
 
148
-	return array_map( 'trailingslashit', $file_paths );
148
+	return array_map('trailingslashit', $file_paths);
149 149
 }
150 150
 
151 151
 /**
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
  * @return string
158 158
  */
159 159
 function give_get_theme_template_dir_name() {
160
-	return trailingslashit( apply_filters( 'give_templates_dir', 'give' ) );
160
+	return trailingslashit(apply_filters('give_templates_dir', 'give'));
161 161
 }
162 162
 
163 163
 /**
@@ -167,10 +167,10 @@  discard block
 block discarded – undo
167 167
  * @return void
168 168
  */
169 169
 function give_version_in_header() {
170
-	echo '<meta name="generator" content="Give v' . GIVE_VERSION . '" />' . "\n";
170
+	echo '<meta name="generator" content="Give v'.GIVE_VERSION.'" />'."\n";
171 171
 }
172 172
 
173
-add_action( 'wp_head', 'give_version_in_header' );
173
+add_action('wp_head', 'give_version_in_header');
174 174
 
175 175
 /**
176 176
  * Determines if we're currently on the Donations History page.
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
  */
181 181
 function give_is_donation_history_page() {
182 182
 
183
-	$ret = is_page( give_get_option( 'history_page' ) );
183
+	$ret = is_page(give_get_option('history_page'));
184 184
 
185
-	return apply_filters( 'give_is_donation_history_page', $ret );
185
+	return apply_filters('give_is_donation_history_page', $ret);
186 186
 }
187 187
 
188 188
 /**
@@ -194,25 +194,25 @@  discard block
 block discarded – undo
194 194
  *
195 195
  * @return array Modified array of classes
196 196
  */
197
-function give_add_body_classes( $class ) {
197
+function give_add_body_classes($class) {
198 198
 	$classes = (array) $class;
199 199
 
200
-	if ( give_is_success_page() ) {
200
+	if (give_is_success_page()) {
201 201
 		$classes[] = 'give-success';
202 202
 		$classes[] = 'give-page';
203 203
 	}
204 204
 
205
-	if ( give_is_failed_transaction_page() ) {
205
+	if (give_is_failed_transaction_page()) {
206 206
 		$classes[] = 'give-failed-transaction';
207 207
 		$classes[] = 'give-page';
208 208
 	}
209 209
 
210
-	if ( give_is_donation_history_page() ) {
210
+	if (give_is_donation_history_page()) {
211 211
 		$classes[] = 'give-donation-history';
212 212
 		$classes[] = 'give-page';
213 213
 	}
214 214
 
215
-	if ( give_is_test_mode() ) {
215
+	if (give_is_test_mode()) {
216 216
 		$classes[] = 'give-test-mode';
217 217
 		$classes[] = 'give-page';
218 218
 	}
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	//Theme-specific Classes used to prevent conflicts via CSS
221 221
 	$current_theme = wp_get_theme();
222 222
 
223
-	switch ( $current_theme->template ) {
223
+	switch ($current_theme->template) {
224 224
 
225 225
 		case 'Divi':
226 226
 			$classes[] = 'give-divi';
@@ -234,10 +234,10 @@  discard block
 block discarded – undo
234 234
 
235 235
 	}
236 236
 
237
-	return array_unique( $classes );
237
+	return array_unique($classes);
238 238
 }
239 239
 
240
-add_filter( 'body_class', 'give_add_body_classes' );
240
+add_filter('body_class', 'give_add_body_classes');
241 241
 
242 242
 
243 243
 /**
@@ -253,22 +253,22 @@  discard block
 block discarded – undo
253 253
  *
254 254
  * @return array
255 255
  */
256
-function give_add_post_class( $classes, $class = '', $post_id = '' ) {
257
-	if ( ! $post_id || 'give_forms' !== get_post_type( $post_id ) ) {
256
+function give_add_post_class($classes, $class = '', $post_id = '') {
257
+	if ( ! $post_id || 'give_forms' !== get_post_type($post_id)) {
258 258
 		return $classes;
259 259
 	}
260 260
 
261 261
 	//@TODO: Add classes for custom taxonomy and form configurations (multi vs single donations, etc).
262 262
 
263
-	if ( false !== ( $key = array_search( 'hentry', $classes ) ) ) {
264
-		unset( $classes[ $key ] );
263
+	if (false !== ($key = array_search('hentry', $classes))) {
264
+		unset($classes[$key]);
265 265
 	}
266 266
 
267 267
 	return $classes;
268 268
 }
269 269
 
270 270
 
271
-add_filter( 'post_class', 'give_add_post_class', 20, 3 );
271
+add_filter('post_class', 'give_add_post_class', 20, 3);
272 272
 
273 273
 /**
274 274
  * Get the placeholder image URL for forms etc
@@ -278,84 +278,84 @@  discard block
 block discarded – undo
278 278
  */
279 279
 function give_get_placeholder_img_src() {
280 280
 
281
-	$placeholder_url = 'http://placehold.it/600x600&text=' . urlencode( esc_attr__( 'Give Placeholder Image', 'give' ) );
281
+	$placeholder_url = 'http://placehold.it/600x600&text='.urlencode(esc_attr__('Give Placeholder Image', 'give'));
282 282
 
283
-	return apply_filters( 'give_placeholder_img_src', $placeholder_url );
283
+	return apply_filters('give_placeholder_img_src', $placeholder_url);
284 284
 }
285 285
 
286 286
 
287 287
 /**
288 288
  * Global
289 289
  */
290
-if ( ! function_exists( 'give_output_content_wrapper' ) ) {
290
+if ( ! function_exists('give_output_content_wrapper')) {
291 291
 
292 292
 	/**
293 293
 	 * Output the start of the page wrapper.
294 294
 	 */
295 295
 	function give_output_content_wrapper() {
296
-		give_get_template_part( 'global/wrapper-start' );
296
+		give_get_template_part('global/wrapper-start');
297 297
 	}
298 298
 }
299
-if ( ! function_exists( 'give_output_content_wrapper_end' ) ) {
299
+if ( ! function_exists('give_output_content_wrapper_end')) {
300 300
 
301 301
 	/**
302 302
 	 * Output the end of the page wrapper.
303 303
 	 */
304 304
 	function give_output_content_wrapper_end() {
305
-		give_get_template_part( 'global/wrapper-end' );
305
+		give_get_template_part('global/wrapper-end');
306 306
 	}
307 307
 }
308 308
 
309 309
 /**
310 310
  * Single Give Form
311 311
  */
312
-if ( ! function_exists( 'give_left_sidebar_pre_wrap' ) ) {
312
+if ( ! function_exists('give_left_sidebar_pre_wrap')) {
313 313
 	function give_left_sidebar_pre_wrap() {
314
-		echo apply_filters( 'give_left_sidebar_pre_wrap', '<div id="give-sidebar-left" class="give-sidebar give-single-form-sidebar-left">' );
314
+		echo apply_filters('give_left_sidebar_pre_wrap', '<div id="give-sidebar-left" class="give-sidebar give-single-form-sidebar-left">');
315 315
 	}
316 316
 }
317 317
 
318
-if ( ! function_exists( 'give_left_sidebar_post_wrap' ) ) {
318
+if ( ! function_exists('give_left_sidebar_post_wrap')) {
319 319
 	function give_left_sidebar_post_wrap() {
320
-		echo apply_filters( 'give_left_sidebar_post_wrap', '</div>' );
320
+		echo apply_filters('give_left_sidebar_post_wrap', '</div>');
321 321
 	}
322 322
 }
323 323
 
324
-if ( ! function_exists( 'give_get_forms_sidebar' ) ) {
324
+if ( ! function_exists('give_get_forms_sidebar')) {
325 325
 	function give_get_forms_sidebar() {
326
-		give_get_template_part( 'single-give-form/sidebar' );
326
+		give_get_template_part('single-give-form/sidebar');
327 327
 	}
328 328
 }
329 329
 
330
-if ( ! function_exists( 'give_show_form_images' ) ) {
330
+if ( ! function_exists('give_show_form_images')) {
331 331
 
332 332
 	/**
333 333
 	 * Output the product image before the single product summary.
334 334
 	 */
335 335
 	function give_show_form_images() {
336
-		$featured_image_option = give_get_option( 'disable_form_featured_img' );
337
-		if ( $featured_image_option !== 'on' ) {
338
-			give_get_template_part( 'single-give-form/featured-image' );
336
+		$featured_image_option = give_get_option('disable_form_featured_img');
337
+		if ($featured_image_option !== 'on') {
338
+			give_get_template_part('single-give-form/featured-image');
339 339
 		}
340 340
 	}
341 341
 }
342 342
 
343
-if ( ! function_exists( 'give_template_single_title' ) ) {
343
+if ( ! function_exists('give_template_single_title')) {
344 344
 
345 345
 	/**
346 346
 	 * Output the product title.
347 347
 	 */
348 348
 	function give_template_single_title() {
349
-		give_get_template_part( 'single-give-form/title' );
349
+		give_get_template_part('single-give-form/title');
350 350
 	}
351 351
 }
352 352
 
353
-if ( ! function_exists( 'give_show_avatars' ) ) {
353
+if ( ! function_exists('give_show_avatars')) {
354 354
 
355 355
 	/**
356 356
 	 * Output the product title.
357 357
 	 */
358 358
 	function give_show_avatars() {
359
-		echo do_shortcode( '[give_donators_gravatars]' );
359
+		echo do_shortcode('[give_donators_gravatars]');
360 360
 	}
361 361
 }
362 362
\ No newline at end of file
Please login to merge, or discard this patch.
includes/emails/template.php 1 patch
Spacing   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 // Exit if accessed directly
13
-if ( ! defined( 'ABSPATH' ) ) {
13
+if ( ! defined('ABSPATH')) {
14 14
 	exit;
15 15
 }
16 16
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
  *
42 42
  * @return string $message Fully formatted message
43 43
  */
44
-function give_email_template_tags( $message, $payment_data, $payment_id, $admin_notice = false ) {
45
-	return give_do_email_tags( $message, $payment_id );
44
+function give_email_template_tags($message, $payment_data, $payment_id, $admin_notice = false) {
45
+	return give_do_email_tags($message, $payment_id);
46 46
 }
47 47
 
48 48
 /**
@@ -55,38 +55,38 @@  discard block
 block discarded – undo
55 55
  *
56 56
  * @return string $message Fully formatted message
57 57
  */
58
-function give_email_preview_template_tags( $message ) {
58
+function give_email_preview_template_tags($message) {
59 59
 	global $give_options;
60 60
 
61
-	$price = give_currency_filter( give_format_amount( 10.50 ) );
61
+	$price = give_currency_filter(give_format_amount(10.50));
62 62
 
63 63
 	$gateway = 'PayPal';
64 64
 
65
-	$receipt_id = strtolower( md5( uniqid() ) );
65
+	$receipt_id = strtolower(md5(uniqid()));
66 66
 
67
-	$notes = __( 'These are some sample notes added to a donation.', 'give' );
67
+	$notes = __('These are some sample notes added to a donation.', 'give');
68 68
 
69
-	$payment_id = rand( 1, 100 );
69
+	$payment_id = rand(1, 100);
70 70
 
71 71
 	$user = wp_get_current_user();
72 72
 
73
-	$message = str_replace( '{name}', $user->display_name, $message );
74
-	$message = str_replace( '{fullname}', $user->display_name, $message );
75
-	$message = str_replace( '{username}', $user->user_login, $message );
76
-	$message = str_replace( '{date}', date( get_option( 'date_format' ), current_time( 'timestamp' ) ), $message );
77
-	$message = str_replace( '{price}', $price, $message );
78
-	$message = str_replace( '{donation}', 'Sample Donation Form Title', $message );
79
-	$message = str_replace( '{receipt_id}', $receipt_id, $message );
80
-	$message = str_replace( '{payment_method}', $gateway, $message );
81
-	$message = str_replace( '{sitename}', get_bloginfo( 'name' ), $message );
82
-	$message = str_replace( '{product_notes}', $notes, $message );
83
-	$message = str_replace( '{payment_id}', $payment_id, $message );
84
-	$message = str_replace( '{receipt_link}', sprintf( __( '%1$sView the receipt in your browser %2$s', 'give' ), '<a href="' . esc_url( add_query_arg( array(
73
+	$message = str_replace('{name}', $user->display_name, $message);
74
+	$message = str_replace('{fullname}', $user->display_name, $message);
75
+	$message = str_replace('{username}', $user->user_login, $message);
76
+	$message = str_replace('{date}', date(get_option('date_format'), current_time('timestamp')), $message);
77
+	$message = str_replace('{price}', $price, $message);
78
+	$message = str_replace('{donation}', 'Sample Donation Form Title', $message);
79
+	$message = str_replace('{receipt_id}', $receipt_id, $message);
80
+	$message = str_replace('{payment_method}', $gateway, $message);
81
+	$message = str_replace('{sitename}', get_bloginfo('name'), $message);
82
+	$message = str_replace('{product_notes}', $notes, $message);
83
+	$message = str_replace('{payment_id}', $payment_id, $message);
84
+	$message = str_replace('{receipt_link}', sprintf(__('%1$sView the receipt in your browser %2$s', 'give'), '<a href="'.esc_url(add_query_arg(array(
85 85
 			'payment_key' => $receipt_id,
86 86
 			'give_action' => 'view_receipt'
87
-		), home_url() ) ) . '">', '&raquo;</a>' ), $message );
87
+		), home_url())).'">', '&raquo;</a>'), $message);
88 88
 
89
-	return wpautop( apply_filters( 'give_email_preview_template_tags', $message ) );
89
+	return wpautop(apply_filters('give_email_preview_template_tags', $message));
90 90
 }
91 91
 
92 92
 /**
@@ -99,20 +99,20 @@  discard block
 block discarded – undo
99 99
  * @since  1.0
100 100
  * @return array|bool
101 101
  */
102
-add_filter( 'give_settings_emails', 'give_email_template_preview' );
102
+add_filter('give_settings_emails', 'give_email_template_preview');
103 103
 
104
-function give_email_template_preview( $array ) {
104
+function give_email_template_preview($array) {
105 105
 
106
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
106
+	if ( ! current_user_can('manage_give_settings')) {
107 107
 		return false;
108 108
 	}
109 109
 	$custom_field = array(
110
-		'name' => __( 'Preview Email', 'give' ),
111
-		'desc' => __( 'Click the buttons to preview emails.', 'give' ),
110
+		'name' => __('Preview Email', 'give'),
111
+		'desc' => __('Click the buttons to preview emails.', 'give'),
112 112
 		'id'   => 'give_email_preview_buttons',
113 113
 		'type' => 'email_preview_buttons'
114 114
 	);
115
-	array_splice( $array, 5, 0, array( $custom_field ) );
115
+	array_splice($array, 5, 0, array($custom_field));
116 116
 
117 117
 	return $array; // splice in at position 3;
118 118
 }
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
128 128
 function give_email_preview_buttons_callback() {
129 129
 	ob_start();
130 130
 	?>
131
-	<a href="<?php echo esc_url( add_query_arg( array( 'give_action' => 'preview_email' ), home_url() ) ); ?>" class="button-secondary" target="_blank" title="<?php _e( 'Donation Receipt Preview', 'give' ); ?> "><?php _e( 'Preview Donation Receipt', 'give' ); ?></a>
132
-	<a href="<?php echo wp_nonce_url( add_query_arg( array(
131
+	<a href="<?php echo esc_url(add_query_arg(array('give_action' => 'preview_email'), home_url())); ?>" class="button-secondary" target="_blank" title="<?php _e('Donation Receipt Preview', 'give'); ?> "><?php _e('Preview Donation Receipt', 'give'); ?></a>
132
+	<a href="<?php echo wp_nonce_url(add_query_arg(array(
133 133
 		'give_action'  => 'send_test_email',
134 134
 		'give-message' => 'sent-test-email'
135
-	) ), 'give-test-email' ); ?>" title="<?php _e( 'This will send a demo donation receipt to the emails listed below.', 'give' ); ?>" class="button-secondary"><?php _e( 'Send Test Email', 'give' ); ?></a>
135
+	)), 'give-test-email'); ?>" title="<?php _e('This will send a demo donation receipt to the emails listed below.', 'give'); ?>" class="button-secondary"><?php _e('Send Test Email', 'give'); ?></a>
136 136
 	<?php
137 137
 	echo ob_get_clean();
138 138
 }
@@ -145,27 +145,27 @@  discard block
 block discarded – undo
145 145
  */
146 146
 function give_display_email_template_preview() {
147 147
 
148
-	if ( empty( $_GET['give_action'] ) ) {
148
+	if (empty($_GET['give_action'])) {
149 149
 		return;
150 150
 	}
151 151
 
152
-	if ( 'preview_email' !== $_GET['give_action'] ) {
152
+	if ('preview_email' !== $_GET['give_action']) {
153 153
 		return;
154 154
 	}
155 155
 
156
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
156
+	if ( ! current_user_can('manage_give_settings')) {
157 157
 		return;
158 158
 	}
159 159
 
160
-	Give()->emails->heading = __( 'Donation Receipt', 'give' );
160
+	Give()->emails->heading = __('Donation Receipt', 'give');
161 161
 
162
-	echo Give()->emails->build_email( give_email_preview_template_tags( give_get_email_body_content( 0, array() ) ) );
162
+	echo Give()->emails->build_email(give_email_preview_template_tags(give_get_email_body_content(0, array())));
163 163
 
164 164
 	exit;
165 165
 
166 166
 }
167 167
 
168
-add_action( 'template_redirect', 'give_display_email_template_preview' );
168
+add_action('template_redirect', 'give_display_email_template_preview');
169 169
 
170 170
 /**
171 171
  * Email Template Body
@@ -177,19 +177,19 @@  discard block
 block discarded – undo
177 177
  *
178 178
  * @return string $email_body Body of the email
179 179
  */
180
-function give_get_email_body_content( $payment_id = 0, $payment_data = array() ) {
180
+function give_get_email_body_content($payment_id = 0, $payment_data = array()) {
181 181
 
182 182
 	global $give_options;
183 183
 
184 184
 	$default_email_body = give_get_default_donation_receipt_email();
185 185
 
186
-	$email = isset( $give_options['donation_receipt'] ) ? stripslashes( $give_options['donation_receipt'] ) : $default_email_body;
186
+	$email = isset($give_options['donation_receipt']) ? stripslashes($give_options['donation_receipt']) : $default_email_body;
187 187
 
188
-	$email_body = wpautop( $email );
188
+	$email_body = wpautop($email);
189 189
 
190
-	$email_body = apply_filters( 'give_donation_receipt_' . Give()->emails->get_template(), $email_body, $payment_id, $payment_data );
190
+	$email_body = apply_filters('give_donation_receipt_'.Give()->emails->get_template(), $email_body, $payment_id, $payment_data);
191 191
 
192
-	return apply_filters( 'give_donation_receipt', $email_body, $payment_id, $payment_data );
192
+	return apply_filters('give_donation_receipt', $email_body, $payment_id, $payment_data);
193 193
 }
194 194
 
195 195
 
@@ -205,37 +205,37 @@  discard block
 block discarded – undo
205 205
  *
206 206
  * @return string $email_body Body of the email
207 207
  */
208
-function give_get_donation_notification_body_content( $payment_id = 0, $payment_data = array() ) {
208
+function give_get_donation_notification_body_content($payment_id = 0, $payment_data = array()) {
209 209
 	global $give_options;
210 210
 
211
-	$user_info = maybe_unserialize( $payment_data['user_info'] );
212
-	$email     = give_get_payment_user_email( $payment_id );
211
+	$user_info = maybe_unserialize($payment_data['user_info']);
212
+	$email     = give_get_payment_user_email($payment_id);
213 213
 
214
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 ) {
215
-		$user_data = get_userdata( $user_info['id'] );
214
+	if (isset($user_info['id']) && $user_info['id'] > 0) {
215
+		$user_data = get_userdata($user_info['id']);
216 216
 		$name      = $user_data->display_name;
217
-	} elseif ( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
218
-		$name = $user_info['first_name'] . ' ' . $user_info['last_name'];
217
+	} elseif (isset($user_info['first_name']) && isset($user_info['last_name'])) {
218
+		$name = $user_info['first_name'].' '.$user_info['last_name'];
219 219
 	} else {
220 220
 		$name = $email;
221 221
 	}
222 222
 
223
-	$gateway = give_get_gateway_admin_label( get_post_meta( $payment_id, '_give_payment_gateway', true ) );
223
+	$gateway = give_get_gateway_admin_label(get_post_meta($payment_id, '_give_payment_gateway', true));
224 224
 
225
-	$default_email_body = __( 'Hello', 'give' ) . "\n\n" . __( 'A donation has been made', 'give' ) . ".\n\n";
226
-	$default_email_body .= sprintf( __( '%s sold:', 'give' ), give_get_forms_label_plural() ) . "\n\n";
225
+	$default_email_body = __('Hello', 'give')."\n\n".__('A donation has been made', 'give').".\n\n";
226
+	$default_email_body .= sprintf(__('%s sold:', 'give'), give_get_forms_label_plural())."\n\n";
227 227
 
228
-	$default_email_body .= __( 'Donor: ', 'give' ) . " " . html_entity_decode( $name, ENT_COMPAT, 'UTF-8' ) . "\n";
229
-	$default_email_body .= __( 'Amount: ', 'give' ) . " " . html_entity_decode( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ), ENT_COMPAT, 'UTF-8' ) . "\n";
230
-	$default_email_body .= __( 'Payment Method: ', 'give' ) . " " . $gateway . "\n\n";
228
+	$default_email_body .= __('Donor: ', 'give')." ".html_entity_decode($name, ENT_COMPAT, 'UTF-8')."\n";
229
+	$default_email_body .= __('Amount: ', 'give')." ".html_entity_decode(give_currency_filter(give_format_amount(give_get_payment_amount($payment_id))), ENT_COMPAT, 'UTF-8')."\n";
230
+	$default_email_body .= __('Payment Method: ', 'give')." ".$gateway."\n\n";
231 231
 
232
-	$default_email_body .= __( 'Thank you', 'give' );
232
+	$default_email_body .= __('Thank you', 'give');
233 233
 
234
-	$email = isset( $give_options['donation_notification'] ) ? stripslashes( $give_options['donation_notification'] ) : $default_email_body;
234
+	$email = isset($give_options['donation_notification']) ? stripslashes($give_options['donation_notification']) : $default_email_body;
235 235
 
236
-	$email_body = give_do_email_tags( $email, $payment_id );
236
+	$email_body = give_do_email_tags($email, $payment_id);
237 237
 
238
-	return apply_filters( 'give_donation_notification', wpautop( $email_body ), $payment_id, $payment_data );
238
+	return apply_filters('give_donation_notification', wpautop($email_body), $payment_id, $payment_data);
239 239
 }
240 240
 
241 241
 /**
@@ -248,15 +248,15 @@  discard block
 block discarded – undo
248 248
  * @since  1.0
249 249
  */
250 250
 function give_render_receipt_in_browser() {
251
-	if ( ! isset( $_GET['payment_key'] ) ) {
252
-		wp_die( __( 'Missing donation payment key.', 'give' ), __( 'Error', 'give' ) );
251
+	if ( ! isset($_GET['payment_key'])) {
252
+		wp_die(__('Missing donation payment key.', 'give'), __('Error', 'give'));
253 253
 	}
254 254
 
255
-	$key = urlencode( $_GET['payment_key'] );
255
+	$key = urlencode($_GET['payment_key']);
256 256
 
257 257
 	ob_start();
258 258
 	//Disallows caching of the page
259
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
259
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
260 260
 	header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
261 261
 	header("Cache-Control: post-check=0, pre-check=0", false);
262 262
 	header("Pragma: no-cache"); // HTTP/1.0
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 	<!DOCTYPE html>
266 266
 	<html lang="en">
267 267
 		<head>
268
-			<title><?php _e( 'Donation Receipt', 'give' ); ?></title>
268
+			<title><?php _e('Donation Receipt', 'give'); ?></title>
269 269
 			<meta charset="utf-8" />
270 270
 
271 271
 			<!-- Further disallowing of caching of this page -->
@@ -279,12 +279,12 @@  discard block
 block discarded – undo
279 279
 
280 280
 			<?php wp_head(); ?>
281 281
 		</head>
282
-		<body class="<?php echo apply_filters( 'give_receipt_page_body_class', 'give_receipt_page' ); ?>">
282
+		<body class="<?php echo apply_filters('give_receipt_page_body_class', 'give_receipt_page'); ?>">
283 283
 
284 284
 			<div id="give_receipt_wrapper">
285
-				<?php do_action( 'give_render_receipt_in_browser_before' ); ?>
286
-				<?php echo do_shortcode( '[give_receipt payment_key=' . $key . ']' ); ?>
287
-				<?php do_action( 'give_render_receipt_in_browser_after' ); ?>
285
+				<?php do_action('give_render_receipt_in_browser_before'); ?>
286
+				<?php echo do_shortcode('[give_receipt payment_key='.$key.']'); ?>
287
+				<?php do_action('give_render_receipt_in_browser_after'); ?>
288 288
 			</div>
289 289
 
290 290
 			<?php wp_footer(); ?>
@@ -295,4 +295,4 @@  discard block
 block discarded – undo
295 295
 	die();
296 296
 }
297 297
 
298
-add_action( 'give_view_receipt', 'give_render_receipt_in_browser' );
298
+add_action('give_view_receipt', 'give_render_receipt_in_browser');
Please login to merge, or discard this patch.
includes/admin/system-info.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
  *
50 50
  * @since: 1.4
51 51
  *
52
- * @return bool
52
+ * @return boolean|null
53 53
  */
54 54
 function give_allow_sessions_for_sysinfo() {
55 55
 	if ( is_admin() && ( isset( $_GET['page'] ) && isset( $_GET['tab'] ) ) && ( $_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings' ) ) {
Please login to merge, or discard this patch.
Spacing   +145 added lines, -145 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  */
12 12
 
13 13
 // Exit if accessed directly
14
-if ( ! defined( 'ABSPATH' ) ) {
14
+if ( ! defined('ABSPATH')) {
15 15
 	exit;
16 16
 }
17 17
 
@@ -24,14 +24,14 @@  discard block
 block discarded – undo
24 24
  */
25 25
 function give_system_info_callback() {
26 26
 
27
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
27
+	if ( ! current_user_can('manage_give_settings')) {
28 28
 		return;
29 29
 	}
30 30
 	?>
31 31
 	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="give-sysinfo" title="To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac)."><?php echo give_tools_sysinfo_get(); ?></textarea>
32 32
 	<p class="submit">
33 33
 		<input type="hidden" name="give-action" value="download_sysinfo"/>
34
-		<?php submit_button( 'Download System Info File', 'secondary', 'give-download-sysinfo', false ); ?>
34
+		<?php submit_button('Download System Info File', 'secondary', 'give-download-sysinfo', false); ?>
35 35
 	</p>
36 36
 	<style>
37 37
 		.give_forms_page_give-settings .give-submit-wrap {
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
  * @return bool
53 53
  */
54 54
 function give_allow_sessions_for_sysinfo() {
55
-	if ( is_admin() && ( isset( $_GET['page'] ) && isset( $_GET['tab'] ) ) && ( $_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings' ) ) {
55
+	if (is_admin() && (isset($_GET['page']) && isset($_GET['tab'])) && ($_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings')) {
56 56
 		return true;
57 57
 	}
58 58
 }
59 59
 
60
-add_filter( 'give_start_session', 'give_allow_sessions_for_sysinfo' );
60
+add_filter('give_start_session', 'give_allow_sessions_for_sysinfo');
61 61
 
62 62
 
63 63
 /**
@@ -72,63 +72,63 @@  discard block
 block discarded – undo
72 72
 function give_tools_sysinfo_get() {
73 73
 	global $wpdb, $give_options;
74 74
 
75
-	if ( ! class_exists( 'Browser' ) ) {
76
-		require_once GIVE_PLUGIN_DIR . 'includes/libraries/browser.php';
75
+	if ( ! class_exists('Browser')) {
76
+		require_once GIVE_PLUGIN_DIR.'includes/libraries/browser.php';
77 77
 	}
78 78
 
79 79
 	$browser = new Browser();
80 80
 
81 81
 	// Get theme info
82
-	if ( get_bloginfo( 'version' ) < '3.4' ) {
83
-		$theme_data = wp_get_theme( get_stylesheet_directory() . '/style.css' );
84
-		$theme      = $theme_data['Name'] . ' ' . $theme_data['Version'];
82
+	if (get_bloginfo('version') < '3.4') {
83
+		$theme_data = wp_get_theme(get_stylesheet_directory().'/style.css');
84
+		$theme      = $theme_data['Name'].' '.$theme_data['Version'];
85 85
 	} else {
86 86
 		$theme_data = wp_get_theme();
87
-		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
87
+		$theme      = $theme_data->Name.' '.$theme_data->Version;
88 88
 	}
89 89
 
90 90
 	// Try to identify the hosting provider
91 91
 	$host = give_get_host();
92 92
 
93
-	$return = '### Begin System Info ###' . "\n\n";
93
+	$return = '### Begin System Info ###'."\n\n";
94 94
 
95 95
 	// Start with the basics...
96
-	$return .= '-- Site Info' . "\n\n";
97
-	$return .= 'Site URL:                 ' . site_url() . "\n";
98
-	$return .= 'Home URL:                 ' . home_url() . "\n";
99
-	$return .= 'Multisite:                ' . ( is_multisite() ? 'Yes' : 'No' ) . "\n";
96
+	$return .= '-- Site Info'."\n\n";
97
+	$return .= 'Site URL:                 '.site_url()."\n";
98
+	$return .= 'Home URL:                 '.home_url()."\n";
99
+	$return .= 'Multisite:                '.(is_multisite() ? 'Yes' : 'No')."\n";
100 100
 
101
-	$return = apply_filters( 'give_sysinfo_after_site_info', $return );
101
+	$return = apply_filters('give_sysinfo_after_site_info', $return);
102 102
 
103 103
 	// Can we determine the site's host?
104
-	if ( $host ) {
105
-		$return .= "\n" . '-- Hosting Provider' . "\n\n";
106
-		$return .= 'Host:                     ' . $host . "\n";
104
+	if ($host) {
105
+		$return .= "\n".'-- Hosting Provider'."\n\n";
106
+		$return .= 'Host:                     '.$host."\n";
107 107
 
108
-		$return = apply_filters( 'give_sysinfo_after_host_info', $return );
108
+		$return = apply_filters('give_sysinfo_after_host_info', $return);
109 109
 	}
110 110
 
111 111
 	// The local users' browser information, handled by the Browser class
112
-	$return .= "\n" . '-- User Browser' . "\n\n";
112
+	$return .= "\n".'-- User Browser'."\n\n";
113 113
 	$return .= $browser;
114 114
 
115
-	$return = apply_filters( 'give_sysinfo_after_user_browser', $return );
115
+	$return = apply_filters('give_sysinfo_after_user_browser', $return);
116 116
 
117 117
 	// WordPress configuration
118
-	$return .= "\n" . '-- WordPress Configuration' . "\n\n";
119
-	$return .= 'Version:                  ' . get_bloginfo( 'version' ) . "\n";
120
-	$return .= 'Language:                 ' . ( defined( 'WPLANG' ) && WPLANG ? WPLANG : 'en_US' ) . "\n";
121
-	$return .= 'Permalink Structure:      ' . ( get_option( 'permalink_structure' ) ? get_option( 'permalink_structure' ) : 'Default' ) . "\n";
122
-	$return .= 'Active Theme:             ' . $theme . "\n";
123
-	$return .= 'Show On Front:            ' . get_option( 'show_on_front' ) . "\n";
118
+	$return .= "\n".'-- WordPress Configuration'."\n\n";
119
+	$return .= 'Version:                  '.get_bloginfo('version')."\n";
120
+	$return .= 'Language:                 '.(defined('WPLANG') && WPLANG ? WPLANG : 'en_US')."\n";
121
+	$return .= 'Permalink Structure:      '.(get_option('permalink_structure') ? get_option('permalink_structure') : 'Default')."\n";
122
+	$return .= 'Active Theme:             '.$theme."\n";
123
+	$return .= 'Show On Front:            '.get_option('show_on_front')."\n";
124 124
 
125 125
 	// Only show page specs if frontpage is set to 'page'
126
-	if ( get_option( 'show_on_front' ) == 'page' ) {
127
-		$front_page_id = get_option( 'page_on_front' );
128
-		$blog_page_id  = get_option( 'page_for_posts' );
126
+	if (get_option('show_on_front') == 'page') {
127
+		$front_page_id = get_option('page_on_front');
128
+		$blog_page_id  = get_option('page_for_posts');
129 129
 
130
-		$return .= 'Page On Front:            ' . ( $front_page_id != 0 ? get_the_title( $front_page_id ) . ' (#' . $front_page_id . ')' : 'Unset' ) . "\n";
131
-		$return .= 'Page For Posts:           ' . ( $blog_page_id != 0 ? get_the_title( $blog_page_id ) . ' (#' . $blog_page_id . ')' : 'Unset' ) . "\n";
130
+		$return .= 'Page On Front:            '.($front_page_id != 0 ? get_the_title($front_page_id).' (#'.$front_page_id.')' : 'Unset')."\n";
131
+		$return .= 'Page For Posts:           '.($blog_page_id != 0 ? get_the_title($blog_page_id).' (#'.$blog_page_id.')' : 'Unset')."\n";
132 132
 	}
133 133
 
134 134
 	// Make sure wp_remote_post() is working
@@ -137,205 +137,205 @@  discard block
 block discarded – undo
137 137
 	$params = array(
138 138
 		'sslverify'  => false,
139 139
 		'timeout'    => 60,
140
-		'user-agent' => 'Give/' . GIVE_VERSION,
140
+		'user-agent' => 'Give/'.GIVE_VERSION,
141 141
 		'body'       => $request
142 142
 	);
143 143
 
144
-	$response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params );
144
+	$response = wp_remote_post('https://www.paypal.com/cgi-bin/webscr', $params);
145 145
 
146
-	if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
146
+	if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
147 147
 		$WP_REMOTE_POST = 'wp_remote_post() works';
148 148
 	} else {
149 149
 		$WP_REMOTE_POST = 'wp_remote_post() does not work';
150 150
 	}
151 151
 
152
-	$return .= 'Remote Post:              ' . $WP_REMOTE_POST . "\n";
153
-	$return .= 'Table Prefix:             ' . 'Length: ' . strlen( $wpdb->prefix ) . '   Status: ' . ( strlen( $wpdb->prefix ) > 16 ? 'ERROR: Too long' : 'Acceptable' ) . "\n";
154
-	$return .= 'Admin AJAX:               ' . ( give_test_ajax_works() ? 'Accessible' : 'Inaccessible' ) . "\n";
155
-	$return .= 'WP_DEBUG:                 ' . ( defined( 'WP_DEBUG' ) ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set' ) . "\n";
156
-	$return .= 'Memory Limit:             ' . WP_MEMORY_LIMIT . "\n";
157
-	$return .= 'Registered Post Stati:    ' . implode( ', ', get_post_stati() ) . "\n";
152
+	$return .= 'Remote Post:              '.$WP_REMOTE_POST."\n";
153
+	$return .= 'Table Prefix:             '.'Length: '.strlen($wpdb->prefix).'   Status: '.(strlen($wpdb->prefix) > 16 ? 'ERROR: Too long' : 'Acceptable')."\n";
154
+	$return .= 'Admin AJAX:               '.(give_test_ajax_works() ? 'Accessible' : 'Inaccessible')."\n";
155
+	$return .= 'WP_DEBUG:                 '.(defined('WP_DEBUG') ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set')."\n";
156
+	$return .= 'Memory Limit:             '.WP_MEMORY_LIMIT."\n";
157
+	$return .= 'Registered Post Stati:    '.implode(', ', get_post_stati())."\n";
158 158
 
159
-	$return = apply_filters( 'give_sysinfo_after_wordpress_config', $return );
159
+	$return = apply_filters('give_sysinfo_after_wordpress_config', $return);
160 160
 
161 161
 	// GIVE configuration
162
-	$return .= "\n" . '-- Give Configuration' . "\n\n";
163
-	$return .= 'Version:                  ' . GIVE_VERSION . "\n";
164
-	$return .= 'Upgraded From:            ' . get_option( 'give_version_upgraded_from', 'None' ) . "\n";
165
-	$return .= 'Test Mode:                ' . ( give_is_test_mode() ? "Enabled\n" : "Disabled\n" );
166
-	$return .= 'Currency Code:            ' . give_get_currency() . "\n";
167
-	$return .= 'Currency Position:        ' . give_get_option( 'currency_position', 'before' ) . "\n";
168
-	$return .= 'Decimal Separator:        ' . give_get_option( 'decimal_separator', '.' ) . "\n";
169
-	$return .= 'Thousands Separator:      ' . give_get_option( 'thousands_separator', ',' ) . "\n";
162
+	$return .= "\n".'-- Give Configuration'."\n\n";
163
+	$return .= 'Version:                  '.GIVE_VERSION."\n";
164
+	$return .= 'Upgraded From:            '.get_option('give_version_upgraded_from', 'None')."\n";
165
+	$return .= 'Test Mode:                '.(give_is_test_mode() ? "Enabled\n" : "Disabled\n");
166
+	$return .= 'Currency Code:            '.give_get_currency()."\n";
167
+	$return .= 'Currency Position:        '.give_get_option('currency_position', 'before')."\n";
168
+	$return .= 'Decimal Separator:        '.give_get_option('decimal_separator', '.')."\n";
169
+	$return .= 'Thousands Separator:      '.give_get_option('thousands_separator', ',')."\n";
170 170
 
171
-	$return = apply_filters( 'give_sysinfo_after_give_config', $return );
171
+	$return = apply_filters('give_sysinfo_after_give_config', $return);
172 172
 
173 173
 	// GIVE pages
174
-	$return .= "\n" . '-- Give Page Configuration' . "\n\n";
175
-	$return .= 'Success Page:             ' . ( ! empty( $give_options['success_page'] ) ? get_permalink( $give_options['success_page'] ) . "\n" : "Unset\n" );
176
-	$return .= 'Failure Page:             ' . ( ! empty( $give_options['failure_page'] ) ? get_permalink( $give_options['failure_page'] ) . "\n" : "Unset\n" );
177
-	$return .= 'Give Forms Slug:           ' . ( defined( 'GIVE_SLUG' ) ? '/' . GIVE_SLUG . "\n" : "/donations\n" );
174
+	$return .= "\n".'-- Give Page Configuration'."\n\n";
175
+	$return .= 'Success Page:             '.( ! empty($give_options['success_page']) ? get_permalink($give_options['success_page'])."\n" : "Unset\n");
176
+	$return .= 'Failure Page:             '.( ! empty($give_options['failure_page']) ? get_permalink($give_options['failure_page'])."\n" : "Unset\n");
177
+	$return .= 'Give Forms Slug:           '.(defined('GIVE_SLUG') ? '/'.GIVE_SLUG."\n" : "/donations\n");
178 178
 
179
-	$return = apply_filters( 'give_sysinfo_after_give_pages', $return );
179
+	$return = apply_filters('give_sysinfo_after_give_pages', $return);
180 180
 
181 181
 	// GIVE gateways
182
-	$return .= "\n" . '-- Give Gateway Configuration' . "\n\n";
182
+	$return .= "\n".'-- Give Gateway Configuration'."\n\n";
183 183
 
184 184
 	$active_gateways = give_get_enabled_payment_gateways();
185
-	if ( $active_gateways ) {
186
-		$default_gateway_is_active = give_is_gateway_active( give_get_default_gateway( null ) );
187
-		if ( $default_gateway_is_active ) {
188
-			$default_gateway = give_get_default_gateway( null );
189
-			$default_gateway = $active_gateways[ $default_gateway ]['admin_label'];
185
+	if ($active_gateways) {
186
+		$default_gateway_is_active = give_is_gateway_active(give_get_default_gateway(null));
187
+		if ($default_gateway_is_active) {
188
+			$default_gateway = give_get_default_gateway(null);
189
+			$default_gateway = $active_gateways[$default_gateway]['admin_label'];
190 190
 		} else {
191 191
 			$default_gateway = 'Test Payment';
192 192
 		}
193 193
 
194 194
 		$gateways = array();
195
-		foreach ( $active_gateways as $gateway ) {
195
+		foreach ($active_gateways as $gateway) {
196 196
 			$gateways[] = $gateway['admin_label'];
197 197
 		}
198 198
 
199
-		$return .= 'Enabled Gateways:         ' . implode( ', ', $gateways ) . "\n";
200
-		$return .= 'Default Gateway:          ' . $default_gateway . "\n";
199
+		$return .= 'Enabled Gateways:         '.implode(', ', $gateways)."\n";
200
+		$return .= 'Default Gateway:          '.$default_gateway."\n";
201 201
 	} else {
202
-		$return .= 'Enabled Gateways:         None' . "\n";
202
+		$return .= 'Enabled Gateways:         None'."\n";
203 203
 	}
204 204
 
205
-	$return = apply_filters( 'give_sysinfo_after_give_gateways', $return );
205
+	$return = apply_filters('give_sysinfo_after_give_gateways', $return);
206 206
 
207 207
 	// GIVE Templates
208
-	$dir = get_stylesheet_directory() . '/give_templates/*';
209
-	if ( is_dir( $dir ) && ( count( glob( "$dir/*" ) ) !== 0 ) ) {
210
-		$return .= "\n" . '-- Give Template Overrides' . "\n\n";
208
+	$dir = get_stylesheet_directory().'/give_templates/*';
209
+	if (is_dir($dir) && (count(glob("$dir/*")) !== 0)) {
210
+		$return .= "\n".'-- Give Template Overrides'."\n\n";
211 211
 
212
-		foreach ( glob( $dir ) as $file ) {
213
-			$return .= 'Filename:                 ' . basename( $file ) . "\n";
212
+		foreach (glob($dir) as $file) {
213
+			$return .= 'Filename:                 '.basename($file)."\n";
214 214
 		}
215 215
 
216
-		$return = apply_filters( 'give_sysinfo_after_give_templates', $return );
216
+		$return = apply_filters('give_sysinfo_after_give_templates', $return);
217 217
 	}
218 218
 
219 219
 	// Must-use plugins
220 220
 	$muplugins = get_mu_plugins();
221
-	if ( count( $muplugins > 0 ) ) {
222
-		$return .= "\n" . '-- Must-Use Plugins' . "\n\n";
221
+	if (count($muplugins > 0)) {
222
+		$return .= "\n".'-- Must-Use Plugins'."\n\n";
223 223
 
224
-		foreach ( $muplugins as $plugin => $plugin_data ) {
225
-			$return .= $plugin_data['Name'] . ': ' . $plugin_data['Version'] . "\n";
224
+		foreach ($muplugins as $plugin => $plugin_data) {
225
+			$return .= $plugin_data['Name'].': '.$plugin_data['Version']."\n";
226 226
 		}
227 227
 
228
-		$return = apply_filters( 'give_sysinfo_after_wordpress_mu_plugins', $return );
228
+		$return = apply_filters('give_sysinfo_after_wordpress_mu_plugins', $return);
229 229
 	}
230 230
 
231 231
 	// WordPress active plugins
232
-	$return .= "\n" . '-- WordPress Active Plugins' . "\n\n";
232
+	$return .= "\n".'-- WordPress Active Plugins'."\n\n";
233 233
 
234 234
 	$plugins        = get_plugins();
235
-	$active_plugins = get_option( 'active_plugins', array() );
235
+	$active_plugins = get_option('active_plugins', array());
236 236
 
237
-	foreach ( $plugins as $plugin_path => $plugin ) {
238
-		if ( ! in_array( $plugin_path, $active_plugins ) ) {
237
+	foreach ($plugins as $plugin_path => $plugin) {
238
+		if ( ! in_array($plugin_path, $active_plugins)) {
239 239
 			continue;
240 240
 		}
241 241
 
242
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
242
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
243 243
 	}
244 244
 
245
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins', $return );
245
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins', $return);
246 246
 
247 247
 	// WordPress inactive plugins
248
-	$return .= "\n" . '-- WordPress Inactive Plugins' . "\n\n";
248
+	$return .= "\n".'-- WordPress Inactive Plugins'."\n\n";
249 249
 
250
-	foreach ( $plugins as $plugin_path => $plugin ) {
251
-		if ( in_array( $plugin_path, $active_plugins ) ) {
250
+	foreach ($plugins as $plugin_path => $plugin) {
251
+		if (in_array($plugin_path, $active_plugins)) {
252 252
 			continue;
253 253
 		}
254 254
 
255
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
255
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
256 256
 	}
257 257
 
258
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins_inactive', $return );
258
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins_inactive', $return);
259 259
 
260
-	if ( is_multisite() ) {
260
+	if (is_multisite()) {
261 261
 		// WordPress Multisite active plugins
262
-		$return .= "\n" . '-- Network Active Plugins' . "\n\n";
262
+		$return .= "\n".'-- Network Active Plugins'."\n\n";
263 263
 
264 264
 		$plugins        = wp_get_active_network_plugins();
265
-		$active_plugins = get_site_option( 'active_sitewide_plugins', array() );
265
+		$active_plugins = get_site_option('active_sitewide_plugins', array());
266 266
 
267
-		foreach ( $plugins as $plugin_path ) {
268
-			$plugin_base = plugin_basename( $plugin_path );
267
+		foreach ($plugins as $plugin_path) {
268
+			$plugin_base = plugin_basename($plugin_path);
269 269
 
270
-			if ( ! array_key_exists( $plugin_base, $active_plugins ) ) {
270
+			if ( ! array_key_exists($plugin_base, $active_plugins)) {
271 271
 				continue;
272 272
 			}
273 273
 
274
-			$plugin = get_plugin_data( $plugin_path );
275
-			$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
274
+			$plugin = get_plugin_data($plugin_path);
275
+			$return .= $plugin['Name'].': '.$plugin['Version']."\n";
276 276
 		}
277 277
 
278
-		$return = apply_filters( 'give_sysinfo_after_wordpress_ms_plugins', $return );
278
+		$return = apply_filters('give_sysinfo_after_wordpress_ms_plugins', $return);
279 279
 	}
280 280
 
281 281
 	// Server configuration (really just versioning)
282
-	$return .= "\n" . '-- Webserver Configuration' . "\n\n";
283
-	$return .= 'PHP Version:              ' . PHP_VERSION . "\n";
284
-	$return .= 'MySQL Version:            ' . $wpdb->db_version() . "\n";
285
-	$return .= 'Webserver Info:           ' . $_SERVER['SERVER_SOFTWARE'] . "\n";
282
+	$return .= "\n".'-- Webserver Configuration'."\n\n";
283
+	$return .= 'PHP Version:              '.PHP_VERSION."\n";
284
+	$return .= 'MySQL Version:            '.$wpdb->db_version()."\n";
285
+	$return .= 'Webserver Info:           '.$_SERVER['SERVER_SOFTWARE']."\n";
286 286
 
287
-	$return = apply_filters( 'give_sysinfo_after_webserver_config', $return );
287
+	$return = apply_filters('give_sysinfo_after_webserver_config', $return);
288 288
 
289 289
 	// PHP configs... now we're getting to the important stuff
290
-	$return .= "\n" . '-- PHP Configuration' . "\n\n";
291
-	$return .= 'Safe Mode:                ' . ( ini_get( 'safe_mode' ) ? 'Enabled' : 'Disabled' . "\n" );
292
-	$return .= 'Memory Limit:             ' . ini_get( 'memory_limit' ) . "\n";
293
-	$return .= 'Upload Max Size:          ' . ini_get( 'upload_max_filesize' ) . "\n";
294
-	$return .= 'Post Max Size:            ' . ini_get( 'post_max_size' ) . "\n";
295
-	$return .= 'Upload Max Filesize:      ' . ini_get( 'upload_max_filesize' ) . "\n";
296
-	$return .= 'Time Limit:               ' . ini_get( 'max_execution_time' ) . "\n";
297
-	$return .= 'Max Input Vars:           ' . ini_get( 'max_input_vars' ) . "\n";
298
-	$return .= 'URL-aware fopen:          ' . ( ini_get( 'allow_url_fopen' ) ? 'On (' . ini_get( 'allow_url_fopen' ) . ')' : 'N/A' ) . "\n";
299
-	$return .= 'Display Errors:           ' . ( ini_get( 'display_errors' ) ? 'On (' . ini_get( 'display_errors' ) . ')' : 'N/A' ) . "\n";
300
-
301
-	$return = apply_filters( 'give_sysinfo_after_php_config', $return );
290
+	$return .= "\n".'-- PHP Configuration'."\n\n";
291
+	$return .= 'Safe Mode:                '.(ini_get('safe_mode') ? 'Enabled' : 'Disabled'."\n");
292
+	$return .= 'Memory Limit:             '.ini_get('memory_limit')."\n";
293
+	$return .= 'Upload Max Size:          '.ini_get('upload_max_filesize')."\n";
294
+	$return .= 'Post Max Size:            '.ini_get('post_max_size')."\n";
295
+	$return .= 'Upload Max Filesize:      '.ini_get('upload_max_filesize')."\n";
296
+	$return .= 'Time Limit:               '.ini_get('max_execution_time')."\n";
297
+	$return .= 'Max Input Vars:           '.ini_get('max_input_vars')."\n";
298
+	$return .= 'URL-aware fopen:          '.(ini_get('allow_url_fopen') ? 'On ('.ini_get('allow_url_fopen').')' : 'N/A')."\n";
299
+	$return .= 'Display Errors:           '.(ini_get('display_errors') ? 'On ('.ini_get('display_errors').')' : 'N/A')."\n";
300
+
301
+	$return = apply_filters('give_sysinfo_after_php_config', $return);
302 302
 
303 303
 	// PHP extensions and such
304
-	$return .= "\n" . '-- PHP Extensions' . "\n\n";
305
-	$return .= 'cURL:                     ' . ( function_exists( 'curl_init' ) ? 'Supported' : 'Not Supported' ) . "\n";
304
+	$return .= "\n".'-- PHP Extensions'."\n\n";
305
+	$return .= 'cURL:                     '.(function_exists('curl_init') ? 'Supported' : 'Not Supported')."\n";
306 306
 
307 307
 	//cURL version
308
-	if ( function_exists( 'curl_init' ) && function_exists( 'curl_version' ) ) {
308
+	if (function_exists('curl_init') && function_exists('curl_version')) {
309 309
 		$curl_values = curl_version();
310
-		$return .= 'cURL Version:             ' . $curl_values["version"] . "\n";
310
+		$return .= 'cURL Version:             '.$curl_values["version"]."\n";
311 311
 	}
312
-	$return .= 'zlib:                     ' . ( function_exists( 'gzcompress' ) ? 'Supported' : 'Not Supported' ) . "\n";
313
-	$return .= 'GD:                       ' . ( ( extension_loaded( 'gd' ) && function_exists( 'gd_info' ) ) ? 'Supported' : 'Not Supported' ) . "\n";
314
-	$return .= 'fsockopen:                ' . ( function_exists( 'fsockopen' ) ? 'Supported' : 'Not Supported' ) . "\n";
315
-	$return .= 'SOAP Client:              ' . ( class_exists( 'SoapClient' ) ? 'Installed' : 'Not Installed' ) . "\n";
316
-	$return .= 'Suhosin:                  ' . ( extension_loaded( 'suhosin' ) ? 'Installed' : 'Not Installed' ) . "\n";
317
-	$return .= 'DOM:                      ' . ( extension_loaded( 'dom' ) ? 'Installed' : 'Not Installed' ) . "\n";
318
-	$return .= 'MBString:                 ' . ( extension_loaded( 'mbstring' ) ? 'Installed' : 'Not Installed' ) . "\n";
312
+	$return .= 'zlib:                     '.(function_exists('gzcompress') ? 'Supported' : 'Not Supported')."\n";
313
+	$return .= 'GD:                       '.((extension_loaded('gd') && function_exists('gd_info')) ? 'Supported' : 'Not Supported')."\n";
314
+	$return .= 'fsockopen:                '.(function_exists('fsockopen') ? 'Supported' : 'Not Supported')."\n";
315
+	$return .= 'SOAP Client:              '.(class_exists('SoapClient') ? 'Installed' : 'Not Installed')."\n";
316
+	$return .= 'Suhosin:                  '.(extension_loaded('suhosin') ? 'Installed' : 'Not Installed')."\n";
317
+	$return .= 'DOM:                      '.(extension_loaded('dom') ? 'Installed' : 'Not Installed')."\n";
318
+	$return .= 'MBString:                 '.(extension_loaded('mbstring') ? 'Installed' : 'Not Installed')."\n";
319 319
 
320
-	$return = apply_filters( 'give_sysinfo_after_php_ext', $return );
320
+	$return = apply_filters('give_sysinfo_after_php_ext', $return);
321 321
 
322 322
 	// Session stuff
323
-	$return .= "\n" . '-- Session Configuration' . "\n\n";
324
-	$return .= 'Give Use Sessions:        ' . ( defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ? 'Enforced' : ( Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled' ) ) . "\n";
325
-	$return .= 'Session:                  ' . ( isset( $_SESSION ) ? 'Enabled' : 'Disabled' ) . "\n";
323
+	$return .= "\n".'-- Session Configuration'."\n\n";
324
+	$return .= 'Give Use Sessions:        '.(defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS ? 'Enforced' : (Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled'))."\n";
325
+	$return .= 'Session:                  '.(isset($_SESSION) ? 'Enabled' : 'Disabled')."\n";
326 326
 
327 327
 	// The rest of this is only relevant is session is enabled
328
-	if ( isset( $_SESSION ) ) {
329
-		$return .= 'Session Name:             ' . esc_html( ini_get( 'session.name' ) ) . "\n";
330
-		$return .= 'Cookie Path:              ' . esc_html( ini_get( 'session.cookie_path' ) ) . "\n";
331
-		$return .= 'Save Path:                ' . esc_html( ini_get( 'session.save_path' ) ) . "\n";
332
-		$return .= 'Use Cookies:              ' . ( ini_get( 'session.use_cookies' ) ? 'On' : 'Off' ) . "\n";
333
-		$return .= 'Use Only Cookies:         ' . ( ini_get( 'session.use_only_cookies' ) ? 'On' : 'Off' ) . "\n";
328
+	if (isset($_SESSION)) {
329
+		$return .= 'Session Name:             '.esc_html(ini_get('session.name'))."\n";
330
+		$return .= 'Cookie Path:              '.esc_html(ini_get('session.cookie_path'))."\n";
331
+		$return .= 'Save Path:                '.esc_html(ini_get('session.save_path'))."\n";
332
+		$return .= 'Use Cookies:              '.(ini_get('session.use_cookies') ? 'On' : 'Off')."\n";
333
+		$return .= 'Use Only Cookies:         '.(ini_get('session.use_only_cookies') ? 'On' : 'Off')."\n";
334 334
 	}
335 335
 
336
-	$return = apply_filters( 'give_sysinfo_after_session_config', $return );
336
+	$return = apply_filters('give_sysinfo_after_session_config', $return);
337 337
 
338
-	$return .= "\n" . '### End System Info ###';
338
+	$return .= "\n".'### End System Info ###';
339 339
 
340 340
 	return $return;
341 341
 }
@@ -349,17 +349,17 @@  discard block
 block discarded – undo
349 349
  */
350 350
 function give_tools_sysinfo_download() {
351 351
 
352
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
352
+	if ( ! current_user_can('manage_give_settings')) {
353 353
 		return;
354 354
 	}
355 355
 
356 356
 	nocache_headers();
357 357
 
358
-	header( 'Content-Type: text/plain' );
359
-	header( 'Content-Disposition: attachment; filename="give-system-info.txt"' );
358
+	header('Content-Type: text/plain');
359
+	header('Content-Disposition: attachment; filename="give-system-info.txt"');
360 360
 
361
-	echo wp_strip_all_tags( $_POST['give-sysinfo'] );
361
+	echo wp_strip_all_tags($_POST['give-sysinfo']);
362 362
 	give_die();
363 363
 }
364 364
 
365
-add_action( 'give_download_sysinfo', 'give_tools_sysinfo_download' );
366 365
\ No newline at end of file
366
+add_action('give_download_sysinfo', 'give_tools_sysinfo_download');
367 367
\ No newline at end of file
Please login to merge, or discard this patch.
includes/class-give-email-access.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * @since       1.4
11 11
  */
12 12
 
13
-defined( 'ABSPATH' ) or exit;
13
+defined('ABSPATH') or exit;
14 14
 
15 15
 /**
16 16
  * Class Give_Email_Access
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	function __construct() {
31 31
 
32 32
 		// get it started
33
-		add_action( 'init', array( $this, 'init' ) );
33
+		add_action('init', array($this, 'init'));
34 34
 	}
35 35
 
36 36
 
@@ -39,30 +39,30 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	function init() {
41 41
 
42
-		$is_enabled = give_get_option( 'email_access' );
42
+		$is_enabled = give_get_option('email_access');
43 43
 
44 44
 		//Non-logged in users only
45
-		if ( is_user_logged_in() || $is_enabled !== 'on' || is_admin() ) {
45
+		if (is_user_logged_in() || $is_enabled !== 'on' || is_admin()) {
46 46
 			return;
47 47
 		}
48 48
 
49 49
 		//Are db columns setup?
50
-		$is_setup = give_get_option( 'email_access_installed' );
51
-		if ( empty( $is_setup ) ) {
50
+		$is_setup = give_get_option('email_access_installed');
51
+		if (empty($is_setup)) {
52 52
 			$this->create_columns();
53 53
 		}
54 54
 
55 55
 		// Timeouts
56
-		$this->verify_throttle  = apply_filters( 'give_nl_verify_throttle', 300 );
57
-		$this->token_expiration = apply_filters( 'give_nl_token_expiration', 7200 );
56
+		$this->verify_throttle  = apply_filters('give_nl_verify_throttle', 300);
57
+		$this->token_expiration = apply_filters('give_nl_token_expiration', 7200);
58 58
 
59 59
 		// Setup login
60 60
 		$this->check_for_token();
61 61
 
62
-		if ( $this->token_exists ) {
63
-			add_filter( 'give_can_view_receipt', '__return_true' );
64
-			add_filter( 'give_user_pending_verification', '__return_false' );
65
-			add_filter( 'give_get_users_purchases_args', array( $this, 'users_purchases_args' ) );
62
+		if ($this->token_exists) {
63
+			add_filter('give_can_view_receipt', '__return_true');
64
+			add_filter('give_user_pending_verification', '__return_false');
65
+			add_filter('give_get_users_purchases_args', array($this, 'users_purchases_args'));
66 66
 		}
67 67
 	}
68 68
 
@@ -73,24 +73,24 @@  discard block
 block discarded – undo
73 73
 	 *
74 74
 	 * @return bool
75 75
 	 */
76
-	function can_send_email( $customer_id ) {
76
+	function can_send_email($customer_id) {
77 77
 		global $wpdb;
78 78
 
79 79
 		// Prevent multiple emails within X minutes
80
-		$throttle = date( 'Y-m-d H:i:s', time() - $this->verify_throttle );
80
+		$throttle = date('Y-m-d H:i:s', time() - $this->verify_throttle);
81 81
 
82 82
 		// Does a user row exist?
83 83
 		$exists = (int) $wpdb->get_var(
84
-			$wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->prefix}give_customers WHERE id = %d", $customer_id )
84
+			$wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}give_customers WHERE id = %d", $customer_id)
85 85
 		);
86 86
 
87
-		if ( 0 < $exists ) {
87
+		if (0 < $exists) {
88 88
 			$row_id = (int) $wpdb->get_var(
89
-				$wpdb->prepare( "SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d AND (verify_throttle < %s OR verify_key = '') LIMIT 1", $customer_id, $throttle )
89
+				$wpdb->prepare("SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d AND (verify_throttle < %s OR verify_key = '') LIMIT 1", $customer_id, $throttle)
90 90
 			);
91 91
 
92
-			if ( $row_id < 1 ) {
93
-				give_set_error( 'give_email_access_attempts_exhausted', __( 'Please wait a few minutes before requesting a new email access link.', 'give' ) );
92
+			if ($row_id < 1) {
93
+				give_set_error('give_email_access_attempts_exhausted', __('Please wait a few minutes before requesting a new email access link.', 'give'));
94 94
 
95 95
 				return false;
96 96
 			}
@@ -106,38 +106,38 @@  discard block
 block discarded – undo
106 106
 	 * @param $customer_id
107 107
 	 * @param $email
108 108
 	 */
109
-	function send_email( $customer_id, $email ) {
109
+	function send_email($customer_id, $email) {
110 110
 
111
-		$verify_key = wp_generate_password( 20, false );
111
+		$verify_key = wp_generate_password(20, false);
112 112
 
113 113
 		// Generate a new verify key
114
-		$this->set_verify_key( $customer_id, $email, $verify_key );
114
+		$this->set_verify_key($customer_id, $email, $verify_key);
115 115
 
116 116
 		// Get the purchase history URL
117
-		$page_id = give_get_option( 'history_page' );
117
+		$page_id = give_get_option('history_page');
118 118
 
119
-		$access_url = add_query_arg( array(
119
+		$access_url = add_query_arg(array(
120 120
 			'give_nl' => $verify_key,
121
-		), get_permalink( $page_id ) );
121
+		), get_permalink($page_id));
122 122
 
123 123
 		//Nice subject and message
124
-		$subject = apply_filters( 'give_email_access_token_subject', sprintf( __( 'Your Access Link to %1$s', 'give' ), get_bloginfo( 'name' ) ) );
124
+		$subject = apply_filters('give_email_access_token_subject', sprintf(__('Your Access Link to %1$s', 'give'), get_bloginfo('name')));
125 125
 
126
-		$message = __( 'You or someone in your organization requested an access link be sent to this email address. This is a temporary access link for you to view your donation information. Click on the link below to view:', 'give' ) . "\n\n";
126
+		$message = __('You or someone in your organization requested an access link be sent to this email address. This is a temporary access link for you to view your donation information. Click on the link below to view:', 'give')."\n\n";
127 127
 
128
-		$message .= '<a href="' . esc_url( $access_url ) . '" target="_blank">' . __( 'Access My Donation Details', 'give' ) . ' &raquo;</a>';
128
+		$message .= '<a href="'.esc_url($access_url).'" target="_blank">'.__('Access My Donation Details', 'give').' &raquo;</a>';
129 129
 
130 130
 		$message .= "\n\n";
131 131
 		$message .= "\n\n";
132
-		$message .= __( 'Sincerely,', 'give' );
133
-		$message .= "\n" . get_bloginfo( 'name' ) . "\n";
132
+		$message .= __('Sincerely,', 'give');
133
+		$message .= "\n".get_bloginfo('name')."\n";
134 134
 
135
-		$message = apply_filters( 'give_email_access_token_message', $message );
135
+		$message = apply_filters('give_email_access_token_message', $message);
136 136
 
137 137
 
138 138
 		// Send the email
139
-		Give()->emails->__set( 'heading', apply_filters( 'give_email_access_token_heading', __( 'Your Access Link', 'give' ) ) );
140
-		Give()->emails->send( $email, $subject, $message );
139
+		Give()->emails->__set('heading', apply_filters('give_email_access_token_heading', __('Your Access Link', 'give')));
140
+		Give()->emails->send($email, $subject, $message);
141 141
 
142 142
 	}
143 143
 
@@ -147,24 +147,24 @@  discard block
 block discarded – undo
147 147
 	 */
148 148
 	function check_for_token() {
149 149
 
150
-		$token = isset( $_GET['give_nl'] ) ? $_GET['give_nl'] : '';
150
+		$token = isset($_GET['give_nl']) ? $_GET['give_nl'] : '';
151 151
 
152 152
 		// Check for cookie
153
-		if ( empty( $token ) ) {
154
-			$token = isset( $_COOKIE['give_nl'] ) ? $_COOKIE['give_nl'] : '';
153
+		if (empty($token)) {
154
+			$token = isset($_COOKIE['give_nl']) ? $_COOKIE['give_nl'] : '';
155 155
 		}
156 156
 
157
-		if ( ! empty( $token ) ) {
158
-			if ( ! $this->is_valid_token( $token ) ) {
159
-				if ( ! $this->is_valid_verify_key( $token ) ) {
157
+		if ( ! empty($token)) {
158
+			if ( ! $this->is_valid_token($token)) {
159
+				if ( ! $this->is_valid_verify_key($token)) {
160 160
 					return;
161 161
 				}
162 162
 			}
163 163
 
164 164
 			$this->token_exists = true;
165 165
 			// Set cookie
166
-			$lifetime = current_time( 'timestamp' ) + Give()->session->set_expiration_time();
167
-			@setcookie( 'give_nl', $token, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false );
166
+			$lifetime = current_time('timestamp') + Give()->session->set_expiration_time();
167
+			@setcookie('give_nl', $token, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
168 168
 		}
169 169
 	}
170 170
 
@@ -175,18 +175,18 @@  discard block
 block discarded – undo
175 175
 	 *
176 176
 	 * @return bool
177 177
 	 */
178
-	function is_valid_token( $token ) {
178
+	function is_valid_token($token) {
179 179
 
180 180
 		global $wpdb;
181 181
 
182 182
 		// Make sure token isn't expired
183
-		$expires = date( 'Y-m-d H:i:s', time() - $this->token_expiration );
183
+		$expires = date('Y-m-d H:i:s', time() - $this->token_expiration);
184 184
 
185 185
 		$email = $wpdb->get_var(
186
-			$wpdb->prepare( "SELECT email FROM {$wpdb->prefix}give_customers WHERE token = %s AND verify_throttle >= %s LIMIT 1", $token, $expires )
186
+			$wpdb->prepare("SELECT email FROM {$wpdb->prefix}give_customers WHERE token = %s AND verify_throttle >= %s LIMIT 1", $token, $expires)
187 187
 		);
188 188
 
189
-		if ( ! empty( $email ) ) {
189
+		if ( ! empty($email)) {
190 190
 			$this->token_email = $email;
191 191
 			$this->token       = $token;
192 192
 
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
 		}
195 195
 
196 196
 		//Set error only if email access form isn't being submitted
197
-		if ( ! isset( $_POST['give_email'] ) && ! isset( $_POST['_wpnonce'] ) ) {
198
-			give_set_error( 'give_email_token_expired', apply_filters( 'give_email_token_expired_message', 'Sorry, your access token has expired. Please request a new one below:', 'give' ) );
197
+		if ( ! isset($_POST['give_email']) && ! isset($_POST['_wpnonce'])) {
198
+			give_set_error('give_email_token_expired', apply_filters('give_email_token_expired_message', 'Sorry, your access token has expired. Please request a new one below:', 'give'));
199 199
 		}
200 200
 
201 201
 
@@ -210,25 +210,25 @@  discard block
 block discarded – undo
210 210
 	 * @param $email
211 211
 	 * @param $verify_key
212 212
 	 */
213
-	function set_verify_key( $customer_id, $email, $verify_key ) {
213
+	function set_verify_key($customer_id, $email, $verify_key) {
214 214
 		global $wpdb;
215 215
 
216
-		$now = date( 'Y-m-d H:i:s' );
216
+		$now = date('Y-m-d H:i:s');
217 217
 
218 218
 		// Insert or update?
219 219
 		$row_id = (int) $wpdb->get_var(
220
-			$wpdb->prepare( "SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d LIMIT 1", $customer_id )
220
+			$wpdb->prepare("SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d LIMIT 1", $customer_id)
221 221
 		);
222 222
 
223 223
 		// Update
224
-		if ( ! empty( $row_id ) ) {
224
+		if ( ! empty($row_id)) {
225 225
 			$wpdb->query(
226
-				$wpdb->prepare( "UPDATE {$wpdb->prefix}give_customers SET verify_key = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $verify_key, $now, $row_id )
226
+				$wpdb->prepare("UPDATE {$wpdb->prefix}give_customers SET verify_key = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $verify_key, $now, $row_id)
227 227
 			);
228 228
 		} // Insert
229 229
 		else {
230 230
 			$wpdb->query(
231
-				$wpdb->prepare( "INSERT INTO {$wpdb->prefix}give_customers ( verify_key, verify_throttle) VALUES (%s, %s)", $verify_key, $now )
231
+				$wpdb->prepare("INSERT INTO {$wpdb->prefix}give_customers ( verify_key, verify_throttle) VALUES (%s, %s)", $verify_key, $now)
232 232
 			);
233 233
 		}
234 234
 	}
@@ -240,20 +240,20 @@  discard block
 block discarded – undo
240 240
 	 *
241 241
 	 * @return bool
242 242
 	 */
243
-	function is_valid_verify_key( $token ) {
243
+	function is_valid_verify_key($token) {
244 244
 		global $wpdb;
245 245
 
246 246
 		// See if the verify_key exists
247 247
 		$row = $wpdb->get_row(
248
-			$wpdb->prepare( "SELECT id, email FROM {$wpdb->prefix}give_customers WHERE verify_key = %s LIMIT 1", $token )
248
+			$wpdb->prepare("SELECT id, email FROM {$wpdb->prefix}give_customers WHERE verify_key = %s LIMIT 1", $token)
249 249
 		);
250 250
 
251
-		$now = date( 'Y-m-d H:i:s' );
251
+		$now = date('Y-m-d H:i:s');
252 252
 
253 253
 		// Set token
254
-		if ( ! empty( $row ) ) {
254
+		if ( ! empty($row)) {
255 255
 			$wpdb->query(
256
-				$wpdb->prepare( "UPDATE {$wpdb->prefix}give_customers SET verify_key = '', token = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $token, $now, $row->id )
256
+				$wpdb->prepare("UPDATE {$wpdb->prefix}give_customers SET verify_key = '', token = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $token, $now, $row->id)
257 257
 			);
258 258
 
259 259
 			$this->token_email = $row->email;
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 	 *
273 273
 	 * @return mixed
274 274
 	 */
275
-	function users_purchases_args( $args ) {
275
+	function users_purchases_args($args) {
276 276
 		$args['user'] = $this->token_email;
277 277
 
278 278
 		return $args;
@@ -289,11 +289,11 @@  discard block
 block discarded – undo
289 289
 		global $wpdb;
290 290
 
291 291
 		//Create columns in customers table
292
-		$query = $wpdb->query( "ALTER TABLE {$wpdb->prefix}give_customers ADD `token` VARCHAR(255) CHARACTER SET utf8 NOT NULL, ADD `verify_key` VARCHAR(255) CHARACTER SET utf8 NOT NULL AFTER `token`, ADD `verify_throttle` DATETIME NOT NULL AFTER `verify_key`" );
292
+		$query = $wpdb->query("ALTER TABLE {$wpdb->prefix}give_customers ADD `token` VARCHAR(255) CHARACTER SET utf8 NOT NULL, ADD `verify_key` VARCHAR(255) CHARACTER SET utf8 NOT NULL AFTER `token`, ADD `verify_throttle` DATETIME NOT NULL AFTER `verify_key`");
293 293
 
294 294
 		//Columns added properly
295
-		if ( $query ) {
296
-			give_update_option( 'email_access_installed', 1 );
295
+		if ($query) {
296
+			give_update_option('email_access_installed', 1);
297 297
 		}
298 298
 
299 299
 	}
Please login to merge, or discard this patch.
includes/admin/reporting/class-gateway-error-logs-list-table.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -9,13 +9,13 @@  discard block
 block discarded – undo
9 9
  */
10 10
 
11 11
 // Exit if accessed directly
12
-if ( ! defined( 'ABSPATH' ) ) {
12
+if ( ! defined('ABSPATH')) {
13 13
 	exit;
14 14
 }
15 15
 
16 16
 // Load WP_List_Table if not loaded
17
-if ( ! class_exists( 'WP_List_Table' ) ) {
18
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
17
+if ( ! class_exists('WP_List_Table')) {
18
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
19 19
 }
20 20
 
21 21
 /**
@@ -45,11 +45,11 @@  discard block
 block discarded – undo
45 45
 		global $status, $page;
46 46
 
47 47
 		// Set parent defaults
48
-		parent::__construct( array(
49
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
50
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
48
+		parent::__construct(array(
49
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
50
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
51 51
 			'ajax'     => false                        // Does this table support ajax?
52
-		) );
52
+		));
53 53
 	}
54 54
 
55 55
 	/**
@@ -63,14 +63,14 @@  discard block
 block discarded – undo
63 63
 	 *
64 64
 	 * @return string Column Name
65 65
 	 */
66
-	public function column_default( $item, $column_name ) {
67
-		switch ( $column_name ) {
66
+	public function column_default($item, $column_name) {
67
+		switch ($column_name) {
68 68
 			case 'ID' :
69 69
 				return $item['ID_label'];
70 70
 			case 'error' :
71
-				return get_the_title( $item['ID'] ) ? get_the_title( $item['ID'] ) : __( 'Payment Error', 'give' );
71
+				return get_the_title($item['ID']) ? get_the_title($item['ID']) : __('Payment Error', 'give');
72 72
 			default:
73
-				return $item[ $column_name ];
73
+				return $item[$column_name];
74 74
 		}
75 75
 	}
76 76
 
@@ -84,29 +84,29 @@  discard block
 block discarded – undo
84 84
 	 *
85 85
 	 * @return void
86 86
 	 */
87
-	public function column_message( $item ) {
87
+	public function column_message($item) {
88 88
 
89 89
 		?>
90
-		<a href="#TB_inline?width=640&amp;inlineId=log-message-<?php echo $item['ID']; ?>" class="thickbox" title="<?php _e( 'View Log Message', 'give' ); ?> "><?php _e( 'View Log Message', 'give' ); ?></a>
90
+		<a href="#TB_inline?width=640&amp;inlineId=log-message-<?php echo $item['ID']; ?>" class="thickbox" title="<?php _e('View Log Message', 'give'); ?> "><?php _e('View Log Message', 'give'); ?></a>
91 91
 		<div id="log-message-<?php echo $item['ID']; ?>" style="display:none;">
92 92
 			<?php
93 93
 
94
-			$log_message = get_post_field( 'post_content', $item['ID'] );
94
+			$log_message = get_post_field('post_content', $item['ID']);
95 95
 
96
-			$serialized  = strpos( $log_message, '{"' );
96
+			$serialized  = strpos($log_message, '{"');
97 97
 
98 98
 			// Check to see if the log message contains serialized information
99
-			if ( $serialized !== false ) {
100
-				$length = strlen( $log_message ) - $serialized;
101
-				$intro  = substr( $log_message, 0, - $length );
102
-				$data   = substr( $log_message, $serialized, strlen( $log_message ) - 1 );
99
+			if ($serialized !== false) {
100
+				$length = strlen($log_message) - $serialized;
101
+				$intro  = substr($log_message, 0, - $length);
102
+				$data   = substr($log_message, $serialized, strlen($log_message) - 1);
103 103
 
104
-				echo wpautop( $intro );
105
-				echo wpautop( __( '<strong>Log data:</strong>', 'give' ) );
106
-				echo '<div style="word-wrap: break-word;">' . wpautop( $data ) . '</div>';
104
+				echo wpautop($intro);
105
+				echo wpautop(__('<strong>Log data:</strong>', 'give'));
106
+				echo '<div style="word-wrap: break-word;">'.wpautop($data).'</div>';
107 107
 			} else {
108 108
 				// No serialized data found
109
-				echo wpautop( $log_message );
109
+				echo wpautop($log_message);
110 110
 			}
111 111
 			?>
112 112
 		</div>
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
 	 */
123 123
 	public function get_columns() {
124 124
 		$columns = array(
125
-			'ID'         => __( 'Log ID', 'give' ),
126
-			'payment_id' => __( 'Payment ID', 'give' ),
127
-			'error'      => __( 'Error', 'give' ),
128
-			'message'    => __( 'Error Message', 'give' ),
129
-			'gateway'    => __( 'Gateway', 'give' ),
130
-			'date'       => __( 'Date', 'give' )
125
+			'ID'         => __('Log ID', 'give'),
126
+			'payment_id' => __('Payment ID', 'give'),
127
+			'error'      => __('Error', 'give'),
128
+			'message'    => __('Error Message', 'give'),
129
+			'gateway'    => __('Gateway', 'give'),
130
+			'date'       => __('Date', 'give')
131 131
 		);
132 132
 
133 133
 		return $columns;
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * @return int Current page number
142 142
 	 */
143 143
 	public function get_paged() {
144
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
144
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
145 145
 	}
146 146
 
147 147
 	/**
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	 * @since  1.0
152 152
 	 * @return void
153 153
 	 */
154
-	public function bulk_actions( $which = '' ) {
154
+	public function bulk_actions($which = '') {
155 155
 		give_log_views();
156 156
 	}
157 157
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 		global $give_logs;
168 168
 
169 169
 		// Prevent the queries from getting cached. Without this there are occasional memory issues for some installs
170
-		wp_suspend_cache_addition( true );
170
+		wp_suspend_cache_addition(true);
171 171
 
172 172
 		$logs_data = array();
173 173
 		$paged     = $this->get_paged();
@@ -176,17 +176,17 @@  discard block
 block discarded – undo
176 176
 			'paged'    => $paged
177 177
 		);
178 178
 
179
-		$logs = $give_logs->get_connected_logs( $log_query );
179
+		$logs = $give_logs->get_connected_logs($log_query);
180 180
 
181
-		if ( $logs ) {
182
-			foreach ( $logs as $log ) {
181
+		if ($logs) {
182
+			foreach ($logs as $log) {
183 183
 
184 184
 				$logs_data[] = array(
185 185
 					'ID'         => $log->ID,
186
-					'ID_label'   => '<span class=\'give-item-label give-item-label-gray\'>' . $log->ID . '</span>',
186
+					'ID_label'   => '<span class=\'give-item-label give-item-label-gray\'>'.$log->ID.'</span>',
187 187
 					'payment_id' => $log->post_parent,
188 188
 					'error'      => 'error',
189
-					'gateway'    => give_get_payment_gateway( $log->post_parent ),
189
+					'gateway'    => give_get_payment_gateway($log->post_parent),
190 190
 					'date'       => $log->post_date
191 191
 				);
192 192
 			}
@@ -207,19 +207,19 @@  discard block
 block discarded – undo
207 207
 	 *
208 208
 	 * @param string $which
209 209
 	 */
210
-	protected function display_tablenav( $which ) {
211
-		if ( 'top' === $which ) {
212
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
210
+	protected function display_tablenav($which) {
211
+		if ('top' === $which) {
212
+			wp_nonce_field('bulk-'.$this->_args['plural']);
213 213
 		}
214 214
 		?>
215
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
215
+		<div class="tablenav <?php echo esc_attr($which); ?>">
216 216
 
217 217
 			<div class="alignleft actions bulkactions">
218
-				<?php $this->bulk_actions( $which ); ?>
218
+				<?php $this->bulk_actions($which); ?>
219 219
 			</div>
220 220
 			<?php
221
-			$this->extra_tablenav( $which );
222
-			$this->pagination( $which );
221
+			$this->extra_tablenav($which);
222
+			$this->pagination($which);
223 223
 			?>
224 224
 
225 225
 			<br class="clear"/>
@@ -246,15 +246,15 @@  discard block
 block discarded – undo
246 246
 		$columns               = $this->get_columns();
247 247
 		$hidden                = array(); // No hidden columns
248 248
 		$sortable              = $this->get_sortable_columns();
249
-		$this->_column_headers = array( $columns, $hidden, $sortable );
249
+		$this->_column_headers = array($columns, $hidden, $sortable);
250 250
 		$current_page          = $this->get_pagenum();
251 251
 		$this->items           = $this->get_logs();
252
-		$total_items           = $give_logs->get_log_count( 0, 'gateway_error' );
252
+		$total_items           = $give_logs->get_log_count(0, 'gateway_error');
253 253
 
254
-		$this->set_pagination_args( array(
254
+		$this->set_pagination_args(array(
255 255
 				'total_items' => $total_items,
256 256
 				'per_page'    => $this->per_page,
257
-				'total_pages' => ceil( $total_items / $this->per_page )
257
+				'total_pages' => ceil($total_items / $this->per_page)
258 258
 			)
259 259
 		);
260 260
 	}
Please login to merge, or discard this patch.