Completed
Pull Request — develop (#1687)
by
unknown
16:12
created
includes/admin/field-types/type_hidden.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 			return;
16 16
 		}
17 17
 
18
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
18
+		$class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
19 19
 
20 20
 		?>
21 21
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />
Please login to merge, or discard this patch.
includes/class-admin-welcome.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,9 @@
 block discarded – undo
12 12
  */
13 13
 
14 14
 // Exit if accessed directly
15
-if ( ! defined( 'ABSPATH' ) ) exit;
15
+if ( ! defined( 'ABSPATH' ) ) {
16
+	exit;
17
+}
16 18
 
17 19
 /**
18 20
  * GravityView_Welcome Class
Please login to merge, or discard this patch.
includes/class-gravityview-image.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
 	var $style = NULL;
24 24
 
25 25
 	/**
26
- 	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
26
+	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
27 27
 	 * @var string
28 28
 	 */
29 29
 	var $size = NULL;
Please login to merge, or discard this patch.
includes/class-gravityview-migrate.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -180,8 +180,8 @@
 block discarded – undo
180 180
 
181 181
 					// check widget settings:
182 182
 					//  [search_free] => 1
183
-			        //  [search_date] => 1
184
-			        $search_generic = array();
183
+					//  [search_date] => 1
184
+					$search_generic = array();
185 185
 					if( !empty( $widget['search_free'] ) ) {
186 186
 						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
187 187
 					}
Please login to merge, or discard this patch.
includes/class-gravityview-roles-capabilities.php 1 patch
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
57 57
 		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
58 58
 		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
59
-        add_action( 'admin_init', array( $this, 'add_caps') );
59
+		add_action( 'admin_init', array( $this, 'add_caps') );
60 60
 	}
61 61
 
62 62
 
@@ -360,7 +360,6 @@  discard block
 block discarded – undo
360 360
 	 * Add Gravity Forms and GravityView's "full access" caps when any other caps are checked against.
361 361
 	 *
362 362
 	 * @since 1.15
363
-
364 363
 	 * @param array $caps_to_check
365 364
 	 *
366 365
 	 * @return array
Please login to merge, or discard this patch.
includes/helper-functions.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -307,7 +307,7 @@
 block discarded – undo
307 307
 		! isset( $value ) // If it's not set, it's empty!
308 308
 		|| false === $value
309 309
 		|| null === $value
310
-	    || '' === $value // Empty string
310
+		|| '' === $value // Empty string
311 311
 		|| array() === $value // Empty array
312 312
 		|| ( is_object( $value ) && ! get_object_vars( $value ) ) // Empty object
313 313
 	) {
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-time.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -255,7 +255,6 @@
 block discarded – undo
255 255
 	 * Get the default date format for a field based on the field ID and the time format setting
256 256
 	 *
257 257
 	 * @since 1.14
258
-
259 258
 	 * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
260 259
 	 * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
261 260
 	 *
Please login to merge, or discard this patch.
includes/class-admin-views.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * @return void
272 272
 	 */
273
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
273
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
274 274
 
275 275
 		$output = '';
276 276
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 	 */
430 430
 	function save_postdata( $post_id ) {
431 431
 
432
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
432
+		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
433 433
 			return;
434 434
 		}
435 435
 
Please login to merge, or discard this patch.
Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -62,28 +62,28 @@  discard block
 block discarded – undo
62 62
 	}
63 63
 
