Completed
Push — develop ( fddcc1...c8b481 )
by Zack
08:02
created
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-rcp.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	 */
24 24
 	protected $script_handles = array(
25 25
 		'rcp-admin-scripts',
26
-	    'bbq',
26
+		'bbq',
27 27
 	);
28 28
 
29 29
 	/**
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 
137 137
 		if( empty( $connected_views ) ) {
138 138
 
139
-		    $menu_items['gravityview'] = array(
139
+			$menu_items['gravityview'] = array(
140 140
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
141 141
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
142 142
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -167,13 +167,13 @@  discard block
 block discarded – undo
167 167
 		// If there were no items added, then let's create the parent menu
168 168
 		if( $sub_menu_items ) {
169 169
 
170
-		    $sub_menu_items[] = array(
171
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
172
-                'link_class' => 'gv-create-view',
173
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
174
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
175
-			    'capabilities'   => array( 'edit_gravityviews' ),
176
-            );
170
+			$sub_menu_items[] = array(
171
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
172
+				'link_class' => 'gv-create-view',
173
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
174
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
175
+				'capabilities'   => array( 'edit_gravityviews' ),
176
+			);
177 177
 
178 178
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
179 179
 			$sub_menu_items[] = array(
@@ -549,12 +549,12 @@  discard block
 block discarded – undo
549 549
 	 * Render html for displaying available fields based on a Form ID
550 550
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
551 551
 	 *
552
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
552
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
553 553
 	 * @access public
554
-     *
554
+	 *
555 555
 	 * @param int $form Gravity Forms Form ID (default: '')
556 556
 	 * @param string $context (default: 'single')
557
-     *
557
+	 *
558 558
 	 * @return void
559 559
 	 */
560 560
 	function render_available_fields( $form = 0, $context = 'single' ) {
@@ -568,7 +568,7 @@  discard block
 block discarded – undo
568 568
 
569 569
 		if ( ! is_array( $blacklist_field_types ) ) {
570 570
 
571
-		    do_action( 'gravityview_log_error', __METHOD__ . ': $blacklist_field_types is not an array', print_r( $blacklist_field_types, true ) );
571
+			do_action( 'gravityview_log_error', __METHOD__ . ': $blacklist_field_types is not an array', print_r( $blacklist_field_types, true ) );
572 572
 
573 573
 			$blacklist_field_types = array();
574 574
 		}
@@ -700,12 +700,12 @@  discard block
 block discarded – undo
700 700
 				/**
701 701
 				 * @since 1.7.2
702 702
 				 */
703
-			    'other_entries' => array(
704
-				    'label'	=> __('Other Entries', 'gravityview'),
705
-				    'type'	=> 'other_entries',
706
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
707
-			    ),
708
-	        );
703
+				'other_entries' => array(
704
+					'label'	=> __('Other Entries', 'gravityview'),
705
+					'type'	=> 'other_entries',
706
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
707
+				),
708
+			);
709 709
 
710 710
 			if( 'single' !== $zone) {
711 711
 
@@ -1016,59 +1016,59 @@  discard block
 block discarded – undo
1016 1016
 
1017 1017
 		// Don't process any scripts below here if it's not a GravityView page.
1018 1018
 		if( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1019
-		    return;
1019
+			return;
1020 1020
 		}
1021 1021
 
1022
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1023
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1024
-
1025
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1026
-
1027
-        //enqueue scripts
1028
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
1029
-
1030
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1031
-            'cookiepath' => COOKIEPATH,
1032
-            'passed_form_id' => (bool) rgget( 'form_id' ),
1033
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1034
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1035
-            'label_close' => __( 'Close', 'gravityview' ),
1036
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1037
-            'label_continue' => __( 'Continue', 'gravityview' ),
1038
-            'label_ok' => __( 'Ok', 'gravityview' ),
1039
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1040
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1041
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1042
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1043
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1044
-        ));
1045
-
1046
-        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1047
-
1048
-        // Enqueue scripts needed for merge tags
1049
-        self::enqueue_gravity_forms_scripts();
1022
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1023
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1024
+
1025
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1026
+
1027
+		//enqueue scripts
1028
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
1029
+
1030
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1031
+			'cookiepath' => COOKIEPATH,
1032
+			'passed_form_id' => (bool) rgget( 'form_id' ),
1033
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1034
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1035
+			'label_close' => __( 'Close', 'gravityview' ),
1036
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1037
+			'label_continue' => __( 'Continue', 'gravityview' ),
1038
+			'label_ok' => __( 'Ok', 'gravityview' ),
1039
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1040
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1041
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1042
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1043
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1044
+		));
1045
+
1046
+		wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1047
+
1048
+		// Enqueue scripts needed for merge tags
1049
+		self::enqueue_gravity_forms_scripts();
1050 1050
 	}
1051 1051
 
1052 1052
 	/**
1053 1053
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1054
-     *
1055
-     * @since 1.0.5-beta
1056
-     *
1057
-     * @return void
1054
+	 *
1055
+	 * @since 1.0.5-beta
1056
+	 *
1057
+	 * @return void
1058 1058
 	 */
