@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * |
| 59 | 59 | * @see GVCommon::get_form_fields() |
| 60 | 60 | * @access public |
| 61 | - * @param string|array $form_id (default: '') or $form object |
|
| 61 | + * @param string|array $form (default: '') or $form object |
|
| 62 | 62 | * @return array |
| 63 | 63 | */ |
| 64 | 64 | function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) { |
@@ -108,7 +108,6 @@ discard block |
||
| 108 | 108 | * Since 1.4, supports custom entry slugs. The way that GravityView fetches an entry based on the custom slug is by searching `gravityview_unique_id` meta. The `$entry_slug` is fetched by getting the current query var set by `is_single_entry()` |
| 109 | 109 | * |
| 110 | 110 | * @access public |
| 111 | - * @param mixed $entry_id |
|
| 112 | 111 | * @param boolean $force_allow_ids Force the get_entry() method to allow passed entry IDs, even if the `gravityview_custom_entry_slug_allow_id` filter returns false. |
| 113 | 112 | * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true {@since 1.14} |
| 114 | 113 | * @return array|boolean |
@@ -202,7 +201,6 @@ discard block |
||
| 202 | 201 | * |
| 203 | 202 | * @see GravityView_Template::template_id |
| 204 | 203 | * |
| 205 | - * @param int $view_id The ID of the View to get the layout of |
|
| 206 | 204 | * |
| 207 | 205 | * @return string GravityView_Template::template_id value. Empty string if not. |
| 208 | 206 | */ |
@@ -333,8 +333,8 @@ discard block |
||
| 333 | 333 | * @param mixed $field_id Field ID or Field array |
| 334 | 334 | * @return string field type |
| 335 | 335 | */ |
| 336 | -function gravityview_get_field_type( $form = null , $field_id = '' ) { |
|
| 337 | - return GVCommon::get_field_type( $form, $field_id ); |
|
| 336 | +function gravityview_get_field_type( $form = null, $field_id = '' ) { |
|
| 337 | + return GVCommon::get_field_type( $form, $field_id ); |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | |
@@ -347,8 +347,8 @@ discard block |
||
| 347 | 347 | * @return string HTML of the output. Empty string if $view_id is empty. |
| 348 | 348 | */ |
| 349 | 349 | function get_gravityview( $view_id = '', $atts = array() ) { |
| 350 | - if( !empty( $view_id ) ) { |
|
| 351 | - $atts['id'] = $view_id; |
|
| 350 | + if ( ! empty( $view_id ) ) { |
|
| 351 | + $atts[ 'id' ] = $view_id; |
|
| 352 | 352 | $args = wp_parse_args( $atts, \GV\View_Settings::defaults() ); |
| 353 | 353 | $GravityView_frontend = GravityView_frontend::getInstance(); |
| 354 | 354 | $GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) ); |
@@ -391,19 +391,19 @@ discard block |
||
| 391 | 391 | */ |
| 392 | 392 | function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) { |
| 393 | 393 | |
| 394 | - if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
| 394 | + if ( class_exists( 'GFFormsModel' ) && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
| 395 | 395 | |
| 396 | 396 | /** @var GF_Field_Radio|GF_Field_Checkbox $form_field */ |
| 397 | - foreach( $form_fields as $form_field ) { |
|
| 397 | + foreach ( $form_fields as $form_field ) { |
|
| 398 | 398 | $field_id = $form_field->id; |
| 399 | - foreach( $view_fields as $zone ) { |
|
| 399 | + foreach ( $view_fields as $zone ) { |
|
| 400 | 400 | |
| 401 | 401 | // ACF compatibility; ACF-added fields aren't arrays |
| 402 | 402 | if ( ! is_array( $zone ) ) { continue; } |
| 403 | 403 | |
| 404 | - foreach( $zone as $field ) { |
|
| 404 | + foreach ( $zone as $field ) { |
|
| 405 | 405 | // If it's an input, not the parent and the parent ID matches a checkbox or radio |
| 406 | - if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) { |
|
| 406 | + if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) { |
|
| 407 | 407 | return true; |
| 408 | 408 | } |
| 409 | 409 | } |
@@ -45,7 +45,6 @@ discard block |
||
| 45 | 45 | * Trick the GF fileupload field to render with the proper HTML ID to enable the plupload JS to work properly |
| 46 | 46 | * |
| 47 | 47 | * @param array $form The Form Object currently being processed. |
| 48 | - * @param string|array $value The field value. From default/dynamic population, $_POST, or a resumed incomplete submission. |
|
| 49 | 48 | * @param null|array $entry Null or the Entry Object currently being edited. |
| 50 | 49 | * @param GF_Field_FileUpload $field Gravity Forms field |
| 51 | 50 | * |
@@ -74,6 +73,7 @@ discard block |
||
| 74 | 73 | * |
| 75 | 74 | * @since 2.0 |
| 76 | 75 | * @param \GV\Template_Context The context. |
| 76 | + * @param GV\Template_Context $context |
|
| 77 | 77 | * |
| 78 | 78 | * @return array Array of file output, with `file_path` and `html` keys (see comments above) |
| 79 | 79 | */ |
@@ -24,16 +24,16 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 26 | 26 | |
| 27 | - unset( $field_options['search_filter'] ); |
|
| 27 | + unset( $field_options[ 'search_filter' ] ); |
|
| 28 | 28 | |
| 29 | - if( 'edit' === $context ) { |
|
| 29 | + if ( 'edit' === $context ) { |
|
| 30 | 30 | return $field_options; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - $add_options['link_to_file'] = array( |
|
| 33 | + $add_options[ 'link_to_file' ] = array( |
|
| 34 | 34 | 'type' => 'checkbox', |
| 35 | 35 | 'label' => __( 'Display as a Link:', 'gravityview' ), |
| 36 | - 'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'), |
|
| 36 | + 'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ), |
|
| 37 | 37 | 'value' => false, |
| 38 | 38 | 'merge_tags' => false, |
| 39 | 39 | ); |
@@ -119,14 +119,14 @@ discard block |
||
| 119 | 119 | $base_id = null; |
| 120 | 120 | |
| 121 | 121 | $is_single = gravityview_get_context() === 'single'; |
| 122 | - $lightbox = ! empty( $gravityview_view->atts['lightbox'] ); |
|
| 122 | + $lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] ); |
|
| 123 | 123 | $field_compat = $gravityview_view->getCurrentField(); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $output_arr = array(); |
| 127 | 127 | |
| 128 | 128 | // Get an array of file paths for the field. |
| 129 | - $file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
| 129 | + $file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
| 130 | 130 | |
| 131 | 131 | // The $value JSON was probably truncated; let's check lead_detail_long. |
| 132 | 132 | if ( ! is_array( $file_paths ) ) { |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $rendered = null; |
| 146 | 146 | |
| 147 | 147 | // If the site is HTTPS, use HTTPS |
| 148 | - if ( function_exists('set_url_scheme') ) { |
|
| 148 | + if ( function_exists( 'set_url_scheme' ) ) { |
|
| 149 | 149 | $file_path = set_url_scheme( $file_path ); |
| 150 | 150 | } |
| 151 | 151 | |
@@ -156,8 +156,8 @@ discard block |
||
| 156 | 156 | $file_path_info = pathinfo( $file_path ); |
| 157 | 157 | |
| 158 | 158 | // If pathinfo() gave us the extension of the file, run the switch statement using that. |
| 159 | - $extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] ); |
|
| 160 | - $basename = $file_path_info['basename']; |
|
| 159 | + $extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] ); |
|
| 160 | + $basename = $file_path_info[ 'basename' ]; |
|
| 161 | 161 | |
| 162 | 162 | // Get the secure download URL |
| 163 | 163 | $is_secure = false; |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | */ |
| 195 | 195 | $audio_settings = apply_filters( 'gravityview_audio_settings', array( |
| 196 | 196 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
| 197 | - 'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id'] |
|
| 197 | + 'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ] |
|
| 198 | 198 | ), $context ); |
| 199 | 199 | |
| 200 | 200 | /** |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | $video_settings = apply_filters( 'gravityview_video_settings', array( |
| 232 | 232 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
| 233 | - 'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id'] |
|
| 233 | + 'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ] |
|
| 234 | 234 | ), $context ); |
| 235 | 235 | |
| 236 | 236 | /** |
@@ -262,13 +262,13 @@ discard block |
||
| 262 | 262 | } else if ( in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ) ) { |
| 263 | 263 | $image_atts = array( |
| 264 | 264 | 'src' => $file_path, |
| 265 | - 'class' => 'gv-image gv-field-id-' . $field_settings['id'], |
|
| 266 | - 'alt' => $field_settings['label'], |
|
| 265 | + 'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ], |
|
| 266 | + 'alt' => $field_settings[ 'label' ], |
|
| 267 | 267 | 'width' => ( $is_single ? null : 250 ) |
| 268 | 268 | ); |
| 269 | 269 | |
| 270 | 270 | if ( $is_secure ) { |
| 271 | - $image_atts['validate_src'] = false; |
|
| 271 | + $image_atts[ 'validate_src' ] = false; |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | /** |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | |
| 284 | 284 | $image = new GravityView_Image( $image_atts ); |
| 285 | 285 | |
| 286 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
| 286 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
| 287 | 287 | |
| 288 | 288 | /** |
| 289 | 289 | * @filter `gravityview/fields/fileupload/allow_insecure_lightbox` Allow insecure links to be shown for the lighbox. |
@@ -294,14 +294,14 @@ discard block |
||
| 294 | 294 | */ |
| 295 | 295 | $override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context ); |
| 296 | 296 | |
| 297 | - if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) { |
|
| 297 | + if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) { |
|
| 298 | 298 | $lightbox_link_atts = array( |
| 299 | 299 | 'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ), |
| 300 | 300 | 'class' => 'thickbox', |
| 301 | 301 | ); |
| 302 | 302 | |
| 303 | 303 | if ( $override_security ) { |
| 304 | - $image_atts['src'] = $insecure_file_path; |
|
| 304 | + $image_atts[ 'src' ] = $insecure_file_path; |
|
| 305 | 305 | $image = new GravityView_Image( $image_atts ); |
| 306 | 306 | $file_path = $insecure_file_path; |
| 307 | 307 | // :( a kitten died somewhere |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | // Show as link should render the image regardless. |
| 316 | - if ( ! empty( $field_settings['show_as_link'] ) ) { |
|
| 316 | + if ( ! empty( $field_settings[ 'show_as_link' ] ) ) { |
|
| 317 | 317 | $text = $rendered; |
| 318 | 318 | } |
| 319 | 319 | } |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | $disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context ); |
| 331 | 331 | |
| 332 | 332 | // Output textualized content where |
| 333 | - if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) { |
|
| 333 | + if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) { |
|
| 334 | 334 | /** |
| 335 | 335 | * Modify the link text (defaults to the file name) |
| 336 | 336 | * |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | */ |
| 344 | 344 | $content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context ); |
| 345 | 345 | |
| 346 | - if ( empty( $field_settings['show_as_link'] ) ) { |
|
| 346 | + if ( empty( $field_settings[ 'show_as_link' ] ) ) { |
|
| 347 | 347 | /** |
| 348 | 348 | * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field |
| 349 | 349 | * @param array|string $link_atts Array or attributes string |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | $content = empty( $rendered ) ? $text : $rendered; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - $output_arr[] = array( |
|
| 362 | + $output_arr[ ] = array( |
|
| 363 | 363 | 'file_path' => $file_path, |
| 364 | 364 | 'content' => $content |
| 365 | 365 | ); |
@@ -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. */ |
@@ -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(); |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $slug = apply_filters( 'gravityview_slug', 'view' ); |
| 210 | 210 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ); |
| 211 | 211 | |
| 212 | - add_filter( 'query_vars', function( $query_vars ) { |
|
| 212 | + add_filter( 'query_vars', function( $query_vars ) { |
|
| 213 | 213 | $query_vars[] = 'csv'; |
| 214 | 214 | return $query_vars; |
| 215 | 215 | } ); |
@@ -254,8 +254,9 @@ discard block |
||
| 254 | 254 | * Check permissions. |
| 255 | 255 | */ |
| 256 | 256 | while ( $error = $view->can_render( null, $request ) ) { |
| 257 | - if ( ! is_wp_error( $error ) ) |
|
| 258 | - break; |
|
| 257 | + if ( ! is_wp_error( $error ) ) { |
|
| 258 | + break; |
|
| 259 | + } |
|
| 259 | 260 | |
| 260 | 261 | switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) { |
| 261 | 262 | case 'post_password_required': |
@@ -795,6 +795,7 @@ |
||
| 795 | 795 | * Retrieve the entries for the current view and request. |
| 796 | 796 | * |
| 797 | 797 | * @param \GV\Request The request. Unused for now. |
| 798 | + * @param Request $request |
|
| 798 | 799 | * |
| 799 | 800 | * @return \GV\Entry_Collection The entries. |
| 800 | 801 | */ |
@@ -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 | /** |
@@ -210,11 +210,11 @@ discard block |
||
| 210 | 210 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ); |
| 211 | 211 | |
| 212 | 212 | add_filter( 'query_vars', function( $query_vars ) { |
| 213 | - $query_vars[] = 'csv'; |
|
| 213 | + $query_vars[ ] = 'csv'; |
|
| 214 | 214 | return $query_vars; |
| 215 | 215 | } ); |
| 216 | 216 | |
| 217 | - if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) { |
|
| 217 | + if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) { |
|
| 218 | 218 | call_user_func_array( 'add_rewrite_rule', $rule ); |
| 219 | 219 | } |
| 220 | 220 | } |
@@ -283,13 +283,13 @@ discard block |
||
| 283 | 283 | return $content; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 286 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 287 | 287 | |
| 288 | 288 | /** |
| 289 | 289 | * Editing a single entry. |
| 290 | 290 | */ |
| 291 | 291 | if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
| 292 | - if ( $entry['status'] != 'active' ) { |
|
| 292 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 293 | 293 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 294 | 294 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 295 | 295 | } |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 303 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 303 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 304 | 304 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 305 | 305 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 306 | 306 | } |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | |
| 324 | 324 | foreach ( $entryset as $e ) { |
| 325 | 325 | |
| 326 | - if ( 'active' !== $e['status'] ) { |
|
| 326 | + if ( 'active' !== $e[ 'status' ] ) { |
|
| 327 | 327 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
| 328 | 328 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 329 | 329 | } |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | if ( $show_only_approved && ! $is_admin_and_can_view ) { |
| 337 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 337 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 338 | 338 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
| 339 | 339 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 340 | 340 | } |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
| 510 | 510 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
| 511 | 511 | |
| 512 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 512 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 513 | 513 | } |
| 514 | 514 | |
| 515 | 515 | return $joins; |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | |
| 557 | 557 | list( $join, $join_column, $join_on, $join_on_column ) = $meta; |
| 558 | 558 | |
| 559 | - $forms[] = GF_Form::by_id( $join_on ); |
|
| 559 | + $forms[ ] = GF_Form::by_id( $join_on ); |
|
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | return $forms; |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | if ( ! $view->form ) { |
| 598 | 598 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
| 599 | 599 | 'view_id' => $view->ID, |
| 600 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
| 600 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
| 601 | 601 | ) ); |
| 602 | 602 | } |
| 603 | 603 | |
@@ -830,34 +830,33 @@ discard block |
||
| 830 | 830 | * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead |
| 831 | 831 | */ |
| 832 | 832 | $parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID ); |
| 833 | - $parameters['context_view_id'] = $this->ID; |
|
| 833 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
| 834 | 834 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
| 835 | 835 | |
| 836 | 836 | if ( $request instanceof REST\Request ) { |
| 837 | 837 | $atts = $this->settings->as_atts(); |
| 838 | 838 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
| 839 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
| 839 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
| 840 | 840 | ) ); |
| 841 | - $parameters['paging'] = $paging_parameters['paging']; |
|
| 841 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
| 845 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
| 844 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
| 846 | 845 | |
| 847 | 846 | /** |
| 848 | 847 | * Cleanup duplicate field_filter parameters to simplify the query. |
| 849 | 848 | */ |
| 850 | 849 | $unique_field_filters = array(); |
| 851 | - foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) { |
|
| 850 | + foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) { |
|
| 852 | 851 | if ( 'mode' === $key ) { |
| 853 | - $unique_field_filters['mode'] = $filter; |
|
| 852 | + $unique_field_filters[ 'mode' ] = $filter; |
|
| 854 | 853 | } else if ( ! in_array( $filter, $unique_field_filters ) ) { |
| 855 | - $unique_field_filters[] = $filter; |
|
| 854 | + $unique_field_filters[ ] = $filter; |
|
| 856 | 855 | } |
| 857 | 856 | } |
| 858 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
| 857 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
| 859 | 858 | |
| 860 | - if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
| 859 | + if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 861 | 860 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
| 862 | 861 | } |
| 863 | 862 | |
@@ -865,10 +864,10 @@ discard block |
||
| 865 | 864 | /** |
| 866 | 865 | * New \GF_Query stuff :) |
| 867 | 866 | */ |
| 868 | - $query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] ); |
|
| 867 | + $query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] ); |
|
| 869 | 868 | |
| 870 | - $query->limit( $parameters['paging']['page_size'] ) |
|
| 871 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
| 869 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 870 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
| 872 | 871 | |
| 873 | 872 | /** |
| 874 | 873 | * Any joins? |
@@ -910,15 +909,15 @@ discard block |
||
| 910 | 909 | } ); |
| 911 | 910 | } else { |
| 912 | 911 | $entries = $this->form->entries |
| 913 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
| 912 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
| 914 | 913 | ->offset( $this->settings->get( 'offset' ) ) |
| 915 | - ->limit( $parameters['paging']['page_size'] ) |
|
| 914 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 916 | 915 | ->page( $page ); |
| 917 | 916 | |
| 918 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
| 917 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
| 919 | 918 | $field = new \GV\Field(); |
| 920 | - $field->ID = $parameters['sorting']['key']; |
|
| 921 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 919 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
| 920 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 922 | 921 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
| 923 | 922 | } |
| 924 | 923 | } |
@@ -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 ); |
@@ -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. |