Completed
Push — develop ( 89fbc6...419b91 )
by Zack
16:20
created
includes/class-ajax.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 
139 139
 		// template areas
140 140
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
141
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
141
+		$template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
142 142
 
143 143
 		// widget areas
144 144
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
@@ -331,40 +331,40 @@  discard block
 block discarded – undo
331 331
 		// load file
332 332
 		$xmlstr = file_get_contents( $form_file );
333 333
 
334
-        $options = array(
335
-            "page" => array("unserialize_as_array" => true),
336
-            "form"=> array("unserialize_as_array" => true),
337
-            "field"=> array("unserialize_as_array" => true),
338
-            "rule"=> array("unserialize_as_array" => true),
339
-            "choice"=> array("unserialize_as_array" => true),
340
-            "input"=> array("unserialize_as_array" => true),
341
-            "routing_item"=> array("unserialize_as_array" => true),
342
-            "creditCard"=> array("unserialize_as_array" => true),
343
-            "routin"=> array("unserialize_as_array" => true),
344
-            "confirmation" => array("unserialize_as_array" => true),
345
-            "notification" => array("unserialize_as_array" => true)
346
-        );
334
+		$options = array(
335
+			"page" => array("unserialize_as_array" => true),
336
+			"form"=> array("unserialize_as_array" => true),
337
+			"field"=> array("unserialize_as_array" => true),
338
+			"rule"=> array("unserialize_as_array" => true),
339
+			"choice"=> array("unserialize_as_array" => true),
340
+			"input"=> array("unserialize_as_array" => true),
341
+			"routing_item"=> array("unserialize_as_array" => true),
342
+			"creditCard"=> array("unserialize_as_array" => true),
343
+			"routin"=> array("unserialize_as_array" => true),
344
+			"confirmation" => array("unserialize_as_array" => true),
345
+			"notification" => array("unserialize_as_array" => true)
346
+		);
347 347
 
348 348
 		$xml = new RGXML($options);
349
-        $forms = $xml->unserialize($xmlstr);
349
+		$forms = $xml->unserialize($xmlstr);
350 350
 
351
-        if( !$forms ) {
352
-        	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353
-        	return false;
354
-        }
351
+		if( !$forms ) {
352
+			gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353
+			return false;
354
+		}
355 355
 
356
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
-        	$form = $forms[0];
358
-        }
356
+		if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
+			$form = $forms[0];
358
+		}
359 359
 
360
-        if( empty( $form ) ) {
361
-        	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362
-        	return false;
363
-        }
360
+		if( empty( $form ) ) {
361
+			gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362
+			return false;
363
+		}
364 364
 
365
-        gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
365
+		gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
366 366
 
367
-        return $form;
367
+		return $form;
368 368
 
369 369
 	}
370 370
 
Please login to merge, or discard this patch.
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		 * Don't exit if we're running test suite.
37 37
 		 * @since 1.15
38 38
 		 */
39
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
39
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
40 40
 			return $mixed;
41 41
 		}
42 42
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * @return void
51 51
 	 */
52 52
 	function check_ajax_nonce() {
53
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
53
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
54 54
 			$this->_exit( false );
55 55
 		}
56 56
 	}
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
 		//check nonce
68 68
 		$this->check_ajax_nonce();
69 69
 
70
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
70
+		$context = isset( $_POST[ 'context' ] ) ? esc_attr( $_POST[ 'context' ] ) : 'directory';
71 71
 
72 72
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
73
-		if( !empty( $_POST['form_id'] ) ) {
74
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
73
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
74
+			do_action( 'gravityview_render_available_fields', (int)$_POST[ 'form_id' ], $context );
75 75
 			$this->_exit();
76
-		} elseif( !empty( $_POST['template_id'] ) ) {
77
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
76
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
77
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
78 78
 
79 79
 			/** @see GravityView_Admin_Views::render_available_fields */
80 80
 			do_action( 'gravityview_render_available_fields', $form, $context );
@@ -96,17 +96,17 @@  discard block
 block discarded – undo
96 96
 	function get_active_areas() {
97 97
 		$this->check_ajax_nonce();
98 98
 
99
-		if( empty( $_POST['template_id'] ) ) {
99
+		if ( empty( $_POST[ 'template_id' ] ) ) {
100 100
 			$this->_exit( false );
101 101
 		}
102 102
 
103 103
 		ob_start();
104
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
105
-		$response['directory'] = ob_get_clean();
104
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'directory', '', true );
105
+		$response[ 'directory' ] = ob_get_clean();
106 106
 
107 107
 		ob_start();
108
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
109
-		$response['single'] = ob_get_clean();
108
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
109
+		$response[ 'single' ] = ob_get_clean();
110 110
 
111 111
 		$response = array_map( 'gravityview_strip_whitespace', $response );
112 112
 
@@ -121,20 +121,20 @@  discard block
 block discarded – undo
121 121
 
122 122
 		$this->check_ajax_nonce();
123 123
 
124
-		if( empty( $_POST['template_id'] ) ) {
124
+		if ( empty( $_POST[ 'template_id' ] ) ) {
125 125
 			$this->_exit( false );
126 126
 		}
127 127
 
128 128
 		// get the fields xml config file for this specific preset
129
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
129
+		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST[ 'template_id' ] );
130 130
 		// import fields
131
-		if( !empty( $preset_fields_path ) ) {
131
+		if ( ! empty( $preset_fields_path ) ) {
132 132
 			$presets = $this->import_fields( $preset_fields_path );
133 133
 		} else {
134 134
 			$presets = array( 'widgets' => array(), 'fields' => array() );
135 135
 		}
136 136
 
137
-		$template_id = esc_attr( $_POST['template_id'] );
137
+		$template_id = esc_attr( $_POST[ 'template_id' ] );
138 138
 
139 139
 		// template areas
140 140
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
@@ -144,20 +144,20 @@  discard block
 block discarded – undo
144 144
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
145 145
 
146 146
 		ob_start();
147
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
148
-		$response['header'] = ob_get_clean();
147
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets[ 'widgets' ] );
148
+		$response[ 'header' ] = ob_get_clean();
149 149
 
150 150
 		ob_start();
151
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
152
-		$response['footer'] = ob_get_clean();
151
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets[ 'widgets' ] );
152
+		$response[ 'footer' ] = ob_get_clean();
153 153
 
154 154
 		ob_start();
155
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
156
-		$response['directory'] = ob_get_clean();
155
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets[ 'fields' ] );
156
+		$response[ 'directory' ] = ob_get_clean();
157 157
 