1059 1059
 	static function enqueue_gravity_forms_scripts() {
1060 1060
 		GFForms::register_scripts();
1061 1061
 
1062 1062
 		$scripts = array(
1063
-		    'sack',
1064
-		    'gform_gravityforms',
1065
-		    'gform_forms',
1066
-		    'gform_form_admin',
1067
-		    'jquery-ui-autocomplete'
1063
+			'sack',
1064
+			'gform_gravityforms',
1065
+			'gform_forms',
1066
+			'gform_form_admin',
1067
+			'jquery-ui-autocomplete'
1068 1068
 		);
1069 1069
 
1070 1070
 		if ( wp_is_mobile() ) {
1071
-		    $scripts[] = 'jquery-touch-punch';
1071
+			$scripts[] = 'jquery-touch-punch';
1072 1072
 		}
1073 1073
 
1074 1074
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
includes/class-gravityview-settings.php 1 patch
Indentation   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -122,10 +122,10 @@  discard block
 block discarded – undo
122 122
 	}
123 123
 
124 124
 	/**
125
-     * Uninstall all traces of GravityView
126
-     *
127
-     * Note: method is public because parent method is public
128
-     *
125
+	 * Uninstall all traces of GravityView
126
+	 *
127
+	 * Note: method is public because parent method is public
128
+	 *
129 129
 	 * @return bool
130 130
 	 */
131 131
 	public function uninstall() {
@@ -137,53 +137,53 @@  discard block
 block discarded – undo
137 137
 		$uninstaller->fire_everything();
138 138
 
139 139
 		/**
140
-         * Set the path so that Gravity Forms can de-activate GravityView
141
-         * @see GFAddOn::uninstall_addon
142
-         * @uses deactivate_plugins()
143
-         */
140
+		 * Set the path so that Gravity Forms can de-activate GravityView
141
+		 * @see GFAddOn::uninstall_addon
142
+		 * @uses deactivate_plugins()
143
+		 */
144 144
 		$this->_path = GRAVITYVIEW_FILE;
145 145
 
146 146
 		return true;
147 147
 	}
148 148
 
149 149
 	/**
150
-     * Get an array of reasons why the plugin might be uninstalled
151
-     *
152
-     * @since 1.17.5
153
-     *
150
+	 * Get an array of reasons why the plugin might be uninstalled
151
+	 *
152
+	 * @since 1.17.5
153
+	 *
154 154
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
155 155
 	 */
156 156
 	private function get_uninstall_reasons() {
157 157
 
158 158
 		$reasons = array(
159 159
 			'will-continue' => array(
160
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
161
-            ),
160
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
161
+			),
162 162
 			'no-longer-need' => array(
163
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
164
-            ),
163
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
164
+			),
165 165
 			'doesnt-work' => array(
166
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
167
-            ),
166
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
167
+			),
168 168
 			'found-other' => array(
169
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
170
-                'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
171
-            ),
169
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
170
+				'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
171
+			),
172 172
 			'other' => array(
173
-                'label' => esc_html__( 'Other', 'gravityview' ),
174
-            ),
173
+				'label' => esc_html__( 'Other', 'gravityview' ),
174
+			),
175 175
 		);
176 176
 
177 177
 		shuffle( $reasons );
178 178
 
179 179
 		return $reasons;
180
-    }
180
+	}
181 181
 
182 182
 	/**
183
-     * Display a feedback form when the plugin is uninstalled
184
-     *
185
-     * @since 1.17.5
186
-     *
183
+	 * Display a feedback form when the plugin is uninstalled
184
+	 *
185
+	 * @since 1.17.5
186
+	 *
187 187
 	 * @return string HTML of the uninstallation form
188 188
 	 */
189 189
 	public function uninstall_form() {
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
264 264
             <ul>
265 265
 				<?php
266
-                $reasons = $this->get_uninstall_reasons();
266
+				$reasons = $this->get_uninstall_reasons();
267 267
 				foreach ( $reasons as $reason ) {
268 268
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', rgar( $reason, 'followup' ), rgar( $reason, 'label' ) );
269 269
 				}
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 		$license_key = self::getSetting('license_key');
432 432
 		if( '' === $license_key ) {
433 433
 			$license_status = 'inactive';
434
-        }
434
+		}
435 435
 		$license_id = empty( $license_key ) ? 'license' : $license_key;
436 436
 
437 437
 		$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');
@@ -491,12 +491,12 @@  discard block
 block discarded – undo
491 491
 	}
492 492
 
493 493
 	/**
494
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
495
-     *
496
-     * @since 1.21.5
497
-     *
498
-     * @see GFAddOn::scripts()
499
-     *
494
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
495
+	 *
496
+	 * @since 1.21.5
497
+	 *
498
+	 * @see GFAddOn::scripts()
499
+	 *
500 500
 	 * @return array Array of scripts
501 501
 	 */
