@@ -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 | } |
@@ -11,35 +11,35 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | function __construct() { |
| 13 | 13 | |
| 14 | - $this->widget_description = __('Links to multiple pages of results.', 'gravityview' ); |
|
| 14 | + $this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' ); |
|
| 15 | 15 | |
| 16 | 16 | $default_values = array( 'header' => 1, 'footer' => 1 ); |
| 17 | 17 | $settings = array( 'show_all' => array( |
| 18 | 18 | 'type' => 'checkbox', |
| 19 | 19 | 'label' => __( 'Show each page number', 'gravityview' ), |
| 20 | - 'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'), |
|
| 20 | + 'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ), |
|
| 21 | 21 | 'value' => false |
| 22 | - )); |
|
| 23 | - parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings ); |
|
| 22 | + ) ); |
|
| 23 | + parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings ); |
|
| 24 | 24 | |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public function render_frontend( $widget_args, $content = '', $context = '') { |
|
| 27 | + public function render_frontend( $widget_args, $content = '', $context = '' ) { |
|
| 28 | 28 | $gravityview_view = GravityView_View::getInstance(); |
| 29 | 29 | |
| 30 | - if( !$this->pre_render_frontend() ) { |
|
| 30 | + if ( ! $this->pre_render_frontend() ) { |
|
| 31 | 31 | return; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | $atts = shortcode_atts( array( |
| 35 | 35 | 'page_size' => rgar( $gravityview_view->paging, 'page_size' ), |
| 36 | 36 | 'total' => $gravityview_view->total_entries, |
| 37 | - 'show_all' => !empty( $this->settings['show_all']['default'] ), |
|
| 38 | - 'current' => (int) rgar( $_GET, 'pagenum', 1 ), |
|
| 37 | + 'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ), |
|
| 38 | + 'current' => (int)rgar( $_GET, 'pagenum', 1 ), |
|
| 39 | 39 | ), $widget_args, 'gravityview_widget_page_links' ); |
| 40 | 40 | |
| 41 | 41 | $page_link_args = array( |
| 42 | - 'base' => add_query_arg('pagenum','%#%', gv_directory_link() ), |
|
| 42 | + 'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ), |
|
| 43 | 43 | 'format' => '&pagenum=%#%', |
| 44 | 44 | 'add_args' => array(), // |
| 45 | 45 | 'prev_text' => '«', |
@@ -47,9 +47,9 @@ discard block |
||
| 47 | 47 | 'type' => 'list', |
| 48 | 48 | 'end_size' => 1, |
| 49 | 49 | 'mid_size' => 2, |
| 50 | - 'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ), |
|
| 51 | - 'current' => $atts['current'], |
|
| 52 | - 'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice |
|
| 50 | + 'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ), |
|
| 51 | + 'current' => $atts[ 'current' ], |
|
| 52 | + 'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice |
|
| 53 | 53 | ); |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -57,14 +57,14 @@ discard block |
||
| 57 | 57 | * @since 1.1.4 |
| 58 | 58 | * @param array $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/) |
| 59 | 59 | */ |
| 60 | - $page_link_args = apply_filters('gravityview_page_links_args', $page_link_args ); |
|
| 60 | + $page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args ); |
|
| 61 | 61 | |
| 62 | 62 | $page_links = paginate_links( $page_link_args ); |
| 63 | 63 | |
| 64 | - if( !empty( $page_links )) { |
|
| 65 | - $class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
| 64 | + if ( ! empty( $page_links ) ) { |
|
| 65 | + $class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
| 66 | 66 | $class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class ); |
| 67 | - echo '<div class="'.$class.'">'. $page_links .'</div>'; |
|
| 67 | + echo '<div class="' . $class . '">' . $page_links . '</div>'; |
|
| 68 | 68 | } else { |
| 69 | 69 | do_action( 'gravityview_log_debug', 'GravityView_Widget_Page_Links[render_frontend] No page links; paginate_links() returned empty response.' ); |
| 70 | 70 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | die; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | -if( ! class_exists( 'Gamajo_Template_Loader' ) ) { |
|
| 19 | +if ( ! class_exists( 'Gamajo_Template_Loader' ) ) { |
|
| 20 | 20 | require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' ); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -157,8 +157,8 @@ discard block |
||
| 157 | 157 | 'atts' => NULL, |
| 158 | 158 | ) ); |
| 159 | 159 | |
| 160 | - foreach ($atts as $key => $value) { |
|
| 161 | - if( is_null( $value ) ) { |
|
| 160 | + foreach ( $atts as $key => $value ) { |
|
| 161 | + if ( is_null( $value ) ) { |
|
| 162 | 162 | continue; |
| 163 | 163 | } |
| 164 | 164 | $this->{$key} = $value; |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | static function getInstance( $passed_post = NULL ) { |
| 191 | 191 | |
| 192 | - if( empty( self::$instance ) ) { |
|
| 192 | + if ( empty( self::$instance ) ) { |
|
| 193 | 193 | self::$instance = new self( $passed_post ); |
| 194 | 194 | } |
| 195 | 195 | |
@@ -202,8 +202,8 @@ discard block |
||
| 202 | 202 | */ |
| 203 | 203 | public function getCurrentField( $key = NULL ) { |
| 204 | 204 | |
| 205 | - if( !empty( $key ) ) { |
|
| 206 | - if( isset( $this->_current_field[ $key ] ) ) { |
|
| 205 | + if ( ! empty( $key ) ) { |
|
| 206 | + if ( isset( $this->_current_field[ $key ] ) ) { |
|
| 207 | 207 | return $this->_current_field[ $key ]; |
| 208 | 208 | } |
| 209 | 209 | return NULL; |
@@ -214,16 +214,16 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | public function setCurrentFieldSetting( $key, $value ) { |
| 216 | 216 | |
| 217 | - if( !empty( $this->_current_field ) ) { |
|
| 218 | - $this->_current_field['field_settings'][ $key ] = $value; |
|
| 217 | + if ( ! empty( $this->_current_field ) ) { |
|
| 218 | + $this->_current_field[ 'field_settings' ][ $key ] = $value; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | public function getCurrentFieldSetting( $key ) { |
| 224 | - $settings = $this->getCurrentField('field_settings'); |
|
| 224 | + $settings = $this->getCurrentField( 'field_settings' ); |
|
| 225 | 225 | |
| 226 | - if( $settings && !empty( $settings[ $key ] ) ) { |
|
| 226 | + if ( $settings && ! empty( $settings[ $key ] ) ) { |
|
| 227 | 227 | return $settings[ $key ]; |
| 228 | 228 | } |
| 229 | 229 | |
@@ -254,8 +254,8 @@ discard block |
||
| 254 | 254 | */ |
| 255 | 255 | public function getAtts( $key = NULL ) { |
| 256 | 256 | |
| 257 | - if( !empty( $key ) ) { |
|
| 258 | - if( isset( $this->atts[ $key ] ) ) { |
|
| 257 | + if ( ! empty( $key ) ) { |
|
| 258 | + if ( isset( $this->atts[ $key ] ) ) { |
|
| 259 | 259 | return $this->atts[ $key ]; |
| 260 | 260 | } |
| 261 | 261 | return NULL; |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | |
| 322 | 322 | $fields = empty( $this->fields ) ? NULL : $this->fields; |
| 323 | 323 | |
| 324 | - if( $fields && !empty( $key ) ) { |
|
| 324 | + if ( $fields && ! empty( $key ) ) { |
|
| 325 | 325 | $fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL; |
| 326 | 326 | } |
| 327 | 327 | |
@@ -339,18 +339,18 @@ discard block |
||
| 339 | 339 | */ |
| 340 | 340 | public function getContextFields( $context = '' ) { |
| 341 | 341 | |
| 342 | - if( '' === $context ) { |
|
| 342 | + if ( '' === $context ) { |
|
| 343 | 343 | $context = $this->getContext(); |
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | $fields = $this->getFields(); |
| 347 | 347 | |
| 348 | - foreach ( (array) $fields as $key => $context_fields ) { |
|
| 348 | + foreach ( (array)$fields as $key => $context_fields ) { |
|
| 349 | 349 | |
| 350 | 350 | // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
| 351 | 351 | $matches = explode( '_', $key ); |
| 352 | 352 | |
| 353 | - if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
| 353 | + if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) { |
|
| 354 | 354 | return $context_fields; |
| 355 | 355 | } |
| 356 | 356 | } |
@@ -371,8 +371,8 @@ discard block |
||
| 371 | 371 | */ |
| 372 | 372 | public function getField( $key ) { |
| 373 | 373 | |
| 374 | - if( !empty( $key ) ) { |
|
| 375 | - if( isset( $this->fields[ $key ] ) ) { |
|
| 374 | + if ( ! empty( $key ) ) { |
|
| 375 | + if ( isset( $this->fields[ $key ] ) ) { |
|
| 376 | 376 | return $this->fields[ $key ]; |
| 377 | 377 | } |
| 378 | 378 | } |
@@ -478,8 +478,8 @@ discard block |
||
| 478 | 478 | public function getPaginationCounts() { |
| 479 | 479 | |
| 480 | 480 | $paging = $this->getPaging(); |
| 481 | - $offset = $paging['offset']; |
|
| 482 | - $page_size = $paging['page_size']; |
|
| 481 | + $offset = $paging[ 'offset' ]; |
|
| 482 | + $page_size = $paging[ 'page_size' ]; |
|
| 483 | 483 | $total = $this->getTotalEntries(); |
| 484 | 484 | |
| 485 | 485 | if ( empty( $total ) ) { |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | */ |
| 501 | 501 | list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) ); |
| 502 | 502 | |
| 503 | - return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total ); |
|
| 503 | + return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total ); |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | /** |
@@ -591,16 +591,16 @@ discard block |
||
| 591 | 591 | */ |
| 592 | 592 | public function getCurrentEntry() { |
| 593 | 593 | |
| 594 | - if( in_array( $this->getContext(), array( 'edit', 'single') ) ) { |
|
| 594 | + if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) { |
|
| 595 | 595 | $entries = $this->getEntries(); |
| 596 | - $entry = $entries[0]; |
|
| 596 | + $entry = $entries[ 0 ]; |
|
| 597 | 597 | } else { |
| 598 | 598 | $entry = $this->_current_entry; |
| 599 | 599 | } |
| 600 | 600 | |
| 601 | 601 | /** @since 1.16 Fixes DataTables empty entry issue */ |
| 602 | - if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) { |
|
| 603 | - $entry = $this->_current_field['entry']; |
|
| 602 | + if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) { |
|
| 603 | + $entry = $this->_current_field[ 'entry' ]; |
|
| 604 | 604 | } |
| 605 | 605 | |
| 606 | 606 | return $entry; |
@@ -637,8 +637,8 @@ discard block |
||
| 637 | 637 | */ |
| 638 | 638 | public function renderZone( $zone = '', $atts = array(), $echo = true ) { |
| 639 | 639 | |
| 640 | - if( empty( $zone ) ) { |
|
| 641 | - do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.'); |
|
| 640 | + if ( empty( $zone ) ) { |
|
| 641 | + do_action( 'gravityview_log_error', 'GravityView_View[renderZone] No zone defined.' ); |
|
| 642 | 642 | return NULL; |
| 643 | 643 | } |
| 644 | 644 | |
@@ -647,37 +647,37 @@ discard block |
||
| 647 | 647 | 'context' => $this->getContext(), |
| 648 | 648 | 'entry' => $this->getCurrentEntry(), |
| 649 | 649 | 'form' => $this->getForm(), |
| 650 | - 'hide_empty' => $this->getAtts('hide_empty'), |
|
| 650 | + 'hide_empty' => $this->getAtts( 'hide_empty' ), |
|
| 651 | 651 | ); |
| 652 | 652 | |
| 653 | 653 | $final_atts = wp_parse_args( $atts, $defaults ); |
| 654 | 654 | |
| 655 | 655 | $output = ''; |
| 656 | 656 | |
| 657 | - $final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}"; |
|
| 657 | + $final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}"; |
|
| 658 | 658 | |
| 659 | - $fields = $this->getField( $final_atts['zone_id'] ); |
|
| 659 | + $fields = $this->getField( $final_atts[ 'zone_id' ] ); |
|
| 660 | 660 | |
| 661 | 661 | // Backward compatibility |
| 662 | - if( 'table' === $this->getTemplatePartSlug() ) { |
|
| 662 | + if ( 'table' === $this->getTemplatePartSlug() ) { |
|
| 663 | 663 | /** |
| 664 | 664 | * @filter `gravityview_table_cells` Modify the fields displayed in a table |
| 665 | 665 | * @param array $fields |
| 666 | 666 | * @param GravityView_View $this |
| 667 | 667 | */ |
| 668 | - $fields = apply_filters("gravityview_table_cells", $fields, $this ); |
|
| 668 | + $fields = apply_filters( "gravityview_table_cells", $fields, $this ); |
|
| 669 | 669 | } |
| 670 | 670 | |
| 671 | - if( empty( $fields ) ) { |
|
| 671 | + if ( empty( $fields ) ) { |
|
| 672 | 672 | |
| 673 | - do_action('gravityview_log_error', 'GravityView_View[renderZone] Empty View configuration for this context.', $fields ); |
|
| 673 | + do_action( 'gravityview_log_error', 'GravityView_View[renderZone] Empty View configuration for this context.', $fields ); |
|
| 674 | 674 | |
| 675 | 675 | return NULL; |
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | $field_output = ''; |
| 679 | 679 | foreach ( $fields as $field ) { |
| 680 | - $final_atts['field'] = $field; |
|
| 680 | + $final_atts[ 'field' ] = $field; |
|
| 681 | 681 | |
| 682 | 682 | $field_output .= gravityview_field_output( $final_atts ); |
| 683 | 683 | } |
@@ -688,21 +688,21 @@ discard block |
||
| 688 | 688 | * @since 1.7.6 |
| 689 | 689 | * @param boolean $hide_empty_zone Default: false |
| 690 | 690 | */ |
| 691 | - if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) { |
|
| 691 | + if ( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) { |
|
| 692 | 692 | return NULL; |
| 693 | 693 | } |
| 694 | 694 | |
| 695 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
| 696 | - $output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">'; |
|
| 695 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
| 696 | + $output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">'; |
|
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | $output .= $field_output; |
| 700 | 700 | |
| 701 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
| 701 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
| 702 | 702 | $output .= '</div>'; |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | - if( $echo ) { |
|
| 705 | + if ( $echo ) { |
|
| 706 | 706 | echo $output; |
| 707 | 707 | } |
| 708 | 708 | |
@@ -720,7 +720,7 @@ discard block |
||
| 720 | 720 | */ |
| 721 | 721 | function locate_template( $template_names, $load = false, $require_once = true ) { |
| 722 | 722 | |
| 723 | - if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
| 723 | + if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
| 724 | 724 | |
| 725 | 725 | $located = $this->located_templates[ $template_names ]; |
| 726 | 726 | |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | // Set $load to always false so we handle it here. |
| 730 | 730 | $located = parent::locate_template( $template_names, false, $require_once ); |
| 731 | 731 | |
| 732 | - if( is_string( $template_names ) ) { |
|
| 732 | + if ( is_string( $template_names ) ) { |
|
| 733 | 733 | $this->located_templates[ $template_names ] = $located; |
| 734 | 734 | } |
| 735 | 735 | } |
@@ -747,7 +747,7 @@ discard block |
||
| 747 | 747 | * @return mixed|null The stored data. |
| 748 | 748 | */ |
| 749 | 749 | public function __get( $name ) { |
| 750 | - if( isset( $this->{$name} ) ) { |
|
| 750 | + if ( isset( $this->{$name} ) ) { |
|
| 751 | 751 | return $this->{$name}; |
| 752 | 752 | } else { |
| 753 | 753 | return NULL; |
@@ -776,15 +776,15 @@ discard block |
||
| 776 | 776 | $additional = array(); |
| 777 | 777 | |
| 778 | 778 | // form-19-table-body.php |
| 779 | - $additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
| 779 | + $additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
| 780 | 780 | |
| 781 | 781 | // view-3-table-body.php |
| 782 | - $additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name ); |
|
| 782 | + $additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name ); |
|
| 783 | 783 | |
| 784 | - if( $this->getPostId() ) { |
|
| 784 | + if ( $this->getPostId() ) { |
|
| 785 | 785 | |
| 786 | 786 | // page-19-table-body.php |
| 787 | - $additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
| 787 | + $additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | 790 | // Combine with existing table-body.php and table.php |
@@ -806,7 +806,7 @@ discard block |
||
| 806 | 806 | |
| 807 | 807 | do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file ); |
| 808 | 808 | |
| 809 | - if( !empty( $template_file) ) { |
|
| 809 | + if ( ! empty( $template_file ) ) { |
|
| 810 | 810 | |
| 811 | 811 | if ( $require_once ) { |
| 812 | 812 | require_once( $template_file ); |
@@ -823,7 +823,7 @@ discard block |
||
| 823 | 823 | */ |
| 824 | 824 | public function render_widget_hooks( $view_id ) { |
| 825 | 825 | |
| 826 | - if( empty( $view_id ) || 'single' == gravityview_get_context() ) { |
|
| 826 | + if ( empty( $view_id ) || 'single' == gravityview_get_context() ) { |
|
| 827 | 827 | do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' ); |
| 828 | 828 | return; |
| 829 | 829 | } |
@@ -831,9 +831,9 @@ discard block |
||
| 831 | 831 | $view_data = gravityview_get_current_view_data( $view_id ); |
| 832 | 832 | |
| 833 | 833 | // get View widget configuration |
| 834 | - $widgets = (array)$view_data['widgets']; |
|
| 834 | + $widgets = (array)$view_data[ 'widgets' ]; |
|
| 835 | 835 | |
| 836 | - switch( current_filter() ) { |
|
| 836 | + switch ( current_filter() ) { |
|
| 837 | 837 | default: |
| 838 | 838 | case 'gravityview_before': |
| 839 | 839 | $zone = 'header'; |
@@ -847,9 +847,9 @@ discard block |
||
| 847 | 847 | * Filter widgets not in the current zone |
| 848 | 848 | * @since 1.16 |
| 849 | 849 | */ |
| 850 | - foreach( $widgets as $key => $widget ) { |
|
| 850 | + foreach ( $widgets as $key => $widget ) { |
|
| 851 | 851 | // The widget isn't in the current zone |
| 852 | - if( false === strpos( $key, $zone ) ) { |
|
| 852 | + if ( false === strpos( $key, $zone ) ) { |
|
| 853 | 853 | unset( $widgets[ $key ] ); |
| 854 | 854 | } |
| 855 | 855 | } |
@@ -864,8 +864,8 @@ discard block |
||
| 864 | 864 | } |
| 865 | 865 | |
| 866 | 866 | // Prevent being called twice |
| 867 | - if( did_action( $zone.'_'.$view_id.'_widgets' ) ) { |
|
| 868 | - do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) ); |
|
| 867 | + if ( did_action( $zone . '_' . $view_id . '_widgets' ) ) { |
|
| 868 | + do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__, $zone . '_' . $view_id . '_widgets' ) ); |
|
| 869 | 869 | return; |
| 870 | 870 | } |
| 871 | 871 | |
@@ -876,7 +876,7 @@ discard block |
||
| 876 | 876 | |
| 877 | 877 | $default_css_class = 'gv-grid gv-widgets-' . $zone; |
| 878 | 878 | |
| 879 | - if( 0 === GravityView_View::getInstance()->getTotalEntries() ) { |
|
| 879 | + if ( 0 === GravityView_View::getInstance()->getTotalEntries() ) { |
|
| 880 | 880 | $default_css_class .= ' gv-widgets-no-results'; |
| 881 | 881 | } |
| 882 | 882 | |
@@ -887,7 +887,7 @@ discard block |
||
| 887 | 887 | * @param string $zone Current widget zone, either `header` or `footer` |
| 888 | 888 | * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']` |
| 889 | 889 | */ |
| 890 | - $css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets ); |
|
| 890 | + $css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets ); |
|
| 891 | 891 | |
| 892 | 892 | $css_class = gravityview_sanitize_html_class( $css_class ); |
| 893 | 893 | |
@@ -895,17 +895,17 @@ discard block |
||
| 895 | 895 | ?> |
| 896 | 896 | <div class="<?php echo $css_class; ?>"> |
| 897 | 897 | <?php |
| 898 | - foreach( $rows as $row ) { |
|
| 899 | - foreach( $row as $col => $areas ) { |
|
| 900 | - $column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left'; |
|
| 898 | + foreach ( $rows as $row ) { |
|
| 899 | + foreach ( $row as $col => $areas ) { |
|
| 900 | + $column = ( $col == '2-2' ) ? '1-2 gv-right' : $col . ' gv-left'; |
|
| 901 | 901 | ?> |
| 902 | 902 | <div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> |
| 903 | 903 | <?php |
| 904 | - if( !empty( $areas ) ) { |
|
| 905 | - foreach( $areas as $area ) { |
|
| 906 | - if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) { |
|
| 907 | - foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) { |
|
| 908 | - do_action( "gravityview_render_widget_{$widget['id']}", $widget ); |
|
| 904 | + if ( ! empty( $areas ) ) { |
|
| 905 | + foreach ( $areas as $area ) { |
|
| 906 | + if ( ! empty( $widgets[ $zone . '_' . $area[ 'areaid' ] ] ) ) { |
|
| 907 | + foreach ( $widgets[ $zone . '_' . $area[ 'areaid' ] ] as $widget ) { |
|
| 908 | + do_action( "gravityview_render_widget_{$widget[ 'id' ]}", $widget ); |
|
| 909 | 909 | } |
| 910 | 910 | } |
| 911 | 911 | } |
@@ -921,8 +921,8 @@ discard block |
||
| 921 | 921 | * Prevent widgets from being called twice. |
| 922 | 922 | * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin |
| 923 | 923 | */ |
| 924 | - if( did_action( 'wp_head' ) ) { |
|
| 925 | - do_action( $zone.'_'.$view_id.'_widgets' ); |
|
| 924 | + if ( did_action( 'wp_head' ) ) { |
|
| 925 | + do_action( $zone . '_' . $view_id . '_widgets' ); |
|
| 926 | 926 | } |
| 927 | 927 | } |
| 928 | 928 | |
@@ -42,12 +42,12 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | add_action( 'wp', array( $this, 'process_delete' ), 10000 ); |
| 44 | 44 | |
| 45 | - add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 ); |
|
| 45 | + add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
|
| 46 | 46 | |
| 47 | 47 | add_action( 'gravityview_before', array( $this, 'display_message' ) ); |
| 48 | 48 | |
| 49 | 49 | // For the Delete Entry Link, you don't want visible to all users. |
| 50 | - add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 ); |
|
| 50 | + add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 ); |
|
| 51 | 51 | |
| 52 | 52 | // Modify the field options based on the name of the field type |
| 53 | 53 | add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 ); |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | // add template path to check for field |
| 56 | 56 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
| 57 | 57 | |
| 58 | - add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 ); |
|
| 58 | + add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 3 ); |
|
| 59 | 59 | |
| 60 | - add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 61 | - add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 60 | + add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 61 | + add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | static function getInstance() { |
| 71 | 71 | |
| 72 | - if( empty( self::$instance ) ) { |
|
| 72 | + if ( empty( self::$instance ) ) { |
|
| 73 | 73 | self::$instance = new self; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -105,20 +105,20 @@ discard block |
||
| 105 | 105 | function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 106 | 106 | |
| 107 | 107 | // Always a link, never a filter |
| 108 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
| 108 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] ); |
|
| 109 | 109 | |
| 110 | 110 | // Delete Entry link should only appear to visitors capable of editing entries |
| 111 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 111 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
| 112 | 112 | |
| 113 | - $add_option['delete_link'] = array( |
|
| 113 | + $add_option[ 'delete_link' ] = array( |
|
| 114 | 114 | 'type' => 'text', |
| 115 | 115 | 'label' => __( 'Delete Link Text', 'gravityview' ), |
| 116 | 116 | 'desc' => NULL, |
| 117 | - 'value' => __('Delete Entry', 'gravityview'), |
|
| 117 | + 'value' => __( 'Delete Entry', 'gravityview' ), |
|
| 118 | 118 | 'merge_tags' => true, |
| 119 | 119 | ); |
| 120 | 120 | |
| 121 | - $field_options['allow_edit_cap'] = array( |
|
| 121 | + $field_options[ 'allow_edit_cap' ] = array( |
|
| 122 | 122 | 'type' => 'select', |
| 123 | 123 | 'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ), |
| 124 | 124 | 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
| 144 | 144 | |
| 145 | - if( 'edit' !== $zone ) { |
|
| 146 | - $entry_default_fields['delete_link'] = array( |
|
| 145 | + if ( 'edit' !== $zone ) { |
|
| 146 | + $entry_default_fields[ 'delete_link' ] = array( |
|
| 147 | 147 | 'label' => __( 'Delete Entry', 'gravityview' ), |
| 148 | 148 | 'type' => 'delete_link', |
| 149 | 149 | 'desc' => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ), |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | function add_available_field( $available_fields = array() ) { |
| 162 | 162 | |
| 163 | - $available_fields['delete_link'] = array( |
|
| 163 | + $available_fields[ 'delete_link' ] = array( |
|
| 164 | 164 | 'label_text' => __( 'Delete Entry', 'gravityview' ), |
| 165 | 165 | 'field_id' => 'delete_link', |
| 166 | 166 | 'label_type' => 'field', |
@@ -188,12 +188,12 @@ discard block |
||
| 188 | 188 | $caps = $visibility_caps; |
| 189 | 189 | |
| 190 | 190 | // If we're configuring fields in the edit context, we want a limited selection |
| 191 | - if( $field_id === 'delete_link' ) { |
|
| 191 | + if ( $field_id === 'delete_link' ) { |
|
| 192 | 192 | |
| 193 | 193 | // Remove other built-in caps. |
| 194 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
| 194 | + unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] ); |
|
| 195 | 195 | |
| 196 | - $caps['read'] = _x('Entry Creator', 'User capability', 'gravityview'); |
|
| 196 | + $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | return $caps; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | * @param [type] $entry [description] |
| 207 | 207 | */ |
| 208 | 208 | function set_entry( $entry = null ) { |
| 209 | - $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry; |
|
| 209 | + $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry; |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | /** |
@@ -236,13 +236,13 @@ discard block |
||
| 236 | 236 | |
| 237 | 237 | $base = GravityView_API::directory_link( $post_id, true ); |
| 238 | 238 | |
| 239 | - if( empty( $base ) ) { |
|
| 240 | - do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id ); |
|
| 239 | + if ( empty( $base ) ) { |
|
| 240 | + do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: ' . $post_id ); |
|
| 241 | 241 | return NULL; |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | // Use the slug instead of the ID for consistent security |
| 245 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
| 245 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
| 246 | 246 | |
| 247 | 247 | $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id; |
| 248 | 248 | |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | 'view_id' => $view_id, |
| 254 | 254 | ), $base ); |
| 255 | 255 | |
| 256 | - $url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' ); |
|
| 256 | + $url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' ); |
|
| 257 | 257 | |
| 258 | 258 | return $url; |
| 259 | 259 | } |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) { |
| 271 | 271 | |
| 272 | 272 | // Only show the link to those who are allowed to see it. |
| 273 | - if( !self::check_user_cap_delete_entry( $entry ) ) { |
|
| 273 | + if ( ! self::check_user_cap_delete_entry( $entry ) ) { |
|
| 274 | 274 | return; |
| 275 | 275 | } |
| 276 | 276 | |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true ); |
| 282 | 282 | |
| 283 | 283 | // If the button is hidden by the filter, don't show. |
| 284 | - if( !$show_delete_button ) { |
|
| 284 | + if ( ! $show_delete_button ) { |
|
| 285 | 285 | return; |
| 286 | 286 | } |
| 287 | 287 | |
@@ -311,27 +311,27 @@ discard block |
||
| 311 | 311 | function process_delete() { |
| 312 | 312 | |
| 313 | 313 | // If the form is submitted |
| 314 | - if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) { |
|
| 314 | + if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) { |
|
| 315 | 315 | |
| 316 | 316 | // Make sure it's a GravityView request |
| 317 | - $valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) ); |
|
| 317 | + $valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) ); |
|
| 318 | 318 | |
| 319 | - if( ! $valid_nonce_key ) { |
|
| 320 | - do_action('gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' ); |
|
| 319 | + if ( ! $valid_nonce_key ) { |
|
| 320 | + do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' ); |
|
| 321 | 321 | return; |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | // Get the entry slug |
| 325 | - $entry_slug = esc_attr( $_GET['entry_id'] ); |
|
| 325 | + $entry_slug = esc_attr( $_GET[ 'entry_id' ] ); |
|
| 326 | 326 | |
| 327 | 327 | // See if there's an entry there |
| 328 | 328 | $entry = gravityview_get_entry( $entry_slug ); |
| 329 | 329 | |
| 330 | - if( $entry ) { |
|
| 330 | + if ( $entry ) { |
|
| 331 | 331 | |
| 332 | 332 | $has_permission = $this->user_can_delete_entry( $entry ); |
| 333 | 333 | |
| 334 | - if( is_wp_error( $has_permission ) ) { |
|
| 334 | + if ( is_wp_error( $has_permission ) ) { |
|
| 335 | 335 | |
| 336 | 336 | $messages = array( |
| 337 | 337 | 'message' => urlencode( $has_permission->get_error_message() ), |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | // Delete the entry |
| 344 | 344 | $delete_response = $this->delete_or_trash_entry( $entry ); |
| 345 | 345 | |
| 346 | - if( is_wp_error( $delete_response ) ) { |
|
| 346 | + if ( is_wp_error( $delete_response ) ) { |
|
| 347 | 347 | |
| 348 | 348 | $messages = array( |
| 349 | 349 | 'message' => urlencode( $delete_response->get_error_message() ), |
@@ -362,10 +362,10 @@ discard block |
||
| 362 | 362 | |
| 363 | 363 | } else { |
| 364 | 364 | |
| 365 | - do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug ); |
|
| 365 | + do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug ' . $entry_slug ); |
|
| 366 | 366 | |
| 367 | 367 | $messages = array( |
| 368 | - 'message' => urlencode( __('The entry does not exist.', 'gravityview') ), |
|
| 368 | + 'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ), |
|
| 369 | 369 | 'status' => 'error', |
| 370 | 370 | ); |
| 371 | 371 | } |
@@ -405,18 +405,18 @@ discard block |
||
| 405 | 405 | */ |
| 406 | 406 | private function delete_or_trash_entry( $entry ) { |
| 407 | 407 | |
| 408 | - $entry_id = $entry['id']; |
|
| 408 | + $entry_id = $entry[ 'id' ]; |
|
| 409 | 409 | |
| 410 | 410 | $mode = $this->get_delete_mode(); |
| 411 | 411 | |
| 412 | - if( 'delete' === $mode ) { |
|
| 412 | + if ( 'delete' === $mode ) { |
|
| 413 | 413 | |
| 414 | 414 | do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id ); |
| 415 | 415 | |
| 416 | 416 | // Delete the entry |
| 417 | 417 | $delete_response = GFAPI::delete_entry( $entry_id ); |
| 418 | 418 | |
| 419 | - if( ! is_wp_error( $delete_response ) ) { |
|
| 419 | + if ( ! is_wp_error( $delete_response ) ) { |
|
| 420 | 420 | $delete_response = 'deleted'; |
| 421 | 421 | |
| 422 | 422 | /** |
@@ -437,8 +437,8 @@ discard block |
||
| 437 | 437 | $trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' ); |
| 438 | 438 | new GravityView_Cache; |
| 439 | 439 | |
| 440 | - if( ! $trashed ) { |
|
| 441 | - $delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) ); |
|
| 440 | + if ( ! $trashed ) { |
|
| 441 | + $delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) ); |
|
| 442 | 442 | } else { |
| 443 | 443 | |
| 444 | 444 | /** |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | public function process_connected_posts( $entry_id = 0, $entry = array() ) { |
| 470 | 470 | |
| 471 | 471 | // The entry had no connected post |
| 472 | - if( empty( $entry['post_id'] ) ) { |
|
| 472 | + if ( empty( $entry[ 'post_id' ] ) ) { |
|
| 473 | 473 | return; |
| 474 | 474 | } |
| 475 | 475 | |
@@ -480,22 +480,22 @@ discard block |
||
| 480 | 480 | */ |
| 481 | 481 | $delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true ); |
| 482 | 482 | |
| 483 | - if( false === $delete_post ) { |
|
| 483 | + if ( false === $delete_post ) { |
|
| 484 | 484 | return; |
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | $action = current_action(); |
| 488 | 488 | |
| 489 | - if( 'gravityview/delete-entry/deleted' === $action ) { |
|
| 490 | - $result = wp_delete_post( $entry['post_id'], true ); |
|
| 489 | + if ( 'gravityview/delete-entry/deleted' === $action ) { |
|
| 490 | + $result = wp_delete_post( $entry[ 'post_id' ], true ); |
|
| 491 | 491 | } else { |
| 492 | - $result = wp_trash_post( $entry['post_id'] ); |
|
| 492 | + $result = wp_trash_post( $entry[ 'post_id' ] ); |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | - if( false === $result ) { |
|
| 496 | - do_action( 'gravityview_log_error', __METHOD__ . ' (called by '.$action.'): Error processing the Post connected to the entry.', $entry ); |
|
| 495 | + if ( false === $result ) { |
|
| 496 | + do_action( 'gravityview_log_error', __METHOD__ . ' (called by ' . $action . '): Error processing the Post connected to the entry.', $entry ); |
|
| 497 | 497 | } else { |
| 498 | - do_action( 'gravityview_log_debug', __METHOD__ . ' (called by '.$action.'): Successfully processed Post connected to the entry.', $entry ); |
|
| 498 | + do_action( 'gravityview_log_debug', __METHOD__ . ' (called by ' . $action . '): Successfully processed Post connected to the entry.', $entry ); |
|
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | |
@@ -508,13 +508,13 @@ discard block |
||
| 508 | 508 | public function verify_nonce() { |
| 509 | 509 | |
| 510 | 510 | // No delete entry request was made |
| 511 | - if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) { |
|
| 511 | + if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
| 512 | 512 | return false; |
| 513 | 513 | } |
| 514 | 514 | |
| 515 | - $nonce_key = self::get_nonce_key( $_GET['entry_id'] ); |
|
| 515 | + $nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] ); |
|
| 516 | 516 | |
| 517 | - $valid = wp_verify_nonce( $_GET['delete'], $nonce_key ); |
|
| 517 | + $valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key ); |
|
| 518 | 518 | |
| 519 | 519 | /** |
| 520 | 520 | * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid. |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | */ |
| 537 | 537 | public static function get_confirm_dialog() { |
| 538 | 538 | |
| 539 | - $confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview'); |
|
| 539 | + $confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' ); |
|
| 540 | 540 | |
| 541 | 541 | /** |
| 542 | 542 | * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | */ |
| 545 | 545 | $confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm ); |
| 546 | 546 | |
| 547 | - return 'return window.confirm(\''. esc_js( $confirm ) .'\');'; |
|
| 547 | + return 'return window.confirm(\'' . esc_js( $confirm ) . '\');'; |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /** |
@@ -562,16 +562,16 @@ discard block |
||
| 562 | 562 | |
| 563 | 563 | $error = NULL; |
| 564 | 564 | |
| 565 | - if( ! $this->verify_nonce() ) { |
|
| 566 | - $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview'); |
|
| 565 | + if ( ! $this->verify_nonce() ) { |
|
| 566 | + $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 567 | 567 | } |
| 568 | 568 | |
| 569 | - if( ! self::check_user_cap_delete_entry( $entry ) ) { |
|
| 570 | - $error = __( 'You do not have permission to delete this entry.', 'gravityview'); |
|
| 569 | + if ( ! self::check_user_cap_delete_entry( $entry ) ) { |
|
| 570 | + $error = __( 'You do not have permission to delete this entry.', 'gravityview' ); |
|
| 571 | 571 | } |
| 572 | 572 | |
| 573 | - if( $entry['status'] === 'trash' ) { |
|
| 574 | - if( 'trash' === $this->get_delete_mode() ) { |
|
| 573 | + if ( $entry[ 'status' ] === 'trash' ) { |
|
| 574 | + if ( 'trash' === $this->get_delete_mode() ) { |
|
| 575 | 575 | $error = __( 'The entry is already in the trash.', 'gravityview' ); |
| 576 | 576 | } else { |
| 577 | 577 | $error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' ); |
@@ -579,11 +579,11 @@ discard block |
||
| 579 | 579 | } |
| 580 | 580 | |
| 581 | 581 | // No errors; everything's fine here! |
| 582 | - if( empty( $error ) ) { |
|
| 582 | + if ( empty( $error ) ) { |
|
| 583 | 583 | return true; |
| 584 | 584 | } |
| 585 | 585 | |
| 586 | - do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error ); |
|
| 586 | + do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error ); |
|
| 587 | 587 | |
| 588 | 588 | return new WP_Error( 'gravityview-delete-entry-permissions', $error ); |
| 589 | 589 | } |
@@ -605,32 +605,32 @@ discard block |
||
| 605 | 605 | |
| 606 | 606 | $current_user = wp_get_current_user(); |
| 607 | 607 | |
| 608 | - $entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL; |
|
| 608 | + $entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL; |
|
| 609 | 609 | |
| 610 | 610 | // Or if they can delete any entries (as defined in Gravity Forms), we're good. |
| 611 | - if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
| 611 | + if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
| 612 | 612 | |
| 613 | - do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' ); |
|
| 613 | + do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' ); |
|
| 614 | 614 | |
| 615 | 615 | return true; |
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | |
| 619 | 619 | // If field options are passed, check if current user can view the link |
| 620 | - if( !empty( $field ) ) { |
|
| 620 | + if ( ! empty( $field ) ) { |
|
| 621 | 621 | |
| 622 | 622 | // If capability is not defined, something is not right! |
| 623 | - if( empty( $field['allow_edit_cap'] ) ) { |
|
| 623 | + if ( empty( $field[ 'allow_edit_cap' ] ) ) { |
|
| 624 | 624 | |
| 625 | 625 | do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field ); |
| 626 | 626 | |
| 627 | 627 | return false; |
| 628 | 628 | } |
| 629 | 629 | |
| 630 | - if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) { |
|
| 630 | + if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) { |
|
| 631 | 631 | |
| 632 | 632 | // Do not return true if cap is read, as we need to check if the current user created the entry |
| 633 | - if( $field['allow_edit_cap'] !== 'read' ) { |
|
| 633 | + if ( $field[ 'allow_edit_cap' ] !== 'read' ) { |
|
| 634 | 634 | return true; |
| 635 | 635 | } |
| 636 | 636 | |
@@ -643,9 +643,9 @@ discard block |
||
| 643 | 643 | |
| 644 | 644 | } |
| 645 | 645 | |
| 646 | - if( !isset( $entry['created_by'] ) ) { |
|
| 646 | + if ( ! isset( $entry[ 'created_by' ] ) ) { |
|
| 647 | 647 | |
| 648 | - do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.'); |
|
| 648 | + do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.' ); |
|
| 649 | 649 | |
| 650 | 650 | return false; |
| 651 | 651 | } |
@@ -653,24 +653,24 @@ discard block |
||
| 653 | 653 | $view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id; |
| 654 | 654 | |
| 655 | 655 | // Only checks user_delete view option if view is already set |
| 656 | - if( $view_id ) { |
|
| 656 | + if ( $view_id ) { |
|
| 657 | 657 | |
| 658 | 658 | $current_view = gravityview_get_current_view_data( $view_id ); |
| 659 | 659 | |
| 660 | - $user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false; |
|
| 660 | + $user_delete = isset( $current_view[ 'atts' ][ 'user_delete' ] ) ? $current_view[ 'atts' ][ 'user_delete' ] : false; |
|
| 661 | 661 | |
| 662 | - if( empty( $user_delete ) ) { |
|
| 662 | + if ( empty( $user_delete ) ) { |
|
| 663 | 663 | |
| 664 | - do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' ); |
|
| 664 | + do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' ); |
|
| 665 | 665 | |
| 666 | 666 | return false; |
| 667 | 667 | } |
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | // If the logged-in user is the same as the user who created the entry, we're good. |
| 671 | - if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
| 671 | + if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) { |
|
| 672 | 672 | |
| 673 | - do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) ); |
|
| 673 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) ); |
|
| 674 | 674 | |
| 675 | 675 | return true; |
| 676 | 676 | } |
@@ -693,31 +693,31 @@ discard block |
||
| 693 | 693 | */ |
| 694 | 694 | public function display_message( $current_view_id = 0 ) { |
| 695 | 695 | |
| 696 | - if( empty( $_GET['status'] ) || ! self::verify_nonce() ) { |
|
| 696 | + if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) { |
|
| 697 | 697 | return; |
| 698 | 698 | } |
| 699 | 699 | |
| 700 | 700 | // Entry wasn't deleted from current View |
| 701 | - if( intval( $_GET['gvid'] ) !== intval( $current_view_id ) ) { |
|
| 701 | + if ( intval( $_GET[ 'gvid' ] ) !== intval( $current_view_id ) ) { |
|
| 702 | 702 | return; |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | - $status = esc_attr( $_GET['status'] ); |
|
| 706 | - $message_from_url = rgget('message'); |
|
| 705 | + $status = esc_attr( $_GET[ 'status' ] ); |
|
| 706 | + $message_from_url = rgget( 'message' ); |
|
| 707 | 707 | $message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) ); |
| 708 | 708 | $class = ''; |
| 709 | 709 | |
| 710 | 710 | switch ( $status ) { |
| 711 | 711 | case 'error': |
| 712 | 712 | $class = ' gv-error error'; |
| 713 | - $error_message = __('There was an error deleting the entry: %s', 'gravityview'); |
|
| 713 | + $error_message = __( 'There was an error deleting the entry: %s', 'gravityview' ); |
|
| 714 | 714 | $message = sprintf( $error_message, $message_from_url ); |
| 715 | 715 | break; |
| 716 | 716 | case 'trashed': |
| 717 | - $message = __('The entry was successfully moved to the trash.', 'gravityview'); |
|
| 717 | + $message = __( 'The entry was successfully moved to the trash.', 'gravityview' ); |
|
| 718 | 718 | break; |
| 719 | 719 | default: |
| 720 | - $message = __('The entry was successfully deleted.', 'gravityview'); |
|
| 720 | + $message = __( 'The entry was successfully deleted.', 'gravityview' ); |
|
| 721 | 721 | break; |
| 722 | 722 | } |
| 723 | 723 | |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | $message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url ); |
| 732 | 732 | |
| 733 | 733 | // DISPLAY ERROR/SUCCESS MESSAGE |
| 734 | - echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>'; |
|
| 734 | + echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>'; |
|
| 735 | 735 | } |
| 736 | 736 | |
| 737 | 737 | |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | $this->label = esc_attr__( 'Approve Entries', 'gravityview' ); |
| 24 | 24 | |
| 25 | - $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' ); |
|
| 25 | + $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' ); |
|
| 26 | 26 | |
| 27 | 27 | $this->add_hooks(); |
| 28 | 28 | |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
| 46 | 46 | |
| 47 | - unset( $field_options['only_loggedin'] ); |
|
| 47 | + unset( $field_options[ 'only_loggedin' ] ); |
|
| 48 | 48 | |
| 49 | - unset( $field_options['new_window'] ); |
|
| 49 | + unset( $field_options[ 'new_window' ] ); |
|
| 50 | 50 | |
| 51 | - unset( $field_options['show_as_link'] ); |
|
| 51 | + unset( $field_options[ 'show_as_link' ] ); |
|
| 52 | 52 | |
| 53 | 53 | return $field_options; |
| 54 | 54 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) ); |
| 70 | 70 | |
| 71 | - add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) ); |
|
| 71 | + add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) ); |
|
| 72 | 72 | |
| 73 | 73 | add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 ); |
| 74 | 74 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | public function maybe_prevent_field_render( $html, $args ) { |
| 89 | 89 | |
| 90 | 90 | // If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render. |
| 91 | - if( $this->name === rgar( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
| 91 | + if ( $this->name === rgar( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 92 | 92 | return ''; |
| 93 | 93 | } |
| 94 | 94 | |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function modify_search_parameters( $parameters ) { |
| 106 | 106 | |
| 107 | - if( $this->name === rgars( $parameters, 'sorting/key' ) ) { |
|
| 108 | - $parameters['sorting']['key'] = 'is_approved'; |
|
| 107 | + if ( $this->name === rgars( $parameters, 'sorting/key' ) ) { |
|
| 108 | + $parameters[ 'sorting' ][ 'key' ] = 'is_approved'; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | return $parameters; |
@@ -121,18 +121,18 @@ discard block |
||
| 121 | 121 | function register_scripts_and_styles() { |
| 122 | 122 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
| 123 | 123 | |
| 124 | - wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true ); |
|
| 124 | + wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true ); |
|
| 125 | 125 | |
| 126 | 126 | $style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css'; |
| 127 | 127 | |
| 128 | - if( class_exists( 'GravityView_View' ) ) { |
|
| 128 | + if ( class_exists( 'GravityView_View' ) ) { |
|
| 129 | 129 | /** |
| 130 | 130 | * Override CSS file by placing in your theme's /gravityview/css/ sub-directory. |
| 131 | 131 | */ |
| 132 | 132 | $style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false ); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) ); |
|
| 135 | + $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) ); |
|
| 136 | 136 | |
| 137 | 137 | /** |
| 138 | 138 | * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file. |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | $style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url ); |
| 143 | 143 | |
| 144 | - if( ! empty( $style_url ) ) { |
|
| 144 | + if ( ! empty( $style_url ) ) { |
|
| 145 | 145 | wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' ); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | public function enqueue_and_localize_script() { |
| 157 | 157 | |
| 158 | 158 | // The script is already registered and enqueued |
| 159 | - if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) { |
|
| 159 | + if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) { |
|
| 160 | 160 | return; |
| 161 | 161 | } |
| 162 | 162 | |
@@ -166,9 +166,9 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | wp_localize_script( 'gravityview-field-approval', 'gvApproval', array( |
| 168 | 168 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
| 169 | - 'nonce' => wp_create_nonce('gravityview_entry_approval'), |
|
| 169 | + 'nonce' => wp_create_nonce( 'gravityview_entry_approval' ), |
|
| 170 | 170 | 'status' => GravityView_Entry_Approval_Status::get_all(), |
| 171 | - )); |
|
| 171 | + ) ); |
|
| 172 | 172 | |
| 173 | 173 | } |
| 174 | 174 | |
@@ -185,8 +185,8 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) { |
| 187 | 187 | |
| 188 | - if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) { |
|
| 189 | - $entry_default_fields["{$this->name}"] = array( |
|
| 188 | + if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) { |
|
| 189 | + $entry_default_fields[ "{$this->name}" ] = array( |
|
| 190 | 190 | 'label' => $this->label, |
| 191 | 191 | 'desc' => $this->description, |
| 192 | 192 | 'type' => $this->name, |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | ) ); |
| 108 | 108 | |
| 109 | 109 | // This is just HTML we don't need. |
| 110 | - unset( $response['message'] ); |
|
| 110 | + unset( $response[ 'message' ] ); |
|
| 111 | 111 | |
| 112 | - switch ( intval( $response['license_limit'] ) ) { |
|
| 112 | + switch ( intval( $response[ 'license_limit' ] ) ) { |
|
| 113 | 113 | case 1: |
| 114 | 114 | $package = 'Sol'; |
| 115 | 115 | break; |
@@ -120,24 +120,24 @@ discard block |
||
| 120 | 120 | $package = 'Interstellar'; |
| 121 | 121 | break; |
| 122 | 122 | default: |
| 123 | - $package = sprintf( '%d-Site License', $response['license_limit'] ); |
|
| 123 | + $package = sprintf( '%d-Site License', $response[ 'license_limit' ] ); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $data = array( |
| 127 | 127 | 'email' => GravityView_Settings::getSetting( 'support-email' ), |
| 128 | - 'name' => $response['customer_name'], |
|
| 129 | - 'Valid License?' => ucwords( $response['license'] ), |
|
| 130 | - 'License Key' => $response['license_key'], |
|
| 128 | + 'name' => $response[ 'customer_name' ], |
|
| 129 | + 'Valid License?' => ucwords( $response[ 'license' ] ), |
|
| 130 | + 'License Key' => $response[ 'license_key' ], |
|
| 131 | 131 | 'License Level' => $package, |
| 132 | 132 | 'Site Admin Email' => get_bloginfo( 'admin_email' ), |
| 133 | 133 | 'Support Email' => GravityView_Settings::getSetting( 'support-email' ), |
| 134 | - 'License Limit' => $response['license_limit'], |
|
| 135 | - 'Site Count' => $response['site_count'], |
|
| 136 | - 'License Expires' => $response['expires'], |
|
| 137 | - 'Activations Left' => $response['activations_left'], |
|
| 138 | - 'Payment ID' => $response['payment_id'], |
|
| 139 | - 'Payment Name' => $response['customer_name'], |
|
| 140 | - 'Payment Email' => $response['customer_email'], |
|
| 134 | + 'License Limit' => $response[ 'license_limit' ], |
|
| 135 | + 'Site Count' => $response[ 'site_count' ], |
|
| 136 | + 'License Expires' => $response[ 'expires' ], |
|
| 137 | + 'Activations Left' => $response[ 'activations_left' ], |
|
| 138 | + 'Payment ID' => $response[ 'payment_id' ], |
|
| 139 | + 'Payment Name' => $response[ 'customer_name' ], |
|
| 140 | + 'Payment Email' => $response[ 'customer_email' ], |
|
| 141 | 141 | 'WordPress Version' => get_bloginfo( 'version', 'display' ), |
| 142 | 142 | 'PHP Version' => phpversion(), |
| 143 | 143 | 'GravityView Version' => GravityView_Plugin::version, |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 42 | 42 | |
| 43 | - unset ( $field_options['search_filter'], $field_options['show_as_link'] ); |
|
| 43 | + unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] ); |
|
| 44 | 44 | |
| 45 | 45 | $new_fields = array( |
| 46 | 46 | 'content' => array( |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | ), |
| 61 | 61 | ); |
| 62 | 62 | |
| 63 | - if( 'edit' === $context ) { |
|
| 64 | - unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'] ); |
|
| 63 | + if ( 'edit' === $context ) { |
|
| 64 | + unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ] ); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | return $new_fields + $field_options; |
@@ -95,9 +95,9 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | // Loop through the configured Edit Entry fields and add Custom Content fields if there are any |
| 97 | 97 | // TODO: Make this available to other custom GV field types |
| 98 | - foreach ( (array) $edit_fields as $edit_field ) { |
|
| 98 | + foreach ( (array)$edit_fields as $edit_field ) { |
|
| 99 | 99 | |
| 100 | - if( 'custom' === rgar( $edit_field, 'id') ) { |
|
| 100 | + if ( 'custom' === rgar( $edit_field, 'id' ) ) { |
|
| 101 | 101 | |
| 102 | 102 | $field_data = array( |
| 103 | 103 | 'label' => rgar( $edit_field, 'custom_label' ), |
@@ -110,13 +110,13 @@ discard block |
||
| 110 | 110 | $field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry, false, false ); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - $field_data['cssClass'] = rgar( $edit_field, 'custom_class' ); |
|
| 113 | + $field_data[ 'cssClass' ] = rgar( $edit_field, 'custom_class' ); |
|
| 114 | 114 | |
| 115 | - $new_fields[] = new GF_Field_HTML( $field_data ); |
|
| 115 | + $new_fields[ ] = new GF_Field_HTML( $field_data ); |
|
| 116 | 116 | |
| 117 | 117 | } else { |
| 118 | - if( isset( $fields[ $i ] ) ) { |
|
| 119 | - $new_fields[] = $fields[ $i ]; |
|
| 118 | + if ( isset( $fields[ $i ] ) ) { |
|
| 119 | + $new_fields[ ] = $fields[ $i ]; |
|
| 120 | 120 | } |
| 121 | 121 | $i++; |
| 122 | 122 | } |
@@ -65,11 +65,11 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | $atts = wp_parse_args( $atts, $defaults ); |
| 67 | 67 | |
| 68 | - foreach( $atts as $key => $val ) { |
|
| 68 | + foreach ( $atts as $key => $val ) { |
|
| 69 | 69 | $this->{$key} = $val; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - $this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; |
|
| 72 | + $this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; |
|
| 73 | 73 | |
| 74 | 74 | $this->set_image_size(); |
| 75 | 75 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | function validate_image_src() { |
| 87 | 87 | |
| 88 | - if ( !$this->validate_src ) { return true; } |
|
| 88 | + if ( ! $this->validate_src ) { return true; } |
|
| 89 | 89 | |
| 90 | 90 | $info = pathinfo( $this->src ); |
| 91 | 91 | |
@@ -93,9 +93,9 @@ discard block |
||
| 93 | 93 | * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag |
| 94 | 94 | * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']` |
| 95 | 95 | */ |
| 96 | - $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' )); |
|
| 96 | + $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ) ); |
|
| 97 | 97 | |
| 98 | - return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts); |
|
| 98 | + return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts ); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -111,16 +111,16 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | // And there is no string size passed |
| 113 | 113 | // And we want to get the image size using PHP |
| 114 | - if ( empty( $string ) && !empty( $this->getimagesize ) ) { |
|
| 114 | + if ( empty( $string ) && ! empty( $this->getimagesize ) ) { |
|
| 115 | 115 | |
| 116 | 116 | $image_size = @getimagesize( $this->src ); |
| 117 | 117 | |
| 118 | 118 | // If it didn't return a response, it may be a HTTPS/SSL error |
| 119 | - if ( empty( $image_size[0] ) ) { |
|
| 119 | + if ( empty( $image_size[ 0 ] ) ) { |
|
| 120 | 120 | $image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) ); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - if ( !empty( $image_size ) ) { |
|
| 123 | + if ( ! empty( $image_size ) ) { |
|
| 124 | 124 | list( $width, $height ) = $image_size; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -133,33 +133,33 @@ discard block |
||
| 133 | 133 | * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels |
| 134 | 134 | */ |
| 135 | 135 | $image_sizes = apply_filters( 'gravityview_image_sizes', array( |
| 136 | - 'tiny' => array('width' => 40, 'height' => 30), |
|
| 137 | - 'small' => array('width' => 100, 'height' => 75), |
|
| 138 | - 'medium' => array('width' => 250, 'height' => 188), |
|
| 139 | - 'large' => array('width' => 448, 'height' => 336), |
|
| 136 | + 'tiny' => array( 'width' => 40, 'height' => 30 ), |
|
| 137 | + 'small' => array( 'width' => 100, 'height' => 75 ), |
|
| 138 | + 'medium' => array( 'width' => 250, 'height' => 188 ), |
|
| 139 | + 'large' => array( 'width' => 448, 'height' => 336 ), |
|
| 140 | 140 | ) ); |
| 141 | 141 | |
| 142 | - switch( $this->size ) { |
|
| 142 | + switch ( $this->size ) { |
|
| 143 | 143 | case 'tiny': |
| 144 | - extract($image_sizes['tiny']); |
|
| 144 | + extract( $image_sizes[ 'tiny' ] ); |
|
| 145 | 145 | break; |
| 146 | 146 | case 'small': |
| 147 | 147 | case 's': |
| 148 | 148 | case 'thumb': |
| 149 | - extract($image_sizes['small']); |
|
| 149 | + extract( $image_sizes[ 'small' ] ); |
|
| 150 | 150 | break; |
| 151 | 151 | case 'm': |
| 152 | 152 | case 'medium': |
| 153 | - extract($image_sizes['medium']); |
|
| 153 | + extract( $image_sizes[ 'medium' ] ); |
|
| 154 | 154 | break; |
| 155 | 155 | case 'large': |
| 156 | 156 | case 'l': |
| 157 | - extract($image_sizes['large']); |
|
| 157 | + extract( $image_sizes[ 'large' ] ); |
|
| 158 | 158 | break; |
| 159 | 159 | default: |
| 160 | 160 | // Verify that the passed sizes are integers. |
| 161 | - $width = !empty( $width ) ? intval( $width ) : intval( $this->width ); |
|
| 162 | - $height = !empty( $height ) ? intval( $height ) : intval( $this->height ); |
|
| 161 | + $width = ! empty( $width ) ? intval( $width ) : intval( $this->width ); |
|
| 162 | + $height = ! empty( $height ) ? intval( $height ) : intval( $this->height ); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | } |
@@ -58,8 +58,8 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | if ( 'address' === rgar( $search_field, 'type' ) ) { |
| 60 | 60 | |
| 61 | - $field_id = intval( floor( $search_field['key'] ) ); |
|
| 62 | - $input_id = gravityview_get_input_id_from_id( $search_field['key'] ); |
|
| 61 | + $field_id = intval( floor( $search_field[ 'key' ] ) ); |
|
| 62 | + $input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] ); |
|
| 63 | 63 | $form = GravityView_View::getInstance()->getForm(); |
| 64 | 64 | |
| 65 | 65 | /** @var GF_Field_Address $address_field */ |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $choices = array(); |
| 69 | 69 | |
| 70 | 70 | $method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id ); |
| 71 | - if( method_exists( $this, $method_name ) ) { |
|
| 71 | + if ( method_exists( $this, $method_name ) ) { |
|
| 72 | 72 | /** |
| 73 | 73 | * @uses GravityView_Field_Address::get_choices_country() |
| 74 | 74 | * @uses GravityView_Field_Address::get_choices_state() |
@@ -76,12 +76,12 @@ discard block |
||
| 76 | 76 | $choices = $this->{$method_name}( $address_field ); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - if( ! empty( $choices ) ) { |
|
| 80 | - $search_field['choices'] = $choices; |
|
| 81 | - $search_field['type'] = rgar( $search_field, 'input'); |
|
| 79 | + if ( ! empty( $choices ) ) { |
|
| 80 | + $search_field[ 'choices' ] = $choices; |
|
| 81 | + $search_field[ 'type' ] = rgar( $search_field, 'input' ); |
|
| 82 | 82 | } else { |
| 83 | - $search_field['type'] = 'text'; |
|
| 84 | - $search_field['input'] = 'input_text'; |
|
| 83 | + $search_field[ 'type' ] = 'text'; |
|
| 84 | + $search_field[ 'input' ] = 'input_text'; |
|
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $country_choices = array(); |
| 108 | 108 | |
| 109 | 109 | foreach ( $countries as $key => $country ) { |
| 110 | - $country_choices[] = array( |
|
| 110 | + $country_choices[ ] = array( |
|
| 111 | 111 | 'value' => $country, |
| 112 | 112 | 'text' => $country, |
| 113 | 113 | ); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | */ |
| 132 | 132 | private function get_choices_state( $address_field ) { |
| 133 | 133 | |
| 134 | - $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType; |
|
| 134 | + $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType; |
|
| 135 | 135 | |
| 136 | 136 | $state_choices = array(); |
| 137 | 137 | |
@@ -143,12 +143,12 @@ discard block |
||
| 143 | 143 | $states = GFCommon::get_canadian_provinces(); |
| 144 | 144 | break; |
| 145 | 145 | default: |
| 146 | - $states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states']; |
|
| 146 | + $states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ]; |
|
| 147 | 147 | break; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | foreach ( $states as $key => $state ) { |
| 151 | - $state_choices[] = array( |
|
| 151 | + $state_choices[ ] = array( |
|
| 152 | 152 | 'value' => $state, |
| 153 | 153 | 'text' => $state, |
| 154 | 154 | ); |
@@ -171,13 +171,13 @@ discard block |
||
| 171 | 171 | // Use the same inputs as the "text" input type allows |
| 172 | 172 | $text_inputs = rgar( $input_types, 'text' ); |
| 173 | 173 | |
| 174 | - $input_types['street'] = $text_inputs; |
|
| 175 | - $input_types['street2'] = $text_inputs; |
|
| 176 | - $input_types['city'] = $text_inputs; |
|
| 174 | + $input_types[ 'street' ] = $text_inputs; |
|
| 175 | + $input_types[ 'street2' ] = $text_inputs; |
|
| 176 | + $input_types[ 'city' ] = $text_inputs; |
|
| 177 | 177 | |
| 178 | - $input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 179 | - $input_types['zip'] = array( 'input_text' ); |
|
| 180 | - $input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 178 | + $input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 179 | + $input_types[ 'zip' ] = array( 'input_text' ); |
|
| 180 | + $input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 181 | 181 | |
| 182 | 182 | return $input_types; |
| 183 | 183 | } |
@@ -198,10 +198,10 @@ discard block |
||
| 198 | 198 | // Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)? |
| 199 | 199 | $input_id = gravityview_get_input_id_from_id( $field_id ); |
| 200 | 200 | |
| 201 | - if( 'address' === $field_type && $input_id ) { |
|
| 201 | + if ( 'address' === $field_type && $input_id ) { |
|
| 202 | 202 | |
| 203 | 203 | // If the input ID matches an expected address input, set to that. Otherwise, keep existing input type. |
| 204 | - if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
| 204 | + if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
| 205 | 205 | $input_type = $address_field_name; |
| 206 | 206 | } |
| 207 | 207 | } |
@@ -250,20 +250,20 @@ discard block |
||
| 250 | 250 | function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
| 251 | 251 | |
| 252 | 252 | // If this is NOT the full address field, return default options. |
| 253 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 253 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 254 | 254 | return $field_options; |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | - if( 'edit' === $context ) { |
|
| 257 | + if ( 'edit' === $context ) { |
|
| 258 | 258 | return $field_options; |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | $add_options = array(); |
| 262 | 262 | |
| 263 | - $add_options['show_map_link'] = array( |
|
| 263 | + $add_options[ 'show_map_link' ] = array( |
|
| 264 | 264 | 'type' => 'checkbox', |
| 265 | 265 | 'label' => __( 'Show Map Link:', 'gravityview' ), |
| 266 | - 'desc' => __('Display a "Map It" link below the address', 'gravityview'), |
|
| 266 | + 'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ), |
|
| 267 | 267 | 'value' => true, |
| 268 | 268 | 'merge_tags' => false, |
| 269 | 269 | ); |