Completed
Pull Request — develop (#1523)
by Zack
19:02
created
future/includes/rest/class-gv-rest-route.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 		$format = '(?:\.(?P<format>html|json))?';
134 134
 
135
-		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ) , array(
135
+		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ), array(
136 136
 			array(
137 137
 				'methods'         => \WP_REST_Server::READABLE,
138 138
 				'callback'        => array( $this, 'get_sub_item' ),
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	 * @return \WP_REST_Response
383 383
 	 */
384 384
 	protected function not_implemented() {
385
-		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' )  );
385
+		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' ) );
386 386
 		return new \WP_REST_Response( $error, 501 );
387 387
 	}
388 388
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-textarea.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
27 27
 
28 28
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
29 29
 
30
-		if( 'edit' === $context ) {
30
+		if ( 'edit' === $context ) {
31 31
 			return $field_options;
32 32
 		}
33 33
 
34
-		$field_options['trim_words'] = array(
34
+		$field_options[ 'trim_words' ] = array(
35 35
 			'type' => 'number',
36 36
 			'merge_tags' => false,
37 37
 			'value' => null,
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
40 40
 		);
41 41
 
42
-        $field_options['make_clickable'] = array(
42
+        $field_options[ 'make_clickable' ] = array(
43 43
             'type' => 'checkbox',
44 44
             'merge_tags' => false,
45 45
             'value' => 0,
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
48 48
         );
49 49
 
50
-		$field_options['allow_html'] = array(
50
+		$field_options[ 'allow_html' ] = array(
51 51
 			'type' => 'checkbox',
52 52
 			'merge_tags' => false,
53 53
 			'value' => 1,
Please login to merge, or discard this patch.
includes/admin/field-types/type_number.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * number input type
4 4
  */
5 5
 
6
-if( !class_exists('GravityView_FieldType_text') ) {
6
+if ( ! class_exists( 'GravityView_FieldType_text' ) ) {
7 7
 	include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' );
8 8
 }
9 9
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		$show_mt = $this->show_merge_tags();
22 22
 
23
-		if ( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
23
+		if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
24 24
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
25 25
 		}
26 26
 
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 		$step = \GV\Utils::get( $this->field, 'step', null );
32 32
 
33 33
 		$atts = '';
34
-		$atts .= $max ? ' max="' . (int) $max . '"' : '';
35
-		$atts .= $min ? ' min="' . (int) $min . '"' : '';
36
-		$atts .= $step ? ' step="' . (int) $step . '"' : '';
34
+		$atts .= $max ? ' max="' . (int)$max . '"' : '';
35
+		$atts .= $min ? ' min="' . (int)$min . '"' : '';
36
+		$atts .= $step ? ' step="' . (int)$step . '"' : '';
37 37
 		?>
38 38
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number"
39 39
 		       value="<?php echo esc_attr( $this->value ); ?>"
Please login to merge, or discard this patch.
includes/presets/default-table/class-gravityview-default-template-table.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -88,15 +88,15 @@
 block discarded – undo
88 88
 	 */
89 89
 	public function maybe_modify_button_label( $label = '', $atts = array() ) {
90 90
 
91
-		if( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
91
+		if ( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
92 92
 			return $label;
93 93
 		}
94 94
 
95
-		if( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
95
+		if ( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
96 96
 			return $label;
97 97
 		}
98 98
 
99
-		if( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
99
+		if ( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
100 100
 			return $label;
101 101
 		}
102 102
 
Please login to merge, or discard this patch.
includes/admin/class.field.type.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
         $defaults = self::get_field_defaults();
34 34
 
35 35
         // Backward compatibility
36
-        if( !empty( $field['choices'] ) ) {
37
-        	$field['options'] = $field['choices'];
38
-        	unset( $field['choices'] );
36
+        if ( ! empty( $field[ 'choices' ] ) ) {
37
+        	$field[ 'options' ] = $field[ 'choices' ];
38
+        	unset( $field[ 'choices' ] );
39 39
         }
40 40
 
41
-        $this->field =  wp_parse_args( $field, $defaults );
41
+        $this->field = wp_parse_args( $field, $defaults );
42 42
 
43
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
43
+        $this->value = is_null( $curr_value ) ? $this->field[ 'value' ] : $curr_value;
44 44
 
45 45
     }
46 46
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
 
81 81
     function get_tooltip() {
82
-        if( ! function_exists('gform_tooltip') ) {
82
+        if ( ! function_exists( 'gform_tooltip' ) ) {
83 83
             return null;
84 84
         }
85 85
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	    	'url' => '#',
90 90
 	    ) );
91 91
 
92
-        return !empty( $this->field['tooltip'] ) ? ' '. $this->tooltip( $this->field['tooltip'], false, true, $article ) : null;
92
+        return ! empty( $this->field[ 'tooltip' ] ) ? ' ' . $this->tooltip( $this->field[ 'tooltip' ], false, true, $article ) : null;
93 93
     }
94 94
 
95 95
     /**
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	     * Below this line has been modified by GravityView.
133 133
 	     */
134 134
 
135
-		if ( empty( $tooltip_text ) && empty( $article['id'] ) ) {
135
+		if ( empty( $tooltip_text ) && empty( $article[ 'id' ] ) ) {
136 136
 			return '';
137 137
 		}
138 138
 
@@ -168,8 +168,8 @@  discard block
 block discarded – undo
168 168
      * @return string
169 169
      */
170 170
     function get_field_id() {
171
-        if( isset( $this->field['id'] ) ) {
172
-            return esc_attr( $this->field['id'] );
171
+        if ( isset( $this->field[ 'id' ] ) ) {
172
+            return esc_attr( $this->field[ 'id' ] );
173 173
         }
174 174
         return esc_attr( sanitize_html_class( $this->name ) );
175 175
     }
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      * @return string
180 180
      */
181 181
     function get_field_label() {
182
-        return esc_html( trim( $this->field['label'] ) );
182
+        return esc_html( trim( $this->field[ 'label' ] ) );
183 183
     }
184 184
 
185 185
 	/**
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 	 * @return string
191 191
 	 */
192 192
 	function get_field_left_label() {
193
-		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
193
+		return ! empty( $this->field[ 'left_label' ] ) ? esc_html( trim( $this->field[ 'left_label' ] ) ) : NULL;
194 194
 	}
195 195
 
196 196
     /**
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
      * @return string
199 199
      */
200 200
     function get_label_class() {
201
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
201
+        return 'gv-label-' . sanitize_html_class( $this->field[ 'type' ] );
202 202
     }
203 203
 
204 204
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
      * @return string
208 208
      */
209 209
     function get_field_desc() {
210
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
210
+        return ! empty( $this->field[ 'desc' ] ) ? '<span class="howto">' . $this->field[ 'desc' ] . '</span>' : '';
211 211
     }
212 212
 
213 213
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
      */
241 241
     function render_setting( $override_input = NULL ) {
242 242
 
243
-        if( !empty( $this->field['full_width'] ) ) { ?>
243
+        if ( ! empty( $this->field[ 'full_width' ] ) ) { ?>
244 244
             <th scope="row" colspan="2">
245 245
                 <div>
246 246
                     <label for="<?php echo $this->get_field_id(); ?>">
Please login to merge, or discard this patch.
future/includes/class-gv-utils.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 		 * Try subkeys after split.
92 92
 		 */
93 93
 		if ( count( $parts = explode( '/', $key, 2 ) ) > 1 ) {
94
-			return self::get( self::get( $array, $parts[0] ), $parts[1], $default );
94
+			return self::get( self::get( $array, $parts[ 0 ] ), $parts[ 1 ], $default );
95 95
 		}
96 96
 
97 97
 		return $default;
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	public static function gf_query_debug( $query ) {
146 146
 		$introspect = $query->_introspect();
147 147
 		return array(
148
-			'where' => $query->_where_unwrap( $introspect['where'] )
148
+			'where' => $query->_where_unwrap( $introspect[ 'where' ] )
149 149
 		);
150 150
 	}
151 151
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		if ( $condition->expressions ) {
159 159
 			$conditions = array();
160 160
 			foreach ( $condition->expressions as $expression ) {
161
-				$conditions[] = self::gf_query_strip_condition_column_aliases( $expression );
161
+				$conditions[ ] = self::gf_query_strip_condition_column_aliases( $expression );
162 162
 			}
163 163
 			return call_user_func_array(
164 164
 				array( '\GF_Query_Condition', $condition->operator == 'AND' ? '_and' : '_or' ),
Please login to merge, or discard this patch.
includes/extensions/duplicate-entry/class-duplicate-entry.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
94 94
 	 */
95 95
 	public function _filter_sortable_fields( $fields ) {
96 96
 
97
-		$fields = (array) $fields;
97
+		$fields = (array)$fields;
98 98
 
99
-		$fields[] = 'duplicate_link';
99
+		$fields[ ] = 'duplicate_link';
100 100
 
101 101
 		return $fields;
102 102
 	}
@@ -135,12 +135,12 @@  discard block
 block discarded – undo
135 135
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
136 136
 
137 137
 		// Always a link, never a filter, always same window
138
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
138
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
139 139
 
140 140
 		// Duplicate Entry link should only appear to visitors capable of editing entries
141
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
141
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
142 142
 
143
-		$add_option['duplicate_link'] = array(
143
+		$add_option[ 'duplicate_link' ] = array(
144 144
 			'type' => 'text',
145 145
 			'label' => __( 'Duplicate Link Text', 'gravityview' ),
146 146
 			'desc' => NULL,
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 			'merge_tags' => true,
149 149
 		);
150 150
 
151
-		$field_options['allow_duplicate_cap'] = array(
151
+		$field_options[ 'allow_duplicate_cap' ] = array(
152 152
 			'type' => 'select',
153 153
 			'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ),
154 154
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
176 176
 
177 177
 		if ( 'edit' !== $zone ) {
178
-			$entry_default_fields['duplicate_link'] = array(
178
+			$entry_default_fields[ 'duplicate_link' ] = array(
179 179
 				'label' => __( 'Duplicate Entry', 'gravityview' ),
180 180
 				'type'  => 'duplicate_link',
181 181
 				'desc'  => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ),
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 	 */
197 197
 	public function add_available_field( $available_fields = array() ) {
198 198
 
199
-		$available_fields['duplicate_link'] = array(
199
+		$available_fields[ 'duplicate_link' ] = array(
200 200
 			'label_text' => __( 'Duplicate Entry', 'gravityview' ),
201 201
 			'field_id' => 'duplicate_link',
202 202
 			'label_type' => 'field',
@@ -229,9 +229,9 @@  discard block
 block discarded – undo
229 229
 		if ( 'duplicate_link' === $field_id ) {
230 230
 
231 231
 			// Remove other built-in caps.
232
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] );
232
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] );
233 233
 
234
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
234
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
235 235
 		}
236 236
 
237 237
 		return $caps;
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 */
267 267
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
268 268
 
269
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
269
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
270 270
 
271 271
 		if ( empty( $base ) ) {
272 272
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -275,12 +275,12 @@  discard block
 block discarded – undo
275 275
 
276 276
 		$actionurl = add_query_arg( array(
277 277
 			'action'	=> 'duplicate',
278
-			'entry_id'	=> $entry['id'],
278
+			'entry_id'	=> $entry[ 'id' ],
279 279
 			'gvid' => $view_id,
280 280
             'view_id' => $view_id,
281 281
 		), $base );
282 282
 
283
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
283
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
284 284
 	}
285 285
 
286 286
 	/**
@@ -301,12 +301,12 @@  discard block
 block discarded – undo
301 301
 	public function process_duplicate() {
302 302
 
303 303
 		// If the form is submitted
304
-		if ( ( ! isset( $_GET['action'] ) ) || 'duplicate' !== $_GET['action'] || ( ! isset( $_GET['entry_id'] ) ) ) {
304
+		if ( ( ! isset( $_GET[ 'action' ] ) ) || 'duplicate' !== $_GET[ 'action' ] || ( ! isset( $_GET[ 'entry_id' ] ) ) ) {
305 305
 			return;
306 306
 		}
307 307
 
308 308
 		// Make sure it's a GravityView request
309
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
309
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
310 310
 
311 311
 		if ( ! $valid_nonce_key ) {
312 312
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 		}
315 315
 
316 316
 		// Get the entry slug
317
-		$entry_slug = esc_attr( $_GET['entry_id'] );
317
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
318 318
 
319 319
 		// See if there's an entry there
320 320
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -408,17 +408,17 @@  discard block
 block discarded – undo
408 408
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
409 409
 		}
410 410
 
411
-		$form = GFAPI::get_form( $entry['form_id'] );
411
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
412 412
 
413
-		$row['id'] = null;
414
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
415
-		$row['date_updated'] = $row['date_created'];
416
-		$row['is_starred'] = false;
417
-		$row['is_read'] = false;
418
-		$row['ip'] = rgars( $form, 'personalData/preventIP' ) ? '' : GFFormsModel::get_ip();
419
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid', 'result', 'duplicate', 'entry_id' ) ) );
420
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
421
-		$row['created_by'] = wp_get_current_user()->ID;
413
+		$row[ 'id' ] = null;
414
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
415
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
416
+		$row[ 'is_starred' ] = false;
417
+		$row[ 'is_read' ] = false;
418
+		$row[ 'ip' ] = rgars( $form, 'personalData/preventIP' ) ? '' : GFFormsModel::get_ip();
419
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid', 'result', 'duplicate', 'entry_id' ) ) );
420
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
421
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
422 422
 
423 423
 		/**
424 424
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -446,15 +446,15 @@  discard block
 block discarded – undo
446 446
 
447 447
 		$save_this_meta = array();
448 448
 		foreach ( $duplicate_meta->get_output() as $m ) {
449
-			$save_this_meta[] = array(
450
-				'meta_key' => $m['meta_key'],
451
-				'meta_value' => $m['meta_value'],
452
-				'item_index' => $m['item_index'],
449
+			$save_this_meta[ ] = array(
450
+				'meta_key' => $m[ 'meta_key' ],
451
+				'meta_value' => $m[ 'meta_value' ],
452
+				'item_index' => $m[ 'item_index' ],
453 453
 			);
454 454
 		}
455 455
 
456 456
 		// Update the row ID for later usage
457
-		$row['id'] = $duplicated_id;
457
+		$row[ 'id' ] = $duplicated_id;
458 458
 
459 459
 		/**
460 460
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -465,8 +465,8 @@  discard block
 block discarded – undo
465 465
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
466 466
 
467 467
 		foreach ( $save_this_meta as $data ) {
468
-			$data['form_id'] = $entry['form_id'];
469
-			$data['entry_id'] = $duplicated_id;
468
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
469
+			$data[ 'entry_id' ] = $duplicated_id;
470 470
 
471 471
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
472 472
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -500,13 +500,13 @@  discard block
 block discarded – undo
500 500
 	public function verify_nonce() {
501 501
 
502 502
 		// No duplicate entry request was made
503
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
503
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
504 504
 			return false;
505 505
 		}
506 506
 
507
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
507
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
508 508
 
509
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
509
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
510 510
 
511 511
 		/**
512 512
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
 			return '';
543 543
 		}
544 544
 
545
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
545
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
546 546
 	}
547 547
 
548 548
 	/**
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
597 597
 		$current_user = wp_get_current_user();
598 598
 
599
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
599
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
600 600
 
601 601
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
602 602
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -611,17 +611,17 @@  discard block
 block discarded – undo
611 611
 		if ( ! empty( $field ) ) {
612 612
 
613 613
 			// If capability is not defined, something is not right!
614
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
614
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
615 615
 
616 616
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
617 617
 
618 618
 				return false;
619 619
 			}
620 620
 
621
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
621
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
622 622
 
623 623
 				// Do not return true if cap is read, as we need to check if the current user created the entry
624
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
624
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
625 625
 					return true;
626 626
 				}
627 627
 
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 
635 635
 		}
636 636
 
637
-		if ( ! isset( $entry['created_by'] ) ) {
637
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
638 638
 
639 639
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
640 640
 
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 		}
660 660
 
661 661
 		// If the logged-in user is the same as the user who created the entry, we're good.
662
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
662
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
663 663
 
664 664
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
665 665
 
@@ -683,12 +683,12 @@  discard block
 block discarded – undo
683 683
 	 * @return void
684 684
 	 */
685 685
 	public function maybe_display_message( $current_view_id = 0 ) {
686
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
686
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
687 687
 			return;
688 688
 		}
689 689
 
690 690
 		// Entry wasn't duplicated from current View
691
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
691
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
692 692
 			return;
693 693
 		}
694 694
 
@@ -696,11 +696,11 @@  discard block
 block discarded – undo
696 696
 	}
697 697
 
698 698
 	public function display_message() {
699
-		if ( empty( $_GET['status'] ) || empty( $_GET['duplicate'] ) ) {
699
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
700 700
 			return;
701 701
 		}
702 702
 
703
-		$status = esc_attr( $_GET['status'] );
703
+		$status = esc_attr( $_GET[ 'status' ] );
704 704
 		$message_from_url = \GV\Utils::_GET( 'message' );
705 705
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
706 706
 		$class = '';
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
727 727
 
728 728
 		// DISPLAY ERROR/SUCCESS MESSAGE
729
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
729
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
730 730
 	}
731 731
 
732 732
 	/**
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 		?>
757 757
 		<span class="gv-duplicate">
758 758
 			|
759
-			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry['id'] ), self::get_nonce_key( $entry['id'] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
759
+			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry[ 'id' ] ), self::get_nonce_key( $entry[ 'id' ] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
760 760
 		</span>
761 761
 		<?php
762 762
 	}
@@ -778,9 +778,9 @@  discard block
 block discarded – undo
778 778
 
779 779
 		if ( 'success' === \GV\Utils::_GET( 'result' ) ) {
780 780
 			add_filter( 'gform_admin_messages', function( $messages ) {
781
-				$messages = (array) $messages;
781
+				$messages = (array)$messages;
782 782
 
783
-				$messages[] = esc_html__( 'Entry duplicated.', 'gravityview' );
783
+				$messages[ ] = esc_html__( 'Entry duplicated.', 'gravityview' );
784 784
 				return $messages;
785 785
 			} );
786 786
 		}
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 
792 792
 			$check_logs_message = '';
793 793
 
794
-			if( $is_logging_active ) {
794
+			if ( $is_logging_active ) {
795 795
 				$check_logs_message = sprintf( ' <a href="%s">%s</a>',
796 796
 					esc_url( admin_url( 'admin.php?page=gf_settings&subview=gravityformslogging' ) ),
797 797
 					esc_html_x( 'Check the GravityView logs for more information.', 'Error message links to logging page', 'gravityview' )
@@ -799,9 +799,9 @@  discard block
 block discarded – undo
799 799
 			}
800 800
 
801 801
 			add_filter( 'gform_admin_error_messages', function( $messages ) use ( $check_logs_message ) {
802
-				$messages = (array) $messages;
802
+				$messages = (array)$messages;
803 803
 
804
-				$messages[] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
804
+				$messages[ ] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
805 805
 
806 806
 				return $messages;
807 807
 			} );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-created-by.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -37,23 +37,23 @@  discard block
 block discarded – undo
37 37
 
38 38
 		$merge_tags = array(
39 39
 			array(
40
-				'label' => __('Entry Creator: Display Name', 'gravityview'),
40
+				'label' => __( 'Entry Creator: Display Name', 'gravityview' ),
41 41
 				'tag' => '{created_by:display_name}'
42 42
 			),
43 43
 			array(
44
-				'label' => __('Entry Creator: Email', 'gravityview'),
44
+				'label' => __( 'Entry Creator: Email', 'gravityview' ),
45 45
 				'tag' => '{created_by:user_email}'
46 46
 			),
47 47
 			array(
48
-				'label' => __('Entry Creator: Username', 'gravityview'),
48
+				'label' => __( 'Entry Creator: Username', 'gravityview' ),
49 49
 				'tag' => '{created_by:user_login}'
50 50
 			),
51 51
 			array(
52
-				'label' => __('Entry Creator: User ID', 'gravityview'),
52
+				'label' => __( 'Entry Creator: User ID', 'gravityview' ),
53 53
 				'tag' => '{created_by:ID}'
54 54
 			),
55 55
 			array(
56
-				'label' => __('Entry Creator: Roles', 'gravityview'),
56
+				'label' => __( 'Entry Creator: Roles', 'gravityview' ),
57 57
 				'tag' => '{created_by:roles}'
58 58
 			),
59 59
 		);
@@ -81,19 +81,19 @@  discard block
 block discarded – undo
81 81
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
82 82
 
83 83
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
84
-		if( empty( $matches ) || empty( $entry['created_by'] ) ) {
84
+		if ( empty( $matches ) || empty( $entry[ 'created_by' ] ) ) {
85 85
 			return $text;
86 86
 		}
87 87
 
88 88
 		// Get the creator of the entry
89
-		$entry_creator = new WP_User( $entry['created_by'] );
89
+		$entry_creator = new WP_User( $entry[ 'created_by' ] );
90 90
 
91 91
 		foreach ( $matches as $match ) {
92 92
 
93
-			$full_tag = $match[0];
94
-			$property = $match[1];
93
+			$full_tag = $match[ 0 ];
94
+			$property = $match[ 1 ];
95 95
 
96
-			switch( $property ) {
96
+			switch ( $property ) {
97 97
 				case '':
98 98
 					$value = $entry_creator->ID;
99 99
 					break;
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
 
120 120
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
121 121
 
122
-		if( 'edit' === $context ) {
122
+		if ( 'edit' === $context ) {
123 123
 			return $field_options;
124 124
 		}
125 125
 
126
-		$field_options['name_display'] = array(
126
+		$field_options[ 'name_display' ] = array(
127 127
 			'type' => 'select',
128 128
 			'label' => __( 'User Format', 'gravityview' ),
129 129
 			'desc' => __( 'How should the User information be displayed?', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-date-updated.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
49 49
 
50
-		if( 'edit' === $context ) {
50
+		if ( 'edit' === $context ) {
51 51
 			return $field_options;
52 52
 		}
53 53
 
54
-		$this->add_field_support('date_display', $field_options );
54
+		$this->add_field_support( 'date_display', $field_options );
55 55
 
56 56
 		return $field_options;
57 57
 	}
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
72 72
 
73 73
 		/** Overridden by a template. */
74
-		if( \GV\Utils::get( $field, 'field_path' ) !== gravityview()->plugin->dir( 'templates/fields/field-html.php' ) ) {
74
+		if ( \GV\Utils::get( $field, 'field_path' ) !== gravityview()->plugin->dir( 'templates/fields/field-html.php' ) ) {
75 75
 			return $output;
76 76
 		}
77 77
 
78
-		return GVCommon::format_date( $field['value'], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
78
+		return GVCommon::format_date( $field[ 'value' ], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
79 79
 	}
80 80
 }
81 81
 
Please login to merge, or discard this patch.