Completed
Pull Request — master (#1071)
by Gennady
22:39 queued 18:23
created
future/includes/class-gv-settings-addon.php 1 patch
Indentation   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -138,20 +138,20 @@  discard block
 block discarded – undo
138 138
 	}
139 139
 
140 140
 	/**
141
-     * Uninstall all traces of GravityView
142
-     *
143
-     * Note: method is public because parent method is public
144
-     *
141
+	 * Uninstall all traces of GravityView
142
+	 *
143
+	 * Note: method is public because parent method is public
144
+	 *
145 145
 	 * @return bool
146 146
 	 */
147 147
 	public function uninstall() {
148 148
 		gravityview()->plugin->uninstall();
149 149
 
150 150
 		/**
151
-         * Set the path so that Gravity Forms can de-activate GravityView
152
-         * @see GFAddOn::uninstall_addon
153
-         * @uses deactivate_plugins()
154
-         */
151
+		 * Set the path so that Gravity Forms can de-activate GravityView
152
+		 * @see GFAddOn::uninstall_addon
153
+		 * @uses deactivate_plugins()
154
+		 */
155 155
 		$this->_path = GRAVITYVIEW_FILE;
156 156
 
157 157
 		return true;
@@ -181,42 +181,42 @@  discard block
 block discarded – undo
181 181
 	}
182 182
 
183 183
 	/**
184
-     * Get an array of reasons why the plugin might be uninstalled
185
-     *
186
-     * @since 1.17.5
187
-     *
184
+	 * Get an array of reasons why the plugin might be uninstalled
185
+	 *
186
+	 * @since 1.17.5
187
+	 *
188 188
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
189 189
 	 */
190 190
 	private function get_uninstall_reasons() {
191 191
 		$reasons = array(
192 192
 			'will-continue' => array(
193
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
-            ),
193
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
+			),
195 195
 			'no-longer-need' => array(
196
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
-            ),
196
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
+			),
198 198
 			'doesnt-work' => array(
199
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
-            ),
199
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
+			),
201 201
 			'found-other' => array(
202
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
-                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
-            ),
202
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
+				'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
+			),
205 205
 			'other' => array(
206
-                'label' => esc_html__( 'Other', 'gravityview' ),
207
-            ),
206
+				'label' => esc_html__( 'Other', 'gravityview' ),
207
+			),
208 208
 		);
209 209
 
210 210
 		shuffle( $reasons );
211 211
 
212 212
 		return $reasons;
213
-    }
213
+	}
214 214
 
215 215
 	/**
216
-     * Display a feedback form when the plugin is uninstalled
217
-     *
218
-     * @since 1.17.5
219
-     *
216
+	 * Display a feedback form when the plugin is uninstalled
217
+	 *
218
+	 * @since 1.17.5
219
+	 *
220 220
 	 * @return string HTML of the uninstallation form
221 221
 	 */
222 222
 	public function uninstall_form() {
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
297 297
             <ul>
298 298
 				<?php
299
-                $reasons = $this->get_uninstall_reasons();
299
+				$reasons = $this->get_uninstall_reasons();
300 300
 				foreach ( $reasons as $reason ) {
301 301
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
302 302
 				}
@@ -390,12 +390,12 @@  discard block
 block discarded – undo
390 390
 	}
391 391
 
392 392
 	public function app_settings_tab() {
393
-	    parent::app_settings_tab();
393
+		parent::app_settings_tab();
394 394
 
395 395
 		if ( $this->maybe_uninstall() ) {
396
-            echo $this->uninstall_form();
396
+			echo $this->uninstall_form();
397 397
 		}
398
-    }
398
+	}
399 399
 
400 400
 	/**
401 401
 	 * The Settings title
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 	 * @return array The settings.
481 481
 	 */
482 482
 	public function all() {
483
-	    return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
483
+		return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
484 484
 	}
485 485
 
