Completed
Push — develop ( 9a262e...31ff0e )
by Zack
19:27
created
includes/class-gravityview-entry-approval-status.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -113,16 +113,16 @@  discard block
 block discarded – undo
113 113
 		$new_value = $old_value;
114 114
 
115 115
 		// Meta value does not exist yet
116
-		if( false === $old_value ) {
116
+		if ( false === $old_value ) {
117 117
 			return self::UNAPPROVED;
118 118
 		}
119 119
 
120 120
 		// Meta value does not exist yet
121
-		if( true === $old_value ) {
121
+		if ( true === $old_value ) {
122 122
 			return self::APPROVED;
123 123
 		}
124 124
 
125
-		switch ( (string) $old_value ) {
125
+		switch ( (string)$old_value ) {
126 126
 
127 127
 			// Approved values
128 128
 			case 'Approved':
@@ -248,9 +248,9 @@  discard block
 block discarded – undo
248 248
 		foreach ( $choices as $key => $choice ) {
249 249
 
250 250
 			// Is the passed status value the same as the choice value or key?
251
-			if ( $status === $choice['value'] || $status === $key ) {
251
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
252 252
 
253
-				if( 'key' === $attr_key ) {
253
+				if ( 'key' === $attr_key ) {
254 254
 					return $key;
255 255
 				} else {
256 256
 					return \GV\Utils::get( $choice, $attr_key, false );
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-link.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -41,22 +41,22 @@
 block discarded – undo
41 41
 
42 42
         <?php
43 43
 
44
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
44
+		$search_value = \GV\Utils::_GET( $search_field['name'] );
45 45
 
46
-        foreach ( $search_field['choices'] as $k => $choice ) {
46
+		foreach ( $search_field['choices'] as $k => $choice ) {
47 47
 
48
-            if ( 0 != $k ) {
49
-                echo esc_html( $links_sep );
50
-            }
48
+			if ( 0 != $k ) {
49
+				echo esc_html( $links_sep );
50
+			}
51 51
 
52
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
52
+			$active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
53 53
 
54
-            if ( $active ) {
55
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
56
-            } else {
57
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
58
-            }
59
-            ?>
54
+			if ( $active ) {
55
+				$link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
56
+			} else {
57
+				$link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
58
+			}
59
+			?>
60 60
 
61 61
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
62 62
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,12 +13,12 @@  discard block
 block discarded – undo
13 13
 $base_url = GravityView_Widget_Search::get_search_form_action();
14 14
 
15 15
 // Make sure that there are choices to display
16
-if ( empty( $search_field['choices'] ) ) {
16
+if ( empty( $search_field[ 'choices' ] ) ) {
17 17
 	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
18 18
 	return;
19 19
 }
20 20
 
21
-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gk-gravityview' ) : $search_field['label'];
21
+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gk-gravityview' ) : $search_field[ 'label' ];
22 22
 
23 23
 /**
24 24
  * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
@@ -41,24 +41,24 @@  discard block
 block discarded – undo
41 41
 
42 42
         <?php
43 43
 
44
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
44
+        $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
45 45
 
46
-        foreach ( $search_field['choices'] as $k => $choice ) {
46
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
47 47
 
48 48
             if ( 0 != $k ) {
49 49
                 echo esc_html( $links_sep );
50 50
             }
51 51
 
52
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
52
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
53 53
 
54 54
             if ( $active ) {
55
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
55
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
56 56
             } else {
57
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
57
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
58 58
             }
59 59
             ?>
60 60
 
61
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
61
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
62 62
 
63 63
 		<?php } ?>
64 64
 	</p>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-checkbox.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18 18
 ?>
19 19
 <div class="gv-search-box gv-search-field-checkbox">
20
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
21
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
20
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
21
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
22 22
 	<?php } ?>
23 23
 	<p>
24
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
24
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
25 25
 
26
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
27
-			<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>>
28
-			<?php echo esc_html( $choice['text'] ); ?>
26
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
27
+			<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>>
28
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
29 29
 		</label>
30 30
 
31 31
 	<?php } ?>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-radio.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-radio.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18 18
 ?>
19 19
 <div class="gv-search-box gv-search-field-radio">
20
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
21
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
20
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
21
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
22 22
 	<?php } ?>
23 23
 	<p>
24
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
24
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
25 25
 
26
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
27
-			<input type="radio" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php checked( $choice['value'], $search_field['value'], true ); ?>>
28
-			<?php echo esc_html( $choice['text'] ); ?>
26
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
27
+			<input type="radio" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php checked( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>>
28
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
29 29
 		</label>
30 30
 
31 31
 	<?php } ?>
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-metabox-tab.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 	 * @param array $callback_args Arguments passed to the callback
98 98
 	 * @return void
99 99
 	 */
100
-	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array()  ) {
100
+	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array() ) {
101 101
 
102
-		$this->id = $this->prefix.$id;
102
+		$this->id = $this->prefix . $id;
103 103
 		$this->title = $title;
104 104
 		$this->render_template_file = $file;
105 105
 		$this->callback = $callback;
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	 */
119 119
 	function parse_icon_class_name( $icon_class_name = '' ) {
120 120
 
121
-		if( preg_match( '/dashicon/i', $icon_class_name ) ) {
121
+		if ( preg_match( '/dashicon/i', $icon_class_name ) ) {
122 122
 			$icon_class_name = 'dashicons ' . $icon_class_name;
123 123
 		}
124 124
 
@@ -142,29 +142,29 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	function render( $post ) {
144 144
 
145
-		if( !empty( $this->render_template_file ) ) {
145
+		if ( ! empty( $this->render_template_file ) ) {
146 146
 
147 147
 			$file = $this->render_template_file;
148 148
 
149 149
 			// If the full path exists, use it
150
-			if( file_exists( $file ) ) {
150
+			if ( file_exists( $file ) ) {
151 151
 				$path = $file;
152 152
 			} else {
153
-				$path = GRAVITYVIEW_DIR .'includes/admin/metaboxes/views/'.$file;
153
+				$path = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/views/' . $file;
154 154
 			}
155 155
 
156
-			if( file_exists( $path ) ) {
156
+			if ( file_exists( $path ) ) {
157 157
 				include $path;
158 158
 			} else {
159 159
 				gravityview()->log->error( 'Metabox template file not found', array( 'data' => $this ) );
160 160
 			}
161 161
 
162
-		} else if( !empty( $this->callback ) ) {
162
+		} else if ( ! empty( $this->callback ) ) {
163 163
 
164
-			if( is_callable( $this->callback ) ) {
164
+			if ( is_callable( $this->callback ) ) {
165 165
 
166 166
 				/** @see do_accordion_sections() */
167
-				call_user_func( $this->callback, $post, (array) $this );
167
+				call_user_func( $this->callback, $post, (array)$this );
168 168
 
169 169
 			} else {
170 170
 				gravityview()->log->error( 'Metabox callback was not callable', array( 'data' => $this ) );
Please login to merge, or discard this patch.
includes/class-oembed.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 	static function getInstance() {
43 43
 		gravityview()->log->notice( '\GravityView_oEmbed is deprecated. Use \GV\oEmbed instead.' );
44 44
 
45
-		if( empty( self::$instance ) ) {
45
+		if ( empty( self::$instance ) ) {
46 46
 			self::$instance = new self;
47 47
 			self::$instance->initialize();
48 48
 		}
Please login to merge, or discard this patch.
includes/connector-functions.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -333,8 +333,8 @@  discard block
 block discarded – undo
333 333
  * @param  mixed $field_id Field ID or Field array
334 334
  * @return string field type
335 335
  */
336
-function gravityview_get_field_type(  $form = null , $field_id = '' ) {
337
-	return GVCommon::get_field_type(  $form, $field_id );
336
+function gravityview_get_field_type( $form = null, $field_id = '' ) {
337
+	return GVCommon::get_field_type( $form, $field_id );
338 338
 }
339 339
 
340 340
 
@@ -347,8 +347,8 @@  discard block
 block discarded – undo
347 347
  * @return string HTML of the output. Empty string if $view_id is empty.
348 348
  */
349 349
 function get_gravityview( $view_id = '', $atts = array() ) {
350
-	if( !empty( $view_id ) ) {
351
-		$atts['id'] = $view_id;
350
+	if ( ! empty( $view_id ) ) {
351
+		$atts[ 'id' ] = $view_id;
352 352
 		$args = wp_parse_args( $atts, \GV\View_Settings::defaults() );
353 353
 		$GravityView_frontend = GravityView_frontend::getInstance();
354 354
 		$GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) );
@@ -391,19 +391,19 @@  discard block
 block discarded – undo
391 391
  */
392 392
 function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) {
393 393
 
394
-	if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
394
+	if ( class_exists( 'GFFormsModel' ) && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
395 395
 
396 396
 		/** @var GF_Field_Radio|GF_Field_Checkbox $form_field */
397
-		foreach( $form_fields as $form_field ) {
397
+		foreach ( $form_fields as $form_field ) {
398 398
 			$field_id = $form_field->id;
399
-			foreach( $view_fields as $zone ) {
399
+			foreach ( $view_fields as $zone ) {
400 400
 
401 401
 				// ACF compatibility; ACF-added fields aren't arrays
402 402
 				if ( ! is_array( $zone ) ) { continue; }
403 403
 
404
-				foreach( $zone as $field ) {
404
+				foreach ( $zone as $field ) {
405 405
 					// If it's an input, not the parent and the parent ID matches a checkbox or radio
406
-					if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) {
406
+					if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) {
407 407
 						return true;
408 408
 					}
409 409
 				}
Please login to merge, or discard this patch.
includes/class-gravityview-merge-tags.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
 		// matching regex => the value is the method to call to replace the value.
53 53
 		$gv_modifiers = array(
54 54
 			'maxwords:(\d+)' => 'modifier_maxwords', /** @see modifier_maxwords */
55
-		    'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */
55
+			'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */
56 56
 			'explode' => 'modifier_explode', /** @see modifier_explode */
57 57
 
58 58
 			/** @see modifier_strings */
59 59
 			'urlencode' => 'modifier_strings',
60 60
 			'wpautop' => 'modifier_strings',
61
-		    'esc_html' => 'modifier_strings',
62
-		    'sanitize_html_class' => 'modifier_strings',
61
+			'esc_html' => 'modifier_strings',
62
+			'sanitize_html_class' => 'modifier_strings',
63 63
 			'sanitize_title' => 'modifier_strings',
64 64
 			'strtolower' => 'modifier_strings',
65 65
 			'strtoupper' => 'modifier_strings',
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 
458 458
 		$atts = array(
459 459
 			'format' => self::get_format_from_modifiers( $exploded, false ),
460
-		    'human' => in_array( 'human', $exploded ), // {date_created:human}
460
+			'human' => in_array( 'human', $exploded ), // {date_created:human}
461 461
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
462 462
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
463 463
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 
79 79
 			$non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) );
80 80
 
81
-			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false);
81
+			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false );
82 82
 		}
83 83
 
84 84
 		foreach ( $modifiers as $passed_modifier ) {
85 85
 
86
-			foreach( $gv_modifiers as $gv_modifier => $method ) {
86
+			foreach ( $gv_modifiers as $gv_modifier => $method ) {
87 87
 
88 88
 				// Uses ^ to only match the first modifier, to enforce same order as passed by GF
89 89
 				preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches );
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 */
133 133
 	private static function modifier_timestamp( $raw_value, $matches ) {
134 134
 
135
-		if( empty( $matches[0] ) ) {
135
+		if ( empty( $matches[ 0 ] ) ) {
136 136
 			return $raw_value;
137 137
 		}
138 138
 
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	private static function modifier_maxwords( $raw_value, $matches, $field = null ) {
163 163
 
164
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
164
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
165 165
 			return $raw_value;
166 166
 		}
167 167
 
168
-		$max = intval( $matches[1] );
168
+		$max = intval( $matches[ 1 ] );
169 169
 
170 170
 		$more_placeholder = '[GVMORE]';
171 171
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	private static function modifier_explode( $raw_value, $matches, $value, $field = null ) {
235 235
 
236 236
 		// For JSON-encoded arrays
237
-		if( $json_array = json_decode( $raw_value, true ) ) {
237
+		if ( $json_array = json_decode( $raw_value, true ) ) {
238 238
 			return implode( ' ', $json_array );
239 239
 		}
240 240
 
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) {
257 257
 
258
-		if( empty( $matches[0] ) ) {
258
+		if ( empty( $matches[ 0 ] ) ) {
259 259
 			return $raw_value;
260 260
 		}
261 261
 
262 262
 		$return = $raw_value;
263 263
 
264
-		switch( $matches[0] ) {
264
+		switch ( $matches[ 0 ] ) {
265 265
 			case 'urlencode':
266 266
 				$return = urlencode( $raw_value );
267 267
 				break;
@@ -348,9 +348,9 @@  discard block
 block discarded – undo
348 348
 		 * @internal Fixed $form['title'] in Gravity Forms
349 349
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
350 350
 		 */
351
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
352
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
353
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
351
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
352
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
353
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
354 354
 
355 355
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data );
356 356
 	}
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 
443 443
 		$site_url = get_site_url();
444 444
 
445
-		if( $url_encode ) {
445
+		if ( $url_encode ) {
446 446
 			$site_url = urlencode( $site_url );
447 447
 		}
448 448
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 		// Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag?
470 470
 		preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER );
471 471
 
472
-		if( empty( $matches ) ) {
472
+		if ( empty( $matches ) ) {
473 473
 			return $original_text;
474 474
 		}
475 475
 
@@ -490,18 +490,18 @@  discard block
 block discarded – undo
490 490
 		 * }
491 491
 		 */
492 492
 		foreach ( $matches as $match ) {
493
-			$full_tag = $match[0];
493
+			$full_tag = $match[ 0 ];
494 494
 
495 495
 			$link_args = array(
496 496
 				'return' => 'url',
497
-				'entry_id' => $entry['id'],
497
+				'entry_id' => $entry[ 'id' ],
498 498
 				'post_id' => \GV\Utils::get( $match, 1, null ),
499 499
 				'action' => \GV\Utils::get( $match, 2, 'read' ),
500 500
 			);
501 501
 
502 502
 			$entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' );
503 503
 
504
-			if( $url_encode ) {
504
+			if ( $url_encode ) {
505 505
 				$entry_link = urlencode( $entry_link );
506 506
 			}
507 507
 
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
540 540
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
541 541
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
542
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
542
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
543 543
 		);
544 544
 
545 545
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -616,8 +616,8 @@  discard block
 block discarded – undo
616 616
 			return $original_text;
617 617
 		}
618 618
 
619
-		foreach ( (array) $matches as $match ) {
620
-			$full_tag = $match[0];
619
+		foreach ( (array)$matches as $match ) {
620
+			$full_tag = $match[ 0 ];
621 621
 			$modifier = \GV\Utils::get( $match, 2, 'permalink' );
622 622
 
623 623
 			$replacement = false;
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
 					$replacement = esc_html( $replacement );
636 636
 				}
637 637
 
638
-				if( $url_encode ) {
638
+				if ( $url_encode ) {
639 639
 					$replacement = urlencode( $replacement );
640 640
 				}
641 641
 
@@ -675,14 +675,14 @@  discard block
 block discarded – undo
675 675
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
676 676
 
677 677
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
678
-		if( empty( $matches ) ) {
678
+		if ( empty( $matches ) ) {
679 679
 			return $text;
680 680
 		}
681 681
 
682 682
 		foreach ( $matches as $match ) {
683 683
 
684
-			$full_tag = $match[0];
685
-			$property = $match[1];
684
+			$full_tag = $match[ 0 ];
685
+			$property = $match[ 1 ];
686 686
 
687 687
 			$value = stripslashes_deep( \GV\Utils::_GET( $property ) );
688 688
 
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 			 * @since 1.15
707 707
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
708 708
 			 */
709
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
709
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
710 710
 
711 711
 			$value = $esc_html ? esc_html( $value ) : $value;
712 712
 
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
 			 * @param array $form Gravity Forms form array
718 718
 			 * @param array $entry Entry array
719 719
 			 */
720
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
720
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
721 721
 
722 722
 			$text = str_replace( $full_tag, $value, $text );
723 723
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-custom.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 				$field_data = array(
110 110
 					'label' => \GV\Utils::get( $edit_field, 'custom_label' ),
111 111
 					'customLabel' => \GV\Utils::get( $edit_field, 'custom_label' ),
112
-				    'content' => \GV\Utils::get( $edit_field, 'content' ),
112
+					'content' => \GV\Utils::get( $edit_field, 'content' ),
113 113
 				);
114 114
 
115 115
 				// Replace merge tags in the content
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 */
57 57
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
58 58
 
59
-		$entry_default_fields['custom']	= array(
59
+		$entry_default_fields[ 'custom' ] = array(
60 60
 			'label'	=> $this->label,
61 61
 			'type'	=> $this->name,
62 62
 			'desc'	=> $this->description,
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 
70 70
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
71 71
 
72
-		unset ( $field_options['search_filter'], $field_options['show_as_link'], $field_options['new_window'] );
72
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ], $field_options[ 'new_window' ] );
73 73
 
74 74
 		$new_fields = array(
75 75
 			'content' => array(
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 		);
113 113
 
114 114
 		if ( 'edit' === $context ) {
115
-			unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] );
115
+			unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] );
116 116
 		}
117 117
 
118 118
 		return $new_fields + $field_options;
@@ -142,13 +142,13 @@  discard block
 block discarded – undo
142 142
 		$new_fields = array();
143 143
 		$i = 0;
144 144
 
145
-		$entry = gravityview()->request->is_edit_entry( $form['id'] );
145
+		$entry = gravityview()->request->is_edit_entry( $form[ 'id' ] );
146 146
 
147 147
 		// Loop through the configured Edit Entry fields and add Custom Content fields if there are any
148 148
 		// TODO: Make this available to other custom GV field types
149
-		foreach ( (array) $edit_fields as $edit_field ) {
149
+		foreach ( (array)$edit_fields as $edit_field ) {
150 150
 
151
-			if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) {
151
+			if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) {
152 152
 
153 153
 				$field_data = array(
154 154
 					'label' => \GV\Utils::get( $edit_field, 'custom_label' ),
@@ -162,13 +162,13 @@  discard block
 block discarded – undo
162 162
 					$field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry_data, false, false );
163 163
 				}
164 164
 
165
-				$field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' );
165
+				$field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' );
166 166
 
167
-				$new_fields[] = new GF_Field_HTML( $field_data );
167
+				$new_fields[ ] = new GF_Field_HTML( $field_data );
168 168
 
169 169
 			} else {
170
-				if( isset( $fields[ $i ] ) ) {
171
-					$new_fields[] =  $fields[ $i ];
170
+				if ( isset( $fields[ $i ] ) ) {
171
+					$new_fields[ ] = $fields[ $i ];
172 172
 				}
173 173
 				$i++;
174 174
 			}
Please login to merge, or discard this patch.