Completed
Push — develop ( 151ba0...47ccc8 )
by Zack
45:18 queued 41:47
created
future/includes/class-gv-settings-addon.php 1 patch
Indentation   +123 added lines, -123 removed lines patch added patch discarded remove patch
@@ -134,28 +134,28 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
@@ -489,9 +489,9 @@  discard block
 block discarded – undo
489 489
 
490 490
 		if( is_multisite() ) {
491 491
 			$option_value = get_blog_option( get_main_site_id(), $option_name, array() );
492
-        } else {
493
-		    $option_value = get_site_option( $option_name, array() );
494
-        }
492
+		} else {
493
+			$option_value = get_site_option( $option_name, array() );
494
+		}
495 495
 
496 496
 		return wp_parse_args( $option_value, $this->defaults() );
497 497
 	}
@@ -562,8 +562,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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 = \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 = \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&rsquo;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
 block discarded – undo
626 626
 		$update_below = false;
627 627
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
890 890
 					array(
891 891
 						'label' => _x( '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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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' );
Please login to merge, or discard this patch.