502 502
 	public function scripts() {
@@ -505,10 +505,10 @@  discard block
 block discarded – undo
505 505
 		$scripts[] = array(
506 506
 			'handle'  => 'gform_tooltip_init',
507 507
 			'enqueue' => array(
508
-                array(
509
-			        'admin_page' => array( 'app_settings' )
510
-                )
511
-            )
508
+				array(
509
+					'admin_page' => array( 'app_settings' )
510
+				)
511
+			)
512 512
 		);
513 513
 
514 514
 		return $scripts;
@@ -528,8 +528,8 @@  discard block
 block discarded – undo
528 528
 			'version' => GravityView_Plugin::version,
529 529
 			"deps" => array(
530 530
 				'gaddon_form_settings_css',
531
-                'gform_tooltip',
532
-                'gform_font_awesome',
531
+				'gform_tooltip',
532
+				'gform_font_awesome',
533 533
 			),
534 534
 			'enqueue' => array(
535 535
 				array( 'admin_page' => array(
@@ -595,12 +595,12 @@  discard block
 block discarded – undo
595 595
 	}
596 596
 
597 597
 	public function app_settings_tab() {
598
-	    parent::app_settings_tab();
598
+		parent::app_settings_tab();
599 599
 
600 600
 		if ( $this->maybe_uninstall() ) {
601
-            echo $this->uninstall_form();
601
+			echo $this->uninstall_form();
602 602
 		}
603
-    }
603
+	}
604 604
 
605 605
 	/**
606 606
 	 * Make protected public
@@ -723,8 +723,8 @@  discard block
 block discarded – undo
723 723
                     type="' . $field['type'] . '"
724 724
                     name="' . esc_attr( $name ) . '"
725 725
                     value="' . $value . '" ' .
726
-		        implode( ' ', $attributes ) .
727
-		        ' />';
726
+				implode( ' ', $attributes ) .
727
+				' />';
728 728
 
729 729
 		if ( $echo ) {
730 730
 			echo $html;
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
 					array(
951 951
 						'label' => _x('Show me beta versions if they are available.', 'gravityview'),
952 952
 						'value' => '1',
953
-                        'name'  => 'beta',
953
+						'name'  => 'beta',
954 954
 					),
955 955
 				),
956 956
 				'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'),
@@ -975,36 +975,36 @@  discard block
 block discarded – undo
975 975
 		}
976 976
 
977 977
 
978
-        $sections = array(
979
-            array(
980
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
981
-                'fields'      => $fields,
982
-            )
983
-        );
978
+		$sections = array(
979
+			array(
980
+				'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
981
+				'fields'      => $fields,
982
+			)
983
+		);
984 984
 
985
-        // custom 'update settings' button
986
-        $button = array(
987
-            'class' => 'button button-primary button-hero',
988
-            'type'     => 'save',
989
-        );
985
+		// custom 'update settings' button
986
+		$button = array(
987
+			'class' => 'button button-primary button-hero',
988
+			'type'     => 'save',
989
+		);
990 990
 
991 991
 		if( $disabled_attribute ) {
992 992
 			$button['disabled'] = $disabled_attribute;
993 993
 		}
994 994
 
995 995
 
996
-        /**
997
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
998
-         * Extensions can tap in here to insert their own section and settings.
999
-         * <code>
1000
-         *   $sections[] = array(
1001
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
1002
-         *      'fields' => $settings,
1003
-         *   );
1004
-         * </code>
1005
-         * @param array $extension_settings Empty array, ready for extension settings!
1006
-         */
1007
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
996
+		/**
997
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
998
+		 * Extensions can tap in here to insert their own section and settings.
999
+		 * <code>
1000
+		 *   $sections[] = array(
1001
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
1002
+		 *      'fields' => $settings,
1003
+		 *   );
1004
+		 * </code>
1005
+		 * @param array $extension_settings Empty array, ready for extension settings!
1006
+		 */
1007
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
1008 1008
 
1009 1009
 		// If there are extensions, add a section for them
1010 1010
 		if ( ! empty( $extension_sections ) ) {
@@ -1017,13 +1017,13 @@  discard block
 block discarded – undo
1017 1017
 				}
1018 1018
 			}
1019 1019
 
1020
-            $k = count( $extension_sections ) - 1 ;
1021
-            $extension_sections[ $k ]['fields'][] = $button;
1020
+			$k = count( $extension_sections ) - 1 ;
1021
+			$extension_sections[ $k ]['fields'][] = $button;
1022 1022
 			$sections = array_merge( $sections, $extension_sections );
1023 1023
 		} else {
1024
-            // add the 'update settings' button to the general section
1025
-            $sections[0]['fields'][] = $button;
1026
-        }
1024
+			// add the 'update settings' button to the general section
1025
+			$sections[0]['fields'][] = $button;
1026
+		}
1027 1027
 
1028 1028
 		return $sections;
1029 1029
 	}
Please login to merge, or discard this patch.