158 158
 		ob_start();
159
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
160
-		$response['single'] = ob_get_clean();
159
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets[ 'fields' ] );
160
+		$response[ 'single' ] = ob_get_clean();
161 161
 
162 162
 		$response = array_map( 'gravityview_strip_whitespace', $response );
163 163
 
@@ -175,26 +175,26 @@  discard block
 block discarded – undo
175 175
 
176 176
 		$this->check_ajax_nonce();
177 177
 
178
-		if( empty( $_POST['template_id'] ) ) {
178
+		if ( empty( $_POST[ 'template_id' ] ) ) {
179 179
 			gravityview()->log->error( 'Cannot create preset form; the template_id is empty.' );
180 180
 			$this->_exit( false );
181 181
 		}
182 182
 
183 183
 		// get the xml for this specific template_id
184
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
184
+		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST[ 'template_id' ] );
185 185
 
186 186
 		// import form
187 187
 		$form = $this->import_form( $preset_form_xml_path );
188 188
 
189 189
 		// get the form ID
190
-		if( false === $form ) {
190
+		if ( false === $form ) {
191 191
 			// send error to user
192
-			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int) $_POST['template_id'] ) );
192
+			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int)$_POST[ 'template_id' ] ) );
193 193
 
194 194
 			$this->_exit( false );
195 195
 		}
196 196
 
197
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
197
+		$this->_exit( '<option value="' . esc_attr( $form[ 'id' ] ) . '" selected="selected">' . esc_html( $form[ 'title' ] ) . '</option>' );
198 198
 
199 199
 	}
200 200
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
 		gravityview()->log->debug( '[import_form] Import Preset Form. (File) {path}', array( 'path' => $xml_or_json_path ) );
210 210
 
211
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
211
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
212 212
 			gravityview()->log->error( 'Class GFExport or file not found. file: {path}', array( 'path' => $xml_or_json_path ) );
213 213
 			return false;
214 214
 		}
@@ -220,13 +220,13 @@  discard block
 block discarded – undo
220 220
 		gravityview()->log->debug( '[import_form] Importing form (Result) {count}', array( 'count' => $count ) );
221 221
 		gravityview()->log->debug( '[import_form] Importing form (Form) ', array( 'data' => $forms ) );
222 222
 
223
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
223
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
224 224
 			gravityview()->log->error( 'Form Import Failed!' );
225 225
 			return false;
226 226
 		}
227 227
 
228 228
 		// import success - return form id
229
-		return $forms[0];
229
+		return $forms[ 0 ];
230 230
 	}
231 231
 
232 232
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	function get_field_options() {
241 241
 		$this->check_ajax_nonce();
242 242
 		
243
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
243
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
244 244
 			gravityview()->log->error( 'Required fields were not set in the $_POST request. ' );
245 245
 			$this->_exit( false );
246 246
 		}
@@ -252,11 +252,11 @@  discard block
 block discarded – undo
252 252
 		$_post = array_map( 'esc_attr', $_post );
253 253
 
254 254
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
255
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
256
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
255
+		$input_type = isset( $_post[ 'input_type' ] ) ? esc_attr( $_post[ 'input_type' ] ) : NULL;
256
+		$context = isset( $_post[ 'context' ] ) ? esc_attr( $_post[ 'context' ] ) : NULL;
257 257
 
258
-		$form_id = empty( $_post['form_id'] ) ? null : $_post['form_id'];
259
-		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
258
+		$form_id = empty( $_post[ 'form_id' ] ) ? null : $_post[ 'form_id' ];
259
+		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
260 260
 
261 261
 		$response = gravityview_strip_whitespace( $response );
262 262
 
@@ -277,15 +277,15 @@  discard block
 block discarded – undo
277 277
 		$form = '';
278 278
 
279 279
 		// if form id is set, use it, else, get form from preset
280
-		if( !empty( $_POST['form_id'] ) ) {
280
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
281 281
 
282
-			$form = (int) $_POST['form_id'];
282
+			$form = (int)$_POST[ 'form_id' ];
283 283
 
284 284
 		}
285 285
 		// get form from preset
286
-		elseif( !empty( $_POST['template_id'] ) ) {
286
+		elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
287 287
 
288
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
288
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
289 289
 
290 290
 		}
291 291
 
@@ -301,27 +301,27 @@  discard block
 block discarded – undo
301 301
 	 * @param  string $template_id Preset template
302 302
 	 *
303 303
 	 */
