@@ -72,7 +72,7 @@ |
||
72 | 72 | * |
73 | 73 | * @param mixed $value The value in. |
74 | 74 | * |
75 | - * @return mixed The value out. |
|
75 | + * @return string The value out. |
|
76 | 76 | */ |
77 | 77 | public function get_value( $value ) { |
78 | 78 | return $this->get_string_from_value( $value ); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function get_content( $output, $entry = array(), $field_settings = array(), $field = array() ) { |
61 | 61 | |
62 | 62 | /** Overridden by a template. */ |
63 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
63 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
64 | 64 | |
65 | 65 | return $this->get_string_from_value( $output ); |
66 | 66 | } |
@@ -92,11 +92,11 @@ discard block |
||
92 | 92 | switch ( intval( $value ) ) { |
93 | 93 | case self::NOT_FULFILLED: |
94 | 94 | default: |
95 | - $return = __('Not Fulfilled', 'gravityview'); |
|
95 | + $return = __( 'Not Fulfilled', 'gravityview' ); |
|
96 | 96 | break; |
97 | 97 | |
98 | 98 | case self::FULFILLED: |
99 | - $return = __('Fulfilled', 'gravityview'); |
|
99 | + $return = __( 'Fulfilled', 'gravityview' ); |
|
100 | 100 | break; |
101 | 101 | } |
102 | 102 | |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | * |
117 | 117 | * @return string Original text if {is_fulfilled} isn't found. Otherwise, "Not Fulfilled" or "Fulfilled" |
118 | 118 | */ |
119 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
119 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
120 | 120 | |
121 | 121 | $return = $text; |
122 | 122 | |
123 | 123 | foreach ( $matches as $match ) { |
124 | 124 | |
125 | - $full_tag = $match[0]; |
|
125 | + $full_tag = $match[ 0 ]; |
|
126 | 126 | |
127 | 127 | $fulfilled = \GV\Utils::get( $entry, 'is_fulfilled' ); |
128 | 128 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | * @param \GV\Entry $entry The entry. |
70 | 70 | * @param \GV\Request $request The request context. |
71 | 71 | * |
72 | - * @return mixed $value The filtered value. |
|
72 | + * @return string $value The filtered value. |
|
73 | 73 | */ |
74 | 74 | public function get_value( $value, $field, $view, $source, $entry, $request ) { |
75 | 75 | return $this->get_content( $value, $entry->as_entry(), $field->as_configuration() ); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) { |
50 | 50 | |
51 | 51 | /** Overridden by a template. */ |
52 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
52 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
53 | 53 | |
54 | 54 | $amount = \GV\Utils::get( $entry, 'payment_amount' ); |
55 | 55 | $return = GFCommon::to_money( $amount, \GV\Utils::get( $entry, 'currency' ) ); |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | * |
89 | 89 | * @return string Original text if {date_created} isn't found. Otherwise, replaced text. |
90 | 90 | */ |
91 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
91 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
92 | 92 | |
93 | 93 | $return = $text; |
94 | 94 | |
95 | 95 | foreach ( $matches as $match ) { |
96 | 96 | |
97 | - $full_tag = $match[0]; |
|
98 | - $modifier = isset( $match[1] ) ? $match[1] : false; |
|
97 | + $full_tag = $match[ 0 ]; |
|
98 | + $modifier = isset( $match[ 1 ] ) ? $match[ 1 ] : false; |
|
99 | 99 | |
100 | 100 | $amount = \GV\Utils::get( $entry, 'payment_amount' ); |
101 | 101 |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | $this->api_data = $_api_data; |
39 | 39 | $this->name = plugin_basename( $_plugin_file ); |
40 | 40 | $this->slug = basename( $_plugin_file, '.php' ); |
41 | - $this->version = $_api_data['version']; |
|
42 | - $this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false; |
|
43 | - $this->beta = ! empty( $this->api_data['beta'] ) ? true : false; |
|
44 | - $this->cache_key = md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
41 | + $this->version = $_api_data[ 'version' ]; |
|
42 | + $this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false; |
|
43 | + $this->beta = ! empty( $this->api_data[ 'beta' ] ) ? true : false; |
|
44 | + $this->cache_key = md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
45 | 45 | |
46 | 46 | $edd_plugin_data[ $this->slug ] = $this->api_data; |
47 | 47 | |
@@ -133,11 +133,11 @@ discard block |
||
133 | 133 | return; |
134 | 134 | } |
135 | 135 | |
136 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
136 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
137 | 137 | return; |
138 | 138 | } |
139 | 139 | |
140 | - if( ! is_multisite() ) { |
|
140 | + if ( ! is_multisite() ) { |
|
141 | 141 | return; |
142 | 142 | } |
143 | 143 | |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | '<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">', |
213 | 213 | esc_html( $version_info->new_version ), |
214 | 214 | '</a>', |
215 | - '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">', |
|
215 | + '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">', |
|
216 | 216 | '</a>' |
217 | 217 | ); |
218 | 218 | } |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | ) |
257 | 257 | ); |
258 | 258 | |
259 | - $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
259 | + $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
260 | 260 | |
261 | 261 | // Get the transient where we store the api request for this plugin for 24 hours |
262 | 262 | $edd_api_request_transient = $this->get_cached_version_info( $cache_key ); |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | |
312 | 312 | $verify_ssl = $this->verify_ssl(); |
313 | 313 | if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
314 | - $args['sslverify'] = $verify_ssl; |
|
314 | + $args[ 'sslverify' ] = $verify_ssl; |
|
315 | 315 | } |
316 | 316 | return $args; |
317 | 317 | |
@@ -334,24 +334,24 @@ discard block |
||
334 | 334 | |
335 | 335 | $data = array_merge( $this->api_data, $_data ); |
336 | 336 | |
337 | - if ( $data['slug'] != $this->slug ) { |
|
337 | + if ( $data[ 'slug' ] != $this->slug ) { |
|
338 | 338 | return; |
339 | 339 | } |
340 | 340 | |
341 | - if( $this->api_url == trailingslashit (home_url() ) ) { |
|
341 | + if ( $this->api_url == trailingslashit( home_url() ) ) { |
|
342 | 342 | return false; // Don't allow a plugin to ping itself |
343 | 343 | } |
344 | 344 | |
345 | 345 | $api_params = array( |
346 | 346 | 'edd_action' => 'get_version', |
347 | - 'license' => ! empty( $data['license'] ) ? $data['license'] : '', |
|
348 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
349 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
350 | - 'version' => isset( $data['version'] ) ? $data['version'] : false, |
|
351 | - 'slug' => $data['slug'], |
|
352 | - 'author' => $data['author'], |
|
347 | + 'license' => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '', |
|
348 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
349 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
350 | + 'version' => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false, |
|
351 | + 'slug' => $data[ 'slug' ], |
|
352 | + 'author' => $data[ 'author' ], |
|
353 | 353 | 'url' => home_url(), |
354 | - 'beta' => ! empty( $data['beta'] ), |
|
354 | + 'beta' => ! empty( $data[ 'beta' ] ), |
|
355 | 355 | ); |
356 | 356 | |
357 | 357 | $verify_ssl = $this->verify_ssl(); |
@@ -371,9 +371,9 @@ discard block |
||
371 | 371 | $request->banners = maybe_unserialize( $request->banners ); |
372 | 372 | } |
373 | 373 | |
374 | - if( ! empty( $request->sections ) ) { |
|
375 | - foreach( $request->sections as $key => $section ) { |
|
376 | - $request->$key = (array) $section; |
|
374 | + if ( ! empty( $request->sections ) ) { |
|
375 | + foreach ( $request->sections as $key => $section ) { |
|
376 | + $request->$key = (array)$section; |
|
377 | 377 | } |
378 | 378 | } |
379 | 379 | |
@@ -384,37 +384,37 @@ discard block |
||
384 | 384 | |
385 | 385 | global $edd_plugin_data; |
386 | 386 | |
387 | - if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
387 | + if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) { |
|
388 | 388 | return; |
389 | 389 | } |
390 | 390 | |
391 | - if( empty( $_REQUEST['plugin'] ) ) { |
|
391 | + if ( empty( $_REQUEST[ 'plugin' ] ) ) { |
|
392 | 392 | return; |
393 | 393 | } |
394 | 394 | |
395 | - if( empty( $_REQUEST['slug'] ) ) { |
|
395 | + if ( empty( $_REQUEST[ 'slug' ] ) ) { |
|
396 | 396 | return; |
397 | 397 | } |
398 | 398 | |
399 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
399 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
400 | 400 | wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) ); |
401 | 401 | } |
402 | 402 | |
403 | - $data = $edd_plugin_data[ $_REQUEST['slug'] ]; |
|
404 | - $beta = ! empty( $data['beta'] ) ? true : false; |
|
405 | - $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' ); |
|
403 | + $data = $edd_plugin_data[ $_REQUEST[ 'slug' ] ]; |
|
404 | + $beta = ! empty( $data[ 'beta' ] ) ? true : false; |
|
405 | + $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' ); |
|
406 | 406 | $version_info = $this->get_cached_version_info( $cache_key ); |
407 | 407 | |
408 | - if( false === $version_info ) { |
|
408 | + if ( false === $version_info ) { |
|
409 | 409 | |
410 | 410 | $api_params = array( |
411 | 411 | 'edd_action' => 'get_version', |
412 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
413 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
414 | - 'slug' => $_REQUEST['slug'], |
|
415 | - 'author' => $data['author'], |
|
412 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
413 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
414 | + 'slug' => $_REQUEST[ 'slug' ], |
|
415 | + 'author' => $data[ 'author' ], |
|
416 | 416 | 'url' => home_url(), |
417 | - 'beta' => ! empty( $data['beta'] ) |
|
417 | + 'beta' => ! empty( $data[ 'beta' ] ) |
|
418 | 418 | ); |
419 | 419 | |
420 | 420 | $verify_ssl = $this->verify_ssl(); |
@@ -431,9 +431,9 @@ discard block |
||
431 | 431 | $version_info = false; |
432 | 432 | } |
433 | 433 | |
434 | - if( ! empty( $version_info ) ) { |
|
435 | - foreach( $version_info->sections as $key => $section ) { |
|
436 | - $version_info->$key = (array) $section; |
|
434 | + if ( ! empty( $version_info ) ) { |
|
435 | + foreach ( $version_info->sections as $key => $section ) { |
|
436 | + $version_info->$key = (array)$section; |
|
437 | 437 | } |
438 | 438 | } |
439 | 439 | |
@@ -441,8 +441,8 @@ discard block |
||
441 | 441 | |
442 | 442 | } |
443 | 443 | |
444 | - if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) { |
|
445 | - echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>'; |
|
444 | + if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) { |
|
445 | + echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>'; |
|
446 | 446 | } |
447 | 447 | |
448 | 448 | exit; |
@@ -450,23 +450,23 @@ discard block |
||
450 | 450 | |
451 | 451 | public function get_cached_version_info( $cache_key = '' ) { |
452 | 452 | |
453 | - if( empty( $cache_key ) ) { |
|
453 | + if ( empty( $cache_key ) ) { |
|
454 | 454 | $cache_key = $this->cache_key; |
455 | 455 | } |
456 | 456 | |
457 | 457 | $cache = get_option( $cache_key ); |
458 | 458 | |
459 | - if( empty( $cache['timeout'] ) || current_time( 'timestamp' ) > $cache['timeout'] ) { |
|
459 | + if ( empty( $cache[ 'timeout' ] ) || current_time( 'timestamp' ) > $cache[ 'timeout' ] ) { |
|
460 | 460 | return false; // Cache is expired |
461 | 461 | } |
462 | 462 | |
463 | - return json_decode( $cache['value'] ); |
|
463 | + return json_decode( $cache[ 'value' ] ); |
|
464 | 464 | |
465 | 465 | } |
466 | 466 | |
467 | 467 | public function set_version_info_cache( $value = '', $cache_key = '' ) { |
468 | 468 | |
469 | - if( empty( $cache_key ) ) { |
|
469 | + if ( empty( $cache_key ) ) { |
|
470 | 470 | $cache_key = $this->cache_key; |
471 | 471 | } |
472 | 472 | |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | * @return bool |
487 | 487 | */ |
488 | 488 | private function verify_ssl() { |
489 | - return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
489 | + return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
490 | 490 | } |
491 | 491 | |
492 | 492 | } |
@@ -2,7 +2,9 @@ |
||
2 | 2 | namespace GV; |
3 | 3 | |
4 | 4 | // Exit if accessed directly |
5 | -if ( ! defined( 'ABSPATH' ) ) exit; |
|
5 | +if ( ! defined( 'ABSPATH' ) ) { |
|
6 | + exit; |
|
7 | +} |
|
6 | 8 | |
7 | 9 | /** |
8 | 10 | * Allows plugins to use their own update API. |
@@ -78,7 +78,7 @@ |
||
78 | 78 | * @uses api_request() |
79 | 79 | * |
80 | 80 | * @param array $_transient_data Update array build by WordPress. |
81 | - * @return array Modified update array with custom plugin data. |
|
81 | + * @return \stdClass Modified update array with custom plugin data. |
|
82 | 82 | */ |
83 | 83 | public function check_update( $_transient_data ) { |
84 | 84 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' ); |
26 | 26 | printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' ); |
27 | 27 | printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), |
28 | - '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version ); |
|
28 | + '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version ); |
|
29 | 29 | printf( '</body>' ); |
30 | 30 | } |
31 | 31 | |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */ |
37 | -if ( version_compare( phpversion(), '5.3.0' , '<' ) ) { |
|
37 | +if ( version_compare( phpversion(), '5.3.0', '<' ) ) { |
|
38 | 38 | require GRAVITYVIEW_DIR . 'future/_stubs.php'; |
39 | 39 | |
40 | 40 | /** All looks fine. */ |
@@ -61,7 +61,7 @@ |
||
61 | 61 | $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
62 | 62 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
63 | 63 | |
64 | - $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
64 | + $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
65 | 65 | $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
66 | 66 | |
67 | 67 | echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID ); |
@@ -62,7 +62,6 @@ |
||
62 | 62 | * |
63 | 63 | * Internal static cache for gets, and whatnot. |
64 | 64 | * This is not persistent, resets across requests. |
65 | - |
|
66 | 65 | * @internal |
67 | 66 | */ |
68 | 67 | private static $cache = array(); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $supports = array( 'title', 'revisions' ); |
109 | 109 | |
110 | 110 | if ( $is_hierarchical ) { |
111 | - $supports[] = 'page-attributes'; |
|
111 | + $supports[ ] = 'page-attributes'; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -288,13 +288,13 @@ discard block |
||
288 | 288 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
289 | 289 | } |
290 | 290 | |
291 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
291 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
292 | 292 | |
293 | 293 | /** |
294 | 294 | * Editing a single entry. |
295 | 295 | */ |
296 | 296 | if ( $entry = $request->is_edit_entry() ) { |
297 | - if ( $entry['status'] != 'active' ) { |
|
297 | + if ( $entry[ 'status' ] != 'active' ) { |
|
298 | 298 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
299 | 299 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
300 | 300 | } |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | } |
306 | 306 | |
307 | 307 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
308 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
308 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
309 | 309 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
310 | 310 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
311 | 311 | } |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | * Viewing a single entry. |
319 | 319 | */ |
320 | 320 | } else if ( $entry = $request->is_entry() ) { |
321 | - if ( $entry['status'] != 'active' ) { |
|
321 | + if ( $entry[ 'status' ] != 'active' ) { |
|
322 | 322 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
323 | 323 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
324 | 324 | } |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
332 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
332 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
333 | 333 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
334 | 334 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
335 | 335 | } |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | |
338 | 338 | $error = \GVCommon::check_entry_display( $entry->as_entry() ); |
339 | 339 | |
340 | - if( is_wp_error( $error ) ) { |
|
340 | + if ( is_wp_error( $error ) ) { |
|
341 | 341 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) ); |
342 | 342 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
343 | 343 | } |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column ); |
397 | 397 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column ); |
398 | 398 | |
399 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
399 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
400 | 400 | } |
401 | 401 | |
402 | 402 | return $joins; |
@@ -431,10 +431,10 @@ discard block |
||
431 | 431 | |
432 | 432 | list( $join, $join_column, $join_on, $join_on_column ) = $meta; |
433 | 433 | |
434 | - $forms_ids [] = GF_Form::by_id( $join_on ); |
|
434 | + $forms_ids [ ] = GF_Form::by_id( $join_on ); |
|
435 | 435 | } |
436 | 436 | |
437 | - return ( !empty( $forms_ids) ) ? $forms_ids : null; |
|
437 | + return ( ! empty( $forms_ids ) ) ? $forms_ids : null; |
|
438 | 438 | } |
439 | 439 | |
440 | 440 | /** |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | if ( ! $view->form ) { |
465 | 465 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
466 | 466 | 'view_id' => $view->ID, |
467 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
467 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
468 | 468 | ) ); |
469 | 469 | } |
470 | 470 | |
@@ -690,28 +690,27 @@ discard block |
||
690 | 690 | * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead |
691 | 691 | */ |
692 | 692 | $parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID ); |
693 | - $parameters['context_view_id'] = $this->ID; |
|
693 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
694 | 694 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
695 | 695 | |
696 | 696 | if ( $request instanceof REST\Request ) { |
697 | 697 | $atts = $this->settings->as_atts(); |
698 | 698 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
699 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
699 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
700 | 700 | ) ); |
701 | - $parameters['paging'] = $paging_parameters['paging']; |
|
701 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
702 | 702 | } |
703 | 703 | |
704 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
705 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
704 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
706 | 705 | |
707 | 706 | if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) { |
708 | 707 | /** |
709 | 708 | * New \GF_Query stuff :) |
710 | 709 | */ |
711 | - $query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] ); |
|
710 | + $query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] ); |
|
712 | 711 | |
713 | - $query->limit( $parameters['paging']['page_size'] ) |
|
714 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
712 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
713 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
715 | 714 | |
716 | 715 | /** |
717 | 716 | * Any joins? |
@@ -751,15 +750,15 @@ discard block |
||
751 | 750 | } ); |
752 | 751 | } else { |
753 | 752 | $entries = $this->form->entries |
754 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
753 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
755 | 754 | ->offset( $this->settings->get( 'offset' ) ) |
756 | - ->limit( $parameters['paging']['page_size'] ) |
|
755 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
757 | 756 | ->page( $page ); |
758 | 757 | |
759 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
758 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
760 | 759 | $field = new \GV\Field(); |
761 | - $field->ID = $parameters['sorting']['key']; |
|
762 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
760 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
761 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
763 | 762 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
764 | 763 | } |
765 | 764 | } |
@@ -690,6 +690,7 @@ |
||
690 | 690 | * Retrieve the entries for the current view and request. |
691 | 691 | * |
692 | 692 | * @param \GV\Request The request. Usued for now. |
693 | + * @param Request $request |
|
693 | 694 | * |
694 | 695 | * @return \GV\Entry_Collection The entries. |
695 | 696 | */ |
@@ -34,7 +34,7 @@ |
||
34 | 34 | global $post; |
35 | 35 | |
36 | 36 | if ( $post ) { |
37 | - $context['post'] = $post; |
|
37 | + $context[ 'post' ] = $post; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | \GV\Mocks\Legacy_Context::push( $context ); |
@@ -64,9 +64,9 @@ |
||
64 | 64 | */ |
65 | 65 | $hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context ); |
66 | 66 | |
67 | - $extras['hide_empty'] = $hide_empty; |
|
68 | - $extras['label'] = $label; |
|
69 | - $extras['value'] = $value; |
|
67 | + $extras[ 'hide_empty' ] = $hide_empty; |
|
68 | + $extras[ 'label' ] = $label; |
|
69 | + $extras[ 'value' ] = $value; |
|
70 | 70 | |
71 | 71 | return \gravityview_field_output( $extras, $context ); |
72 | 72 | } |
@@ -151,11 +151,11 @@ discard block |
||
151 | 151 | do_action( 'gravityview/template/list/body/before', $context ); |
152 | 152 | |
153 | 153 | /** |
154 | - * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
155 | - * @deprecated Use `gravityview/template/list/body/before` |
|
156 | - * @since 1.0.7 |
|
157 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
158 | - */ |
|
154 | + * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
155 | + * @deprecated Use `gravityview/template/list/body/before` |
|
156 | + * @since 1.0.7 |
|
157 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
158 | + */ |
|
159 | 159 | do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ ); |
160 | 160 | } |
161 | 161 | |
@@ -177,11 +177,11 @@ discard block |
||
177 | 177 | do_action( 'gravityview/template/list/body/after', $context ); |
178 | 178 | |
179 | 179 | /** |
180 | - * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
181 | - * @deprecated Use `gravityview/template/list/body/after` |
|
182 | - * @since 1.0.7 |
|
183 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
184 | - */ |
|
180 | + * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
181 | + * @deprecated Use `gravityview/template/list/body/after` |
|
182 | + * @since 1.0.7 |
|
183 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
184 | + */ |
|
185 | 185 | do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ ); |
186 | 186 | } |
187 | 187 | |
@@ -212,11 +212,11 @@ discard block |
||
212 | 212 | $zone = str_replace( '/', '_', $zone ); |
213 | 213 | |
214 | 214 | /** |
215 | - * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows. |
|
216 | - * @deprecated Use `gravityview/template/list/entry/$zone/before` |
|
217 | - * @since 1.0.7 |
|
218 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
219 | - */ |
|
215 | + * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows. |
|
216 | + * @deprecated Use `gravityview/template/list/entry/$zone/before` |
|
217 | + * @since 1.0.7 |
|
218 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
219 | + */ |
|
220 | 220 | do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ ); |
221 | 221 | } |
222 | 222 | |
@@ -247,11 +247,11 @@ discard block |
||
247 | 247 | $zone = str_replace( '/', '_', $zone ); |
248 | 248 | |
249 | 249 | /** |
250 | - * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows. |
|
251 | - * @deprecated Use `gravityview/template/list/entry/after` |
|
252 | - * @since 1.0.7 |
|
253 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
254 | - */ |
|
250 | + * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows. |
|
251 | + * @deprecated Use `gravityview/template/list/entry/after` |
|
252 | + * @since 1.0.7 |
|
253 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
254 | + */ |
|
255 | 255 | do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ ); |
256 | 256 | } |
257 | 257 | } |
@@ -113,14 +113,14 @@ |
||
113 | 113 | |
114 | 114 | /** Require critical legacy core files. @todo Deprecate */ |
115 | 115 | require_once $this->plugin->dir( 'includes/helper-functions.php' ); |
116 | - require_once $this->plugin->dir( 'includes/class-common.php'); |
|
117 | - require_once $this->plugin->dir( 'includes/connector-functions.php'); |
|
116 | + require_once $this->plugin->dir( 'includes/class-common.php' ); |
|
117 | + require_once $this->plugin->dir( 'includes/connector-functions.php' ); |
|
118 | 118 | require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' ); |
119 | 119 | require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' ); |
120 | 120 | require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' ); |
121 | 121 | require_once $this->plugin->dir( 'includes/class-admin.php' ); |
122 | - require_once $this->plugin->dir( 'includes/class-post-types.php'); |
|
123 | - require_once $this->plugin->dir( 'includes/class-cache.php'); |
|
122 | + require_once $this->plugin->dir( 'includes/class-post-types.php' ); |
|
123 | + require_once $this->plugin->dir( 'includes/class-cache.php' ); |
|
124 | 124 | |
125 | 125 | /** |
126 | 126 | * GravityView extensions and widgets. |