@@ -292,7 +292,7 @@ discard block  | 
                                                    ||
| 292 | 292 | *  | 
                                                        
| 293 | 293 | * @since 1.18  | 
                                                        
| 294 | 294 | *  | 
                                                        
| 295 | - * @param int|string $value_or_key Valid status value or key (1 or "approved")  | 
                                                        |
| 295 | + * @param string $value_or_key Valid status value or key (1 or "approved")  | 
                                                        |
| 296 | 296 | *  | 
                                                        
| 297 | 297 |  	 * @return string|false Label of value ("Approved"). If invalid value, return false. | 
                                                        
| 298 | 298 | */  | 
                                                        
@@ -314,7 +314,6 @@ discard block  | 
                                                    ||
| 314 | 314 | /**  | 
                                                        
| 315 | 315 | * Get HTML template for a popover used to display approval statuses  | 
                                                        
| 316 | 316 | *  | 
                                                        
| 317 | - * @param int $value Status value (1, 2, 3)  | 
                                                        |
| 318 | 317 | *  | 
                                                        
| 319 | 318 | * @return string HTML code  | 
                                                        
| 320 | 319 | */  | 
                                                        
@@ -114,16 +114,16 @@ discard block  | 
                                                    ||
| 114 | 114 | $new_value = $old_value;  | 
                                                        
| 115 | 115 | |
| 116 | 116 | // Meta value does not exist yet  | 
                                                        