486 486
 	/**
@@ -549,8 +549,8 @@  discard block
 block discarded – undo
549 549
                     type="' . $field['type'] . '"
550 550
                     name="' . esc_attr( $name ) . '"
551 551
                     value="' . $value . '" ' .
552
-		        implode( ' ', $attributes ) .
553
-		        ' />';
552
+				implode( ' ', $attributes ) .
553
+				' />';
554 554
 
555 555
 		if ( $echo ) {
556 556
 			echo $html;
@@ -568,12 +568,12 @@  discard block
 block discarded – undo
568 568
 	}
569 569
 
570 570
 	/**
571
-     * Check whether GravityView is being saved
572
-     *
573
-     * The generic is_save_postback() is true for all addons
574
-     *
575
-     * @since 2.0.8
576
-     *
571
+	 * Check whether GravityView is being saved
572
+	 *
573
+	 * The generic is_save_postback() is true for all addons
574
+	 *
575
+	 * @since 2.0.8
576
+	 *
577 577
 	 * @return bool
578 578
 	 */
579 579
 	public function is_save_postback() {
@@ -587,16 +587,16 @@  discard block
 block discarded – undo
587 587
 	 */
588 588
 	public function license_key_notice() {
589 589
 
590
-	    if( $this->is_save_postback() ) {
591
-		    $settings = $this->get_posted_settings();
592
-		    $license_key = \GV\Utils::get( $settings, 'license_key' );
593
-		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
594
-        } else {
595
-		    $license_status = $this->get( 'license_key_status', 'inactive' );
596
-		    $license_key    = $this->get( 'license_key' );
597
-	    }
590
+		if( $this->is_save_postback() ) {
591
+			$settings = $this->get_posted_settings();
592
+			$license_key = \GV\Utils::get( $settings, 'license_key' );
593
+			$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
594
+		} else {
595
+			$license_status = $this->get( 'license_key_status', 'inactive' );
596
+			$license_key    = $this->get( 'license_key' );
597
+		}
598 598
 
599
-	    $license_id = empty( $license_key ) ? 'license' : $license_key;
599
+		$license_id = empty( $license_key ) ? 'license' : $license_key;
600 600
 
601 601
 		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
602 602
 
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
 		$update_below = false;
611 611
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
612 612
 
613
-        switch ( $license_status ) {
613
+		switch ( $license_status ) {
614 614
 			/** @since 1.17 */
615 615
 			case 'expired':
616 616
 				$title = __( 'Expired License', 'gravityview' );
@@ -666,12 +666,12 @@  discard block
 block discarded – undo
666 666
 	}
667 667
 
668 668
 	/**
669
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
670
-     *
671
-     * @since 1.21.5
672
-     *
673
-     * @see GFAddOn::scripts()
674
-     *
669
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
670
+	 *
671
+	 * @since 1.21.5
672
+	 *
673
+	 * @see GFAddOn::scripts()
674
+	 *
675 675
 	 * @return array Array of scripts
676 676
 	 */
677 677
 	public function scripts() {
@@ -680,10 +680,10 @@  discard block
 block discarded – undo
680 680
 		$scripts[] = array(
681 681
 			'handle'  => 'gform_tooltip_init',
682 682
 			'enqueue' => array(
683
-                array(
684
-			        'admin_page' => array( 'app_settings' )
685
-                )
686
-            )
683
+				array(
684
+					'admin_page' => array( 'app_settings' )
685
+				)
686
+			)
687 687
 		);
688 688
 
689 689
 		return $scripts;
@@ -701,10 +701,10 @@  discard block
 block discarded – undo
701 701
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
702 702
 			'version' => Plugin::$version,
703 703
 			'deps' => array(
704
-                'gform_admin',
704
+				'gform_admin',
705 705
 				'gaddon_form_settings_css',
706
-                'gform_tooltip',
707
-                'gform_font_awesome',
706
+				'gform_tooltip',
707
+				'gform_font_awesome',
708 708
 			),
709 709
 			'enqueue' => array(
710 710
 				array( 'admin_page' => array(
@@ -872,7 +872,7 @@  discard block
 block discarded – undo
872 872
 					array(
873 873
 						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
874 874
 						'value' => '1',
875
-                        'name'  => 'beta',
875
+						'name'  => 'beta',
876 876
 					),
877 877
 				),
878 878
 				'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' ),
@@ -910,38 +910,38 @@  discard block
 block discarded – undo
910 910
 
911 911
 			if ( empty( $field['disabled'] ) ) {
912 912
 				unset( $field['disabled'] );
913
-            }
913
+			}
914 914
 		}
915 915
 
916
-        $sections = array(
917
-            array(
918
-                'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
919
-                'fields'      => $fields,
920
-            )
921
-        );
916
+		$sections = array(
917
+			array(
918
+				'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
919
+				'fields'      => $fields,
920
+			)
921
+		);
922 922
 
923
-        // custom 'update settings' button
924
-        $button = array(
925
-            'class' => 'button button-primary button-hero',
926
-            'type' => 'save',
927
-        );
923
+		// custom 'update settings' button
924
+		$button = array(
925
+			'class' => 'button button-primary button-hero',
926
+			'type' => 'save',
927
+		);
928 928
 
929 929
 		if ( $disabled_attribute ) {
930 930
 			$button['disabled'] = $disabled_attribute;
931 931
 		}
932 932
 
933
-        /**
934
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
935
-         * Extensions can tap in here to insert their own section and settings.
936
-         * <code>
937
-         *   $sections[] = array(
938
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
939
-         *      'fields' => $settings,
940
-         *   );
941
-         * </code>
942
-         * @param array $extension_settings Empty array, ready for extension settings!
943
-         */
944
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
933
+		/**
934
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
935
+		 * Extensions can tap in here to insert their own section and settings.
936
+		 * <code>
937
+		 *   $sections[] = array(
938
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
939
+		 *      'fields' => $settings,
940
+		 *   );
941
+		 * </code>
942
+		 * @param array $extension_settings Empty array, ready for extension settings!
943
+		 */
944
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
945 945
 
946 946
 		// If there are extensions, add a section for them
947 947
 		if ( ! empty( $extension_sections ) ) {
@@ -954,13 +954,13 @@  discard block
 block discarded – undo
954 954
 				}
955 955
 			}
956 956
 
957
-            $k = count( $extension_sections ) - 1 ;
958
-            $extension_sections[ $k ]['fields'][] = $button;
957
+			$k = count( $extension_sections ) - 1 ;
958
+			$extension_sections[ $k ]['fields'][] = $button;
959 959
 			$sections = array_merge( $sections, $extension_sections );
960 960
 		} else {
961
-            // add the 'update settings' button to the general section
962
-            $sections[0]['fields'][] = $button;
963
-        }
961
+			// add the 'update settings' button to the general section
962
+			$sections[0]['fields'][] = $button;
963
+		}
964 964
 
