@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | var $is_searchable = true; |
| 13 | 13 | |
| 14 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
| 14 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
| 15 | 15 | |
| 16 | 16 | var $_gf_field_class_name = 'GF_Field_Radio'; |
| 17 | 17 | |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | // Set the $_field_id var |
| 41 | 41 | $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ); |
| 42 | 42 | |
| 43 | - if( $this->is_choice_value_enabled() ) { |
|
| 44 | - $field_options['choice_display'] = array( |
|
| 43 | + if ( $this->is_choice_value_enabled() ) { |
|
| 44 | + $field_options[ 'choice_display' ] = array( |
|
| 45 | 45 | 'type' => 'radio', |
| 46 | 46 | 'value' => 'value', |
| 47 | 47 | 'label' => __( 'What should be displayed:', 'gravityview' ), |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | // Set the $_field_id var |
| 45 | 45 | $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ); |
| 46 | 46 | |
| 47 | - if( $this->is_choice_value_enabled() ) { |
|
| 48 | - $field_options['choice_display'] = array( |
|
| 47 | + if ( $this->is_choice_value_enabled() ) { |
|
| 48 | + $field_options[ 'choice_display' ] = array( |
|
| 49 | 49 | 'type' => 'radio', |
| 50 | 50 | 'value' => 'value', |
| 51 | 51 | 'label' => __( 'What should be displayed:', 'gravityview' ), |
@@ -24,21 +24,21 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 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 | ); |
| 40 | 40 | |
| 41 | - $add_options['image_width'] = array( |
|
| 41 | + $add_options[ 'image_width' ] = array( |
|
| 42 | 42 | 'type' => 'text', |
| 43 | 43 | 'label' => __( 'Custom Width:', 'gravityview' ), |
| 44 | 44 | 'desc' => __( 'Override the default image width (250).', 'gravityview' ), |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | $base_id = null; |
| 128 | 128 | |
| 129 | 129 | $is_single = gravityview_get_context() === 'single'; |
| 130 | - $lightbox = ! empty( $gravityview_view->atts['lightbox'] ); |
|
| 130 | + $lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] ); |
|
| 131 | 131 | $field_compat = $gravityview_view->getCurrentField(); |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | $output_arr = array(); |
| 135 | 135 | |
| 136 | 136 | // Get an array of file paths for the field. |
| 137 | - $file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
| 137 | + $file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
| 138 | 138 | |
| 139 | 139 | // The $value JSON was probably truncated; let's check lead_detail_long. |
| 140 | 140 | if ( ! is_array( $file_paths ) ) { |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $rendered = null; |
| 154 | 154 | |
| 155 | 155 | // If the site is HTTPS, use HTTPS |
| 156 | - if ( function_exists('set_url_scheme') ) { |
|
| 156 | + if ( function_exists( 'set_url_scheme' ) ) { |
|
| 157 | 157 | $file_path = set_url_scheme( $file_path ); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -164,8 +164,8 @@ discard block |
||
| 164 | 164 | $file_path_info = pathinfo( $file_path ); |
| 165 | 165 | |
| 166 | 166 | // If pathinfo() gave us the extension of the file, run the switch statement using that. |
| 167 | - $extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] ); |
|
| 168 | - $basename = $file_path_info['basename']; |
|
| 167 | + $extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] ); |
|
| 168 | + $basename = $file_path_info[ 'basename' ]; |
|
| 169 | 169 | |
| 170 | 170 | // Get the secure download URL |
| 171 | 171 | $is_secure = false; |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | */ |
| 203 | 203 | $audio_settings = apply_filters( 'gravityview_audio_settings', array( |
| 204 | 204 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
| 205 | - 'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id'] |
|
| 205 | + 'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ] |
|
| 206 | 206 | ), $context ); |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | */ |
| 239 | 239 | $video_settings = apply_filters( 'gravityview_video_settings', array( |
| 240 | 240 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
| 241 | - 'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id'] |
|
| 241 | + 'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ] |
|
| 242 | 242 | ), $context ); |
| 243 | 243 | |
| 244 | 244 | /** |
@@ -271,13 +271,13 @@ discard block |
||
| 271 | 271 | $width = \GV\Utils::get( $field_settings, 'image_width', 250 ); |
| 272 | 272 | $image_atts = array( |
| 273 | 273 | 'src' => $file_path, |
| 274 | - 'class' => 'gv-image gv-field-id-' . $field_settings['id'], |
|
| 275 | - 'alt' => $field_settings['label'], |
|
| 276 | - 'width' => ( $is_single ? null : ( $width ? $width: 250 ) ) |
|
| 274 | + 'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ], |
|
| 275 | + 'alt' => $field_settings[ 'label' ], |
|
| 276 | + 'width' => ( $is_single ? null : ( $width ? $width : 250 ) ) |
|
| 277 | 277 | ); |
| 278 | 278 | |
| 279 | 279 | if ( $is_secure ) { |
| 280 | - $image_atts['validate_src'] = false; |
|
| 280 | + $image_atts[ 'validate_src' ] = false; |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | /** |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | |
| 293 | 293 | $image = new GravityView_Image( $image_atts ); |
| 294 | 294 | |
| 295 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
| 295 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
| 296 | 296 | |
| 297 | 297 | /** |
| 298 | 298 | * @filter `gravityview/fields/fileupload/allow_insecure_lightbox` Allow insecure links to be shown for the lighbox. |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | */ |
| 304 | 304 | $override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context ); |
| 305 | 305 | |
| 306 | - if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) { |
|
| 306 | + if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) { |
|
| 307 | 307 | $lightbox_link_atts = array( |
| 308 | 308 | 'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ), |
| 309 | 309 | 'class' => 'thickbox', |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | $lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context ); |
| 313 | 313 | |
| 314 | 314 | if ( $override_security ) { |
| 315 | - $image_atts['src'] = $insecure_file_path; |
|
| 315 | + $image_atts[ 'src' ] = $insecure_file_path; |
|
| 316 | 316 | $image = new GravityView_Image( $image_atts ); |
| 317 | 317 | $file_path = $insecure_file_path; |
| 318 | 318 | // :( a kitten died somewhere |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | // Show as link should render the image regardless. |
| 327 | - if ( ! empty( $field_settings['show_as_link'] ) ) { |
|
| 327 | + if ( ! empty( $field_settings[ 'show_as_link' ] ) ) { |
|
| 328 | 328 | $text = $rendered; |
| 329 | 329 | } |
| 330 | 330 | } |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | $disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context ); |
| 342 | 342 | |
| 343 | 343 | // Output textualized content where |
| 344 | - if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) { |
|
| 344 | + if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) { |
|
| 345 | 345 | /** |
| 346 | 346 | * Modify the link text (defaults to the file name) |
| 347 | 347 | * |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | */ |
| 355 | 355 | $content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context ); |
| 356 | 356 | |
| 357 | - if ( empty( $field_settings['show_as_link'] ) ) { |
|
| 357 | + if ( empty( $field_settings[ 'show_as_link' ] ) ) { |
|
| 358 | 358 | /** |
| 359 | 359 | * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field |
| 360 | 360 | * @param array|string $link_atts Array or attributes string |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | $content = empty( $rendered ) ? $text : $rendered; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | - $output_arr[] = array( |
|
| 373 | + $output_arr[ ] = array( |
|
| 374 | 374 | 'file_path' => $file_path, |
| 375 | 375 | 'content' => $content |
| 376 | 376 | ); |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | 'type' => 'radio', |
| 65 | 65 | 'full_width' => true, |
| 66 | 66 | 'label' => esc_html__( 'Search Mode', 'gravityview' ), |
| 67 | - 'desc' => __('Should search results match all search fields, or any?', 'gravityview'), |
|
| 67 | + 'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ), |
|
| 68 | 68 | 'value' => 'any', |
| 69 | 69 | 'class' => 'hide-if-js', |
| 70 | 70 | 'options' => array( |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | // admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999 |
| 85 | 85 | add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 ); |
| 86 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
| 86 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
| 87 | 87 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
| 88 | 88 | |
| 89 | 89 | // ajax - get the searchable fields |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | $script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
| 228 | 228 | $script_source = empty( $script_min ) ? '/source' : ''; |
| 229 | 229 | |
| 230 | - wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version ); |
|
| 230 | + wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version ); |
|
| 231 | 231 | |
| 232 | 232 | wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array( |
| 233 | 233 | 'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ), |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | * @return array Scripts allowed in no-conflict mode, plus the search widget script |
| 250 | 250 | */ |
| 251 | 251 | public function register_no_conflict( $allowed ) { |
| 252 | - $allowed[] = 'gravityview_searchwidget_admin'; |
|
| 252 | + $allowed[ ] = 'gravityview_searchwidget_admin'; |
|
| 253 | 253 | return $allowed; |
| 254 | 254 | } |
| 255 | 255 | |
@@ -262,24 +262,24 @@ discard block |
||
| 262 | 262 | */ |
| 263 | 263 | public static function get_searchable_fields() { |
| 264 | 264 | |
| 265 | - if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 265 | + if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 266 | 266 | exit( '0' ); |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | $form = ''; |
| 270 | 270 | |
| 271 | 271 | // Fetch the form for the current View |
| 272 | - if ( ! empty( $_POST['view_id'] ) ) { |
|
| 272 | + if ( ! empty( $_POST[ 'view_id' ] ) ) { |
|
| 273 | 273 | |
| 274 | - $form = gravityview_get_form_id( $_POST['view_id'] ); |
|
| 274 | + $form = gravityview_get_form_id( $_POST[ 'view_id' ] ); |
|
| 275 | 275 | |
| 276 | - } elseif ( ! empty( $_POST['formid'] ) ) { |
|
| 276 | + } elseif ( ! empty( $_POST[ 'formid' ] ) ) { |
|
| 277 | 277 | |
| 278 | - $form = (int) $_POST['formid']; |
|
| 278 | + $form = (int)$_POST[ 'formid' ]; |
|
| 279 | 279 | |
| 280 | - } elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 280 | + } elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 281 | 281 | |
| 282 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
| 282 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
| 283 | 283 | |
| 284 | 284 | } |
| 285 | 285 | |
@@ -329,14 +329,14 @@ discard block |
||
| 329 | 329 | ); |
| 330 | 330 | |
| 331 | 331 | if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) { |
| 332 | - $custom_fields['is_approved'] = array( |
|
| 332 | + $custom_fields[ 'is_approved' ] = array( |
|
| 333 | 333 | 'text' => esc_html__( 'Approval Status', 'gravityview' ), |
| 334 | 334 | 'type' => 'multi', |
| 335 | 335 | ); |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | - foreach( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 339 | - $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] ); |
|
| 338 | + foreach ( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 339 | + $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] ); |
|
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | // Get fields with sub-inputs and no parent |
@@ -358,13 +358,13 @@ discard block |
||
| 358 | 358 | |
| 359 | 359 | foreach ( $fields as $id => $field ) { |
| 360 | 360 | |
| 361 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 361 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 362 | 362 | continue; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | - $types = self::get_search_input_types( $id, $field['type'] ); |
|
| 365 | + $types = self::get_search_input_types( $id, $field[ 'type' ] ); |
|
| 366 | 366 | |
| 367 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>'; |
|
| 367 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>'; |
|
| 368 | 368 | } |
| 369 | 369 | } |
| 370 | 370 | |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | public static function get_search_input_types( $field_id = '', $field_type = null ) { |
| 388 | 388 | |
| 389 | 389 | // @todo - This needs to be improved - many fields have . including products and addresses |
| 390 | - if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 390 | + if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 391 | 391 | $input_type = 'boolean'; // on/off checkbox |
| 392 | 392 | } elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) { |
| 393 | 393 | $input_type = 'multi'; //multiselect |
@@ -433,19 +433,19 @@ discard block |
||
| 433 | 433 | $post_id = 0; |
| 434 | 434 | |
| 435 | 435 | // We're in the WordPress Widget context, and an overriding post ID has been set. |
| 436 | - if ( ! empty( $widget_args['post_id'] ) ) { |
|
| 437 | - $post_id = absint( $widget_args['post_id'] ); |
|
| 436 | + if ( ! empty( $widget_args[ 'post_id' ] ) ) { |
|
| 437 | + $post_id = absint( $widget_args[ 'post_id' ] ); |
|
| 438 | 438 | } |
| 439 | 439 | // We're in the WordPress Widget context, and the base View ID should be used |
| 440 | - else if ( ! empty( $widget_args['view_id'] ) ) { |
|
| 441 | - $post_id = absint( $widget_args['view_id'] ); |
|
| 440 | + else if ( ! empty( $widget_args[ 'view_id' ] ) ) { |
|
| 441 | + $post_id = absint( $widget_args[ 'view_id' ] ); |
|
| 442 | 442 | } |
| 443 | 443 | |
| 444 | 444 | $args = gravityview_get_permalink_query_args( $post_id ); |
| 445 | 445 | |
| 446 | 446 | // Add hidden fields to the search form |
| 447 | 447 | foreach ( $args as $key => $value ) { |
| 448 | - $search_fields[] = array( |
|
| 448 | + $search_fields[ ] = array( |
|
| 449 | 449 | 'name' => $key, |
| 450 | 450 | 'input' => 'hidden', |
| 451 | 451 | 'value' => $value, |
@@ -484,28 +484,28 @@ discard block |
||
| 484 | 484 | /** |
| 485 | 485 | * Include the sidebar Widgets. |
| 486 | 486 | */ |
| 487 | - $widgets = (array) get_option( 'widget_gravityview_search', array() ); |
|
| 487 | + $widgets = (array)get_option( 'widget_gravityview_search', array() ); |
|
| 488 | 488 | |
| 489 | 489 | foreach ( $widgets as $widget ) { |
| 490 | - if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) { |
|
| 491 | - if( $_fields = json_decode( $widget['search_fields'], true ) ) { |
|
| 490 | + if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) { |
|
| 491 | + if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) { |
|
| 492 | 492 | foreach ( $_fields as $field ) { |
| 493 | - if ( empty( $field['form_id'] ) ) { |
|
| 494 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 493 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
| 494 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 495 | 495 | } |
| 496 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
| 496 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
| 497 | 497 | } |
| 498 | 498 | } |
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) { |
| 503 | - if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
| 503 | + if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
| 504 | 504 | foreach ( $_fields as $field ) { |
| 505 | - if ( empty( $field['form_id'] ) ) { |
|
| 506 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 505 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
| 506 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 507 | 507 | } |
| 508 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
| 508 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
| 509 | 509 | } |
| 510 | 510 | } |
| 511 | 511 | } |
@@ -535,7 +535,7 @@ discard block |
||
| 535 | 535 | return $search_criteria; // Return the original criteria, GF_Query modification kicks in later |
| 536 | 536 | } |
| 537 | 537 | |
| 538 | - if( 'post' === $this->search_method ) { |
|
| 538 | + if ( 'post' === $this->search_method ) { |
|
| 539 | 539 | $get = $_POST; |
| 540 | 540 | } else { |
| 541 | 541 | $get = $_GET; |
@@ -554,15 +554,15 @@ discard block |
||
| 554 | 554 | $get = gv_map_deep( $get, 'rawurldecode' ); |
| 555 | 555 | |
| 556 | 556 | // Make sure array key is set up |
| 557 | - $search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
| 557 | + $search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
| 558 | 558 | |
| 559 | 559 | $searchable_fields = $this->get_view_searchable_fields( $view ); |
| 560 | 560 | $searchable_field_objects = $this->get_view_searchable_fields( $view, true ); |
| 561 | 561 | |
| 562 | 562 | // add free search |
| 563 | - if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) { |
|
| 563 | + if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) { |
|
| 564 | 564 | |
| 565 | - $search_all_value = trim( $get['gv_search'] ); |
|
| 565 | + $search_all_value = trim( $get[ 'gv_search' ] ); |
|
| 566 | 566 | |
| 567 | 567 | /** |
| 568 | 568 | * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase? |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | } |
| 588 | 588 | |
| 589 | 589 | foreach ( $words as $word ) { |
| 590 | - $search_criteria['field_filters'][] = array( |
|
| 590 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 591 | 591 | 'key' => null, // The field ID to search |
| 592 | 592 | 'value' => $word, // The value to search |
| 593 | 593 | 'operator' => 'contains', // What to search in. Options: `is` or `contains` |
@@ -600,14 +600,14 @@ discard block |
||
| 600 | 600 | /** |
| 601 | 601 | * Get and normalize the dates according to the input format. |
| 602 | 602 | */ |
| 603 | - if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) { |
|
| 604 | - if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
| 603 | + if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) { |
|
| 604 | + if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
| 605 | 605 | $curr_start = $curr_start_date->format( 'Y-m-d' ); |
| 606 | 606 | } |
| 607 | 607 | } |
| 608 | 608 | |
| 609 | - if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) { |
|
| 610 | - if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
| 609 | + if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) { |
|
| 610 | + if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
| 611 | 611 | $curr_end = $curr_end_date->format( 'Y-m-d' ); |
| 612 | 612 | } |
| 613 | 613 | } |
@@ -642,22 +642,22 @@ discard block |
||
| 642 | 642 | */ |
| 643 | 643 | if ( ! empty( $curr_start ) ) { |
| 644 | 644 | $curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) ); |
| 645 | - $search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 645 | + $search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | if ( ! empty( $curr_end ) ) { |
| 649 | 649 | // Fast-forward 24 hour on the end time |
| 650 | 650 | $curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS ); |
| 651 | - $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 652 | - if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
| 653 | - $search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 ); |
|
| 651 | + $search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 652 | + if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
| 653 | + $search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 ); |
|
| 654 | 654 | } |
| 655 | 655 | } |
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | // search for a specific entry ID |
| 659 | 659 | if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) { |
| 660 | - $search_criteria['field_filters'][] = array( |
|
| 660 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 661 | 661 | 'key' => 'id', |
| 662 | 662 | 'value' => absint( $get[ 'gv_id' ] ), |
| 663 | 663 | 'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ), |
@@ -666,20 +666,20 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | // search for a specific Created_by ID |
| 668 | 668 | if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) { |
| 669 | - $search_criteria['field_filters'][] = array( |
|
| 669 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 670 | 670 | 'key' => 'created_by', |
| 671 | - 'value' => $get['gv_by'], |
|
| 671 | + 'value' => $get[ 'gv_by' ], |
|
| 672 | 672 | 'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ), |
| 673 | 673 | ); |
| 674 | 674 | } |
| 675 | 675 | |
| 676 | 676 | // Get search mode passed in URL |
| 677 | - $mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ? $get['mode'] : 'any'; |
|
| 677 | + $mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any'; |
|
| 678 | 678 | |
| 679 | 679 | // get the other search filters |
| 680 | 680 | foreach ( $get as $key => $value ) { |
| 681 | 681 | |
| 682 | - if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) { |
|
| 682 | + if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) { |
|
| 683 | 683 | continue; // Not a filter, or empty |
| 684 | 684 | } |
| 685 | 685 | |
@@ -693,19 +693,19 @@ discard block |
||
| 693 | 693 | continue; |
| 694 | 694 | } |
| 695 | 695 | |
| 696 | - if ( ! isset( $filter['operator'] ) ) { |
|
| 697 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
| 696 | + if ( ! isset( $filter[ 'operator' ] ) ) { |
|
| 697 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
| 698 | 698 | } |
| 699 | 699 | |
| 700 | - if ( isset( $filter[0]['value'] ) ) { |
|
| 701 | - $search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter ); |
|
| 700 | + if ( isset( $filter[ 0 ][ 'value' ] ) ) { |
|
| 701 | + $search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter ); |
|
| 702 | 702 | |
| 703 | 703 | // if date range type, set search mode to ALL |
| 704 | - if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 704 | + if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 705 | 705 | $mode = 'all'; |
| 706 | 706 | } |
| 707 | - } elseif( !empty( $filter ) ) { |
|
| 708 | - $search_criteria['field_filters'][] = $filter; |
|
| 707 | + } elseif ( ! empty( $filter ) ) { |
|
| 708 | + $search_criteria[ 'field_filters' ][ ] = $filter; |
|
| 709 | 709 | } |
| 710 | 710 | } |
| 711 | 711 | |
@@ -714,7 +714,7 @@ discard block |
||
| 714 | 714 | * @since 1.5.1 |
| 715 | 715 | * @param[out,in] string $mode Search mode (`any` vs `all`) |
| 716 | 716 | */ |
| 717 | - $search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 717 | + $search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 718 | 718 | |
| 719 | 719 | gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) ); |
| 720 | 720 | |
@@ -748,19 +748,19 @@ discard block |
||
| 748 | 748 | |
| 749 | 749 | $query_class = $view->get_query_class(); |
| 750 | 750 | |
| 751 | - if ( empty( $search_criteria['field_filters'] ) ) { |
|
| 751 | + if ( empty( $search_criteria[ 'field_filters' ] ) ) { |
|
| 752 | 752 | return; |
| 753 | 753 | } |
| 754 | 754 | |
| 755 | 755 | $widgets = $view->widgets->by_id( $this->widget_id ); |
| 756 | 756 | if ( $widgets->count() ) { |
| 757 | 757 | $widgets = $widgets->all(); |
| 758 | - $widget = $widgets[0]; |
|
| 758 | + $widget = $widgets[ 0 ]; |
|
| 759 | 759 | |
| 760 | 760 | $search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ); |
| 761 | 761 | |
| 762 | - foreach ( (array) $search_fields as $search_field ) { |
|
| 763 | - if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) { |
|
| 762 | + foreach ( (array)$search_fields as $search_field ) { |
|
| 763 | + if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) { |
|
| 764 | 764 | $created_by_text_mode = true; |
| 765 | 765 | } |
| 766 | 766 | } |
@@ -769,7 +769,7 @@ discard block |
||
| 769 | 769 | $extra_conditions = array(); |
| 770 | 770 | $mode = 'any'; |
| 771 | 771 | |
| 772 | - foreach ( $search_criteria['field_filters'] as &$filter ) { |
|
| 772 | + foreach ( $search_criteria[ 'field_filters' ] as &$filter ) { |
|
| 773 | 773 | if ( ! is_array( $filter ) ) { |
| 774 | 774 | if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) { |
| 775 | 775 | $mode = $filter; |
@@ -778,13 +778,13 @@ discard block |
||
| 778 | 778 | } |
| 779 | 779 | |
| 780 | 780 | // Construct a manual query for unapproved statuses |
| 781 | - if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) { |
|
| 782 | - $_tmp_query = new $query_class( $view->form->ID, array( |
|
| 781 | + if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) { |
|
| 782 | + $_tmp_query = new $query_class( $view->form->ID, array( |
|
| 783 | 783 | 'field_filters' => array( |
| 784 | 784 | array( |
| 785 | 785 | 'operator' => 'in', |
| 786 | 786 | 'key' => 'is_approved', |
| 787 | - 'value' => (array) $filter['value'], |
|
| 787 | + 'value' => (array)$filter[ 'value' ], |
|
| 788 | 788 | ), |
| 789 | 789 | array( |
| 790 | 790 | 'operator' => 'is', |
@@ -796,30 +796,30 @@ discard block |
||
| 796 | 796 | ) ); |
| 797 | 797 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 798 | 798 | |
| 799 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
| 799 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
| 800 | 800 | |
| 801 | 801 | $filter = false; |
| 802 | 802 | continue; |
| 803 | 803 | } |
| 804 | 804 | |
| 805 | 805 | // Construct manual query for text mode creator search |
| 806 | - if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) { |
|
| 807 | - $extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
| 806 | + if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) { |
|
| 807 | + $extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
| 808 | 808 | $filter = false; |
| 809 | 809 | continue; |
| 810 | 810 | } |
| 811 | 811 | |
| 812 | 812 | // By default, we want searches to be wildcard for each field. |
| 813 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
| 813 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
| 814 | 814 | |
| 815 | 815 | // For multichoice, let's have an in (OR) search. |
| 816 | - if ( is_array( $filter['value'] ) ) { |
|
| 817 | - $filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
| 816 | + if ( is_array( $filter[ 'value' ] ) ) { |
|
| 817 | + $filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
| 818 | 818 | } |
| 819 | 819 | |
| 820 | 820 | // Default form with joins functionality |
| 821 | - if ( empty( $filter['form_id'] ) ) { |
|
| 822 | - $filter['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 821 | + if ( empty( $filter[ 'form_id' ] ) ) { |
|
| 822 | + $filter[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 823 | 823 | } |
| 824 | 824 | |
| 825 | 825 | /** |
@@ -829,28 +829,28 @@ discard block |
||
| 829 | 829 | * @since develop |
| 830 | 830 | * @param \GV\View $view The View we're operating on. |
| 831 | 831 | */ |
| 832 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view ); |
|
| 832 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view ); |
|
| 833 | 833 | } |
| 834 | 834 | |
| 835 | - if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) { |
|
| 835 | + if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) { |
|
| 836 | 836 | $date_criteria = array(); |
| 837 | 837 | |
| 838 | - if ( isset( $search_criteria['start_date'] ) ) { |
|
| 839 | - $date_criteria['start_date'] = $search_criteria['start_date']; |
|
| 838 | + if ( isset( $search_criteria[ 'start_date' ] ) ) { |
|
| 839 | + $date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ]; |
|
| 840 | 840 | } |
| 841 | 841 | |
| 842 | - if ( isset( $search_criteria['end_date'] ) ) { |
|
| 843 | - $date_criteria['end_date'] = $search_criteria['end_date']; |
|
| 842 | + if ( isset( $search_criteria[ 'end_date' ] ) ) { |
|
| 843 | + $date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ]; |
|
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | $_tmp_query = new $query_class( $view->form->ID, $date_criteria ); |
| 847 | 847 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 848 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
| 848 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
| 849 | 849 | } |
| 850 | 850 | |
| 851 | 851 | $search_conditions = array(); |
| 852 | 852 | |
| 853 | - if ( $filters = array_filter( $search_criteria['field_filters'] ) ) { |
|
| 853 | + if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) { |
|
| 854 | 854 | |
| 855 | 855 | foreach ( $filters as $filter ) { |
| 856 | 856 | if ( ! is_array( $filter ) ) { |
@@ -863,12 +863,12 @@ discard block |
||
| 863 | 863 | * code by reusing what's inside GF_Query already as they |
| 864 | 864 | * take care of many small things like forcing numeric, etc. |
| 865 | 865 | */ |
| 866 | - $_tmp_query = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
| 866 | + $_tmp_query = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
| 867 | 867 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 868 | - $search_condition = $_tmp_query_parts['where']; |
|
| 868 | + $search_condition = $_tmp_query_parts[ 'where' ]; |
|
| 869 | 869 | |
| 870 | - if ( empty( $filter['key'] ) && $search_condition->expressions ) { |
|
| 871 | - $search_conditions[] = $search_condition; |
|
| 870 | + if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) { |
|
| 871 | + $search_conditions[ ] = $search_condition; |
|
| 872 | 872 | } else { |
| 873 | 873 | $left = $search_condition->left; |
| 874 | 874 | $alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' ); |
@@ -879,21 +879,21 @@ discard block |
||
| 879 | 879 | $join = $_join->join; |
| 880 | 880 | |
| 881 | 881 | // Join |
| 882 | - $search_conditions[] = new GF_Query_Condition( |
|
| 882 | + $search_conditions[ ] = new GF_Query_Condition( |
|
| 883 | 883 | new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ), |
| 884 | 884 | $search_condition->operator, |
| 885 | 885 | $search_condition->right |
| 886 | 886 | ); |
| 887 | 887 | |
| 888 | 888 | // On |
| 889 | - $search_conditions[] = new GF_Query_Condition( |
|
| 889 | + $search_conditions[ ] = new GF_Query_Condition( |
|
| 890 | 890 | new GF_Query_Column( GF_Query_Column::META, $on->ID, $query->_alias( GF_Query_Column::META, $on->ID, 'm' ) ), |
| 891 | 891 | $search_condition->operator, |
| 892 | 892 | $search_condition->right |
| 893 | 893 | ); |
| 894 | 894 | } |
| 895 | 895 | } else { |
| 896 | - $search_conditions[] = new GF_Query_Condition( |
|
| 896 | + $search_conditions[ ] = new GF_Query_Condition( |
|
| 897 | 897 | new GF_Query_Column( $left->field_id, $left->source, $alias ), |
| 898 | 898 | $search_condition->operator, |
| 899 | 899 | $search_condition->right |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | /** |
| 916 | 916 | * Combine the parts as a new WHERE clause. |
| 917 | 917 | */ |
| 918 | - $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) ); |
|
| 918 | + $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) ); |
|
| 919 | 919 | $query->where( $where ); |
| 920 | 920 | } |
| 921 | 921 | |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | $field_id = str_replace( 'filter_', '', $key ); |
| 939 | 939 | |
| 940 | 940 | // calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox ) |
| 941 | - if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) { |
|
| 941 | + if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) { |
|
| 942 | 942 | $field_id = str_replace( '_', '.', $field_id ); |
| 943 | 943 | } |
| 944 | 944 | |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | // form is in searchable fields |
| 996 | 996 | $found = false; |
| 997 | 997 | foreach ( $searchable_fields as $field ) { |
| 998 | - if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) { |
|
| 998 | + if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) { |
|
| 999 | 999 | $found = true; |
| 1000 | 1000 | break; |
| 1001 | 1001 | } |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | |
| 1032 | 1032 | case 'select': |
| 1033 | 1033 | case 'radio': |
| 1034 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1034 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1035 | 1035 | break; |
| 1036 | 1036 | |
| 1037 | 1037 | case 'post_category': |
@@ -1045,7 +1045,7 @@ discard block |
||
| 1045 | 1045 | |
| 1046 | 1046 | foreach ( $value as $val ) { |
| 1047 | 1047 | $cat = get_term( $val, 'category' ); |
| 1048 | - $filter[] = array( |
|
| 1048 | + $filter[ ] = array( |
|
| 1049 | 1049 | 'key' => $field_id, |
| 1050 | 1050 | 'value' => esc_attr( $cat->name ) . ':' . $val, |
| 1051 | 1051 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1064,7 +1064,7 @@ discard block |
||
| 1064 | 1064 | $filter = array(); |
| 1065 | 1065 | |
| 1066 | 1066 | foreach ( $value as $val ) { |
| 1067 | - $filter[] = array( 'key' => $field_id, 'value' => $val ); |
|
| 1067 | + $filter[ ] = array( 'key' => $field_id, 'value' => $val ); |
|
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | 1070 | break; |
@@ -1073,9 +1073,9 @@ discard block |
||
| 1073 | 1073 | // convert checkbox on/off into the correct search filter |
| 1074 | 1074 | if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) { |
| 1075 | 1075 | foreach ( $form_field->inputs as $k => $input ) { |
| 1076 | - if ( $input['id'] == $field_id ) { |
|
| 1077 | - $filter['value'] = $form_field->choices[ $k ]['value']; |
|
| 1078 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1076 | + if ( $input[ 'id' ] == $field_id ) { |
|
| 1077 | + $filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ]; |
|
| 1078 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1079 | 1079 | break; |
| 1080 | 1080 | } |
| 1081 | 1081 | } |
@@ -1085,7 +1085,7 @@ discard block |
||
| 1085 | 1085 | $filter = array(); |
| 1086 | 1086 | |
| 1087 | 1087 | foreach ( $value as $val ) { |
| 1088 | - $filter[] = array( |
|
| 1088 | + $filter[ ] = array( |
|
| 1089 | 1089 | 'key' => $field_id, |
| 1090 | 1090 | 'value' => $val, |
| 1091 | 1091 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1106,9 +1106,9 @@ discard block |
||
| 1106 | 1106 | foreach ( $words as $word ) { |
| 1107 | 1107 | if ( ! empty( $word ) && strlen( $word ) > 1 ) { |
| 1108 | 1108 | // Keep the same key for each filter |
| 1109 | - $filter['value'] = $word; |
|
| 1109 | + $filter[ 'value' ] = $word; |
|
| 1110 | 1110 | // Add a search for the value |
| 1111 | - $filters[] = $filter; |
|
| 1111 | + $filters[ ] = $filter; |
|
| 1112 | 1112 | } |
| 1113 | 1113 | } |
| 1114 | 1114 | |
@@ -1122,19 +1122,19 @@ discard block |
||
| 1122 | 1122 | |
| 1123 | 1123 | foreach ( $searchable_fields as $searchable_field ) { |
| 1124 | 1124 | |
| 1125 | - if( $form_field->ID !== $searchable_field['field'] ) { |
|
| 1125 | + if ( $form_field->ID !== $searchable_field[ 'field' ] ) { |
|
| 1126 | 1126 | continue; |
| 1127 | 1127 | } |
| 1128 | 1128 | |
| 1129 | 1129 | // Only exact-match dropdowns, not text search |
| 1130 | - if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) { |
|
| 1130 | + if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) { |
|
| 1131 | 1131 | continue; |
| 1132 | 1132 | } |
| 1133 | 1133 | |
| 1134 | 1134 | $input_id = gravityview_get_input_id_from_id( $form_field->ID ); |
| 1135 | 1135 | |
| 1136 | 1136 | if ( 4 === $input_id ) { |
| 1137 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1137 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1138 | 1138 | }; |
| 1139 | 1139 | } |
| 1140 | 1140 | } |
@@ -1161,12 +1161,12 @@ discard block |
||
| 1161 | 1161 | * @since 1.16.3 |
| 1162 | 1162 | * Safeguard until GF implements '<=' operator |
| 1163 | 1163 | */ |
| 1164 | - if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 1164 | + if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 1165 | 1165 | $operator = '<'; |
| 1166 | 1166 | $date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) ); |
| 1167 | 1167 | } |
| 1168 | 1168 | |
| 1169 | - $filter[] = array( |
|
| 1169 | + $filter[ ] = array( |
|
| 1170 | 1170 | 'key' => $field_id, |
| 1171 | 1171 | 'value' => self::get_formatted_date( $date, 'Y-m-d', $date_format ), |
| 1172 | 1172 | 'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ), |
@@ -1174,8 +1174,8 @@ discard block |
||
| 1174 | 1174 | } |
| 1175 | 1175 | } else { |
| 1176 | 1176 | $date = $value; |
| 1177 | - $filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
| 1178 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1177 | + $filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
| 1178 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1179 | 1179 | } |
| 1180 | 1180 | |
| 1181 | 1181 | break; |
@@ -1206,7 +1206,7 @@ discard block |
||
| 1206 | 1206 | 'ymd_dot' => 'Y.m.d', |
| 1207 | 1207 | ); |
| 1208 | 1208 | |
| 1209 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
| 1209 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
| 1210 | 1210 | $format = $datepicker[ $field->dateFormat ]; |
| 1211 | 1211 | } |
| 1212 | 1212 | |
@@ -1243,7 +1243,7 @@ discard block |
||
| 1243 | 1243 | public function add_template_path( $file_paths ) { |
| 1244 | 1244 | |
| 1245 | 1245 | // Index 100 is the default GravityView template path. |
| 1246 | - $file_paths[102] = self::$file . 'templates/'; |
|
| 1246 | + $file_paths[ 102 ] = self::$file . 'templates/'; |
|
| 1247 | 1247 | |
| 1248 | 1248 | return $file_paths; |
| 1249 | 1249 | } |
@@ -1262,7 +1262,7 @@ discard block |
||
| 1262 | 1262 | $has_date = false; |
| 1263 | 1263 | |
| 1264 | 1264 | foreach ( $search_fields as $k => $field ) { |
| 1265 | - if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 1265 | + if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 1266 | 1266 | $has_date = true; |
| 1267 | 1267 | break; |
| 1268 | 1268 | } |
@@ -1289,7 +1289,7 @@ discard block |
||
| 1289 | 1289 | } |
| 1290 | 1290 | |
| 1291 | 1291 | // get configured search fields |
| 1292 | - $search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : ''; |
|
| 1292 | + $search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : ''; |
|
| 1293 | 1293 | |
| 1294 | 1294 | if ( empty( $search_fields ) || ! is_array( $search_fields ) ) { |
| 1295 | 1295 | gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) ); |
@@ -1305,40 +1305,40 @@ discard block |
||
| 1305 | 1305 | |
| 1306 | 1306 | $updated_field = $this->get_search_filter_details( $updated_field, $context ); |
| 1307 | 1307 | |
| 1308 | - switch ( $field['field'] ) { |
|
| 1308 | + switch ( $field[ 'field' ] ) { |
|
| 1309 | 1309 | |
| 1310 | 1310 | case 'search_all': |
| 1311 | - $updated_field['key'] = 'search_all'; |
|
| 1312 | - $updated_field['input'] = 'search_all'; |
|
| 1313 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 1311 | + $updated_field[ 'key' ] = 'search_all'; |
|
| 1312 | + $updated_field[ 'input' ] = 'search_all'; |
|
| 1313 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 1314 | 1314 | break; |
| 1315 | 1315 | |
| 1316 | 1316 | case 'entry_date': |
| 1317 | - $updated_field['key'] = 'entry_date'; |
|
| 1318 | - $updated_field['input'] = 'entry_date'; |
|
| 1319 | - $updated_field['value'] = array( |
|
| 1317 | + $updated_field[ 'key' ] = 'entry_date'; |
|
| 1318 | + $updated_field[ 'input' ] = 'entry_date'; |
|
| 1319 | + $updated_field[ 'value' ] = array( |
|
| 1320 | 1320 | 'start' => $this->rgget_or_rgpost( 'gv_start' ), |
| 1321 | 1321 | 'end' => $this->rgget_or_rgpost( 'gv_end' ), |
| 1322 | 1322 | ); |
| 1323 | 1323 | break; |
| 1324 | 1324 | |
| 1325 | 1325 | case 'entry_id': |
| 1326 | - $updated_field['key'] = 'entry_id'; |
|
| 1327 | - $updated_field['input'] = 'entry_id'; |
|
| 1328 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 1326 | + $updated_field[ 'key' ] = 'entry_id'; |
|
| 1327 | + $updated_field[ 'input' ] = 'entry_id'; |
|
| 1328 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 1329 | 1329 | break; |
| 1330 | 1330 | |
| 1331 | 1331 | case 'created_by': |
| 1332 | - $updated_field['key'] = 'created_by'; |
|
| 1333 | - $updated_field['name'] = 'gv_by'; |
|
| 1334 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 1335 | - $updated_field['choices'] = self::get_created_by_choices( $view ); |
|
| 1332 | + $updated_field[ 'key' ] = 'created_by'; |
|
| 1333 | + $updated_field[ 'name' ] = 'gv_by'; |
|
| 1334 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 1335 | + $updated_field[ 'choices' ] = self::get_created_by_choices( $view ); |
|
| 1336 | 1336 | break; |
| 1337 | 1337 | |
| 1338 | 1338 | case 'is_approved': |
| 1339 | - $updated_field['key'] = 'is_approved'; |
|
| 1340 | - $updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
| 1341 | - $updated_field['choices'] = self::get_is_approved_choices(); |
|
| 1339 | + $updated_field[ 'key' ] = 'is_approved'; |
|
| 1340 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
| 1341 | + $updated_field[ 'choices' ] = self::get_is_approved_choices(); |
|
| 1342 | 1342 | break; |
| 1343 | 1343 | } |
| 1344 | 1344 | |
@@ -1359,16 +1359,16 @@ discard block |
||
| 1359 | 1359 | |
| 1360 | 1360 | $gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args ); |
| 1361 | 1361 | |
| 1362 | - $gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal'; |
|
| 1362 | + $gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal'; |
|
| 1363 | 1363 | |
| 1364 | 1364 | /** @since 1.14 */ |
| 1365 | - $gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any'; |
|
| 1365 | + $gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any'; |
|
| 1366 | 1366 | |
| 1367 | - $custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
| 1367 | + $custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
| 1368 | 1368 | |
| 1369 | 1369 | $gravityview_view->search_class = self::get_search_class( $custom_class ); |
| 1370 | 1370 | |
| 1371 | - $gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false; |
|
| 1371 | + $gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false; |
|
| 1372 | 1372 | |
| 1373 | 1373 | if ( $this->has_date_field( $search_fields ) ) { |
| 1374 | 1374 | // enqueue datepicker stuff only if needed! |
@@ -1390,10 +1390,10 @@ discard block |
||
| 1390 | 1390 | public static function get_search_class( $custom_class = '' ) { |
| 1391 | 1391 | $gravityview_view = GravityView_View::getInstance(); |
| 1392 | 1392 | |
| 1393 | - $search_class = 'gv-search-'.$gravityview_view->search_layout; |
|
| 1393 | + $search_class = 'gv-search-' . $gravityview_view->search_layout; |
|
| 1394 | 1394 | |
| 1395 | - if ( ! empty( $custom_class ) ) { |
|
| 1396 | - $search_class .= ' '.$custom_class; |
|
| 1395 | + if ( ! empty( $custom_class ) ) { |
|
| 1396 | + $search_class .= ' ' . $custom_class; |
|
| 1397 | 1397 | } |
| 1398 | 1398 | |
| 1399 | 1399 | /** |
@@ -1437,9 +1437,9 @@ discard block |
||
| 1437 | 1437 | |
| 1438 | 1438 | if ( ! $label ) { |
| 1439 | 1439 | |
| 1440 | - $label = isset( $form_field['label'] ) ? $form_field['label'] : ''; |
|
| 1440 | + $label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : ''; |
|
| 1441 | 1441 | |
| 1442 | - switch( $field['field'] ) { |
|
| 1442 | + switch ( $field[ 'field' ] ) { |
|
| 1443 | 1443 | case 'search_all': |
| 1444 | 1444 | $label = __( 'Search Entries:', 'gravityview' ); |
| 1445 | 1445 | break; |
@@ -1451,10 +1451,10 @@ discard block |
||
| 1451 | 1451 | break; |
| 1452 | 1452 | default: |
| 1453 | 1453 | // If this is a field input, not a field |
| 1454 | - if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) { |
|
| 1454 | + if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) { |
|
| 1455 | 1455 | |
| 1456 | 1456 | // Get the label for the field in question, which returns an array |
| 1457 | - $items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) ); |
|
| 1457 | + $items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) ); |
|
| 1458 | 1458 | |
| 1459 | 1459 | // Get the item with the `label` key |
| 1460 | 1460 | $values = wp_list_pluck( $items, 'label' ); |
@@ -1495,35 +1495,35 @@ discard block |
||
| 1495 | 1495 | $form = $gravityview_view->getForm(); |
| 1496 | 1496 | |
| 1497 | 1497 | // for advanced field ids (eg, first name / last name ) |
| 1498 | - $name = 'filter_' . str_replace( '.', '_', $field['field'] ); |
|
| 1498 | + $name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] ); |
|
| 1499 | 1499 | |
| 1500 | 1500 | // get searched value from $_GET/$_POST (string or array) |
| 1501 | 1501 | $value = $this->rgget_or_rgpost( $name ); |
| 1502 | 1502 | |
| 1503 | 1503 | // get form field details |
| 1504 | - $form_field = gravityview_get_field( $form, $field['field'] ); |
|
| 1504 | + $form_field = gravityview_get_field( $form, $field[ 'field' ] ); |
|
| 1505 | 1505 | |
| 1506 | 1506 | $filter = array( |
| 1507 | - 'key' => $field['field'], |
|
| 1507 | + 'key' => $field[ 'field' ], |
|
| 1508 | 1508 | 'name' => $name, |
| 1509 | 1509 | 'label' => self::get_field_label( $field, $form_field ), |
| 1510 | - 'input' => $field['input'], |
|
| 1510 | + 'input' => $field[ 'input' ], |
|
| 1511 | 1511 | 'value' => $value, |
| 1512 | - 'type' => $form_field['type'], |
|
| 1512 | + 'type' => $form_field[ 'type' ], |
|
| 1513 | 1513 | ); |
| 1514 | 1514 | |
| 1515 | 1515 | // collect choices |
| 1516 | - if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) { |
|
| 1517 | - $filter['choices'] = gravityview_get_terms_choices(); |
|
| 1518 | - } elseif ( ! empty( $form_field['choices'] ) ) { |
|
| 1519 | - $filter['choices'] = $form_field['choices']; |
|
| 1516 | + if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) { |
|
| 1517 | + $filter[ 'choices' ] = gravityview_get_terms_choices(); |
|
| 1518 | + } elseif ( ! empty( $form_field[ 'choices' ] ) ) { |
|
| 1519 | + $filter[ 'choices' ] = $form_field[ 'choices' ]; |
|
| 1520 | 1520 | } |
| 1521 | 1521 | |
| 1522 | - if ( 'date_range' === $field['input'] && empty( $value ) ) { |
|
| 1523 | - $filter['value'] = array( 'start' => '', 'end' => '' ); |
|
| 1522 | + if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) { |
|
| 1523 | + $filter[ 'value' ] = array( 'start' => '', 'end' => '' ); |
|
| 1524 | 1524 | } |
| 1525 | 1525 | |
| 1526 | - if ( ! empty( $filter['choices'] ) ) { |
|
| 1526 | + if ( ! empty( $filter[ 'choices' ] ) ) { |
|
| 1527 | 1527 | /** |
| 1528 | 1528 | * @filter `gravityview/search/sieve_choices` Only output used choices for this field. |
| 1529 | 1529 | * @param[in,out] bool Yes or no. |
@@ -1531,7 +1531,7 @@ discard block |
||
| 1531 | 1531 | * @param \GV\Context The context. |
| 1532 | 1532 | */ |
| 1533 | 1533 | if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) { |
| 1534 | - $filter['choices'] = $this->sieve_filter_choices( $filter, $context ); |
|
| 1534 | + $filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context ); |
|
| 1535 | 1535 | } |
| 1536 | 1536 | } |
| 1537 | 1537 | |
@@ -1560,11 +1560,11 @@ discard block |
||
| 1560 | 1560 | * @return array The filter choices. |
| 1561 | 1561 | */ |
| 1562 | 1562 | private function sieve_filter_choices( $filter, $context ) { |
| 1563 | - if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) { |
|
| 1563 | + if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) { |
|
| 1564 | 1564 | return $filter; // @todo Populate plugins might give us empty choices |
| 1565 | 1565 | } |
| 1566 | 1566 | |
| 1567 | - if ( ! is_numeric( $filter['key'] ) ) { |
|
| 1567 | + if ( ! is_numeric( $filter[ 'key' ] ) ) { |
|
| 1568 | 1568 | return $filter; |
| 1569 | 1569 | } |
| 1570 | 1570 | |
@@ -1574,17 +1574,17 @@ discard block |
||
| 1574 | 1574 | |
| 1575 | 1575 | $table = GFFormsModel::get_entry_meta_table_name(); |
| 1576 | 1576 | |
| 1577 | - $key_like = $wpdb->esc_like( $filter['key'] ) . '.%'; |
|
| 1577 | + $key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%'; |
|
| 1578 | 1578 | |
| 1579 | 1579 | $choices = $wpdb->get_col( $wpdb->prepare( |
| 1580 | 1580 | "SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
| 1581 | - $key_like, $filter['key'], $form_id |
|
| 1581 | + $key_like, $filter[ 'key' ], $form_id |
|
| 1582 | 1582 | ) ); |
| 1583 | 1583 | |
| 1584 | 1584 | $filter_choices = array(); |
| 1585 | - foreach ( $filter['choices'] as $choice ) { |
|
| 1586 | - if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) { |
|
| 1587 | - $filter_choices[] = $choice; |
|
| 1585 | + foreach ( $filter[ 'choices' ] as $choice ) { |
|
| 1586 | + if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) { |
|
| 1587 | + $filter_choices[ ] = $choice; |
|
| 1588 | 1588 | } |
| 1589 | 1589 | } |
| 1590 | 1590 | |
@@ -1619,7 +1619,7 @@ discard block |
||
| 1619 | 1619 | * @param \GV\View $view The view. |
| 1620 | 1620 | */ |
| 1621 | 1621 | $text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view ); |
| 1622 | - $choices[] = array( |
|
| 1622 | + $choices[ ] = array( |
|
| 1623 | 1623 | 'value' => $user->ID, |
| 1624 | 1624 | 'text' => $text, |
| 1625 | 1625 | ); |
@@ -1639,9 +1639,9 @@ discard block |
||
| 1639 | 1639 | |
| 1640 | 1640 | $choices = array(); |
| 1641 | 1641 | foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) { |
| 1642 | - $choices[] = array( |
|
| 1643 | - 'value' => $status['value'], |
|
| 1644 | - 'text' => $status['label'], |
|
| 1642 | + $choices[ ] = array( |
|
| 1643 | + 'value' => $status[ 'value' ], |
|
| 1644 | + 'text' => $status[ 'label' ], |
|
| 1645 | 1645 | ); |
| 1646 | 1646 | } |
| 1647 | 1647 | |
@@ -1693,7 +1693,7 @@ discard block |
||
| 1693 | 1693 | */ |
| 1694 | 1694 | public function add_datepicker_js_dependency( $js_dependencies ) { |
| 1695 | 1695 | |
| 1696 | - $js_dependencies[] = 'jquery-ui-datepicker'; |
|
| 1696 | + $js_dependencies[ ] = 'jquery-ui-datepicker'; |
|
| 1697 | 1697 | |
| 1698 | 1698 | return $js_dependencies; |
| 1699 | 1699 | } |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | 'isRTL' => is_rtl(), |
| 1738 | 1738 | ), $view_data ); |
| 1739 | 1739 | |
| 1740 | - $localizations['datepicker'] = $datepicker_settings; |
|
| 1740 | + $localizations[ 'datepicker' ] = $datepicker_settings; |
|
| 1741 | 1741 | |
| 1742 | 1742 | return $localizations; |
| 1743 | 1743 | |
@@ -1764,7 +1764,7 @@ discard block |
||
| 1764 | 1764 | * @return void |
| 1765 | 1765 | */ |
| 1766 | 1766 | private function maybe_enqueue_flexibility() { |
| 1767 | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
| 1767 | + if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) { |
|
| 1768 | 1768 | wp_enqueue_script( 'gv-flexibility' ); |
| 1769 | 1769 | } |
| 1770 | 1770 | } |
@@ -1786,7 +1786,7 @@ discard block |
||
| 1786 | 1786 | add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 ); |
| 1787 | 1787 | |
| 1788 | 1788 | $scheme = is_ssl() ? 'https://' : 'http://'; |
| 1789 | - wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1789 | + wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1790 | 1790 | |
| 1791 | 1791 | /** |
| 1792 | 1792 | * @filter `gravityview_search_datepicker_class` |
@@ -1865,7 +1865,7 @@ discard block |
||
| 1865 | 1865 | public function add_preview_inputs() { |
| 1866 | 1866 | global $wp; |
| 1867 | 1867 | |
| 1868 | - if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) { |
|
| 1868 | + if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) { |
|
| 1869 | 1869 | return; |
| 1870 | 1870 | } |
| 1871 | 1871 | |
@@ -1917,7 +1917,7 @@ discard block |
||
| 1917 | 1917 | */ |
| 1918 | 1918 | class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition { |
| 1919 | 1919 | public function __construct( $filter, $view ) { |
| 1920 | - $this->value = $filter['value']; |
|
| 1920 | + $this->value = $filter[ 'value' ]; |
|
| 1921 | 1921 | $this->view = $view; |
| 1922 | 1922 | } |
| 1923 | 1923 | |
@@ -1949,11 +1949,11 @@ discard block |
||
| 1949 | 1949 | $conditions = array(); |
| 1950 | 1950 | |
| 1951 | 1951 | foreach ( $user_fields as $user_field ) { |
| 1952 | - $conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 1952 | + $conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 1953 | 1953 | } |
| 1954 | 1954 | |
| 1955 | 1955 | foreach ( $user_meta_fields as $meta_field ) { |
| 1956 | - $conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 1956 | + $conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 1957 | 1957 | } |
| 1958 | 1958 | |
| 1959 | 1959 | $conditions = '(' . implode( ' OR ', $conditions ) . ')'; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | public static function get_instance() { |
| 96 | 96 | |
| 97 | - if( empty( self::$instance ) ) { |
|
| 97 | + if ( empty( self::$instance ) ) { |
|
| 98 | 98 | self::$instance = new self; |
| 99 | 99 | } |
| 100 | 100 | |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | $operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS ); |
| 130 | 130 | |
| 131 | - if( $with_values ) { |
|
| 131 | + if ( $with_values ) { |
|
| 132 | 132 | $operators_with_values = array(); |
| 133 | - foreach( $operators as $key ) { |
|
| 133 | + foreach ( $operators as $key ) { |
|
| 134 | 134 | $operators_with_values[ $key ] = ''; |
| 135 | 135 | } |
| 136 | 136 | return $operators_with_values; |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | $operators = $this->get_operators( false ); |
| 151 | 151 | |
| 152 | - if( !in_array( $operation, $operators ) ) { |
|
| 152 | + if ( ! in_array( $operation, $operators ) ) { |
|
| 153 | 153 | gravityview()->log->debug( ' Attempted to add invalid operation type. {operation}', array( 'operation' => $operation ) ); |
| 154 | 154 | return false; |
| 155 | 155 | } |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | return null; |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | - if( empty( $atts ) ) { |
|
| 204 | + if ( empty( $atts ) ) { |
|
| 205 | 205 | gravityview()->log->error( '$atts are empty.', array( 'data' => $atts ) ); |
| 206 | 206 | return null; |
| 207 | 207 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | $setup = $this->setup_operation_and_comparison(); |
| 226 | 226 | |
| 227 | 227 | // We need an operation and comparison value |
| 228 | - if( ! $setup ) { |
|
| 228 | + if ( ! $setup ) { |
|
| 229 | 229 | gravityview()->log->error( 'No valid operators were passed.', array( 'data' => $this->atts ) ); |
| 230 | 230 | return null; |
| 231 | 231 | } |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | $logged_in_match = ! $this->logged_in ^ is_user_logged_in(); // XNOR |
| 278 | 278 | |
| 279 | 279 | // Only logged-in match |
| 280 | - if( 1 === sizeof( $this->passed_atts ) ) { |
|
| 280 | + if ( 1 === sizeof( $this->passed_atts ) ) { |
|
| 281 | 281 | $this->is_match = $logged_in_match; |
| 282 | 282 | } else { |
| 283 | 283 | $this->is_match = $logged_in_match && $comparison_match; |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | private function get_output() { |
| 293 | 293 | |
| 294 | - if( $this->is_match ) { |
|
| 294 | + if ( $this->is_match ) { |
|
| 295 | 295 | $output = $this->content; |
| 296 | 296 | } else { |
| 297 | 297 | $output = $this->else_content; |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | * @param string $output HTML/text output |
| 310 | 310 | * @param GVLogic_Shortcode $this This class |
| 311 | 311 | */ |
| 312 | - $output = apply_filters('gravityview/gvlogic/output', $output, $this ); |
|
| 312 | + $output = apply_filters( 'gravityview/gvlogic/output', $output, $this ); |
|
| 313 | 313 | |
| 314 | 314 | gravityview()->log->debug( 'Output: ', array( 'data' => $output ) ); |
| 315 | 315 | |
@@ -329,14 +329,14 @@ discard block |
||
| 329 | 329 | list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content, 2 ), 2, NULL ); |
| 330 | 330 | list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content, 2 ), 2, NULL ); |
| 331 | 331 | |
| 332 | - $else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL; |
|
| 332 | + $else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL; |
|
| 333 | 333 | $else_content = isset( $after_else ) ? $after_else : $else_attr; |
| 334 | 334 | |
| 335 | 335 | // The content is everything OTHER than the [else] |
| 336 | 336 | $this->content = $before_else_if; |
| 337 | 337 | |
| 338 | 338 | if ( ! $this->is_match ) { |
| 339 | - if( $elseif_content = $this->process_elseif( $before_else ) ) { |
|
| 339 | + if ( $elseif_content = $this->process_elseif( $before_else ) ) { |
|
| 340 | 340 | $this->else_content = $elseif_content; |
| 341 | 341 | } else { |
| 342 | 342 | $this->else_content = $else_content; |
@@ -364,16 +364,16 @@ discard block |
||
| 364 | 364 | foreach ( $else_if_matches as $key => $else_if_match ) { |
| 365 | 365 | |
| 366 | 366 | // If $else_if_match[5] exists and has content, check for more shortcodes |
| 367 | - preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER ); |
|
| 367 | + preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER ); |
|
| 368 | 368 | |
| 369 | 369 | // If the logic passes, this is the value that should be used for $this->else_content |
| 370 | - $else_if_value = $else_if_match[5]; |
|
| 371 | - $check_elseif_match = $else_if_match[0]; |
|
| 370 | + $else_if_value = $else_if_match[ 5 ]; |
|
| 371 | + $check_elseif_match = $else_if_match[ 0 ]; |
|
| 372 | 372 | |
| 373 | 373 | // Retrieve the value of the match that is currently being checked, without any other [else] tags |
| 374 | - if( ! empty( $recursive_matches[0][0] ) ) { |
|
| 375 | - $else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value ); |
|
| 376 | - $check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match ); |
|
| 374 | + if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) { |
|
| 375 | + $else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value ); |
|
| 376 | + $check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match ); |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | $check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match ); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | // Process any remaining [else] tags |
| 393 | - return $this->process_elseif( $else_if_match[5] ); |
|
| 393 | + return $this->process_elseif( $else_if_match[ 5 ] ); |
|
| 394 | 394 | } |
| 395 | 395 | |
| 396 | 396 | return false; |
@@ -417,11 +417,11 @@ discard block |
||
| 417 | 417 | $this->atts = array_intersect_key( $this->passed_atts, $this->atts ); |
| 418 | 418 | |
| 419 | 419 | // Strip whitespace if it's not default false |
| 420 | - $this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false; |
|
| 420 | + $this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false; |
|
| 421 | 421 | |
| 422 | - if ( isset( $this->atts['logged_in'] ) ) { |
|
| 422 | + if ( isset( $this->atts[ 'logged_in' ] ) ) { |
|
| 423 | 423 | // Truthy |
| 424 | - if ( in_array( strtolower( $this->atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) { |
|
| 424 | + if ( in_array( strtolower( $this->atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) { |
|
| 425 | 425 | $this->logged_in = false; |
| 426 | 426 | } else { |
| 427 | 427 | $this->logged_in = true; |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | do_action( 'gravityview/gvlogic/parse_atts/after', $this ); |
| 438 | 438 | |
| 439 | 439 | // Make sure the "if" isn't processed in self::setup_operation_and_comparison() |
| 440 | - unset( $this->atts['if'] ); |
|
| 440 | + unset( $this->atts[ 'if' ] ); |
|
| 441 | 441 | } |
| 442 | 442 | } |
| 443 | 443 | |
@@ -123,16 +123,16 @@ discard block |
||
| 123 | 123 | function load() { |
| 124 | 124 | |
| 125 | 125 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
| 126 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
| 126 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
| 127 | 127 | |
| 128 | 128 | // Don't display an embedded form when editing an entry |
| 129 | 129 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
| 130 | 130 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
| 131 | 131 | |
| 132 | 132 | // Stop Gravity Forms processing what is ours! |
| 133 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
| 133 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
| 134 | 134 | |
| 135 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
| 135 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
| 136 | 136 | |
| 137 | 137 | add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 ); |
| 138 | 138 | |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
| 144 | 144 | |
| 145 | 145 | // Add fields expected by GFFormDisplay::validate() |
| 146 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
| 146 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
| 147 | 147 | |
| 148 | 148 | // Fix multiselect value for GF 2.2 |
| 149 | 149 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | * @return void |
| 161 | 161 | */ |
| 162 | 162 | public function prevent_render_form() { |
| 163 | - if( $this->is_edit_entry() ) { |
|
| 164 | - if( 'wp_head' === current_filter() ) { |
|
| 163 | + if ( $this->is_edit_entry() ) { |
|
| 164 | + if ( 'wp_head' === current_filter() ) { |
|
| 165 | 165 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
| 166 | 166 | } else { |
| 167 | 167 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -176,14 +176,14 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function prevent_maybe_process_form() { |
| 178 | 178 | |
| 179 | - if( ! $this->is_edit_entry_submission() ) { |
|
| 179 | + if ( ! $this->is_edit_entry_submission() ) { |
|
| 180 | 180 | return; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' ); |
| 184 | 184 | |
| 185 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
| 186 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 185 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
| 186 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | /** |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | public function is_edit_entry() { |
| 194 | 194 | |
| 195 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
| 195 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
| 196 | 196 | |
| 197 | 197 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
| 198 | 198 | } |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | * @return boolean |
| 204 | 204 | */ |
| 205 | 205 | public function is_edit_entry_submission() { |
| 206 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
| 206 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | /** |
@@ -216,16 +216,16 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | |
| 218 | 218 | $entries = $gravityview_view->getEntries(); |
| 219 | - self::$original_entry = $entries[0]; |
|
| 220 | - $this->entry = $entries[0]; |
|
| 219 | + self::$original_entry = $entries[ 0 ]; |
|
| 220 | + $this->entry = $entries[ 0 ]; |
|
| 221 | 221 | |
| 222 | 222 | self::$original_form = $gravityview_view->getForm(); |
| 223 | 223 | $this->form = $gravityview_view->getForm(); |
| 224 | - $this->form_id = $this->entry['form_id']; |
|
| 224 | + $this->form_id = $this->entry[ 'form_id' ]; |
|
| 225 | 225 | $this->view_id = $gravityview_view->getViewId(); |
| 226 | 226 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
| 227 | 227 | |
| 228 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
| 228 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | |
@@ -284,9 +284,9 @@ discard block |
||
| 284 | 284 | private function print_scripts() { |
| 285 | 285 | $gravityview_view = GravityView_View::getInstance(); |
| 286 | 286 | |
| 287 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 287 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 288 | 288 | |
| 289 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
| 289 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
| 290 | 290 | |
| 291 | 291 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
| 292 | 292 | |
@@ -302,19 +302,19 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | private function process_save( $gv_data ) { |
| 304 | 304 | |
| 305 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
| 305 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
| 306 | 306 | return; |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | // Make sure the entry, view, and form IDs are all correct |
| 310 | 310 | $valid = $this->verify_nonce(); |
| 311 | 311 | |
| 312 | - if ( !$valid ) { |
|
| 312 | + if ( ! $valid ) { |
|
| 313 | 313 | gravityview()->log->error( 'Nonce validation failed.' ); |
| 314 | 314 | return; |
| 315 | 315 | } |
| 316 | 316 | |
| 317 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
| 317 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
| 318 | 318 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
| 319 | 319 | return; |
| 320 | 320 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | |
| 326 | 326 | $this->validate(); |
| 327 | 327 | |
| 328 | - if( $this->is_valid ) { |
|
| 328 | + if ( $this->is_valid ) { |
|
| 329 | 329 | |
| 330 | 330 | gravityview()->log->debug( 'Submission is valid.' ); |
| 331 | 331 | |
@@ -337,15 +337,15 @@ discard block |
||
| 337 | 337 | /** |
| 338 | 338 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
| 339 | 339 | */ |
| 340 | - unset( $_GET['page'] ); |
|
| 340 | + unset( $_GET[ 'page' ] ); |
|
| 341 | 341 | |
| 342 | - $date_created = $this->entry['date_created']; |
|
| 342 | + $date_created = $this->entry[ 'date_created' ]; |
|
| 343 | 343 | |
| 344 | 344 | /** |
| 345 | 345 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
| 346 | 346 | * @since 1.17.2 |
| 347 | 347 | */ |
| 348 | - unset( $this->entry['date_created'] ); |
|
| 348 | + unset( $this->entry[ 'date_created' ] ); |
|
| 349 | 349 | |
| 350 | 350 | /** |
| 351 | 351 | * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry |
@@ -355,14 +355,14 @@ discard block |
||
| 355 | 355 | * @param GravityView_Edit_Entry_Render $this This object |
| 356 | 356 | * @param GravityView_View_Data $gv_data The View data |
| 357 | 357 | */ |
| 358 | - do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data ); |
|
| 358 | + do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data ); |
|
| 359 | 359 | |
| 360 | 360 | GFFormsModel::save_lead( $form, $this->entry ); |
| 361 | 361 | |
| 362 | 362 | // Delete the values for hidden inputs |
| 363 | 363 | $this->unset_hidden_field_values(); |
| 364 | 364 | |
| 365 | - $this->entry['date_created'] = $date_created; |
|
| 365 | + $this->entry[ 'date_created' ] = $date_created; |
|
| 366 | 366 | |
| 367 | 367 | // Process calculation fields |
| 368 | 368 | $this->update_calculation_fields(); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | * @param GravityView_Edit_Entry_Render $this This object |
| 385 | 385 | * @param GravityView_View_Data $gv_data The View data |
| 386 | 386 | */ |
| 387 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
| 387 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
| 388 | 388 | |
| 389 | 389 | } else { |
| 390 | 390 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -412,16 +412,16 @@ discard block |
||
| 412 | 412 | */ |
| 413 | 413 | $unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this ); |
| 414 | 414 | |
| 415 | - if( ! $unset_hidden_field_values ) { |
|
| 415 | + if ( ! $unset_hidden_field_values ) { |
|
| 416 | 416 | return; |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
| 420 | 420 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
| 421 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
| 421 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
| 422 | 422 | } else { |
| 423 | 423 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
| 424 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
| 424 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
| 425 | 425 | } |
| 426 | 426 | |
| 427 | 427 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | $empty_value = $field->get_value_save_entry( |
| 440 | 440 | is_array( $field->get_entry_inputs() ) ? array() : '', |
| 441 | - $this->form, '', $this->entry['id'], $this->entry |
|
| 441 | + $this->form, '', $this->entry[ 'id' ], $this->entry |
|
| 442 | 442 | ); |
| 443 | 443 | |
| 444 | 444 | $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | /** No file is being uploaded. */ |
| 511 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 511 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 512 | 512 | /** So return the original upload */ |
| 513 | 513 | return $entry[ $input_id ]; |
| 514 | 514 | } |
@@ -526,11 +526,11 @@ discard block |
||
| 526 | 526 | * @return mixed |
| 527 | 527 | */ |
| 528 | 528 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
| 529 | - if( ! $this->is_edit_entry() ) { |
|
| 529 | + if ( ! $this->is_edit_entry() ) { |
|
| 530 | 530 | return $plupload_init; |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
| 533 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
| 534 | 534 | |
| 535 | 535 | return $plupload_init; |
| 536 | 536 | } |
@@ -545,27 +545,27 @@ discard block |
||
| 545 | 545 | $form = $this->filter_conditional_logic( $this->form ); |
| 546 | 546 | |
| 547 | 547 | /** @var GF_Field $field */ |
| 548 | - foreach( $form['fields'] as $k => &$field ) { |
|
| 548 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
| 549 | 549 | |
| 550 | 550 | /** |
| 551 | 551 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
| 552 | 552 | * @since 1.16.3 |
| 553 | 553 | * @var GF_Field $field |
| 554 | 554 | */ |
| 555 | - if( $field->has_calculation() ) { |
|
| 556 | - unset( $form['fields'][ $k ] ); |
|
| 555 | + if ( $field->has_calculation() ) { |
|
| 556 | + unset( $form[ 'fields' ][ $k ] ); |
|
| 557 | 557 | } |
| 558 | 558 | |
| 559 | 559 | $field->adminOnly = false; |
| 560 | 560 | |
| 561 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 562 | - foreach( $field->inputs as $key => $input ) { |
|
| 563 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 561 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 562 | + foreach ( $field->inputs as $key => $input ) { |
|
| 563 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
| 564 | 564 | } |
| 565 | 565 | } |
| 566 | 566 | } |
| 567 | 567 | |
| 568 | - $form['fields'] = array_values( $form['fields'] ); |
|
| 568 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
| 569 | 569 | |
| 570 | 570 | return $form; |
| 571 | 571 | } |
@@ -577,14 +577,14 @@ discard block |
||
| 577 | 577 | $update = false; |
| 578 | 578 | |
| 579 | 579 | // get the most up to date entry values |
| 580 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
| 580 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
| 581 | 581 | |
| 582 | 582 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
| 583 | 583 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
| 584 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
| 584 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
| 585 | 585 | } else { |
| 586 | 586 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
| 587 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
| 587 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
| 588 | 588 | } |
| 589 | 589 | |
| 590 | 590 | |
@@ -596,24 +596,24 @@ discard block |
||
| 596 | 596 | $inputs = $field->get_entry_inputs(); |
| 597 | 597 | if ( is_array( $inputs ) ) { |
| 598 | 598 | foreach ( $inputs as $input ) { |
| 599 | - list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
|
| 599 | + list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 ); |
|
| 600 | 600 | |
| 601 | 601 | if ( 'product' === $field->type ) { |
| 602 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 602 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
| 603 | 603 | |
| 604 | 604 | // Only allow quantity to be set if it's allowed to be edited |
| 605 | 605 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
| 606 | 606 | } else { // otherwise set to what it previously was |
| 607 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
| 607 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
| 608 | 608 | } |
| 609 | 609 | } else { |
| 610 | 610 | // Set to what it previously was if it's not editable |
| 611 | 611 | if ( ! in_array( $field_id, $allowed_fields ) ) { |
| 612 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
| 612 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | - GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
| 616 | + GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
| 617 | 617 | } |
| 618 | 618 | } else { |
| 619 | 619 | // Set to what it previously was if it's not editable |
@@ -653,19 +653,19 @@ discard block |
||
| 653 | 653 | |
| 654 | 654 | $input_name = 'input_' . $field_id; |
| 655 | 655 | |
| 656 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 656 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 657 | 657 | |
| 658 | 658 | // We have a new image |
| 659 | 659 | |
| 660 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
| 660 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
| 661 | 661 | |
| 662 | 662 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 663 | 663 | $ary = stripslashes_deep( $ary ); |
| 664 | 664 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 665 | 665 | |
| 666 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
| 667 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
| 668 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
| 666 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
| 667 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
| 668 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
| 669 | 669 | |
| 670 | 670 | $image_meta = array( |
| 671 | 671 | 'post_excerpt' => $img_caption, |
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | |
| 675 | 675 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
| 676 | 676 | if ( ! empty( $img_title ) ) { |
| 677 | - $image_meta['post_title'] = $img_title; |
|
| 677 | + $image_meta[ 'post_title' ] = $img_title; |
|
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | /** |
@@ -732,15 +732,15 @@ discard block |
||
| 732 | 732 | */ |
| 733 | 733 | private function maybe_update_post_fields( $form ) { |
| 734 | 734 | |
| 735 | - if( empty( $this->entry['post_id'] ) ) { |
|
| 735 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
| 736 | 736 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
| 737 | 737 | return; |
| 738 | 738 | } |
| 739 | 739 | |
| 740 | - $post_id = $this->entry['post_id']; |
|
| 740 | + $post_id = $this->entry[ 'post_id' ]; |
|
| 741 | 741 | |
| 742 | 742 | // Security check |
| 743 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 743 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 744 | 744 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
| 745 | 745 | return; |
| 746 | 746 | } |
@@ -753,25 +753,25 @@ discard block |
||
| 753 | 753 | |
| 754 | 754 | $field = RGFormsModel::get_field( $form, $field_id ); |
| 755 | 755 | |
| 756 | - if( ! $field ) { |
|
| 756 | + if ( ! $field ) { |
|
| 757 | 757 | continue; |
| 758 | 758 | } |
| 759 | 759 | |
| 760 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 760 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 761 | 761 | |
| 762 | 762 | // Get the value of the field, including $_POSTed value |
| 763 | 763 | $value = RGFormsModel::get_field_value( $field ); |
| 764 | 764 | |
| 765 | 765 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
| 766 | 766 | $entry_tmp = $this->entry; |
| 767 | - $entry_tmp["{$field_id}"] = $value; |
|
| 767 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
| 768 | 768 | |
| 769 | - switch( $field->type ) { |
|
| 769 | + switch ( $field->type ) { |
|
| 770 | 770 | |
| 771 | 771 | case 'post_title': |
| 772 | 772 | $post_title = $value; |
| 773 | 773 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
| 774 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 774 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
| 775 | 775 | } |
| 776 | 776 | $updated_post->post_title = $post_title; |
| 777 | 777 | $updated_post->post_name = $post_title; |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | case 'post_content': |
| 782 | 782 | $post_content = $value; |
| 783 | 783 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
| 784 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 784 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
| 785 | 785 | } |
| 786 | 786 | $updated_post->post_content = $post_content; |
| 787 | 787 | unset( $post_content ); |
@@ -799,11 +799,11 @@ discard block |
||
| 799 | 799 | $value = $value[ $field_id ]; |
| 800 | 800 | } |
| 801 | 801 | |
| 802 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 802 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 803 | 803 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
| 804 | 804 | } |
| 805 | 805 | |
| 806 | - $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
|
| 806 | + $value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry ); |
|
| 807 | 807 | |
| 808 | 808 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
| 809 | 809 | break; |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | // update entry after |
| 818 | - $this->entry["{$field_id}"] = $value; |
|
| 818 | + $this->entry[ "{$field_id}" ] = $value; |
|
| 819 | 819 | |
| 820 | 820 | $update_entry = true; |
| 821 | 821 | |
@@ -824,11 +824,11 @@ discard block |
||
| 824 | 824 | |
| 825 | 825 | } |
| 826 | 826 | |
| 827 | - if( $update_entry ) { |
|
| 827 | + if ( $update_entry ) { |
|
| 828 | 828 | |
| 829 | 829 | $return_entry = GFAPI::update_entry( $this->entry ); |
| 830 | 830 | |
| 831 | - if( is_wp_error( $return_entry ) ) { |
|
| 831 | + if ( is_wp_error( $return_entry ) ) { |
|
| 832 | 832 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
| 833 | 833 | } else { |
| 834 | 834 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | |
| 839 | 839 | $return_post = wp_update_post( $updated_post, true ); |
| 840 | 840 | |
| 841 | - if( is_wp_error( $return_post ) ) { |
|
| 841 | + if ( is_wp_error( $return_post ) ) { |
|
| 842 | 842 | $return_post->add_data( $updated_post, '$updated_post' ); |
| 843 | 843 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
| 844 | 844 | } else { |
@@ -872,7 +872,7 @@ discard block |
||
| 872 | 872 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
| 873 | 873 | |
| 874 | 874 | // replace conditional shortcodes |
| 875 | - if( $do_shortcode ) { |
|
| 875 | + if ( $do_shortcode ) { |
|
| 876 | 876 | $output = do_shortcode( $output ); |
| 877 | 877 | } |
| 878 | 878 | |
@@ -891,19 +891,19 @@ discard block |
||
| 891 | 891 | */ |
| 892 | 892 | private function after_update() { |
| 893 | 893 | |
| 894 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
| 895 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
| 894 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 895 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 896 | 896 | |
| 897 | 897 | // Re-define the entry now that we've updated it. |
| 898 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
| 898 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
| 899 | 899 | |
| 900 | 900 | $entry = GFFormsModel::set_entry_meta( $entry, self::$original_form ); |
| 901 | 901 | |
| 902 | 902 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
| 903 | 903 | // We need to clear the cache because Gravity Forms caches the field values, which |
| 904 | 904 | // we have just updated. |
| 905 | - foreach ($this->form['fields'] as $key => $field) { |
|
| 906 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
| 905 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
| 906 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
| 907 | 907 | } |
| 908 | 908 | } |
| 909 | 909 | |
@@ -913,11 +913,11 @@ discard block |
||
| 913 | 913 | * @since develop |
| 914 | 914 | */ |
| 915 | 915 | if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) { |
| 916 | - $feeds = GFAPI::get_feeds( null, $entry['form_id'] ); |
|
| 916 | + $feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] ); |
|
| 917 | 917 | if ( ! is_wp_error( $feeds ) ) { |
| 918 | 918 | $registered_feeds = array(); |
| 919 | 919 | foreach ( GFAddOn::get_registered_addons() as $registered_feed ) { |
| 920 | - if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
| 920 | + if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
| 921 | 921 | if ( method_exists( $registered_feed, 'get_instance' ) ) { |
| 922 | 922 | $registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) ); |
| 923 | 923 | $registered_feeds[ $registered_feed->get_slug() ] = $registered_feed; |
@@ -925,8 +925,8 @@ discard block |
||
| 925 | 925 | } |
| 926 | 926 | } |
| 927 | 927 | foreach ( $feeds as $feed ) { |
| 928 | - if ( in_array( $feed['id'], $allowed_feeds ) ) { |
|
| 929 | - if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) { |
|
| 928 | + if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) { |
|
| 929 | + if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) { |
|
| 930 | 930 | $returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form ); |
| 931 | 931 | if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) { |
| 932 | 932 | $entry = $returned_entry; |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | |
| 957 | 957 | <div class="gv-edit-entry-wrapper"><?php |
| 958 | 958 | |
| 959 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
| 959 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
| 960 | 960 | |
| 961 | 961 | /** |
| 962 | 962 | * Fixes weird wpautop() issue |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | * @param string $edit_entry_title Modify the "Edit Entry" title |
| 973 | 973 | * @param GravityView_Edit_Entry_Render $this This object |
| 974 | 974 | */ |
| 975 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 975 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
| 976 | 976 | |
| 977 | 977 | echo esc_attr( $edit_entry_title ); |
| 978 | 978 | ?></span> |
@@ -1022,13 +1022,13 @@ discard block |
||
| 1022 | 1022 | |
| 1023 | 1023 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
| 1024 | 1024 | |
| 1025 | - if( ! $this->is_valid ){ |
|
| 1025 | + if ( ! $this->is_valid ) { |
|
| 1026 | 1026 | |
| 1027 | 1027 | // Keeping this compatible with Gravity Forms. |
| 1028 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
| 1029 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
| 1028 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
| 1029 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
| 1030 | 1030 | |
| 1031 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
| 1031 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
| 1032 | 1032 | |
| 1033 | 1033 | } else { |
| 1034 | 1034 | $view = \GV\View::by_id( $this->view_id ); |
@@ -1039,23 +1039,23 @@ discard block |
||
| 1039 | 1039 | |
| 1040 | 1040 | case '0': |
| 1041 | 1041 | $redirect_url = $back_link; |
| 1042 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 1042 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
| 1043 | 1043 | break; |
| 1044 | 1044 | |
| 1045 | 1045 | case '1': |
| 1046 | 1046 | $redirect_url = $directory_link = GravityView_API::directory_link(); |
| 1047 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 1047 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 1048 | 1048 | break; |
| 1049 | 1049 | |
| 1050 | 1050 | case '2': |
| 1051 | 1051 | $redirect_url = $edit_redirect_url; |
| 1052 | 1052 | $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
| 1053 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 1053 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 1054 | 1054 | break; |
| 1055 | 1055 | |
| 1056 | 1056 | case '': |
| 1057 | 1057 | default: |
| 1058 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 1058 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
| 1059 | 1059 | break; |
| 1060 | 1060 | } |
| 1061 | 1061 | |
@@ -1071,7 +1071,7 @@ discard block |
||
| 1071 | 1071 | * @param array $entry Gravity Forms entry array |
| 1072 | 1072 | * @param string $back_link URL to return to the original entry. @since 1.6 |
| 1073 | 1073 | */ |
| 1074 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
| 1074 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
| 1075 | 1075 | |
| 1076 | 1076 | echo GVCommon::generate_notice( $message ); |
| 1077 | 1077 | } |
@@ -1095,21 +1095,21 @@ discard block |
||
| 1095 | 1095 | */ |
| 1096 | 1096 | do_action( 'gravityview/edit-entry/render/before', $this ); |
| 1097 | 1097 | |
| 1098 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
| 1099 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
| 1098 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
| 1099 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
| 1100 | 1100 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
| 1101 | 1101 | |
| 1102 | 1102 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
| 1103 | 1103 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
| 1104 | 1104 | |
| 1105 | 1105 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
| 1106 | - unset( $_GET['page'] ); |
|
| 1106 | + unset( $_GET[ 'page' ] ); |
|
| 1107 | 1107 | |
| 1108 | 1108 | // TODO: Verify multiple-page forms |
| 1109 | 1109 | |
| 1110 | 1110 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
| 1111 | 1111 | |
| 1112 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
| 1112 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
| 1113 | 1113 | |
| 1114 | 1114 | ob_get_clean(); |
| 1115 | 1115 | |
@@ -1135,7 +1135,7 @@ discard block |
||
| 1135 | 1135 | * @return string |
| 1136 | 1136 | */ |
| 1137 | 1137 | public function render_form_buttons() { |
| 1138 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
| 1138 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
| 1139 | 1139 | } |
| 1140 | 1140 | |
| 1141 | 1141 | |
@@ -1155,10 +1155,10 @@ discard block |
||
| 1155 | 1155 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
| 1156 | 1156 | |
| 1157 | 1157 | // In case we have validated the form, use it to inject the validation results into the form render |
| 1158 | - if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) { |
|
| 1158 | + if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) { |
|
| 1159 | 1159 | $form = $this->form_after_validation; |
| 1160 | 1160 | } else { |
| 1161 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1161 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1162 | 1162 | } |
| 1163 | 1163 | |
| 1164 | 1164 | $form = $this->filter_conditional_logic( $form ); |
@@ -1166,8 +1166,8 @@ discard block |
||
| 1166 | 1166 | $form = $this->prefill_conditional_logic( $form ); |
| 1167 | 1167 | |
| 1168 | 1168 | // for now we don't support Save and Continue feature. |
| 1169 | - if( ! self::$supports_save_and_continue ) { |
|
| 1170 | - unset( $form['save'] ); |
|
| 1169 | + if ( ! self::$supports_save_and_continue ) { |
|
| 1170 | + unset( $form[ 'save' ] ); |
|
| 1171 | 1171 | } |
| 1172 | 1172 | |
| 1173 | 1173 | $form = $this->unselect_default_values( $form ); |
@@ -1190,31 +1190,31 @@ discard block |
||
| 1190 | 1190 | */ |
| 1191 | 1191 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
| 1192 | 1192 | |
| 1193 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
| 1193 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
| 1194 | 1194 | return $field_content; |
| 1195 | 1195 | } |
| 1196 | 1196 | |
| 1197 | 1197 | $message = null; |
| 1198 | 1198 | |
| 1199 | 1199 | // First, make sure they have the capability to edit the post. |
| 1200 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1200 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
| 1201 | 1201 | |
| 1202 | 1202 | /** |
| 1203 | 1203 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
| 1204 | 1204 | * @param string $message The existing "You don't have permission..." text |
| 1205 | 1205 | */ |
| 1206 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1206 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
| 1207 | 1207 | |
| 1208 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1208 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
| 1209 | 1209 | /** |
| 1210 | 1210 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
| 1211 | 1211 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
| 1212 | 1212 | */ |
| 1213 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1213 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1214 | 1214 | } |
| 1215 | 1215 | |
| 1216 | - if( $message ) { |
|
| 1217 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1216 | + if ( $message ) { |
|
| 1217 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1218 | 1218 | } |
| 1219 | 1219 | |
| 1220 | 1220 | return $field_content; |
@@ -1238,8 +1238,8 @@ discard block |
||
| 1238 | 1238 | |
| 1239 | 1239 | // If the form has been submitted, then we don't need to pre-fill the values, |
| 1240 | 1240 | // Except for fileupload type and when a field input is overridden- run always!! |
| 1241 | - if( |
|
| 1242 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1241 | + if ( |
|
| 1242 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1243 | 1243 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
| 1244 | 1244 | && ! GFCommon::is_product_field( $field->type ) |
| 1245 | 1245 | || ! empty( $field_content ) |
@@ -1259,7 +1259,7 @@ discard block |
||
| 1259 | 1259 | $return = null; |
| 1260 | 1260 | |
| 1261 | 1261 | /** @var GravityView_Field $gv_field */ |
| 1262 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1262 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1263 | 1263 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1264 | 1264 | } else { |
| 1265 | 1265 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1268,7 +1268,7 @@ discard block |
||
| 1268 | 1268 | // If there was output, it's an error |
| 1269 | 1269 | $warnings = ob_get_clean(); |
| 1270 | 1270 | |
| 1271 | - if( !empty( $warnings ) ) { |
|
| 1271 | + if ( ! empty( $warnings ) ) { |
|
| 1272 | 1272 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
| 1273 | 1273 | } |
| 1274 | 1274 | |
@@ -1293,7 +1293,7 @@ discard block |
||
| 1293 | 1293 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
| 1294 | 1294 | |
| 1295 | 1295 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
| 1296 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1296 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1297 | 1297 | |
| 1298 | 1298 | $field_value = array(); |
| 1299 | 1299 | |
@@ -1302,10 +1302,10 @@ discard block |
||
| 1302 | 1302 | |
| 1303 | 1303 | foreach ( (array)$field->inputs as $input ) { |
| 1304 | 1304 | |
| 1305 | - $input_id = strval( $input['id'] ); |
|
| 1305 | + $input_id = strval( $input[ 'id' ] ); |
|
| 1306 | 1306 | |
| 1307 | 1307 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1308 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1308 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1309 | 1309 | $allow_pre_populated = false; |
| 1310 | 1310 | } |
| 1311 | 1311 | |
@@ -1313,7 +1313,7 @@ discard block |
||
| 1313 | 1313 | |
| 1314 | 1314 | $pre_value = $field->get_value_submission( array(), false ); |
| 1315 | 1315 | |
| 1316 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1316 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1317 | 1317 | |
| 1318 | 1318 | } else { |
| 1319 | 1319 | |
@@ -1324,13 +1324,13 @@ discard block |
||
| 1324 | 1324 | |
| 1325 | 1325 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
| 1326 | 1326 | // or pre-populated value if not empty and set to override saved value |
| 1327 | - $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1327 | + $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1328 | 1328 | |
| 1329 | 1329 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
| 1330 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
| 1330 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
| 1331 | 1331 | $categories = array(); |
| 1332 | 1332 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1333 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1333 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1334 | 1334 | } |
| 1335 | 1335 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1336 | 1336 | } |
@@ -1358,7 +1358,7 @@ discard block |
||
| 1358 | 1358 | * @param GF_Field $field Gravity Forms field object |
| 1359 | 1359 | * @param GravityView_Edit_Entry_Render $this Current object |
| 1360 | 1360 | */ |
| 1361 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1361 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
| 1362 | 1362 | |
| 1363 | 1363 | return $field_value; |
| 1364 | 1364 | } |
@@ -1375,12 +1375,12 @@ discard block |
||
| 1375 | 1375 | */ |
| 1376 | 1376 | public function gform_pre_validation( $form ) { |
| 1377 | 1377 | |
| 1378 | - if( ! $this->verify_nonce() ) { |
|
| 1378 | + if ( ! $this->verify_nonce() ) { |
|
| 1379 | 1379 | return $form; |
| 1380 | 1380 | } |
| 1381 | 1381 | |
| 1382 | 1382 | // Fix PHP warning regarding undefined index. |
| 1383 | - foreach ( $form['fields'] as &$field) { |
|
| 1383 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1384 | 1384 | |
| 1385 | 1385 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1386 | 1386 | // expects certain field array items to be set. |
@@ -1388,7 +1388,7 @@ discard block |
||
| 1388 | 1388 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
| 1389 | 1389 | } |
| 1390 | 1390 | |
| 1391 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
| 1391 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
| 1392 | 1392 | |
| 1393 | 1393 | /** |
| 1394 | 1394 | * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend. |
@@ -1402,26 +1402,26 @@ discard block |
||
| 1402 | 1402 | // Set the previous value |
| 1403 | 1403 | $entry = $this->get_entry(); |
| 1404 | 1404 | |
| 1405 | - $input_name = 'input_'.$field->id; |
|
| 1406 | - $form_id = $form['id']; |
|
| 1405 | + $input_name = 'input_' . $field->id; |
|
| 1406 | + $form_id = $form[ 'id' ]; |
|
| 1407 | 1407 | |
| 1408 | 1408 | $value = NULL; |
| 1409 | 1409 | |
| 1410 | 1410 | // Use the previous entry value as the default. |
| 1411 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1411 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1412 | 1412 | $value = $entry[ $field->id ]; |
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | 1415 | // If this is a single upload file |
| 1416 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1417 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1418 | - $value = $file_path['url']; |
|
| 1416 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 1417 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
| 1418 | + $value = $file_path[ 'url' ]; |
|
| 1419 | 1419 | |
| 1420 | 1420 | } else { |
| 1421 | 1421 | |
| 1422 | 1422 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
| 1423 | 1423 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
| 1424 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1424 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
| 1425 | 1425 | |
| 1426 | 1426 | } |
| 1427 | 1427 | |
@@ -1429,10 +1429,10 @@ discard block |
||
| 1429 | 1429 | |
| 1430 | 1430 | // If there are fresh uploads, process and merge them. |
| 1431 | 1431 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
| 1432 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1432 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
| 1433 | 1433 | $value = empty( $value ) ? '[]' : $value; |
| 1434 | 1434 | $value = stripslashes_deep( $value ); |
| 1435 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1435 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
| 1436 | 1436 | } |
| 1437 | 1437 | |
| 1438 | 1438 | } else { |
@@ -1450,8 +1450,8 @@ discard block |
||
| 1450 | 1450 | |
| 1451 | 1451 | case 'number': |
| 1452 | 1452 | // Fix "undefined index" issue at line 1286 in form_display.php |
| 1453 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1454 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1453 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
| 1454 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
| 1455 | 1455 | } |
| 1456 | 1456 | break; |
| 1457 | 1457 | } |
@@ -1488,7 +1488,7 @@ discard block |
||
| 1488 | 1488 | * You can enter whatever you want! |
| 1489 | 1489 | * We try validating, and customize the results using `self::custom_validation()` |
| 1490 | 1490 | */ |
| 1491 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
| 1491 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
| 1492 | 1492 | |
| 1493 | 1493 | // Needed by the validate funtion |
| 1494 | 1494 | $failed_validation_page = NULL; |
@@ -1496,14 +1496,14 @@ discard block |
||
| 1496 | 1496 | |
| 1497 | 1497 | // Prevent entry limit from running when editing an entry, also |
| 1498 | 1498 | // prevent form scheduling from preventing editing |
| 1499 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
| 1499 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
| 1500 | 1500 | |
| 1501 | 1501 | // Hide fields depending on Edit Entry settings |
| 1502 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1502 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1503 | 1503 | |
| 1504 | 1504 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
| 1505 | 1505 | |
| 1506 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1506 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1507 | 1507 | } |
| 1508 | 1508 | |
| 1509 | 1509 | |
@@ -1526,7 +1526,7 @@ discard block |
||
| 1526 | 1526 | |
| 1527 | 1527 | $gv_valid = true; |
| 1528 | 1528 | |
| 1529 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
| 1529 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
| 1530 | 1530 | |
| 1531 | 1531 | $value = RGFormsModel::get_field_value( $field ); |
| 1532 | 1532 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1539,22 +1539,22 @@ discard block |
||
| 1539 | 1539 | case 'post_image': |
| 1540 | 1540 | |
| 1541 | 1541 | // in case nothing is uploaded but there are already files saved |
| 1542 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1542 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
| 1543 | 1543 | $field->failed_validation = false; |
| 1544 | 1544 | unset( $field->validation_message ); |
| 1545 | 1545 | } |
| 1546 | 1546 | |
| 1547 | 1547 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
| 1548 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1548 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
| 1549 | 1549 | |
| 1550 | 1550 | $input_name = 'input_' . $field->id; |
| 1551 | 1551 | //uploaded |
| 1552 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1552 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
| 1553 | 1553 | |
| 1554 | 1554 | //existent |
| 1555 | 1555 | $entry = $this->get_entry(); |
| 1556 | 1556 | $value = NULL; |
| 1557 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1557 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1558 | 1558 | $value = json_decode( $entry[ $field->id ], true ); |
| 1559 | 1559 | } |
| 1560 | 1560 | |
@@ -1562,13 +1562,13 @@ discard block |
||
| 1562 | 1562 | $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
| 1563 | 1563 | ( is_array( $value ) ? count( $value ) : 0 ); |
| 1564 | 1564 | |
| 1565 | - if( $count_files > $field->maxFiles ) { |
|
| 1565 | + if ( $count_files > $field->maxFiles ) { |
|
| 1566 | 1566 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
| 1567 | 1567 | $field->failed_validation = 1; |
| 1568 | 1568 | $gv_valid = false; |
| 1569 | 1569 | |
| 1570 | 1570 | // in case of error make sure the newest upload files are removed from the upload input |
| 1571 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1571 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
| 1572 | 1572 | } |
| 1573 | 1573 | |
| 1574 | 1574 | } |
@@ -1579,7 +1579,7 @@ discard block |
||
| 1579 | 1579 | } |
| 1580 | 1580 | |
| 1581 | 1581 | // This field has failed validation. |
| 1582 | - if( !empty( $field->failed_validation ) ) { |
|
| 1582 | + if ( ! empty( $field->failed_validation ) ) { |
|
| 1583 | 1583 | |
| 1584 | 1584 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
| 1585 | 1585 | |
@@ -1597,19 +1597,19 @@ discard block |
||
| 1597 | 1597 | } |
| 1598 | 1598 | |
| 1599 | 1599 | // You can't continue inside a switch, so we do it after. |
| 1600 | - if( empty( $field->failed_validation ) ) { |
|
| 1600 | + if ( empty( $field->failed_validation ) ) { |
|
| 1601 | 1601 | continue; |
| 1602 | 1602 | } |
| 1603 | 1603 | |
| 1604 | 1604 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1605 | 1605 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1606 | - if( !empty( $field->noDuplicates ) ) { |
|
| 1606 | + if ( ! empty( $field->noDuplicates ) ) { |
|
| 1607 | 1607 | |
| 1608 | 1608 | $entry = $this->get_entry(); |
| 1609 | 1609 | |
| 1610 | 1610 | // If the value of the entry is the same as the stored value |
| 1611 | 1611 | // Then we can assume it's not a duplicate, it's the same. |
| 1612 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1612 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1613 | 1613 | //if value submitted was not changed, then don't validate |
| 1614 | 1614 | $field->failed_validation = false; |
| 1615 | 1615 | |
@@ -1622,7 +1622,7 @@ discard block |
||
| 1622 | 1622 | } |
| 1623 | 1623 | |
| 1624 | 1624 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1625 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1625 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1626 | 1626 | unset( $field->validation_message ); |
| 1627 | 1627 | $field->validation_message = false; |
| 1628 | 1628 | continue; |
@@ -1634,12 +1634,12 @@ discard block |
||
| 1634 | 1634 | |
| 1635 | 1635 | } |
| 1636 | 1636 | |
| 1637 | - $validation_results['is_valid'] = $gv_valid; |
|
| 1637 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
| 1638 | 1638 | |
| 1639 | 1639 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
| 1640 | 1640 | |
| 1641 | 1641 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
| 1642 | - $this->form_after_validation = $validation_results['form']; |
|
| 1642 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
| 1643 | 1643 | |
| 1644 | 1644 | return $validation_results; |
| 1645 | 1645 | } |
@@ -1652,7 +1652,7 @@ discard block |
||
| 1652 | 1652 | */ |
| 1653 | 1653 | public function get_entry() { |
| 1654 | 1654 | |
| 1655 | - if( empty( $this->entry ) ) { |
|
| 1655 | + if ( empty( $this->entry ) ) { |
|
| 1656 | 1656 | // Get the database value of the entry that's being edited |
| 1657 | 1657 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
| 1658 | 1658 | } |
@@ -1684,10 +1684,10 @@ discard block |
||
| 1684 | 1684 | } |
| 1685 | 1685 | |
| 1686 | 1686 | // If edit tab not yet configured, show all fields |
| 1687 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
| 1687 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
| 1688 | 1688 | |
| 1689 | 1689 | // Hide fields depending on admin settings |
| 1690 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
| 1690 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
| 1691 | 1691 | |
| 1692 | 1692 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
| 1693 | 1693 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1720,7 +1720,7 @@ discard block |
||
| 1720 | 1720 | */ |
| 1721 | 1721 | private function filter_fields( $fields, $configured_fields ) { |
| 1722 | 1722 | |
| 1723 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
| 1723 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
| 1724 | 1724 | return $fields; |
| 1725 | 1725 | } |
| 1726 | 1726 | |
@@ -1733,12 +1733,12 @@ discard block |
||
| 1733 | 1733 | |
| 1734 | 1734 | // Remove the fields that have calculation properties and keep them to be used later |
| 1735 | 1735 | // @since 1.16.2 |
| 1736 | - if( $field->has_calculation() ) { |
|
| 1737 | - $this->fields_with_calculation[] = $field; |
|
| 1736 | + if ( $field->has_calculation() ) { |
|
| 1737 | + $this->fields_with_calculation[ ] = $field; |
|
| 1738 | 1738 | // don't remove the calculation fields on form render. |
| 1739 | 1739 | } |
| 1740 | 1740 | |
| 1741 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1741 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1742 | 1742 | unset( $fields[ $key ] ); |
| 1743 | 1743 | } |
| 1744 | 1744 | } |
@@ -1756,7 +1756,7 @@ discard block |
||
| 1756 | 1756 | continue; // Same |
| 1757 | 1757 | } |
| 1758 | 1758 | |
| 1759 | - $out_fields[] = $field; |
|
| 1759 | + $out_fields[ ] = $field; |
|
| 1760 | 1760 | } |
| 1761 | 1761 | |
| 1762 | 1762 | return array_values( $out_fields ); |
@@ -1767,8 +1767,8 @@ discard block |
||
| 1767 | 1767 | |
| 1768 | 1768 | /** @var GF_Field $field */ |
| 1769 | 1769 | foreach ( $fields as $field ) { |
| 1770 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1771 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1770 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1771 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1772 | 1772 | break; |
| 1773 | 1773 | } |
| 1774 | 1774 | |
@@ -1791,14 +1791,14 @@ discard block |
||
| 1791 | 1791 | |
| 1792 | 1792 | $return_field = $field; |
| 1793 | 1793 | |
| 1794 | - if( empty( $field_setting['show_label'] ) ) { |
|
| 1794 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
| 1795 | 1795 | $return_field->label = ''; |
| 1796 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
| 1797 | - $return_field->label = $field_setting['custom_label']; |
|
| 1796 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
| 1797 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
| 1798 | 1798 | } |
| 1799 | 1799 | |
| 1800 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
| 1801 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
| 1800 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
| 1801 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
| 1802 | 1802 | } |
| 1803 | 1803 | |
| 1804 | 1804 | /** |
@@ -1836,16 +1836,16 @@ discard block |
||
| 1836 | 1836 | */ |
| 1837 | 1837 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
| 1838 | 1838 | |
| 1839 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1840 | - foreach( $fields as $k => $field ) { |
|
| 1841 | - if( $field->adminOnly ) { |
|
| 1839 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
| 1840 | + foreach ( $fields as $k => $field ) { |
|
| 1841 | + if ( $field->adminOnly ) { |
|
| 1842 | 1842 | unset( $fields[ $k ] ); |
| 1843 | 1843 | } |
| 1844 | 1844 | } |
| 1845 | 1845 | return array_values( $fields ); |
| 1846 | 1846 | } |
| 1847 | 1847 | |
| 1848 | - foreach( $fields as &$field ) { |
|
| 1848 | + foreach ( $fields as &$field ) { |
|
| 1849 | 1849 | $field->adminOnly = false; |
| 1850 | 1850 | } |
| 1851 | 1851 | |
@@ -1866,7 +1866,7 @@ discard block |
||
| 1866 | 1866 | */ |
| 1867 | 1867 | private function unselect_default_values( $form ) { |
| 1868 | 1868 | |
| 1869 | - foreach ( $form['fields'] as &$field ) { |
|
| 1869 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1870 | 1870 | |
| 1871 | 1871 | if ( empty( $field->choices ) ) { |
| 1872 | 1872 | continue; |
@@ -1874,7 +1874,7 @@ discard block |
||
| 1874 | 1874 | |
| 1875 | 1875 | foreach ( $field->choices as &$choice ) { |
| 1876 | 1876 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
| 1877 | - $choice['isSelected'] = false; |
|
| 1877 | + $choice[ 'isSelected' ] = false; |
|
| 1878 | 1878 | } |
| 1879 | 1879 | } |
| 1880 | 1880 | } |
@@ -1899,22 +1899,22 @@ discard block |
||
| 1899 | 1899 | */ |
| 1900 | 1900 | function prefill_conditional_logic( $form ) { |
| 1901 | 1901 | |
| 1902 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1902 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1903 | 1903 | return $form; |
| 1904 | 1904 | } |
| 1905 | 1905 | |
| 1906 | 1906 | // Have Conditional Logic pre-fill fields as if the data were default values |
| 1907 | 1907 | /** @var GF_Field $field */ |
| 1908 | - foreach ( $form['fields'] as &$field ) { |
|
| 1908 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1909 | 1909 | |
| 1910 | - if( 'checkbox' === $field->type ) { |
|
| 1910 | + if ( 'checkbox' === $field->type ) { |
|
| 1911 | 1911 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1912 | - $input_id = $input['id']; |
|
| 1912 | + $input_id = $input[ 'id' ]; |
|
| 1913 | 1913 | $choice = $field->choices[ $key ]; |
| 1914 | 1914 | $value = \GV\Utils::get( $this->entry, $input_id ); |
| 1915 | 1915 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
| 1916 | - if( $match ) { |
|
| 1917 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1916 | + if ( $match ) { |
|
| 1917 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
| 1918 | 1918 | } |
| 1919 | 1919 | } |
| 1920 | 1920 | } else { |
@@ -1922,15 +1922,15 @@ discard block |
||
| 1922 | 1922 | // We need to run through each field to set the default values |
| 1923 | 1923 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1924 | 1924 | |
| 1925 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1925 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1926 | 1926 | |
| 1927 | - if( 'list' === $field->type ) { |
|
| 1927 | + if ( 'list' === $field->type ) { |
|
| 1928 | 1928 | $list_rows = maybe_unserialize( $field_value ); |
| 1929 | 1929 | |
| 1930 | 1930 | $list_field_value = array(); |
| 1931 | - foreach ( (array) $list_rows as $row ) { |
|
| 1932 | - foreach ( (array) $row as $column ) { |
|
| 1933 | - $list_field_value[] = $column; |
|
| 1931 | + foreach ( (array)$list_rows as $row ) { |
|
| 1932 | + foreach ( (array)$row as $column ) { |
|
| 1933 | + $list_field_value[ ] = $column; |
|
| 1934 | 1934 | } |
| 1935 | 1935 | } |
| 1936 | 1936 | |
@@ -1963,32 +1963,32 @@ discard block |
||
| 1963 | 1963 | * @see https://github.com/gravityview/GravityView/issues/840 |
| 1964 | 1964 | * @since develop |
| 1965 | 1965 | */ |
| 1966 | - $the_form = GFAPI::get_form( $form['id'] ); |
|
| 1966 | + $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
| 1967 | 1967 | $editable_ids = array(); |
| 1968 | - foreach ( $form['fields'] as $field ) { |
|
| 1969 | - $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
| 1968 | + foreach ( $form[ 'fields' ] as $field ) { |
|
| 1969 | + $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
| 1970 | 1970 | } |
| 1971 | 1971 | $remove_conditions_rule = array(); |
| 1972 | - foreach ( $the_form['fields'] as $field ) { |
|
| 1973 | - if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
| 1974 | - foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
| 1975 | - if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
| 1972 | + foreach ( $the_form[ 'fields' ] as $field ) { |
|
| 1973 | + if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
| 1974 | + foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
| 1975 | + if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
| 1976 | 1976 | /** |
| 1977 | 1977 | * This conditional field is not editable in this View. |
| 1978 | 1978 | * We need to remove the rule, but only if it matches. |
| 1979 | 1979 | */ |
| 1980 | - if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
| 1980 | + if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
| 1981 | 1981 | $value = $_field->get_value_export( $this->entry ); |
| 1982 | - } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
| 1983 | - $value = $this->entry[ $rule['fieldId'] ]; |
|
| 1982 | + } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
| 1983 | + $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
| 1984 | 1984 | } else { |
| 1985 | - $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
| 1985 | + $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
| 1986 | 1986 | } |
| 1987 | 1987 | |
| 1988 | - $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
| 1988 | + $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
| 1989 | 1989 | |
| 1990 | 1990 | if ( $match ) { |
| 1991 | - $remove_conditions_rule[] = array( $field['id'], $i ); |
|
| 1991 | + $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
| 1992 | 1992 | } |
| 1993 | 1993 | } |
| 1994 | 1994 | } |
@@ -1996,21 +1996,21 @@ discard block |
||
| 1996 | 1996 | } |
| 1997 | 1997 | |
| 1998 | 1998 | if ( $remove_conditions_rule ) { |
| 1999 | - foreach ( $form['fields'] as &$field ) { |
|
| 1999 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 2000 | 2000 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
| 2001 | 2001 | |
| 2002 | 2002 | list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
| 2003 | 2003 | |
| 2004 | - if ( $field['id'] == $rule_field_id ) { |
|
| 2005 | - unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
| 2006 | - gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
| 2004 | + if ( $field[ 'id' ] == $rule_field_id ) { |
|
| 2005 | + unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
| 2006 | + gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
| 2007 | 2007 | } |
| 2008 | 2008 | } |
| 2009 | 2009 | } |
| 2010 | 2010 | } |
| 2011 | 2011 | |
| 2012 | 2012 | /** Normalize the indices... */ |
| 2013 | - $form['fields'] = array_values( $form['fields'] ); |
|
| 2013 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
| 2014 | 2014 | |
| 2015 | 2015 | /** |
| 2016 | 2016 | * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
@@ -2020,16 +2020,16 @@ discard block |
||
| 2020 | 2020 | */ |
| 2021 | 2021 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
| 2022 | 2022 | |
| 2023 | - if( $use_conditional_logic ) { |
|
| 2023 | + if ( $use_conditional_logic ) { |
|
| 2024 | 2024 | return $form; |
| 2025 | 2025 | } |
| 2026 | 2026 | |
| 2027 | - foreach( $form['fields'] as &$field ) { |
|
| 2027 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 2028 | 2028 | /* @var GF_Field $field */ |
| 2029 | 2029 | $field->conditionalLogic = null; |
| 2030 | 2030 | } |
| 2031 | 2031 | |
| 2032 | - unset( $form['button']['conditionalLogic'] ); |
|
| 2032 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
| 2033 | 2033 | |
| 2034 | 2034 | return $form; |
| 2035 | 2035 | |
@@ -2046,7 +2046,7 @@ discard block |
||
| 2046 | 2046 | */ |
| 2047 | 2047 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
| 2048 | 2048 | |
| 2049 | - if( ! $this->is_edit_entry() ) { |
|
| 2049 | + if ( ! $this->is_edit_entry() ) { |
|
| 2050 | 2050 | return $has_conditional_logic; |
| 2051 | 2051 | } |
| 2052 | 2052 | |
@@ -2078,44 +2078,44 @@ discard block |
||
| 2078 | 2078 | * 2. There are two entries embedded using oEmbed |
| 2079 | 2079 | * 3. One of the entries has just been saved |
| 2080 | 2080 | */ |
| 2081 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
| 2081 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
| 2082 | 2082 | |
| 2083 | 2083 | $error = true; |
| 2084 | 2084 | |
| 2085 | 2085 | } |
| 2086 | 2086 | |
| 2087 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
| 2087 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
| 2088 | 2088 | |
| 2089 | 2089 | $error = true; |
| 2090 | 2090 | |
| 2091 | - } elseif( ! $this->verify_nonce() ) { |
|
| 2091 | + } elseif ( ! $this->verify_nonce() ) { |
|
| 2092 | 2092 | |
| 2093 | 2093 | /** |
| 2094 | 2094 | * If the Entry is embedded, there may be two entries on the same page. |
| 2095 | 2095 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
| 2096 | 2096 | */ |
| 2097 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 2097 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 2098 | 2098 | $error = true; |
| 2099 | 2099 | } else { |
| 2100 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
| 2100 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 2101 | 2101 | } |
| 2102 | 2102 | |
| 2103 | 2103 | } |
| 2104 | 2104 | |
| 2105 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 2106 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
| 2105 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 2106 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
| 2107 | 2107 | } |
| 2108 | 2108 | |
| 2109 | - if( $this->entry['status'] === 'trash' ) { |
|
| 2110 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 2109 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
| 2110 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 2111 | 2111 | } |
| 2112 | 2112 | |
| 2113 | 2113 | // No errors; everything's fine here! |
| 2114 | - if( empty( $error ) ) { |
|
| 2114 | + if ( empty( $error ) ) { |
|
| 2115 | 2115 | return true; |
| 2116 | 2116 | } |
| 2117 | 2117 | |
| 2118 | - if( $echo && $error !== true ) { |
|
| 2118 | + if ( $echo && $error !== true ) { |
|
| 2119 | 2119 | |
| 2120 | 2120 | $error = esc_html( $error ); |
| 2121 | 2121 | |
@@ -2123,10 +2123,10 @@ discard block |
||
| 2123 | 2123 | * @since 1.9 |
| 2124 | 2124 | */ |
| 2125 | 2125 | if ( ! empty( $this->entry ) ) { |
| 2126 | - $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 2126 | + $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 2127 | 2127 | } |
| 2128 | 2128 | |
| 2129 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
| 2129 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
| 2130 | 2130 | } |
| 2131 | 2131 | |
| 2132 | 2132 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2146,17 +2146,17 @@ discard block |
||
| 2146 | 2146 | |
| 2147 | 2147 | $error = NULL; |
| 2148 | 2148 | |
| 2149 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 2150 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
| 2149 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 2150 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
| 2151 | 2151 | } |
| 2152 | 2152 | |
| 2153 | 2153 | // No errors; everything's fine here! |
| 2154 | - if( empty( $error ) ) { |
|
| 2154 | + if ( empty( $error ) ) { |
|
| 2155 | 2155 | return true; |
| 2156 | 2156 | } |
| 2157 | 2157 | |
| 2158 | - if( $echo ) { |
|
| 2159 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
| 2158 | + if ( $echo ) { |
|
| 2159 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
| 2160 | 2160 | } |
| 2161 | 2161 | |
| 2162 | 2162 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2177,14 +2177,14 @@ discard block |
||
| 2177 | 2177 | private function check_user_cap_edit_field( $field ) { |
| 2178 | 2178 | |
| 2179 | 2179 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
| 2180 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 2180 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 2181 | 2181 | return true; |
| 2182 | 2182 | } |
| 2183 | 2183 | |
| 2184 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
| 2184 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
| 2185 | 2185 | |
| 2186 | - if( $field_cap ) { |
|
| 2187 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
| 2186 | + if ( $field_cap ) { |
|
| 2187 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
| 2188 | 2188 | } |
| 2189 | 2189 | |
| 2190 | 2190 | return false; |
@@ -2198,17 +2198,17 @@ discard block |
||
| 2198 | 2198 | public function verify_nonce() { |
| 2199 | 2199 | |
| 2200 | 2200 | // Verify form submitted for editing single |
| 2201 | - if( $this->is_edit_entry_submission() ) { |
|
| 2201 | + if ( $this->is_edit_entry_submission() ) { |
|
| 2202 | 2202 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
| 2203 | 2203 | } |
| 2204 | 2204 | |
| 2205 | 2205 | // Verify |
| 2206 | - else if( ! $this->is_edit_entry() ) { |
|
| 2206 | + else if ( ! $this->is_edit_entry() ) { |
|
| 2207 | 2207 | $valid = false; |
| 2208 | 2208 | } |
| 2209 | 2209 | |
| 2210 | 2210 | else { |
| 2211 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
| 2211 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
| 2212 | 2212 | } |
| 2213 | 2213 | |
| 2214 | 2214 | /** |
@@ -27,32 +27,32 @@ discard block |
||
| 27 | 27 | add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 ); |
| 28 | 28 | |
| 29 | 29 | // Tooltips |
| 30 | - add_filter( 'gform_tooltips', array( $this, 'tooltips') ); |
|
| 30 | + add_filter( 'gform_tooltips', array( $this, 'tooltips' ) ); |
|
| 31 | 31 | |
| 32 | 32 | // adding styles and scripts |
| 33 | - add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 ); |
|
| 34 | - add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') ); |
|
| 35 | - add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') ); |
|
| 36 | - add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') ); |
|
| 37 | - add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') ); |
|
| 38 | - |
|
| 39 | - add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 ); |
|
| 40 | - add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 ); |
|
| 41 | - add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers') ); |
|
| 42 | - add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 ); |
|
| 43 | - add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') ); |
|
| 44 | - add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 ); |
|
| 33 | + add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 ); |
|
| 34 | + add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) ); |
|
| 35 | + add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
|
| 36 | + add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) ); |
|
| 37 | + add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
|
| 38 | + |
|
| 39 | + add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 ); |
|
| 40 | + add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 ); |
|
| 41 | + add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ) ); |
|
| 42 | + add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 ); |
|
| 43 | + add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) ); |
|
| 44 | + add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 ); |
|
| 45 | 45 | |
| 46 | 46 | // @todo check if this hook is needed.. |
| 47 | 47 | //add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 ); |
| 48 | 48 | |
| 49 | 49 | // Add Connected Form column |
| 50 | - add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) ); |
|
| 50 | + add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) ); |
|
| 51 | 51 | |
| 52 | 52 | add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 ); |
| 53 | 53 | add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 ); |
| 54 | 54 | |
| 55 | - add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 ); |
|
| 55 | + add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 ); |
|
| 56 | 56 | |
| 57 | 57 | add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) ); |
| 58 | 58 | |
@@ -71,11 +71,11 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | function suggest_support_articles( $localization_data = array() ) { |
| 73 | 73 | |
| 74 | - if( ! gravityview()->request->is_view() ) { |
|
| 74 | + if ( ! gravityview()->request->is_view() ) { |
|
| 75 | 75 | return $localization_data; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - $localization_data['suggest'] = array( |
|
| 78 | + $localization_data[ 'suggest' ] = array( |
|
| 79 | 79 | '57ef23539033602e61d4a560', |
| 80 | 80 | '54c67bb9e4b0512429885513', |
| 81 | 81 | '54c67bb9e4b0512429885512', |
@@ -96,13 +96,13 @@ discard block |
||
| 96 | 96 | public function filter_pre_get_posts_by_gravityview_form_id( &$query ) { |
| 97 | 97 | global $pagenow; |
| 98 | 98 | |
| 99 | - if ( !is_admin() ) { |
|
| 99 | + if ( ! is_admin() ) { |
|
| 100 | 100 | return; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - $form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false; |
|
| 103 | + $form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false; |
|
| 104 | 104 | |
| 105 | - if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) { |
|
| 105 | + if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) { |
|
| 106 | 106 | return; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -119,18 +119,18 @@ discard block |
||
| 119 | 119 | function add_view_dropdown() { |
| 120 | 120 | $current_screen = get_current_screen(); |
| 121 | 121 | |
| 122 | - if( 'gravityview' !== $current_screen->post_type ) { |
|
| 122 | + if ( 'gravityview' !== $current_screen->post_type ) { |
|
| 123 | 123 | return; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $forms = gravityview_get_forms(); |
| 127 | 127 | $current_form = \GV\Utils::_GET( 'gravityview_form_id' ); |
| 128 | 128 | // If there are no forms to select, show no forms. |
| 129 | - if( !empty( $forms ) ) { ?> |
|
| 129 | + if ( ! empty( $forms ) ) { ?> |
|
| 130 | 130 | <select name="gravityview_form_id" id="gravityview_form_id"> |
| 131 | 131 | <option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option> |
| 132 | - <?php foreach( $forms as $form ) { ?> |
|
| 133 | - <option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option> |
|
| 132 | + <?php foreach ( $forms as $form ) { ?> |
|
| 133 | + <option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option> |
|
| 134 | 134 | <?php } ?> |
| 135 | 135 | </select> |
| 136 | 136 | <?php } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | */ |
| 144 | 144 | public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) { |
| 145 | 145 | _deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' ); |
| 146 | - GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id ); |
|
| 146 | + GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id ); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /** |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) { |
| 166 | 166 | |
| 167 | 167 | // Don't show on Trashed forms |
| 168 | - if( 'trash' === rgget( 'filter') ) { |
|
| 168 | + if ( 'trash' === rgget( 'filter' ) ) { |
|
| 169 | 169 | return $menu_items; |
| 170 | 170 | } |
| 171 | 171 | |
@@ -173,13 +173,13 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | $priority = 0; |
| 175 | 175 | |
| 176 | - if( 'form_list' === GFForms::get_page() ) { |
|
| 176 | + if ( 'form_list' === GFForms::get_page() ) { |
|
| 177 | 177 | $priority = 790; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - if( empty( $connected_views ) ) { |
|
| 180 | + if ( empty( $connected_views ) ) { |
|
| 181 | 181 | |
| 182 | - $menu_items['gravityview'] = array( |
|
| 182 | + $menu_items[ 'gravityview' ] = array( |
|
| 183 | 183 | 'label' => esc_attr__( 'Create a View', 'gravityview' ), |
| 184 | 184 | 'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', |
| 185 | 185 | 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), |
@@ -195,22 +195,22 @@ discard block |
||
| 195 | 195 | $sub_menu_items = array(); |
| 196 | 196 | foreach ( (array)$connected_views as $view ) { |
| 197 | 197 | |
| 198 | - if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) { |
|
| 198 | + if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) { |
|
| 199 | 199 | continue; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - $label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title; |
|
| 202 | + $label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title; |
|
| 203 | 203 | |
| 204 | - $sub_menu_items[] = array( |
|
| 204 | + $sub_menu_items[ ] = array( |
|
| 205 | 205 | 'label' => esc_attr( $label ), |
| 206 | - 'url' => admin_url( 'post.php?action=edit&post='.$view->ID ), |
|
| 206 | + 'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ), |
|
| 207 | 207 | ); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // If there were no items added, then let's create the parent menu |
| 211 | - if( $sub_menu_items ) { |
|
| 211 | + if ( $sub_menu_items ) { |
|
| 212 | 212 | |
| 213 | - $sub_menu_items[] = array( |
|
| 213 | + $sub_menu_items[ ] = array( |
|
| 214 | 214 | 'label' => esc_attr__( 'Create a View', 'gravityview' ), |
| 215 | 215 | 'link_class' => 'gv-create-view', |
| 216 | 216 | 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), |
@@ -219,14 +219,14 @@ discard block |
||
| 219 | 219 | ); |
| 220 | 220 | |
| 221 | 221 | // Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown |
| 222 | - $sub_menu_items[] = array( |
|
| 222 | + $sub_menu_items[ ] = array( |
|
| 223 | 223 | 'url' => '#', |
| 224 | 224 | 'label' => '', |
| 225 | 225 | 'menu_class' => 'hidden', |
| 226 | 226 | 'capabilities' => '', |
| 227 | 227 | ); |
| 228 | 228 | |
| 229 | - $menu_items['gravityview'] = array( |
|
| 229 | + $menu_items[ 'gravityview' ] = array( |
|
| 230 | 230 | 'label' => __( 'Connected Views', 'gravityview' ), |
| 231 | 231 | 'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', |
| 232 | 232 | 'title' => __( 'GravityView Views using this form as a data source', 'gravityview' ), |
@@ -255,8 +255,8 @@ discard block |
||
| 255 | 255 | $add = array( 'captcha', 'page' ); |
| 256 | 256 | |
| 257 | 257 | // Don't allowing editing the following values: |
| 258 | - if( $context === 'edit' ) { |
|
| 259 | - $add[] = 'post_id'; |
|
| 258 | + if ( $context === 'edit' ) { |
|
| 259 | + $add[ ] = 'post_id'; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | $return = array_merge( $array, $add ); |
@@ -279,32 +279,32 @@ discard block |
||
| 279 | 279 | foreach ( $default_args as $key => $arg ) { |
| 280 | 280 | |
| 281 | 281 | // If an arg has `tooltip` defined, but it's false, don't display a tooltip |
| 282 | - if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; } |
|
| 282 | + if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; } |
|
| 283 | 283 | |
| 284 | 284 | // By default, use `tooltip` if defined. |
| 285 | - $tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip']; |
|
| 285 | + $tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ]; |
|
| 286 | 286 | |
| 287 | 287 | // Otherwise, use the description as a tooltip. |
| 288 | - if( empty( $tooltip ) && !empty( $arg['desc'] ) ) { |
|
| 289 | - $tooltip = $arg['desc']; |
|
| 288 | + if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) { |
|
| 289 | + $tooltip = $arg[ 'desc' ]; |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | // If there's no tooltip set, continue |
| 293 | - if( empty( $tooltip ) ) { |
|
| 293 | + if ( empty( $tooltip ) ) { |
|
| 294 | 294 | continue; |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | // Add the tooltip |
| 298 | - $gv_tooltips[ 'gv_'.$key ] = array( |
|
| 299 | - 'title' => $arg['label'], |
|
| 298 | + $gv_tooltips[ 'gv_' . $key ] = array( |
|
| 299 | + 'title' => $arg[ 'label' ], |
|
| 300 | 300 | 'value' => $tooltip, |
| 301 | 301 | ); |
| 302 | 302 | |
| 303 | 303 | } |
| 304 | 304 | |
| 305 | - $gv_tooltips['gv_css_merge_tags'] = array( |
|
| 306 | - 'title' => __('CSS Merge Tags', 'gravityview'), |
|
| 307 | - 'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' ) |
|
| 305 | + $gv_tooltips[ 'gv_css_merge_tags' ] = array( |
|
| 306 | + 'title' => __( 'CSS Merge Tags', 'gravityview' ), |
|
| 307 | + 'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' ) |
|
| 308 | 308 | ); |
| 309 | 309 | |
| 310 | 310 | /** |
@@ -322,9 +322,9 @@ discard block |
||
| 322 | 322 | |
| 323 | 323 | foreach ( $gv_tooltips as $key => $tooltip ) { |
| 324 | 324 | |
| 325 | - $title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>'; |
|
| 325 | + $title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>'; |
|
| 326 | 326 | |
| 327 | - $tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) ); |
|
| 327 | + $tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) ); |
|
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | return $tooltips; |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | * |
| 339 | 339 | * @return void |
| 340 | 340 | */ |
| 341 | - public function add_custom_column_content( $column_name = NULL, $post_id ) { |
|
| 341 | + public function add_custom_column_content( $column_name = NULL, $post_id ) { |
|
| 342 | 342 | |
| 343 | 343 | $output = ''; |
| 344 | 344 | |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | // Generate backup if label doesn't exist: `example_name` => `Example Name` |
| 361 | 361 | $template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) ); |
| 362 | 362 | |
| 363 | - $output = $template ? $template['label'] : $template_id_pretty; |
|
| 363 | + $output = $template ? $template[ 'label' ] : $template_id_pretty; |
|
| 364 | 364 | |
| 365 | 365 | break; |
| 366 | 366 | |
@@ -401,44 +401,44 @@ discard block |
||
| 401 | 401 | static public function get_connected_form_links( $form, $include_form_link = true ) { |
| 402 | 402 | |
| 403 | 403 | // Either the form is empty or the form ID is 0, not yet set. |
| 404 | - if( empty( $form ) ) { |
|
| 404 | + if ( empty( $form ) ) { |
|
| 405 | 405 | return ''; |
| 406 | 406 | } |
| 407 | 407 | |
| 408 | 408 | // The $form is passed as the form ID |
| 409 | - if( !is_array( $form ) ) { |
|
| 409 | + if ( ! is_array( $form ) ) { |
|
| 410 | 410 | $form = gravityview_get_form( $form ); |
| 411 | 411 | } |
| 412 | 412 | |
| 413 | - $form_id = $form['id']; |
|
| 413 | + $form_id = $form[ 'id' ]; |
|
| 414 | 414 | $links = array(); |
| 415 | 415 | |
| 416 | - if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) { |
|
| 416 | + if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) { |
|
| 417 | 417 | $form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&id=%d', $form_id ) ); |
| 418 | - $form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>'; |
|
| 419 | - $links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>'; |
|
| 418 | + $form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>'; |
|
| 419 | + $links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>'; |
|
| 420 | 420 | } else { |
| 421 | - $form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>'; |
|
| 421 | + $form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>'; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | - if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) { |
|
| 424 | + if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) { |
|
| 425 | 425 | $entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&id=%d', $form_id ) ); |
| 426 | - $links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>'; |
|
| 426 | + $links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>'; |
|
| 427 | 427 | } |
| 428 | 428 | |
| 429 | - if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) { |
|
| 429 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) { |
|
| 430 | 430 | $settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&view=settings&id=%d', $form_id ) ); |
| 431 | - $links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>'; |
|
| 431 | + $links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>'; |
|
| 432 | 432 | } |
| 433 | 433 | |
| 434 | - if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) { |
|
| 434 | + if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) { |
|
| 435 | 435 | $preview_url = site_url( sprintf( '?gf_page=preview&id=%d', $form_id ) ); |
| 436 | - $links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>'; |
|
| 436 | + $links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>'; |
|
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | $output = ''; |
| 440 | 440 | |
| 441 | - if( !empty( $include_form_link ) ) { |
|
| 441 | + if ( ! empty( $include_form_link ) ) { |
|
| 442 | 442 | $output .= $form_link; |
| 443 | 443 | } |
| 444 | 444 | |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | */ |
| 451 | 451 | $links = apply_filters( 'gravityview_connected_form_links', $links, $form ); |
| 452 | 452 | |
| 453 | - $output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>'; |
|
| 453 | + $output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>'; |
|
| 454 | 454 | |
| 455 | 455 | return $output; |
| 456 | 456 | } |
@@ -464,8 +464,8 @@ discard block |
||
| 464 | 464 | // Get the date column and save it for later to add back in. |
| 465 | 465 | // This adds it after the Data Source column. |
| 466 | 466 | // This way, we don't need to do array_slice, array_merge, etc. |
| 467 | - $date = $columns['date']; |
|
| 468 | - unset( $columns['date'] ); |
|
| 467 | + $date = $columns[ 'date' ]; |
|
| 468 | + unset( $columns[ 'date' ] ); |
|
| 469 | 469 | |
| 470 | 470 | $data_source_required_caps = array( |
| 471 | 471 | 'gravityforms_edit_forms', |
@@ -476,14 +476,14 @@ discard block |
||
| 476 | 476 | 'gravityforms_preview_forms', |
| 477 | 477 | ); |
| 478 | 478 | |
| 479 | - if( GVCommon::has_cap( $data_source_required_caps ) ) { |
|
| 480 | - $columns['gv_connected_form'] = __( 'Data Source', 'gravityview' ); |
|
| 479 | + if ( GVCommon::has_cap( $data_source_required_caps ) ) { |
|
| 480 | + $columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' ); |
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | - $columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' ); |
|
| 483 | + $columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' ); |
|
| 484 | 484 | |
| 485 | 485 | // Add the date back in. |
| 486 | - $columns['date'] = $date; |
|
| 486 | + $columns[ 'date' ] = $date; |
|
| 487 | 487 | |
| 488 | 488 | return $columns; |
| 489 | 489 | } |
@@ -497,12 +497,12 @@ discard block |
||
| 497 | 497 | */ |
| 498 | 498 | function save_postdata( $post_id ) { |
| 499 | 499 | |
| 500 | - if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){ |
|
| 500 | + if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { |
|
| 501 | 501 | return; |
| 502 | 502 | } |
| 503 | 503 | |
| 504 | 504 | // validate post_type |
| 505 | - if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) { |
|
| 505 | + if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) { |
|
| 506 | 506 | return; |
| 507 | 507 | } |
| 508 | 508 | |
@@ -517,63 +517,63 @@ discard block |
||
| 517 | 517 | $statii = array(); |
| 518 | 518 | |
| 519 | 519 | // check if this is a start fresh View |
| 520 | - if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) { |
|
| 520 | + if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) { |
|
| 521 | 521 | |
| 522 | - $form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : ''; |
|
| 522 | + $form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : ''; |
|
| 523 | 523 | // save form id |
| 524 | - $statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id ); |
|
| 524 | + $statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id ); |
|
| 525 | 525 | |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | - if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) { |
|
| 528 | + if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) { |
|
| 529 | 529 | gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) ); |
| 530 | 530 | return; |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | // Was this a start fresh? |
| 534 | - if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) { |
|
| 535 | - $statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 ); |
|
| 534 | + if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) { |
|
| 535 | + $statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 ); |
|
| 536 | 536 | } else { |
| 537 | - $statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' ); |
|
| 537 | + $statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' ); |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | // Check if we have a template id |
| 541 | - if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) { |
|
| 541 | + if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) { |
|
| 542 | 542 | |
| 543 | - $template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : ''; |
|
| 543 | + $template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : ''; |
|
| 544 | 544 | |
| 545 | 545 | // now save template id |
| 546 | - $statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id ); |
|
| 546 | + $statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id ); |
|
| 547 | 547 | } |
| 548 | 548 | |
| 549 | 549 | |
| 550 | 550 | // save View Configuration metabox |
| 551 | - if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) { |
|
| 551 | + if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) { |
|
| 552 | 552 | |
| 553 | 553 | // template settings |
| 554 | - if( empty( $_POST['template_settings'] ) ) { |
|
| 555 | - $_POST['template_settings'] = array(); |
|
| 554 | + if ( empty( $_POST[ 'template_settings' ] ) ) { |
|
| 555 | + $_POST[ 'template_settings' ] = array(); |
|
| 556 | 556 | } |
| 557 | - $statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] ); |
|
| 557 | + $statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] ); |
|
| 558 | 558 | |
| 559 | 559 | // guard against unloaded View configuration page |
| 560 | - if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) { |
|
| 560 | + if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) { |
|
| 561 | 561 | $fields = array(); |
| 562 | 562 | |
| 563 | - if ( ! empty( $_POST['gv_fields'] ) ) { |
|
| 563 | + if ( ! empty( $_POST[ 'gv_fields' ] ) ) { |
|
| 564 | 564 | $fields = _gravityview_process_posted_fields(); |
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | $fields = wp_slash( $fields ); |
| 568 | 568 | |
| 569 | - $statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields ); |
|
| 569 | + $statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields ); |
|
| 570 | 570 | } |
| 571 | 571 | |
| 572 | 572 | // Directory Visible Widgets |
| 573 | - if( empty( $_POST['widgets'] ) ) { |
|
| 574 | - $_POST['widgets'] = array(); |
|
| 573 | + if ( empty( $_POST[ 'widgets' ] ) ) { |
|
| 574 | + $_POST[ 'widgets' ] = array(); |
|
| 575 | 575 | } |
| 576 | - $statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] ); |
|
| 576 | + $statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] ); |
|
| 577 | 577 | |
| 578 | 578 | } // end save view configuration |
| 579 | 579 | |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false. |
| 584 | 584 | * @since 1.17.2 |
| 585 | 585 | */ |
| 586 | - do_action('gravityview_view_saved', $post_id, $statii ); |
|
| 586 | + do_action( 'gravityview_view_saved', $post_id, $statii ); |
|
| 587 | 587 | |
| 588 | 588 | gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) ); |
| 589 | 589 | } |
@@ -627,20 +627,20 @@ discard block |
||
| 627 | 627 | |
| 628 | 628 | $output = ''; |
| 629 | 629 | |
| 630 | - if( !empty( $fields ) ) { |
|
| 630 | + if ( ! empty( $fields ) ) { |
|
| 631 | 631 | |
| 632 | - foreach( $fields as $id => $details ) { |
|
| 632 | + foreach ( $fields as $id => $details ) { |
|
| 633 | 633 | |
| 634 | - if( in_array( $details['type'], (array) $blacklist_field_types ) ) { |
|
| 634 | + if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) { |
|
| 635 | 635 | continue; |
| 636 | 636 | } |
| 637 | 637 | |
| 638 | 638 | // Edit mode only allows editing the parent fields, not single inputs. |
| 639 | - if( $context === 'edit' && !empty( $details['parent'] ) ) { |
|
| 639 | + if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) { |
|
| 640 | 640 | continue; |
| 641 | 641 | } |
| 642 | 642 | |
| 643 | - $output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form ); |
|
| 643 | + $output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form ); |
|
| 644 | 644 | |
| 645 | 645 | } // End foreach |
| 646 | 646 | } |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | echo $output; |
| 649 | 649 | |
| 650 | 650 | // For the EDIT view we only want to allow the form fields. |
| 651 | - if( $context === 'edit' ) { |
|
| 651 | + if ( $context === 'edit' ) { |
|
| 652 | 652 | return; |
| 653 | 653 | } |
| 654 | 654 | |
@@ -672,16 +672,16 @@ discard block |
||
| 672 | 672 | $additional_fields = apply_filters( 'gravityview_additional_fields', array( |
| 673 | 673 | array( |
| 674 | 674 | 'label_text' => __( '+ Add All Fields', 'gravityview' ), |
| 675 | - 'desc' => __('Add all the available fields at once.', 'gravityview'), |
|
| 675 | + 'desc' => __( 'Add all the available fields at once.', 'gravityview' ), |
|
| 676 | 676 | 'field_id' => 'all-fields', |
| 677 | 677 | 'label_type' => 'field', |
| 678 | 678 | 'input_type' => NULL, |
| 679 | 679 | 'field_options' => NULL, |
| 680 | 680 | 'settings_html' => NULL, |
| 681 | 681 | ) |
| 682 | - )); |
|
| 682 | + ) ); |
|
| 683 | 683 | |
| 684 | - if( !empty( $additional_fields )) { |
|
| 684 | + if ( ! empty( $additional_fields ) ) { |
|
| 685 | 685 | foreach ( (array)$additional_fields as $item ) { |
| 686 | 686 | |
| 687 | 687 | // Prevent items from not having index set |
@@ -692,16 +692,16 @@ discard block |
||
| 692 | 692 | 'input_type' => NULL, |
| 693 | 693 | 'field_options' => NULL, |
| 694 | 694 | 'settings_html' => NULL, |
| 695 | - )); |
|
| 695 | + ) ); |
|
| 696 | 696 | |
| 697 | 697 | // Backward compat. |
| 698 | - if( !empty( $item['field_options'] ) ) { |
|
| 698 | + if ( ! empty( $item[ 'field_options' ] ) ) { |
|
| 699 | 699 | // Use settings_html from now on. |
| 700 | - $item['settings_html'] = $item['field_options']; |
|
| 700 | + $item[ 'settings_html' ] = $item[ 'field_options' ]; |
|
| 701 | 701 | } |
| 702 | 702 | |
| 703 | 703 | // Render a label for each of them |
| 704 | - echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form ); |
|
| 704 | + echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form ); |
|
| 705 | 705 | |
| 706 | 706 | } |
| 707 | 707 | } |
@@ -714,54 +714,54 @@ discard block |
||
| 714 | 714 | * @param string $zone Either 'single', 'directory', 'header', 'footer' |
| 715 | 715 | * @return array |
| 716 | 716 | */ |
| 717 | - function get_entry_default_fields($form, $zone) { |
|
| 717 | + function get_entry_default_fields( $form, $zone ) { |
|
| 718 | 718 | |
| 719 | 719 | $entry_default_fields = array(); |
| 720 | 720 | |
| 721 | - if( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
| 721 | + if ( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
| 722 | 722 | |
| 723 | 723 | $entry_default_fields = array( |
| 724 | 724 | 'id' => array( |
| 725 | - 'label' => __('Entry ID', 'gravityview'), |
|
| 725 | + 'label' => __( 'Entry ID', 'gravityview' ), |
|
| 726 | 726 | 'type' => 'id', |
| 727 | - 'desc' => __('The unique ID of the entry.', 'gravityview'), |
|
| 727 | + 'desc' => __( 'The unique ID of the entry.', 'gravityview' ), |
|
| 728 | 728 | ), |
| 729 | 729 | 'date_created' => array( |
| 730 | - 'label' => __('Entry Date', 'gravityview'), |
|
| 731 | - 'desc' => __('The date the entry was created.', 'gravityview'), |
|
| 730 | + 'label' => __( 'Entry Date', 'gravityview' ), |
|
| 731 | + 'desc' => __( 'The date the entry was created.', 'gravityview' ), |
|
| 732 | 732 | 'type' => 'date_created', |
| 733 | 733 | ), |
| 734 | 734 | 'source_url' => array( |
| 735 | - 'label' => __('Source URL', 'gravityview'), |
|
| 735 | + 'label' => __( 'Source URL', 'gravityview' ), |
|
| 736 | 736 | 'type' => 'source_url', |
| 737 | - 'desc' => __('The URL of the page where the form was submitted.', 'gravityview'), |
|
| 737 | + 'desc' => __( 'The URL of the page where the form was submitted.', 'gravityview' ), |
|
| 738 | 738 | ), |
| 739 | 739 | 'ip' => array( |
| 740 | - 'label' => __('User IP', 'gravityview'), |
|
| 740 | + 'label' => __( 'User IP', 'gravityview' ), |
|
| 741 | 741 | 'type' => 'ip', |
| 742 | - 'desc' => __('The IP Address of the user who created the entry.', 'gravityview'), |
|
| 742 | + 'desc' => __( 'The IP Address of the user who created the entry.', 'gravityview' ), |
|
| 743 | 743 | ), |
| 744 | 744 | 'created_by' => array( |
| 745 | - 'label' => __('User', 'gravityview'), |
|
| 745 | + 'label' => __( 'User', 'gravityview' ), |
|
| 746 | 746 | 'type' => 'created_by', |
| 747 | - 'desc' => __('Details of the logged-in user who created the entry (if any).', 'gravityview'), |
|
| 747 | + 'desc' => __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ), |
|
| 748 | 748 | ), |
| 749 | 749 | |
| 750 | 750 | /** |
| 751 | 751 | * @since 1.7.2 |
| 752 | 752 | */ |
| 753 | 753 | 'other_entries' => array( |
| 754 | - 'label' => __('Other Entries', 'gravityview'), |
|
| 754 | + 'label' => __( 'Other Entries', 'gravityview' ), |
|
| 755 | 755 | 'type' => 'other_entries', |
| 756 | - 'desc' => __('Display other entries created by the entry creator.', 'gravityview'), |
|
| 756 | + 'desc' => __( 'Display other entries created by the entry creator.', 'gravityview' ), |
|
| 757 | 757 | ), |
| 758 | 758 | ); |
| 759 | 759 | |
| 760 | - if( 'single' !== $zone) { |
|
| 760 | + if ( 'single' !== $zone ) { |
|
| 761 | 761 | |
| 762 | - $entry_default_fields['entry_link'] = array( |
|
| 763 | - 'label' => __('Link to Entry', 'gravityview'), |
|
| 764 | - 'desc' => __('A dedicated link to the single entry with customizable text.', 'gravityview'), |
|
| 762 | + $entry_default_fields[ 'entry_link' ] = array( |
|
| 763 | + 'label' => __( 'Link to Entry', 'gravityview' ), |
|
| 764 | + 'desc' => __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ), |
|
| 765 | 765 | 'type' => 'entry_link', |
| 766 | 766 | ); |
| 767 | 767 | } |
@@ -771,19 +771,19 @@ discard block |
||
| 771 | 771 | /** |
| 772 | 772 | * @since 1.2 |
| 773 | 773 | */ |
| 774 | - $entry_default_fields['custom'] = array( |
|
| 775 | - 'label' => __('Custom Content', 'gravityview'), |
|
| 774 | + $entry_default_fields[ 'custom' ] = array( |
|
| 775 | + 'label' => __( 'Custom Content', 'gravityview' ), |
|
| 776 | 776 | 'type' => 'custom', |
| 777 | - 'desc' => __('Insert custom text or HTML.', 'gravityview'), |
|
| 777 | + 'desc' => __( 'Insert custom text or HTML.', 'gravityview' ), |
|
| 778 | 778 | ); |
| 779 | 779 | |
| 780 | 780 | /** |
| 781 | 781 | * @since develop |
| 782 | 782 | */ |
| 783 | - $entry_default_fields['sequence'] = array( |
|
| 784 | - 'label' => __('Result Number', 'gravityview'), |
|
| 783 | + $entry_default_fields[ 'sequence' ] = array( |
|
| 784 | + 'label' => __( 'Result Number', 'gravityview' ), |
|
| 785 | 785 | 'type' => 'sequence', |
| 786 | - 'desc' => __('Display a sequential result number for each entry.', 'gravityview'), |
|
| 786 | + 'desc' => __( 'Display a sequential result number for each entry.', 'gravityview' ), |
|
| 787 | 787 | ); |
| 788 | 788 | |
| 789 | 789 | /** |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | * @param string|array $form form_ID or form object |
| 793 | 793 | * @param string $zone Either 'single', 'directory', 'header', 'footer' |
| 794 | 794 | */ |
| 795 | - return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone); |
|
| 795 | + return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone ); |
|
| 796 | 796 | } |
| 797 | 797 | |
| 798 | 798 | /** |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | */ |
| 804 | 804 | function get_available_fields( $form = '', $zone = NULL ) { |
| 805 | 805 | |
| 806 | - if( empty( $form ) ) { |
|
| 806 | + if ( empty( $form ) ) { |
|
| 807 | 807 | gravityview()->log->error( '$form is empty' ); |
| 808 | 808 | return array(); |
| 809 | 809 | } |
@@ -812,7 +812,7 @@ discard block |
||
| 812 | 812 | $fields = gravityview_get_form_fields( $form, true ); |
| 813 | 813 | |
| 814 | 814 | // get meta fields ( only if form was already created ) |
| 815 | - if( !is_array( $form ) ) { |
|
| 815 | + if ( ! is_array( $form ) ) { |
|
| 816 | 816 | $meta_fields = gravityview_get_entry_meta( $form ); |
| 817 | 817 | } else { |
| 818 | 818 | $meta_fields = array(); |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | $fields = $fields + $meta_fields + $default_fields; |
| 826 | 826 | |
| 827 | 827 | // Move Custom Content to top |
| 828 | - $fields = array( 'custom' => $fields['custom'] ) + $fields; |
|
| 828 | + $fields = array( 'custom' => $fields[ 'custom' ] ) + $fields; |
|
| 829 | 829 | |
| 830 | 830 | /** |
| 831 | 831 | * @filter `gravityview/admin/available_fields` Modify the available fields that can be used in a View. |
@@ -845,11 +845,11 @@ discard block |
||
| 845 | 845 | |
| 846 | 846 | $widgets = $this->get_registered_widgets(); |
| 847 | 847 | |
| 848 | - if( !empty( $widgets ) ) { |
|
| 848 | + if ( ! empty( $widgets ) ) { |
|
| 849 | 849 | |
| 850 | - foreach( $widgets as $id => $details ) { |
|
| 850 | + foreach ( $widgets as $id => $details ) { |
|
| 851 | 851 | |
| 852 | - echo new GravityView_Admin_View_Widget( $details['label'], $id, $details ); |
|
| 852 | + echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details ); |
|
| 853 | 853 | |
| 854 | 854 | } |
| 855 | 855 | } |
@@ -878,7 +878,7 @@ discard block |
||
| 878 | 878 | function render_active_areas( $template_id, $type, $zone, $rows, $values ) { |
| 879 | 879 | global $post; |
| 880 | 880 | |
| 881 | - if( $type === 'widget' ) { |
|
| 881 | + if ( $type === 'widget' ) { |
|
| 882 | 882 | $button_label = __( 'Add Widget', 'gravityview' ); |
| 883 | 883 | } else { |
| 884 | 884 | $button_label = __( 'Add Field', 'gravityview' ); |
@@ -890,10 +890,10 @@ discard block |
||
| 890 | 890 | $form_id = null; |
| 891 | 891 | |
| 892 | 892 | // if saved values, get available fields to label everyone |
| 893 | - if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) { |
|
| 893 | + if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) { |
|
| 894 | 894 | |
| 895 | - if( !empty( $_POST['template_id'] ) ) { |
|
| 896 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
| 895 | + if ( ! empty( $_POST[ 'template_id' ] ) ) { |
|
| 896 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
| 897 | 897 | } else { |
| 898 | 898 | $form_id = $form = gravityview_get_form_id( $post->ID ); |
| 899 | 899 | } |
@@ -911,44 +911,44 @@ discard block |
||
| 911 | 911 | } |
| 912 | 912 | } |
| 913 | 913 | |
| 914 | - foreach( $rows as $row ) : |
|
| 915 | - foreach( $row as $col => $areas ) : |
|
| 916 | - $column = ($col == '2-2') ? '1-2' : $col; ?> |
|
| 914 | + foreach ( $rows as $row ) : |
|
| 915 | + foreach ( $row as $col => $areas ) : |
|
| 916 | + $column = ( $col == '2-2' ) ? '1-2' : $col; ?> |
|
| 917 | 917 | |
| 918 | 918 | <div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> |
| 919 | 919 | |
| 920 | - <?php foreach( $areas as $area ) : ?> |
|
| 920 | + <?php foreach ( $areas as $area ) : ?> |
|
| 921 | 921 | |
| 922 | - <div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"> |
|
| 923 | - <div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"> |
|
| 922 | + <div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"> |
|
| 923 | + <div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"> |
|
| 924 | 924 | |
| 925 | 925 | <?php // render saved fields |
| 926 | 926 | |
| 927 | - if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) { |
|
| 927 | + if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) { |
|
| 928 | 928 | |
| 929 | - foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) { |
|
| 929 | + foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) { |
|
| 930 | 930 | |
| 931 | 931 | // Maybe has a form ID |
| 932 | - $form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id']; |
|
| 932 | + $form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ]; |
|
| 933 | 933 | |
| 934 | 934 | $input_type = NULL; |
| 935 | 935 | |
| 936 | 936 | if ( $form_id ) { |
| 937 | - $original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ; |
|
| 937 | + $original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false; |
|
| 938 | 938 | } else { |
| 939 | - $original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ; |
|
| 939 | + $original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false; |
|
| 940 | 940 | } |
| 941 | 941 | |
| 942 | - if ( !$original_item ) { |
|
| 943 | - gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) ); |
|
| 942 | + if ( ! $original_item ) { |
|
| 943 | + gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) ); |
|
| 944 | 944 | |
| 945 | 945 | $original_item = $field; |
| 946 | 946 | } else { |
| 947 | - $input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL; |
|
| 947 | + $input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL; |
|
| 948 | 948 | } |
| 949 | 949 | |
| 950 | 950 | // Field options dialog box |
| 951 | - $field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item ); |
|
| 951 | + $field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item ); |
|
| 952 | 952 | |
| 953 | 953 | $item = array( |
| 954 | 954 | 'input_type' => $input_type, |
@@ -961,23 +961,23 @@ discard block |
||
| 961 | 961 | $item = wp_parse_args( $item, $original_item ); |
| 962 | 962 | } |
| 963 | 963 | |
| 964 | - switch( $type ) { |
|
| 964 | + switch ( $type ) { |
|
| 965 | 965 | case 'widget': |
| 966 | - echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field ); |
|
| 966 | + echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field ); |
|
| 967 | 967 | break; |
| 968 | 968 | default: |
| 969 | - echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id ); |
|
| 969 | + echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id ); |
|
| 970 | 970 | } |
| 971 | 971 | } |
| 972 | 972 | |
| 973 | 973 | } // End if zone is not empty ?> |
| 974 | 974 | |
| 975 | - <span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span> |
|
| 975 | + <span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span> |
|
| 976 | 976 | </div> |
| 977 | 977 | <div class="gv-droppable-area-action"> |
| 978 | - <a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></a> |
|
| 978 | + <a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a> |
|
| 979 | 979 | |
| 980 | - <p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> – <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p> |
|
| 980 | + <p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> – <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p> |
|
| 981 | 981 | </div> |
| 982 | 982 | </div> |
| 983 | 983 | |
@@ -1000,7 +1000,7 @@ discard block |
||
| 1000 | 1000 | $default_widget_areas = \GV\Widget::get_default_widget_areas(); |
| 1001 | 1001 | |
| 1002 | 1002 | $widgets = array(); |
| 1003 | - if( !empty( $post_id ) ) { |
|
| 1003 | + if ( ! empty( $post_id ) ) { |
|
| 1004 | 1004 | $widgets = gravityview_get_directory_widgets( $post_id ); |
| 1005 | 1005 | } |
| 1006 | 1006 | |
@@ -1033,7 +1033,7 @@ discard block |
||
| 1033 | 1033 | // list of available fields to be shown in the popup |
| 1034 | 1034 | $forms = gravityview_get_forms( 'any' ); |
| 1035 | 1035 | |
| 1036 | - $form_ids = array_map( function ($form) { return $form['id']; }, $forms); |
|
| 1036 | + $form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms ); |
|
| 1037 | 1037 | |
| 1038 | 1038 | foreach ( $form_ids as $form_id ) { |
| 1039 | 1039 | $filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id ); |
@@ -1046,7 +1046,7 @@ discard block |
||
| 1046 | 1046 | </div> |
| 1047 | 1047 | |
| 1048 | 1048 | <div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox"> |
| 1049 | - <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?> |
|
| 1049 | + <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?> |
|
| 1050 | 1050 | </div> |
| 1051 | 1051 | |
| 1052 | 1052 | <div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div> |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | * @return string HTML of the active areas |
| 1066 | 1066 | */ |
| 1067 | 1067 | function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) { |
| 1068 | - if( empty( $template_id ) ) { |
|
| 1068 | + if ( empty( $template_id ) ) { |
|
| 1069 | 1069 | gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) ); |
| 1070 | 1070 | return ''; |
| 1071 | 1071 | } |
@@ -1079,12 +1079,12 @@ discard block |
||
| 1079 | 1079 | */ |
| 1080 | 1080 | $template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context ); |
| 1081 | 1081 | |
| 1082 | - if( empty( $template_areas ) ) { |
|
| 1082 | + if ( empty( $template_areas ) ) { |
|
| 1083 | 1083 | |
| 1084 | 1084 | gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) ); |
| 1085 | 1085 | $output = '<div>'; |
| 1086 | - $output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>'; |
|
| 1087 | - $output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>'; |
|
| 1086 | + $output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>'; |
|
| 1087 | + $output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>'; |
|
| 1088 | 1088 | $output .= '</div>'; |
| 1089 | 1089 | } else { |
| 1090 | 1090 | |
@@ -1099,7 +1099,7 @@ discard block |
||
| 1099 | 1099 | |
| 1100 | 1100 | } |
| 1101 | 1101 | |
| 1102 | - if( $echo ) { |
|
| 1102 | + if ( $echo ) { |
|
| 1103 | 1103 | echo $output; |
| 1104 | 1104 | } |
| 1105 | 1105 | |
@@ -1119,32 +1119,32 @@ discard block |
||
| 1119 | 1119 | $is_widgets_page = ( $pagenow === 'widgets.php' ); |
| 1120 | 1120 | |
| 1121 | 1121 | // Add the GV font (with the Astronaut) |
| 1122 | - wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version ); |
|
| 1122 | + wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version ); |
|
| 1123 | 1123 | wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version ); |
| 1124 | 1124 | |
| 1125 | - wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true ); |
|
| 1125 | + wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true ); |
|
| 1126 | 1126 | |
| 1127 | - if( GFForms::get_page() === 'form_list' ) { |
|
| 1127 | + if ( GFForms::get_page() === 'form_list' ) { |
|
| 1128 | 1128 | wp_enqueue_style( 'gravityview_views_styles' ); |
| 1129 | 1129 | return; |
| 1130 | 1130 | } |
| 1131 | 1131 | |
| 1132 | 1132 | // Don't process any scripts below here if it's not a GravityView page. |
| 1133 | - if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) { |
|
| 1133 | + if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) { |
|
| 1134 | 1134 | return; |
| 1135 | 1135 | } |
| 1136 | 1136 | |
| 1137 | 1137 | wp_enqueue_script( 'jquery-ui-datepicker' ); |
| 1138 | - wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version ); |
|
| 1138 | + wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version ); |
|
| 1139 | 1139 | |
| 1140 | - $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; |
|
| 1140 | + $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
| 1141 | 1141 | |
| 1142 | 1142 | //enqueue scripts |
| 1143 | 1143 | wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version ); |
| 1144 | 1144 | |
| 1145 | - wp_localize_script('gravityview_views_scripts', 'gvGlobals', array( |
|
| 1145 | + wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array( |
|
| 1146 | 1146 | 'cookiepath' => COOKIEPATH, |
| 1147 | - 'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ), |
|
| 1147 | + 'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ), |
|
| 1148 | 1148 | 'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ), |
| 1149 | 1149 | 'label_viewname' => __( 'Enter View name here', 'gravityview' ), |
| 1150 | 1150 | 'label_close' => __( 'Close', 'gravityview' ), |
@@ -1156,7 +1156,7 @@ discard block |
||
| 1156 | 1156 | 'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ), |
| 1157 | 1157 | 'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ), |
| 1158 | 1158 | 'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ), |
| 1159 | - )); |
|
| 1159 | + ) ); |
|
| 1160 | 1160 | |
| 1161 | 1161 | wp_enqueue_style( 'gravityview_views_styles' ); |
| 1162 | 1162 | |
@@ -1183,7 +1183,7 @@ discard block |
||
| 1183 | 1183 | ); |
| 1184 | 1184 | |
| 1185 | 1185 | if ( wp_is_mobile() ) { |
| 1186 | - $scripts[] = 'jquery-touch-punch'; |
|
| 1186 | + $scripts[ ] = 'jquery-touch-punch'; |
|
| 1187 | 1187 | } |
| 1188 | 1188 | |
| 1189 | 1189 | wp_enqueue_script( $scripts ); |