| 117 | -		if( false === $old_value ) { | 
                                                        |
| 117 | +		if ( false === $old_value ) { | 
                                                        |
| 118 | 118 | return self::UNAPPROVED;  | 
                                                        
| 119 | 119 | }  | 
                                                        
| 120 | 120 | |
| 121 | 121 | // Meta value does not exist yet  | 
                                                        
| 122 | -		if( true === $old_value ) { | 
                                                        |
| 122 | +		if ( true === $old_value ) { | 
                                                        |
| 123 | 123 | return self::APPROVED;  | 
                                                        
| 124 | 124 | }  | 
                                                        
| 125 | 125 | |
| 126 | -		switch ( (string) $old_value ) { | 
                                                        |
| 126 | +		switch ( (string)$old_value ) { | 
                                                        |
| 127 | 127 | |
| 128 | 128 | // Approved values  | 
                                                        
| 129 | 129 | case 'Approved':  | 
                                                        
@@ -249,9 +249,9 @@ discard block  | 
                                                    ||
| 249 | 249 |  		foreach ( $choices as $key => $choice ) { | 
                                                        
| 250 | 250 | |
| 251 | 251 | // Is the passed status value the same as the choice value or key?  | 
                                                        
| 252 | -			if ( $status === $choice['value'] || $status === $key ) { | 
                                                        |
| 252 | +			if ( $status === $choice[ 'value' ] || $status === $key ) { | 
                                                        |
| 253 | 253 | |
| 254 | -				if( 'key' === $attr_key ) { | 
                                                        |
| 254 | +				if ( 'key' === $attr_key ) { | 
                                                        |
| 255 | 255 | return $key;  | 
                                                        
| 256 | 256 |  				} else { | 
                                                        
| 257 | 257 | return \GV\Utils::get( $choice, $attr_key, false );  | 
                                                        
@@ -323,9 +323,9 @@ discard block  | 
                                                    ||
| 323 | 323 | $choices = self::get_choices();  | 
                                                        
| 324 | 324 | |
| 325 | 325 | return <<<TEMPLATE  | 
                                                        
| 326 | -<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a> | 
                                                        |
| 327 | -<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a> | 
                                                        |
| 328 | -<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a> | 
                                                        |
| 326 | +<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a> | 
                                                        |
| 327 | +<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a> | 
                                                        |
| 328 | +<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a> | 
                                                        |
| 329 | 329 | TEMPLATE;  | 
                                                        
| 330 | 330 | }  | 
                                                        
| 331 | 331 | }  | 
                                                        
@@ -326,6 +326,6 @@  | 
                                                    ||
| 326 | 326 |  <a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a> | 
                                                        
| 327 | 327 |  <a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a> | 
                                                        
| 328 | 328 |  <a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a> | 
                                                        
| 329 | -TEMPLATE;  | 
                                                        |
| 329 | +template;  | 
                                                        |
| 330 | 330 | }  | 
                                                        
| 331 | 331 | }  | 
                                                        
@@ -361,14 +361,14 @@ discard block  | 
                                                    ||
| 361 | 361 | /**  | 
                                                        
| 362 | 362 | * update_approved function.  | 
                                                        
| 363 | 363 | *  | 
                                                        
| 364 | - * @since 1.18 Moved to GravityView_Entry_Approval::update_approved  | 
                                                        |
| 364 | + * @since 1.18 Moved to GravityView_Entry_Approval::update_approved  | 
                                                        |
| 365 | 365 | * @see GravityView_Entry_Approval::update_approved  | 
                                                        
| 366 | - *  | 
                                                        |
| 366 | + *  | 
                                                        |
| 367 | 367 | * @param int $entry_id (default: 0)  | 
                                                        
| 368 | 368 | * @param int $approved (default: 0)  | 
                                                        
| 369 | 369 | * @param int $form_id (default: 0)  | 
                                                        
| 370 | 370 | * @param int $approvedcolumn (default: 0)  | 
                                                        
| 371 | - *  | 
                                                        |
| 371 | + *  | 
                                                        |
| 372 | 372 | * @return boolean True: It worked; False: it failed  | 
                                                        
| 373 | 373 | */  | 
                                                        
| 374 | 374 |  	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) { | 
                                                        
@@ -378,9 +378,9 @@ discard block  | 
                                                    ||
| 378 | 378 | /**  | 
                                                        
| 379 | 379 | * Calculate the approve field.input id  | 
                                                        
| 380 | 380 | *  | 
                                                        
| 381 | - * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column  | 
                                                        |
| 382 | - * @see GravityView_Entry_Approval::get_approved_column  | 
                                                        |
| 383 | - *  | 
                                                        |
| 381 | + * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column  | 
                                                        |
| 382 | + * @see GravityView_Entry_Approval::get_approved_column  | 
                                                        |
| 383 | + *  | 
                                                        |
| 384 | 384 | * @param mixed $form GF Form or Form ID  | 
                                                        
| 385 | 385 | * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.  | 
                                                        
| 386 | 386 | */  | 
                                                        
@@ -505,36 +505,36 @@ discard block  | 
                                                    ||
| 505 | 505 | 'bulk_actions' => $this->get_bulk_actions( $form_id ),  | 
                                                        
| 506 | 506 | 'bulk_message' => $this->bulk_update_message,  | 
                                                        
| 507 | 507 |  			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'), | 
                                                        
| 508 | -            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), | 
                                                        |
| 508 | +			'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), | 
                                                        |
| 509 | 509 |  			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'), | 
                                                        
| 510 | 510 | 'column_title' => __( 'Show entry in directory view?', 'gravityview'),  | 
                                                        
| 511 | 511 | 'column_link' => esc_url( $this->get_sort_link() ),  | 
                                                        
| 512 | - 'status_popover_template' => GravityView_Entry_Approval_Status::get_status_popover_template(),  | 
                                                        |
| 512 | + 'status_popover_template' => GravityView_Entry_Approval_Status::get_status_popover_template(),  | 
                                                        |
| 513 | 513 | ) );  | 
                                                        
| 514 | 514 | |
| 515 | 515 | }  | 
                                                        
| 516 | 516 | |
| 517 | 517 | /**  | 
                                                        
| 518 | - * Generate a link to sort by approval status  | 
                                                        |
| 519 | - *  | 
                                                        |
| 520 | - * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as  | 
                                                        |
| 521 | - * numeric, but it does group the approved entries together.  | 
                                                        |
| 522 | - *  | 
                                                        |
| 523 | - * @since 2.0.14 Remove need for approval field for sorting by approval status  | 
                                                        |
| 524 | - *  | 
                                                        |
| 518 | + * Generate a link to sort by approval status  | 
                                                        |
| 519 | + *  | 
                                                        |
| 520 | + * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as  | 
                                                        |
| 521 | + * numeric, but it does group the approved entries together.  | 
                                                        |
| 522 | + *  | 
                                                        |
| 523 | + * @since 2.0.14 Remove need for approval field for sorting by approval status  | 
                                                        |
| 524 | + *  | 
                                                        |
| 525 | 525 | * @param int $form_id [NO LONGER USED]  | 
                                                        
| 526 | 526 | *  | 
                                                        
| 527 | 527 | * @return string Sorting link  | 
                                                        
| 528 | 528 | */  | 
                                                        
| 529 | 529 |  	private function get_sort_link( $form_id = 0 ) { | 
                                                        
| 530 | 530 | |
| 531 | - $args = array(  | 
                                                        |
| 532 | - 'orderby' => 'is_approved',  | 
                                                        |
| 533 | - 'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',  | 
                                                        |
| 534 | - );  | 
                                                        |
| 531 | + $args = array(  | 
                                                        |
| 532 | + 'orderby' => 'is_approved',  | 
                                                        |
| 533 | + 'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',  | 
                                                        |
| 534 | + );  | 
                                                        |
| 535 | 535 | |
| 536 | 536 | return add_query_arg( $args );  | 
                                                        
| 537 | - }  | 
                                                        |
| 537 | + }  | 
                                                        |