965 965
 		return $sections;
966 966
 	}
@@ -1014,9 +1014,9 @@  discard block
 block discarded – undo
1014 1014
 	 */
1015 1015
 	protected function settings_edd_license( $field, $echo = true ) {
1016 1016
 
1017
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1018
-		    $field['input_type'] = 'password';
1019
-        }
1017
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1018
+			$field['input_type'] = 'password';
1019
+		}
1020 1020
 
1021 1021
 		$text = $this->settings_text( $field, false );
1022 1022
 
@@ -1033,9 +1033,9 @@  discard block
 block discarded – undo
1033 1033
 
1034 1034
 	/**
1035 1035
 	 * Allow pure HTML settings row
1036
-     *
1037
-     * @since 2.0.6
1038
-     *
1036
+	 *
1037
+	 * @since 2.0.6
1038
+	 *
1039 1039
 	 * @param array $field
1040 1040
 	 * @param bool $echo Whether to echo the
1041 1041
 	 *
@@ -1101,19 +1101,19 @@  discard block
 block discarded – undo
1101 1101
 	}
1102 1102
 
1103 1103
 	/**
1104
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1105
-     *
1106
-     * Converts `$field['description']` to `$field['gv_description']`
1107
-     * Converts `$field['subtitle']` to `$field['description']`
1108
-     *
1109
-     * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1110
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1111
-     *
1112
-     * @since 1.21.5.2
1113
-     *
1104
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1105
+	 *
1106
+	 * Converts `$field['description']` to `$field['gv_description']`
1107
+	 * Converts `$field['subtitle']` to `$field['description']`
1108
+	 *
1109
+	 * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1110
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1111
+	 *
1112
+	 * @since 1.21.5.2
1113
+	 *
1114 1114
 	 * @param array $field
1115
-     *
1116
-     * @return void
1115
+	 *
1116
+	 * @return void
1117 1117
 	 */
1118 1118
 	public function single_setting_row( $field ) {
1119 1119
 		$field['gv_description'] = Utils::get( $field, 'description' );
Please login to merge, or discard this patch.