304
-	static function pre_get_form_fields( $template_id = '') {
304
+	static function pre_get_form_fields( $template_id = '' ) {
305 305
 
306
-		if( empty( $template_id ) ) {
306
+		if ( empty( $template_id ) ) {
307 307
 			gravityview()->log->error( 'Template ID not set.' );
308 308
 			return false;
309 309
 		} else {
310 310
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
311
-			if( !file_exists( $form_file )  ) {
311
+			if ( ! file_exists( $form_file ) ) {
312 312
 				gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. File not found. file: {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
313 313
 				return false;
314 314
 			}
315 315
 		}
316 316
 
317 317
 		// Load xml parser (from GravityForms)
318
-		if( class_exists( 'GFCommon' ) ) {
318
+		if ( class_exists( 'GFCommon' ) ) {
319 319
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
320 320
 		} else {
321 321
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
322 322
 		}
323 323
 
324
-		if( file_exists( $xml_parser ) ) {
324
+		if ( file_exists( $xml_parser ) ) {
325 325
 			require_once( $xml_parser );
326 326
 		} else {
327 327
 			gravityview()->log->debug( ' - Gravity Forms XML Parser not found {path}.', array( 'path' => $xml_parser ) );
@@ -332,32 +332,32 @@  discard block
 block discarded – undo
332 332
 		$xmlstr = file_get_contents( $form_file );
333 333
 
334 334
         $options = array(
335
-            "page" => array("unserialize_as_array" => true),
336
-            "form"=> array("unserialize_as_array" => true),
337
-            "field"=> array("unserialize_as_array" => true),
338
-            "rule"=> array("unserialize_as_array" => true),
339
-            "choice"=> array("unserialize_as_array" => true),
340
-            "input"=> array("unserialize_as_array" => true),
341
-            "routing_item"=> array("unserialize_as_array" => true),
342
-            "creditCard"=> array("unserialize_as_array" => true),
343
-            "routin"=> array("unserialize_as_array" => true),
344
-            "confirmation" => array("unserialize_as_array" => true),
345
-            "notification" => array("unserialize_as_array" => true)
335
+            "page" => array( "unserialize_as_array" => true ),
336
+            "form"=> array( "unserialize_as_array" => true ),
337
+            "field"=> array( "unserialize_as_array" => true ),
338
+            "rule"=> array( "unserialize_as_array" => true ),
339
+            "choice"=> array( "unserialize_as_array" => true ),
340
+            "input"=> array( "unserialize_as_array" => true ),
341
+            "routing_item"=> array( "unserialize_as_array" => true ),
342
+            "creditCard"=> array( "unserialize_as_array" => true ),
343
+            "routin"=> array( "unserialize_as_array" => true ),
344
+            "confirmation" => array( "unserialize_as_array" => true ),
345
+            "notification" => array( "unserialize_as_array" => true )
346 346
         );
347 347
 
348
-		$xml = new RGXML($options);
349
-        $forms = $xml->unserialize($xmlstr);
348
+		$xml = new RGXML( $options );
349
+        $forms = $xml->unserialize( $xmlstr );
350 350
 
351
-        if( !$forms ) {
351
+        if ( ! $forms ) {
352 352
         	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353 353
         	return false;
354 354
         }
355 355
 
356
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
-        	$form = $forms[0];
356
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
357
+        	$form = $forms[ 0 ];
358 358
         }
359 359
 
360
-        if( empty( $form ) ) {
360
+        if ( empty( $form ) ) {
361 361
         	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362 362
         	return false;
363 363
         }
@@ -376,38 +376,38 @@  discard block
 block discarded – undo
376 376
 	 */
377 377
 	function import_fields( $file ) {
378 378
 
379
-		if( empty( $file ) || !file_exists(  $file ) ) {
379
+		if ( empty( $file ) || ! file_exists( $file ) ) {
380 380
 			gravityview()->log->error( 'Importing Preset Fields. File not found. (File) {path}', array( 'path' => $file ) );
381 381
 			return false;
382 382
 		}
383 383
 
384
-		if( !class_exists('WXR_Parser') ) {
384
+		if ( ! class_exists( 'WXR_Parser' ) ) {
385 385
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
386 386
 		}
387 387
 
388 388
 		$parser = new WXR_Parser();
389 389
 		$presets = $parser->parse( $file );
390 390
 
391
-		if(is_wp_error( $presets )) {
391
+		if ( is_wp_error( $presets ) ) {
392 392
 			gravityview()->log->error( 'Importing Preset Fields failed. Threw WP_Error.', array( 'data' => $presets ) );
393 393
 			return false;
394 394
 		}
395 395
 
396
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
396
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
397 397
 			gravityview()->log->error( 'Importing Preset Fields failed. Meta not found in file. {path}', array( 'path' => $file ) );
398 398
 			return false;
399 399
 		}
400 400
 
401
-		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets['posts'][0]['postmeta'] ) );
401
+		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) );
402 402
 
403 403
 		$fields = $widgets = array();
404
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
405
-			switch ($meta['key']) {
404
+		foreach ( $presets[ 'posts' ][ 0 ][ 'postmeta' ] as $meta ) {
405
+			switch ( $meta[ 'key' ] ) {
406 406
 				case '_gravityview_directory_fields':
407
-					$fields = maybe_unserialize( $meta['value'] );
407
+					$fields = maybe_unserialize( $meta[ 'value' ] );
408 408
 					break;
409 409
 				case '_gravityview_directory_widgets':
410
-					$widgets = maybe_unserialize( $meta['value'] );
410
+					$widgets = maybe_unserialize( $meta[ 'value' ] );
411 411
 					break;
412 412
 			}
413 413
 		}
Please login to merge, or discard this patch.
includes/class-admin-views.php 2 patches
Indentation   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -63,28 +63,28 @@  discard block
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	/**
66
-     * When on the Add/Edit View screen, suggest most popular articles related to that
67
-     *
66
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
67
+	 *
68 68
 	 * @param array $localization_data Data to be passed to the Support Port JS
69 69
 	 *
70 70
 	 * @return array
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
75
-	        return $localization_data;
76
-        }
74
+		if( ! gravityview()->request->is_view() ) {
75
+			return $localization_data;
76
+		}
77 77
 
78 78
 		$localization_data['suggest'] = array(
79
-            '57ef23539033602e61d4a560',
80
-            '54c67bb9e4b0512429885513',
81
-            '54c67bb9e4b0512429885512',
82
-            '54c67bbbe4b07997ea3f3f6b',
83
-            '54d1a33ae4b086c0c0964ce9',
84
-            '57ef253c9033602e61d4a563',
85
-            '552355bfe4b0221aadf2572b',
86
-            '54c67bcde4b051242988553e',
87
-        );
79
+			'57ef23539033602e61d4a560',
80
+			'54c67bb9e4b0512429885513',
81
+			'54c67bb9e4b0512429885512',
82
+			'54c67bbbe4b07997ea3f3f6b',
83
+			'54d1a33ae4b086c0c0964ce9',
84
+			'57ef253c9033602e61d4a563',
85
+			'552355bfe4b0221aadf2572b',
86
+			'54c67bcde4b051242988553e',
87
+		);
88 88
 
89 89
 		return $localization_data;
90 90
 	}
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		if( 'form_list' === GFForms::get_page() ) {
172 172
 			$priority = 790;
173
-        }
173
+		}
174 174
 
175 175
 		if( empty( $connected_views ) ) {
176 176
 
177
-		    $menu_items['gravityview'] = array(
177
+			$menu_items['gravityview'] = array(
178 178
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
179 179
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
180 180
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -205,13 +205,13 @@  discard block
 block discarded – undo
205 205
 		// If there were no items added, then let's create the parent menu
206 206
 		if( $sub_menu_items ) {
207 207
 
208
-		    $sub_menu_items[] = array(
209
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
210
-                'link_class' => 'gv-create-view',
211
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
212
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
213
-			    'capabilities'   => array( 'edit_gravityviews' ),
214
-            );
208
+			$sub_menu_items[] = array(
209
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
210
+				'link_class' => 'gv-create-view',
211
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
212
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
213
+				'capabilities'   => array( 'edit_gravityviews' ),
214
+			);
215 215
 
216 216
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
217 217
 			$sub_menu_items[] = array(
@@ -596,12 +596,12 @@  discard block
 block discarded – undo
596 596
 	 * Render html for displaying available fields based on a Form ID
597 597
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
598 598
 	 *
599
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
599
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
600 600
 	 * @access public
601
-     *
601
+	 *
602 602
 	 * @param int $form Gravity Forms Form ID (default: '')
603 603
 	 * @param string $context (default: 'single')
604
-     *
604
+	 *
605 605
 	 * @return void
606 606
 	 */
607 607
 	function render_available_fields( $form = 0, $context = 'single' ) {
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
 
616 616
 		if ( ! is_array( $blacklist_field_types ) ) {
617 617
 
618
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
618
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
619 619
 
620 620
 			$blacklist_field_types = array();
621 621
 		}
@@ -747,12 +747,12 @@  discard block
 block discarded – undo
747 747
 				/**
748 748
 				 * @since 1.7.2
749 749
 				 */
750
-			    'other_entries' => array(
751
-				    'label'	=> __('Other Entries', 'gravityview'),
752
-				    'type'	=> 'other_entries',
753
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
754
-			    ),
755
-	        );
750
+				'other_entries' => array(
751
+					'label'	=> __('Other Entries', 'gravityview'),
752
+					'type'	=> 'other_entries',
753
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
754
+				),
755
+			);
756 756
 
757 757
 			if( 'single' !== $zone) {
758 758
 
@@ -885,9 +885,9 @@  discard block
 block discarded – undo
885 885
 
886 886
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
887 887
 
888
-                foreach ( $joined_forms as $form ) {
889
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
890
-                }
888
+				foreach ( $joined_forms as $form ) {
889
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
890
+				}
891 891
 			} else {
892 892
 				$available_items[ $form ] = \GV\Widget::registered();
893 893
 			}
@@ -917,9 +917,9 @@  discard block
 block discarded – undo
917 917
 
918 918
 										if ( $form_id ) {
919 919
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
920
-                                        } else {
920
+										} else {
921 921
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
922
-                                        }
922
+										}
923 923
 
924 924
 										if ( !$original_item ) {
925 925
 											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 ) ) );
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
972 972
 
973 973
 	/**
974 974
 	 * Render the widget active areas
975
-     * @param  string $template_id The current slug of the selected View template
975
+	 * @param  string $template_id The current slug of the selected View template
976 976
 	 * @param  string $zone    Either 'header' or 'footer'
977 977
 	 * @param  string $post_id Current Post ID (view)
978 978
 	 * @return string          html
@@ -1002,13 +1002,13 @@  discard block
 block discarded – undo
1002 1002
 	}
1003 1003
 
1004 1004
 	/**
1005
-     * Renders "Add Field" tooltips
1006
-     *
1007
-     * @since 2.0.11
1008
-     *
1005
+	 * Renders "Add Field" tooltips
1006
+	 *
1007
+	 * @since 2.0.11
1008
+	 *
1009 1009
 	 * @param string $context "directory", "single", or "edit"
1010
-     *
1011
-     * @return void
1010
+	 *
1011
+	 * @return void
1012 1012
 	 */
1013 1013
 	function render_field_pickers( $context = 'directory' ) {
1014 1014
 
@@ -1035,7 +1035,7 @@  discard block
 block discarded – undo
1035 1035
             </div>
1036 1036
 			<?php
1037 1037
 		}
1038
-    }
1038
+	}
1039 1039
 
1040 1040
 	/**
1041 1041
 	 * Render the Template Active Areas and configured active fields for a given template id and post id
@@ -1101,7 +1101,7 @@  discard block
 block discarded – undo
1101 1101
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1102 1102
 
1103 1103
 		// Add the GV font (with the Astronaut)
1104
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1104
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1105 1105
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1106 1106
 
1107 1107
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1109,63 +1109,63 @@  discard block
 block discarded – undo
1109 1109
 		if( GFForms::get_page() === 'form_list' ) {
1110 1110
 			wp_enqueue_style( 'gravityview_views_styles' );
1111 1111
 			return;
1112
-        }
1112
+		}
1113 1113
 
1114 1114
 		// Don't process any scripts below here if it's not a GravityView page.
1115 1115
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1116
-		    return;
1116
+			return;
1117 1117
 		}
1118 1118
 
1119
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1120
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1121
-
1122
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1123
-
1124
-        //enqueue scripts
1125
-        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 );
1126
-
1127
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1128
-            'cookiepath' => COOKIEPATH,
1129
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1130
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1131
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1132
-            'label_close' => __( 'Close', 'gravityview' ),
1133
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1134
-            'label_continue' => __( 'Continue', 'gravityview' ),
1135
-            'label_ok' => __( 'Ok', 'gravityview' ),
1136
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1137
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1138
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1139
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1140
-            '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' ),
1141
-        ));
1119
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1120
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1121
+
1122
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1123
+
1124
+		//enqueue scripts
1125
+		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 );
1126
+
1127
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1128
+			'cookiepath' => COOKIEPATH,
1129
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1130
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1131
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1132
+			'label_close' => __( 'Close', 'gravityview' ),
1133
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1134
+			'label_continue' => __( 'Continue', 'gravityview' ),
1135
+			'label_ok' => __( 'Ok', 'gravityview' ),
1136
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1137
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1138
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1139
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1140
+			'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' ),
1141
+		));
1142 1142
 
1143 1143
 		wp_enqueue_style( 'gravityview_views_styles' );
1144 1144
 
1145
-        // Enqueue scripts needed for merge tags
1146
-        self::enqueue_gravity_forms_scripts();
1145
+		// Enqueue scripts needed for merge tags
1146
+		self::enqueue_gravity_forms_scripts();
1147 1147
 	}
1148 1148
 
1149 1149
 	/**
1150 1150
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1151
-     *
1152
-     * @since 1.0.5-beta
1153
-     *
1154
-     * @return void
1151
+	 *
1152
+	 * @since 1.0.5-beta
1153
+	 *
1154
+	 * @return void
1155 1155
 	 */
1156 1156
 	static function enqueue_gravity_forms_scripts() {
1157 1157
 		GFForms::register_scripts();
1158 1158
 
1159 1159
 		$scripts = array(
1160
-		    'sack',
1161
-		    'gform_gravityforms',
1162
-		    'gform_forms',
1163
-		    'gform_form_admin',
1164
-		    'jquery-ui-autocomplete'
1160
+			'sack',
1161
+			'gform_gravityforms',
1162
+			'gform_forms',
1163
+			'gform_form_admin',
1164
+			'jquery-ui-autocomplete'
1165 1165
 		);
1166 1166
 
1167 1167
 		if ( wp_is_mobile() ) {
1168
-		    $scripts[] = 'jquery-touch-punch';
1168
+			$scripts[] = 'jquery-touch-punch';
1169 1169
 		}
1170 1170
 
1171 1171
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
Spacing   +180 added lines, -180 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers') );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ) );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
74
+	    if ( ! gravityview()->request->is_view() ) {
75 75
 	        return $localization_data;
76 76
         }
77 77
 
78
-		$localization_data['suggest'] = array(
78
+		$localization_data[ 'suggest' ] = array(
79 79
             '57ef23539033602e61d4a560',
80 80
             '54c67bb9e4b0512429885513',
81 81
             '54c67bb9e4b0512429885512',
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
97 97
 		global $pagenow;
98 98
 
99
-		if ( !is_admin() ) {
99
+		if ( ! is_admin() ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
103
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
104 104
 
105
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
106 106
 			return;
107 107
 		}
108 108
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	function add_view_dropdown() {
120 120
 		$current_screen = get_current_screen();
121 121
 
122
-		if( 'gravityview' !== $current_screen->post_type ) {
122
+		if ( 'gravityview' !== $current_screen->post_type ) {
123 123
 			return;
124 124
 		}
125 125
 
126 126
 		$forms = gravityview_get_forms();
127 127
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
128 128
 		// If there are no forms to select, show no forms.
129
-		if( !empty( $forms ) ) { ?>
129
+		if ( ! empty( $forms ) ) { ?>
130 130
 			<select name="gravityview_form_id" id="gravityview_form_id">
131 131
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
132
-				<?php foreach( $forms as $form ) { ?>
133
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
132
+				<?php foreach ( $forms as $form ) { ?>
133
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
134 134
 				<?php } ?>
135 135
 			</select>
136 136
 		<?php }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
145 145
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
146
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
146
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
147 147
 	}
148 148
 
149 149
 	/**
@@ -168,13 +168,13 @@  discard block
 block discarded – undo
168 168
 
169 169
 		$priority = 0;
170 170
 
171
-		if( 'form_list' === GFForms::get_page() ) {
171
+		if ( 'form_list' === GFForms::get_page() ) {
172 172
 			$priority = 790;
173 173
         }
174 174
 
175
-		if( empty( $connected_views ) ) {
175
+		if ( empty( $connected_views ) ) {
176 176
 
177
-		    $menu_items['gravityview'] = array(
177
+		    $menu_items[ 'gravityview' ] = array(
178 178
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
179 179
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
180 180
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -190,22 +190,22 @@  discard block
 block discarded – undo
190 190
 		$sub_menu_items = array();
191 191
 		foreach ( (array)$connected_views as $view ) {
192 192
 
193
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
193
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
194 194
 				continue;
195 195
 			}
196 196
 
197
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
197
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
198 198
 
199
-			$sub_menu_items[] = array(
199
+			$sub_menu_items[ ] = array(
200 200
 				'label' => esc_attr( $label ),
201
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
201
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
202 202
 			);
203 203
 		}
204 204
 
205 205
 		// If there were no items added, then let's create the parent menu
206
-		if( $sub_menu_items ) {
206
+		if ( $sub_menu_items ) {
207 207
 
208
-		    $sub_menu_items[] = array(
208
+		    $sub_menu_items[ ] = array(
209 209
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
210 210
                 'link_class' => 'gv-create-view',
211 211
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -214,14 +214,14 @@  discard block
 block discarded – undo
214 214
             );
215 215
 
216 216
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
217
-			$sub_menu_items[] = array(
217
+			$sub_menu_items[ ] = array(
218 218
 				'url' => '#',
219 219
 				'label' => '',
220 220
 				'menu_class' => 'hidden',
221 221
 				'capabilities' => '',
222 222
 			);
223 223
 
224
-			$menu_items['gravityview'] = array(
224
+			$menu_items[ 'gravityview' ] = array(
225 225
 				'label'          => __( 'Connected Views', 'gravityview' ),
226 226
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
227 227
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -250,8 +250,8 @@  discard block
 block discarded – undo
250 250
 		$add = array( 'captcha', 'page' );
251 251
 
252 252
 		// Don't allowing editing the following values:
253
-		if( $context === 'edit' ) {
254
-			$add[] = 'post_id';
253
+		if ( $context === 'edit' ) {
254
+			$add[ ] = 'post_id';
255 255
 		}
256 256
 
257 257
 		$return = array_merge( $array, $add );
@@ -274,32 +274,32 @@  discard block
 block discarded – undo
274 274
 		foreach ( $default_args as $key => $arg ) {
275 275
 
276 276
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
277
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
277
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
278 278
 
279 279
 			// By default, use `tooltip` if defined.
280
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
280
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
281 281
 
282 282
 			// Otherwise, use the description as a tooltip.
283
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
284
-				$tooltip = $arg['desc'];
283
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
284
+				$tooltip = $arg[ 'desc' ];
285 285
 			}
286 286
 
287 287
 			// If there's no tooltip set, continue
288
-			if( empty( $tooltip ) ) {
288
+			if ( empty( $tooltip ) ) {
289 289
 				continue;
290 290
 			}
291 291
 
292 292
 			// Add the tooltip
293
-			$gv_tooltips[ 'gv_'.$key ] = array(
294
-				'title'	=> $arg['label'],
293
+			$gv_tooltips[ 'gv_' . $key ] = array(
294
+				'title'	=> $arg[ 'label' ],
295 295
 				'value'	=> $tooltip,
296 296
 			);
297 297
 
298 298
 		}
299 299
 
300
-		$gv_tooltips['gv_css_merge_tags'] = array(
301
-			'title' => __('CSS Merge Tags', 'gravityview'),
302
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
300
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
301
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
302
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
303 303
 		);
304 304
 
305 305
 		/**
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
317 317
 
318 318
 		foreach ( $gv_tooltips as $key => $tooltip ) {
319 319
 
320
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
320
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
321 321
 
322
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
322
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
323 323
 		}
324 324
 
325 325
 		return $tooltips;
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 *
334 334
 	 * @return void
335 335
 	 */
336
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
336
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
337 337
 
338 338
 		$output = '';
339 339
 
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
356 356
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
357 357
 
358
-				$output = $template ? $template['label'] : $template_id_pretty;
358
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
359 359
 
360 360
 				break;
361 361
 
@@ -396,44 +396,44 @@  discard block
 block discarded – undo
396 396
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
397 397
 
398 398
 		// Either the form is empty or the form ID is 0, not yet set.
399
-		if( empty( $form ) ) {
399
+		if ( empty( $form ) ) {
400 400
 			return '';
401 401
 		}
402 402
 
403 403
 		// The $form is passed as the form ID
404
-		if( !is_array( $form ) ) {
404
+		if ( ! is_array( $form ) ) {
405 405
 			$form = gravityview_get_form( $form );
406 406
 		}
407 407
 
408
-		$form_id = $form['id'];
408
+		$form_id = $form[ 'id' ];
409 409
 		$links = array();
410 410
 
411
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
411
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
412 412
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
413
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
414
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
413
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
414
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
415 415
 		} else {
416
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
416
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
417 417
 		}
418 418
 
419
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
419
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
420 420
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
421
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
421
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
422 422
 		}
423 423
 
424
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
424
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
425 425
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
426
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
426
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
427 427
 		}
428 428
 
429
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
429
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
430 430
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
431
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
431
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
432 432
 		}
433 433
 
434 434
 		$output = '';
435 435
 
436
-		if( !empty( $include_form_link ) ) {
436
+		if ( ! empty( $include_form_link ) ) {
437 437
 			$output .= $form_link;
438 438
 		}
439 439
 
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 		 */
446 446
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
447 447
 
448
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
448
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
449 449
 
450 450
 		return $output;
451 451
 	}
@@ -459,8 +459,8 @@  discard block
 block discarded – undo
459 459
 		// Get the date column and save it for later to add back in.
460 460
 		// This adds it after the Data Source column.
461 461
 		// This way, we don't need to do array_slice, array_merge, etc.
462
-		$date = $columns['date'];
463
-		unset( $columns['date'] );
462
+		$date = $columns[ 'date' ];
463
+		unset( $columns[ 'date' ] );
464 464
 
465 465
 		$data_source_required_caps = array(
466 466
 			'gravityforms_edit_forms',
@@ -471,14 +471,14 @@  discard block
 block discarded – undo
471 471
 			'gravityforms_preview_forms',
472 472
 		);
473 473
 
474
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
475
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
474
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
475
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
476 476
 		}
477 477
 
478
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
478
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
479 479
 
480 480
 		// Add the date back in.
481
-		$columns['date'] = $date;
481
+		$columns[ 'date' ] = $date;
482 482
 
483 483
 		return $columns;
484 484
 	}
@@ -492,12 +492,12 @@  discard block
 block discarded – undo
492 492
 	 */
493 493
 	function save_postdata( $post_id ) {
494 494
 
495
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
495
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
496 496
 			return;
497 497
 		}
498 498
 
499 499
 		// validate post_type
500
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
500
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
501 501
 			return;
502 502
 		}
503 503
 
@@ -512,65 +512,65 @@  discard block
 block discarded – undo
512 512
 		$statii = array();
513 513
 
514 514
 		// check if this is a start fresh View
515
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
515
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
516 516
 
517
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
517
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
518 518
 			// save form id
519
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
519
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
520 520
 
521 521
 		}
522 522
 
523
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
523
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
524 524
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
525 525
 			return;
526 526
 		}
527 527
 
528 528
 		// Was this a start fresh?
529
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
530
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
529
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
530
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
531 531
 		} else {
532
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
532
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
533 533
 		}
534 534
 
535 535
 		// Check if we have a template id
536
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
536
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
537 537
 
538
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
538
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
539 539
 
540 540
 			// now save template id
541
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
541
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
542 542
 		}
543 543
 
544 544
 
545 545
 		// save View Configuration metabox
546
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
546
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
547 547
 
548 548
 			// template settings
549
-			if( empty( $_POST['template_settings'] ) ) {
550
-				$_POST['template_settings'] = array();
549
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
550
+				$_POST[ 'template_settings' ] = array();
551 551
 			}
552
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
552
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
553 553
 
554 554
 			$fields = array();
555 555
 
556 556
 			// Directory&single Visible Fields
557
-			if( !empty( $preset_fields ) ) {
557
+			if ( ! empty( $preset_fields ) ) {
558 558
 
559 559
 				$fields = $preset_fields;
560 560
 
561
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
561
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
562 562
 				$fields = _gravityview_process_posted_fields();
563 563
 			}
564 564
 
565 565
 			$fields = wp_slash( $fields );
566 566
 
567
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
567
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
568 568
 
569 569
 			// Directory Visible Widgets
570
-			if( empty( $_POST['widgets'] ) ) {
571
-				$_POST['widgets'] = array();
570
+			if ( empty( $_POST[ 'widgets' ] ) ) {
571
+				$_POST[ 'widgets' ] = array();
572 572
 			}
573
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
573
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
574 574
 
575 575
 		} // end save view configuration
576 576
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
581 581
 		 * @since 1.17.2
582 582
 		 */
583
-		do_action('gravityview_view_saved', $post_id, $statii );
583
+		do_action( 'gravityview_view_saved', $post_id, $statii );
584 584
 
585 585
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
586 586
 	}
@@ -624,20 +624,20 @@  discard block
 block discarded – undo
624 624
 
625 625
 		$output = '';
626 626
 
627
-		if( !empty( $fields ) ) {
627
+		if ( ! empty( $fields ) ) {
628 628
 
629
-			foreach( $fields as $id => $details ) {
629
+			foreach ( $fields as $id => $details ) {
630 630
 
631
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
631
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
632 632
 					continue;
633 633
 				}
634 634
 
635 635
 				// Edit mode only allows editing the parent fields, not single inputs.
636
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
636
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
637 637
 					continue;
638 638
 				}
639 639
 
640
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form );
640
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form );
641 641
 
642 642
 			} // End foreach
