| @@ -134,28 +134,28 @@ discard block | ||
| 134 | 134 | */ | 
| 135 | 135 |  	public function add_network_menu() { | 
| 136 | 136 | |
| 137 | -	    if ( ! gravityview()->plugin->is_network_activated() ) { | |
| 137 | +		if ( ! gravityview()->plugin->is_network_activated() ) { | |
| 138 | 138 | return; | 
| 139 | 139 | } | 
| 140 | 140 | |
| 141 | -        add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); | |
| 141 | +		add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); | |
| 142 | 142 | } | 
| 143 | 143 | |
| 144 | 144 | /** | 
| 145 | - * Uninstall all traces of GravityView | |
| 146 | - * | |
| 147 | - * Note: method is public because parent method is public | |
| 148 | - * | |
| 145 | + * Uninstall all traces of GravityView | |
| 146 | + * | |
| 147 | + * Note: method is public because parent method is public | |
| 148 | + * | |
| 149 | 149 | * @return bool | 
| 150 | 150 | */ | 
| 151 | 151 |  	public function uninstall() { | 
| 152 | 152 | gravityview()->plugin->uninstall(); | 
| 153 | 153 | |
| 154 | 154 | /** | 
| 155 | - * Set the path so that Gravity Forms can de-activate GravityView | |
| 156 | - * @see GFAddOn::uninstall_addon | |
| 157 | - * @uses deactivate_plugins() | |
| 158 | - */ | |
| 155 | + * Set the path so that Gravity Forms can de-activate GravityView | |
| 156 | + * @see GFAddOn::uninstall_addon | |
| 157 | + * @uses deactivate_plugins() | |
| 158 | + */ | |
| 159 | 159 | $this->_path = GRAVITYVIEW_FILE; | 
| 160 | 160 | |
| 161 | 161 | return true; | 
| @@ -185,42 +185,42 @@ discard block | ||
| 185 | 185 | } | 
| 186 | 186 | |
| 187 | 187 | /** | 
| 188 | - * Get an array of reasons why the plugin might be uninstalled | |
| 189 | - * | |
| 190 | - * @since 1.17.5 | |
| 191 | - * | |
| 188 | + * Get an array of reasons why the plugin might be uninstalled | |
| 189 | + * | |
| 190 | + * @since 1.17.5 | |
| 191 | + * | |
| 192 | 192 | * @return array Array of reasons with the label and followup questions for each uninstall reason | 
| 193 | 193 | */ | 
| 194 | 194 |  	private function get_uninstall_reasons() { | 
| 195 | 195 | $reasons = array( | 
| 196 | 196 | 'will-continue' => array( | 
| 197 | - 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), | |
| 198 | - ), | |
| 197 | + 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), | |
| 198 | + ), | |
| 199 | 199 | 'no-longer-need' => array( | 
| 200 | - 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), | |
| 201 | - ), | |
| 200 | + 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), | |
| 201 | + ), | |
| 202 | 202 | 'doesnt-work' => array( | 
| 203 | - 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), | |
| 204 | - ), | |
| 203 | + 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), | |
| 204 | + ), | |
| 205 | 205 | 'found-other' => array( | 
| 206 | - 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), | |
| 207 | - 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), | |
| 208 | - ), | |
| 206 | + 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), | |
| 207 | + 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), | |
| 208 | + ), | |
| 209 | 209 | 'other' => array( | 
| 210 | - 'label' => esc_html__( 'Other', 'gravityview' ), | |
| 211 | - ), | |
| 210 | + 'label' => esc_html__( 'Other', 'gravityview' ), | |
| 211 | + ), | |
| 212 | 212 | ); | 
| 213 | 213 | |
| 214 | 214 | shuffle( $reasons ); | 
| 215 | 215 | |
| 216 | 216 | return $reasons; | 
| 217 | - } | |
| 217 | + } | |
| 218 | 218 | |
| 219 | 219 | /** | 
| 220 | - * Display a feedback form when the plugin is uninstalled | |
| 221 | - * | |
| 222 | - * @since 1.17.5 | |
| 223 | - * | |
| 220 | + * Display a feedback form when the plugin is uninstalled | |
| 221 | + * | |
| 222 | + * @since 1.17.5 | |
| 223 | + * | |
| 224 | 224 | * @return string HTML of the uninstallation form | 
| 225 | 225 | */ | 
| 226 | 226 |  	public function uninstall_form() { | 
| @@ -300,7 +300,7 @@ discard block | ||
| 300 | 300 | <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2> | 
| 301 | 301 | <ul> | 
| 302 | 302 | <?php | 
| 303 | - $reasons = $this->get_uninstall_reasons(); | |
| 303 | + $reasons = $this->get_uninstall_reasons(); | |
| 304 | 304 |  				foreach ( $reasons as $reason ) { | 
| 305 | 305 | printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) ); | 
| 306 | 306 | } | 
| @@ -394,12 +394,12 @@ discard block | ||
| 394 | 394 | } | 
| 395 | 395 | |
| 396 | 396 |  	public function app_settings_tab() { | 
| 397 | - parent::app_settings_tab(); | |
| 397 | + parent::app_settings_tab(); | |
| 398 | 398 | |
| 399 | 399 |  		if ( $this->maybe_uninstall() ) { | 
| 400 | - echo $this->uninstall_form(); | |
| 400 | + echo $this->uninstall_form(); | |
| 401 | 401 | } | 
| 402 | - } | |
| 402 | + } | |
| 403 | 403 | |
| 404 | 404 | /** | 
| 405 | 405 | * The Settings title | 
| @@ -562,8 +562,8 @@ discard block | ||
| 562 | 562 | type="' . $field['type'] . '" | 
| 563 | 563 | name="' . esc_attr( $name ) . '" | 
| 564 | 564 | value="' . $value . '" ' . | 
| 565 | - implode( ' ', $attributes ) . | |
| 566 | - ' />'; | |
| 565 | + implode( ' ', $attributes ) . | |
| 566 | + ' />'; | |
| 567 | 567 | |
| 568 | 568 |  		if ( $echo ) { | 
| 569 | 569 | echo $html; | 
| @@ -581,12 +581,12 @@ discard block | ||
| 581 | 581 | } | 
| 582 | 582 | |
| 583 | 583 | /** | 
| 584 | - * Check whether GravityView is being saved | |
| 585 | - * | |
| 586 | - * The generic is_save_postback() is true for all addons | |
| 587 | - * | |
| 588 | - * @since 2.0.8 | |
| 589 | - * | |
| 584 | + * Check whether GravityView is being saved | |
| 585 | + * | |
| 586 | + * The generic is_save_postback() is true for all addons | |
| 587 | + * | |
| 588 | + * @since 2.0.8 | |
| 589 | + * | |
| 590 | 590 | * @return bool | 
| 591 | 591 | */ | 
| 592 | 592 |  	public function is_save_postback() { | 
| @@ -600,16 +600,16 @@ discard block | ||
| 600 | 600 | */ | 
| 601 | 601 |  	public function license_key_notice() { | 
| 602 | 602 | |
| 603 | -	    if( $this->is_save_postback() ) { | |
| 604 | - $settings = $this->get_posted_settings(); | |
| 605 | - $license_key = defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get( $settings, 'license_key' ); | |
| 606 | - $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); | |
| 607 | -        } else { | |
| 608 | - $license_status = $this->get( 'license_key_status', 'inactive' ); | |
| 609 | - $license_key = $this->get( 'license_key' ); | |
| 610 | - } | |
| 603 | +		if( $this->is_save_postback() ) { | |
| 604 | + $settings = $this->get_posted_settings(); | |
| 605 | + $license_key = defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get( $settings, 'license_key' ); | |
| 606 | + $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); | |
| 607 | +		} else { | |
| 608 | + $license_status = $this->get( 'license_key_status', 'inactive' ); | |
| 609 | + $license_key = $this->get( 'license_key' ); | |
| 610 | + } | |
| 611 | 611 | |
| 612 | - $license_id = empty( $license_key ) ? 'license' : $license_key; | |
| 612 | + $license_id = empty( $license_key ) ? 'license' : $license_key; | |
| 613 | 613 | |
| 614 | 614 | $message = esc_html__( 'Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' ); | 
| 615 | 615 | |
| @@ -626,7 +626,7 @@ discard block | ||
| 626 | 626 | $update_below = false; | 
| 627 | 627 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); | 
| 628 | 628 | |
| 629 | -        switch ( $license_status ) { | |
| 629 | +		switch ( $license_status ) { | |
| 630 | 630 | /** @since 1.17 */ | 
| 631 | 631 | case 'expired': | 
| 632 | 632 | $title = __( 'Expired License', 'gravityview' ); | 
| @@ -664,13 +664,13 @@ discard block | ||
| 664 | 664 | return; | 
| 665 | 665 | } | 
| 666 | 666 | |
| 667 | - \GravityView_Admin_Notices::add_notice( array( | |
| 668 | - 'message' => $message, | |
| 669 | - 'class' => 'notice notice-warning', | |
| 670 | - 'title' => $title, | |
| 671 | - 'cap' => 'gravityview_edit_settings', | |
| 672 | - 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) | |
| 673 | - ) ); | |
| 667 | + \GravityView_Admin_Notices::add_notice( array( | |
| 668 | + 'message' => $message, | |
| 669 | + 'class' => 'notice notice-warning', | |
| 670 | + 'title' => $title, | |
| 671 | + 'cap' => 'gravityview_edit_settings', | |
| 672 | + 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) | |
| 673 | + ) ); | |
| 674 | 674 | } | 
| 675 | 675 | |
| 676 | 676 | /** | 
| @@ -684,12 +684,12 @@ discard block | ||
| 684 | 684 | } | 
| 685 | 685 | |
| 686 | 686 | /** | 
| 687 | - * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. | |
| 688 | - * | |
| 689 | - * @since 1.21.5 | |
| 690 | - * | |
| 691 | - * @see GFAddOn::scripts() | |
| 692 | - * | |
| 687 | + * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. | |
| 688 | + * | |
| 689 | + * @since 1.21.5 | |
| 690 | + * | |
| 691 | + * @see GFAddOn::scripts() | |
| 692 | + * | |
| 693 | 693 | * @return array Array of scripts | 
| 694 | 694 | */ | 
| 695 | 695 |  	public function scripts() { | 
| @@ -698,10 +698,10 @@ discard block | ||
| 698 | 698 | $scripts[] = array( | 
| 699 | 699 | 'handle' => 'gform_tooltip_init', | 
| 700 | 700 | 'enqueue' => array( | 
| 701 | - array( | |
| 702 | - 'admin_page' => array( 'app_settings' ) | |
| 703 | - ) | |
| 704 | - ) | |
| 701 | + array( | |
| 702 | + 'admin_page' => array( 'app_settings' ) | |
| 703 | + ) | |
| 704 | + ) | |
| 705 | 705 | ); | 
| 706 | 706 | |
| 707 | 707 | return $scripts; | 
| @@ -719,10 +719,10 @@ discard block | ||
| 719 | 719 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), | 
| 720 | 720 | 'version' => Plugin::$version, | 
| 721 | 721 | 'deps' => array( | 
| 722 | - 'gform_admin', | |
| 722 | + 'gform_admin', | |
| 723 | 723 | 'gaddon_form_settings_css', | 
| 724 | - 'gform_tooltip', | |
| 725 | - 'gform_font_awesome', | |
| 724 | + 'gform_tooltip', | |
| 725 | + 'gform_font_awesome', | |
| 726 | 726 | ), | 
| 727 | 727 | 'enqueue' => array( | 
| 728 | 728 | array( 'admin_page' => array( | 
| @@ -890,7 +890,7 @@ discard block | ||
| 890 | 890 | array( | 
| 891 | 891 | 'label' => esc_html__( 'Show me beta versions if they are available.', 'gravityview' ), | 
| 892 | 892 | 'value' => '1', | 
| 893 | - 'name' => 'beta', | |
| 893 | + 'name' => 'beta', | |
| 894 | 894 | ), | 
| 895 | 895 | ), | 
| 896 | 896 | 'description' => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ), | 
| @@ -928,38 +928,38 @@ discard block | ||
| 928 | 928 | |
| 929 | 929 |  			if ( empty( $field['disabled'] ) ) { | 
| 930 | 930 | unset( $field['disabled'] ); | 
| 931 | - } | |
| 931 | + } | |
| 932 | 932 | } | 
| 933 | 933 | |
| 934 | - $sections = array( | |
| 935 | - array( | |
| 936 | - 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), | |
| 937 | - 'fields' => $fields, | |
| 938 | - ) | |
| 939 | - ); | |
| 934 | + $sections = array( | |
| 935 | + array( | |
| 936 | + 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), | |
| 937 | + 'fields' => $fields, | |
| 938 | + ) | |
| 939 | + ); | |
| 940 | 940 | |
| 941 | - // custom 'update settings' button | |
| 942 | - $button = array( | |
| 943 | - 'class' => 'button button-primary button-hero', | |
| 944 | - 'type' => 'save', | |
| 945 | - ); | |
| 941 | + // custom 'update settings' button | |
| 942 | + $button = array( | |
| 943 | + 'class' => 'button button-primary button-hero', | |
| 944 | + 'type' => 'save', | |
| 945 | + ); | |
| 946 | 946 | |
| 947 | 947 |  		if ( $disabled_attribute ) { | 
| 948 | 948 | $button['disabled'] = $disabled_attribute; | 
| 949 | 949 | } | 
| 950 | 950 | |
| 951 | - /** | |
| 952 | - * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page | |
| 953 | - * Extensions can tap in here to insert their own section and settings. | |
| 954 | - * <code> | |
| 955 | - * $sections[] = array( | |
| 956 | - * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), | |
| 957 | - * 'fields' => $settings, | |
| 958 | - * ); | |
| 959 | - * </code> | |
| 960 | - * @param array $extension_settings Empty array, ready for extension settings! | |
| 961 | - */ | |
| 962 | - $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); | |
| 951 | + /** | |
| 952 | + * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page | |
| 953 | + * Extensions can tap in here to insert their own section and settings. | |
| 954 | + * <code> | |
| 955 | + * $sections[] = array( | |
| 956 | + * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), | |
| 957 | + * 'fields' => $settings, | |
| 958 | + * ); | |
| 959 | + * </code> | |
| 960 | + * @param array $extension_settings Empty array, ready for extension settings! | |
| 961 | + */ | |
| 962 | + $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); | |
| 963 | 963 | |
| 964 | 964 | // If there are extensions, add a section for them | 
| 965 | 965 |  		if ( ! empty( $extension_sections ) ) { | 
| @@ -972,13 +972,13 @@ discard block | ||
| 972 | 972 | } | 
| 973 | 973 | } | 
| 974 | 974 | |
| 975 | - $k = count( $extension_sections ) - 1 ; | |
| 976 | - $extension_sections[ $k ]['fields'][] = $button; | |
| 975 | + $k = count( $extension_sections ) - 1 ; | |
| 976 | + $extension_sections[ $k ]['fields'][] = $button; | |
| 977 | 977 | $sections = array_merge( $sections, $extension_sections ); | 
| 978 | 978 |  		} else { | 
| 979 | - // add the 'update settings' button to the general section | |
| 980 | - $sections[0]['fields'][] = $button; | |
| 981 | - } | |
| 979 | + // add the 'update settings' button to the general section | |
| 980 | + $sections[0]['fields'][] = $button; | |
| 981 | + } | |
| 982 | 982 | |
| 983 | 983 | return $sections; | 
| 984 | 984 | } | 
| @@ -1032,9 +1032,9 @@ discard block | ||
| 1032 | 1032 | */ | 
| 1033 | 1033 |  	protected function settings_edd_license( $field, $echo = true ) { | 
| 1034 | 1034 | |
| 1035 | -	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { | |
| 1036 | - $field['input_type'] = 'password'; | |
| 1037 | - } | |
| 1035 | +		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { | |
| 1036 | + $field['input_type'] = 'password'; | |
| 1037 | + } | |
| 1038 | 1038 | |
| 1039 | 1039 | $text = $this->settings_text( $field, false ); | 
| 1040 | 1040 | |
| @@ -1051,9 +1051,9 @@ discard block | ||
| 1051 | 1051 | |
| 1052 | 1052 | /** | 
| 1053 | 1053 | * Allow pure HTML settings row | 
| 1054 | - * | |
| 1055 | - * @since 2.0.6 | |
| 1056 | - * | |
| 1054 | + * | |
| 1055 | + * @since 2.0.6 | |
| 1056 | + * | |
| 1057 | 1057 | * @param array $field | 
| 1058 | 1058 | * @param bool $echo Whether to echo the | 
| 1059 | 1059 | * | 
| @@ -1119,19 +1119,19 @@ discard block | ||
| 1119 | 1119 | } | 
| 1120 | 1120 | |
| 1121 | 1121 | /** | 
| 1122 | - * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it | |
| 1123 | - * | |
| 1124 | - * Converts `$field['description']` to `$field['gv_description']` | |
| 1125 | - * Converts `$field['subtitle']` to `$field['description']` | |
| 1126 | - * | |
| 1127 | - * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` | |
| 1128 | - * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description | |
| 1129 | - * | |
| 1130 | - * @since 1.21.5.2 | |
| 1131 | - * | |
| 1122 | + * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it | |
| 1123 | + * | |
| 1124 | + * Converts `$field['description']` to `$field['gv_description']` | |
| 1125 | + * Converts `$field['subtitle']` to `$field['description']` | |
| 1126 | + * | |
| 1127 | + * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` | |
| 1128 | + * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description | |
| 1129 | + * | |
| 1130 | + * @since 1.21.5.2 | |
| 1131 | + * | |
| 1132 | 1132 | * @param array $field | 
| 1133 | - * | |
| 1134 | - * @return void | |
| 1133 | + * | |
| 1134 | + * @return void | |
| 1135 | 1135 | */ | 
| 1136 | 1136 |  	public function single_setting_row( $field ) { | 
| 1137 | 1137 | $field['gv_description'] = Utils::get( $field, 'description' ); | 
| @@ -102,7 +102,7 @@ discard block | ||
| 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 | ||
| 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 | ?> | 
| @@ -542,15 +542,15 @@ discard block | ||
| 542 | 542 | * @return string The HTML | 
| 543 | 543 | */ | 
| 544 | 544 |  	public function as_html( $field, $echo = true ) { | 
| 545 | - $field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit'; | |
| 545 | + $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit'; | |
| 546 | 546 | |
| 547 | 547 | $attributes = $this->get_field_attributes( $field ); | 
| 548 | 548 | $default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) ); | 
| 549 | - $value = $this->get( $field['name'], $default_value ); | |
| 549 | + $value = $this->get( $field[ 'name' ], $default_value ); | |
| 550 | 550 | |
| 551 | 551 | |
| 552 | - $attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton'; | |
| 553 | - $name = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name']; | |
| 552 | + $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton'; | |
| 553 | + $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ]; | |
| 554 | 554 | |
| 555 | 555 |  		if ( empty( $value ) ) { | 
| 556 | 556 | $value = __( 'Update Settings', 'gravityview' ); | 
| @@ -559,7 +559,7 @@ discard block | ||
| 559 | 559 | $attributes = $this->get_field_attributes( $field ); | 
| 560 | 560 | |
| 561 | 561 | $html = '<input | 
| 562 | - type="' . $field['type'] . '" | |
| 562 | + type="' . $field[ 'type' ] . '" | |
| 563 | 563 | name="' . esc_attr( $name ) . '" | 
| 564 | 564 | value="' . $value . '" ' . | 
| 565 | 565 | implode( ' ', $attributes ) . | 
| @@ -590,7 +590,7 @@ discard block | ||
| 590 | 590 | * @return bool | 
| 591 | 591 | */ | 
| 592 | 592 |  	public function is_save_postback() { | 
| 593 | - return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] ); | |
| 593 | + return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] ); | |
| 594 | 594 | } | 
| 595 | 595 | |
| 596 | 596 | /** | 
| @@ -600,7 +600,7 @@ discard block | ||
| 600 | 600 | */ | 
| 601 | 601 |  	public function license_key_notice() { | 
| 602 | 602 | |
| 603 | -	    if( $this->is_save_postback() ) { | |
| 603 | +	    if ( $this->is_save_postback() ) { | |
| 604 | 604 | $settings = $this->get_posted_settings(); | 
| 605 | 605 | $license_key = defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get( $settings, 'license_key' ); | 
| 606 | 606 | $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); | 
| @@ -621,7 +621,7 @@ discard block | ||
| 621 | 621 | * but didn't want to mess up the translation strings for the translators. | 
| 622 | 622 | */ | 
| 623 | 623 | $message = mb_substr( $message, 0, mb_strlen( $message ) - 1 ); | 
| 624 | - $title = __( 'Inactive License', 'gravityview'); | |
| 624 | + $title = __( 'Inactive License', 'gravityview' ); | |
| 625 | 625 | $status = ''; | 
| 626 | 626 | $update_below = false; | 
| 627 | 627 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); | 
| @@ -651,7 +651,7 @@ discard block | ||
| 651 | 651 | $update_below = __( 'Activate your license key below.', 'gravityview' ); | 
| 652 | 652 | break; | 
| 653 | 653 | } | 
| 654 | - $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice'; | |
| 654 | + $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice'; | |
| 655 | 655 | |
| 656 | 656 | // Show a different notice on settings page for inactive licenses (hide the buttons) | 
| 657 | 657 |  		if ( $update_below && gravityview()->request->is_admin( '', 'settings' ) ) { | 
| @@ -695,7 +695,7 @@ discard block | ||
| 695 | 695 |  	public function scripts() { | 
| 696 | 696 | $scripts = parent::scripts(); | 
| 697 | 697 | |
| 698 | - $scripts[] = array( | |
| 698 | + $scripts[ ] = array( | |
| 699 | 699 | 'handle' => 'gform_tooltip_init', | 
| 700 | 700 | 'enqueue' => array( | 
| 701 | 701 | array( | 
| @@ -714,7 +714,7 @@ discard block | ||
| 714 | 714 |  	public function styles() { | 
| 715 | 715 | $styles = parent::styles(); | 
| 716 | 716 | |
| 717 | - $styles[] = array( | |
| 717 | + $styles[ ] = array( | |
| 718 | 718 | 'handle' => 'gravityview_settings', | 
| 719 | 719 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), | 
| 720 | 720 | 'version' => Plugin::$version, | 
| @@ -745,7 +745,7 @@ discard block | ||
| 745 | 745 | * If multisite and not network admin, we don't want the settings to show. | 
| 746 | 746 | * @since 1.7.6 | 
| 747 | 747 | */ | 
| 748 | - $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); | |
| 748 | + $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); | |
| 749 | 749 | |
| 750 | 750 | /** | 
| 751 | 751 | * Override whether to show the Settings menu on a per-blog basis. | 
| @@ -793,26 +793,26 @@ discard block | ||
| 793 | 793 | 'label' => __( 'License Key', 'gravityview' ), | 
| 794 | 794 | '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' ) ), | 
| 795 | 795 | 'type' => 'edd_license', | 
| 796 | - 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), | |
| 796 | + 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), | |
| 797 | 797 | 'data-pending-text' => __( 'Verifying license…', 'gravityview' ), | 
| 798 | - 'default_value' => $default_settings['license_key'], | |
| 798 | + 'default_value' => $default_settings[ 'license_key' ], | |
| 799 | 799 | 'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key', | 
| 800 | 800 | ), | 
| 801 | 801 | array( | 
| 802 | 802 | 'name' => 'license_key_response', | 
| 803 | - 'default_value' => $default_settings['license_key_response'], | |
| 803 | + 'default_value' => $default_settings[ 'license_key_response' ], | |
| 804 | 804 | 'type' => 'hidden', | 
| 805 | 805 | ), | 
| 806 | 806 | array( | 
| 807 | 807 | 'name' => 'license_key_status', | 
| 808 | - 'default_value' => $default_settings['license_key_status'], | |
| 808 | + 'default_value' => $default_settings[ 'license_key_status' ], | |
| 809 | 809 | 'type' => 'hidden', | 
| 810 | 810 | ), | 
| 811 | 811 | array( | 
| 812 | 812 | 'name' => 'support-email', | 
| 813 | 813 | 'type' => 'text', | 
| 814 | 814 | 'validate' => 'email', | 
| 815 | - 'default_value' => $default_settings['support-email'], | |
| 815 | + 'default_value' => $default_settings[ 'support-email' ], | |
| 816 | 816 | 'label' => __( 'Support Email', 'gravityview' ), | 
| 817 | 817 | 'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ), | 
| 818 | 818 | 'class' => 'code regular-text', | 
| @@ -824,7 +824,7 @@ discard block | ||
| 824 | 824 | 'name' => 'support_port', | 
| 825 | 825 | 'type' => 'radio', | 
| 826 | 826 | 'label' => __( 'Show Support Port?', 'gravityview' ), | 
| 827 | - 'default_value' => $default_settings['support_port'], | |
| 827 | + 'default_value' => $default_settings[ 'support_port' ], | |
| 828 | 828 | 'horizontal' => 1, | 
| 829 | 829 | 'choices' => array( | 
| 830 | 830 | array( | 
| @@ -843,7 +843,7 @@ discard block | ||
| 843 | 843 | 'name' => 'no-conflict-mode', | 
| 844 | 844 | 'type' => 'radio', | 
| 845 | 845 | 'label' => __( 'No-Conflict Mode', 'gravityview' ), | 
| 846 | - 'default_value' => $default_settings['no-conflict-mode'], | |
| 846 | + 'default_value' => $default_settings[ 'no-conflict-mode' ], | |
| 847 | 847 | 'horizontal' => 1, | 
| 848 | 848 | 'choices' => array( | 
| 849 | 849 | array( | 
| @@ -865,7 +865,7 @@ discard block | ||
| 865 | 865 | 'name' => 'rest_api', | 
| 866 | 866 | 'type' => 'radio', | 
| 867 | 867 | 'label' => __( 'REST API', 'gravityview' ), | 
| 868 | - 'default_value' => $default_settings['rest_api'], | |
| 868 | + 'default_value' => $default_settings[ 'rest_api' ], | |
| 869 | 869 | 'horizontal' => 1, | 
| 870 | 870 | 'choices' => array( | 
| 871 | 871 | array( | 
| @@ -884,7 +884,7 @@ discard block | ||
| 884 | 884 | 'name' => 'beta', | 
| 885 | 885 | 'type' => 'checkbox', | 
| 886 | 886 | 'label' => __( 'Become a Beta Tester', 'gravityview' ), | 
| 887 | - 'default_value' => $default_settings['beta'], | |
| 887 | + 'default_value' => $default_settings[ 'beta' ], | |
| 888 | 888 | 'horizontal' => 1, | 
| 889 | 889 | 'choices' => array( | 
| 890 | 890 | array( | 
| @@ -917,17 +917,17 @@ discard block | ||
| 917 | 917 | * @since 1.7.4 | 
| 918 | 918 | */ | 
| 919 | 919 |  		foreach ( $fields as &$field ) { | 
| 920 | - $field['name'] = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' ); | |
| 921 | - $field['label'] = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' ); | |
| 922 | - $field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' ); | |
| 923 | - $field['description'] = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' ); | |
| 920 | + $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' ); | |
| 921 | + $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' ); | |
| 922 | + $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' ); | |
| 923 | + $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' ); | |
| 924 | 924 | |
| 925 | 925 |  			if ( $disabled_attribute ) { | 
| 926 | - $field['disabled'] = $disabled_attribute; | |
| 926 | + $field[ 'disabled' ] = $disabled_attribute; | |
| 927 | 927 | } | 
| 928 | 928 | |
| 929 | -			if ( empty( $field['disabled'] ) ) { | |
| 930 | - unset( $field['disabled'] ); | |
| 929 | +			if ( empty( $field[ 'disabled' ] ) ) { | |
| 930 | + unset( $field[ 'disabled' ] ); | |
| 931 | 931 | } | 
| 932 | 932 | } | 
| 933 | 933 | |
| @@ -945,7 +945,7 @@ discard block | ||
| 945 | 945 | ); | 
| 946 | 946 | |
| 947 | 947 |  		if ( $disabled_attribute ) { | 
| 948 | - $button['disabled'] = $disabled_attribute; | |
| 948 | + $button[ 'disabled' ] = $disabled_attribute; | |
| 949 | 949 | } | 
| 950 | 950 | |
| 951 | 951 | /** | 
| @@ -964,20 +964,20 @@ discard block | ||
| 964 | 964 | // If there are extensions, add a section for them | 
| 965 | 965 |  		if ( ! empty( $extension_sections ) ) { | 
| 966 | 966 | |
| 967 | -			if( $disabled_attribute ) { | |
| 967 | +			if ( $disabled_attribute ) { | |
| 968 | 968 |  				foreach ( $extension_sections as &$section ) { | 
| 969 | -					foreach ( $section['fields'] as &$field ) { | |
| 970 | - $field['disabled'] = $disabled_attribute; | |
| 969 | +					foreach ( $section[ 'fields' ] as &$field ) { | |
| 970 | + $field[ 'disabled' ] = $disabled_attribute; | |
| 971 | 971 | } | 
| 972 | 972 | } | 
| 973 | 973 | } | 
| 974 | 974 | |
| 975 | - $k = count( $extension_sections ) - 1 ; | |
| 976 | - $extension_sections[ $k ]['fields'][] = $button; | |
| 975 | + $k = count( $extension_sections ) - 1; | |
| 976 | + $extension_sections[ $k ][ 'fields' ][ ] = $button; | |
| 977 | 977 | $sections = array_merge( $sections, $extension_sections ); | 
| 978 | 978 |  		} else { | 
| 979 | 979 | // add the 'update settings' button to the general section | 
| 980 | - $sections[0]['fields'][] = $button; | |
| 980 | + $sections[ 0 ][ 'fields' ][ ] = $button; | |
| 981 | 981 | } | 
| 982 | 982 | |
| 983 | 983 | return $sections; | 
| @@ -1033,7 +1033,7 @@ discard block | ||
| 1033 | 1033 |  	protected function settings_edd_license( $field, $echo = true ) { | 
| 1034 | 1034 | |
| 1035 | 1035 |  	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { | 
| 1036 | - $field['input_type'] = 'password'; | |
| 1036 | + $field[ 'input_type' ] = 'password'; | |
| 1037 | 1037 | } | 
| 1038 | 1038 | |
| 1039 | 1039 | $text = $this->settings_text( $field, false ); | 
| @@ -1082,7 +1082,7 @@ discard block | ||
| 1082 | 1082 |  	public function single_setting_row_html( $field ) { | 
| 1083 | 1083 | ?> | 
| 1084 | 1084 | |
| 1085 | - <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>"> | |
| 1085 | + <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>"> | |
| 1086 | 1086 | <td colspan="2"> | 
| 1087 | 1087 | <?php $this->single_setting( $field ); ?> | 
| 1088 | 1088 | </td> | 
| @@ -1100,10 +1100,10 @@ discard block | ||
| 1100 | 1100 | * @return string | 
| 1101 | 1101 | */ | 
| 1102 | 1102 |  	public function settings_save( $field, $echo = true ) { | 
| 1103 | - $field['type'] = 'submit'; | |
| 1104 | - $field['name'] = 'gform-settings-save'; | |
| 1105 | - $field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton'; | |
| 1106 | - $field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); | |
| 1103 | + $field[ 'type' ] = 'submit'; | |
| 1104 | + $field[ 'name' ] = 'gform-settings-save'; | |
| 1105 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton'; | |
| 1106 | + $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); | |
| 1107 | 1107 | |
| 1108 | 1108 | $output = $this->settings_submit( $field, false ); | 
| 1109 | 1109 | |
| @@ -1134,8 +1134,8 @@ discard block | ||
| 1134 | 1134 | * @return void | 
| 1135 | 1135 | */ | 
| 1136 | 1136 |  	public function single_setting_row( $field ) { | 
| 1137 | - $field['gv_description'] = Utils::get( $field, 'description' ); | |
| 1138 | - $field['description'] = Utils::get( $field, 'subtitle' ); | |
| 1137 | + $field[ 'gv_description' ] = Utils::get( $field, 'description' ); | |
| 1138 | + $field[ 'description' ] = Utils::get( $field, 'subtitle' ); | |
| 1139 | 1139 | parent::single_setting_row( $field ); | 
| 1140 | 1140 | } | 
| 1141 | 1141 | |
| @@ -1147,7 +1147,7 @@ discard block | ||
| 1147 | 1147 |  	public function single_setting_label( $field ) { | 
| 1148 | 1148 | parent::single_setting_label( $field ); | 
| 1149 | 1149 |  		if ( $description = Utils::get( $field, 'gv_description' ) ) { | 
| 1150 | - echo '<span class="description">'. $description .'</span>'; | |
| 1150 | + echo '<span class="description">' . $description . '</span>'; | |
| 1151 | 1151 | } | 
| 1152 | 1152 | } | 
| 1153 | 1153 | |
| @@ -1192,10 +1192,10 @@ discard block | ||
| 1192 | 1192 | // then we assume it's changed. If it's changed, unset the status and the previous response. | 
| 1193 | 1193 |  		if ( ! $added_message && ( $local_key !== $response_key ) ) { | 
| 1194 | 1194 | |
| 1195 | - unset( $posted_settings['license_key_response'] ); | |
| 1196 | - unset( $posted_settings['license_key_status'] ); | |
| 1195 | + unset( $posted_settings[ 'license_key_response' ] ); | |
| 1196 | + unset( $posted_settings[ 'license_key_status' ] ); | |
| 1197 | 1197 | |
| 1198 | -			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); | |
| 1198 | + \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); | |
| 1199 | 1199 | |
| 1200 | 1200 | $added_message = true; | 
| 1201 | 1201 | } |