Completed
Pull Request — master (#627)
by Devin
04:26
created
includes/admin/upgrades/upgrades.php 2 patches
Spacing   +17 added lines, -17 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,12 +21,12 @@  discard block
 block discarded – undo
21 21
  * @return void
22 22
  */
23 23
 function give_upgrades_screen() {
24
-	$action = isset( $_GET['give-upgrade'] ) ? sanitize_text_field( $_GET['give-upgrade'] ) : '';
25
-	$step   = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
26
-	$total  = isset( $_GET['total'] ) ? absint( $_GET['total'] ) : false;
27
-	$custom = isset( $_GET['custom'] ) ? absint( $_GET['custom'] ) : 0;
28
-	$number = isset( $_GET['number'] ) ? absint( $_GET['number'] ) : 100;
29
-	$steps  = round( ( $total / $number ), 0 );
24
+	$action = isset($_GET['give-upgrade']) ? sanitize_text_field($_GET['give-upgrade']) : '';
25
+	$step   = isset($_GET['step']) ? absint($_GET['step']) : 1;
26
+	$total  = isset($_GET['total']) ? absint($_GET['total']) : false;
27
+	$custom = isset($_GET['custom']) ? absint($_GET['custom']) : 0;
28
+	$number = isset($_GET['number']) ? absint($_GET['number']) : 100;
29
+	$steps  = round(($total / $number), 0);
30 30
 
31 31
 	$doing_upgrade_args = array(
32 32
 		'page'         => 'give-upgrades',
@@ -36,25 +36,25 @@  discard block
 block discarded – undo
36 36
 		'custom'       => $custom,
37 37
 		'steps'        => $steps
38 38
 	);
39
-	update_option( 'give_doing_upgrade', $doing_upgrade_args );
40
-	if ( $step > $steps ) {
39
+	update_option('give_doing_upgrade', $doing_upgrade_args);
40
+	if ($step > $steps) {
41 41
 		// Prevent a weird case where the estimate was off. Usually only a couple.
42 42
 		$steps = $step;
43 43
 	}
44 44
 	?>
45 45
 	<div class="wrap">
46
-		<h2><?php _e( 'Give - Upgrades', 'give' ); ?></h2>
46
+		<h2><?php _e('Give - Upgrades', 'give'); ?></h2>
47 47
 
48
-		<?php if ( ! empty( $action ) ) : ?>
48
+		<?php if ( ! empty($action)) : ?>
49 49
 
50 50
 			<div id="give-upgrade-status">
51
-				<p style="font-size: 20px;max-width: 900px;"><?php _e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
52
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
51
+				<p style="font-size: 20px;max-width: 900px;"><?php _e('The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give'); ?>
52
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
53 53
 				</p>
54 54
 
55
-				<?php if ( ! empty( $total ) ) : ?>
55
+				<?php if ( ! empty($total)) : ?>
56 56
 					<p>
57
-						<strong><?php printf( __( 'Step %d of approximately %d running', 'give' ), $step, $steps ); ?></strong>
57
+						<strong><?php printf(__('Step %d of approximately %d running', 'give'), $step, $steps); ?></strong>
58 58
 					</p>
59 59
 				<?php endif; ?>
60 60
 			</div>
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 
69 69
 			<div id="give-upgrade-status">
70 70
 				<p style="font-size: 20px;max-width: 900px;">
71
-					<?php _e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
72
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
71
+					<?php _e('The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give'); ?>
72
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
73 73
 				</p>
74 74
 			</div>
75 75
 			<script type="text/javascript">
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,11 +64,14 @@
 block discarded – undo
64 64
 				}, 250 );
65 65
 			</script>
66 66
 
67
-		<?php else : ?>
67
+		<?php else {
68
+	: ?>
68 69
 
69 70
 			<div id="give-upgrade-status">
70 71
 				<p style="font-size: 20px;max-width: 900px;">
71
-					<?php _e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
72
+					<?php _e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' );
73
+}
74
+?>
72 75
 					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
73 76
 				</p>
74 77
 			</div>
Please login to merge, or discard this patch.
includes/api/class-give-api-v1.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
  */
11 11
 
12 12
 // Exit if accessed directly
13
-if ( ! defined( 'ABSPATH' ) ) exit;
13
+if ( ! defined('ABSPATH')) exit;
14 14
 
15 15
 /**
16 16
  * Give_API_V1 Class
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,9 @@
 block discarded – undo
10 10
  */
11 11
 
12 12
 // Exit if accessed directly
13
-if ( ! defined( 'ABSPATH' ) ) exit;
13
+if ( ! defined( 'ABSPATH' ) ) {
14
+	exit;
15
+}
14 16
 
15 17
 /**
16 18
  * Give_API_V1 Class
Please login to merge, or discard this patch.
includes/class-give-customer.php 1 patch
Spacing   +126 added lines, -126 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
 
@@ -96,29 +96,29 @@  discard block
 block discarded – undo
96 96
 	 *
97 97
 	 * @since 1.0
98 98
 	 */
99
-	public function __construct( $_id_or_email = false, $by_user_id = false ) {
99
+	public function __construct($_id_or_email = false, $by_user_id = false) {
100 100
 
101 101
 		$this->db = new Give_DB_Customers;
102 102
 
103
-		if ( false === $_id_or_email || ( is_numeric( $_id_or_email ) && (int) $_id_or_email !== absint( $_id_or_email ) ) ) {
103
+		if (false === $_id_or_email || (is_numeric($_id_or_email) && (int) $_id_or_email !== absint($_id_or_email))) {
104 104
 			return false;
105 105
 		}
106 106
 
107
-		$by_user_id = is_bool( $by_user_id ) ? $by_user_id : false;
107
+		$by_user_id = is_bool($by_user_id) ? $by_user_id : false;
108 108
 
109
-		if ( is_numeric( $_id_or_email ) ) {
109
+		if (is_numeric($_id_or_email)) {
110 110
 			$field = $by_user_id ? 'user_id' : 'id';
111 111
 		} else {
112 112
 			$field = 'email';
113 113
 		}
114 114
 
115
-		$customer = $this->db->get_customer_by( $field, $_id_or_email );
115
+		$customer = $this->db->get_customer_by($field, $_id_or_email);
116 116
 
117
-		if ( empty( $customer ) || ! is_object( $customer ) ) {
117
+		if (empty($customer) || ! is_object($customer)) {
118 118
 			return false;
119 119
 		}
120 120
 
121
-		$this->setup_customer( $customer );
121
+		$this->setup_customer($customer);
122 122
 
123 123
 	}
124 124
 
@@ -131,15 +131,15 @@  discard block
 block discarded – undo
131 131
 	 *
132 132
 	 * @return bool             If the setup was successful or not
133 133
 	 */
134
-	private function setup_customer( $customer ) {
134
+	private function setup_customer($customer) {
135 135
 
136
-		if ( ! is_object( $customer ) ) {
136
+		if ( ! is_object($customer)) {
137 137
 			return false;
138 138
 		}
139 139
 
140
-		foreach ( $customer as $key => $value ) {
140
+		foreach ($customer as $key => $value) {
141 141
 
142
-			switch ( $key ) {
142
+			switch ($key) {
143 143
 
144 144
 				case 'notes':
145 145
 					$this->$key = $this->get_notes();
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 		}
155 155
 
156 156
 		// Customer ID and email are the only things that are necessary, make sure they exist
157
-		if ( ! empty( $this->id ) && ! empty( $this->email ) ) {
157
+		if ( ! empty($this->id) && ! empty($this->email)) {
158 158
 			return true;
159 159
 		}
160 160
 
@@ -167,15 +167,15 @@  discard block
 block discarded – undo
167 167
 	 *
168 168
 	 * @since 1.0
169 169
 	 */
170
-	public function __get( $key ) {
170
+	public function __get($key) {
171 171
 
172
-		if ( method_exists( $this, 'get_' . $key ) ) {
172
+		if (method_exists($this, 'get_'.$key)) {
173 173
 
174
-			return call_user_func( array( $this, 'get_' . $key ) );
174
+			return call_user_func(array($this, 'get_'.$key));
175 175
 
176 176
 		} else {
177 177
 
178
-			return new WP_Error( 'give-customer-invalid-property', sprintf( __( 'Can\'t get property %s', 'give' ), $key ) );
178
+			return new WP_Error('give-customer-invalid-property', sprintf(__('Can\'t get property %s', 'give'), $key));
179 179
 
180 180
 		}
181 181
 
@@ -190,9 +190,9 @@  discard block
 block discarded – undo
190 190
 	 *
191 191
 	 * @return mixed        False if not a valid creation, Customer ID if user is found or valid creation
192 192
 	 */
193
-	public function create( $data = array() ) {
193
+	public function create($data = array()) {
194 194
 
195
-		if ( $this->id != 0 || empty( $data ) ) {
195
+		if ($this->id != 0 || empty($data)) {
196 196
 			return false;
197 197
 		}
198 198
 
@@ -200,34 +200,34 @@  discard block
 block discarded – undo
200 200
 			'payment_ids' => ''
201 201
 		);
202 202
 
203
-		$args = wp_parse_args( $data, $defaults );
204
-		$args = $this->sanitize_columns( $args );
203
+		$args = wp_parse_args($data, $defaults);
204
+		$args = $this->sanitize_columns($args);
205 205
 
206
-		if ( empty( $args['email'] ) || ! is_email( $args['email'] ) ) {
206
+		if (empty($args['email']) || ! is_email($args['email'])) {
207 207
 			return false;
208 208
 		}
209 209
 
210
-		if ( ! empty( $args['payment_ids'] ) && is_array( $args['payment_ids'] ) ) {
211
-			$args['payment_ids'] = implode( ',', array_unique( array_values( $args['payment_ids'] ) ) );
210
+		if ( ! empty($args['payment_ids']) && is_array($args['payment_ids'])) {
211
+			$args['payment_ids'] = implode(',', array_unique(array_values($args['payment_ids'])));
212 212
 		}
213 213
 
214
-		do_action( 'give_customer_pre_create', $args );
214
+		do_action('give_customer_pre_create', $args);
215 215
 
216 216
 		$created = false;
217 217
 
218 218
 		// The DB class 'add' implies an update if the customer being asked to be created already exists
219
-		if ( $this->db->add( $data ) ) {
219
+		if ($this->db->add($data)) {
220 220
 
221 221
 			// We've successfully added/updated the customer, reset the class vars with the new data
222
-			$customer = $this->db->get_customer_by( 'email', $args['email'] );
222
+			$customer = $this->db->get_customer_by('email', $args['email']);
223 223
 
224 224
 			// Setup the customer data with the values from DB
225
-			$this->setup_customer( $customer );
225
+			$this->setup_customer($customer);
226 226
 
227 227
 			$created = $this->id;
228 228
 		}
229 229
 
230
-		do_action( 'give_customer_post_create', $created, $args );
230
+		do_action('give_customer_post_create', $created, $args);
231 231
 
232 232
 		return $created;
233 233
 
@@ -242,27 +242,27 @@  discard block
 block discarded – undo
242 242
 	 *
243 243
 	 * @return bool         If the update was successful or not
244 244
 	 */
245
-	public function update( $data = array() ) {
245
+	public function update($data = array()) {
246 246
 
247
-		if ( empty( $data ) ) {
247
+		if (empty($data)) {
248 248
 			return false;
249 249
 		}
250 250
 
251
-		$data = $this->sanitize_columns( $data );
251
+		$data = $this->sanitize_columns($data);
252 252
 
253
-		do_action( 'give_customer_pre_update', $this->id, $data );
253
+		do_action('give_customer_pre_update', $this->id, $data);
254 254
 
255 255
 		$updated = false;
256 256
 
257
-		if ( $this->db->update( $this->id, $data ) ) {
257
+		if ($this->db->update($this->id, $data)) {
258 258
 
259
-			$customer = $this->db->get_customer_by( 'id', $this->id );
260
-			$this->setup_customer( $customer );
259
+			$customer = $this->db->get_customer_by('id', $this->id);
260
+			$this->setup_customer($customer);
261 261
 
262 262
 			$updated = true;
263 263
 		}
264 264
 
265
-		do_action( 'give_customer_post_update', $updated, $this->id, $data );
265
+		do_action('give_customer_post_update', $updated, $this->id, $data);
266 266
 
267 267
 		return $updated;
268 268
 	}
@@ -278,44 +278,44 @@  discard block
 block discarded – undo
278 278
 	 *
279 279
 	 * @return bool            If the attachment was successfuly
280 280
 	 */
281
-	public function attach_payment( $payment_id = 0, $update_stats = true ) {
281
+	public function attach_payment($payment_id = 0, $update_stats = true) {
282 282
 
283
-		if ( empty( $payment_id ) ) {
283
+		if (empty($payment_id)) {
284 284
 			return false;
285 285
 		}
286 286
 
287
-		if ( empty( $this->payment_ids ) ) {
287
+		if (empty($this->payment_ids)) {
288 288
 
289 289
 			$new_payment_ids = $payment_id;
290 290
 
291 291
 		} else {
292 292
 
293
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
293
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
294 294
 
295
-			if ( in_array( $payment_id, $payment_ids ) ) {
295
+			if (in_array($payment_id, $payment_ids)) {
296 296
 				$update_stats = false;
297 297
 			}
298 298
 
299 299
 			$payment_ids[] = $payment_id;
300 300
 
301
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
301
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
302 302
 
303 303
 		}
304 304
 
305
-		do_action( 'give_customer_pre_attach_payment', $payment_id, $this->id );
305
+		do_action('give_customer_pre_attach_payment', $payment_id, $this->id);
306 306
 
307
-		$payment_added = $this->update( array( 'payment_ids' => $new_payment_ids ) );
307
+		$payment_added = $this->update(array('payment_ids' => $new_payment_ids));
308 308
 
309
-		if ( $payment_added ) {
309
+		if ($payment_added) {
310 310
 
311 311
 			$this->payment_ids = $new_payment_ids;
312 312
 
313 313
 			// We added this payment successfully, increment the stats
314
-			if ( $update_stats ) {
315
-				$payment_amount = give_get_payment_amount( $payment_id );
314
+			if ($update_stats) {
315
+				$payment_amount = give_get_payment_amount($payment_id);
316 316
 
317
-				if ( ! empty( $payment_amount ) ) {
318
-					$this->increase_value( $payment_amount );
317
+				if ( ! empty($payment_amount)) {
318
+					$this->increase_value($payment_amount);
319 319
 				}
320 320
 
321 321
 				$this->increase_purchase_count();
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 
324 324
 		}
325 325
 
326
-		do_action( 'give_customer_post_attach_payment', $payment_added, $payment_id, $this->id );
326
+		do_action('give_customer_post_attach_payment', $payment_added, $payment_id, $this->id);
327 327
 
328 328
 		return $payment_added;
329 329
 	}
@@ -339,44 +339,44 @@  discard block
 block discarded – undo
339 339
 	 *
340 340
 	 * @return boolean             If the removal was successful
341 341
 	 */
342
-	public function remove_payment( $payment_id = 0, $update_stats = true ) {
342
+	public function remove_payment($payment_id = 0, $update_stats = true) {
343 343
 
344
-		if ( empty( $payment_id ) ) {
344
+		if (empty($payment_id)) {
345 345
 			return false;
346 346
 		}
347 347
 
348 348
 		$new_payment_ids = '';
349 349
 
350
-		if ( ! empty( $this->payment_ids ) ) {
350
+		if ( ! empty($this->payment_ids)) {
351 351
 
352
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
352
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
353 353
 
354
-			$pos = array_search( $payment_id, $payment_ids );
355
-			if ( false === $pos ) {
354
+			$pos = array_search($payment_id, $payment_ids);
355
+			if (false === $pos) {
356 356
 				return false;
357 357
 			}
358 358
 
359
-			unset( $payment_ids[ $pos ] );
360
-			$payment_ids = array_filter( $payment_ids );
359
+			unset($payment_ids[$pos]);
360
+			$payment_ids = array_filter($payment_ids);
361 361
 
362
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
362
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
363 363
 
364 364
 		}
365 365
 
366
-		do_action( 'give_customer_pre_remove_payment', $payment_id, $this->id );
366
+		do_action('give_customer_pre_remove_payment', $payment_id, $this->id);
367 367
 
368
-		$payment_removed = $this->update( array( 'payment_ids' => $new_payment_ids ) );
368
+		$payment_removed = $this->update(array('payment_ids' => $new_payment_ids));
369 369
 
370
-		if ( $payment_removed ) {
370
+		if ($payment_removed) {
371 371
 
372 372
 			$this->payment_ids = $new_payment_ids;
373 373
 
374
-			if ( $update_stats ) {
374
+			if ($update_stats) {
375 375
 				// We removed this payment successfully, decrement the stats
376
-				$payment_amount = give_get_payment_amount( $payment_id );
376
+				$payment_amount = give_get_payment_amount($payment_id);
377 377
 
378
-				if ( ! empty( $payment_amount ) ) {
379
-					$this->decrease_value( $payment_amount );
378
+				if ( ! empty($payment_amount)) {
379
+					$this->decrease_value($payment_amount);
380 380
 				}
381 381
 
382 382
 				$this->decrease_purchase_count();
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 
385 385
 		}
386 386
 
387
-		do_action( 'give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id );
387
+		do_action('give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id);
388 388
 
389 389
 		return $payment_removed;
390 390
 
@@ -399,22 +399,22 @@  discard block
 block discarded – undo
399 399
 	 *
400 400
 	 * @return int            The purchase count
401 401
 	 */
402
-	public function increase_purchase_count( $count = 1 ) {
402
+	public function increase_purchase_count($count = 1) {
403 403
 
404 404
 		// Make sure it's numeric and not negative
405
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
405
+		if ( ! is_numeric($count) || $count != absint($count)) {
406 406
 			return false;
407 407
 		}
408 408
 
409 409
 		$new_total = (int) $this->purchase_count + (int) $count;
410 410
 
411
-		do_action( 'give_customer_pre_increase_purchase_count', $count, $this->id );
411
+		do_action('give_customer_pre_increase_purchase_count', $count, $this->id);
412 412
 
413
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
413
+		if ($this->update(array('purchase_count' => $new_total))) {
414 414
 			$this->purchase_count = $new_total;
415 415
 		}
416 416
 
417
-		do_action( 'give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id );
417
+		do_action('give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id);
418 418
 
419 419
 		return $this->purchase_count;
420 420
 	}
@@ -428,26 +428,26 @@  discard block
 block discarded – undo
428 428
 	 *
429 429
 	 * @return mixed          If successful, the new count, otherwise false
430 430
 	 */
431
-	public function decrease_purchase_count( $count = 1 ) {
431
+	public function decrease_purchase_count($count = 1) {
432 432
 
433 433
 		// Make sure it's numeric and not negative
434
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
434
+		if ( ! is_numeric($count) || $count != absint($count)) {
435 435
 			return false;
436 436
 		}
437 437
 
438 438
 		$new_total = (int) $this->purchase_count - (int) $count;
439 439
 
440
-		if ( $new_total < 0 ) {
440
+		if ($new_total < 0) {
441 441
 			$new_total = 0;
442 442
 		}
443 443
 
444
-		do_action( 'give_customer_pre_decrease_purchase_count', $count, $this->id );
444
+		do_action('give_customer_pre_decrease_purchase_count', $count, $this->id);
445 445
 
446
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
446
+		if ($this->update(array('purchase_count' => $new_total))) {
447 447
 			$this->purchase_count = $new_total;
448 448
 		}
449 449
 
450
-		do_action( 'give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id );
450
+		do_action('give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id);
451 451
 
452 452
 		return $this->purchase_count;
453 453
 	}
@@ -461,17 +461,17 @@  discard block
 block discarded – undo
461 461
 	 *
462 462
 	 * @return mixed         If successful, the new value, otherwise false
463 463
 	 */
464
-	public function increase_value( $value = 0.00 ) {
464
+	public function increase_value($value = 0.00) {
465 465
 
466
-		$new_value = floatval( $this->purchase_value ) + $value;
466
+		$new_value = floatval($this->purchase_value) + $value;
467 467
 
468
-		do_action( 'give_customer_pre_increase_value', $value, $this->id );
468
+		do_action('give_customer_pre_increase_value', $value, $this->id);
469 469
 
470
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
470
+		if ($this->update(array('purchase_value' => $new_value))) {
471 471
 			$this->purchase_value = $new_value;
472 472
 		}
473 473
 
474
-		do_action( 'give_customer_post_increase_value', $this->purchase_value, $value, $this->id );
474
+		do_action('give_customer_post_increase_value', $this->purchase_value, $value, $this->id);
475 475
 
476 476
 		return $this->purchase_value;
477 477
 	}
@@ -485,21 +485,21 @@  discard block
 block discarded – undo
485 485
 	 *
486 486
 	 * @return mixed         If successful, the new value, otherwise false
487 487
 	 */
488
-	public function decrease_value( $value = 0.00 ) {
488
+	public function decrease_value($value = 0.00) {
489 489
 
490
-		$new_value = floatval( $this->purchase_value ) - $value;
490
+		$new_value = floatval($this->purchase_value) - $value;
491 491
 
492
-		if ( $new_value < 0 ) {
492
+		if ($new_value < 0) {
493 493
 			$new_value = 0.00;
494 494
 		}
495 495
 
496
-		do_action( 'give_customer_pre_decrease_value', $value, $this->id );
496
+		do_action('give_customer_pre_decrease_value', $value, $this->id);
497 497
 
498
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
498
+		if ($this->update(array('purchase_value' => $new_value))) {
499 499
 			$this->purchase_value = $new_value;
500 500
 		}
501 501
 
502
-		do_action( 'give_customer_post_decrease_value', $this->purchase_value, $value, $this->id );
502
+		do_action('give_customer_post_decrease_value', $this->purchase_value, $value, $this->id);
503 503
 
504 504
 		return $this->purchase_value;
505 505
 	}
@@ -514,15 +514,15 @@  discard block
 block discarded – undo
514 514
 	 *
515 515
 	 * @return array           The notes requsted
516 516
 	 */
517
-	public function get_notes( $length = 20, $paged = 1 ) {
517
+	public function get_notes($length = 20, $paged = 1) {
518 518
 
519
-		$length = is_numeric( $length ) ? $length : 20;
520
-		$offset = is_numeric( $paged ) && $paged != 1 ? ( ( absint( $paged ) - 1 ) * $length ) : 0;
519
+		$length = is_numeric($length) ? $length : 20;
520
+		$offset = is_numeric($paged) && $paged != 1 ? ((absint($paged) - 1) * $length) : 0;
521 521
 
522 522
 		$all_notes   = $this->get_raw_notes();
523
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
523
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
524 524
 
525
-		$desired_notes = array_slice( $notes_array, $offset, $length );
525
+		$desired_notes = array_slice($notes_array, $offset, $length);
526 526
 
527 527
 		return $desired_notes;
528 528
 
@@ -537,9 +537,9 @@  discard block
 block discarded – undo
537 537
 	public function get_notes_count() {
538 538
 
539 539
 		$all_notes   = $this->get_raw_notes();
540
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
540
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
541 541
 
542
-		return count( $notes_array );
542
+		return count($notes_array);
543 543
 
544 544
 	}
545 545
 
@@ -552,32 +552,32 @@  discard block
 block discarded – undo
552 552
 	 *
553 553
 	 * @return string|boolean The new note if added succesfully, false otherwise
554 554
 	 */
555
-	public function add_note( $note = '' ) {
555
+	public function add_note($note = '') {
556 556
 
557
-		$note = trim( $note );
558
-		if ( empty( $note ) ) {
557
+		$note = trim($note);
558
+		if (empty($note)) {
559 559
 			return false;
560 560
 		}
561 561
 
562 562
 		$notes = $this->get_raw_notes();
563 563
 
564
-		if ( empty( $notes ) ) {
564
+		if (empty($notes)) {
565 565
 			$notes = '';
566 566
 		}
567 567
 
568
-		$note_string = date_i18n( 'F j, Y H:i:s', current_time( 'timestamp' ) ) . ' - ' . $note;
569
-		$new_note    = apply_filters( 'give_customer_add_note_string', $note_string );
570
-		$notes .= "\n\n" . $new_note;
568
+		$note_string = date_i18n('F j, Y H:i:s', current_time('timestamp')).' - '.$note;
569
+		$new_note    = apply_filters('give_customer_add_note_string', $note_string);
570
+		$notes .= "\n\n".$new_note;
571 571
 
572
-		do_action( 'give_customer_pre_add_note', $new_note, $this->id );
572
+		do_action('give_customer_pre_add_note', $new_note, $this->id);
573 573
 
574
-		$updated = $this->update( array( 'notes' => $notes ) );
574
+		$updated = $this->update(array('notes' => $notes));
575 575
 
576
-		if ( $updated ) {
576
+		if ($updated) {
577 577
 			$this->notes = $this->get_notes();
578 578
 		}
579 579
 
580
-		do_action( 'give_customer_post_add_note', $this->notes, $new_note, $this->id );
580
+		do_action('give_customer_post_add_note', $this->notes, $new_note, $this->id);
581 581
 
582 582
 		// Return the formatted note, so we can test, as well as update any displays
583 583
 		return $new_note;
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 	 */
593 593
 	private function get_raw_notes() {
594 594
 
595
-		$all_notes = $this->db->get_column( 'notes', $this->id );
595
+		$all_notes = $this->db->get_column('notes', $this->id);
596 596
 
597 597
 		return $all_notes;
598 598
 
@@ -607,51 +607,51 @@  discard block
 block discarded – undo
607 607
 	 *
608 608
 	 * @return array       The sanitized data, based off column defaults
609 609
 	 */
610
-	private function sanitize_columns( $data ) {
610
+	private function sanitize_columns($data) {
611 611
 
612 612
 		$columns        = $this->db->get_columns();
613 613
 		$default_values = $this->db->get_column_defaults();
614 614
 
615
-		foreach ( $columns as $key => $type ) {
615
+		foreach ($columns as $key => $type) {
616 616
 
617 617
 			// Only sanitize data that we were provided
618
-			if ( ! array_key_exists( $key, $data ) ) {
618
+			if ( ! array_key_exists($key, $data)) {
619 619
 				continue;
620 620
 			}
621 621
 
622
-			switch ( $type ) {
622
+			switch ($type) {
623 623
 
624 624
 				case '%s':
625
-					if ( 'email' == $key ) {
626
-						$data[ $key ] = sanitize_email( $data[ $key ] );
627
-					} elseif ( 'notes' == $key ) {
628
-						$data[ $key ] = strip_tags( $data[ $key ] );
625
+					if ('email' == $key) {
626
+						$data[$key] = sanitize_email($data[$key]);
627
+					} elseif ('notes' == $key) {
628
+						$data[$key] = strip_tags($data[$key]);
629 629
 					} else {
630
-						$data[ $key ] = sanitize_text_field( $data[ $key ] );
630
+						$data[$key] = sanitize_text_field($data[$key]);
631 631
 					}
632 632
 					break;
633 633
 
634 634
 				case '%d':
635
-					if ( ! is_numeric( $data[ $key ] ) || (int) $data[ $key ] !== absint( $data[ $key ] ) ) {
636
-						$data[ $key ] = $default_values[ $key ];
635
+					if ( ! is_numeric($data[$key]) || (int) $data[$key] !== absint($data[$key])) {
636
+						$data[$key] = $default_values[$key];
637 637
 					} else {
638
-						$data[ $key ] = absint( $data[ $key ] );
638
+						$data[$key] = absint($data[$key]);
639 639
 					}
640 640
 					break;
641 641
 
642 642
 				case '%f':
643 643
 					// Convert what was given to a float
644
-					$value = floatval( $data[ $key ] );
644
+					$value = floatval($data[$key]);
645 645
 
646
-					if ( ! is_float( $value ) ) {
647
-						$data[ $key ] = $default_values[ $key ];
646
+					if ( ! is_float($value)) {
647
+						$data[$key] = $default_values[$key];
648 648
 					} else {
649
-						$data[ $key ] = $value;
649
+						$data[$key] = $value;
650 650
 					}
651 651
 					break;
652 652
 
653 653
 				default:
654
-					$data[ $key ] = sanitize_text_field( $data[ $key ] );
654
+					$data[$key] = sanitize_text_field($data[$key]);
655 655
 					break;
656 656
 
657 657
 			}
Please login to merge, or discard this patch.
includes/class-give-license-handler.php 1 patch
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -8,11 +8,11 @@  discard block
 block discarded – undo
8 8
  */
9 9
 
10 10
 // Exit if accessed directly
11
-if ( ! defined( 'ABSPATH' ) ) {
11
+if ( ! defined('ABSPATH')) {
12 12
 	exit;
13 13
 }
14 14
 
15
-if ( ! class_exists( 'Give_License' ) ) :
15
+if ( ! class_exists('Give_License')) :
16 16
 
17 17
 	/**
18 18
 	 * Give_License Class
@@ -38,16 +38,16 @@  discard block
 block discarded – undo
38 38
 		 * @param string  $_optname
39 39
 		 * @param string  $_api_url
40 40
 		 */
41
-		public function __construct( $_file, $_item_name, $_version, $_author, $_optname = null, $_api_url = null ) {
41
+		public function __construct($_file, $_item_name, $_version, $_author, $_optname = null, $_api_url = null) {
42 42
 			global $give_options;
43 43
 
44 44
 			$this->file           = $_file;
45 45
 			$this->item_name      = $_item_name;
46
-			$this->item_shortname = 'give_' . preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $this->item_name ) ) );
46
+			$this->item_shortname = 'give_'.preg_replace('/[^a-zA-Z0-9_\s]/', '', str_replace(' ', '_', strtolower($this->item_name)));
47 47
 			$this->version        = $_version;
48
-			$this->license        = isset( $give_options[ $this->item_shortname . '_license_key' ] ) ? trim( $give_options[ $this->item_shortname . '_license_key' ] ) : '';
48
+			$this->license        = isset($give_options[$this->item_shortname.'_license_key']) ? trim($give_options[$this->item_shortname.'_license_key']) : '';
49 49
 			$this->author         = $_author;
50
-			$this->api_url        = is_null( $_api_url ) ? $this->api_url : $_api_url;
50
+			$this->api_url        = is_null($_api_url) ? $this->api_url : $_api_url;
51 51
 
52 52
 
53 53
 			// Setup hooks
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 		 * @return  void
64 64
 		 */
65 65
 		private function includes() {
66
-			if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
66
+			if ( ! class_exists('EDD_SL_Plugin_Updater')) {
67 67
 				require_once 'admin/EDD_SL_Plugin_Updater.php';
68 68
 			}
69 69
 		}
@@ -77,18 +77,18 @@  discard block
 block discarded – undo
77 77
 		private function hooks() {
78 78
 
79 79
 			// Register settings
80
-			add_filter( 'give_settings_licenses', array( $this, 'settings' ), 1 );
80
+			add_filter('give_settings_licenses', array($this, 'settings'), 1);
81 81
 
82 82
 			// Activate license key on settings save
83
-			add_action( 'admin_init', array( $this, 'activate_license' ) );
83
+			add_action('admin_init', array($this, 'activate_license'));
84 84
 
85 85
 			// Deactivate license key
86
-			add_action( 'admin_init', array( $this, 'deactivate_license' ) );
86
+			add_action('admin_init', array($this, 'deactivate_license'));
87 87
 
88 88
 			// Updater
89
-			add_action( 'admin_init', array( $this, 'auto_updater' ), 0 );
89
+			add_action('admin_init', array($this, 'auto_updater'), 0);
90 90
 
91
-			add_action( 'admin_notices', array( $this, 'notices' ) );
91
+			add_action('admin_notices', array($this, 'notices'));
92 92
 		}
93 93
 
94 94
 		/**
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		 */
101 101
 		public function auto_updater() {
102 102
 
103
-			if ( 'valid' !== get_option( $this->item_shortname . '_license_active' ) ) {
103
+			if ('valid' !== get_option($this->item_shortname.'_license_active')) {
104 104
 				return;
105 105
 			}
106 106
 
@@ -127,20 +127,20 @@  discard block
 block discarded – undo
127 127
 		 *
128 128
 		 * @return  array
129 129
 		 */
130
-		public function settings( $settings ) {
130
+		public function settings($settings) {
131 131
 
132 132
 			$give_license_settings = array(
133 133
 				array(
134
-					'name'    => sprintf( __( '%1$s', 'give' ), $this->item_name ),
135
-					'id'      => $this->item_shortname . '_license_key',
134
+					'name'    => sprintf(__('%1$s', 'give'), $this->item_name),
135
+					'id'      => $this->item_shortname.'_license_key',
136 136
 					'desc'    => '',
137 137
 					'type'    => 'license_key',
138
-					'options' => array( 'is_valid_license_option' => $this->item_shortname . '_license_active' ),
138
+					'options' => array('is_valid_license_option' => $this->item_shortname.'_license_active'),
139 139
 					'size'    => 'regular'
140 140
 				)
141 141
 			);
142 142
 
143
-			return array_merge( $settings, $give_license_settings );
143
+			return array_merge($settings, $give_license_settings);
144 144
 		}
145 145
 
146 146
 		/**
@@ -152,18 +152,18 @@  discard block
 block discarded – undo
152 152
 		 *
153 153
 		 * @return  array
154 154
 		 */
155
-		public function license_settings_content( $settings ) {
155
+		public function license_settings_content($settings) {
156 156
 
157 157
 			$give_license_settings = array(
158 158
 				array(
159
-					'name' => __( 'Add-on Licenses', 'give' ),
159
+					'name' => __('Add-on Licenses', 'give'),
160 160
 					'desc' => '<hr>',
161 161
 					'type' => 'give_title',
162 162
 					'id'   => 'give_title'
163 163
 				),
164 164
 			);
165 165
 
166
-			return array_merge( $settings, $give_license_settings );
166
+			return array_merge($settings, $give_license_settings);
167 167
 		}
168 168
 
169 169
 
@@ -175,34 +175,34 @@  discard block
 block discarded – undo
175 175
 		 */
176 176
 		public function activate_license() {
177 177
 
178
-			if ( ! isset( $_POST[ $this->item_shortname . '_license_key' ] ) ) {
178
+			if ( ! isset($_POST[$this->item_shortname.'_license_key'])) {
179 179
 				return;
180 180
 			}
181 181
 
182
-			foreach ( $_POST as $key => $value ) {
183
-				if ( false !== strpos( $key, 'license_key_deactivate' ) ) {
182
+			foreach ($_POST as $key => $value) {
183
+				if (false !== strpos($key, 'license_key_deactivate')) {
184 184
 					// Don't activate a key when deactivating a different key
185 185
 					return;
186 186
 				}
187 187
 			}
188 188
 
189
-			if ( ! wp_verify_nonce( $_REQUEST[ $this->item_shortname . '_license_key-nonce' ], $this->item_shortname . '_license_key-nonce' ) ) {
189
+			if ( ! wp_verify_nonce($_REQUEST[$this->item_shortname.'_license_key-nonce'], $this->item_shortname.'_license_key-nonce')) {
190 190
 
191
-				wp_die( __( 'Nonce verification failed', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
191
+				wp_die(__('Nonce verification failed', 'give'), __('Error', 'give'), array('response' => 403));
192 192
 
193 193
 			}
194 194
 
195
-			if ( ! current_user_can( 'manage_give_settings' ) ) {
195
+			if ( ! current_user_can('manage_give_settings')) {
196 196
 				return;
197 197
 			}
198 198
 
199
-			if ( 'valid' === get_option( $this->item_shortname . '_license_active' ) ) {
199
+			if ('valid' === get_option($this->item_shortname.'_license_active')) {
200 200
 				return;
201 201
 			}
202 202
 
203
-			$license = sanitize_text_field( $_POST[ $this->item_shortname . '_license_key' ] );
203
+			$license = sanitize_text_field($_POST[$this->item_shortname.'_license_key']);
204 204
 
205
-			if ( empty( $license ) ) {
205
+			if (empty($license)) {
206 206
 				return;
207 207
 			}
208 208
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 			$api_params = array(
211 211
 				'edd_action' => 'activate_license', //never change from "edd_" to "give_"!
212 212
 				'license'    => $license,
213
-				'item_name'  => urlencode( $this->item_name ),
213
+				'item_name'  => urlencode($this->item_name),
214 214
 				'url'        => home_url()
215 215
 			);
216 216
 
@@ -225,22 +225,22 @@  discard block
 block discarded – undo
225 225
 			);
226 226
 
227 227
 			// Make sure there are no errors
228
-			if ( is_wp_error( $response ) ) {
228
+			if (is_wp_error($response)) {
229 229
 				return;
230 230
 			}
231 231
 
232 232
 			// Tell WordPress to look for updates
233
-			set_site_transient( 'update_plugins', null );
233
+			set_site_transient('update_plugins', null);
234 234
 
235 235
 			// Decode license data
236
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
236
+			$license_data = json_decode(wp_remote_retrieve_body($response));
237 237
 
238
-			update_option( $this->item_shortname . '_license_active', $license_data->license );
238
+			update_option($this->item_shortname.'_license_active', $license_data->license);
239 239
 
240
-			if ( ! (bool) $license_data->success ) {
241
-				set_transient( 'give_license_error', $license_data, 1000 );
240
+			if ( ! (bool) $license_data->success) {
241
+				set_transient('give_license_error', $license_data, 1000);
242 242
 			} else {
243
-				delete_transient( 'give_license_error' );
243
+				delete_transient('give_license_error');
244 244
 			}
245 245
 		}
246 246
 
@@ -253,28 +253,28 @@  discard block
 block discarded – undo
253 253
 		 */
254 254
 		public function deactivate_license() {
255 255
 
256
-			if ( ! isset( $_POST[ $this->item_shortname . '_license_key' ] ) ) {
256
+			if ( ! isset($_POST[$this->item_shortname.'_license_key'])) {
257 257
 				return;
258 258
 			}
259 259
 
260
-			if ( ! wp_verify_nonce( $_REQUEST[ $this->item_shortname . '_license_key-nonce' ], $this->item_shortname . '_license_key-nonce' ) ) {
260
+			if ( ! wp_verify_nonce($_REQUEST[$this->item_shortname.'_license_key-nonce'], $this->item_shortname.'_license_key-nonce')) {
261 261
 
262
-				wp_die( __( 'Nonce verification failed', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
262
+				wp_die(__('Nonce verification failed', 'give'), __('Error', 'give'), array('response' => 403));
263 263
 
264 264
 			}
265 265
 
266
-			if ( ! current_user_can( 'manage_give_settings' ) ) {
266
+			if ( ! current_user_can('manage_give_settings')) {
267 267
 				return;
268 268
 			}
269 269
 
270 270
 			// Run on deactivate button press
271
-			if ( isset( $_POST[ $this->item_shortname . '_license_key_deactivate' ] ) ) {
271
+			if (isset($_POST[$this->item_shortname.'_license_key_deactivate'])) {
272 272
 
273 273
 				// Data to send to the API
274 274
 				$api_params = array(
275 275
 					'edd_action' => 'deactivate_license', //never change from "edd_" to "give_"!
276 276
 					'license'    => $this->license,
277
-					'item_name'  => urlencode( $this->item_name ),
277
+					'item_name'  => urlencode($this->item_name),
278 278
 					'url'        => home_url()
279 279
 				);
280 280
 
@@ -290,19 +290,19 @@  discard block
 block discarded – undo
290 290
 
291 291
 
292 292
 				// Make sure there are no errors
293
-				if ( is_wp_error( $response ) ) {
293
+				if (is_wp_error($response)) {
294 294
 					return;
295 295
 				}
296 296
 
297 297
 				// Decode the license data
298
-				$license_data = json_decode( wp_remote_retrieve_body( $response ) );
298
+				$license_data = json_decode(wp_remote_retrieve_body($response));
299 299
 
300
-				delete_option( $this->item_shortname . '_license_active' );
300
+				delete_option($this->item_shortname.'_license_active');
301 301
 
302
-				if ( ! (bool) $license_data->success ) {
303
-					set_transient( 'give_license_error', $license_data, 1000 );
302
+				if ( ! (bool) $license_data->success) {
303
+					set_transient('give_license_error', $license_data, 1000);
304 304
 				} else {
305
-					delete_transient( 'give_license_error' );
305
+					delete_transient('give_license_error');
306 306
 				}
307 307
 			}
308 308
 		}
@@ -316,57 +316,57 @@  discard block
 block discarded – undo
316 316
 		 */
317 317
 		public function notices() {
318 318
 
319
-			if ( ! isset( $_GET['page'] ) || 'give-settings' !== $_GET['page'] ) {
319
+			if ( ! isset($_GET['page']) || 'give-settings' !== $_GET['page']) {
320 320
 				return;
321 321
 			}
322 322
 
323
-			if ( ! isset( $_GET['tab'] ) || 'licenses' !== $_GET['tab'] ) {
323
+			if ( ! isset($_GET['tab']) || 'licenses' !== $_GET['tab']) {
324 324
 				return;
325 325
 			}
326 326
 
327
-			$license_error = get_transient( 'give_license_error' );
327
+			$license_error = get_transient('give_license_error');
328 328
 
329
-			if ( false === $license_error ) {
329
+			if (false === $license_error) {
330 330
 				return;
331 331
 			}
332 332
 
333
-			if ( ! empty( $license_error->error ) ) {
333
+			if ( ! empty($license_error->error)) {
334 334
 
335
-				switch ( $license_error->error ) {
335
+				switch ($license_error->error) {
336 336
 
337 337
 					case 'item_name_mismatch' :
338 338
 
339
-						$message = __( 'This license does not belong to the product you have entered it for.', 'give' );
339
+						$message = __('This license does not belong to the product you have entered it for.', 'give');
340 340
 						break;
341 341
 
342 342
 					case 'no_activations_left' :
343 343
 
344
-						$message = __( 'This license does not have any activations left', 'give' );
344
+						$message = __('This license does not have any activations left', 'give');
345 345
 						break;
346 346
 
347 347
 					case 'expired' :
348 348
 
349
-						$message = __( 'This license key is expired. Please renew it.', 'give' );
349
+						$message = __('This license key is expired. Please renew it.', 'give');
350 350
 						break;
351 351
 
352 352
 					default :
353 353
 
354
-						$message = sprintf( __( 'There was a problem activating your license key, please try again or contact support. Error code: %s', 'give' ), $license_error->error );
354
+						$message = sprintf(__('There was a problem activating your license key, please try again or contact support. Error code: %s', 'give'), $license_error->error);
355 355
 						break;
356 356
 
357 357
 				}
358 358
 
359 359
 			}
360 360
 
361
-			if ( ! empty( $message ) ) {
361
+			if ( ! empty($message)) {
362 362
 
363 363
 				echo '<div class="error">';
364
-				echo '<p>' . $message . '</p>';
364
+				echo '<p>'.$message.'</p>';
365 365
 				echo '</div>';
366 366
 
367 367
 			}
368 368
 
369
-			delete_transient( 'give_license_error' );
369
+			delete_transient('give_license_error');
370 370
 
371 371
 		}
372 372
 	}
Please login to merge, or discard this patch.
includes/class-give-roles.php 2 patches
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function __construct() {
30 30
 
31
-		add_filter( 'give_map_meta_cap', array( $this, 'meta_caps' ), 10, 4 );
31
+		add_filter('give_map_meta_cap', array($this, 'meta_caps'), 10, 4);
32 32
 	}
33 33
 
34 34
 	/**
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 * @return void
40 40
 	 */
41 41
 	public function add_roles() {
42
-		add_role( 'give_manager', __( 'Give Manager', 'give' ), array(
42
+		add_role('give_manager', __('Give Manager', 'give'), array(
43 43
 			'read'                   => true,
44 44
 			'edit_posts'             => true,
45 45
 			'delete_posts'           => true,
@@ -68,20 +68,20 @@  discard block
 block discarded – undo
68 68
 			'publish_posts'          => true,
69 69
 			'read_private_pages'     => true,
70 70
 			'read_private_posts'     => true
71
-		) );
71
+		));
72 72
 
73
-		add_role( 'give_accountant', __( 'Give Accountant', 'give' ), array(
73
+		add_role('give_accountant', __('Give Accountant', 'give'), array(
74 74
 		    'read'                   => true,
75 75
 		    'edit_posts'             => false,
76 76
 		    'delete_posts'           => false
77
-		) );
77
+		));
78 78
 
79
-		add_role( 'give_worker', __( 'Give Worker', 'give' ), array(
79
+		add_role('give_worker', __('Give Worker', 'give'), array(
80 80
 			'read'                   => true,
81 81
 			'edit_posts'             => false,
82 82
 			'upload_files'           => true,
83 83
 			'delete_posts'           => false
84
-		) );
84
+		));
85 85
 
86 86
 	}
87 87
 
@@ -96,38 +96,38 @@  discard block
 block discarded – undo
96 96
 	public function add_caps() {
97 97
 		global $wp_roles;
98 98
 
99
-		if ( class_exists('WP_Roles') ) {
100
-			if ( ! isset( $wp_roles ) ) {
99
+		if (class_exists('WP_Roles')) {
100
+			if ( ! isset($wp_roles)) {
101 101
 				$wp_roles = new WP_Roles();
102 102
 			}
103 103
 		}
104 104
 
105
-		if ( is_object( $wp_roles ) ) {
106
-			$wp_roles->add_cap( 'give_manager', 'view_give_reports' );
107
-			$wp_roles->add_cap( 'give_manager', 'view_give_sensitive_data' );
108
-			$wp_roles->add_cap( 'give_manager', 'export_give_reports' );
109
-			$wp_roles->add_cap( 'give_manager', 'manage_give_settings' );
105
+		if (is_object($wp_roles)) {
106
+			$wp_roles->add_cap('give_manager', 'view_give_reports');
107
+			$wp_roles->add_cap('give_manager', 'view_give_sensitive_data');
108
+			$wp_roles->add_cap('give_manager', 'export_give_reports');
109
+			$wp_roles->add_cap('give_manager', 'manage_give_settings');
110 110
 
111
-			$wp_roles->add_cap( 'administrator', 'view_give_reports' );
112
-			$wp_roles->add_cap( 'administrator', 'view_give_sensitive_data' );
113
-			$wp_roles->add_cap( 'administrator', 'export_give_reports' );
114
-			$wp_roles->add_cap( 'administrator', 'manage_give_settings' );
111
+			$wp_roles->add_cap('administrator', 'view_give_reports');
112
+			$wp_roles->add_cap('administrator', 'view_give_sensitive_data');
113
+			$wp_roles->add_cap('administrator', 'export_give_reports');
114
+			$wp_roles->add_cap('administrator', 'manage_give_settings');
115 115
 
116 116
 			// Add the main post type capabilities
117 117
 			$capabilities = $this->get_core_caps();
118
-			foreach ( $capabilities as $cap_group ) {
119
-				foreach ( $cap_group as $cap ) {
120
-					$wp_roles->add_cap( 'give_manager', $cap );
121
-					$wp_roles->add_cap( 'administrator', $cap );
122
-					$wp_roles->add_cap( 'give_worker', $cap );
118
+			foreach ($capabilities as $cap_group) {
119
+				foreach ($cap_group as $cap) {
120
+					$wp_roles->add_cap('give_manager', $cap);
121
+					$wp_roles->add_cap('administrator', $cap);
122
+					$wp_roles->add_cap('give_worker', $cap);
123 123
 				}
124 124
 			}
125 125
 
126
-			$wp_roles->add_cap( 'give_accountant', 'edit_give_forms' );
127
-			$wp_roles->add_cap( 'give_accountant', 'read_private_forms' );
128
-			$wp_roles->add_cap( 'give_accountant', 'view_give_reports' );
129
-			$wp_roles->add_cap( 'give_accountant', 'export_give_reports' );
130
-			$wp_roles->add_cap( 'give_accountant', 'edit_give_payments' );
126
+			$wp_roles->add_cap('give_accountant', 'edit_give_forms');
127
+			$wp_roles->add_cap('give_accountant', 'read_private_forms');
128
+			$wp_roles->add_cap('give_accountant', 'view_give_reports');
129
+			$wp_roles->add_cap('give_accountant', 'export_give_reports');
130
+			$wp_roles->add_cap('give_accountant', 'edit_give_payments');
131 131
 
132 132
 		}
133 133
 	}
@@ -142,10 +142,10 @@  discard block
 block discarded – undo
142 142
 	public function get_core_caps() {
143 143
 		$capabilities = array();
144 144
 
145
-		$capability_types = array( 'give_forms', 'give_campaigns', 'give_payments' );
145
+		$capability_types = array('give_forms', 'give_campaigns', 'give_payments');
146 146
 
147
-		foreach ( $capability_types as $capability_type ) {
148
-			$capabilities[ $capability_type ] = array(
147
+		foreach ($capability_types as $capability_type) {
148
+			$capabilities[$capability_type] = array(
149 149
 				// Post type
150 150
 				"edit_{$capability_type}",
151 151
 				"read_{$capability_type}",
@@ -182,22 +182,22 @@  discard block
 block discarded – undo
182 182
 	 * @since  2.0
183 183
 	 * @return array $caps
184 184
 	 */
185
-	public function meta_caps( $caps, $cap, $user_id, $args ) {
185
+	public function meta_caps($caps, $cap, $user_id, $args) {
186 186
 
187
-		switch( $cap ) {
187
+		switch ($cap) {
188 188
 
189 189
 			case 'view_give_forms_stats' :
190 190
 				
191
-				if( empty( $args[0] ) ) {
191
+				if (empty($args[0])) {
192 192
 					break;
193 193
 				}
194 194
 				
195
-				$form = get_post( $args[0] );
196
-				if ( empty( $form ) ) {
195
+				$form = get_post($args[0]);
196
+				if (empty($form)) {
197 197
 					break;
198 198
 				}
199 199
 
200
-				if( user_can( $user_id, 'view_give_reports' ) || $user_id == $form->post_author ) {
200
+				if (user_can($user_id, 'view_give_reports') || $user_id == $form->post_author) {
201 201
 					$caps = array();
202 202
 				}
203 203
 
@@ -219,41 +219,41 @@  discard block
 block discarded – undo
219 219
 		
220 220
 		global $wp_roles;
221 221
 
222
-		if ( class_exists( 'WP_Roles' ) ) {
223
-			if ( ! isset( $wp_roles ) ) {
222
+		if (class_exists('WP_Roles')) {
223
+			if ( ! isset($wp_roles)) {
224 224
 				$wp_roles = new WP_Roles();
225 225
 			}
226 226
 		}
227 227
 
228
-		if ( is_object( $wp_roles ) ) {
228
+		if (is_object($wp_roles)) {
229 229
 			/** Give Manager Capabilities */
230
-			$wp_roles->remove_cap( 'give_manager', 'view_give_reports' );
231
-			$wp_roles->remove_cap( 'give_manager', 'view_give_sensitive_data' );
232
-			$wp_roles->remove_cap( 'give_manager', 'export_give_reports' );
233
-			$wp_roles->remove_cap( 'give_manager', 'manage_give_settings' );
230
+			$wp_roles->remove_cap('give_manager', 'view_give_reports');
231
+			$wp_roles->remove_cap('give_manager', 'view_give_sensitive_data');
232
+			$wp_roles->remove_cap('give_manager', 'export_give_reports');
233
+			$wp_roles->remove_cap('give_manager', 'manage_give_settings');
234 234
 
235 235
 			/** Site Administrator Capabilities */
236
-			$wp_roles->remove_cap( 'administrator', 'view_give_reports' );
237
-			$wp_roles->remove_cap( 'administrator', 'view_give_sensitive_data' );
238
-			$wp_roles->remove_cap( 'administrator', 'export_give_reports' );
239
-			$wp_roles->remove_cap( 'administrator', 'manage_give_settings' );
236
+			$wp_roles->remove_cap('administrator', 'view_give_reports');
237
+			$wp_roles->remove_cap('administrator', 'view_give_sensitive_data');
238
+			$wp_roles->remove_cap('administrator', 'export_give_reports');
239
+			$wp_roles->remove_cap('administrator', 'manage_give_settings');
240 240
 
241 241
 			/** Remove the Main Post Type Capabilities */
242 242
 			$capabilities = $this->get_core_caps();
243 243
 
244
-			foreach ( $capabilities as $cap_group ) {
245
-				foreach ( $cap_group as $cap ) {
246
-					$wp_roles->remove_cap( 'give_manager', $cap );
247
-					$wp_roles->remove_cap( 'administrator', $cap );
248
-					$wp_roles->remove_cap( 'give_worker', $cap );
244
+			foreach ($capabilities as $cap_group) {
245
+				foreach ($cap_group as $cap) {
246
+					$wp_roles->remove_cap('give_manager', $cap);
247
+					$wp_roles->remove_cap('administrator', $cap);
248
+					$wp_roles->remove_cap('give_worker', $cap);
249 249
 				}
250 250
 			}
251 251
 
252 252
 			/** Shop Accountant Capabilities */
253
-			$wp_roles->remove_cap( 'give_accountant', 'edit_give_forms' );
254
-			$wp_roles->remove_cap( 'give_accountant', 'read_private_forms' );
255
-			$wp_roles->remove_cap( 'give_accountant', 'view_give_reports' );
256
-			$wp_roles->remove_cap( 'give_accountant', 'export_give_reports' );
253
+			$wp_roles->remove_cap('give_accountant', 'edit_give_forms');
254
+			$wp_roles->remove_cap('give_accountant', 'read_private_forms');
255
+			$wp_roles->remove_cap('give_accountant', 'view_give_reports');
256
+			$wp_roles->remove_cap('give_accountant', 'export_give_reports');
257 257
 
258 258
 		}
259 259
 	}
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,9 +71,9 @@
 block discarded – undo
71 71
 		) );
72 72
 
73 73
 		add_role( 'give_accountant', __( 'Give Accountant', 'give' ), array(
74
-		    'read'                   => true,
75
-		    'edit_posts'             => false,
76
-		    'delete_posts'           => false
74
+			'read'                   => true,
75
+			'edit_posts'             => false,
76
+			'delete_posts'           => false
77 77
 		) );
78 78
 
79 79
 		add_role( 'give_worker', __( 'Give Worker', 'give' ), array(
Please login to merge, or discard this patch.
includes/class-give-template-loader.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 	public function __construct() {
15 15
 
16
-		add_filter( 'template_include', array( __CLASS__, 'template_loader' ) );
16
+		add_filter('template_include', array(__CLASS__, 'template_loader'));
17 17
 
18 18
 
19 19
 		/**
@@ -28,19 +28,19 @@  discard block
 block discarded – undo
28 28
 		 * @see 3give_output_content_wrapper()
29 29
 		 * @see give_output_content_wrapper_end()
30 30
 		 */
31
-		add_action( 'give_before_main_content', 'give_output_content_wrapper', 10 );
32
-		add_action( 'give_after_main_content', 'give_output_content_wrapper_end', 10 );
31
+		add_action('give_before_main_content', 'give_output_content_wrapper', 10);
32
+		add_action('give_after_main_content', 'give_output_content_wrapper_end', 10);
33 33
 
34 34
 		/**
35 35
 		 * Entry Summary Classes
36 36
 		 */
37
-		add_filter( 'give_forms_single_summary_classes', array( $this, 'give_set_single_summary_classes' ) );
37
+		add_filter('give_forms_single_summary_classes', array($this, 'give_set_single_summary_classes'));
38 38
 
39 39
 
40 40
 		/**
41 41
 		 * Sidebar
42 42
 		 */
43
-		add_action( 'give_before_single_form_summary', array( $this, 'give_output_sidebar_option' ), 1 );
43
+		add_action('give_before_single_form_summary', array($this, 'give_output_sidebar_option'), 1);
44 44
 
45 45
 
46 46
 		/**
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
 		 *
49 49
 		 * @see give_template_single_title()
50 50
 		 */
51
-		add_action( 'give_single_form_summary', 'give_template_single_title', 5 );
52
-		add_action( 'give_single_form_summary', 'give_get_donation_form', 10 );
51
+		add_action('give_single_form_summary', 'give_template_single_title', 5);
52
+		add_action('give_single_form_summary', 'give_get_donation_form', 10);
53 53
 
54 54
 
55 55
 	}
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
 	 *
65 65
 	 * @return string
66 66
 	 */
67
-	public function give_set_single_summary_classes( $classes ) {
67
+	public function give_set_single_summary_classes($classes) {
68 68
 
69
-		$sidebar_option = give_get_option( 'disable_form_sidebar' );
69
+		$sidebar_option = give_get_option('disable_form_sidebar');
70 70
 
71 71
 		//Add full width class when feature image is disabled AND no widgets are present
72
-		if ( $sidebar_option == 'on' ) {
72
+		if ($sidebar_option == 'on') {
73 73
 			$classes .= ' give-full-width';
74 74
 		}
75 75
 
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 	 *
87 87
 	 */
88 88
 	public function give_output_sidebar_option() {
89
-		$sidebar_option = give_get_option( 'disable_form_sidebar' );
89
+		$sidebar_option = give_get_option('disable_form_sidebar');
90 90
 		//Add full width class when feature image is disabled AND no widgets are present
91
-		if ( $sidebar_option !== 'on' ) {
92
-			add_action( 'give_before_single_form_summary', 'give_left_sidebar_pre_wrap', 5 );
93
-			add_action( 'give_before_single_form_summary', 'give_show_form_images', 10 );
94
-			add_action( 'give_before_single_form_summary', 'give_get_forms_sidebar', 20 );
95
-			add_action( 'give_before_single_form_summary', 'give_left_sidebar_post_wrap', 30 );
91
+		if ($sidebar_option !== 'on') {
92
+			add_action('give_before_single_form_summary', 'give_left_sidebar_pre_wrap', 5);
93
+			add_action('give_before_single_form_summary', 'give_show_form_images', 10);
94
+			add_action('give_before_single_form_summary', 'give_get_forms_sidebar', 20);
95
+			add_action('give_before_single_form_summary', 'give_left_sidebar_post_wrap', 30);
96 96
 		}
97 97
 
98 98
 	}
@@ -114,22 +114,22 @@  discard block
 block discarded – undo
114 114
 	 *
115 115
 	 * @return string
116 116
 	 */
117
-	public static function template_loader( $template ) {
118
-		$find = array( 'give.php' );
117
+	public static function template_loader($template) {
118
+		$find = array('give.php');
119 119
 		$file = '';
120 120
 
121
-		if ( is_single() && get_post_type() == 'give_forms' ) {
121
+		if (is_single() && get_post_type() == 'give_forms') {
122 122
 
123 123
 			$file   = 'single-give-form.php';
124 124
 			$find[] = $file;
125
-			$find[] = apply_filters( 'give_template_path', 'give/' ) . $file;
125
+			$find[] = apply_filters('give_template_path', 'give/').$file;
126 126
 
127 127
 		}
128 128
 
129
-		if ( $file ) {
130
-			$template = locate_template( array_unique( $find ) );
131
-			if ( ! $template ) {
132
-				$template = GIVE_PLUGIN_DIR . '/templates/' . $file;
129
+		if ($file) {
130
+			$template = locate_template(array_unique($find));
131
+			if ( ! $template) {
132
+				$template = GIVE_PLUGIN_DIR.'/templates/'.$file;
133 133
 			}
134 134
 		}
135 135
 
Please login to merge, or discard this patch.
includes/country-functions.php 1 patch
Spacing   +76 added lines, -76 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,9 +23,9 @@  discard block
 block discarded – undo
23 23
  */
24 24
 function give_get_country() {
25 25
 	global $give_options;
26
-	$country = isset( $give_options['base_country'] ) ? $give_options['base_country'] : 'US';
26
+	$country = isset($give_options['base_country']) ? $give_options['base_country'] : 'US';
27 27
 
28
-	return apply_filters( 'give_give_country', $country );
28
+	return apply_filters('give_give_country', $country);
29 29
 }
30 30
 
31 31
 /**
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
  */
37 37
 function give_get_state() {
38 38
 	global $give_options;
39
-	$state = isset( $give_options['base_state'] ) ? $give_options['base_state'] : false;
39
+	$state = isset($give_options['base_state']) ? $give_options['base_state'] : false;
40 40
 
41
-	return apply_filters( 'give_give_state', $state );
41
+	return apply_filters('give_give_state', $state);
42 42
 }
43 43
 
44 44
 /**
@@ -50,14 +50,14 @@  discard block
 block discarded – undo
50 50
  *
51 51
  * @return mixed|void  A list of states for the shop's base country
52 52
  */
53
-function give_get_states( $country = null ) {
53
+function give_get_states($country = null) {
54 54
 	global $give_options;
55 55
 
56
-	if ( empty( $country ) ) {
56
+	if (empty($country)) {
57 57
 		$country = give_get_country();
58 58
 	}
59 59
 
60
-	switch ( $country ) :
60
+	switch ($country) :
61 61
 
62 62
 		case 'US' :
63 63
 			$states = give_get_states_list();
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 
108 108
 	endswitch;
109 109
 
110
-	return apply_filters( 'give_give_states', $states );
110
+	return apply_filters('give_give_states', $states);
111 111
 }
112 112
 
113 113
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 		'ZW' => 'Zimbabwe'
367 367
 	);
368 368
 
369
-	return apply_filters( 'give_countries', $countries );
369
+	return apply_filters('give_countries', $countries);
370 370
 }
371 371
 
372 372
 /**
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 		'AP' => 'Armed Forces - Pacific'
448 448
 	);
449 449
 
450
-	return apply_filters( 'give_us_states', $states );
450
+	return apply_filters('give_us_states', $states);
451 451
 }
452 452
 
453 453
 /**
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 		'YT' => 'Yukon'
476 476
 	);
477 477
 
478
-	return apply_filters( 'give_canada_provinces', $provinces );
478
+	return apply_filters('give_canada_provinces', $provinces);
479 479
 }
480 480
 
481 481
 /**
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 		'WA'  => 'Western Australia'
498 498
 	);
499 499
 
500
-	return apply_filters( 'give_australian_states', $states );
500
+	return apply_filters('give_australian_states', $states);
501 501
 }
502 502
 
503 503
 /**
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 		'TO' => 'Tocantins'
539 539
 	);
540 540
 
541
-	return apply_filters( 'give_brazil_states', $states );
541
+	return apply_filters('give_brazil_states', $states);
542 542
 }
543 543
 
544 544
 /**
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		'NEW TERRITORIES' => 'New Territories'
556 556
 	);
557 557
 
558
-	return apply_filters( 'give_hong_kong_states', $states );
558
+	return apply_filters('give_hong_kong_states', $states);
559 559
 }
560 560
 
561 561
 /**
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 		'ZA' => 'Zala'
590 590
 	);
591 591
 
592
-	return apply_filters( 'give_hungary_states', $states );
592
+	return apply_filters('give_hungary_states', $states);
593 593
 }
594 594
 
595 595
 /**
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
 		'CN32' => 'Xinjiang / &#26032;&#30086;'
636 636
 	);
637 637
 
638
-	return apply_filters( 'give_chinese_states', $states );
638
+	return apply_filters('give_chinese_states', $states);
639 639
 }
640 640
 
641 641
 /**
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 		'WC' => 'West Coast'
665 665
 	);
666 666
 
667
-	return apply_filters( 'give_new_zealand_states', $states );
667
+	return apply_filters('give_new_zealand_states', $states);
668 668
 }
669 669
 
670 670
 /**
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
 		'PB' => 'Papua Barat'
713 713
 	);
714 714
 
715
-	return apply_filters( 'give_indonesia_states', $states );
715
+	return apply_filters('give_indonesia_states', $states);
716 716
 }
717 717
 
718 718
 /**
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
762 762
 		'PY' => 'Pondicherry (Puducherry)'
763 763
 	);
764 764
 
765
-	return apply_filters( 'give_indian_states', $states );
765
+	return apply_filters('give_indian_states', $states);
766 766
 }
767 767
 
768 768
 /**
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
 		'PJY' => 'W.P. Putrajaya'
793 793
 	);
794 794
 
795
-	return apply_filters( 'give_malaysian_states', $states );
795
+	return apply_filters('give_malaysian_states', $states);
796 796
 }
797 797
 
798 798
 /**
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
815 815
 		'WC'  => 'Western Cape'
816 816
 	);
817 817
 
818
-	return apply_filters( 'give_south_african_states', $states );
818
+	return apply_filters('give_south_african_states', $states);
819 819
 }
820 820
 
821 821
 /**
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
 		'TH-35' => 'Yasothon (&#3618;&#3650;&#3626;&#3608;&#3619;)'
907 907
 	);
908 908
 
909
-	return apply_filters( 'give_thailand_states', $states );
909
+	return apply_filters('give_thailand_states', $states);
910 910
 }
911 911
 
912 912
 /**
@@ -918,59 +918,59 @@  discard block
 block discarded – undo
918 918
 function give_get_spain_states_list() {
919 919
 	$states = array(
920 920
 		''   => '',
921
-		'C'  => __( 'A Coru&ntilde;a', 'give' ),
922
-		'VI' => __( 'Araba', 'give' ),
923
-		'AB' => __( 'Albacete', 'give' ),
924
-		'A'  => __( 'Alicante', 'give' ),
925
-		'AL' => __( 'Almer&iacute;a', 'give' ),
926
-		'O'  => __( 'Asturias', 'give' ),
927
-		'AV' => __( '&Aacute;vila', 'give' ),
928
-		'BA' => __( 'Badajoz', 'give' ),
929
-		'PM' => __( 'Baleares', 'give' ),
930
-		'B'  => __( 'Barcelona', 'give' ),
931
-		'BU' => __( 'Burgos', 'give' ),
932
-		'CC' => __( 'C&aacute;ceres', 'give' ),
933
-		'CA' => __( 'C&aacute;diz', 'give' ),
934
-		'S'  => __( 'Cantabria', 'give' ),
935
-		'CS' => __( 'Castell&oacute;n', 'give' ),
936
-		'CE' => __( 'Ceuta', 'give' ),
937
-		'CR' => __( 'Ciudad Real', 'give' ),
938
-		'CO' => __( 'C&oacute;rdoba', 'give' ),
939
-		'CU' => __( 'Cuenca', 'give' ),
940
-		'GI' => __( 'Girona', 'give' ),
941
-		'GR' => __( 'Granada', 'give' ),
942
-		'GU' => __( 'Guadalajara', 'give' ),
943
-		'SS' => __( 'Gipuzkoa', 'give' ),
944
-		'H'  => __( 'Huelva', 'give' ),
945
-		'HU' => __( 'Huesca', 'give' ),
946
-		'J'  => __( 'Ja&eacute;n', 'give' ),
947
-		'LO' => __( 'La Rioja', 'give' ),
948
-		'GC' => __( 'Las Palmas', 'give' ),
949
-		'LE' => __( 'Le&oacute;n', 'give' ),
950
-		'L'  => __( 'Lleida', 'give' ),
951
-		'LU' => __( 'Lugo', 'give' ),
952
-		'M'  => __( 'Madrid', 'give' ),
953
-		'MA' => __( 'M&aacute;laga', 'give' ),
954
-		'ML' => __( 'Melilla', 'give' ),
955
-		'MU' => __( 'Murcia', 'give' ),
956
-		'NA' => __( 'Navarra', 'give' ),
957
-		'OR' => __( 'Ourense', 'give' ),
958
-		'P'  => __( 'Palencia', 'give' ),
959
-		'PO' => __( 'Pontevedra', 'give' ),
960
-		'SA' => __( 'Salamanca', 'give' ),
961
-		'TF' => __( 'Santa Cruz de Tenerife', 'give' ),
962
-		'SG' => __( 'Segovia', 'give' ),
963
-		'SE' => __( 'Sevilla', 'give' ),
964
-		'SO' => __( 'Soria', 'give' ),
965
-		'T'  => __( 'Tarragona', 'give' ),
966
-		'TE' => __( 'Teruel', 'give' ),
967
-		'TO' => __( 'Toledo', 'give' ),
968
-		'V'  => __( 'Valencia', 'give' ),
969
-		'VA' => __( 'Valladolid', 'give' ),
970
-		'BI' => __( 'Bizkaia', 'give' ),
971
-		'ZA' => __( 'Zamora', 'give' ),
972
-		'Z'  => __( 'Zaragoza', 'give' )
921
+		'C'  => __('A Coru&ntilde;a', 'give'),
922
+		'VI' => __('Araba', 'give'),
923
+		'AB' => __('Albacete', 'give'),
924
+		'A'  => __('Alicante', 'give'),
925
+		'AL' => __('Almer&iacute;a', 'give'),
926
+		'O'  => __('Asturias', 'give'),
927
+		'AV' => __('&Aacute;vila', 'give'),
928
+		'BA' => __('Badajoz', 'give'),
929
+		'PM' => __('Baleares', 'give'),
930
+		'B'  => __('Barcelona', 'give'),
931
+		'BU' => __('Burgos', 'give'),
932
+		'CC' => __('C&aacute;ceres', 'give'),
933
+		'CA' => __('C&aacute;diz', 'give'),
934
+		'S'  => __('Cantabria', 'give'),
935
+		'CS' => __('Castell&oacute;n', 'give'),
936
+		'CE' => __('Ceuta', 'give'),
937
+		'CR' => __('Ciudad Real', 'give'),
938
+		'CO' => __('C&oacute;rdoba', 'give'),
939
+		'CU' => __('Cuenca', 'give'),
940
+		'GI' => __('Girona', 'give'),
941
+		'GR' => __('Granada', 'give'),
942
+		'GU' => __('Guadalajara', 'give'),
943
+		'SS' => __('Gipuzkoa', 'give'),
944
+		'H'  => __('Huelva', 'give'),
945
+		'HU' => __('Huesca', 'give'),
946
+		'J'  => __('Ja&eacute;n', 'give'),
947
+		'LO' => __('La Rioja', 'give'),
948
+		'GC' => __('Las Palmas', 'give'),
949
+		'LE' => __('Le&oacute;n', 'give'),
950
+		'L'  => __('Lleida', 'give'),
951
+		'LU' => __('Lugo', 'give'),
952
+		'M'  => __('Madrid', 'give'),
953
+		'MA' => __('M&aacute;laga', 'give'),
954
+		'ML' => __('Melilla', 'give'),
955
+		'MU' => __('Murcia', 'give'),
956
+		'NA' => __('Navarra', 'give'),
957
+		'OR' => __('Ourense', 'give'),
958
+		'P'  => __('Palencia', 'give'),
959
+		'PO' => __('Pontevedra', 'give'),
960
+		'SA' => __('Salamanca', 'give'),
961
+		'TF' => __('Santa Cruz de Tenerife', 'give'),
962
+		'SG' => __('Segovia', 'give'),
963
+		'SE' => __('Sevilla', 'give'),
964
+		'SO' => __('Soria', 'give'),
965
+		'T'  => __('Tarragona', 'give'),
966
+		'TE' => __('Teruel', 'give'),
967
+		'TO' => __('Toledo', 'give'),
968
+		'V'  => __('Valencia', 'give'),
969
+		'VA' => __('Valladolid', 'give'),
970
+		'BI' => __('Bizkaia', 'give'),
971
+		'ZA' => __('Zamora', 'give'),
972
+		'Z'  => __('Zaragoza', 'give')
973 973
 	);
974 974
 
975
-	return apply_filters( 'give_spain_states', $states );
975
+	return apply_filters('give_spain_states', $states);
976 976
 }
Please login to merge, or discard this patch.
includes/emails/actions.php 1 patch
Spacing   +18 added lines, -18 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,17 +23,17 @@  discard block
 block discarded – undo
23 23
  *
24 24
  * @return void
25 25
  */
26
-function give_trigger_donation_receipt( $payment_id ) {
26
+function give_trigger_donation_receipt($payment_id) {
27 27
 	// Make sure we don't send a purchase receipt while editing a payment
28
-	if ( isset( $_POST['give-action'] ) && 'edit_payment' == $_POST['give-action'] ) {
28
+	if (isset($_POST['give-action']) && 'edit_payment' == $_POST['give-action']) {
29 29
 		return;
30 30
 	}
31 31
 
32 32
 	// Send email
33
-	give_email_donation_receipt( $payment_id );
33
+	give_email_donation_receipt($payment_id);
34 34
 }
35 35
 
36
-add_action( 'give_complete_purchase', 'give_trigger_donation_receipt', 999, 1 );
36
+add_action('give_complete_purchase', 'give_trigger_donation_receipt', 999, 1);
37 37
 
38 38
 /**
39 39
  * Resend the Email Purchase Receipt. (This can be done from the Payment History page)
@@ -44,29 +44,29 @@  discard block
 block discarded – undo
44 44
  *
45 45
  * @return void
46 46
  */
47
-function give_resend_donation_receipt( $data ) {
47
+function give_resend_donation_receipt($data) {
48 48
 
49
-	$purchase_id = absint( $data['purchase_id'] );
49
+	$purchase_id = absint($data['purchase_id']);
50 50
 
51
-	if ( empty( $purchase_id ) ) {
51
+	if (empty($purchase_id)) {
52 52
 		return;
53 53
 	}
54 54
 
55
-	if ( ! current_user_can( 'edit_give_payments', $purchase_id ) ) {
56
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
55
+	if ( ! current_user_can('edit_give_payments', $purchase_id)) {
56
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
57 57
 	}
58 58
 
59
-	give_email_donation_receipt( $purchase_id, false );
59
+	give_email_donation_receipt($purchase_id, false);
60 60
 
61
-	wp_redirect( add_query_arg( array(
61
+	wp_redirect(add_query_arg(array(
62 62
 		'give-message' => 'email_sent',
63 63
 		'give-action'  => false,
64 64
 		'purchase_id'  => false
65
-	) ) );
65
+	)));
66 66
 	exit;
67 67
 }
68 68
 
69
-add_action( 'give_email_links', 'give_resend_donation_receipt' );
69
+add_action('give_email_links', 'give_resend_donation_receipt');
70 70
 
71 71
 /**
72 72
  * Trigger the sending of a Test Email
@@ -77,8 +77,8 @@  discard block
 block discarded – undo
77 77
  *
78 78
  * @return void
79 79
  */
80
-function give_send_test_email( $data ) {
81
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give-test-email' ) ) {
80
+function give_send_test_email($data) {
81
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give-test-email')) {
82 82
 		return;
83 83
 	}
84 84
 
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
 	give_email_test_donation_receipt();
87 87
 
88 88
 	// Remove the test email query arg
89
-	wp_redirect( remove_query_arg( 'give_action' ) );
89
+	wp_redirect(remove_query_arg('give_action'));
90 90
 	exit;
91 91
 }
92 92
 
93
-add_action( 'give_send_test_email', 'give_send_test_email' );
93
+add_action('give_send_test_email', 'give_send_test_email');
Please login to merge, or discard this patch.
includes/emails/class-give-emails.php 1 patch
Spacing   +58 added lines, -58 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
 
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function __construct() {
81 81
 
82
-		if ( 'none' === $this->get_template() ) {
82
+		if ('none' === $this->get_template()) {
83 83
 			$this->html = false;
84 84
 		}
85 85
 
86
-		add_action( 'give_email_send_before', array( $this, 'send_before' ) );
87
-		add_action( 'give_email_send_after', array( $this, 'send_after' ) );
86
+		add_action('give_email_send_before', array($this, 'send_before'));
87
+		add_action('give_email_send_after', array($this, 'send_after'));
88 88
 
89 89
 	}
90 90
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 *
94 94
 	 * @since 1.0
95 95
 	 */
96
-	public function __set( $key, $value ) {
96
+	public function __set($key, $value) {
97 97
 		$this->$key = $value;
98 98
 	}
99 99
 
@@ -103,11 +103,11 @@  discard block
 block discarded – undo
103 103
 	 * @since 1.0
104 104
 	 */
105 105
 	public function get_from_name() {
106
-		if ( ! $this->from_name ) {
107
-			$this->from_name = give_get_option( 'from_name', get_bloginfo( 'name' ) );
106
+		if ( ! $this->from_name) {
107
+			$this->from_name = give_get_option('from_name', get_bloginfo('name'));
108 108
 		}
109 109
 
110
-		return apply_filters( 'give_email_from_name', wp_specialchars_decode( $this->from_name ), $this );
110
+		return apply_filters('give_email_from_name', wp_specialchars_decode($this->from_name), $this);
111 111
 	}
112 112
 
113 113
 	/**
@@ -116,11 +116,11 @@  discard block
 block discarded – undo
116 116
 	 * @since 1.0
117 117
 	 */
118 118
 	public function get_from_address() {
119
-		if ( ! $this->from_address ) {
120
-			$this->from_address = give_get_option( 'from_email', get_option( 'admin_email' ) );
119
+		if ( ! $this->from_address) {
120
+			$this->from_address = give_get_option('from_email', get_option('admin_email'));
121 121
 		}
122 122
 
123
-		return apply_filters( 'give_email_from_address', $this->from_address, $this );
123
+		return apply_filters('give_email_from_address', $this->from_address, $this);
124 124
 	}
125 125
 
126 126
 	/**
@@ -129,13 +129,13 @@  discard block
 block discarded – undo
129 129
 	 * @since 1.0
130 130
 	 */
131 131
 	public function get_content_type() {
132
-		if ( ! $this->content_type && $this->html ) {
133
-			$this->content_type = apply_filters( 'give_email_default_content_type', 'text/html', $this );
134
-		} else if ( ! $this->html ) {
132
+		if ( ! $this->content_type && $this->html) {
133
+			$this->content_type = apply_filters('give_email_default_content_type', 'text/html', $this);
134
+		} else if ( ! $this->html) {
135 135
 			$this->content_type = 'text/plain';
136 136
 		}
137 137
 
138
-		return apply_filters( 'give_email_content_type', $this->content_type, $this );
138
+		return apply_filters('give_email_content_type', $this->content_type, $this);
139 139
 	}
140 140
 
141 141
 	/**
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
 	 * @since 1.0
145 145
 	 */
146 146
 	public function get_headers() {
147
-		if ( ! $this->headers ) {
147
+		if ( ! $this->headers) {
148 148
 			$this->headers = "From: {$this->get_from_name()} <{$this->get_from_address()}>\r\n";
149 149
 			$this->headers .= "Reply-To: {$this->get_from_address()}\r\n";
150 150
 			$this->headers .= "Content-Type: {$this->get_content_type()}; charset=utf-8\r\n";
151 151
 		}
152 152
 
153
-		return apply_filters( 'give_email_headers', $this->headers, $this );
153
+		return apply_filters('give_email_headers', $this->headers, $this);
154 154
 	}
155 155
 
156 156
 	/**
@@ -160,11 +160,11 @@  discard block
 block discarded – undo
160 160
 	 */
161 161
 	public function get_templates() {
162 162
 		$templates = array(
163
-			'default' => __( 'Default Template', 'give' ),
164
-			'none'    => __( 'No template, plain text only', 'give' )
163
+			'default' => __('Default Template', 'give'),
164
+			'none'    => __('No template, plain text only', 'give')
165 165
 		);
166 166
 
167
-		return apply_filters( 'give_email_templates', $templates );
167
+		return apply_filters('give_email_templates', $templates);
168 168
 	}
169 169
 
170 170
 	/**
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
173 173
 	 * @since 1.0
174 174
 	 */
175 175
 	public function get_template() {
176
-		if ( ! $this->template ) {
177
-			$this->template = give_get_option( 'email_template', 'default' );
176
+		if ( ! $this->template) {
177
+			$this->template = give_get_option('email_template', 'default');
178 178
 		}
179 179
 
180
-		return apply_filters( 'give_email_template', $this->template );
180
+		return apply_filters('give_email_template', $this->template);
181 181
 	}
182 182
 
183 183
 	/**
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 	 * @since 1.0
187 187
 	 */
188 188
 	public function get_heading() {
189
-		return apply_filters( 'give_email_heading', $this->heading );
189
+		return apply_filters('give_email_heading', $this->heading);
190 190
 	}
191 191
 
192 192
 	/**
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 	 *
197 197
 	 * @return mixed
198 198
 	 */
199
-	public function parse_tags( $content ) {
199
+	public function parse_tags($content) {
200 200
 
201 201
 		// The email tags are parsed during setup for purchase receipts and sale notifications
202 202
 		// Once tags are not restricted to payments, we'll expand this. @see https://github.com/easydigitaldownloads/Easy-Digital-Downloads/issues/2151
@@ -209,36 +209,36 @@  discard block
 block discarded – undo
209 209
 	 *
210 210
 	 * @since 1.0
211 211
 	 */
212
-	public function build_email( $message ) {
212
+	public function build_email($message) {
213 213
 
214
-		if ( false === $this->html ) {
215
-			return apply_filters( 'give_email_message', wp_strip_all_tags( $message ), $this );
214
+		if (false === $this->html) {
215
+			return apply_filters('give_email_message', wp_strip_all_tags($message), $this);
216 216
 		}
217 217
 
218
-		$message = $this->text_to_html( $message );
218
+		$message = $this->text_to_html($message);
219 219
 
220 220
 		ob_start();
221 221
 
222
-		give_get_template_part( 'emails/header', $this->get_template(), true );
222
+		give_get_template_part('emails/header', $this->get_template(), true);
223 223
 
224
-		do_action( 'give_email_header', $this );
224
+		do_action('give_email_header', $this);
225 225
 
226
-		if ( has_action( 'give_email_template_' . $this->get_template() ) ) {
227
-			do_action( 'give_email_template_' . $this->get_template() );
226
+		if (has_action('give_email_template_'.$this->get_template())) {
227
+			do_action('give_email_template_'.$this->get_template());
228 228
 		} else {
229
-			give_get_template_part( 'emails/body', $this->get_template(), true );
229
+			give_get_template_part('emails/body', $this->get_template(), true);
230 230
 		}
231 231
 
232
-		do_action( 'give_email_body', $this );
232
+		do_action('give_email_body', $this);
233 233
 
234
-		give_get_template_part( 'emails/footer', $this->get_template(), true );
234
+		give_get_template_part('emails/footer', $this->get_template(), true);
235 235
 
236
-		do_action( 'give_email_footer', $this );
236
+		do_action('give_email_footer', $this);
237 237
 
238 238
 		$body    = ob_get_clean();
239
-		$message = str_replace( '{email}', $message, $body );
239
+		$message = str_replace('{email}', $message, $body);
240 240
 
241
-		return apply_filters( 'give_email_message', $message, $this );
241
+		return apply_filters('give_email_message', $message, $this);
242 242
 	}
243 243
 
244 244
 	/**
@@ -251,26 +251,26 @@  discard block
 block discarded – undo
251 251
 	 *
252 252
 	 * @return bool
253 253
 	 */
254
-	public function send( $to, $subject, $message, $attachments = '' ) {
254
+	public function send($to, $subject, $message, $attachments = '') {
255 255
 
256
-		if ( ! did_action( 'init' ) && ! did_action( 'admin_init' ) ) {
257
-			_doing_it_wrong( __FUNCTION__, __( 'You cannot send email with Give_Emails until init/admin_init has been reached', 'give' ), null );
256
+		if ( ! did_action('init') && ! did_action('admin_init')) {
257
+			_doing_it_wrong(__FUNCTION__, __('You cannot send email with Give_Emails until init/admin_init has been reached', 'give'), null);
258 258
 
259 259
 			return false;
260 260
 		}
261 261
 
262
-		do_action( 'give_email_send_before', $this );
262
+		do_action('give_email_send_before', $this);
263 263
 
264
-		$subject = $this->parse_tags( $subject );
265
-		$message = $this->parse_tags( $message );
264
+		$subject = $this->parse_tags($subject);
265
+		$message = $this->parse_tags($message);
266 266
 
267
-		$message = $this->build_email( $message );
267
+		$message = $this->build_email($message);
268 268
 
269
-		$attachments = apply_filters( 'give_email_attachments', $attachments, $this );
269
+		$attachments = apply_filters('give_email_attachments', $attachments, $this);
270 270
 
271
-		$sent = wp_mail( $to, $subject, $message, $this->get_headers(), $attachments );
271
+		$sent = wp_mail($to, $subject, $message, $this->get_headers(), $attachments);
272 272
 
273
-		do_action( 'give_email_send_after', $this );
273
+		do_action('give_email_send_after', $this);
274 274
 
275 275
 		return $sent;
276 276
 
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
 	 * @since 1.0
283 283
 	 */
284 284
 	public function send_before() {
285
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
286
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
287
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
285
+		add_filter('wp_mail_from', array($this, 'get_from_address'));
286
+		add_filter('wp_mail_from_name', array($this, 'get_from_name'));
287
+		add_filter('wp_mail_content_type', array($this, 'get_content_type'));
288 288
 	}
289 289
 
290 290
 	/**
@@ -293,9 +293,9 @@  discard block
 block discarded – undo
293 293
 	 * @since 1.0
294 294
 	 */
295 295
 	public function send_after() {
296
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
297
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
298
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
296
+		remove_filter('wp_mail_from', array($this, 'get_from_address'));
297
+		remove_filter('wp_mail_from_name', array($this, 'get_from_name'));
298
+		remove_filter('wp_mail_content_type', array($this, 'get_content_type'));
299 299
 
300 300
 		// Reset heading to an empty string
301 301
 		$this->heading = '';
@@ -306,10 +306,10 @@  discard block
 block discarded – undo
306 306
 	 *
307 307
 	 * @since 1.0
308 308
 	 */
309
-	public function text_to_html( $message ) {
309
+	public function text_to_html($message) {
310 310
 
311
-		if ( 'text/html' == $this->content_type || true === $this->html ) {
312
-			$message = wpautop( $message );
311
+		if ('text/html' == $this->content_type || true === $this->html) {
312
+			$message = wpautop($message);
313 313
 		}
314 314
 
315 315
 		return $message;
Please login to merge, or discard this patch.