643 643
 		}
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
 		echo $output;
646 646
 
647 647
 		// For the EDIT view we only want to allow the form fields.
648
-		if( $context === 'edit' ) {
648
+		if ( $context === 'edit' ) {
649 649
 			return;
650 650
 		}
651 651
 
@@ -669,16 +669,16 @@  discard block
 block discarded – undo
669 669
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
670 670
 			array(
671 671
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
672
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
672
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
673 673
 				'field_id' => 'all-fields',
674 674
 				'label_type' => 'field',
675 675
 				'input_type' => NULL,
676 676
 				'field_options' => NULL,
677 677
 				'settings_html'	=> NULL,
678 678
 			)
679
-		));
679
+		) );
680 680
 
681
-		if( !empty( $additional_fields )) {
681
+		if ( ! empty( $additional_fields ) ) {
682 682
 			foreach ( (array)$additional_fields as $item ) {
683 683
 
684 684
 				// Prevent items from not having index set
@@ -689,16 +689,16 @@  discard block
 block discarded – undo
689 689
 					'input_type' => NULL,
690 690
 					'field_options' => NULL,
691 691
 					'settings_html'	=> NULL,
692
-				));
692
+				) );
693 693
 
694 694
 				// Backward compat.
695
-				if( !empty( $item['field_options'] ) ) {
695
+				if ( ! empty( $item[ 'field_options' ] ) ) {
696 696
 					// Use settings_html from now on.
697
-					$item['settings_html'] = $item['field_options'];
697
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
698 698
 				}
699 699
 
700 700
 				// Render a label for each of them
701
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
701
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
702 702
 
703 703
 			}