| 538 | 538 | |
| 539 | 539 | /**  | 
                                                        
| 540 | 540 | * Get an array of options to be added to the Gravity Forms "Bulk action" dropdown in a "GravityView" option group  | 
                                                        
@@ -576,9 +576,9 @@ discard block  | 
                                                    ||
| 576 | 576 | // Sanitize the values, just to be sure.  | 
                                                        
| 577 | 577 |  		foreach ( $bulk_actions as $key => $group ) { | 
                                                        
| 578 | 578 | |
| 579 | -		    if( empty( $group ) ) { | 
                                                        |
| 580 | - continue;  | 
                                                        |
| 581 | - }  | 
                                                        |
| 579 | +			if( empty( $group ) ) { | 
                                                        |
| 580 | + continue;  | 
                                                        |
| 581 | + }  | 
                                                        |
| 582 | 582 | |
| 583 | 583 |  			foreach ( $group as $i => $action ) { | 
                                                        
| 584 | 584 | $bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );  | 
                                                        
@@ -44,7 +44,7 @@ discard block  | 
                                                    ||
| 44 | 44 | /** gf_entries page - entries table screen */  | 
                                                        
| 45 | 45 | |
| 46 | 46 | // capture bulk actions  | 
                                                        
| 47 | - add_action( 'gform_loaded', array( $this, 'process_bulk_action') );  | 
                                                        |
| 47 | + add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );  | 
                                                        |
| 48 | 48 | |
| 49 | 49 | // add hidden field with approve status  | 
                                                        
| 50 | 50 | add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );  | 
                                                        
@@ -52,7 +52,7 @@ discard block  | 
                                                    ||
| 52 | 52 | add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );  | 
                                                        
| 53 | 53 | |
| 54 | 54 | // adding styles and scripts  | 
                                                        
| 55 | - add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );  | 
                                                        |
| 55 | + add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );  | 
                                                        |
| 56 | 56 | // bypass Gravity Forms no-conflict mode  | 
                                                        
| 57 | 57 | add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );  | 
                                                        
| 58 | 58 | add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );  | 
                                                        
@@ -81,7 +81,7 @@ discard block  | 
                                                    ||
| 81 | 81 | * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.  | 
                                                        
| 82 | 82 | * @param array $form GF Form object of current form  | 
                                                        
| 83 | 83 | */  | 
                                                        
| 84 | -		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) { | 
                                                        |
| 84 | +		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) { | 
                                                        |
| 85 | 85 | return $filter_links;  | 
                                                        
| 86 | 86 | }  | 
                                                        
| 87 | 87 | |
@@ -109,27 +109,27 @@ discard block  | 
                                                    ||
| 109 | 109 | $approved_count = $disapproved_count = $unapproved_count = 0;  | 
                                                        
| 110 | 110 | |
| 111 | 111 | // Only count if necessary  | 
                                                        
| 112 | -		if( $include_counts ) { | 
                                                        |
| 113 | - $approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );  | 
                                                        |
| 114 | - $disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );  | 
                                                        |
| 115 | - $unapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );  | 
                                                        |
| 112 | +		if ( $include_counts ) { | 
                                                        |
| 113 | + $approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );  | 
                                                        |
| 114 | + $disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );  | 
                                                        |
| 115 | + $unapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );  | 
                                                        |
| 116 | 116 | }  | 
                                                        
| 117 | 117 | |
| 118 | - $filter_links[] = array(  | 
                                                        |
| 118 | + $filter_links[ ] = array(  | 
                                                        |
| 119 | 119 | 'id' => 'gv_approved',  | 
                                                        
| 120 | 120 | 'field_filters' => $field_filters_approved,  | 
                                                        
| 121 | 121 | 'count' => $approved_count,  | 
                                                        
| 122 | 122 | 'label' => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),  | 
                                                        
| 123 | 123 | );  | 
                                                        
| 124 | 124 | |
| 125 | - $filter_links[] = array(  | 
                                                        |
| 125 | + $filter_links[ ] = array(  | 
                                                        |
| 126 | 126 | 'id' => 'gv_disapproved',  | 
                                                        
| 127 | 127 | 'field_filters' => $field_filters_disapproved,  | 
                                                        
| 128 | 128 | 'count' => $disapproved_count,  | 
                                                        
| 129 | 129 | 'label' => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::DISAPPROVED ),  | 
                                                        
| 130 | 130 | );  | 
                                                        
