|
@@ -102,7 +102,7 @@ discard block |
|
|
block discarded – undo |
|
102
|
102
|
* @return array |
|
103
|
103
|
*/ |
|
104
|
104
|
public function modify_app_settings_menu_title( $setting_tabs ) { |
|
105
|
|
- $setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' ); |
|
|
105
|
+ $setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' ); |
|
106
|
106
|
return $setting_tabs; |
|
107
|
107
|
} |
|
108
|
108
|
|
|
@@ -308,15 +308,15 @@ discard block |
|
|
block discarded – undo |
|
308
|
308
|
</ul> |
|
309
|
309
|
<div class="gv-followup widefat"> |
|
310
|
310
|
<p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p> |
|
311
|
|
- <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea> |
|
|
311
|
+ <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea> |
|
312
|
312
|
</div> |
|
313
|
313
|
<div class="scale-description"> |
|
314
|
314
|
<p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p> |
|
315
|
315
|
<ul class="inline"> |
|
316
|
316
|
<?php |
|
317
|
317
|
$i = 0; |
|
318
|
|
- while( $i < 11 ) { |
|
319
|
|
- echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>'; |
|
|
318
|
+ while ( $i < 11 ) { |
|
|
319
|
+ echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>'; |
|
320
|
320
|
$i++; |
|
321
|
321
|
} |
|
322
|
322
|
?> |
|
@@ -533,15 +533,15 @@ discard block |
|
|
block discarded – undo |
|
533
|
533
|
* @return string The HTML |
|
534
|
534
|
*/ |
|
535
|
535
|
public function as_html( $field, $echo = true ) { |
|
536
|
|
- $field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit'; |
|
|
536
|
+ $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit'; |
|
537
|
537
|
|
|
538
|
538
|
$attributes = $this->get_field_attributes( $field ); |
|
539
|
539
|
$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) ); |
|
540
|
|
- $value = $this->get( $field['name'], $default_value ); |
|
|
540
|
+ $value = $this->get( $field[ 'name' ], $default_value ); |
|
541
|
541
|
|
|
542
|
542
|
|
|
543
|
|
- $attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton'; |
|
544
|
|
- $name = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name']; |
|
|
543
|
+ $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton'; |
|
|
544
|
+ $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ]; |
|
545
|
545
|
|
|
546
|
546
|
if ( empty( $value ) ) { |
|
547
|
547
|
$value = __( 'Update Settings', 'gravityview' ); |
|
@@ -550,7 +550,7 @@ discard block |
|
|
block discarded – undo |
|
550
|
550
|
$attributes = $this->get_field_attributes( $field ); |
|
551
|
551
|
|
|
552
|
552
|
$html = '<input |
|
553
|
|
- type="' . $field['type'] . '" |
|
|
553
|
+ type="' . $field[ 'type' ] . '" |
|
554
|
554
|
name="' . esc_attr( $name ) . '" |
|
555
|
555
|
value="' . $value . '" ' . |
|
556
|
556
|
implode( ' ', $attributes ) . |
|
@@ -581,7 +581,7 @@ discard block |
|
|
block discarded – undo |
|
581
|
581
|
* @return bool |
|
582
|
582
|
*/ |
|
583
|
583
|
public function is_save_postback() { |
|
584
|
|
- return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] ); |
|
|
584
|
+ return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] ); |
|
585
|
585
|
} |
|
586
|
586
|
|
|
587
|
587
|
/** |
|
@@ -591,7 +591,7 @@ discard block |
|
|
block discarded – undo |
|
591
|
591
|
*/ |
|
592
|
592
|
public function license_key_notice() { |
|
593
|
593
|
|
|
594
|
|
- if( $this->is_save_postback() ) { |
|
|
594
|
+ if ( $this->is_save_postback() ) { |
|
595
|
595
|
$settings = $this->get_posted_settings(); |
|
596
|
596
|
$license_key = \GV\Utils::get( $settings, 'license_key' ); |
|
597
|
597
|
$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
|
@@ -612,7 +612,7 @@ discard block |
|
|
block discarded – undo |
|
612
|
612
|
* but didn't want to mess up the translation strings for the translators. |
|
613
|
613
|
*/ |
|
614
|
614
|
$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 ); |
|
615
|
|
- $title = __( 'Inactive License', 'gravityview'); |
|
|
615
|
+ $title = __( 'Inactive License', 'gravityview' ); |
|
616
|
616
|
$status = ''; |
|
617
|
617
|
$update_below = false; |
|
618
|
618
|
$primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
|
@@ -642,7 +642,7 @@ discard block |
|
|
block discarded – undo |
|
642
|
642
|
$update_below = __( 'Activate your license key below.', 'gravityview' ); |
|
643
|
643
|
break; |
|
644
|
644
|
} |
|
645
|
|
- $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice'; |
|
|
645
|
+ $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice'; |
|
646
|
646
|
|
|
647
|
647
|
// Show a different notice on settings page for inactive licenses (hide the buttons) |
|
648
|
648
|
if ( $update_below && gravityview()->request->is_admin( '', 'settings' ) ) { |
|
@@ -686,7 +686,7 @@ discard block |
|
|
block discarded – undo |
|
686
|
686
|
public function scripts() { |
|
687
|
687
|
$scripts = parent::scripts(); |
|
688
|
688
|
|
|
689
|
|
- $scripts[] = array( |
|
|
689
|
+ $scripts[ ] = array( |
|
690
|
690
|
'handle' => 'gform_tooltip_init', |
|
691
|
691
|
'enqueue' => array( |
|
692
|
692
|
array( |
|
@@ -705,7 +705,7 @@ discard block |
|
|
block discarded – undo |
|
705
|
705
|
public function styles() { |
|
706
|
706
|
$styles = parent::styles(); |
|
707
|
707
|
|
|
708
|
|
- $styles[] = array( |
|
|
708
|
+ $styles[ ] = array( |
|
709
|
709
|
'handle' => 'gravityview_settings', |
|
710
|
710
|
'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
|
711
|
711
|
'version' => Plugin::$version, |
|
@@ -736,7 +736,7 @@ discard block |
|
|
block discarded – undo |
|
736
|
736
|
* If multisite and not network admin, we don't want the settings to show. |
|
737
|
737
|
* @since 1.7.6 |
|
738
|
738
|
*/ |
|
739
|
|
- $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
|
739
|
+ $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
740
|
740
|
|
|
741
|
741
|
/** |
|
742
|
742
|
* Override whether to show the Settings menu on a per-blog basis. |
|
@@ -784,26 +784,26 @@ discard block |
|
|
block discarded – undo |
|
784
|
784
|
'label' => __( 'License Key', 'gravityview' ), |
|
785
|
785
|
'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates & support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ), |
|
786
|
786
|
'type' => 'edd_license', |
|
787
|
|
- 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
|
787
|
+ 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
788
|
788
|
'data-pending-text' => __( 'Verifying license…', 'gravityview' ), |
|
789
|
|
- 'default_value' => $default_settings['license_key'], |
|
|
789
|
+ 'default_value' => $default_settings[ 'license_key' ], |
|
790
|
790
|
'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key', |
|
791
|
791
|
), |
|
792
|
792
|
array( |
|
793
|
793
|
'name' => 'license_key_response', |
|
794
|
|
- 'default_value' => $default_settings['license_key_response'], |
|
|
794
|
+ 'default_value' => $default_settings[ 'license_key_response' ], |
|
795
|
795
|
'type' => 'hidden', |
|
796
|
796
|
), |
|
797
|
797
|
array( |
|
798
|
798
|
'name' => 'license_key_status', |
|
799
|
|
- 'default_value' => $default_settings['license_key_status'], |
|
|
799
|
+ 'default_value' => $default_settings[ 'license_key_status' ], |
|
800
|
800
|
'type' => 'hidden', |
|
801
|
801
|
), |
|
802
|
802
|
array( |
|
803
|
803
|
'name' => 'support-email', |
|
804
|
804
|
'type' => 'text', |
|
805
|
805
|
'validate' => 'email', |
|
806
|
|
- 'default_value' => $default_settings['support-email'], |
|
|
806
|
+ 'default_value' => $default_settings[ 'support-email' ], |
|
807
|
807
|
'label' => __( 'Support Email', 'gravityview' ), |
|
808
|
808
|
'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ), |
|
809
|
809
|
'class' => 'code regular-text', |
|
@@ -815,7 +815,7 @@ discard block |
|
|
block discarded – undo |
|
815
|
815
|
'name' => 'support_port', |
|
816
|
816
|
'type' => 'radio', |
|
817
|
817
|
'label' => __( 'Show Support Port?', 'gravityview' ), |
|
818
|
|
- 'default_value' => $default_settings['support_port'], |
|
|
818
|
+ 'default_value' => $default_settings[ 'support_port' ], |
|
819
|
819
|
'horizontal' => 1, |
|
820
|
820
|
'choices' => array( |
|
821
|
821
|
array( |
|
@@ -834,7 +834,7 @@ discard block |
|
|
block discarded – undo |
|
834
|
834
|
'name' => 'no-conflict-mode', |
|
835
|
835
|
'type' => 'radio', |
|
836
|
836
|
'label' => __( 'No-Conflict Mode', 'gravityview' ), |
|
837
|
|
- 'default_value' => $default_settings['no-conflict-mode'], |
|
|
837
|
+ 'default_value' => $default_settings[ 'no-conflict-mode' ], |
|
838
|
838
|
'horizontal' => 1, |
|
839
|
839
|
'choices' => array( |
|
840
|
840
|
array( |
|
@@ -856,7 +856,7 @@ discard block |
|
|
block discarded – undo |
|
856
|
856
|
'name' => 'rest_api', |
|
857
|
857
|
'type' => 'radio', |
|
858
|
858
|
'label' => __( 'REST API', 'gravityview' ), |
|
859
|
|
- 'default_value' => $default_settings['rest_api'], |
|
|
859
|
+ 'default_value' => $default_settings[ 'rest_api' ], |
|
860
|
860
|
'horizontal' => 1, |
|
861
|
861
|
'choices' => array( |
|
862
|
862
|
array( |
|
@@ -875,7 +875,7 @@ discard block |
|
|
block discarded – undo |
|
875
|
875
|
'name' => 'beta', |
|
876
|
876
|
'type' => 'checkbox', |
|
877
|
877
|
'label' => __( 'Become a Beta Tester', 'gravityview' ), |
|
878
|
|
- 'default_value' => $default_settings['beta'], |
|
|
878
|
+ 'default_value' => $default_settings[ 'beta' ], |
|
879
|
879
|
'horizontal' => 1, |
|
880
|
880
|
'choices' => array( |
|
881
|
881
|
array( |
|
@@ -908,17 +908,17 @@ discard block |
|
|
block discarded – undo |
|
908
|
908
|
* @since 1.7.4 |
|
909
|
909
|
*/ |
|
910
|
910
|
foreach ( $fields as &$field ) { |
|
911
|
|
- $field['name'] = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' ); |
|
912
|
|
- $field['label'] = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' ); |
|
913
|
|
- $field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' ); |
|
914
|
|
- $field['description'] = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' ); |
|
|
911
|
+ $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' ); |
|
|
912
|
+ $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' ); |
|
|
913
|
+ $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' ); |
|
|
914
|
+ $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' ); |
|
915
|
915
|
|
|
916
|
916
|
if ( $disabled_attribute ) { |
|
917
|
|
- $field['disabled'] = $disabled_attribute; |
|
|
917
|
+ $field[ 'disabled' ] = $disabled_attribute; |
|
918
|
918
|
} |
|
919
|
919
|
|
|
920
|
|
- if ( empty( $field['disabled'] ) ) { |
|
921
|
|
- unset( $field['disabled'] ); |
|
|
920
|
+ if ( empty( $field[ 'disabled' ] ) ) { |
|
|
921
|
+ unset( $field[ 'disabled' ] ); |
|
922
|
922
|
} |
|
923
|
923
|
} |
|
924
|
924
|
|
|
@@ -936,7 +936,7 @@ discard block |
|
|
block discarded – undo |
|
936
|
936
|
); |
|
937
|
937
|
|
|
938
|
938
|
if ( $disabled_attribute ) { |
|
939
|
|
- $button['disabled'] = $disabled_attribute; |
|
|
939
|
+ $button[ 'disabled' ] = $disabled_attribute; |
|
940
|
940
|
} |
|
941
|
941
|
|
|
942
|
942
|
/** |
|
@@ -955,20 +955,20 @@ discard block |
|
|
block discarded – undo |
|
955
|
955
|
// If there are extensions, add a section for them |
|
956
|
956
|
if ( ! empty( $extension_sections ) ) { |
|
957
|
957
|
|
|
958
|
|
- if( $disabled_attribute ) { |
|
|
958
|
+ if ( $disabled_attribute ) { |
|
959
|
959
|
foreach ( $extension_sections as &$section ) { |
|
960
|
|
- foreach ( $section['fields'] as &$field ) { |
|
961
|
|
- $field['disabled'] = $disabled_attribute; |
|
|
960
|
+ foreach ( $section[ 'fields' ] as &$field ) { |
|
|
961
|
+ $field[ 'disabled' ] = $disabled_attribute; |
|
962
|
962
|
} |
|
963
|
963
|
} |
|
964
|
964
|
} |
|
965
|
965
|
|
|
966
|
|
- $k = count( $extension_sections ) - 1 ; |
|
967
|
|
- $extension_sections[ $k ]['fields'][] = $button; |
|
|
966
|
+ $k = count( $extension_sections ) - 1; |
|
|
967
|
+ $extension_sections[ $k ][ 'fields' ][ ] = $button; |
|
968
|
968
|
$sections = array_merge( $sections, $extension_sections ); |
|
969
|
969
|
} else { |
|
970
|
970
|
// add the 'update settings' button to the general section |
|
971
|
|
- $sections[0]['fields'][] = $button; |
|
|
971
|
+ $sections[ 0 ][ 'fields' ][ ] = $button; |
|
972
|
972
|
} |
|
973
|
973
|
|
|
974
|
974
|
return $sections; |
|
@@ -1024,7 +1024,7 @@ discard block |
|
|
block discarded – undo |
|
1024
|
1024
|
protected function settings_edd_license( $field, $echo = true ) { |
|
1025
|
1025
|
|
|
1026
|
1026
|
if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
1027
|
|
- $field['input_type'] = 'password'; |
|
|
1027
|
+ $field[ 'input_type' ] = 'password'; |
|
1028
|
1028
|
} |
|
1029
|
1029
|
|
|
1030
|
1030
|
$text = $this->settings_text( $field, false ); |
|
@@ -1073,7 +1073,7 @@ discard block |
|
|
block discarded – undo |
|
1073
|
1073
|
public function single_setting_row_html( $field ) { |
|
1074
|
1074
|
?> |
|
1075
|
1075
|
|
|
1076
|
|
- <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>"> |
|
|
1076
|
+ <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>"> |
|
1077
|
1077
|
<td colspan="2"> |
|
1078
|
1078
|
<?php $this->single_setting( $field ); ?> |
|
1079
|
1079
|
</td> |
|
@@ -1091,10 +1091,10 @@ discard block |
|
|
block discarded – undo |
|
1091
|
1091
|
* @return string |
|
1092
|
1092
|
*/ |
|
1093
|
1093
|
public function settings_save( $field, $echo = true ) { |
|
1094
|
|
- $field['type'] = 'submit'; |
|
1095
|
|
- $field['name'] = 'gform-settings-save'; |
|
1096
|
|
- $field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton'; |
|
1097
|
|
- $field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
|
1094
|
+ $field[ 'type' ] = 'submit'; |
|
|
1095
|
+ $field[ 'name' ] = 'gform-settings-save'; |
|
|
1096
|
+ $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton'; |
|
|
1097
|
+ $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1098
|
1098
|
|
|
1099
|
1099
|
$output = $this->settings_submit( $field, false ); |
|
1100
|
1100
|
|
|
@@ -1125,8 +1125,8 @@ discard block |
|
|
block discarded – undo |
|
1125
|
1125
|
* @return void |
|
1126
|
1126
|
*/ |
|
1127
|
1127
|
public function single_setting_row( $field ) { |
|
1128
|
|
- $field['gv_description'] = Utils::get( $field, 'description' ); |
|
1129
|
|
- $field['description'] = Utils::get( $field, 'subtitle' ); |
|
|
1128
|
+ $field[ 'gv_description' ] = Utils::get( $field, 'description' ); |
|
|
1129
|
+ $field[ 'description' ] = Utils::get( $field, 'subtitle' ); |
|
1130
|
1130
|
parent::single_setting_row( $field ); |
|
1131
|
1131
|
} |
|
1132
|
1132
|
|
|
@@ -1138,7 +1138,7 @@ discard block |
|
|
block discarded – undo |
|
1138
|
1138
|
public function single_setting_label( $field ) { |
|
1139
|
1139
|
parent::single_setting_label( $field ); |
|
1140
|
1140
|
if ( $description = Utils::get( $field, 'gv_description' ) ) { |
|
1141
|
|
- echo '<span class="description">'. $description .'</span>'; |
|
|
1141
|
+ echo '<span class="description">' . $description . '</span>'; |
|
1142
|
1142
|
} |
|
1143
|
1143
|
} |
|
1144
|
1144
|
|
|
@@ -1175,9 +1175,9 @@ discard block |
|
|
block discarded – undo |
|
1175
|
1175
|
// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response), |
|
1176
|
1176
|
// then we assume it's changed. If it's changed, unset the status and the previous response. |
|
1177
|
1177
|
if ( $local_key !== $response_key ) { |
|
1178
|
|
- unset( $posted_settings['license_key_response'] ); |
|
1179
|
|
- unset( $posted_settings['license_key_status'] ); |
|
1180
|
|
- \GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
|
1178
|
+ unset( $posted_settings[ 'license_key_response' ] ); |
|
|
1179
|
+ unset( $posted_settings[ 'license_key_status' ] ); |
|
|
1180
|
+ \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1181
|
1181
|
} |
|
1182
|
1182
|
return $posted_settings; |
|
1183
|
1183
|
} |