@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | return true; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - $context = $args[1]; |
|
| 33 | + $context = $args[ 1 ]; |
|
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * Assume false by default. |
| 37 | 37 | */ |
| 38 | 38 | $is_page = false; |
| 39 | 39 | |
| 40 | - if( function_exists( '\get_current_screen' ) ) { |
|
| 40 | + if ( function_exists( '\get_current_screen' ) ) { |
|
| 41 | 41 | $current_screen = \get_current_screen(); |
| 42 | 42 | } else { |
| 43 | 43 | $current_screen = false; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $is_page = 'single'; |
| 51 | 51 | } else if ( $is_gv_settings = 'gravityview_page_gravityview_settings' === $current_screen->id ) { |
| 52 | 52 | $is_page = 'settings'; |
| 53 | - } else if( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) { |
|
| 53 | + } else if ( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) { |
|
| 54 | 54 | $is_page = 'downloads'; |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @param[in,out] string|bool $is_page If false, no. If string, the name of the page (`single`, `settings`, or `views`) |
| 61 | 61 | * @param[in] string $hook The name of the page to check against. Is passed to the method. |
| 62 | 62 | */ |
| 63 | - $is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $args[0] ); |
|
| 63 | + $is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $args[ 0 ] ); |
|
| 64 | 64 | |
| 65 | 65 | // If the current page is the same as the compared page |
| 66 | 66 | if ( ! empty( $context ) ) { |
@@ -115,16 +115,16 @@ discard block |
||
| 115 | 115 | function load() { |
| 116 | 116 | |
| 117 | 117 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
| 118 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
| 118 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
| 119 | 119 | |
| 120 | 120 | // Don't display an embedded form when editing an entry |
| 121 | 121 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
| 122 | 122 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
| 123 | 123 | |
| 124 | 124 | // Stop Gravity Forms processing what is ours! |
| 125 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
| 125 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
| 126 | 126 | |
| 127 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
| 127 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
| 128 | 128 | |
| 129 | 129 | add_action( 'gravityview_edit_entry', array( $this, 'init' ) ); |
| 130 | 130 | |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
| 136 | 136 | |
| 137 | 137 | // Add fields expected by GFFormDisplay::validate() |
| 138 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
| 138 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
| 139 | 139 | |
| 140 | 140 | // Fix multiselect value for GF 2.2 |
| 141 | 141 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -152,8 +152,8 @@ discard block |
||
| 152 | 152 | * @return void |
| 153 | 153 | */ |
| 154 | 154 | public function prevent_render_form() { |
| 155 | - if( $this->is_edit_entry() ) { |
|
| 156 | - if( 'wp_head' === current_filter() ) { |
|
| 155 | + if ( $this->is_edit_entry() ) { |
|
| 156 | + if ( 'wp_head' === current_filter() ) { |
|
| 157 | 157 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
| 158 | 158 | } else { |
| 159 | 159 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -168,13 +168,13 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | public function prevent_maybe_process_form() { |
| 170 | 170 | |
| 171 | - if( ! empty( $_POST ) ) { |
|
| 171 | + if ( ! empty( $_POST ) ) { |
|
| 172 | 172 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if( $this->is_edit_entry_submission() ) { |
|
| 176 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
| 177 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 175 | + if ( $this->is_edit_entry_submission() ) { |
|
| 176 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
| 177 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | */ |
| 185 | 185 | public function is_edit_entry() { |
| 186 | 186 | |
| 187 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
| 187 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
| 188 | 188 | |
| 189 | 189 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
| 190 | 190 | } |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | * @return boolean |
| 196 | 196 | */ |
| 197 | 197 | public function is_edit_entry_submission() { |
| 198 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
| 198 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | /** |
@@ -208,8 +208,8 @@ discard block |
||
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | $entries = $gravityview_view->getEntries(); |
| 211 | - self::$original_entry = $entries[0]; |
|
| 212 | - $this->entry = $entries[0]; |
|
| 211 | + self::$original_entry = $entries[ 0 ]; |
|
| 212 | + $this->entry = $entries[ 0 ]; |
|
| 213 | 213 | |
| 214 | 214 | self::$original_form = $gravityview_view->getForm(); |
| 215 | 215 | $this->form = $gravityview_view->getForm(); |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | $this->view_id = $gravityview_view->getViewId(); |
| 218 | 218 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
| 219 | 219 | |
| 220 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
| 220 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | |
@@ -268,9 +268,9 @@ discard block |
||
| 268 | 268 | private function print_scripts() { |
| 269 | 269 | $gravityview_view = GravityView_View::getInstance(); |
| 270 | 270 | |
| 271 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 271 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 272 | 272 | |
| 273 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
| 273 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
| 274 | 274 | |
| 275 | 275 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
| 276 | 276 | |
@@ -286,19 +286,19 @@ discard block |
||
| 286 | 286 | */ |
| 287 | 287 | private function process_save( $gv_data ) { |
| 288 | 288 | |
| 289 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
| 289 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
| 290 | 290 | return; |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | // Make sure the entry, view, and form IDs are all correct |
| 294 | 294 | $valid = $this->verify_nonce(); |
| 295 | 295 | |
| 296 | - if ( !$valid ) { |
|
| 296 | + if ( ! $valid ) { |
|
| 297 | 297 | gravityview()->log->error( 'Nonce validation failed.' ); |
| 298 | 298 | return; |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
| 301 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
| 302 | 302 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
| 303 | 303 | return; |
| 304 | 304 | } |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | |
| 310 | 310 | $this->validate(); |
| 311 | 311 | |
| 312 | - if( $this->is_valid ) { |
|
| 312 | + if ( $this->is_valid ) { |
|
| 313 | 313 | |
| 314 | 314 | gravityview()->log->debug( 'Submission is valid.' ); |
| 315 | 315 | |
@@ -321,22 +321,22 @@ discard block |
||
| 321 | 321 | /** |
| 322 | 322 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
| 323 | 323 | */ |
| 324 | - unset( $_GET['page'] ); |
|
| 324 | + unset( $_GET[ 'page' ] ); |
|
| 325 | 325 | |
| 326 | - $date_created = $this->entry['date_created']; |
|
| 326 | + $date_created = $this->entry[ 'date_created' ]; |
|
| 327 | 327 | |
| 328 | 328 | /** |
| 329 | 329 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
| 330 | 330 | * @since 1.17.2 |
| 331 | 331 | */ |
| 332 | - unset( $this->entry['date_created'] ); |
|
| 332 | + unset( $this->entry[ 'date_created' ] ); |
|
| 333 | 333 | |
| 334 | 334 | GFFormsModel::save_lead( $form, $this->entry ); |
| 335 | 335 | |
| 336 | 336 | // Delete the values for hidden inputs |
| 337 | 337 | $this->unset_hidden_field_values(); |
| 338 | 338 | |
| 339 | - $this->entry['date_created'] = $date_created; |
|
| 339 | + $this->entry[ 'date_created' ] = $date_created; |
|
| 340 | 340 | |
| 341 | 341 | // Process calculation fields |
| 342 | 342 | $this->update_calculation_fields(); |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | * @param GravityView_Edit_Entry_Render $this This object |
| 359 | 359 | * @param GravityView_View_Data $gv_data The View data |
| 360 | 360 | */ |
| 361 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
| 361 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
| 362 | 362 | |
| 363 | 363 | } else { |
| 364 | 364 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -386,16 +386,16 @@ discard block |
||
| 386 | 386 | */ |
| 387 | 387 | $unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this ); |
| 388 | 388 | |
| 389 | - if( ! $unset_hidden_field_values ) { |
|
| 389 | + if ( ! $unset_hidden_field_values ) { |
|
| 390 | 390 | return; |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
| 394 | 394 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
| 395 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
| 395 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
| 396 | 396 | } else { |
| 397 | 397 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
| 398 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
| 398 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | } |
| 477 | 477 | |
| 478 | 478 | /** No file is being uploaded. */ |
| 479 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 479 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 480 | 480 | /** So return the original upload */ |
| 481 | 481 | return $entry[ $input_id ]; |
| 482 | 482 | } |
@@ -494,11 +494,11 @@ discard block |
||
| 494 | 494 | * @return mixed |
| 495 | 495 | */ |
| 496 | 496 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
| 497 | - if( ! $this->is_edit_entry() ) { |
|
| 497 | + if ( ! $this->is_edit_entry() ) { |
|
| 498 | 498 | return $plupload_init; |
| 499 | 499 | } |
| 500 | 500 | |
| 501 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
| 501 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
| 502 | 502 | |
| 503 | 503 | return $plupload_init; |
| 504 | 504 | } |
@@ -513,22 +513,22 @@ discard block |
||
| 513 | 513 | $form = $this->form; |
| 514 | 514 | |
| 515 | 515 | /** @var GF_Field $field */ |
| 516 | - foreach( $form['fields'] as $k => &$field ) { |
|
| 516 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
| 517 | 517 | |
| 518 | 518 | /** |
| 519 | 519 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
| 520 | 520 | * @since 1.16.3 |
| 521 | 521 | * @var GF_Field $field |
| 522 | 522 | */ |
| 523 | - if( $field->has_calculation() ) { |
|
| 524 | - unset( $form['fields'][ $k ] ); |
|
| 523 | + if ( $field->has_calculation() ) { |
|
| 524 | + unset( $form[ 'fields' ][ $k ] ); |
|
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | $field->adminOnly = false; |
| 528 | 528 | |
| 529 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 530 | - foreach( $field->inputs as $key => $input ) { |
|
| 531 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 529 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 530 | + foreach ( $field->inputs as $key => $input ) { |
|
| 531 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
| 532 | 532 | } |
| 533 | 533 | } |
| 534 | 534 | } |
@@ -542,30 +542,30 @@ discard block |
||
| 542 | 542 | $update = false; |
| 543 | 543 | |
| 544 | 544 | // get the most up to date entry values |
| 545 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
| 545 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
| 546 | 546 | |
| 547 | - if( !empty( $this->fields_with_calculation ) ) { |
|
| 547 | + if ( ! empty( $this->fields_with_calculation ) ) { |
|
| 548 | 548 | $update = true; |
| 549 | 549 | foreach ( $this->fields_with_calculation as $calc_field ) { |
| 550 | 550 | $inputs = $calc_field->get_entry_inputs(); |
| 551 | 551 | if ( is_array( $inputs ) ) { |
| 552 | 552 | foreach ( $inputs as $input ) { |
| 553 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 554 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 553 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
| 554 | + $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
| 555 | 555 | } |
| 556 | 556 | } else { |
| 557 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
| 558 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 557 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id ); |
|
| 558 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
| 559 | 559 | } |
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | } |
| 563 | 563 | |
| 564 | - if( $update ) { |
|
| 564 | + if ( $update ) { |
|
| 565 | 565 | |
| 566 | 566 | $return_entry = GFAPI::update_entry( $entry ); |
| 567 | 567 | |
| 568 | - if( is_wp_error( $return_entry ) ) { |
|
| 568 | + if ( is_wp_error( $return_entry ) ) { |
|
| 569 | 569 | gravityview()->log->error( 'Updating the entry calculation fields failed', array( 'data' => $return_entry ) ); |
| 570 | 570 | } else { |
| 571 | 571 | gravityview()->log->debug( 'Updating the entry calculation fields succeeded' ); |
@@ -596,19 +596,19 @@ discard block |
||
| 596 | 596 | |
| 597 | 597 | $input_name = 'input_' . $field_id; |
| 598 | 598 | |
| 599 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 599 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 600 | 600 | |
| 601 | 601 | // We have a new image |
| 602 | 602 | |
| 603 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
| 603 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
| 604 | 604 | |
| 605 | 605 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 606 | 606 | $ary = stripslashes_deep( $ary ); |
| 607 | 607 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 608 | 608 | |
| 609 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
| 610 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
| 611 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
| 609 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
| 610 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
| 611 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
| 612 | 612 | |
| 613 | 613 | $image_meta = array( |
| 614 | 614 | 'post_excerpt' => $img_caption, |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | |
| 618 | 618 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
| 619 | 619 | if ( ! empty( $img_title ) ) { |
| 620 | - $image_meta['post_title'] = $img_title; |
|
| 620 | + $image_meta[ 'post_title' ] = $img_title; |
|
| 621 | 621 | } |
| 622 | 622 | |
| 623 | 623 | /** |
@@ -675,15 +675,15 @@ discard block |
||
| 675 | 675 | */ |
| 676 | 676 | private function maybe_update_post_fields( $form ) { |
| 677 | 677 | |
| 678 | - if( empty( $this->entry['post_id'] ) ) { |
|
| 678 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
| 679 | 679 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
| 680 | 680 | return; |
| 681 | 681 | } |
| 682 | 682 | |
| 683 | - $post_id = $this->entry['post_id']; |
|
| 683 | + $post_id = $this->entry[ 'post_id' ]; |
|
| 684 | 684 | |
| 685 | 685 | // Security check |
| 686 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 686 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 687 | 687 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
| 688 | 688 | return; |
| 689 | 689 | } |
@@ -696,25 +696,25 @@ discard block |
||
| 696 | 696 | |
| 697 | 697 | $field = RGFormsModel::get_field( $form, $field_id ); |
| 698 | 698 | |
| 699 | - if( ! $field ) { |
|
| 699 | + if ( ! $field ) { |
|
| 700 | 700 | continue; |
| 701 | 701 | } |
| 702 | 702 | |
| 703 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 703 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 704 | 704 | |
| 705 | 705 | // Get the value of the field, including $_POSTed value |
| 706 | 706 | $value = RGFormsModel::get_field_value( $field ); |
| 707 | 707 | |
| 708 | 708 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
| 709 | 709 | $entry_tmp = $this->entry; |
| 710 | - $entry_tmp["{$field_id}"] = $value; |
|
| 710 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
| 711 | 711 | |
| 712 | - switch( $field->type ) { |
|
| 712 | + switch ( $field->type ) { |
|
| 713 | 713 | |
| 714 | 714 | case 'post_title': |
| 715 | 715 | $post_title = $value; |
| 716 | 716 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
| 717 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 717 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
| 718 | 718 | } |
| 719 | 719 | $updated_post->post_title = $post_title; |
| 720 | 720 | $updated_post->post_name = $post_title; |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | case 'post_content': |
| 725 | 725 | $post_content = $value; |
| 726 | 726 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
| 727 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 727 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
| 728 | 728 | } |
| 729 | 729 | $updated_post->post_content = $post_content; |
| 730 | 730 | unset( $post_content ); |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | $value = $value[ $field_id ]; |
| 743 | 743 | } |
| 744 | 744 | |
| 745 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 745 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 746 | 746 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
| 747 | 747 | } |
| 748 | 748 | |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | } |
| 761 | 761 | |
| 762 | 762 | // update entry after |
| 763 | - $this->entry["{$field_id}"] = $value; |
|
| 763 | + $this->entry[ "{$field_id}" ] = $value; |
|
| 764 | 764 | |
| 765 | 765 | $update_entry = true; |
| 766 | 766 | |
@@ -769,11 +769,11 @@ discard block |
||
| 769 | 769 | |
| 770 | 770 | } |
| 771 | 771 | |
| 772 | - if( $update_entry ) { |
|
| 772 | + if ( $update_entry ) { |
|
| 773 | 773 | |
| 774 | 774 | $return_entry = GFAPI::update_entry( $this->entry ); |
| 775 | 775 | |
| 776 | - if( is_wp_error( $return_entry ) ) { |
|
| 776 | + if ( is_wp_error( $return_entry ) ) { |
|
| 777 | 777 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
| 778 | 778 | } else { |
| 779 | 779 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -783,7 +783,7 @@ discard block |
||
| 783 | 783 | |
| 784 | 784 | $return_post = wp_update_post( $updated_post, true ); |
| 785 | 785 | |
| 786 | - if( is_wp_error( $return_post ) ) { |
|
| 786 | + if ( is_wp_error( $return_post ) ) { |
|
| 787 | 787 | $return_post->add_data( $updated_post, '$updated_post' ); |
| 788 | 788 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
| 789 | 789 | } else { |
@@ -805,7 +805,7 @@ discard block |
||
| 805 | 805 | $input_type = RGFormsModel::get_input_type( $field ); |
| 806 | 806 | |
| 807 | 807 | // Only certain custom field types are supported |
| 808 | - switch( $input_type ) { |
|
| 808 | + switch ( $input_type ) { |
|
| 809 | 809 | case 'fileupload': |
| 810 | 810 | case 'list': |
| 811 | 811 | case 'multiselect': |
@@ -842,7 +842,7 @@ discard block |
||
| 842 | 842 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
| 843 | 843 | |
| 844 | 844 | // replace conditional shortcodes |
| 845 | - if( $do_shortcode ) { |
|
| 845 | + if ( $do_shortcode ) { |
|
| 846 | 846 | $output = do_shortcode( $output ); |
| 847 | 847 | } |
| 848 | 848 | |
@@ -861,19 +861,19 @@ discard block |
||
| 861 | 861 | */ |
| 862 | 862 | private function after_update() { |
| 863 | 863 | |
| 864 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
| 865 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
| 864 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 865 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 866 | 866 | |
| 867 | 867 | // Re-define the entry now that we've updated it. |
| 868 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
| 868 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
| 869 | 869 | |
| 870 | 870 | $entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
| 871 | 871 | |
| 872 | 872 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
| 873 | 873 | // We need to clear the cache because Gravity Forms caches the field values, which |
| 874 | 874 | // we have just updated. |
| 875 | - foreach ($this->form['fields'] as $key => $field) { |
|
| 876 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
| 875 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
| 876 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
| 877 | 877 | } |
| 878 | 878 | } |
| 879 | 879 | |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | |
| 893 | 893 | <div class="gv-edit-entry-wrapper"><?php |
| 894 | 894 | |
| 895 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
| 895 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
| 896 | 896 | |
| 897 | 897 | /** |
| 898 | 898 | * Fixes weird wpautop() issue |
@@ -908,7 +908,7 @@ discard block |
||
| 908 | 908 | * @param string $edit_entry_title Modify the "Edit Entry" title |
| 909 | 909 | * @param GravityView_Edit_Entry_Render $this This object |
| 910 | 910 | */ |
| 911 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 911 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
| 912 | 912 | |
| 913 | 913 | echo esc_attr( $edit_entry_title ); |
| 914 | 914 | ?></span> |
@@ -958,16 +958,16 @@ discard block |
||
| 958 | 958 | |
| 959 | 959 | $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) ); |
| 960 | 960 | |
| 961 | - if( ! $this->is_valid ){ |
|
| 961 | + if ( ! $this->is_valid ) { |
|
| 962 | 962 | |
| 963 | 963 | // Keeping this compatible with Gravity Forms. |
| 964 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
| 965 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
| 964 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
| 965 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
| 966 | 966 | |
| 967 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
| 967 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
| 968 | 968 | |
| 969 | 969 | } else { |
| 970 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' ); |
|
| 970 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' ); |
|
| 971 | 971 | |
| 972 | 972 | /** |
| 973 | 973 | * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link) |
@@ -977,7 +977,7 @@ discard block |
||
| 977 | 977 | * @param array $entry Gravity Forms entry array |
| 978 | 978 | * @param string $back_link URL to return to the original entry. @since 1.6 |
| 979 | 979 | */ |
| 980 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
| 980 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
| 981 | 981 | |
| 982 | 982 | echo GVCommon::generate_notice( $message ); |
| 983 | 983 | } |
@@ -1001,21 +1001,21 @@ discard block |
||
| 1001 | 1001 | */ |
| 1002 | 1002 | do_action( 'gravityview/edit-entry/render/before', $this ); |
| 1003 | 1003 | |
| 1004 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
| 1005 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
| 1004 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
| 1005 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
| 1006 | 1006 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
| 1007 | 1007 | |
| 1008 | 1008 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
| 1009 | 1009 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
| 1010 | 1010 | |
| 1011 | 1011 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
| 1012 | - unset( $_GET['page'] ); |
|
| 1012 | + unset( $_GET[ 'page' ] ); |
|
| 1013 | 1013 | |
| 1014 | 1014 | // TODO: Verify multiple-page forms |
| 1015 | 1015 | |
| 1016 | 1016 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
| 1017 | 1017 | |
| 1018 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
| 1018 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
| 1019 | 1019 | |
| 1020 | 1020 | ob_get_clean(); |
| 1021 | 1021 | |
@@ -1041,7 +1041,7 @@ discard block |
||
| 1041 | 1041 | * @return string |
| 1042 | 1042 | */ |
| 1043 | 1043 | public function render_form_buttons() { |
| 1044 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
| 1044 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | 1047 | |
@@ -1061,10 +1061,10 @@ discard block |
||
| 1061 | 1061 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
| 1062 | 1062 | |
| 1063 | 1063 | // In case we have validated the form, use it to inject the validation results into the form render |
| 1064 | - if( isset( $this->form_after_validation ) ) { |
|
| 1064 | + if ( isset( $this->form_after_validation ) ) { |
|
| 1065 | 1065 | $form = $this->form_after_validation; |
| 1066 | 1066 | } else { |
| 1067 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1067 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | 1070 | $form = $this->filter_conditional_logic( $form ); |
@@ -1072,8 +1072,8 @@ discard block |
||
| 1072 | 1072 | $form = $this->prefill_conditional_logic( $form ); |
| 1073 | 1073 | |
| 1074 | 1074 | // for now we don't support Save and Continue feature. |
| 1075 | - if( ! self::$supports_save_and_continue ) { |
|
| 1076 | - unset( $form['save'] ); |
|
| 1075 | + if ( ! self::$supports_save_and_continue ) { |
|
| 1076 | + unset( $form[ 'save' ] ); |
|
| 1077 | 1077 | } |
| 1078 | 1078 | |
| 1079 | 1079 | return $form; |
@@ -1094,29 +1094,29 @@ discard block |
||
| 1094 | 1094 | */ |
| 1095 | 1095 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
| 1096 | 1096 | |
| 1097 | - if( GFCommon::is_post_field( $field ) ) { |
|
| 1097 | + if ( GFCommon::is_post_field( $field ) ) { |
|
| 1098 | 1098 | |
| 1099 | 1099 | $message = null; |
| 1100 | 1100 | |
| 1101 | 1101 | // First, make sure they have the capability to edit the post. |
| 1102 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1102 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
| 1103 | 1103 | |
| 1104 | 1104 | /** |
| 1105 | 1105 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
| 1106 | 1106 | * @param string $message The existing "You don't have permission..." text |
| 1107 | 1107 | */ |
| 1108 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1108 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
| 1109 | 1109 | |
| 1110 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1110 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
| 1111 | 1111 | /** |
| 1112 | 1112 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
| 1113 | 1113 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
| 1114 | 1114 | */ |
| 1115 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1115 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1116 | 1116 | } |
| 1117 | 1117 | |
| 1118 | - if( $message ) { |
|
| 1119 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1118 | + if ( $message ) { |
|
| 1119 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1120 | 1120 | } |
| 1121 | 1121 | } |
| 1122 | 1122 | |
@@ -1141,8 +1141,8 @@ discard block |
||
| 1141 | 1141 | |
| 1142 | 1142 | // If the form has been submitted, then we don't need to pre-fill the values, |
| 1143 | 1143 | // Except for fileupload type and when a field input is overridden- run always!! |
| 1144 | - if( |
|
| 1145 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1144 | + if ( |
|
| 1145 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1146 | 1146 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
| 1147 | 1147 | && ! GFCommon::is_product_field( $field->type ) |
| 1148 | 1148 | || ! empty( $field_content ) |
@@ -1162,7 +1162,7 @@ discard block |
||
| 1162 | 1162 | $return = null; |
| 1163 | 1163 | |
| 1164 | 1164 | /** @var GravityView_Field $gv_field */ |
| 1165 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1165 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1166 | 1166 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1167 | 1167 | } else { |
| 1168 | 1168 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1171,7 +1171,7 @@ discard block |
||
| 1171 | 1171 | // If there was output, it's an error |
| 1172 | 1172 | $warnings = ob_get_clean(); |
| 1173 | 1173 | |
| 1174 | - if( !empty( $warnings ) ) { |
|
| 1174 | + if ( ! empty( $warnings ) ) { |
|
| 1175 | 1175 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
| 1176 | 1176 | } |
| 1177 | 1177 | |
@@ -1196,7 +1196,7 @@ discard block |
||
| 1196 | 1196 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
| 1197 | 1197 | |
| 1198 | 1198 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
| 1199 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1199 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1200 | 1200 | |
| 1201 | 1201 | $field_value = array(); |
| 1202 | 1202 | |
@@ -1205,10 +1205,10 @@ discard block |
||
| 1205 | 1205 | |
| 1206 | 1206 | foreach ( (array)$field->inputs as $input ) { |
| 1207 | 1207 | |
| 1208 | - $input_id = strval( $input['id'] ); |
|
| 1208 | + $input_id = strval( $input[ 'id' ] ); |
|
| 1209 | 1209 | |
| 1210 | 1210 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1211 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1211 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1212 | 1212 | $allow_pre_populated = false; |
| 1213 | 1213 | } |
| 1214 | 1214 | |
@@ -1216,7 +1216,7 @@ discard block |
||
| 1216 | 1216 | |
| 1217 | 1217 | $pre_value = $field->get_value_submission( array(), false ); |
| 1218 | 1218 | |
| 1219 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1219 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1220 | 1220 | |
| 1221 | 1221 | } else { |
| 1222 | 1222 | |
@@ -1227,13 +1227,13 @@ discard block |
||
| 1227 | 1227 | |
| 1228 | 1228 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
| 1229 | 1229 | // or pre-populated value if not empty and set to override saved value |
| 1230 | - $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; |
|
| 1230 | + $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; |
|
| 1231 | 1231 | |
| 1232 | 1232 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
| 1233 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
| 1233 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
| 1234 | 1234 | $categories = array(); |
| 1235 | 1235 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1236 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1236 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1237 | 1237 | } |
| 1238 | 1238 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1239 | 1239 | } |
@@ -1261,7 +1261,7 @@ discard block |
||
| 1261 | 1261 | * @param GF_Field $field Gravity Forms field object |
| 1262 | 1262 | * @param GravityView_Edit_Entry_Render $this Current object |
| 1263 | 1263 | */ |
| 1264 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1264 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
| 1265 | 1265 | |
| 1266 | 1266 | return $field_value; |
| 1267 | 1267 | } |
@@ -1278,12 +1278,12 @@ discard block |
||
| 1278 | 1278 | */ |
| 1279 | 1279 | public function gform_pre_validation( $form ) { |
| 1280 | 1280 | |
| 1281 | - if( ! $this->verify_nonce() ) { |
|
| 1281 | + if ( ! $this->verify_nonce() ) { |
|
| 1282 | 1282 | return $form; |
| 1283 | 1283 | } |
| 1284 | 1284 | |
| 1285 | 1285 | // Fix PHP warning regarding undefined index. |
| 1286 | - foreach ( $form['fields'] as &$field) { |
|
| 1286 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1287 | 1287 | |
| 1288 | 1288 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1289 | 1289 | // expects certain field array items to be set. |
@@ -1291,7 +1291,7 @@ discard block |
||
| 1291 | 1291 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
| 1292 | 1292 | } |
| 1293 | 1293 | |
| 1294 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
| 1294 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
| 1295 | 1295 | |
| 1296 | 1296 | /** |
| 1297 | 1297 | * 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. |
@@ -1305,26 +1305,26 @@ discard block |
||
| 1305 | 1305 | // Set the previous value |
| 1306 | 1306 | $entry = $this->get_entry(); |
| 1307 | 1307 | |
| 1308 | - $input_name = 'input_'.$field->id; |
|
| 1309 | - $form_id = $form['id']; |
|
| 1308 | + $input_name = 'input_' . $field->id; |
|
| 1309 | + $form_id = $form[ 'id' ]; |
|
| 1310 | 1310 | |
| 1311 | 1311 | $value = NULL; |
| 1312 | 1312 | |
| 1313 | 1313 | // Use the previous entry value as the default. |
| 1314 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1314 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1315 | 1315 | $value = $entry[ $field->id ]; |
| 1316 | 1316 | } |
| 1317 | 1317 | |
| 1318 | 1318 | // If this is a single upload file |
| 1319 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1320 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1321 | - $value = $file_path['url']; |
|
| 1319 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 1320 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
| 1321 | + $value = $file_path[ 'url' ]; |
|
| 1322 | 1322 | |
| 1323 | 1323 | } else { |
| 1324 | 1324 | |
| 1325 | 1325 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
| 1326 | 1326 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
| 1327 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1327 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
| 1328 | 1328 | |
| 1329 | 1329 | } |
| 1330 | 1330 | |
@@ -1332,10 +1332,10 @@ discard block |
||
| 1332 | 1332 | |
| 1333 | 1333 | // If there are fresh uploads, process and merge them. |
| 1334 | 1334 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
| 1335 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1335 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
| 1336 | 1336 | $value = empty( $value ) ? '[]' : $value; |
| 1337 | 1337 | $value = stripslashes_deep( $value ); |
| 1338 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1338 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
| 1339 | 1339 | } |
| 1340 | 1340 | |
| 1341 | 1341 | } else { |
@@ -1353,8 +1353,8 @@ discard block |
||
| 1353 | 1353 | |
| 1354 | 1354 | case 'number': |
| 1355 | 1355 | // Fix "undefined index" issue at line 1286 in form_display.php |
| 1356 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1357 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1356 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
| 1357 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
| 1358 | 1358 | } |
| 1359 | 1359 | break; |
| 1360 | 1360 | } |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | * You can enter whatever you want! |
| 1392 | 1392 | * We try validating, and customize the results using `self::custom_validation()` |
| 1393 | 1393 | */ |
| 1394 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
| 1394 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
| 1395 | 1395 | |
| 1396 | 1396 | // Needed by the validate funtion |
| 1397 | 1397 | $failed_validation_page = NULL; |
@@ -1399,14 +1399,14 @@ discard block |
||
| 1399 | 1399 | |
| 1400 | 1400 | // Prevent entry limit from running when editing an entry, also |
| 1401 | 1401 | // prevent form scheduling from preventing editing |
| 1402 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
| 1402 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
| 1403 | 1403 | |
| 1404 | 1404 | // Hide fields depending on Edit Entry settings |
| 1405 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1405 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1406 | 1406 | |
| 1407 | 1407 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
| 1408 | 1408 | |
| 1409 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1409 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1410 | 1410 | } |
| 1411 | 1411 | |
| 1412 | 1412 | |
@@ -1429,7 +1429,7 @@ discard block |
||
| 1429 | 1429 | |
| 1430 | 1430 | $gv_valid = true; |
| 1431 | 1431 | |
| 1432 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
| 1432 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
| 1433 | 1433 | |
| 1434 | 1434 | $value = RGFormsModel::get_field_value( $field ); |
| 1435 | 1435 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1442,35 +1442,35 @@ discard block |
||
| 1442 | 1442 | case 'post_image': |
| 1443 | 1443 | |
| 1444 | 1444 | // in case nothing is uploaded but there are already files saved |
| 1445 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1445 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
| 1446 | 1446 | $field->failed_validation = false; |
| 1447 | 1447 | unset( $field->validation_message ); |
| 1448 | 1448 | } |
| 1449 | 1449 | |
| 1450 | 1450 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
| 1451 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1451 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
| 1452 | 1452 | |
| 1453 | 1453 | $input_name = 'input_' . $field->id; |
| 1454 | 1454 | //uploaded |
| 1455 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1455 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
| 1456 | 1456 | |
| 1457 | 1457 | //existent |
| 1458 | 1458 | $entry = $this->get_entry(); |
| 1459 | 1459 | $value = NULL; |
| 1460 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1460 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1461 | 1461 | $value = json_decode( $entry[ $field->id ], true ); |
| 1462 | 1462 | } |
| 1463 | 1463 | |
| 1464 | 1464 | // count uploaded files and existent entry files |
| 1465 | 1465 | $count_files = count( $file_names ) + count( $value ); |
| 1466 | 1466 | |
| 1467 | - if( $count_files > $field->maxFiles ) { |
|
| 1467 | + if ( $count_files > $field->maxFiles ) { |
|
| 1468 | 1468 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
| 1469 | 1469 | $field->failed_validation = 1; |
| 1470 | 1470 | $gv_valid = false; |
| 1471 | 1471 | |
| 1472 | 1472 | // in case of error make sure the newest upload files are removed from the upload input |
| 1473 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1473 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
| 1474 | 1474 | } |
| 1475 | 1475 | |
| 1476 | 1476 | } |
@@ -1481,7 +1481,7 @@ discard block |
||
| 1481 | 1481 | } |
| 1482 | 1482 | |
| 1483 | 1483 | // This field has failed validation. |
| 1484 | - if( !empty( $field->failed_validation ) ) { |
|
| 1484 | + if ( ! empty( $field->failed_validation ) ) { |
|
| 1485 | 1485 | |
| 1486 | 1486 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
| 1487 | 1487 | |
@@ -1499,19 +1499,19 @@ discard block |
||
| 1499 | 1499 | } |
| 1500 | 1500 | |
| 1501 | 1501 | // You can't continue inside a switch, so we do it after. |
| 1502 | - if( empty( $field->failed_validation ) ) { |
|
| 1502 | + if ( empty( $field->failed_validation ) ) { |
|
| 1503 | 1503 | continue; |
| 1504 | 1504 | } |
| 1505 | 1505 | |
| 1506 | 1506 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1507 | 1507 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1508 | - if( !empty( $field->noDuplicates ) ) { |
|
| 1508 | + if ( ! empty( $field->noDuplicates ) ) { |
|
| 1509 | 1509 | |
| 1510 | 1510 | $entry = $this->get_entry(); |
| 1511 | 1511 | |
| 1512 | 1512 | // If the value of the entry is the same as the stored value |
| 1513 | 1513 | // Then we can assume it's not a duplicate, it's the same. |
| 1514 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1514 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1515 | 1515 | //if value submitted was not changed, then don't validate |
| 1516 | 1516 | $field->failed_validation = false; |
| 1517 | 1517 | |
@@ -1524,7 +1524,7 @@ discard block |
||
| 1524 | 1524 | } |
| 1525 | 1525 | |
| 1526 | 1526 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1527 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1527 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1528 | 1528 | unset( $field->validation_message ); |
| 1529 | 1529 | $field->validation_message = false; |
| 1530 | 1530 | continue; |
@@ -1536,12 +1536,12 @@ discard block |
||
| 1536 | 1536 | |
| 1537 | 1537 | } |
| 1538 | 1538 | |
| 1539 | - $validation_results['is_valid'] = $gv_valid; |
|
| 1539 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
| 1540 | 1540 | |
| 1541 | 1541 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
| 1542 | 1542 | |
| 1543 | 1543 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
| 1544 | - $this->form_after_validation = $validation_results['form']; |
|
| 1544 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
| 1545 | 1545 | |
| 1546 | 1546 | return $validation_results; |
| 1547 | 1547 | } |
@@ -1554,7 +1554,7 @@ discard block |
||
| 1554 | 1554 | */ |
| 1555 | 1555 | public function get_entry() { |
| 1556 | 1556 | |
| 1557 | - if( empty( $this->entry ) ) { |
|
| 1557 | + if ( empty( $this->entry ) ) { |
|
| 1558 | 1558 | // Get the database value of the entry that's being edited |
| 1559 | 1559 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
| 1560 | 1560 | } |
@@ -1586,10 +1586,10 @@ discard block |
||
| 1586 | 1586 | } |
| 1587 | 1587 | |
| 1588 | 1588 | // If edit tab not yet configured, show all fields |
| 1589 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
| 1589 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
| 1590 | 1590 | |
| 1591 | 1591 | // Hide fields depending on admin settings |
| 1592 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
| 1592 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
| 1593 | 1593 | |
| 1594 | 1594 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
| 1595 | 1595 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1621,7 +1621,7 @@ discard block |
||
| 1621 | 1621 | */ |
| 1622 | 1622 | private function filter_fields( $fields, $configured_fields ) { |
| 1623 | 1623 | |
| 1624 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
| 1624 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
| 1625 | 1625 | return $fields; |
| 1626 | 1626 | } |
| 1627 | 1627 | |
@@ -1634,18 +1634,18 @@ discard block |
||
| 1634 | 1634 | |
| 1635 | 1635 | // Remove the fields that have calculation properties and keep them to be used later |
| 1636 | 1636 | // @since 1.16.2 |
| 1637 | - if( $field->has_calculation() ) { |
|
| 1638 | - $this->fields_with_calculation[] = $field; |
|
| 1637 | + if ( $field->has_calculation() ) { |
|
| 1638 | + $this->fields_with_calculation[ ] = $field; |
|
| 1639 | 1639 | // don't remove the calculation fields on form render. |
| 1640 | 1640 | } |
| 1641 | 1641 | |
| 1642 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1642 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1643 | 1643 | unset( $fields[ $key ] ); |
| 1644 | 1644 | } |
| 1645 | 1645 | } |
| 1646 | 1646 | |
| 1647 | 1647 | // The Edit tab has not been configured, so we return all fields by default. |
| 1648 | - if( empty( $configured_fields ) ) { |
|
| 1648 | + if ( empty( $configured_fields ) ) { |
|
| 1649 | 1649 | return $fields; |
| 1650 | 1650 | } |
| 1651 | 1651 | |
@@ -1654,8 +1654,8 @@ discard block |
||
| 1654 | 1654 | |
| 1655 | 1655 | /** @var GF_Field $field */ |
| 1656 | 1656 | foreach ( $fields as $field ) { |
| 1657 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1658 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1657 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1658 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1659 | 1659 | break; |
| 1660 | 1660 | } |
| 1661 | 1661 | |
@@ -1678,14 +1678,14 @@ discard block |
||
| 1678 | 1678 | |
| 1679 | 1679 | $return_field = $field; |
| 1680 | 1680 | |
| 1681 | - if( empty( $field_setting['show_label'] ) ) { |
|
| 1681 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
| 1682 | 1682 | $return_field->label = ''; |
| 1683 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
| 1684 | - $return_field->label = $field_setting['custom_label']; |
|
| 1683 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
| 1684 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
| 1685 | 1685 | } |
| 1686 | 1686 | |
| 1687 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
| 1688 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
| 1687 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
| 1688 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
| 1689 | 1689 | } |
| 1690 | 1690 | |
| 1691 | 1691 | /** |
@@ -1723,16 +1723,16 @@ discard block |
||
| 1723 | 1723 | */ |
| 1724 | 1724 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
| 1725 | 1725 | |
| 1726 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1727 | - foreach( $fields as $k => $field ) { |
|
| 1728 | - if( $field->adminOnly ) { |
|
| 1726 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
| 1727 | + foreach ( $fields as $k => $field ) { |
|
| 1728 | + if ( $field->adminOnly ) { |
|
| 1729 | 1729 | unset( $fields[ $k ] ); |
| 1730 | 1730 | } |
| 1731 | 1731 | } |
| 1732 | 1732 | return $fields; |
| 1733 | 1733 | } |
| 1734 | 1734 | |
| 1735 | - foreach( $fields as &$field ) { |
|
| 1735 | + foreach ( $fields as &$field ) { |
|
| 1736 | 1736 | $field->adminOnly = false; |
| 1737 | 1737 | } |
| 1738 | 1738 | |
@@ -1756,22 +1756,22 @@ discard block |
||
| 1756 | 1756 | */ |
| 1757 | 1757 | function prefill_conditional_logic( $form ) { |
| 1758 | 1758 | |
| 1759 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1759 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1760 | 1760 | return $form; |
| 1761 | 1761 | } |
| 1762 | 1762 | |
| 1763 | 1763 | // Have Conditional Logic pre-fill fields as if the data were default values |
| 1764 | 1764 | /** @var GF_Field $field */ |
| 1765 | - foreach ( $form['fields'] as &$field ) { |
|
| 1765 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1766 | 1766 | |
| 1767 | - if( 'checkbox' === $field->type ) { |
|
| 1767 | + if ( 'checkbox' === $field->type ) { |
|
| 1768 | 1768 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1769 | - $input_id = $input['id']; |
|
| 1769 | + $input_id = $input[ 'id' ]; |
|
| 1770 | 1770 | $choice = $field->choices[ $key ]; |
| 1771 | 1771 | $value = \GV\Utils::get( $this->entry, $input_id ); |
| 1772 | 1772 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
| 1773 | - if( $match ) { |
|
| 1774 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1773 | + if ( $match ) { |
|
| 1774 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
| 1775 | 1775 | } |
| 1776 | 1776 | } |
| 1777 | 1777 | } else { |
@@ -1779,15 +1779,15 @@ discard block |
||
| 1779 | 1779 | // We need to run through each field to set the default values |
| 1780 | 1780 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1781 | 1781 | |
| 1782 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1782 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1783 | 1783 | |
| 1784 | - if( 'list' === $field->type ) { |
|
| 1784 | + if ( 'list' === $field->type ) { |
|
| 1785 | 1785 | $list_rows = maybe_unserialize( $field_value ); |
| 1786 | 1786 | |
| 1787 | 1787 | $list_field_value = array(); |
| 1788 | - foreach ( (array) $list_rows as $row ) { |
|
| 1789 | - foreach ( (array) $row as $column ) { |
|
| 1790 | - $list_field_value[] = $column; |
|
| 1788 | + foreach ( (array)$list_rows as $row ) { |
|
| 1789 | + foreach ( (array)$row as $column ) { |
|
| 1790 | + $list_field_value[ ] = $column; |
|
| 1791 | 1791 | } |
| 1792 | 1792 | } |
| 1793 | 1793 | |
@@ -1822,16 +1822,16 @@ discard block |
||
| 1822 | 1822 | */ |
| 1823 | 1823 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
| 1824 | 1824 | |
| 1825 | - if( $use_conditional_logic ) { |
|
| 1825 | + if ( $use_conditional_logic ) { |
|
| 1826 | 1826 | return $form; |
| 1827 | 1827 | } |
| 1828 | 1828 | |
| 1829 | - foreach( $form['fields'] as &$field ) { |
|
| 1829 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1830 | 1830 | /* @var GF_Field $field */ |
| 1831 | 1831 | $field->conditionalLogic = null; |
| 1832 | 1832 | } |
| 1833 | 1833 | |
| 1834 | - unset( $form['button']['conditionalLogic'] ); |
|
| 1834 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
| 1835 | 1835 | |
| 1836 | 1836 | return $form; |
| 1837 | 1837 | |
@@ -1848,7 +1848,7 @@ discard block |
||
| 1848 | 1848 | */ |
| 1849 | 1849 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
| 1850 | 1850 | |
| 1851 | - if( ! $this->is_edit_entry() ) { |
|
| 1851 | + if ( ! $this->is_edit_entry() ) { |
|
| 1852 | 1852 | return $has_conditional_logic; |
| 1853 | 1853 | } |
| 1854 | 1854 | |
@@ -1880,44 +1880,44 @@ discard block |
||
| 1880 | 1880 | * 2. There are two entries embedded using oEmbed |
| 1881 | 1881 | * 3. One of the entries has just been saved |
| 1882 | 1882 | */ |
| 1883 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
| 1883 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
| 1884 | 1884 | |
| 1885 | 1885 | $error = true; |
| 1886 | 1886 | |
| 1887 | 1887 | } |
| 1888 | 1888 | |
| 1889 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
| 1889 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
| 1890 | 1890 | |
| 1891 | 1891 | $error = true; |
| 1892 | 1892 | |
| 1893 | - } elseif( ! $this->verify_nonce() ) { |
|
| 1893 | + } elseif ( ! $this->verify_nonce() ) { |
|
| 1894 | 1894 | |
| 1895 | 1895 | /** |
| 1896 | 1896 | * If the Entry is embedded, there may be two entries on the same page. |
| 1897 | 1897 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
| 1898 | 1898 | */ |
| 1899 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 1899 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 1900 | 1900 | $error = true; |
| 1901 | 1901 | } else { |
| 1902 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
| 1902 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 1903 | 1903 | } |
| 1904 | 1904 | |
| 1905 | 1905 | } |
| 1906 | 1906 | |
| 1907 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 1908 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
| 1907 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 1908 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
| 1909 | 1909 | } |
| 1910 | 1910 | |
| 1911 | - if( $this->entry['status'] === 'trash' ) { |
|
| 1912 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 1911 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
| 1912 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 1913 | 1913 | } |
| 1914 | 1914 | |
| 1915 | 1915 | // No errors; everything's fine here! |
| 1916 | - if( empty( $error ) ) { |
|
| 1916 | + if ( empty( $error ) ) { |
|
| 1917 | 1917 | return true; |
| 1918 | 1918 | } |
| 1919 | 1919 | |
| 1920 | - if( $echo && $error !== true ) { |
|
| 1920 | + if ( $echo && $error !== true ) { |
|
| 1921 | 1921 | |
| 1922 | 1922 | $error = esc_html( $error ); |
| 1923 | 1923 | |
@@ -1925,10 +1925,10 @@ discard block |
||
| 1925 | 1925 | * @since 1.9 |
| 1926 | 1926 | */ |
| 1927 | 1927 | if ( ! empty( $this->entry ) ) { |
| 1928 | - $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;" ) ); |
|
| 1928 | + $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;" ) ); |
|
| 1929 | 1929 | } |
| 1930 | 1930 | |
| 1931 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
| 1931 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
| 1932 | 1932 | } |
| 1933 | 1933 | |
| 1934 | 1934 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -1948,17 +1948,17 @@ discard block |
||
| 1948 | 1948 | |
| 1949 | 1949 | $error = NULL; |
| 1950 | 1950 | |
| 1951 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 1952 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
| 1951 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 1952 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
| 1953 | 1953 | } |
| 1954 | 1954 | |
| 1955 | 1955 | // No errors; everything's fine here! |
| 1956 | - if( empty( $error ) ) { |
|
| 1956 | + if ( empty( $error ) ) { |
|
| 1957 | 1957 | return true; |
| 1958 | 1958 | } |
| 1959 | 1959 | |
| 1960 | - if( $echo ) { |
|
| 1961 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
| 1960 | + if ( $echo ) { |
|
| 1961 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
| 1962 | 1962 | } |
| 1963 | 1963 | |
| 1964 | 1964 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -1979,14 +1979,14 @@ discard block |
||
| 1979 | 1979 | private function check_user_cap_edit_field( $field ) { |
| 1980 | 1980 | |
| 1981 | 1981 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
| 1982 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 1982 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 1983 | 1983 | return true; |
| 1984 | 1984 | } |
| 1985 | 1985 | |
| 1986 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
| 1986 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
| 1987 | 1987 | |
| 1988 | - if( $field_cap ) { |
|
| 1989 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
| 1988 | + if ( $field_cap ) { |
|
| 1989 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
| 1990 | 1990 | } |
| 1991 | 1991 | |
| 1992 | 1992 | return false; |
@@ -2000,17 +2000,17 @@ discard block |
||
| 2000 | 2000 | public function verify_nonce() { |
| 2001 | 2001 | |
| 2002 | 2002 | // Verify form submitted for editing single |
| 2003 | - if( $this->is_edit_entry_submission() ) { |
|
| 2003 | + if ( $this->is_edit_entry_submission() ) { |
|
| 2004 | 2004 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
| 2005 | 2005 | } |
| 2006 | 2006 | |
| 2007 | 2007 | // Verify |
| 2008 | - else if( ! $this->is_edit_entry() ) { |
|
| 2008 | + else if ( ! $this->is_edit_entry() ) { |
|
| 2009 | 2009 | $valid = false; |
| 2010 | 2010 | } |
| 2011 | 2011 | |
| 2012 | 2012 | else { |
| 2013 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
| 2013 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
| 2014 | 2014 | } |
| 2015 | 2015 | |
| 2016 | 2016 | /** |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | abstract class GravityView_Extension extends \GV\Extension { |
| 16 | 16 | public function __construct() { |
| 17 | - if( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
| 17 | + if ( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
| 18 | 18 | gravityview()->log->warning( '\GravityView_Extension is deprecated. Inherit from \GV\Extension instead', array( 'data' => $this ) ); |
| 19 | 19 | } |
| 20 | 20 | parent::__construct(); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public function add_admin_menu() { |
| 97 | 97 | |
| 98 | - $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
| 98 | + $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
| 99 | 99 | |
| 100 | 100 | $menu_text = sprintf( '<span title="%s">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text ); |
| 101 | 101 | |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | - * When on the Installer page, show a different notice than on the Settings page |
|
| 114 | - * |
|
| 113 | + * When on the Installer page, show a different notice than on the Settings page |
|
| 114 | + * |
|
| 115 | 115 | * @param array $notice |
| 116 | 116 | * |
| 117 | 117 | * @return string License notice |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | public function maybe_modify_license_notice( $notice = '' ) { |
| 120 | 120 | |
| 121 | 121 | if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) { |
| 122 | - return $notice; |
|
| 123 | - } |
|
| 122 | + return $notice; |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
| 125 | + return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | /** |
@@ -160,43 +160,43 @@ discard block |
||
| 160 | 160 | * Get downloads data from transient or from API; save transient after getting data from API |
| 161 | 161 | * |
| 162 | 162 | * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: { |
| 163 | - * @type array $info { |
|
| 164 | - * @type string $id int 17 |
|
| 165 | - * @type string $slug Extension slug |
|
| 166 | - * @type string $title Extension title |
|
| 167 | - * @type string $create_date in '2018-07-19 20:03:10' format |
|
| 168 | - * @type string $modified_date |
|
| 169 | - * @type string $status |
|
| 170 | - * @type string $link URL to public plugin page |
|
| 171 | - * @type string $content |
|
| 172 | - * @type string $excerpt |
|
| 173 | - * @type string $thumbnail URL to thumbnail |
|
| 174 | - * @type array $category Taxonomy details for the plugin's category { |
|
| 175 | - * @type int $term_id => int 30 |
|
| 176 | - * @type string $name => string 'Plugins' (length=7) |
|
| 177 | - * @type string $slug => string 'plugins' (length=7) |
|
| 178 | - * @type int $term_group => int 0 |
|
| 179 | - * @type int $term_taxonomy_id => int 30 |
|
| 180 | - * @type string $taxonomy => string 'download_category' (length=17) |
|
| 181 | - * @type string $description => string '' (length=0) |
|
| 182 | - * @type int $parent => int 0 |
|
| 183 | - * @type int $count => int 4 |
|
| 184 | - * @type string $filter => string 'raw' (length=3) |
|
| 185 | - * } |
|
| 186 | - * @type array $tags {see $category above} |
|
| 187 | - * @type string $textdomain string 'gravityview' (length=11) |
|
| 188 | - * } |
|
| 189 | - * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
| 190 | - * @type array $licensing { |
|
| 191 | - * @type bool $enabled Is licensing enabled for the extension |
|
| 192 | - * @type string $version Version number |
|
| 193 | - * @type string $exp_unit Expiration unit ('years') |
|
| 194 | - * @type string $exp_length Expiration length ('1') |
|
| 195 | - * } |
|
| 196 | - * @type array $files Array of files. Empty if user has no access to the file. { |
|
| 197 | - * @type string $file string URL of the file download |
|
| 198 | - * } |
|
| 199 | - * } |
|
| 163 | + * @type array $info { |
|
| 164 | + * @type string $id int 17 |
|
| 165 | + * @type string $slug Extension slug |
|
| 166 | + * @type string $title Extension title |
|
| 167 | + * @type string $create_date in '2018-07-19 20:03:10' format |
|
| 168 | + * @type string $modified_date |
|
| 169 | + * @type string $status |
|
| 170 | + * @type string $link URL to public plugin page |
|
| 171 | + * @type string $content |
|
| 172 | + * @type string $excerpt |
|
| 173 | + * @type string $thumbnail URL to thumbnail |
|
| 174 | + * @type array $category Taxonomy details for the plugin's category { |
|
| 175 | + * @type int $term_id => int 30 |
|
| 176 | + * @type string $name => string 'Plugins' (length=7) |
|
| 177 | + * @type string $slug => string 'plugins' (length=7) |
|
| 178 | + * @type int $term_group => int 0 |
|
| 179 | + * @type int $term_taxonomy_id => int 30 |
|
| 180 | + * @type string $taxonomy => string 'download_category' (length=17) |
|
| 181 | + * @type string $description => string '' (length=0) |
|
| 182 | + * @type int $parent => int 0 |
|
| 183 | + * @type int $count => int 4 |
|
| 184 | + * @type string $filter => string 'raw' (length=3) |
|
| 185 | + * } |
|
| 186 | + * @type array $tags {see $category above} |
|
| 187 | + * @type string $textdomain string 'gravityview' (length=11) |
|
| 188 | + * } |
|
| 189 | + * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
| 190 | + * @type array $licensing { |
|
| 191 | + * @type bool $enabled Is licensing enabled for the extension |
|
| 192 | + * @type string $version Version number |
|
| 193 | + * @type string $exp_unit Expiration unit ('years') |
|
| 194 | + * @type string $exp_length Expiration length ('1') |
|
| 195 | + * } |
|
| 196 | + * @type array $files Array of files. Empty if user has no access to the file. { |
|
| 197 | + * @type string $file string URL of the file download |
|
| 198 | + * } |
|
| 199 | + * } |
|
| 200 | 200 | */ |
| 201 | 201 | public function get_downloads_data() { |
| 202 | 202 | |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | ) ); |
| 225 | 225 | |
| 226 | 226 | if ( is_wp_error( $response ) ) { |
| 227 | - gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
| 227 | + gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
| 228 | 228 | return $response; |
| 229 | 229 | } |
| 230 | 230 | |
@@ -277,10 +277,10 @@ discard block |
||
| 277 | 277 | <div class="gv-admin-installer-notice notice inline error"> |
| 278 | 278 | <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3> |
| 279 | 279 | <?php |
| 280 | - if ( is_wp_error( $downloads_data ) ) { |
|
| 281 | - echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
| 282 | - } |
|
| 283 | - ?> |
|
| 280 | + if ( is_wp_error( $downloads_data ) ) { |
|
| 281 | + echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
| 282 | + } |
|
| 283 | + ?> |
|
| 284 | 284 | </div> |
| 285 | 285 | </div> |
| 286 | 286 | <?php |
@@ -336,9 +336,9 @@ discard block |
||
| 336 | 336 | protected function render_download( $download, $wp_plugins ) { |
| 337 | 337 | |
| 338 | 338 | |
| 339 | - $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
| 339 | + $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
| 340 | 340 | |
| 341 | - $download_info = $details['download_info']; |
|
| 341 | + $download_info = $details['download_info']; |
|
| 342 | 342 | |
| 343 | 343 | ?> |
| 344 | 344 | <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
@@ -360,43 +360,43 @@ discard block |
||
| 360 | 360 | |
| 361 | 361 | <div class="addon-excerpt"><?php |
| 362 | 362 | |
| 363 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
| 363 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
| 364 | 364 | |
| 365 | - // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
| 366 | - $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
| 367 | - $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
| 365 | + // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
| 366 | + $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
| 367 | + $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
| 368 | 368 | |
| 369 | - $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
| 370 | - $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
| 369 | + $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
| 370 | + $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
| 371 | 371 | $excerpt = str_replace( $replacements, $tags, $excerpt ); |
| 372 | 372 | |
| 373 | 373 | echo wpautop( $excerpt ); |
| 374 | - ?></div> |
|
| 374 | + ?></div> |
|
| 375 | 375 | </div> |
| 376 | 376 | </div> |
| 377 | 377 | <?php |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | /** |
| 381 | - * Generates details array for the download to keep the render_download() method a bit tidier |
|
| 382 | - * |
|
| 381 | + * Generates details array for the download to keep the render_download() method a bit tidier |
|
| 382 | + * |
|
| 383 | 383 | * @param array $download Single download, as returned by {@see get_downloads_data} |
| 384 | 384 | * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()} |
| 385 | 385 | * |
| 386 | 386 | * @return array { |
| 387 | - * @type array $download_info |
|
| 388 | - * @type string $plugin_path |
|
| 389 | - * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
| 390 | - * @type string $status_label |
|
| 391 | - * @type string $button_title Title attribute to show when hovering over the download's button |
|
| 392 | - * @type string $button_class CSS class to use for the button |
|
| 393 | - * @type string $button_label Text to use for the download's anchor link |
|
| 394 | - * @type string $href URL for the download's button |
|
| 395 | - * @type bool $spinner Whether to show the spinner icon |
|
| 396 | - * @type string $item_class CSS class for the download container |
|
| 397 | - * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
| 398 | - * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
| 399 | - * } |
|
| 387 | + * @type array $download_info |
|
| 388 | + * @type string $plugin_path |
|
| 389 | + * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
| 390 | + * @type string $status_label |
|
| 391 | + * @type string $button_title Title attribute to show when hovering over the download's button |
|
| 392 | + * @type string $button_class CSS class to use for the button |
|
| 393 | + * @type string $button_label Text to use for the download's anchor link |
|
| 394 | + * @type string $href URL for the download's button |
|
| 395 | + * @type bool $spinner Whether to show the spinner icon |
|
| 396 | + * @type string $item_class CSS class for the download container |
|
| 397 | + * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
| 398 | + * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
| 399 | + * } |
|
| 400 | 400 | */ |
| 401 | 401 | private function get_download_display_details( $download, $wp_plugins ) { |
| 402 | 402 | |
@@ -487,18 +487,18 @@ discard block |
||
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
| 490 | - } |
|
| 490 | + } |
|
| 491 | 491 | |
| 492 | 492 | /** |
| 493 | - * Returns the base price for an extension |
|
| 494 | - * |
|
| 493 | + * Returns the base price for an extension |
|
| 494 | + * |
|
| 495 | 495 | * @param array $download |
| 496 | 496 | * |
| 497 | 497 | * @return float Base price for an extension. If not for sale separately, returns 0 |
| 498 | 498 | */ |
| 499 | 499 | private function get_download_base_price( $download ) { |
| 500 | 500 | |
| 501 | - $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
| 501 | + $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
| 502 | 502 | $base_price = \GFCommon::to_number( $base_price ); |
| 503 | 503 | |
| 504 | 504 | unset( $download['pricing']['amount'] ); |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | } |
| 510 | 510 | |
| 511 | 511 | return floatval( $base_price ); |
| 512 | - } |
|
| 512 | + } |
|
| 513 | 513 | |
| 514 | 514 | /** |
| 515 | 515 | * Handle AJAX request to activate extension |
@@ -527,8 +527,8 @@ discard block |
||
| 527 | 527 | |
| 528 | 528 | if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
| 529 | 529 | wp_send_json_error( array( |
| 530 | - 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
| 531 | - ) ); |
|
| 530 | + 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
| 531 | + ) ); |
|
| 532 | 532 | } |
| 533 | 533 | |
| 534 | 534 | wp_send_json_success(); |
@@ -549,10 +549,10 @@ discard block |
||
| 549 | 549 | deactivate_plugins( $data['path'] ); |
| 550 | 550 | |
| 551 | 551 | if( is_plugin_active( $data['path'] ) ) { |
| 552 | - wp_send_json_error( array( |
|
| 553 | - 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
| 554 | - ) ); |
|
| 555 | - } |
|
| 552 | + wp_send_json_error( array( |
|
| 553 | + 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
| 554 | + ) ); |
|
| 555 | + } |
|
| 556 | 556 | |
| 557 | 557 | wp_send_json_success(); |
| 558 | 558 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function register_noconflict( $items ) { |
| 55 | 55 | |
| 56 | - $items[] = 'gravityview-admin-installer'; |
|
| 56 | + $items[ ] = 'gravityview-admin-installer'; |
|
| 57 | 57 | |
| 58 | 58 | return $items; |
| 59 | 59 | } |
@@ -70,17 +70,17 @@ discard block |
||
| 70 | 70 | return; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - add_filter( 'plugins_api', function ( $data, $action, $args ) use ( $downloads_data ) { |
|
| 73 | + add_filter( 'plugins_api', function( $data, $action, $args ) use ( $downloads_data ) { |
|
| 74 | 74 | foreach ( $downloads_data as $extension ) { |
| 75 | - if ( empty( $extension['info'] ) || empty( $args->slug ) || $args->slug !== $extension['info']['slug'] ) { |
|
| 75 | + if ( empty( $extension[ 'info' ] ) || empty( $args->slug ) || $args->slug !== $extension[ 'info' ][ 'slug' ] ) { |
|
| 76 | 76 | continue; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - return (object) array( |
|
| 80 | - 'slug' => $extension['info']['slug'], |
|
| 81 | - 'name' => $extension['info']['title'], |
|
| 82 | - 'version' => $extension['licensing']['version'], |
|
| 83 | - 'download_link' => $extension['files'][0]['file'], |
|
| 79 | + return (object)array( |
|
| 80 | + 'slug' => $extension[ 'info' ][ 'slug' ], |
|
| 81 | + 'name' => $extension[ 'info' ][ 'title' ], |
|
| 82 | + 'version' => $extension[ 'licensing' ][ 'version' ], |
|
| 83 | + 'download_link' => $extension[ 'files' ][ 0 ][ 'file' ], |
|
| 84 | 84 | ); |
| 85 | 85 | } |
| 86 | 86 | |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | foreach ( $all_plugins as $path => $plugin ) { |
| 144 | 144 | |
| 145 | - if ( empty( $plugin['TextDomain'] ) ) { |
|
| 145 | + if ( empty( $plugin[ 'TextDomain' ] ) ) { |
|
| 146 | 146 | continue; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - $wp_plugins[ $plugin['TextDomain'] ] = array( |
|
| 149 | + $wp_plugins[ $plugin[ 'TextDomain' ] ] = array( |
|
| 150 | 150 | 'path' => $path, |
| 151 | - 'version' => $plugin['Version'], |
|
| 151 | + 'version' => $plugin[ 'Version' ], |
|
| 152 | 152 | 'activated' => is_plugin_active( $path ) |
| 153 | 153 | ); |
| 154 | 154 | } |
@@ -230,13 +230,13 @@ discard block |
||
| 230 | 230 | |
| 231 | 231 | $downloads_data = json_decode( wp_remote_retrieve_body( $response ), true ); |
| 232 | 232 | |
| 233 | - if ( empty( $downloads_data['products'] ) ) { |
|
| 233 | + if ( empty( $downloads_data[ 'products' ] ) ) { |
|
| 234 | 234 | return array(); |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - $this->set_downloads_data( $downloads_data['products'] ); |
|
| 237 | + $this->set_downloads_data( $downloads_data[ 'products' ] ); |
|
| 238 | 238 | |
| 239 | - return $downloads_data['products']; |
|
| 239 | + return $downloads_data[ 'products' ]; |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | /** |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | |
| 310 | 310 | foreach ( $downloads_data as $extension ) { |
| 311 | 311 | |
| 312 | - if ( empty( $extension['info'] ) ) { |
|
| 312 | + if ( empty( $extension[ 'info' ] ) ) { |
|
| 313 | 313 | continue; |
| 314 | 314 | } |
| 315 | 315 | |
@@ -338,29 +338,29 @@ discard block |
||
| 338 | 338 | |
| 339 | 339 | $details = $this->get_download_display_details( $download, $wp_plugins ); |
| 340 | 340 | |
| 341 | - $download_info = $details['download_info']; |
|
| 341 | + $download_info = $details[ 'download_info' ]; |
|
| 342 | 342 | |
| 343 | 343 | ?> |
| 344 | - <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
|
| 344 | + <div class="item <?php echo esc_attr( $details[ 'item_class' ] ); ?>"> |
|
| 345 | 345 | <div class="addon-inner"> |
| 346 | - <a href="<?php echo esc_url( $download_info['link'] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info['thumbnail'] ); ?>" alt="" /></a> |
|
| 347 | - <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info['title'] ) ); ?></h3> |
|
| 346 | + <a href="<?php echo esc_url( $download_info[ 'link' ] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info[ 'thumbnail' ] ); ?>" alt="" /></a> |
|
| 347 | + <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info[ 'title' ] ) ); ?></h3> |
|
| 348 | 348 | <div> |
| 349 | - <?php if( $details['status_label'] ) { ?> |
|
| 350 | - <div class="status <?php echo esc_attr( $details['status'] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details['status_label'] ) ); ?>"> |
|
| 351 | - <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details['status_label'] ); ?></span> |
|
| 349 | + <?php if ( $details[ 'status_label' ] ) { ?> |
|
| 350 | + <div class="status <?php echo esc_attr( $details[ 'status' ] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details[ 'status_label' ] ) ); ?>"> |
|
| 351 | + <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details[ 'status_label' ] ); ?></span> |
|
| 352 | 352 | </div> |
| 353 | 353 | <?php } ?> |
| 354 | 354 | |
| 355 | - <a data-status="<?php echo esc_attr( $details['status'] ); ?>" data-plugin-path="<?php echo esc_attr( $details['plugin_path'] ); ?>" href="<?php echo esc_url( $details['href'] ); ?>" class="button <?php echo esc_attr( $details['button_class'] ); ?>" title="<?php echo esc_attr( $details['button_title'] ); ?>"> |
|
| 356 | - <span class="title"><?php echo esc_html( $details['button_label'] ); ?></span> |
|
| 357 | - <?php if( $details['spinner'] ) { ?><span class="spinner"></span><?php } ?> |
|
| 355 | + <a data-status="<?php echo esc_attr( $details[ 'status' ] ); ?>" data-plugin-path="<?php echo esc_attr( $details[ 'plugin_path' ] ); ?>" href="<?php echo esc_url( $details[ 'href' ] ); ?>" class="button <?php echo esc_attr( $details[ 'button_class' ] ); ?>" title="<?php echo esc_attr( $details[ 'button_title' ] ); ?>"> |
|
| 356 | + <span class="title"><?php echo esc_html( $details[ 'button_label' ] ); ?></span> |
|
| 357 | + <?php if ( $details[ 'spinner' ] ) { ?><span class="spinner"></span><?php } ?> |
|
| 358 | 358 | </a> |
| 359 | 359 | </div> |
| 360 | 360 | |
| 361 | 361 | <div class="addon-excerpt"><?php |
| 362 | 362 | |
| 363 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
| 363 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info[ 'excerpt' ] ); |
|
| 364 | 364 | |
| 365 | 365 | // Allow some pure HTML tags, but remove everything else from the excerpt. |
| 366 | 366 | $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | */ |
| 401 | 401 | private function get_download_display_details( $download, $wp_plugins ) { |
| 402 | 402 | |
| 403 | - $download_info = wp_parse_args( (array) $download['info'], array( |
|
| 403 | + $download_info = wp_parse_args( (array)$download[ 'info' ], array( |
|
| 404 | 404 | 'thumbnail' => '', |
| 405 | 405 | 'title' => '', |
| 406 | 406 | 'textdomain' => '', |
@@ -411,9 +411,9 @@ discard block |
||
| 411 | 411 | 'installer_excerpt' => null, // May not be defined |
| 412 | 412 | ) ); |
| 413 | 413 | |
| 414 | - $wp_plugin = \GV\Utils::get( $wp_plugins, $download_info['textdomain'], false ); |
|
| 414 | + $wp_plugin = \GV\Utils::get( $wp_plugins, $download_info[ 'textdomain' ], false ); |
|
| 415 | 415 | |
| 416 | - $has_access = ! empty( $download['files'] ); |
|
| 416 | + $has_access = ! empty( $download[ 'files' ] ); |
|
| 417 | 417 | $spinner = true; |
| 418 | 418 | $href = $plugin_path = '#'; |
| 419 | 419 | $status = $item_class = $button_title = $button_class = ''; |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | $required_license = $galactic_only ? __( 'All Access', 'gravityview' ) : __( 'Core + Extensions', 'gravityview' ); |
| 424 | 424 | |
| 425 | 425 | // The license is not active - no matter what level, this should not work |
| 426 | - if( ! $is_active && empty( $base_price ) ) { |
|
| 426 | + if ( ! $is_active && empty( $base_price ) ) { |
|
| 427 | 427 | $spinner = false; |
| 428 | 428 | $button_class = 'disabled disabled-license'; |
| 429 | 429 | $button_label = sprintf( __( 'Active %s License is Required.', 'gravityview' ), $required_license ); |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $status_label = ''; |
| 436 | 436 | $button_label = sprintf( __( 'Purchase Now for %s', 'gravityview' ), '$' . $base_price ); |
| 437 | 437 | $button_class = 'button-primary button-large'; |
| 438 | - $href = $download_info['link']; |
|
| 438 | + $href = $download_info[ 'link' ]; |
|
| 439 | 439 | $item_class = 'featured'; |
| 440 | 440 | } |
| 441 | 441 | |
@@ -454,8 +454,8 @@ discard block |
||
| 454 | 454 | $href = add_query_arg( |
| 455 | 455 | array( |
| 456 | 456 | 'action' => 'install-plugin', |
| 457 | - 'plugin' => $download_info['slug'], |
|
| 458 | - '_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info['slug'] ), |
|
| 457 | + 'plugin' => $download_info[ 'slug' ], |
|
| 458 | + '_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info[ 'slug' ] ), |
|
| 459 | 459 | ), |
| 460 | 460 | self_admin_url( 'update.php' ) |
| 461 | 461 | ); |
@@ -467,26 +467,26 @@ discard block |
||
| 467 | 467 | } |
| 468 | 468 | |
| 469 | 469 | // Access and the plugin is installed but not active |
| 470 | - else if ( false === $wp_plugin['activated'] ) { |
|
| 470 | + else if ( false === $wp_plugin[ 'activated' ] ) { |
|
| 471 | 471 | |
| 472 | 472 | $status = 'inactive'; |
| 473 | 473 | $status_label = __( 'Inactive', 'gravityview' ); |
| 474 | 474 | $button_label = __( 'Activate', 'gravityview' ); |
| 475 | - $plugin_path = $wp_plugin['path']; |
|
| 475 | + $plugin_path = $wp_plugin[ 'path' ]; |
|
| 476 | 476 | |
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | // Access and the plugin is installed and active |
| 480 | 480 | else { |
| 481 | 481 | |
| 482 | - $plugin_path = $wp_plugin['path']; |
|
| 482 | + $plugin_path = $wp_plugin[ 'path' ]; |
|
| 483 | 483 | $status = 'active'; |
| 484 | 484 | $status_label = __( 'Active', 'gravityview' ); |
| 485 | 485 | $button_label = __( 'Deactivate', 'gravityview' ); |
| 486 | 486 | |
| 487 | 487 | } |
| 488 | 488 | |
| 489 | - return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
|
| 489 | + return compact( 'download_info', 'plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | /** |
@@ -501,11 +501,11 @@ discard block |
||
| 501 | 501 | $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
| 502 | 502 | $base_price = \GFCommon::to_number( $base_price ); |
| 503 | 503 | |
| 504 | - unset( $download['pricing']['amount'] ); |
|
| 504 | + unset( $download[ 'pricing' ][ 'amount' ] ); |
|
| 505 | 505 | |
| 506 | 506 | // Price options array, not single price |
| 507 | - if ( ! $base_price && ! empty( $download['pricing'] ) ) { |
|
| 508 | - $base_price = array_shift( $download['pricing'] ); |
|
| 507 | + if ( ! $base_price && ! empty( $download[ 'pricing' ] ) ) { |
|
| 508 | + $base_price = array_shift( $download[ 'pricing' ] ); |
|
| 509 | 509 | } |
| 510 | 510 | |
| 511 | 511 | return floatval( $base_price ); |
@@ -519,13 +519,13 @@ discard block |
||
| 519 | 519 | public function activate_download() { |
| 520 | 520 | $data = \GV\Utils::_POST( 'data', array() ); |
| 521 | 521 | |
| 522 | - if ( empty( $data['path'] ) ) { |
|
| 522 | + if ( empty( $data[ 'path' ] ) ) { |
|
| 523 | 523 | return; |
| 524 | 524 | } |
| 525 | 525 | |
| 526 | - $result = activate_plugin( $data['path'] ); |
|
| 526 | + $result = activate_plugin( $data[ 'path' ] ); |
|
| 527 | 527 | |
| 528 | - if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
|
| 528 | + if ( is_wp_error( $result ) || ! is_plugin_active( $data[ 'path' ] ) ) { |
|
| 529 | 529 | wp_send_json_error( array( |
| 530 | 530 | 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
| 531 | 531 | ) ); |
@@ -542,13 +542,13 @@ discard block |
||
| 542 | 542 | public function deactivate_download() { |
| 543 | 543 | $data = \GV\Utils::_POST( 'data', array() ); |
| 544 | 544 | |
| 545 | - if ( empty( $data['path'] ) ) { |
|
| 545 | + if ( empty( $data[ 'path' ] ) ) { |
|
| 546 | 546 | return; |
| 547 | 547 | } |
| 548 | 548 | |
| 549 | - deactivate_plugins( $data['path'] ); |
|
| 549 | + deactivate_plugins( $data[ 'path' ] ); |
|
| 550 | 550 | |
| 551 | - if( is_plugin_active( $data['path'] ) ) { |
|
| 551 | + if ( is_plugin_active( $data[ 'path' ] ) ) { |
|
| 552 | 552 | wp_send_json_error( array( |
| 553 | 553 | 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
| 554 | 554 | ) ); |