@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | * @param int $entry_id ID of the Gravity Forms entry |
| 372 | 372 | * @param string $status String whether entry is approved or not. `0` for not approved, `Approved` for approved. |
| 373 | 373 | * @param int $form_id ID of the form of the entry being updated. Improves query performance. |
| 374 | - * @param string $approvedcolumn Gravity Forms Field ID |
|
| 374 | + * @param integer $approvedcolumn Gravity Forms Field ID |
|
| 375 | 375 | * |
| 376 | 376 | * @return true|WP_Error |
| 377 | 377 | */ |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | * |
| 423 | 423 | * When approving a field via the entry meta, we |
| 424 | 424 | * |
| 425 | - * @param array|int $form Form ID or form array |
|
| 425 | + * @param integer $form Form ID or form array |
|
| 426 | 426 | * @param string $approved_column Approved column field ID |
| 427 | 427 | * |
| 428 | 428 | * @return string|null |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | private function add_hooks() { |
| 40 | 40 | |
| 41 | 41 | // in case entry is edited (on admin or frontend) |
| 42 | - add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2); |
|
| 42 | + add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 ); |
|
| 43 | 43 | |
| 44 | 44 | // when using the User opt-in field, check on entry submission |
| 45 | 45 | add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 ); |
| 46 | 46 | |
| 47 | 47 | // process ajax approve entry requests |
| 48 | - add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved')); |
|
| 48 | + add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) ); |
|
| 49 | 49 | |
| 50 | 50 | } |
| 51 | 51 | |
@@ -62,13 +62,13 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | public static function get_entry_status( $entry, $value_or_label = 'label' ) { |
| 64 | 64 | |
| 65 | - $entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true ); |
|
| 65 | + $entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true ); |
|
| 66 | 66 | |
| 67 | 67 | $status = gform_get_meta( $entry_id, self::meta_key ); |
| 68 | 68 | |
| 69 | 69 | $status = GravityView_Entry_Approval_Status::maybe_convert_status( $status ); |
| 70 | 70 | |
| 71 | - if( 'value' === $value_or_label ) { |
|
| 71 | + if ( 'value' === $value_or_label ) { |
|
| 72 | 72 | return $status; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -93,20 +93,20 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | public function ajax_update_approved() { |
| 95 | 95 | |
| 96 | - $form_id = intval( rgpost('form_id') ); |
|
| 96 | + $form_id = intval( rgpost( 'form_id' ) ); |
|
| 97 | 97 | |
| 98 | 98 | // We always want requests from the admin to allow entry IDs, but not from the frontend |
| 99 | 99 | // There's another nonce sent when approving entries in the admin that we check |
| 100 | 100 | $force_entry_ids = rgpost( 'admin_nonce' ) && wp_verify_nonce( rgpost( 'admin_nonce' ), 'gravityview_admin_entry_approval' ); |
| 101 | 101 | |
| 102 | - $entry_id = GVCommon::get_entry_id( rgpost('entry_slug'), $force_entry_ids ); |
|
| 102 | + $entry_id = GVCommon::get_entry_id( rgpost( 'entry_slug' ), $force_entry_ids ); |
|
| 103 | 103 | |
| 104 | - $approval_status = rgpost('approved'); |
|
| 104 | + $approval_status = rgpost( 'approved' ); |
|
| 105 | 105 | |
| 106 | - $nonce = rgpost('nonce'); |
|
| 106 | + $nonce = rgpost( 'nonce' ); |
|
| 107 | 107 | |
| 108 | 108 | // Valid status |
| 109 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
| 109 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
| 110 | 110 | |
| 111 | 111 | do_action( 'gravityview_log_error', __METHOD__ . ': Invalid approval status', $_POST ); |
| 112 | 112 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | |
| 138 | 138 | do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' ); |
| 139 | 139 | |
| 140 | - $result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') ); |
|
| 140 | + $result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) ); |
|
| 141 | 141 | |
| 142 | 142 | } |
| 143 | 143 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | * @param $form array Gravity Forms form object |
| 171 | 171 | */ |
| 172 | 172 | public function after_submission( $entry, $form ) { |
| 173 | - $this->after_update_entry_update_approved_meta( $form , $entry['id'] ); |
|
| 173 | + $this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] ); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | /** |
@@ -184,12 +184,12 @@ discard block |
||
| 184 | 184 | */ |
| 185 | 185 | public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) { |
| 186 | 186 | |
| 187 | - $approved_column = self::get_approved_column( $form['id'] ); |
|
| 187 | + $approved_column = self::get_approved_column( $form[ 'id' ] ); |
|
| 188 | 188 | |
| 189 | 189 | /** |
| 190 | 190 | * If the form doesn't contain the approve field, don't assume anything. |
| 191 | 191 | */ |
| 192 | - if( empty( $approved_column ) ) { |
|
| 192 | + if ( empty( $approved_column ) ) { |
|
| 193 | 193 | return; |
| 194 | 194 | } |
| 195 | 195 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $value = GravityView_Entry_Approval_Status::APPROVED; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | - self::update_approved_meta( $entry_id, $value, $form['id'] ); |
|
| 206 | + self::update_approved_meta( $entry_id, $value, $form[ 'id' ] ); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | /** |
@@ -221,12 +221,12 @@ discard block |
||
| 221 | 221 | */ |
| 222 | 222 | public static function update_bulk( $entries = array(), $approved, $form_id ) { |
| 223 | 223 | |
| 224 | - if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) { |
|
| 224 | + if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) { |
|
| 225 | 225 | do_action( 'gravityview_log_error', __METHOD__ . ' Entries were empty or malformed.', $entries ); |
| 226 | 226 | return NULL; |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | - if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 229 | + if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 230 | 230 | do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' ); |
| 231 | 231 | return NULL; |
| 232 | 232 | } |
@@ -241,10 +241,10 @@ discard block |
||
| 241 | 241 | $approved_column_id = self::get_approved_column( $form_id ); |
| 242 | 242 | |
| 243 | 243 | $success = true; |
| 244 | - foreach( $entries as $entry_id ) { |
|
| 244 | + foreach ( $entries as $entry_id ) { |
|
| 245 | 245 | $update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id ); |
| 246 | 246 | |
| 247 | - if( ! $update_success ) { |
|
| 247 | + if ( ! $update_success ) { |
|
| 248 | 248 | $success = false; |
| 249 | 249 | } |
| 250 | 250 | } |
@@ -268,12 +268,12 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) { |
| 270 | 270 | |
| 271 | - if( !class_exists( 'GFAPI' ) ) { |
|
| 271 | + if ( ! class_exists( 'GFAPI' ) ) { |
|
| 272 | 272 | do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' ); |
| 273 | 273 | return false; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) { |
|
| 276 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) { |
|
| 277 | 277 | do_action( 'gravityview_log_error', __METHOD__ . ': Not a valid approval value.' ); |
| 278 | 278 | return false; |
| 279 | 279 | } |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | // If the form has an Approve/Reject field, update that value |
| 291 | 291 | $result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn ); |
| 292 | 292 | |
| 293 | - if( is_wp_error( $result ) ) { |
|
| 293 | + if ( is_wp_error( $result ) ) { |
|
| 294 | 294 | do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) ); |
| 295 | 295 | return false; |
| 296 | 296 | } |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | |
| 303 | 303 | // add note to entry if approval field updating worked or there was no approved field |
| 304 | 304 | // There's no validation for the meta |
| 305 | - if( true === $result ) { |
|
| 305 | + if ( true === $result ) { |
|
| 306 | 306 | |
| 307 | 307 | // Add an entry note |
| 308 | 308 | self::add_approval_status_updated_note( $entry_id, $approved ); |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | $note_id = false; |
| 357 | 357 | |
| 358 | - if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) { |
|
| 358 | + if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) { |
|
| 359 | 359 | |
| 360 | 360 | $current_user = wp_get_current_user(); |
| 361 | 361 | |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | */ |
| 378 | 378 | private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) { |
| 379 | 379 | |
| 380 | - if( empty( $approvedcolumn ) ) { |
|
| 380 | + if ( empty( $approvedcolumn ) ) { |
|
| 381 | 381 | $approvedcolumn = self::get_approved_column( $form_id ); |
| 382 | 382 | } |
| 383 | 383 | |
@@ -400,12 +400,12 @@ discard block |
||
| 400 | 400 | $status = GravityView_Entry_Approval_Status::maybe_convert_status( $status ); |
| 401 | 401 | |
| 402 | 402 | $new_value = ''; |
| 403 | - if( GravityView_Entry_Approval_Status::APPROVED === $status ) { |
|
| 403 | + if ( GravityView_Entry_Approval_Status::APPROVED === $status ) { |
|
| 404 | 404 | $new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn ); |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | 407 | //update entry |
| 408 | - $entry["{$approvedcolumn}"] = $new_value; |
|
| 408 | + $entry[ "{$approvedcolumn}" ] = $new_value; |
|
| 409 | 409 | |
| 410 | 410 | /** |
| 411 | 411 | * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves |
@@ -434,12 +434,12 @@ discard block |
||
| 434 | 434 | // If the user has enabled a different value than the label (for some reason), use it. |
| 435 | 435 | // This is highly unlikely |
| 436 | 436 | if ( is_array( $field->choices ) && ! empty( $field->choices ) ) { |
| 437 | - return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text']; |
|
| 437 | + return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ]; |
|
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | // Otherwise, fall back on the inputs array |
| 441 | 441 | if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) { |
| 442 | - return $field->inputs[0]['label']; |
|
| 442 | + return $field->inputs[ 0 ][ 'label' ]; |
|
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | return null; |
@@ -460,16 +460,16 @@ discard block |
||
| 460 | 460 | private static function update_approved_meta( $entry_id, $status, $form_id = 0 ) { |
| 461 | 461 | |
| 462 | 462 | if ( ! GravityView_Entry_Approval_Status::is_valid( $status ) ) { |
| 463 | - do_action('gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status ); |
|
| 463 | + do_action( 'gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status ); |
|
| 464 | 464 | return; |
| 465 | 465 | } |
| 466 | 466 | |
| 467 | 467 | $status = GravityView_Entry_Approval_Status::maybe_convert_status( $status ); |
| 468 | 468 | |
| 469 | 469 | // update entry meta |
| 470 | - if( function_exists('gform_update_meta') ) { |
|
| 470 | + if ( function_exists( 'gform_update_meta' ) ) { |
|
| 471 | 471 | |
| 472 | - if( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) { |
|
| 472 | + if ( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) { |
|
| 473 | 473 | gform_delete_meta( $entry_id, self::meta_key ); |
| 474 | 474 | } else { |
| 475 | 475 | gform_update_meta( $entry_id, self::meta_key, $status, $form_id ); |
@@ -492,11 +492,11 @@ discard block |
||
| 492 | 492 | * @since 1.18 Added "unapproved" |
| 493 | 493 | * @param int $entry_id ID of the Gravity Forms entry |
| 494 | 494 | */ |
| 495 | - do_action( 'gravityview/approve_entries/' . $action , $entry_id ); |
|
| 495 | + do_action( 'gravityview/approve_entries/' . $action, $entry_id ); |
|
| 496 | 496 | |
| 497 | 497 | } else { |
| 498 | 498 | |
| 499 | - do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' ); |
|
| 499 | + do_action( 'gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' ); |
|
| 500 | 500 | |
| 501 | 501 | } |
| 502 | 502 | } |
@@ -511,11 +511,11 @@ discard block |
||
| 511 | 511 | */ |
| 512 | 512 | static public function get_approved_column( $form ) { |
| 513 | 513 | |
| 514 | - if( empty( $form ) ) { |
|
| 514 | + if ( empty( $form ) ) { |
|
| 515 | 515 | return null; |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | - if( !is_array( $form ) ) { |
|
| 518 | + if ( ! is_array( $form ) ) { |
|
| 519 | 519 | $form = GVCommon::get_form( $form ); |
| 520 | 520 | } |
| 521 | 521 | |
@@ -525,22 +525,22 @@ discard block |
||
| 525 | 525 | * @var string $key |
| 526 | 526 | * @var GF_Field $field |
| 527 | 527 | */ |
| 528 | - foreach( $form['fields'] as $key => $field ) { |
|
| 528 | + foreach ( $form[ 'fields' ] as $key => $field ) { |
|
| 529 | 529 | |
| 530 | 530 | $inputs = $field->get_entry_inputs(); |
| 531 | 531 | |
| 532 | - if( !empty( $field->gravityview_approved ) ) { |
|
| 533 | - if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) { |
|
| 534 | - $approved_column_id = $inputs[0]['id']; |
|
| 532 | + if ( ! empty( $field->gravityview_approved ) ) { |
|
| 533 | + if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) { |
|
| 534 | + $approved_column_id = $inputs[ 0 ][ 'id' ]; |
|
| 535 | 535 | break; |
| 536 | 536 | } |
| 537 | 537 | } |
| 538 | 538 | |
| 539 | 539 | // Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work.. |
| 540 | - if( 'checkbox' === $field->type && ! empty( $inputs ) ) { |
|
| 540 | + if ( 'checkbox' === $field->type && ! empty( $inputs ) ) { |
|
| 541 | 541 | foreach ( $inputs as $input ) { |
| 542 | - if ( 'approved' === strtolower( $input['label'] ) ) { |
|
| 543 | - $approved_column_id = $input['id']; |
|
| 542 | + if ( 'approved' === strtolower( $input[ 'label' ] ) ) { |
|
| 543 | + $approved_column_id = $input[ 'id' ]; |
|
| 544 | 544 | break; |
| 545 | 545 | } |
| 546 | 546 | } |