| 131 | 131 | |
| 132 | - $filter_links[] = array(  | 
                                                        |
| 132 | + $filter_links[ ] = array(  | 
                                                        |
| 133 | 133 | 'id' => 'gv_unapproved',  | 
                                                        
| 134 | 134 | 'field_filters' => $field_filters_unapproved,  | 
                                                        
| 135 | 135 | 'count' => $unapproved_count,  | 
                                                        
@@ -148,9 +148,9 @@ discard block  | 
                                                    ||
| 148 | 148 | */  | 
                                                        
| 149 | 149 |  	function tooltips( $tooltips ) { | 
                                                        
| 150 | 150 | |
| 151 | - $tooltips['form_gravityview_fields'] = array(  | 
                                                        |
| 152 | -			'title' => __('GravityView Fields', 'gravityview'), | 
                                                        |
| 153 | - 'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),  | 
                                                        |
| 151 | + $tooltips[ 'form_gravityview_fields' ] = array(  | 
                                                        |
| 152 | + 'title' => __( 'GravityView Fields', 'gravityview' ),  | 
                                                        |
| 153 | + 'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),  | 
                                                        |
| 154 | 154 | );  | 
                                                        
| 155 | 155 | |
| 156 | 156 | return $tooltips;  | 
                                                        
@@ -261,7 +261,7 @@ discard block  | 
                                                    ||
| 261 | 261 | |
| 262 | 262 | $gv_bulk_action = false;  | 
                                                        
| 263 | 263 | |
| 264 | -		if( version_compare( GFForms::$version, '2.0', '>=' ) ) { | 
                                                        |
| 264 | +		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) { | 
                                                        |
| 265 | 265 | $bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );  | 
                                                        
| 266 | 266 |  		} else { | 
                                                        
| 267 | 267 | // GF 1.9.x - Bulk action 2 is the bottom bulk action select form.  | 
                                                        
@@ -269,7 +269,7 @@ discard block  | 
                                                    ||
| 269 | 269 | }  | 
                                                        
| 270 | 270 | |
| 271 | 271 | // Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().  | 
                                                        
| 272 | -		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) { | 
                                                        |
| 272 | +		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) { | 
                                                        |
| 273 | 273 | $gv_bulk_action = $bulk_action;  | 
                                                        
| 274 | 274 | }  | 
                                                        
| 275 | 275 | |
@@ -294,7 +294,7 @@ discard block  | 
                                                    ||
| 294 | 294 | |
| 295 | 295 | // gforms_entry_list is the nonce that confirms we're on the right page  | 
                                                        
| 296 | 296 | // gforms_update_note is sent when bulk editing entry notes. We don't want to process then.  | 
                                                        
| 297 | -		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) { | 
                                                        |
| 297 | +		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) { | 
                                                        |
| 298 | 298 | |
| 299 | 299 | check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );  | 
                                                        
| 300 | 300 | |
@@ -312,13 +312,13 @@ discard block  | 
                                                    ||
| 312 | 312 | }  | 
                                                        
| 313 | 313 | |
| 314 | 314 | // All entries are set to be updated, not just the visible ones  | 
                                                        
| 315 | -			if ( ! empty( $_POST['all_entries'] ) ) { | 
                                                        |
| 315 | +			if ( ! empty( $_POST[ 'all_entries' ] ) ) { | 
                                                        |
| 316 | 316 | |
| 317 | 317 | // Convert the current entry search into GF-formatted search criteria  | 
                                                        
| 318 | 318 | $search = array(  | 
                                                        
| 319 | - 'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,  | 
                                                        |
| 320 | - 'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',  | 
                                                        |
| 321 | - 'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',  | 
                                                        |
| 319 | + 'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,  | 
                                                        |
| 320 | + 'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',  | 
                                                        |
| 321 | + 'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',  | 
                                                        |
| 322 | 322 | );  | 
                                                        
| 323 | 323 | |
| 324 | 324 | $search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );  | 
                                                        
@@ -329,7 +329,7 @@ discard block  | 
                                                    ||
| 329 | 329 |  			} else { | 
                                                        
| 330 | 330 | |
| 331 | 331 | // Changed from 'lead' to 'entry' in 2.0  | 
                                                        
| 332 | - $entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];  | 
                                                        |
| 332 | + $entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];  | 
                                                        |
| 333 | 333 | |
| 334 | 334 | }  | 
                                                        
| 335 | 335 | |
@@ -341,15 +341,15 @@ discard block  | 
                                                    ||
| 341 | 341 | $entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );  | 
                                                        
| 342 | 342 | |
| 343 | 343 |  			switch ( $approved_status ) { | 
                                                        
| 344 | - case $this->bulk_action_prefixes['approve']:  | 
                                                        |
| 344 | + case $this->bulk_action_prefixes[ 'approve' ]:  | 
                                                        |
| 345 | 345 | GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );  | 
                                                        
| 346 | 346 | $this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );  | 
                                                        
| 347 | 347 | break;  | 
                                                        
| 348 | - case $this->bulk_action_prefixes['unapprove']:  | 
                                                        |
| 348 | + case $this->bulk_action_prefixes[ 'unapprove' ]:  | 
                                                        |
| 349 | 349 | GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );  | 
                                                        
| 350 | 350 | $this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );  | 
                                                        
| 351 | 351 | break;  | 
                                                        
| 352 | - case $this->bulk_action_prefixes['disapprove']:  | 
                                                        |
| 352 | + case $this->bulk_action_prefixes[ 'disapprove' ]:  | 
                                                        |
| 353 | 353 | GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );  | 
                                                        
| 354 | 354 | $this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );  | 
                                                        
| 355 | 355 | break;  | 
                                                        
@@ -371,7 +371,7 @@ discard block  | 
                                                    ||
| 371 | 371 | *  | 
                                                        
| 372 | 372 | * @return boolean True: It worked; False: it failed  | 
                                                        
| 373 | 373 | */  | 
                                                        
| 374 | -	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) { | 
                                                        |
| 374 | +	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) { | 
                                                        |
| 375 | 375 | return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );  | 
                                                        
| 376 | 376 | }  | 
                                                        
| 377 | 377 | |
@@ -401,20 +401,20 @@ discard block  | 
                                                    ||
| 401 | 401 | *  | 
                                                        
| 402 | 402 | * @return void  | 
                                                        
| 403 | 403 | */  | 
                                                        
| 404 | -	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) { | 
                                                        |
| 404 | +	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) { | 
                                                        |
| 405 | 405 | |
| 406 | -		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) { | 
                                                        |
| 406 | +		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) { | 
                                                        |
| 407 | 407 | return;  | 
                                                        
| 408 | 408 | }  | 
                                                        
| 409 | 409 | |
| 410 | -		if( empty( $entry['id'] ) ) { | 
                                                        |
| 410 | +		if ( empty( $entry[ 'id' ] ) ) { | 
                                                        |
| 411 | 411 | return;  | 
                                                        
| 412 | 412 | }  | 
                                                        
| 413 | 413 | |
| 414 | 414 | $status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );  | 
                                                        
| 415 | 415 | |
| 416 | -		if( $status_value ) { | 
                                                        |
| 417 | - echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';  | 
                                                        |
| 416 | +		if ( $status_value ) { | 
                                                        |
| 417 | + echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';  | 
                                                        |
| 418 | 418 | }  | 
                                                        
| 419 | 419 | }  | 
                                                        
| 420 | 420 | |
@@ -427,10 +427,10 @@ discard block  | 
                                                    ||
| 427 | 427 | */  | 
                                                        
| 428 | 428 |  	private function get_form_id() { | 
                                                        
| 429 | 429 | |
| 430 | -		$form_id = GFForms::get('id'); | 
                                                        |
| 430 | + $form_id = GFForms::get( 'id' );  | 
                                                        |
| 431 | 431 | |
| 432 | 432 | // If there are no forms identified, use the first form. That's how GF does it.  | 
                                                        
| 433 | -		if( empty( $form_id ) && class_exists('RGFormsModel') ) { | 
                                                        |
| 433 | +		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) { | 
                                                        |
| 434 | 434 | $form_id = $this->get_first_form_id();  | 
                                                        
| 435 | 435 | }  | 
                                                        
| 436 | 436 | |
@@ -450,14 +450,14 @@ discard block  | 
                                                    ||
| 450 | 450 | |
| 451 | 451 | $forms = RGFormsModel::get_forms( null, 'title' );  | 
                                                        
| 452 | 452 | |
| 453 | -		if( ! isset( $forms[0] ) ) { | 
                                                        |
| 453 | +		if ( ! isset( $forms[ 0 ] ) ) { | 
                                                        |
| 454 | 454 | gravityview()->log->error( 'No forms were found' );  | 
                                                        
| 455 | 455 | return 0;  | 
                                                        
| 456 | 456 | }  | 
                                                        
| 457 | 457 | |
| 458 | - $first_form = $forms[0];  | 
                                                        |
| 458 | + $first_form = $forms[ 0 ];  | 
                                                        |
| 459 | 459 | |
| 460 | - $form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];  | 
                                                        |
| 460 | + $form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];  | 
                                                        |
| 461 | 461 | |
| 462 | 462 | return intval( $form_id );  | 
                                                        
| 463 | 463 | }  | 
                                                        
@@ -465,37 +465,37 @@ discard block  | 
                                                    ||
| 465 | 465 | |
| 466 | 466 |  	function add_scripts_and_styles( $hook ) { | 
                                                        
| 467 | 467 | |
| 468 | -		if( ! class_exists( 'GFForms' ) ) { | 
                                                        |
| 468 | +		if ( ! class_exists( 'GFForms' ) ) { | 
                                                        |
| 469 | 469 | gravityview()->log->error( 'GFForms does not exist.' );  | 
                                                        
| 470 | 470 | return;  | 
                                                        
| 471 | 471 | }  | 
                                                        
| 472 | 472 | |
| 473 | 473 | // enqueue styles & scripts gf_entries  | 
                                                        
| 474 | 474 | // But only if we're on the main Entries page, not on reports pages  | 
                                                        
| 475 | -		if( GFForms::get_page() !== 'entry_list' ) { | 
                                                        |
| 475 | +		if ( GFForms::get_page() !== 'entry_list' ) { | 
                                                        |
| 476 | 476 | return;  | 
                                                        
| 477 | 477 | }  | 
                                                        
| 478 | 478 | |
| 479 | 479 | $form_id = $this->get_form_id();  | 
                                                        
| 480 | 480 | |
| 481 | 481 | // Things are broken; no forms were found  | 
                                                        
| 482 | -		if( empty( $form_id ) ) { | 
                                                        |
| 482 | +		if ( empty( $form_id ) ) { | 
                                                        |
| 483 | 483 | return;  | 
                                                        
| 484 | 484 | }  | 
                                                        
| 485 | 485 | |
| 486 | -		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version ); | 
                                                        |
| 486 | + wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );  | 
                                                        |
| 487 | 487 | |
| 488 | -		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; | 
                                                        |
| 488 | + $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';  | 
                                                        |
| 489 | 489 | |
| 490 | -		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version ); | 
                                                        |
| 490 | + wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );  | 
                                                        |