704 704
 		}
@@ -711,54 +711,54 @@  discard block
 block discarded – undo
711 711
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
712 712
 	 * @return array
713 713
 	 */
714
-	function get_entry_default_fields($form, $zone) {
714
+	function get_entry_default_fields( $form, $zone ) {
715 715
 
716 716
 		$entry_default_fields = array();
717 717
 
718
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
718
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
719 719
 
720 720
 			$entry_default_fields = array(
721 721
 				'id' => array(
722
-					'label' => __('Entry ID', 'gravityview'),
722
+					'label' => __( 'Entry ID', 'gravityview' ),
723 723
 					'type' => 'id',
724
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
724
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
725 725
 				),
726 726
 				'date_created' => array(
727
-					'label' => __('Entry Date', 'gravityview'),
728
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
727
+					'label' => __( 'Entry Date', 'gravityview' ),
728
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
729 729
 					'type' => 'date_created',
730 730
 				),
731 731
 				'source_url' => array(
732
-					'label' => __('Source URL', 'gravityview'),
732
+					'label' => __( 'Source URL', 'gravityview' ),
733 733
 					'type' => 'source_url',
734
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
734
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
735 735
 				),
736 736
 				'ip' => array(
737
-					'label' => __('User IP', 'gravityview'),
737
+					'label' => __( 'User IP', 'gravityview' ),
738 738
 					'type' => 'ip',
739
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
739
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
740 740
 				),
741 741
 				'created_by' => array(
742
-					'label' => __('User', 'gravityview'),
742
+					'label' => __( 'User', 'gravityview' ),
743 743
 					'type' => 'created_by',
744
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
744
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
745 745
 				),
746 746
 
747 747
 				/**
748 748
 				 * @since 1.7.2
749 749
 				 */
750 750
 			    'other_entries' => array(
751
-				    'label'	=> __('Other Entries', 'gravityview'),
751
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
752 752
 				    'type'	=> 'other_entries',
753
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
753
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
754 754
 			    ),
755 755
 	        );
756 756
 
757
-			if( 'single' !== $zone) {
757
+			if ( 'single' !== $zone ) {
758 758
 
759
-				$entry_default_fields['entry_link'] = array(
760
-					'label' => __('Link to Entry', 'gravityview'),
761
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
759
+				$entry_default_fields[ 'entry_link' ] = array(
760
+					'label' => __( 'Link to Entry', 'gravityview' ),
761
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
762 762
 					'type' => 'entry_link',
763 763
 				);
764 764
 			}
@@ -768,10 +768,10 @@  discard block
 block discarded – undo
768 768
 		/**
769 769
 		 * @since  1.2
770 770
 		 */
771
-		$entry_default_fields['custom']	= array(
772
-			'label'	=> __('Custom Content', 'gravityview'),
771
+		$entry_default_fields[ 'custom' ] = array(
772
+			'label'	=> __( 'Custom Content', 'gravityview' ),
773 773
 			'type'	=> 'custom',
774
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
774
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
775 775
 		);
776 776
 
777 777
 		/**
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
 		 * @param  string|array $form form_ID or form object
781 781
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
782 782
 		 */
783
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
783
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
784 784
 	}
785 785
 
786 786
 	/**
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 	 */
792 792
 	function get_available_fields( $form = '', $zone = NULL ) {
793 793
 
794
-		if( empty( $form ) ) {
794
+		if ( empty( $form ) ) {
795 795
 			gravityview()->log->error( '$form is empty' );
796 796
 			return array();
797 797
 		}
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 		$fields = gravityview_get_form_fields( $form, true );
801 801
 
802 802
 		// get meta fields ( only if form was already created )
803
-		if( !is_array( $form ) ) {
803
+		if ( ! is_array( $form ) ) {
804 804
 			$meta_fields = gravityview_get_entry_meta( $form );
805 805
 		} else {
806 806
 			$meta_fields = array();
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
 		$fields = $fields + $meta_fields + $default_fields;
814 814
 
815 815
 		// Move Custom Content to top
816
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
816
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
817 817
 
818 818
 		return $fields;
819 819
 	}
@@ -827,11 +827,11 @@  discard block
 block discarded – undo
827 827
 
828 828
 		$widgets = $this->get_registered_widgets();
829 829
 
830
-		if( !empty( $widgets ) ) {
830
+		if ( ! empty( $widgets ) ) {
831 831
 
832
-			foreach( $widgets as $id => $details ) {
832
+			foreach ( $widgets as $id => $details ) {
833 833
 
834
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
834
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
835 835
 
836 836
 			}
837 837
 		}
@@ -860,7 +860,7 @@  discard block
 block discarded – undo
860 860
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
861 861
 		global $post;
862 862
 
863
-		if( $type === 'widget' ) {
863
+		if ( $type === 'widget' ) {
864 864
 			$button_label = __( 'Add Widget', 'gravityview' );
865 865
 		} else {
866 866
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -872,10 +872,10 @@  discard block
 block discarded – undo
872 872
 		$form_id = null;
873 873
 
874 874
 		// if saved values, get available fields to label everyone
875
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
875
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
876 876
 
877
-			if( !empty( $_POST['template_id'] ) ) {
878
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
877
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
878
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
879 879
 			} else {
880 880
 				$form_id = $form = gravityview_get_form_id( $post->ID );
881 881
 			}
@@ -893,44 +893,44 @@  discard block
 block discarded – undo
893 893
 			}
894 894
 		}
895 895
 
896
-		foreach( $rows as $row ) :
897
-			foreach( $row as $col => $areas ) :
898
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
896
+		foreach ( $rows as $row ) :
897
+			foreach ( $row as $col => $areas ) :
898
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
899 899
 
900 900
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
901 901
 
902
-					<?php foreach( $areas as $area ) : 	?>
902
+					<?php foreach ( $areas as $area ) : 	?>
903 903
 
904
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
905
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
904
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
905
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
906 906
 
907 907
 								<?php // render saved fields
908 908
 
909
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
909
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
910 910
 
911
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
911
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
912 912
 
913 913
 										// Maybe has a form ID
914
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
914
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
915 915
 
916 916
 										$input_type = NULL;
917 917
 
918 918
 										if ( $form_id ) {
919
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
919
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
920 920
                                         } else {
921
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
921
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
922 922
                                         }
923 923
 
924
-										if ( !$original_item ) {
925
-											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 ) ) );
924
+										if ( ! $original_item ) {
925
+											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 ) ) );
926 926
 
927 927
 											$original_item = $field;
928 928
 										} else {
929
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
929
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
930 930
 										}
931 931
 
932 932
 										// Field options dialog box
933
-										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
933
+										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
934 934
 
935 935
 										$item = array(
936 936
 											'input_type' => $input_type,
@@ -943,23 +943,23 @@  discard block
 block discarded – undo
943 943
 											$item = wp_parse_args( $item, $original_item );
944 944
 										}
945 945
 
946
-										switch( $type ) {
946
+										switch ( $type ) {
947 947
 											case 'widget':
948
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
948
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
949 949
 												break;
950 950
 											default:
951
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
951
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
952 952
 										}
953 953
 									}
954 954
 
955 955
 								} // End if zone is not empty ?>
956 956
 
957
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
957
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
958 958
 							</div>
959 959
 							<div class="gv-droppable-area-action">
960
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
960
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
961 961
 
962
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
962
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
963 963
 							</div>
964 964
 						</div>
965 965
 
@@ -982,7 +982,7 @@  discard block
 block discarded – undo
982 982
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
983 983
 
984 984
 		$widgets = array();
985
-		if( !empty( $post_id ) ) {
985
+		if ( ! empty( $post_id ) ) {
986 986
 			$widgets = gravityview_get_directory_widgets( $post_id );
987 987
 		}
988 988
 
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
1015 1015
 		// list of available fields to be shown in the popup
1016 1016
 		$forms = gravityview_get_forms( 'any' );
1017 1017
 
1018
-		$form_ids = array_map( function ($form) { return $form['id']; }, $forms);
1018
+		$form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms );
1019 1019
 
1020 1020
 		foreach ( $form_ids as $form_id ) {
1021 1021
 			$filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id );
@@ -1028,7 +1028,7 @@  discard block
 block discarded – undo
1028 1028
                 </div>
1029 1029
 
1030 1030
                 <div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox">
1031
-                <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?>
1031
+                <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?>
1032 1032
                 </div>
1033 1033
 
1034 1034
                 <div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div>
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 	 * @return string HTML of the active areas
1048 1048
 	 */
1049 1049
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1050
-		if( empty( $template_id ) ) {
1050
+		if ( empty( $template_id ) ) {
1051 1051
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1052 1052
 			return '';
1053 1053
 		}
@@ -1061,12 +1061,12 @@  discard block
 block discarded – undo
1061 1061
 		 */
1062 1062
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1063 1063
 
1064
-		if( empty( $template_areas ) ) {
1064
+		if ( empty( $template_areas ) ) {
1065 1065
 
1066 1066
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1067 1067
 			$output = '<div>';
1068
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
1069
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
1068
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
1069
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
1070 1070
 			$output .= '</div>';
1071 1071
 		} else {
1072 1072
 
@@ -1081,7 +1081,7 @@  discard block
 block discarded – undo
1081 1081
 
1082 1082
 		}
1083 1083
 
1084
-		if( $echo ) {
1084
+		if ( $echo ) {
1085 1085
 			echo $output;
1086 1086
 		}
1087 1087
 
@@ -1101,32 +1101,32 @@  discard block
 block discarded – undo
1101 1101
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1102 1102
 
1103 1103
 		// Add the GV font (with the Astronaut)
1104
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1104
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1105 1105
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1106 1106
 
1107
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1107
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1108 1108
 
1109
-		if( GFForms::get_page() === 'form_list' ) {
1109
+		if ( GFForms::get_page() === 'form_list' ) {
1110 1110
 			wp_enqueue_style( 'gravityview_views_styles' );
1111 1111
 			return;
1112 1112
         }
1113 1113
 
1114 1114
 		// Don't process any scripts below here if it's not a GravityView page.
1115
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1115
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1116 1116
 		    return;
1117 1117
 		}
1118 1118
 
1119 1119
         wp_enqueue_script( 'jquery-ui-datepicker' );
1120
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1120
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1121 1121
 
1122
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1122
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1123 1123
 
1124 1124
         //enqueue scripts
1125 1125
         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 );
1126 1126
 
1127
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1127
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1128 1128
             'cookiepath' => COOKIEPATH,
1129
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1129
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1130 1130
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1131 1131
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1132 1132
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1139 1139
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1140 1140
             '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' ),
1141
-        ));
1141
+        ) );
1142 1142
 
1143 1143
 		wp_enqueue_style( 'gravityview_views_styles' );
1144 1144
 
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 		);
1166 1166
 
1167 1167
 		if ( wp_is_mobile() ) {
1168
-		    $scripts[] = 'jquery-touch-punch';
1168
+		    $scripts[ ] = 'jquery-touch-punch';
1169 1169
 		}
1170 1170
 
1171 1171
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.