64 64
 	/**
65
-     * When on the Add/Edit View screen, suggest most popular articles related to that
66
-     *
65
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
66
+	 *
67 67
 	 * @param array $localization_data Data to be passed to the Support Port JS
68 68
 	 *
69 69
 	 * @return array
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
74
-	        return $localization_data;
75
-        }
73
+		if( ! gravityview()->request->is_view() ) {
74
+			return $localization_data;
75
+		}
76 76
 
77 77
 		$localization_data['suggest'] = array(
78
-            '57ef23539033602e61d4a560',
79
-            '54c67bb9e4b0512429885513',
80
-            '54c67bb9e4b0512429885512',
81
-            '54c67bbbe4b07997ea3f3f6b',
82
-            '54d1a33ae4b086c0c0964ce9',
83
-            '57ef253c9033602e61d4a563',
84
-            '552355bfe4b0221aadf2572b',
85
-            '54c67bcde4b051242988553e',
86
-        );
78
+			'57ef23539033602e61d4a560',
79
+			'54c67bb9e4b0512429885513',
80
+			'54c67bb9e4b0512429885512',
81
+			'54c67bbbe4b07997ea3f3f6b',
82
+			'54d1a33ae4b086c0c0964ce9',
83
+			'57ef253c9033602e61d4a563',
84
+			'552355bfe4b0221aadf2572b',
85
+			'54c67bcde4b051242988553e',
86
+		);
87 87
 
88 88
 		return $localization_data;
89 89
 	}
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
229 229
 
230 230
 		if( 'form_list' === GFForms::get_page() ) {
231 231
 			$priority = 790;
232
-        }
232
+		}
233 233
 
234 234
 		if( empty( $connected_views ) ) {
235 235
 
236
-		    $menu_items['gravityview'] = array(
236
+			$menu_items['gravityview'] = array(
237 237
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
238 238
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
239 239
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
 		// If there were no items added, then let's create the parent menu
266 266
 		if( $sub_menu_items ) {
267 267
 
268
-		    $sub_menu_items[] = array(
269
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
270
-			    'icon' => '<span class="dashicons dashicons-plus"></span>',
271
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
272
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
273
-			    'capabilities'   => array( 'edit_gravityviews' ),
274
-            );
268
+			$sub_menu_items[] = array(
269
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
270
+				'icon' => '<span class="dashicons dashicons-plus"></span>',
271
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
272
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
273
+				'capabilities'   => array( 'edit_gravityviews' ),
274
+			);
275 275
 
276 276
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
277 277
 			$sub_menu_items[] = array(
@@ -668,16 +668,16 @@  discard block
 block discarded – undo
668 668
 	/**
669 669
 	 * Render html for displaying available fields based on a Form ID
670 670
 	 *
671
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
671
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
672 672
 	 *
673 673
 	 * @param int $form Gravity Forms Form ID (default: '')
674 674
 	 * @param string $context (default: 'single')
675
-     *
675
+	 *
676 676
 	 * @return void
677 677
 	 */
