Completed
Pull Request — develop (#1504)
by Zack
16:09
created
includes/admin/class-gravityview-support-port.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function maybe_add_article_to_tooltip( $tooltip = '', $article = array(), $url = '', $atts = '', $css_class = '', $anchor_text = '' ) {
55 55
 
56
-		if ( empty( $article['id'] ) ) {
56
+		if ( empty( $article[ 'id' ] ) ) {
57 57
 			return $tooltip;
58 58
 		}
59 59
 
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
 
70 70
 		$css_class .= ' gv_tooltip';
71 71
 
72
-		if ( ! empty( $article['type'] ) ) {
73
-			$atts = sprintf( 'data-beacon-article-%s="%s"', $article['type'], $article['id'] );
72
+		if ( ! empty( $article[ 'type' ] ) ) {
73
+			$atts = sprintf( 'data-beacon-article-%s="%s"', $article[ 'type' ], $article[ 'id' ] );
74 74
 		} else {
75
-			$atts = sprintf( 'data-beacon-article="%s"', $article['id'] );
75
+			$atts = sprintf( 'data-beacon-article="%s"', $article[ 'id' ] );
76 76
 		}
77 77
 
78 78
 		$url = \GV\Utils::get( $article, 'url', '#' );
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
 		) );
172 172
 
173 173
 		// This is just HTML we don't need.
174
-		unset( $response['message'] );
174
+		unset( $response[ 'message' ] );
175 175
 
176
-		switch ( intval( $response['price_id'] ) ) {
176
+		switch ( intval( $response[ 'price_id' ] ) ) {
177 177
 			default:
178 178
 			case 1:
179 179
 				$package = 'Core';
@@ -199,12 +199,12 @@  discard block
 block discarded – undo
199 199
 			'email'                 => $current_user->user_email,
200 200
 			'name'                  => mb_substr( $current_user->display_name, 0, 80 ),
201 201
 			'signature'             => hash_hmac( 'sha256', $current_user->user_email, self::beacon_key ),
202
-			'License Key'           => $response['license_key'] . ' (' . ucwords( $response['license'] ) . ')',
202
+			'License Key'           => $response[ 'license_key' ] . ' (' . ucwords( $response[ 'license' ] ) . ')',
203 203
 			'License Level'         => $package,
204 204
 			'Alt Emails'            => sprintf( "Admin: %s, GV Support: %s", get_bloginfo( 'admin_email' ), gravityview()->plugin->settings->get( 'support-email' ) ),
205
-			'Payment Details'       => $response['customer_name'] . ' ' . $response['customer_email'],
205
+			'Payment Details'       => $response[ 'customer_name' ] . ' ' . $response[ 'customer_email' ],
206 206
 			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
207
-			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER['SERVER_SOFTWARE'] ),
207
+			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER[ 'SERVER_SOFTWARE' ] ),
208 208
 			'No-Conflict Mode'      => empty( $no_conflict_mode ) ? 'Disabled' : 'Enabled',
209 209
 			'GravityView Version'   => \GV\Plugin::$version,
210 210
 			'Gravity Forms Version' => GFForms::$version,
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		ob_get_clean();
215 215
 
216 216
 		// Help Scout length limit is 200 characters
217
-		foreach( $data as $key => $value ) {
217
+		foreach ( $data as $key => $value ) {
218 218
 			if ( ! is_string( $value ) ) {
219 219
                 continue;
220 220
 			}
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/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		$this->id         = $item_id;
76 76
 		$this->form_id    = $form_id;
77 77
 		$this->settings   = $settings;
78
-		$this->label_type = $item['label_type'];
78
+		$this->label_type = $item[ 'label_type' ];
79 79
 	}
80 80
 
81 81
 	/**
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 
120 120
 			foreach ( $field_info_items as $item ) {
121 121
 
122
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
122
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123 123
 					continue;
124 124
 				}
125 125
 
126
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
126
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
127 127
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
128 128
 				$output .= '<span class="' . $class . '">';
129
-				$output .= esc_html( $item['value'] );
129
+				$output .= esc_html( $item[ 'value' ] );
130 130
 				$output .= '</span>';
131 131
 			}
132 132
 
@@ -154,21 +154,21 @@  discard block
 block discarded – undo
154 154
 
155 155
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
156 156
 		// TODO: Un-hack this
157
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
158
-		$settings_link      = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
157
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
158
+		$settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
159 159
 
160 160
 		// Should we show the icon that the field is being used as a link to single entry?
161
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
161
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
162 162
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
163 163
 
164 164
 		// When a field label is empty, use the Field ID
165 165
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
166 166
 
167 167
 		// If there's a custom label, and show label is checked, use that as the field heading
168
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
169
-			$label = $this->settings['custom_label'];
170
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
171
-			$label = $this->item['customLabel'];
168
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
169
+			$label = $this->settings[ 'custom_label' ];
170
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
171
+			$label = $this->item[ 'customLabel' ];
172 172
 		}
173 173
 		$label = esc_attr( $label );
174 174
 
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
177 177
 		$output .= '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
178 178
 
179 179
 		$parent_label = '';
180
-		if ( ! empty( $this->item['parent'] ) ) {
181
-			$parent_label = ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
180
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
181
+			$parent_label = ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
182 182
 		}
183 183
 
184 184
 		// Name of field / widget
@@ -193,10 +193,10 @@  discard block
 block discarded – undo
193 193
 
194 194
 		$output .= '</h5>';
195 195
 
196
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
197
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
196
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
197
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
198 198
 
199
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
199
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
200 200
 
201 201
 		return $output;
202 202
 	}
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.
future/includes/class-gv-settings-addon.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * @return array
103 103
 	 */
104 104
 	public function modify_app_settings_menu_title( $setting_tabs ) {
105
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
105
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
106 106
 		return $setting_tabs;
107 107
 	}
108 108
 
@@ -308,15 +308,15 @@  discard block
 block discarded – undo
308 308
             </ul>
309 309
             <div class="gv-followup widefat">
310 310
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
311
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
311
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
312 312
             </div>
313 313
             <div class="scale-description">
314 314
                 <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
315 315
                 <ul class="inline">
316 316
 					<?php
317 317
 					$i = 0;
318
-					while( $i < 11 ) {
319
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
318
+					while ( $i < 11 ) {
319
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
320 320
 						$i++;
321 321
 					}
322 322
 					?>
@@ -549,15 +549,15 @@  discard block
 block discarded – undo
549 549
 	 * @return string The HTML
550 550
 	 */
551 551
 	public function as_html( $field, $echo = true ) {
552
-		$field['type']  = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit';
552
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
553 553
 
554 554
 		$attributes    = $this->get_field_attributes( $field );
555 555
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
556
-		$value         = $this->get( $field['name'], $default_value );
556
+		$value         = $this->get( $field[ 'name' ], $default_value );
557 557
 
558 558
 
559
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
560
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
559
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
560
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
561 561
 
562 562
 		if ( empty( $value ) ) {
563 563
 			$value = __( 'Update Settings', 'gravityview' );
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 		$attributes = $this->get_field_attributes( $field );
567 567
 
568 568
 		$html = '<input
569
-                    type="' . $field['type'] . '"
569
+                    type="' . $field[ 'type' ] . '"
570 570
                     name="' . esc_attr( $name ) . '"
571 571
                     value="' . $value . '" ' .
572 572
 		        implode( ' ', $attributes ) .
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	 * @return bool
598 598
 	 */
599 599
 	public function is_save_postback() {
600
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
600
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
601 601
 	}
602 602
 
603 603
 	/**
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 	 */
608 608
 	public function license_key_notice() {
609 609
 
610
-	    if( $this->is_save_postback() ) {
610
+	    if ( $this->is_save_postback() ) {
611 611
 		    $settings = $this->get_posted_settings();
612 612
 		    $license_key = defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get( $settings, 'license_key' );
613 613
 		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 		 * but didn't want to mess up the translation strings for the translators.
629 629
 		 */
630 630
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
631
-		$title = __( 'Inactive License', 'gravityview');
631
+		$title = __( 'Inactive License', 'gravityview' );
632 632
 		$status = '';
633 633
 		$update_below = false;
634 634
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
659 659
 				break;
660 660
 		}
661
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
661
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
662 662
 
663 663
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
664 664
 		if ( $update_below && gravityview()->request->is_admin( '', 'settings' ) ) {
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 	public function scripts() {
703 703
 		$scripts = parent::scripts();
704 704
 
705
-		$scripts[] = array(
705
+		$scripts[ ] = array(
706 706
 			'handle'  => 'gform_tooltip_init',
707 707
 			'enqueue' => array(
708 708
                 array(
@@ -721,7 +721,7 @@  discard block
 block discarded – undo
721 721
 	public function styles() {
722 722
 		$styles = parent::styles();
723 723
 
724
-		$styles[] = array(
724
+		$styles[ ] = array(
725 725
 			'handle'  => 'gravityview_settings',
726 726
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
727 727
 			'version' => Plugin::$version,
@@ -810,26 +810,26 @@  discard block
 block discarded – undo
810 810
 				'label' => __( 'License Key', 'gravityview' ),
811 811
 				'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
812 812
 				'type' => 'edd_license',
813
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
813
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
814 814
 				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
815
-				'default_value' => $default_settings['license_key'],
815
+				'default_value' => $default_settings[ 'license_key' ],
816 816
 				'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
817 817
 			),
818 818
 			array(
819 819
 				'name' => 'license_key_response',
820
-				'default_value' => $default_settings['license_key_response'],
820
+				'default_value' => $default_settings[ 'license_key_response' ],
821 821
 				'type' => 'hidden',
822 822
 			),
823 823
 			array(
824 824
 				'name' => 'license_key_status',
825
-				'default_value' => $default_settings['license_key_status'],
825
+				'default_value' => $default_settings[ 'license_key_status' ],
826 826
 				'type' => 'hidden',
827 827
 			),
828 828
 			array(
829 829
 				'name' => 'support-email',
830 830
 				'type' => 'text',
831 831
 				'validate' => 'email',
832
-				'default_value' => $default_settings['support-email'],
832
+				'default_value' => $default_settings[ 'support-email' ],
833 833
 				'label' => __( 'Support Email', 'gravityview' ),
834 834
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
835 835
 				'class' => 'code regular-text',
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
 				'name' => 'support_port',
842 842
 				'type' => 'radio',
843 843
 				'label' => __( 'Show Support Port?', 'gravityview' ),
844
-				'default_value' => $default_settings['support_port'],
844
+				'default_value' => $default_settings[ 'support_port' ],
845 845
 				'horizontal' => 1,
846 846
 				'choices' => array(
847 847
 					array(
@@ -860,7 +860,7 @@  discard block
 block discarded – undo
860 860
 				'name' => 'no-conflict-mode',
861 861
 				'type' => 'radio',
862 862
 				'label' => __( 'No-Conflict Mode', 'gravityview' ),
863
-				'default_value' => $default_settings['no-conflict-mode'],
863
+				'default_value' => $default_settings[ 'no-conflict-mode' ],
864 864
 				'horizontal' => 1,
865 865
 				'choices' => array(
866 866
 					array(
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
 					'name' => 'rest_api',
883 883
 					'type' => 'radio',
884 884
 					'label' => __( 'REST API', 'gravityview' ),
885
-					'default_value' => $default_settings['rest_api'],
885
+					'default_value' => $default_settings[ 'rest_api' ],
886 886
 					'horizontal' => 1,
887 887
 					'choices' => array(
888 888
 						array(
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
 				'name' => 'beta',
902 902
 				'type' => 'checkbox',
903 903
 				'label' => __( 'Become a Beta Tester', 'gravityview' ),
904
-				'default_value' => $default_settings['beta'],
904
+				'default_value' => $default_settings[ 'beta' ],
905 905
 				'horizontal' => 1,
906 906
 				'choices' => array(
907 907
 					array(
@@ -934,17 +934,17 @@  discard block
 block discarded – undo
934 934
 		 * @since 1.7.4
935 935
 		 */
936 936
 		foreach ( $fields as &$field ) {
937
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
938
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
939
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
940
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
937
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
938
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
939
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
940
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
941 941
 
942 942
 			if ( $disabled_attribute ) {
943
-				$field['disabled']  = $disabled_attribute;
943
+				$field[ 'disabled' ] = $disabled_attribute;
944 944
 			}
945 945
 
946
-			if ( empty( $field['disabled'] ) ) {
947
-				unset( $field['disabled'] );
946
+			if ( empty( $field[ 'disabled' ] ) ) {
947
+				unset( $field[ 'disabled' ] );
948 948
             }
949 949
 		}
950 950
 
@@ -962,7 +962,7 @@  discard block
 block discarded – undo
962 962
         );
963 963
 
964 964
 		if ( $disabled_attribute ) {
965
-			$button['disabled'] = $disabled_attribute;
965
+			$button[ 'disabled' ] = $disabled_attribute;
966 966
 		}
967 967
 
968 968
         /**
@@ -981,20 +981,20 @@  discard block
 block discarded – undo
981 981
 		// If there are extensions, add a section for them
982 982
 		if ( ! empty( $extension_sections ) ) {
983 983
 
984
-			if( $disabled_attribute ) {
984
+			if ( $disabled_attribute ) {
985 985
 				foreach ( $extension_sections as &$section ) {
986
-					foreach ( $section['fields'] as &$field ) {
987
-						$field['disabled'] = $disabled_attribute;
986
+					foreach ( $section[ 'fields' ] as &$field ) {
987
+						$field[ 'disabled' ] = $disabled_attribute;
988 988
 					}
989 989
 				}
990 990
 			}
991 991
 
992
-            $k = count( $extension_sections ) - 1 ;
993
-            $extension_sections[ $k ]['fields'][] = $button;
992
+            $k = count( $extension_sections ) - 1;
993
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
994 994
 			$sections = array_merge( $sections, $extension_sections );
995 995
 		} else {
996 996
             // add the 'update settings' button to the general section
997
-            $sections[0]['fields'][] = $button;
997
+            $sections[ 0 ][ 'fields' ][ ] = $button;
998 998
         }
999 999
 
1000 1000
 		return $sections;
@@ -1050,7 +1050,7 @@  discard block
 block discarded – undo
1050 1050
 	protected function settings_edd_license( $field, $echo = true ) {
1051 1051
 
1052 1052
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1053
-		    $field['input_type'] = 'password';
1053
+		    $field[ 'input_type' ] = 'password';
1054 1054
         }
1055 1055
 
1056 1056
 		$text = $this->settings_text( $field, false );
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
 	public function single_setting_row_html( $field ) {
1100 1100
 		?>
1101 1101
 
1102
-        <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1102
+        <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1103 1103
             <td colspan="2">
1104 1104
 				<?php $this->single_setting( $field ); ?>
1105 1105
             </td>
@@ -1117,10 +1117,10 @@  discard block
 block discarded – undo
1117 1117
 	 * @return string
1118 1118
 	 */
1119 1119
 	public function settings_save( $field, $echo = true ) {
1120
-		$field['type']  = 'submit';
1121
-		$field['name']  = 'gform-settings-save';
1122
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
1123
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1120
+		$field[ 'type' ]  = 'submit';
1121
+		$field[ 'name' ]  = 'gform-settings-save';
1122
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
1123
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1124 1124
 
1125 1125
 		$output = $this->settings_submit( $field, false );
1126 1126
 
@@ -1151,8 +1151,8 @@  discard block
 block discarded – undo
1151 1151
      * @return void
1152 1152
 	 */
1153 1153
 	public function single_setting_row( $field ) {
1154
-		$field['gv_description'] = Utils::get( $field, 'description' );
1155
-		$field['description']    = Utils::get( $field, 'subtitle' );
1154
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1155
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1156 1156
 		parent::single_setting_row( $field );
1157 1157
 	}
1158 1158
 
@@ -1164,7 +1164,7 @@  discard block
 block discarded – undo
1164 1164
 	public function single_setting_label( $field ) {
1165 1165
 		parent::single_setting_label( $field );
1166 1166
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
1167
-			echo '<span class="description">'. $description .'</span>';
1167
+			echo '<span class="description">' . $description . '</span>';
1168 1168
 		}
1169 1169
 	}
1170 1170
 
@@ -1209,10 +1209,10 @@  discard block
 block discarded – undo
1209 1209
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1210 1210
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
1211 1211
 
1212
-			unset( $posted_settings['license_key_response'] );
1213
-			unset( $posted_settings['license_key_status'] );
1212
+			unset( $posted_settings[ 'license_key_response' ] );
1213
+			unset( $posted_settings[ 'license_key_status' ] );
1214 1214
 
1215
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1215
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1216 1216
 
1217 1217
 			$added_message = true;
1218 1218
 		}
Please login to merge, or discard this patch.
includes/widgets/register-gravityview-widgets.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -16,17 +16,17 @@
 block discarded – undo
16 16
  */
17 17
 function gravityview_register_gravityview_widgets() {
18 18
 
19
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
19
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
20 20
 
21
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
22
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
23
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' );
24
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
25
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-gravityforms.php' );
26
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
21
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
22
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
23
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' );
24
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
25
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-gravityforms.php' );
26
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
27 27
 
28
-	if( class_exists('GFPolls') ) {
29
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
28
+	if ( class_exists( 'GFPolls' ) ) {
29
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
30 30
 	}
31 31
 
32 32
 }
Please login to merge, or discard this patch.