| 491 | 491 | |
| 492 | 492 | wp_enqueue_script( 'gravityview_entries_list-popper', plugins_url( 'assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );  | 
                                                        
| 493 | 493 | wp_enqueue_script( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );  | 
                                                        
| 494 | 494 | wp_enqueue_style( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );  | 
                                                        
| 495 | 495 | |
| 496 | 496 | wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(  | 
                                                        
| 497 | - 'nonce' => wp_create_nonce( 'gravityview_entry_approval'),  | 
                                                        |
| 498 | - 'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),  | 
                                                        |
| 497 | + 'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),  | 
                                                        |
| 498 | + 'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),  | 
                                                        |
| 499 | 499 | 'form_id' => $form_id,  | 
                                                        
| 500 | 500 | 'show_column' => (int)$this->show_approve_entry_column( $form_id ),  | 
                                                        
| 501 | 501 | 'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),  | 
                                                        
@@ -504,10 +504,10 @@ discard block  | 
                                                    ||
| 504 | 504 | 'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,  | 
                                                        
| 505 | 505 | 'bulk_actions' => $this->get_bulk_actions( $form_id ),  | 
                                                        
| 506 | 506 | 'bulk_message' => $this->bulk_update_message,  | 
                                                        
| 507 | -			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'), | 
                                                        |
| 508 | -            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), | 
                                                        |
| 509 | -			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'), | 
                                                        |
| 510 | - 'column_title' => __( 'Show entry in directory view?', 'gravityview'),  | 
                                                        |
| 507 | + 'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),  | 
                                                        |
| 508 | + 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),  | 
                                                        |
| 509 | + 'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),  | 
                                                        |
| 510 | + 'column_title' => __( 'Show entry in directory view?', 'gravityview' ),  | 
                                                        |
| 511 | 511 | 'column_link' => esc_url( $this->get_sort_link() ),  | 
                                                        
| 512 | 512 | 'status_popover_template' => GravityView_Entry_Approval_Status::get_status_popover_template(),  | 
                                                        
| 513 | 513 | ) );  | 
                                                        
@@ -550,16 +550,16 @@ discard block  | 
                                                    ||
| 550 | 550 | $bulk_actions = array(  | 
                                                        
| 551 | 551 | 'GravityView' => array(  | 
                                                        
| 552 | 552 | array(  | 
                                                        
| 553 | -					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'), | 
                                                        |
| 554 | - 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),  | 
                                                        |
| 553 | + 'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),  | 
                                                        |
| 554 | + 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),  | 
                                                        |
| 555 | 555 | ),  | 
                                                        
| 556 | 556 | array(  | 
                                                        
| 557 | -					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'), | 
                                                        |
| 558 | - 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),  | 
                                                        |
| 557 | + 'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),  | 
                                                        |
| 558 | + 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),  | 
                                                        |
| 559 | 559 | ),  | 
                                                        
| 560 | 560 | array(  | 
                                                        
| 561 | -					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'), | 
                                                        |
| 562 | - 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),  | 
                                                        |
| 561 | + 'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),  | 
                                                        |
| 562 | + 'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),  | 
                                                        |
| 563 | 563 | ),  | 
                                                        
| 564 | 564 | ),  | 
                                                        
| 565 | 565 | );  | 
                                                        
@@ -576,13 +576,13 @@ discard block  | 
                                                    ||
| 576 | 576 | // Sanitize the values, just to be sure.  | 
                                                        
| 577 | 577 |  		foreach ( $bulk_actions as $key => $group ) { | 
                                                        
| 578 | 578 | |
| 579 | -		    if( empty( $group ) ) { | 
                                                        |
| 579 | +		    if ( empty( $group ) ) { | 
                                                        |
| 580 | 580 | continue;  | 
                                                        
| 581 | 581 | }  | 
                                                        
| 582 | 582 | |
| 583 | 583 |  			foreach ( $group as $i => $action ) { | 
                                                        
| 584 | - $bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );  | 
                                                        |
| 585 | - $bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );  | 
                                                        |
| 584 | + $bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );  | 
                                                        |
| 585 | + $bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );  | 
                                                        |
| 586 | 586 | }  | 
                                                        
| 587 | 587 | }  | 
                                                        
| 588 | 588 | |
@@ -607,13 +607,13 @@ discard block  | 
                                                    ||
| 607 | 607 | * @since 1.7.2  | 
                                                        
| 608 | 608 | * @param boolean $hide_if_no_connections  | 
                                                        
| 609 | 609 | */  | 
                                                        
| 610 | -		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false ); | 
                                                        |
| 610 | + $hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );  | 
                                                        |
| 611 | 611 | |
| 612 | -		if( $hide_if_no_connections ) { | 
                                                        |
| 612 | +		if ( $hide_if_no_connections ) { | 
                                                        |
| 613 | 613 | |
| 614 | 614 | $connected_views = gravityview_get_connected_views( $form_id );  | 
                                                        
| 615 | 615 | |
| 616 | -			if( empty( $connected_views ) ) { | 
                                                        |
| 616 | +			if ( empty( $connected_views ) ) { | 
                                                        |
| 617 | 617 | $show_approve_column = false;  | 
                                                        
| 618 | 618 | }  | 
                                                        
| 619 | 619 | }  | 
                                                        
@@ -623,21 +623,21 @@ discard block  | 
                                                    ||
| 623 | 623 | * @param boolean $show_approve_column Whether the column will be shown  | 
                                                        
| 624 | 624 | * @param int $form_id The ID of the Gravity Forms form for which entries are being shown  | 
                                                        
| 625 | 625 | */  | 
                                                        
| 626 | -		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id ); | 
                                                        |
| 626 | + $show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );  | 
                                                        |
| 627 | 627 | |
| 628 | 628 | return $show_approve_column;  | 
                                                        
| 629 | 629 | }  | 
                                                        
| 630 | 630 | |
| 631 | 631 |  	function register_gform_noconflict_script( $scripts ) { | 
                                                        
| 632 | - $scripts[] = 'gravityview_gf_entries_scripts';  | 
                                                        |
| 633 | - $scripts[] = 'gravityview_entries_list-popper';  | 
                                                        |
| 634 | - $scripts[] = 'gravityview_entries_list-tippy';  | 
                                                        |
| 632 | + $scripts[ ] = 'gravityview_gf_entries_scripts';  | 
                                                        |
| 633 | + $scripts[ ] = 'gravityview_entries_list-popper';  | 
                                                        |
| 634 | + $scripts[ ] = 'gravityview_entries_list-tippy';  | 
                                                        |
| 635 | 635 | return $scripts;  | 
                                                        
| 636 | 636 | }  | 
                                                        
| 637 | 637 | |
| 638 | 638 |  	function register_gform_noconflict_style( $styles ) { | 
                                                        
| 639 | - $styles[] = 'gravityview_entries_list';  | 
                                                        |
| 640 | - $styles[] = 'gravityview_entries_list-tippy';  | 
                                                        |
| 639 | + $styles[ ] = 'gravityview_entries_list';  | 
                                                        |
| 640 | + $styles[ ] = 'gravityview_entries_list-tippy';  | 
                                                        |
| 641 | 641 | return $styles;  | 
                                                        
| 642 | 642 | }  | 
                                                        
| 643 | 643 | |
@@ -24,7 +24,7 @@ discard block  | 
                                                    ||
| 24 | 24 | |
| 25 | 25 | $this->label = esc_attr__( 'Approve Entries', 'gravityview' );  | 
                                                        
| 26 | 26 | |
| 27 | - $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );  | 
                                                        |
| 27 | + $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );  | 
                                                        |
| 28 | 28 | |
| 29 | 29 | $this->add_hooks();  | 
                                                        
| 30 | 30 | |
@@ -46,11 +46,11 @@ discard block  | 
                                                    ||
| 46 | 46 | */  | 
                                                        
| 47 | 47 |  	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { | 
                                                        
| 48 | 48 | |
| 49 | - unset( $field_options['only_loggedin'] );  | 
                                                        |
| 49 | + unset( $field_options[ 'only_loggedin' ] );  | 
                                                        |
| 50 | 50 | |
| 51 | - unset( $field_options['new_window'] );  | 
                                                        |
| 51 | + unset( $field_options[ 'new_window' ] );  | 
                                                        |
| 52 | 52 | |
| 53 | - unset( $field_options['show_as_link'] );  | 
                                                        |
| 53 | + unset( $field_options[ 'show_as_link' ] );  | 
                                                        |
| 54 | 54 | |
| 55 | 55 | return $field_options;  | 
                                                        
| 56 | 56 | }  | 
                                                        
@@ -70,7 +70,7 @@ discard block  | 
                                                    ||
| 70 | 70 | |
| 71 | 71 | add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );  | 
                                                        
| 72 | 72 | |
| 73 | - add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );  | 
                                                        |
| 73 | + add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );  | 
                                                        |
| 74 | 74 | |
| 75 | 75 | add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );  | 
                                                        
| 76 | 76 | |
@@ -92,7 +92,7 @@ discard block  | 
                                                    ||
| 92 | 92 |  	public function maybe_prevent_field_render( $html, $args ) { | 
                                                        
| 93 | 93 | |
| 94 | 94 | // If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.  | 
                                                        
| 95 | -		if( $this->name === \GV\Utils::get( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) { | 
                                                        |
| 95 | +		if ( $this->name === \GV\Utils::get( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { | 
                                                        |
| 96 | 96 | return '';  | 
                                                        
| 97 | 97 | }  | 
                                                        
| 98 | 98 | |
@@ -122,7 +122,7 @@ discard block  | 
                                                    ||
| 122 | 122 |  	public function modify_search_parameters( $parameters ) { | 
                                                        
| 123 | 123 | |
| 124 | 124 |  		if ( $this->name === \GV\Utils::get( $parameters, 'sorting/key' ) ) { | 
                                                        
| 125 | - $parameters['sorting']['key'] = 'is_approved';  | 
                                                        |
| 125 | + $parameters[ 'sorting' ][ 'key' ] = 'is_approved';  | 
                                                        |
| 126 | 126 | }  | 
                                                        
| 127 | 127 | |
| 128 | 128 | return $parameters;  | 
                                                        
@@ -138,7 +138,7 @@ discard block  | 
                                                    ||
| 138 | 138 |  	function register_scripts_and_styles() { | 
                                                        
| 139 | 139 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';  | 
                                                        
| 140 | 140 | |
| 141 | - wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );  | 
                                                        |
| 141 | + wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );  | 
                                                        |
| 142 | 142 | |
| 143 | 143 | wp_register_script( 'gravityview-field-approval-popper', GRAVITYVIEW_URL . 'assets/lib/tippy/popper.min.js', array(), GravityView_Plugin::version, true );  | 
                                                        
| 144 | 144 | wp_register_script( 'gravityview-field-approval-tippy', GRAVITYVIEW_URL . 'assets/lib/tippy/tippy.min.js', array(), GravityView_Plugin::version, true );  | 
                                                        
@@ -146,14 +146,14 @@ discard block  | 
                                                    ||
| 146 | 146 | |
| 147 | 147 | $style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';  | 
                                                        
| 148 | 148 | |
| 149 | -		if( class_exists( 'GravityView_View' ) ) { | 
                                                        |
| 149 | +		if ( class_exists( 'GravityView_View' ) ) { | 
                                                        |
| 150 | 150 | /**  | 
                                                        
| 151 | 151 | * Override CSS file by placing in your theme's /gravityview/css/ sub-directory.  | 
                                                        
| 152 | 152 | */  | 
                                                        
| 153 | 153 | $style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );  | 
                                                        
| 154 | 154 | }  | 
                                                        
| 155 | 155 | |
| 156 | - $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );  | 
                                                        |
| 156 | + $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );  | 
                                                        |
| 157 | 157 | |
| 158 | 158 | /**  | 
                                                        
| 159 | 159 | * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.  | 
                                                        
@@ -162,7 +162,7 @@ discard block  | 
                                                    ||
| 162 | 162 | */  | 
                                                        
| 163 | 163 | $style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );  | 
                                                        
| 164 | 164 | |
| 165 | -		if( ! empty( $style_url ) ) { | 
                                                        |
| 165 | +		if ( ! empty( $style_url ) ) { | 
                                                        |
| 166 | 166 | wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );  | 
                                                        
| 167 | 167 | }  | 
                                                        
| 168 | 168 | |
@@ -177,7 +177,7 @@ discard block  | 
                                                    ||
| 177 | 177 |  	public function enqueue_and_localize_script() { | 
                                                        
| 178 | 178 | |
| 179 | 179 | // The script is already registered and enqueued  | 
                                                        
| 180 | -		if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) { | 
                                                        |
| 180 | +		if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) { | 
                                                        |
| 181 | 181 | return;  | 
                                                        
| 182 | 182 | }  | 
                                                        
| 183 | 183 | |
@@ -190,10 +190,10 @@ discard block  | 
                                                    ||
| 190 | 190 | |
| 191 | 191 | wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(  | 
                                                        
| 192 | 192 | 'ajaxurl' => admin_url( 'admin-ajax.php' ),  | 
                                                        
| 193 | -			'nonce' => wp_create_nonce('gravityview_entry_approval'), | 
                                                        |
| 193 | + 'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),  | 
                                                        |
| 194 | 194 | 'status' => GravityView_Entry_Approval_Status::get_all(),  | 
                                                        
| 195 | 195 | 'status_popover_template' => GravityView_Entry_Approval_Status::get_status_popover_template(),  | 
                                                        
| 196 | - ));  | 
                                                        |
| 196 | + ) );  | 
                                                        |
| 197 | 197 | |
| 198 | 198 | }  | 
                                                        
| 199 | 199 | |
@@ -210,8 +210,8 @@ discard block  | 
                                                    ||
| 210 | 210 | */  | 
                                                        
| 211 | 211 |  	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) { | 
                                                        
| 212 | 212 | |
| 213 | -		if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) { | 
                                                        |
| 214 | -			$entry_default_fields["{$this->name}"] = array( | 
                                                        |
| 213 | +		if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) { | 
                                                        |
| 214 | +			$entry_default_fields[ "{$this->name}" ] = array( | 
                                                        |
| 215 | 215 | 'label' => $this->label,  | 
                                                        
| 216 | 216 | 'desc' => $this->description,  | 
                                                        
| 217 | 217 | 'type' => $this->name,  |