678 678
 	function render_available_fields( $form = 0, $context = 'single' ) {
679 679
 
680
-	    // Determine if form is a preset and convert it to an array with fields
680
+		// Determine if form is a preset and convert it to an array with fields
681 681
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
682 682
 
683 683
 		/**
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
 
696 696
 		if ( ! is_array( $blocklist_field_types ) ) {
697 697
 
698
-		    gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
698
+			gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
699 699
 
700 700
 			$blocklist_field_types = array();
701 701
 		}
@@ -953,9 +953,9 @@  discard block
 block discarded – undo
953 953
 
954 954
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
955 955
 
956
-                foreach ( $joined_forms as $form ) {
957
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
958
-                }
956
+				foreach ( $joined_forms as $form ) {
957
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
958
+				}
959 959
 			} else {
960 960
 				$available_items[ $form ] = \GV\Widget::registered();
961 961
 			}
@@ -994,9 +994,9 @@  discard block
 block discarded – undo
994 994
 
995 995
 										if ( $form_id ) {
996 996
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
997
-                                        } else {
997
+										} else {
998 998
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
999
-                                        }
999
+										}
1000 1000
 
1001 1001
 										if ( !$original_item ) {
1002 1002
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -1246,7 +1246,7 @@  discard block
 block discarded – undo
1246 1246
 		}
1247 1247
 
1248 1248
 		// Add the GV font (with the Astronaut)
1249
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1249
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1250 1250
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1251 1251
 
1252 1252
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1254,46 +1254,46 @@  discard block
 block discarded – undo
1254 1254
 		if( GFForms::get_page() === 'form_list' ) {
1255 1255
 			wp_enqueue_style( 'gravityview_views_styles' );
1256 1256
 			return;
1257
-        }
1257
+		}
1258 1258
 
1259 1259
 		// Don't process any scripts below here if it's not a GravityView page.
1260 1260
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1261
-		    return;
1261
+			return;
1262 1262
 		}
1263 1263
 
1264 1264
 		wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
1265 1265
 
1266
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1267
-
1268
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1269
-
1270
-        // Enqueue scripts
1271
-        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' ), \GV\Plugin::$version );
1272
-
1273
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1274
-            'cookiepath' => COOKIEPATH,
1275
-            'admin_cookiepath' => ADMIN_COOKIE_PATH,
1276
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1277
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1278
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1279
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1280
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1281
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1282
-            'label_close' => __( 'Close', 'gravityview' ),
1283
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1284
-            'label_continue' => __( 'Continue', 'gravityview' ),
1285
-            'label_ok' => __( 'Ok', 'gravityview' ),
1286
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1287
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1288
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1289
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1290
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1291
-        ));
1266
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1267
+
1268
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1269
+
1270
+		// Enqueue scripts
1271
+		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' ), \GV\Plugin::$version );
1272
+
1273
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1274
+			'cookiepath' => COOKIEPATH,
1275
+			'admin_cookiepath' => ADMIN_COOKIE_PATH,
1276
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1277
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1278
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1279
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1280
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1281
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1282
+			'label_close' => __( 'Close', 'gravityview' ),
1283
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1284
+			'label_continue' => __( 'Continue', 'gravityview' ),
1285
+			'label_ok' => __( 'Ok', 'gravityview' ),
1286
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1287
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1288
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1289
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1290
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1291
+		));
1292 1292
 
1293 1293
 		wp_enqueue_style( 'gravityview_views_styles' );
1294 1294
 
1295
-        // Enqueue scripts needed for merge tags
1296
-        self::enqueue_gravity_forms_scripts();
1295
+		// Enqueue scripts needed for merge tags
1296
+		self::enqueue_gravity_forms_scripts();
1297 1297
 
1298 1298
 		// 2.5 changed how Merge Tags are enqueued
1299 1299
 		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
@@ -1303,24 +1303,24 @@  discard block
 block discarded – undo
1303 1303
 
1304 1304
 	/**
1305 1305
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1306
-     *
1307
-     * @since 1.0.5-beta
1308
-     *
1309
-     * @return void
1306
+	 *
1307
+	 * @since 1.0.5-beta
1308
+	 *
1309
+	 * @return void
1310 1310
 	 */
1311 1311
 	static function enqueue_gravity_forms_scripts() {
1312 1312
 		GFForms::register_scripts();
1313 1313
 
1314 1314
 		$scripts = array(
1315
-		    'sack',
1316
-		    'gform_gravityforms',
1317
-		    'gform_forms',
1318
-		    'gform_form_admin',
1319
-		    'jquery-ui-autocomplete'
1315
+			'sack',
1316
+			'gform_gravityforms',
1317
+			'gform_forms',
1318
+			'gform_form_admin',
1319
+			'jquery-ui-autocomplete'
1320 1320
 		);
1321 1321
 
1322 1322
 		if ( wp_is_mobile() ) {
1323
-		    $scripts[] = 'jquery-touch-punch';
1323
+			$scripts[] = 'jquery-touch-punch';
1324 1324
 		}
1325 1325
 
1326 1326
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-no-conflict.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
 		// Dequeue other jQuery styles even if no-conflict is off.
118 118
 		// Terrible-looking tabs help no one.
119
-		if( !empty( $wp_styles->registered ) )  {
119
+		if( !empty( $wp_styles->registered ) ) {
120 120
 			foreach ($wp_styles->registered as $key => $style) {
121 121
 				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
122 122
 					wp_dequeue_style( $key );
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 
190 190
 		//unregistering scripts
191 191
 		$registered = array();
192
-		foreach( $wp_objects->registered as $handle => $script_registration ){
193
-			if( in_array( $handle, $required_objects ) ){
192
+		foreach( $wp_objects->registered as $handle => $script_registration ) {
193
+			if( in_array( $handle, $required_objects ) ) {
194 194
 				$registered[ $handle ] = $script_registration;
195 195
 			}
196 196
 		}
Please login to merge, or discard this patch.