@@ -346,14 +346,14 @@ discard block |
||
| 346 | 346 | /** |
| 347 | 347 | * update_approved function. |
| 348 | 348 | * |
| 349 | - * @since 1.18 Moved to GravityView_Entry_Approval::update_approved |
|
| 349 | + * @since 1.18 Moved to GravityView_Entry_Approval::update_approved |
|
| 350 | 350 | * @see GravityView_Entry_Approval::update_approved |
| 351 | - * |
|
| 351 | + * |
|
| 352 | 352 | * @param int $entry_id (default: 0) |
| 353 | 353 | * @param int $approved (default: 0) |
| 354 | 354 | * @param int $form_id (default: 0) |
| 355 | 355 | * @param int $approvedcolumn (default: 0) |
| 356 | - * |
|
| 356 | + * |
|
| 357 | 357 | * @return boolean True: It worked; False: it failed |
| 358 | 358 | */ |
| 359 | 359 | public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) { |
@@ -363,9 +363,9 @@ discard block |
||
| 363 | 363 | /** |
| 364 | 364 | * Calculate the approve field.input id |
| 365 | 365 | * |
| 366 | - * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column |
|
| 367 | - * @see GravityView_Entry_Approval::get_approved_column |
|
| 368 | - * |
|
| 366 | + * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column |
|
| 367 | + * @see GravityView_Entry_Approval::get_approved_column |
|
| 368 | + * |
|
| 369 | 369 | * @param mixed $form GF Form or Form ID |
| 370 | 370 | * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set. |
| 371 | 371 | */ |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | 'bulk_actions' => $this->get_bulk_actions( $form_id ), |
| 487 | 487 | 'bulk_message' => $this->bulk_update_message, |
| 488 | 488 | 'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'), |
| 489 | - 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), |
|
| 489 | + 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), |
|
| 490 | 490 | 'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'), |
| 491 | 491 | 'column_title' => __( 'Show entry in directory view?', 'gravityview'), |
| 492 | 492 | 'column_link' => esc_url( $this->get_sort_link( $form_id ) ), |
@@ -495,11 +495,11 @@ discard block |
||
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | /** |
| 498 | - * Generate a link to sort by approval status (if there is an Approve/Disapprove field) |
|
| 499 | - * |
|
| 500 | - * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as |
|
| 501 | - * numeric, but it does group the approved entries together. |
|
| 502 | - * |
|
| 498 | + * Generate a link to sort by approval status (if there is an Approve/Disapprove field) |
|
| 499 | + * |
|
| 500 | + * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as |
|
| 501 | + * numeric, but it does group the approved entries together. |
|
| 502 | + * |
|
| 503 | 503 | * @param int $form_id |
| 504 | 504 | * |
| 505 | 505 | * @return string Sorting link |
@@ -509,20 +509,20 @@ discard block |
||
| 509 | 509 | $approved_column_id = self::get_approved_column( $form_id ); |
| 510 | 510 | |
| 511 | 511 | if( ! $approved_column_id ) { |
| 512 | - return ''; |
|
| 513 | - } |
|
| 512 | + return ''; |
|
| 513 | + } |
|
| 514 | 514 | |
| 515 | - $order = ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc'; |
|
| 515 | + $order = ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc'; |
|
| 516 | 516 | |
| 517 | - $args = array( |
|
| 518 | - 'orderby' => $approved_column_id, |
|
| 519 | - 'order' => $order, |
|
| 520 | - ); |
|
| 517 | + $args = array( |
|
| 518 | + 'orderby' => $approved_column_id, |
|
| 519 | + 'order' => $order, |
|
| 520 | + ); |
|
| 521 | 521 | |
| 522 | - $link = add_query_arg( $args ); |
|
| 522 | + $link = add_query_arg( $args ); |
|
| 523 | 523 | |
| 524 | 524 | return $link; |
| 525 | - } |
|
| 525 | + } |
|
| 526 | 526 | |
| 527 | 527 | /** |
| 528 | 528 | * Get an array of options to be added to the Gravity Forms "Bulk action" dropdown in a "GravityView" option group |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | /** gf_entries page - entries table screen */ |
| 45 | 45 | |
| 46 | 46 | // capture bulk actions |
| 47 | - add_action( 'gform_loaded', array( $this, 'process_bulk_action') ); |
|
| 47 | + add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) ); |
|
| 48 | 48 | |
| 49 | 49 | // add hidden field with approve status |
| 50 | 50 | add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 ); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) ); |
| 53 | 53 | |
| 54 | 54 | // adding styles and scripts |
| 55 | - add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') ); |
|
| 55 | + add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) ); |
|
| 56 | 56 | // bypass Gravity Forms no-conflict mode |
| 57 | 57 | add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) ); |
| 58 | 58 | add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) ); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them. |
| 82 | 82 | * @param array $form GF Form object of current form |
| 83 | 83 | */ |
| 84 | - if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) { |
|
| 84 | + if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) { |
|
| 85 | 85 | return $filter_links; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -102,19 +102,19 @@ discard block |
||
| 102 | 102 | $approved_count = $disapproved_count = 0; |
| 103 | 103 | |
| 104 | 104 | // Only count if necessary |
| 105 | - if( $include_counts ) { |
|
| 106 | - $approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) ); |
|
| 107 | - $disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) ); |
|
| 105 | + if ( $include_counts ) { |
|
| 106 | + $approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) ); |
|
| 107 | + $disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) ); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - $filter_links[] = array( |
|
| 110 | + $filter_links[ ] = array( |
|
| 111 | 111 | 'id' => 'gv_approved', |
| 112 | 112 | 'field_filters' => $field_filters_approved, |
| 113 | 113 | 'count' => $approved_count, |
| 114 | 114 | 'label' => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ), |
| 115 | 115 | ); |
| 116 | 116 | |
| 117 | - $filter_links[] = array( |
|
| 117 | + $filter_links[ ] = array( |
|
| 118 | 118 | 'id' => 'gv_disapproved', |
| 119 | 119 | 'field_filters' => $field_filters_disapproved, |
| 120 | 120 | 'count' => $disapproved_count, |
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | function tooltips( $tooltips ) { |
| 135 | 135 | |
| 136 | - $tooltips['form_gravityview_fields'] = array( |
|
| 137 | - 'title' => __('GravityView Fields', 'gravityview'), |
|
| 138 | - 'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'), |
|
| 136 | + $tooltips[ 'form_gravityview_fields' ] = array( |
|
| 137 | + 'title' => __( 'GravityView Fields', 'gravityview' ), |
|
| 138 | + 'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ), |
|
| 139 | 139 | ); |
| 140 | 140 | |
| 141 | 141 | return $tooltips; |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | $gv_bulk_action = false; |
| 248 | 248 | |
| 249 | - if( version_compare( GFForms::$version, '2.0', '>=' ) ) { |
|
| 249 | + if ( version_compare( GFForms::$version, '2.0', '>=' ) ) { |
|
| 250 | 250 | $bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' ); |
| 251 | 251 | } else { |
| 252 | 252 | // GF 1.9.x - Bulk action 2 is the bottom bulk action select form. |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | // Check the $bulk_action value against GV actions, see if they're the same. I hate strpos(). |
| 257 | - if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) { |
|
| 257 | + if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) { |
|
| 258 | 258 | $gv_bulk_action = $bulk_action; |
| 259 | 259 | } |
| 260 | 260 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | // gforms_entry_list is the nonce that confirms we're on the right page |
| 281 | 281 | // gforms_update_note is sent when bulk editing entry notes. We don't want to process then. |
| 282 | - if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) { |
|
| 282 | + if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) { |
|
| 283 | 283 | |
| 284 | 284 | check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' ); |
| 285 | 285 | |
@@ -297,13 +297,13 @@ discard block |
||
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | // All entries are set to be updated, not just the visible ones |
| 300 | - if ( ! empty( $_POST['all_entries'] ) ) { |
|
| 300 | + if ( ! empty( $_POST[ 'all_entries' ] ) ) { |
|
| 301 | 301 | |
| 302 | 302 | // Convert the current entry search into GF-formatted search criteria |
| 303 | 303 | $search = array( |
| 304 | - 'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0, |
|
| 305 | - 'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '', |
|
| 306 | - 'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains', |
|
| 304 | + 'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0, |
|
| 305 | + 'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '', |
|
| 306 | + 'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains', |
|
| 307 | 307 | ); |
| 308 | 308 | |
| 309 | 309 | $search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id ); |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | } else { |
| 315 | 315 | |
| 316 | 316 | // Changed from 'lead' to 'entry' in 2.0 |
| 317 | - $entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry']; |
|
| 317 | + $entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ]; |
|
| 318 | 318 | |
| 319 | 319 | } |
| 320 | 320 | |
@@ -326,15 +326,15 @@ discard block |
||
| 326 | 326 | $entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' ); |
| 327 | 327 | |
| 328 | 328 | switch ( $approved_status ) { |
| 329 | - case $this->bulk_action_prefixes['approve']: |
|
| 329 | + case $this->bulk_action_prefixes[ 'approve' ]: |
|
| 330 | 330 | GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id ); |
| 331 | 331 | $this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count ); |
| 332 | 332 | break; |
| 333 | - case $this->bulk_action_prefixes['unapprove']: |
|
| 333 | + case $this->bulk_action_prefixes[ 'unapprove' ]: |
|
| 334 | 334 | GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id ); |
| 335 | 335 | $this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count ); |
| 336 | 336 | break; |
| 337 | - case $this->bulk_action_prefixes['disapprove']: |
|
| 337 | + case $this->bulk_action_prefixes[ 'disapprove' ]: |
|
| 338 | 338 | GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id ); |
| 339 | 339 | $this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count ); |
| 340 | 340 | break; |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | * |
| 357 | 357 | * @return boolean True: It worked; False: it failed |
| 358 | 358 | */ |
| 359 | - public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) { |
|
| 359 | + public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) { |
|
| 360 | 360 | return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn ); |
| 361 | 361 | } |
| 362 | 362 | |
@@ -386,20 +386,20 @@ discard block |
||
| 386 | 386 | * |
| 387 | 387 | * @return void |
| 388 | 388 | */ |
| 389 | - static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) { |
|
| 389 | + static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) { |
|
| 390 | 390 | |
| 391 | - if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) { |
|
| 391 | + if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) { |
|
| 392 | 392 | return; |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | - if( empty( $entry['id'] ) ) { |
|
| 395 | + if ( empty( $entry[ 'id' ] ) ) { |
|
| 396 | 396 | return; |
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | $status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' ); |
| 400 | 400 | |
| 401 | - if( $status_value ) { |
|
| 402 | - echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />'; |
|
| 401 | + if ( $status_value ) { |
|
| 402 | + echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />'; |
|
| 403 | 403 | } |
| 404 | 404 | } |
| 405 | 405 | |
@@ -412,10 +412,10 @@ discard block |
||
| 412 | 412 | */ |
| 413 | 413 | private function get_form_id() { |
| 414 | 414 | |
| 415 | - $form_id = GFForms::get('id'); |
|
| 415 | + $form_id = GFForms::get( 'id' ); |
|
| 416 | 416 | |
| 417 | 417 | // If there are no forms identified, use the first form. That's how GF does it. |
| 418 | - if( empty( $form_id ) && class_exists('RGFormsModel') ) { |
|
| 418 | + if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) { |
|
| 419 | 419 | $form_id = $this->get_first_form_id(); |
| 420 | 420 | } |
| 421 | 421 | |
@@ -435,14 +435,14 @@ discard block |
||
| 435 | 435 | |
| 436 | 436 | $forms = RGFormsModel::get_forms( null, 'title' ); |
| 437 | 437 | |
| 438 | - if( ! isset( $forms[0] ) ) { |
|
| 438 | + if ( ! isset( $forms[ 0 ] ) ) { |
|
| 439 | 439 | gravityview()->log->error( 'No forms were found' ); |
| 440 | 440 | return 0; |
| 441 | 441 | } |
| 442 | 442 | |
| 443 | - $first_form = $forms[0]; |
|
| 443 | + $first_form = $forms[ 0 ]; |
|
| 444 | 444 | |
| 445 | - $form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id']; |
|
| 445 | + $form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ]; |
|
| 446 | 446 | |
| 447 | 447 | return intval( $form_id ); |
| 448 | 448 | } |
@@ -450,33 +450,33 @@ discard block |
||
| 450 | 450 | |
| 451 | 451 | function add_scripts_and_styles( $hook ) { |
| 452 | 452 | |
| 453 | - if( ! class_exists( 'GFForms' ) ) { |
|
| 453 | + if ( ! class_exists( 'GFForms' ) ) { |
|
| 454 | 454 | gravityview()->log->error( 'GFForms does not exist.' ); |
| 455 | 455 | return; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | // enqueue styles & scripts gf_entries |
| 459 | 459 | // But only if we're on the main Entries page, not on reports pages |
| 460 | - if( GFForms::get_page() !== 'entry_list' ) { |
|
| 460 | + if ( GFForms::get_page() !== 'entry_list' ) { |
|
| 461 | 461 | return; |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | 464 | $form_id = $this->get_form_id(); |
| 465 | 465 | |
| 466 | 466 | // Things are broken; no forms were found |
| 467 | - if( empty( $form_id ) ) { |
|
| 467 | + if ( empty( $form_id ) ) { |
|
| 468 | 468 | return; |
| 469 | 469 | } |
| 470 | 470 | |
| 471 | - wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version ); |
|
| 471 | + wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version ); |
|
| 472 | 472 | |
| 473 | - $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; |
|
| 473 | + $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
| 474 | 474 | |
| 475 | - wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version ); |
|
| 475 | + wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version ); |
|
| 476 | 476 | |
| 477 | 477 | wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array( |
| 478 | - 'nonce' => wp_create_nonce( 'gravityview_entry_approval'), |
|
| 479 | - 'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'), |
|
| 478 | + 'nonce' => wp_create_nonce( 'gravityview_entry_approval' ), |
|
| 479 | + 'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ), |
|
| 480 | 480 | 'form_id' => $form_id, |
| 481 | 481 | 'show_column' => (int)$this->show_approve_entry_column( $form_id ), |
| 482 | 482 | 'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ), |
@@ -485,10 +485,10 @@ discard block |
||
| 485 | 485 | 'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED, |
| 486 | 486 | 'bulk_actions' => $this->get_bulk_actions( $form_id ), |
| 487 | 487 | 'bulk_message' => $this->bulk_update_message, |
| 488 | - 'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'), |
|
| 489 | - 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), |
|
| 490 | - 'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'), |
|
| 491 | - 'column_title' => __( 'Show entry in directory view?', 'gravityview'), |
|
| 488 | + 'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ), |
|
| 489 | + 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ), |
|
| 490 | + 'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ), |
|
| 491 | + 'column_title' => __( 'Show entry in directory view?', 'gravityview' ), |
|
| 492 | 492 | 'column_link' => esc_url( $this->get_sort_link( $form_id ) ), |
| 493 | 493 | ) ); |
| 494 | 494 | |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | |
| 509 | 509 | $approved_column_id = self::get_approved_column( $form_id ); |
| 510 | 510 | |
| 511 | - if( ! $approved_column_id ) { |
|
| 511 | + if ( ! $approved_column_id ) { |
|
| 512 | 512 | return ''; |
| 513 | 513 | } |
| 514 | 514 | |
@@ -538,16 +538,16 @@ discard block |
||
| 538 | 538 | $bulk_actions = array( |
| 539 | 539 | 'GravityView' => array( |
| 540 | 540 | array( |
| 541 | - 'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'), |
|
| 542 | - 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ), |
|
| 541 | + 'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ), |
|
| 542 | + 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ), |
|
| 543 | 543 | ), |
| 544 | 544 | array( |
| 545 | - 'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'), |
|
| 546 | - 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ), |
|
| 545 | + 'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ), |
|
| 546 | + 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ), |
|
| 547 | 547 | ), |
| 548 | 548 | array( |
| 549 | - 'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'), |
|
| 550 | - 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ), |
|
| 549 | + 'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ), |
|
| 550 | + 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ), |
|
| 551 | 551 | ), |
| 552 | 552 | ), |
| 553 | 553 | ); |
@@ -564,8 +564,8 @@ discard block |
||
| 564 | 564 | // Sanitize the values, just to be sure. |
| 565 | 565 | foreach ( $bulk_actions as $key => $group ) { |
| 566 | 566 | foreach ( $group as $i => $action ) { |
| 567 | - $bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] ); |
|
| 568 | - $bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] ); |
|
| 567 | + $bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] ); |
|
| 568 | + $bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] ); |
|
| 569 | 569 | } |
| 570 | 570 | } |
| 571 | 571 | |
@@ -590,13 +590,13 @@ discard block |
||
| 590 | 590 | * @since 1.7.2 |
| 591 | 591 | * @param boolean $hide_if_no_connections |
| 592 | 592 | */ |
| 593 | - $hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false ); |
|
| 593 | + $hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false ); |
|
| 594 | 594 | |
| 595 | - if( $hide_if_no_connections ) { |
|
| 595 | + if ( $hide_if_no_connections ) { |
|
| 596 | 596 | |
| 597 | 597 | $connected_views = gravityview_get_connected_views( $form_id ); |
| 598 | 598 | |
| 599 | - if( empty( $connected_views ) ) { |
|
| 599 | + if ( empty( $connected_views ) ) { |
|
| 600 | 600 | $show_approve_column = false; |
| 601 | 601 | } |
| 602 | 602 | } |
@@ -606,18 +606,18 @@ discard block |
||
| 606 | 606 | * @param boolean $show_approve_column Whether the column will be shown |
| 607 | 607 | * @param int $form_id The ID of the Gravity Forms form for which entries are being shown |
| 608 | 608 | */ |
| 609 | - $show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id ); |
|
| 609 | + $show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id ); |
|
| 610 | 610 | |
| 611 | 611 | return $show_approve_column; |
| 612 | 612 | } |
| 613 | 613 | |
| 614 | 614 | function register_gform_noconflict_script( $scripts ) { |
| 615 | - $scripts[] = 'gravityview_gf_entries_scripts'; |
|
| 615 | + $scripts[ ] = 'gravityview_gf_entries_scripts'; |
|
| 616 | 616 | return $scripts; |
| 617 | 617 | } |
| 618 | 618 | |
| 619 | 619 | function register_gform_noconflict_style( $styles ) { |
| 620 | - $styles[] = 'gravityview_entries_list'; |
|
| 620 | + $styles[ ] = 'gravityview_entries_list'; |
|
| 621 | 621 | return $styles; |
| 622 | 622 | } |
| 623 | 623 | |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | // Make sure the keys are all set |
| 68 | 68 | $note = wp_parse_args( $note, $default_note ); |
| 69 | 69 | |
| 70 | - GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) ); |
|
| 70 | + GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) ); |
|
| 71 | 71 | |
| 72 | 72 | // If last_error is empty string, there was no error. |
| 73 | - if( empty( $wpdb->last_error ) ) { |
|
| 73 | + if ( empty( $wpdb->last_error ) ) { |
|
| 74 | 74 | $return = $wpdb->insert_id; |
| 75 | 75 | } else { |
| 76 | 76 | $return = new WP_Error( 'gravityview-add-note', $wpdb->last_error ); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public static function delete_notes( $note_ids = array() ) { |
| 98 | 98 | |
| 99 | - if( !is_array( $note_ids ) ) { |
|
| 99 | + if ( ! is_array( $note_ids ) ) { |
|
| 100 | 100 | |
| 101 | 101 | gravityview()->log->error( 'Note IDs not an array. Not processing delete request.', array( 'data' => $note_ids ) ); |
| 102 | 102 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | ) |
| 157 | 157 | ); |
| 158 | 158 | |
| 159 | - return $results ? $results[0] : false; |
|
| 159 | + return $results ? $results[ 0 ] : false; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | public static function filter_avatar( $avatar = '', $note ) { |
| 171 | 171 | |
| 172 | - if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) { |
|
| 173 | - $avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) ); |
|
| 172 | + if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) { |
|
| 173 | + $avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) ); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | return $avatar; |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | function __construct() { |
| 16 | 16 | |
| 17 | 17 | // Only run on Admin |
| 18 | - if ( !is_admin() ) { |
|
| 18 | + if ( ! is_admin() ) { |
|
| 19 | 19 | return; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // If the Duplicate Post plugin is active, don't run. |
| 23 | - if( defined('DUPLICATE_POST_CURRENT_VERSION') ) { |
|
| 23 | + if ( defined( 'DUPLICATE_POST_CURRENT_VERSION' ) ) { |
|
| 24 | 24 | return; |
| 25 | 25 | } |
| 26 | 26 | |
@@ -60,10 +60,10 @@ discard block |
||
| 60 | 60 | global $post; |
| 61 | 61 | |
| 62 | 62 | // We only want to add Clone links to the Edit View metabox |
| 63 | - if( !$this->is_all_views_page() ) { |
|
| 63 | + if ( ! $this->is_all_views_page() ) { |
|
| 64 | 64 | |
| 65 | - if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) { |
|
| 66 | - $links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>'; |
|
| 65 | + if ( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) { |
|
| 66 | + $links[ ] = '<span>' . $duplicate_links[ 'edit_as_new_draft' ] . '</span>'; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | } |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | * @param string|null If string, the status to set for the new View. If empty, use existing View status. |
| 124 | 124 | * @param WP_Post $post View being cloned |
| 125 | 125 | */ |
| 126 | - $new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post ); |
|
| 126 | + $new_view_status = apply_filters( 'gravityview/duplicate-view/status', $status, $post ); |
|
| 127 | 127 | |
| 128 | 128 | $new_view = array( |
| 129 | 129 | 'menu_order' => $post->menu_order, |
@@ -146,11 +146,11 @@ discard block |
||
| 146 | 146 | * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false` |
| 147 | 147 | * @param WP_Post $post View being cloned |
| 148 | 148 | */ |
| 149 | - $copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post ); |
|
| 149 | + $copy_date = apply_filters( 'gravityview/duplicate-view/copy-date', false, $post ); |
|
| 150 | 150 | |
| 151 | 151 | if ( $copy_date ) { |
| 152 | - $new_view['post_date'] = $new_post_date = $post->post_date; |
|
| 153 | - $new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date ); |
|
| 152 | + $new_view[ 'post_date' ] = $new_post_date = $post->post_date; |
|
| 153 | + $new_view[ 'post_date_gmt' ] = get_gmt_from_date( $new_post_date ); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | /** |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * @param array $new_view Array of settings to be passed to wp_insert_post() |
| 160 | 160 | * @param WP_Post $post View being cloned |
| 161 | 161 | */ |
| 162 | - $new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post ); |
|
| 162 | + $new_view = apply_filters( 'gravityview/duplicate-view/new-view', $new_view, $post ); |
|
| 163 | 163 | |
| 164 | 164 | // Magic happens here. |
| 165 | 165 | $new_view_id = wp_insert_post( $new_view ); |
@@ -241,13 +241,13 @@ discard block |
||
| 241 | 241 | $clone_text = __( 'Clone', 'gravityview' ); |
| 242 | 242 | $clone_title = __( 'Clone this View', 'gravityview' ); |
| 243 | 243 | |
| 244 | - $actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title ); |
|
| 244 | + $actions[ 'clone' ] = gravityview_get_link( $clone_link, $clone_text, 'title=' . $clone_title ); |
|
| 245 | 245 | |
| 246 | 246 | $clone_draft_link = $this->get_clone_view_link( $post->ID ); |
| 247 | 247 | $clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' ); |
| 248 | 248 | $clone_draft_title = __( 'Copy as a new draft View', 'gravityview' ); |
| 249 | 249 | |
| 250 | - $actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title ); |
|
| 250 | + $actions[ 'edit_as_new_draft' ] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title=' . $clone_draft_title ); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | return $actions; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | // Verify the View exists |
| 274 | - if ( !$view = get_post( $id ) ) { |
|
| 274 | + if ( ! $view = get_post( $id ) ) { |
|
| 275 | 275 | return ''; |
| 276 | 276 | } |
| 277 | 277 | |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | $post_type_object = get_post_type_object( $view->post_type ); |
| 287 | 287 | |
| 288 | 288 | /** If there's no gravityview post type for some reason, abort! */ |
| 289 | - if ( !$post_type_object ) { |
|
| 289 | + if ( ! $post_type_object ) { |
|
| 290 | 290 | gravityview()->log->error( 'No gravityview post type exists when trying to clone the View.', array( 'data' => $view ) ); |
| 291 | 291 | return ''; |
| 292 | 292 | } |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | * @param int $view_id View ID |
| 299 | 299 | * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display` |
| 300 | 300 | */ |
| 301 | - $clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context ); |
|
| 301 | + $clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php" . $action ), $view->ID, $context ); |
|
| 302 | 302 | |
| 303 | 303 | return $clone_view_link; |
| 304 | 304 | } |
@@ -325,14 +325,14 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | public function save_as_new_view( $status = '' ) { |
| 327 | 327 | |
| 328 | - if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) { |
|
| 328 | + if ( ! ( isset( $_GET[ 'post' ] ) || isset( $_POST[ 'post' ] ) ) ) { |
|
| 329 | 329 | wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) ); |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | // Get the original post |
| 333 | - $id = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] ); |
|
| 333 | + $id = ( isset( $_GET[ 'post' ] ) ? $_GET[ 'post' ] : $_POST[ 'post' ] ); |
|
| 334 | 334 | |
| 335 | - if( ! $this->current_user_can_copy( $id ) ) { |
|
| 335 | + if ( ! $this->current_user_can_copy( $id ) ) { |
|
| 336 | 336 | wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) ); |
| 337 | 337 | } |
| 338 | 338 | |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | $return = $input_type; |
| 47 | 47 | |
| 48 | - if( 'survey' === $field_type ) { |
|
| 48 | + if ( 'survey' === $field_type ) { |
|
| 49 | 49 | $return = 'select'; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | public function fix_survey_fields( $fields ) { |
| 66 | 66 | |
| 67 | 67 | /** @var GF_Field $field */ |
| 68 | - foreach( $fields as &$field ) { |
|
| 69 | - if( 'survey' === $field->type ) { |
|
| 68 | + foreach ( $fields as &$field ) { |
|
| 69 | + if ( 'survey' === $field->type ) { |
|
| 70 | 70 | $field->allowsPrepopulate = true; |
| 71 | 71 | } |
| 72 | 72 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @return void |
| 83 | 83 | */ |
| 84 | 84 | function add_render_hooks() { |
| 85 | - add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10, 3 ); |
|
| 85 | + add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10, 3 ); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @return void |
| 96 | 96 | */ |
| 97 | 97 | function remove_render_hooks() { |
| 98 | - remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10 ); |
|
| 98 | + remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10 ); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -113,9 +113,9 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function fix_survey_field_value( $value, $field, $name ) { |
| 115 | 115 | |
| 116 | - if( 'survey' === $field->type ) { |
|
| 116 | + if ( 'survey' === $field->type ) { |
|
| 117 | 117 | |
| 118 | - $entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry(); |
|
| 118 | + $entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry(); |
|
| 119 | 119 | |
| 120 | 120 | // We need to run through each survey row until we find a match for expected values |
| 121 | 121 | foreach ( $entry as $field_id => $field_value ) { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | list( $row_val, $col_val ) = explode( ':', $field_value, 2 ); |
| 129 | 129 | |
| 130 | 130 | // If the $name matches the $row_val, we are processing the correct row |
| 131 | - if( $row_val === $name ) { |
|
| 131 | + if ( $row_val === $name ) { |
|
| 132 | 132 | $value = $field_value; |
| 133 | 133 | break; |
| 134 | 134 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | parent::add_hooks(); |
| 35 | 35 | |
| 36 | - add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 ); |
|
| 36 | + add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 ); |
|
| 37 | 37 | |
| 38 | 38 | } |
| 39 | 39 | |
@@ -52,13 +52,13 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) { |
| 54 | 54 | |
| 55 | - if( empty( $form_id ) ) { |
|
| 55 | + if ( empty( $form_id ) ) { |
|
| 56 | 56 | $form_id = GravityView_View::getInstance()->getFormId(); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | $entry_meta = gravity_flow()->get_entry_meta( array(), $form_id ); |
| 60 | 60 | |
| 61 | - return (array) \GV\Utils::get( $entry_meta, $status_key . '/filter/choices' ); |
|
| 61 | + return (array)\GV\Utils::get( $entry_meta, $status_key . '/filter/choices' ); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | $workflow_steps = $GFlow->get_steps(); |
| 82 | 82 | |
| 83 | - if( $workflow_steps ) { |
|
| 83 | + if ( $workflow_steps ) { |
|
| 84 | 84 | |
| 85 | 85 | foreach ( $workflow_steps as $step ) { |
| 86 | 86 | |
@@ -92,12 +92,12 @@ discard block |
||
| 92 | 92 | ); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - $fields['workflow_step'] = array( |
|
| 95 | + $fields[ 'workflow_step' ] = array( |
|
| 96 | 96 | 'label' => esc_html__( 'Workflow Step', 'gravityview' ), |
| 97 | 97 | 'type' => 'select', |
| 98 | 98 | ); |
| 99 | 99 | |
| 100 | - $fields['workflow_final_status'] = array( |
|
| 100 | + $fields[ 'workflow_final_status' ] = array( |
|
| 101 | 101 | 'label' => esc_html__( 'Workflow Status', 'gravityview' ), |
| 102 | 102 | 'type' => 'select', |
| 103 | 103 | ); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | parent::add_hooks(); |
| 69 | 69 | |
| 70 | - if( gravityview_is_admin_page() ) { |
|
| 70 | + if ( gravityview_is_admin_page() ) { |
|
| 71 | 71 | |
| 72 | 72 | // Make Yoast metabox go down to the bottom please. |
| 73 | 73 | add_filter( 'wpseo_metabox_prio', array( $this, 'return_low' ) ); |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function disable_content_analysis( $options ) { |
| 94 | 94 | |
| 95 | - $options['keyword_analysis_active'] = false; |
|
| 96 | - $options['content_analysis_active'] = false; |
|
| 95 | + $options[ 'keyword_analysis_active' ] = false; |
|
| 96 | + $options[ 'content_analysis_active' ] = false; |
|
| 97 | 97 | |
| 98 | 98 | return $options; |
| 99 | 99 | } |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | global $pagenow; |
| 113 | 113 | |
| 114 | 114 | // New View page |
| 115 | - if( $pagenow === 'post-new.php' ) { |
|
| 116 | - $options['hideeditbox-gravityview'] = true; |
|
| 115 | + if ( $pagenow === 'post-new.php' ) { |
|
| 116 | + $options[ 'hideeditbox-gravityview' ] = true; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | return $options; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $signature_fields = GFAPI::get_fields_by_type( $form, 'signature' ); |
| 54 | 54 | |
| 55 | 55 | foreach ( $signature_fields as $field ) { |
| 56 | - unset( $_POST["input_{$field->id}"] ); |
|
| 56 | + unset( $_POST[ "input_{$field->id}" ] ); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -72,19 +72,19 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | function edit_entry_field_input( $field_content = '', $field, $value = '', $lead_id = 0, $form_id = 0 ) { |
| 74 | 74 | |
| 75 | - $context = function_exists('gravityview_get_context') ? gravityview_get_context() : ''; |
|
| 75 | + $context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : ''; |
|
| 76 | 76 | |
| 77 | - if( 'signature' !== $field->type || 'edit' !== $context ) { |
|
| 77 | + if ( 'signature' !== $field->type || 'edit' !== $context ) { |
|
| 78 | 78 | return $field_content; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | // We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet. |
| 82 | 82 | $entry = GravityView_View::getInstance()->getCurrentEntry(); |
| 83 | - $entry = GFAPI::get_entry( $entry['id'] ); |
|
| 83 | + $entry = GFAPI::get_entry( $entry[ 'id' ] ); |
|
| 84 | 84 | $entry_value = \GV\Utils::get( $entry, $field->id ); |
| 85 | 85 | |
| 86 | - $_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted |
|
| 87 | - $_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
| 86 | + $_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted |
|
| 87 | + $_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
| 88 | 88 | |
| 89 | 89 | return ''; // Return empty string to force using $_POST values instead |
| 90 | 90 | } |
@@ -48,132 +48,132 @@ |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | - * Given information provided in an entry, get array of media IDs |
|
| 52 | - * |
|
| 53 | - * This is necessary because GF doesn't expect to need to update post images, only to create them. |
|
| 54 | - * |
|
| 55 | - * @see GFFormsModel::create_post() |
|
| 56 | - * |
|
| 57 | - * @since 1.17 |
|
| 58 | - * |
|
| 59 | - * @param array $form Gravity Forms form array |
|
| 60 | - * @param array $entry Gravity Forms entry array |
|
| 61 | - * |
|
| 62 | - * @return array Array of "Field ID" => "Media IDs" |
|
| 63 | - */ |
|
| 64 | - public static function get_post_field_images( $form, $entry ) { |
|
| 65 | - |
|
| 66 | - $post_data = self::get_post_fields( $form, $entry ); |
|
| 67 | - |
|
| 68 | - $media = get_attached_media( 'image', $entry['post_id'] ); |
|
| 69 | - |
|
| 70 | - $post_images = array(); |
|
| 71 | - |
|
| 72 | - foreach ( $media as $media_item ) { |
|
| 73 | - foreach( (array) $post_data['images'] as $post_data_item ) { |
|
| 74 | - if( |
|
| 75 | - \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title && |
|
| 76 | - \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content && |
|
| 77 | - \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt |
|
| 78 | - ) { |
|
| 79 | - $post_images["{$post_data_item['field_id']}"] = $media_item->ID; |
|
| 80 | - } |
|
| 81 | - } |
|
| 82 | - } |
|
| 83 | - |
|
| 84 | - return $post_images; |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - /** |
|
| 88 | - * Alias of GFFormsModel::get_post_fields(); just making it public |
|
| 89 | - * |
|
| 90 | - * @see GFFormsModel::get_post_fields() |
|
| 91 | - * |
|
| 92 | - * @since 1.17 |
|
| 93 | - * |
|
| 94 | - * @param array $form Gravity Forms form array |
|
| 95 | - * @param array $entry Gravity Forms entry array |
|
| 96 | - * |
|
| 97 | - * @return array |
|
| 98 | - */ |
|
| 99 | - public static function get_post_fields( $form, $entry ) { |
|
| 100 | - |
|
| 101 | - $reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' ); |
|
| 102 | - |
|
| 103 | - /** |
|
| 104 | - * If the method changes to public, use Gravity Forms' method |
|
| 105 | - * @todo: If/when the method is public, remove the unneeded copied code. |
|
| 106 | - */ |
|
| 107 | - if( $reflection->isPublic() ) { |
|
| 108 | - return parent::get_post_fields( $form, $entry ); |
|
| 109 | - } |
|
| 110 | - |
|
| 111 | - // It was private; let's make it public |
|
| 112 | - $reflection->setAccessible( true ); |
|
| 113 | - |
|
| 114 | - return $reflection->invoke( new GFFormsModel, $form, $entry ); |
|
| 115 | - } |
|
| 116 | - |
|
| 117 | - /** |
|
| 118 | - * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private. |
|
| 119 | - * |
|
| 120 | - * @since 1.16.2 |
|
| 121 | - * |
|
| 122 | - * @param string $url URL of the post image to update |
|
| 123 | - * @param int $post_id ID of the post image to update |
|
| 124 | - * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path. |
|
| 125 | - */ |
|
| 126 | - public static function copy_post_image( $url, $post_id ) { |
|
| 127 | - |
|
| 128 | - $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' ); |
|
| 129 | - |
|
| 130 | - /** |
|
| 131 | - * If the method changes to public, use Gravity Forms' method |
|
| 132 | - * @todo: If/when the method is public, remove the unneeded copied code. |
|
| 133 | - */ |
|
| 134 | - if( $reflection->isPublic() ) { |
|
| 135 | - return parent::copy_post_image( $url, $post_id ); |
|
| 136 | - } |
|
| 137 | - |
|
| 138 | - // It was private; let's make it public |
|
| 139 | - $reflection->setAccessible( true ); |
|
| 140 | - |
|
| 141 | - return $reflection->invoke( new GFFormsModel, $url, $post_id ); |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private. |
|
| 146 | - * |
|
| 147 | - * Note: The method became public in GF 1.9.17.7 |
|
| 148 | - * |
|
| 149 | - * @see GFFormsModel::media_handle_upload |
|
| 150 | - * @see GravityView_Edit_Entry_Render::maybe_update_post_fields |
|
| 151 | - * |
|
| 152 | - * @uses copy_post_image |
|
| 153 | - * @uses wp_insert_attachment |
|
| 154 | - * @uses wp_update_attachment_metadata |
|
| 155 | - * |
|
| 156 | - * @param string $url URL of the post image to update |
|
| 157 | - * @param int $post_id ID of the post image to update |
|
| 158 | - * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys. |
|
| 159 | - * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image |
|
| 160 | - */ |
|
| 161 | - public static function media_handle_upload( $url, $post_id, $post_data = array() ) { |
|
| 162 | - |
|
| 163 | - $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' ); |
|
| 164 | - |
|
| 165 | - /** |
|
| 166 | - * If the method changes to public, use Gravity Forms' method |
|
| 167 | - * @todo: If/when the method is public, remove the unneeded copied code. |
|
| 168 | - */ |
|
| 169 | - if( $reflection->isPublic() ) { |
|
| 170 | - return parent::media_handle_upload( $url, $post_id, $post_data ); |
|
| 171 | - } |
|
| 172 | - |
|
| 173 | - // It was private; let's make it public |
|
| 174 | - $reflection->setAccessible( true ); |
|
| 175 | - |
|
| 176 | - return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data ); |
|
| 177 | - } |
|
| 51 | + * Given information provided in an entry, get array of media IDs |
|
| 52 | + * |
|
| 53 | + * This is necessary because GF doesn't expect to need to update post images, only to create them. |
|
| 54 | + * |
|
| 55 | + * @see GFFormsModel::create_post() |
|
| 56 | + * |
|
| 57 | + * @since 1.17 |
|
| 58 | + * |
|
| 59 | + * @param array $form Gravity Forms form array |
|
| 60 | + * @param array $entry Gravity Forms entry array |
|
| 61 | + * |
|
| 62 | + * @return array Array of "Field ID" => "Media IDs" |
|
| 63 | + */ |
|
| 64 | + public static function get_post_field_images( $form, $entry ) { |
|
| 65 | + |
|
| 66 | + $post_data = self::get_post_fields( $form, $entry ); |
|
| 67 | + |
|
| 68 | + $media = get_attached_media( 'image', $entry['post_id'] ); |
|
| 69 | + |
|
| 70 | + $post_images = array(); |
|
| 71 | + |
|
| 72 | + foreach ( $media as $media_item ) { |
|
| 73 | + foreach( (array) $post_data['images'] as $post_data_item ) { |
|
| 74 | + if( |
|
| 75 | + \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title && |
|
| 76 | + \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content && |
|
| 77 | + \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt |
|
| 78 | + ) { |
|
| 79 | + $post_images["{$post_data_item['field_id']}"] = $media_item->ID; |
|
| 80 | + } |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + return $post_images; |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + /** |
|
| 88 | + * Alias of GFFormsModel::get_post_fields(); just making it public |
|
| 89 | + * |
|
| 90 | + * @see GFFormsModel::get_post_fields() |
|
| 91 | + * |
|
| 92 | + * @since 1.17 |
|
| 93 | + * |
|
| 94 | + * @param array $form Gravity Forms form array |
|
| 95 | + * @param array $entry Gravity Forms entry array |
|
| 96 | + * |
|
| 97 | + * @return array |
|
| 98 | + */ |
|
| 99 | + public static function get_post_fields( $form, $entry ) { |
|
| 100 | + |
|
| 101 | + $reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' ); |
|
| 102 | + |
|
| 103 | + /** |
|
| 104 | + * If the method changes to public, use Gravity Forms' method |
|
| 105 | + * @todo: If/when the method is public, remove the unneeded copied code. |
|
| 106 | + */ |
|
| 107 | + if( $reflection->isPublic() ) { |
|
| 108 | + return parent::get_post_fields( $form, $entry ); |
|
| 109 | + } |
|
| 110 | + |
|
| 111 | + // It was private; let's make it public |
|
| 112 | + $reflection->setAccessible( true ); |
|
| 113 | + |
|
| 114 | + return $reflection->invoke( new GFFormsModel, $form, $entry ); |
|
| 115 | + } |
|
| 116 | + |
|
| 117 | + /** |
|
| 118 | + * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private. |
|
| 119 | + * |
|
| 120 | + * @since 1.16.2 |
|
| 121 | + * |
|
| 122 | + * @param string $url URL of the post image to update |
|
| 123 | + * @param int $post_id ID of the post image to update |
|
| 124 | + * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path. |
|
| 125 | + */ |
|
| 126 | + public static function copy_post_image( $url, $post_id ) { |
|
| 127 | + |
|
| 128 | + $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' ); |
|
| 129 | + |
|
| 130 | + /** |
|
| 131 | + * If the method changes to public, use Gravity Forms' method |
|
| 132 | + * @todo: If/when the method is public, remove the unneeded copied code. |
|
| 133 | + */ |
|
| 134 | + if( $reflection->isPublic() ) { |
|
| 135 | + return parent::copy_post_image( $url, $post_id ); |
|
| 136 | + } |
|
| 137 | + |
|
| 138 | + // It was private; let's make it public |
|
| 139 | + $reflection->setAccessible( true ); |
|
| 140 | + |
|
| 141 | + return $reflection->invoke( new GFFormsModel, $url, $post_id ); |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private. |
|
| 146 | + * |
|
| 147 | + * Note: The method became public in GF 1.9.17.7 |
|
| 148 | + * |
|
| 149 | + * @see GFFormsModel::media_handle_upload |
|
| 150 | + * @see GravityView_Edit_Entry_Render::maybe_update_post_fields |
|
| 151 | + * |
|
| 152 | + * @uses copy_post_image |
|
| 153 | + * @uses wp_insert_attachment |
|
| 154 | + * @uses wp_update_attachment_metadata |
|
| 155 | + * |
|
| 156 | + * @param string $url URL of the post image to update |
|
| 157 | + * @param int $post_id ID of the post image to update |
|
| 158 | + * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys. |
|
| 159 | + * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image |
|
| 160 | + */ |
|
| 161 | + public static function media_handle_upload( $url, $post_id, $post_data = array() ) { |
|
| 162 | + |
|
| 163 | + $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' ); |
|
| 164 | + |
|
| 165 | + /** |
|
| 166 | + * If the method changes to public, use Gravity Forms' method |
|
| 167 | + * @todo: If/when the method is public, remove the unneeded copied code. |
|
| 168 | + */ |
|
| 169 | + if( $reflection->isPublic() ) { |
|
| 170 | + return parent::media_handle_upload( $url, $post_id, $post_data ); |
|
| 171 | + } |
|
| 172 | + |
|
| 173 | + // It was private; let's make it public |
|
| 174 | + $reflection->setAccessible( true ); |
|
| 175 | + |
|
| 176 | + return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data ); |
|
| 177 | + } |
|
| 178 | 178 | |
| 179 | 179 | } |
| 180 | 180 | \ No newline at end of file |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) { |
| 41 | 41 | |
| 42 | 42 | if ( 'date_created' === $source_field ) { |
| 43 | - $field_value = is_int( $field_value )? $field_value : strtotime( $field_value ); |
|
| 44 | - $target_value = is_int( $target_value )? $target_value : strtotime( $target_value ); |
|
| 43 | + $field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value ); |
|
| 44 | + $target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value ); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form ); // TODO: Change the autogenerated stub |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | $post_data = self::get_post_fields( $form, $entry ); |
| 67 | 67 | |
| 68 | - $media = get_attached_media( 'image', $entry['post_id'] ); |
|
| 68 | + $media = get_attached_media( 'image', $entry[ 'post_id' ] ); |
|
| 69 | 69 | |
| 70 | 70 | $post_images = array(); |
| 71 | 71 | |
| 72 | 72 | foreach ( $media as $media_item ) { |
| 73 | - foreach( (array) $post_data['images'] as $post_data_item ) { |
|
| 74 | - if( |
|
| 73 | + foreach ( (array)$post_data[ 'images' ] as $post_data_item ) { |
|
| 74 | + if ( |
|
| 75 | 75 | \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title && |
| 76 | 76 | \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content && |
| 77 | 77 | \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt |
| 78 | 78 | ) { |
| 79 | - $post_images["{$post_data_item['field_id']}"] = $media_item->ID; |
|
| 79 | + $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID; |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * If the method changes to public, use Gravity Forms' method |
| 105 | 105 | * @todo: If/when the method is public, remove the unneeded copied code. |
| 106 | 106 | */ |
| 107 | - if( $reflection->isPublic() ) { |
|
| 107 | + if ( $reflection->isPublic() ) { |
|
| 108 | 108 | return parent::get_post_fields( $form, $entry ); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * If the method changes to public, use Gravity Forms' method |
| 132 | 132 | * @todo: If/when the method is public, remove the unneeded copied code. |
| 133 | 133 | */ |
| 134 | - if( $reflection->isPublic() ) { |
|
| 134 | + if ( $reflection->isPublic() ) { |
|
| 135 | 135 | return parent::copy_post_image( $url, $post_id ); |
| 136 | 136 | } |
| 137 | 137 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * If the method changes to public, use Gravity Forms' method |
| 167 | 167 | * @todo: If/when the method is public, remove the unneeded copied code. |
| 168 | 168 | */ |
| 169 | - if( $reflection->isPublic() ) { |
|
| 169 | + if ( $reflection->isPublic() ) { |
|
| 170 | 170 | return parent::media_handle_upload( $url, $post_id, $post_data ); |
| 171 | 171 | } |
| 172 | 172 | |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | if ( ! empty( $passed_post ) ) { |
| 22 | 22 | $id_or_id_array = $this->maybe_get_view_id( $passed_post ); |
| 23 | - foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
| 23 | + foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
| 24 | 24 | if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) { |
| 25 | 25 | $this->views->add( \GV\View::by_id( $view_id ) ); |
| 26 | 26 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | foreach ( $passed_post as &$post ) { |
| 76 | 76 | $views = \GV\View_Collection::from_post( $post ); |
| 77 | 77 | foreach ( $views->all() as $view ) { |
| 78 | - $ids []= $view->ID; |
|
| 78 | + $ids [ ] = $view->ID; |
|
| 79 | 79 | |
| 80 | 80 | /** And as a side-effect... add each view to the global scope. */ |
| 81 | 81 | if ( ! $this->views->contains( $view->ID ) ) { |
@@ -89,29 +89,29 @@ discard block |
||
| 89 | 89 | if ( is_string( $passed_post ) ) { |
| 90 | 90 | $shortcodes = \GV\Shortcode::parse( $passed_post ); |
| 91 | 91 | foreach ( $shortcodes as $shortcode ) { |
| 92 | - if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) { |
|
| 93 | - $ids []= $shortcode->atts['id']; |
|
| 92 | + if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) { |
|
| 93 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
| 94 | 94 | |
| 95 | 95 | /** And as a side-effect... add each view to the global scope. */ |
| 96 | - if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) { |
|
| 97 | - $this->views->add( $shortcode->atts['id'] ); |
|
| 96 | + if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) { |
|
| 97 | + $this->views->add( $shortcode->atts[ 'id' ] ); |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | } else { |
| 102 | 102 | $id = $this->get_id_from_atts( $passed_post ); |
| 103 | - $ids[] = intval( $id ); |
|
| 103 | + $ids[ ] = intval( $id ); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - if( empty($ids) ) { |
|
| 108 | + if ( empty( $ids ) ) { |
|
| 109 | 109 | return NULL; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | // If it's just one ID, return that. |
| 113 | 113 | // Otherwise, return array of IDs |
| 114 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
| 114 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public static function getInstance( $passed_post = NULL ) { |
| 121 | 121 | |
| 122 | - if( empty( self::$instance ) ) { |
|
| 122 | + if ( empty( self::$instance ) ) { |
|
| 123 | 123 | self::$instance = new GravityView_View_Data( $passed_post ); |
| 124 | 124 | } |
| 125 | 125 | |
@@ -135,8 +135,8 @@ discard block |
||
| 135 | 135 | return array(); |
| 136 | 136 | } |
| 137 | 137 | return array_combine( |
| 138 | - array_map( function ( $view ) { return $view->ID; }, $this->views->all() ), |
|
| 139 | - array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
| 138 | + array_map( function( $view ) { return $view->ID; }, $this->views->all() ), |
|
| 139 | + array_map( function( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
| 140 | 140 | ); |
| 141 | 141 | } |
| 142 | 142 | |
@@ -245,22 +245,22 @@ discard block |
||
| 245 | 245 | public function parse_post_content( $content ) { |
| 246 | 246 | $ids = array(); |
| 247 | 247 | foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) { |
| 248 | - if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) { |
|
| 249 | - if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) { |
|
| 250 | - $this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) ); |
|
| 248 | + if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
| 249 | + if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) { |
|
| 250 | + $this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) ); |
|
| 251 | 251 | } |
| 252 | 252 | /** |
| 253 | 253 | * The original function outputs the ID even though it wasn't added by ::add_view() |
| 254 | 254 | * Wether this is a bug or not remains a mystery. But we need to emulate this behavior |
| 255 | 255 | * until better times. |
| 256 | 256 | */ |
| 257 | - $ids []= $shortcode->atts['id']; |
|
| 257 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | if ( empty ( $ids ) ) { |
| 261 | 261 | return null; |
| 262 | 262 | } |
| 263 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
| 263 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | // Not invalid if not set! |
| 284 | 284 | if ( empty( $post_id ) || empty( $view_id ) ) { |
| 285 | 285 | |
| 286 | - if( $empty_is_valid ) { |
|
| 286 | + if ( $empty_is_valid ) { |
|
| 287 | 287 | return true; |
| 288 | 288 | } |
| 289 | 289 | |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | $view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() ); |
| 317 | 317 | |
| 318 | 318 | // The post or page specified does not contain the shortcode. |
| 319 | - if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) { |
|
| 319 | + if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) { |
|
| 320 | 320 | $message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' ); |
| 321 | 321 | } |
| 322 | 322 | } |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | if ( ! $message ) { |
| 325 | 325 | // It's a View |
| 326 | 326 | if ( \GV\View::exists( $post_id ) ) { |
| 327 | - $message = esc_html__( 'The ID is already a View.', 'gravityview' );; |
|
| 327 | + $message = esc_html__( 'The ID is already a View.', 'gravityview' ); ; |
|
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | |