Completed
Pull Request — develop (#1511)
by
unknown
16:53
created
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +22 added lines, -22 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' ) ) {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$this->id         = $item_id;
77 77
 		$this->form_id    = $form_id;
78 78
 		$this->settings   = $settings;
79
-		$this->label_type = $item['label_type'];
79
+		$this->label_type = $item[ 'label_type' ];
80 80
 	}
81 81
 
82 82
 	/**
@@ -120,14 +120,14 @@  discard block
 block discarded – undo
120 120
 
121 121
 			foreach ( $field_info_items as $item ) {
122 122
 
123
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
124 124
 					continue;
125 125
 				}
126 126
 
127
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
127
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
128 128
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
129 129
 				$output .= '<span class="' . $class . '">';
130
-				$output .= esc_html( $item['value'] );
130
+				$output .= esc_html( $item[ 'value' ] );
131 131
 				$output .= '</span>';
132 132
 			}
133 133
 
@@ -155,26 +155,26 @@  discard block
 block discarded – undo
155 155
 
156 156
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
157 157
 		// TODO: Un-hack this
158
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
159
-		$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 );
158
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
159
+		$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 );
160 160
 
161 161
 		// Should we show the icon that the field is being used as a link to single entry?
162
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
162
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
163 163
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
164 164
 
165 165
 		// When a field label is empty, use the Field ID
166 166
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
167 167
 
168 168
 		// If there's a custom label, and show label is checked, use that as the field heading
169
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
170
-			$label = $this->settings['custom_label'];
171
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
172
-			$label = $this->item['customLabel'];
169
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
170
+			$label = $this->settings[ 'custom_label' ];
171
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
172
+			$label = $this->item[ 'customLabel' ];
173 173
 		}
174 174
 		$label = esc_attr( $label );
175 175
 
176
-		if ( $this->item['icon'] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
177
-			$label = '<i class="dashicons ' . esc_attr( $this->item['icon'] ) . '"></i> ' . $label;
176
+		if ( $this->item[ 'icon' ] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
177
+			$label = '<i class="dashicons ' . esc_attr( $this->item[ 'icon' ] ) . '"></i> ' . $label;
178 178
 		}
179 179
 
180 180
 		$output = '<button class="gv-add-field screen-reader-text">' . sprintf( esc_html__( 'Add "%s"', 'gravityview' ), $label ) . '</button>';
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
183 183
 
184 184
 		$parent_label = '';
185 185
 
186
-    if ( ! empty( $this->item['parent'] ) ) {
187
-			$parent_label = ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
186
+    if ( ! empty( $this->item[ 'parent' ] ) ) {
187
+			$parent_label = ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
188 188
 		}
189 189
 
190 190
 		// Name of field / widget
@@ -199,10 +199,10 @@  discard block
 block discarded – undo
199 199
 
200 200
 		$output .= '</h5>';
201 201
 
202
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
203
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
202
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
203
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
204 204
 
205
-		$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>';
205
+		$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>';
206 206
 
207 207
 		return $output;
208 208
 	}
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +185 added lines, -185 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers'), 10, 2 );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
73
+	    if ( ! gravityview()->request->is_view() ) {
74 74
 	        return $localization_data;
75 75
         }
76 76
 
77
-		$localization_data['suggest'] = array(
77
+		$localization_data[ 'suggest' ] = array(
78 78
             '57ef23539033602e61d4a560',
79 79
             '54c67bb9e4b0512429885513',
80 80
             '54c67bb9e4b0512429885512',
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
96 96
 		global $pagenow;
97 97
 
98
-		if ( !is_admin() ) {
98
+		if ( ! is_admin() ) {
99 99
 			return;
100 100
 		}
101 101
 
102
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
102
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
103 103
 
104
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
104
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -118,18 +118,18 @@  discard block
 block discarded – undo
118 118
 	function add_view_dropdown() {
119 119
 		$current_screen = get_current_screen();
120 120
 
121
-		if( 'gravityview' !== $current_screen->post_type ) {
121
+		if ( 'gravityview' !== $current_screen->post_type ) {
122 122
 			return;
123 123
 		}
124 124
 
125 125
 		$forms = gravityview_get_forms();
126 126
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
127 127
 		// If there are no forms to select, show no forms.
128
-		if( !empty( $forms ) ) { ?>
128
+		if ( ! empty( $forms ) ) { ?>
129 129
 			<select name="gravityview_form_id" id="gravityview_form_id">
130 130
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
131
-				<?php foreach( $forms as $form ) { ?>
132
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
131
+				<?php foreach ( $forms as $form ) { ?>
132
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
133 133
 				<?php } ?>
134 134
 			</select>
135 135
 		<?php }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
144 144
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
145
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
145
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
146 146
 	}
147 147
 
148 148
 	/**
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) {
165 165
 
166 166
 		// Don't show on Trashed forms
167
-		if( 'trash' === rgget( 'filter') ) {
167
+		if ( 'trash' === rgget( 'filter' ) ) {
168 168
 			return $menu_items;
169 169
 		}
170 170
 
@@ -172,13 +172,13 @@  discard block
 block discarded – undo
172 172
 
173 173
 		$priority = 0;
174 174
 
175
-		if( 'form_list' === GFForms::get_page() ) {
175
+		if ( 'form_list' === GFForms::get_page() ) {
176 176
 			$priority = 790;
177 177
         }
178 178
 
179
-		if( empty( $connected_views ) ) {
179
+		if ( empty( $connected_views ) ) {
180 180
 
181
-		    $menu_items['gravityview'] = array(
181
+		    $menu_items[ 'gravityview' ] = array(
182 182
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
183 183
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
184 184
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -194,22 +194,22 @@  discard block
 block discarded – undo
194 194
 		$sub_menu_items = array();
195 195
 		foreach ( (array)$connected_views as $view ) {
196 196
 
197
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
197
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
198 198
 				continue;
199 199
 			}
200 200
 
201
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
201
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
202 202
 
203
-			$sub_menu_items[] = array(
203
+			$sub_menu_items[ ] = array(
204 204
 				'label' => esc_attr( $label ),
205
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
205
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
206 206
 			);
207 207
 		}
208 208
 
209 209
 		// If there were no items added, then let's create the parent menu
210
-		if( $sub_menu_items ) {
210
+		if ( $sub_menu_items ) {
211 211
 
212
-		    $sub_menu_items[] = array(
212
+		    $sub_menu_items[ ] = array(
213 213
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
214 214
                 'link_class' => 'gv-create-view',
215 215
 			    'icon' => '<i>&nbsp;+&nbsp;</i>',
@@ -225,14 +225,14 @@  discard block
 block discarded – undo
225 225
 			if ( ! ( 'gf_edit_forms' === rgget( 'page' ) && '' === rgget( 'view' ) ) || version_compare( '2.5-beta', GFForms::$version, '>' ) ) {
226 226
 
227 227
 				// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
228
-				$sub_menu_items[] = array(
228
+				$sub_menu_items[ ] = array(
229 229
 					'url' => '#',
230 230
 					'label' => '',
231 231
 					'menu_class' => 'hidden',
232 232
 					'capabilities' => '',
233 233
 				);
234 234
 
235
-				$menu_items['gravityview'] = array(
235
+				$menu_items[ 'gravityview' ] = array(
236 236
 					'label'          => __( 'Connected Views', 'gravityview' ),
237 237
 					'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
238 238
 					'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 
247 247
 			} else {
248 248
 
249
-				$menu_items[ 'gravityview'] = array(
249
+				$menu_items[ 'gravityview' ] = array(
250 250
 					'label' => __( 'Connected Views', 'gravityview' ),
251 251
 					'url'   => '#gravityview-group-heading',
252 252
 					'icon'  => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
@@ -282,8 +282,8 @@  discard block
 block discarded – undo
282 282
 		$add = array( 'captcha', 'page' );
283 283
 
284 284
 		// Don't allowing editing the following values:
285
-		if( $context === 'edit' ) {
286
-			$add[] = 'post_id';
285
+		if ( $context === 'edit' ) {
286
+			$add[ ] = 'post_id';
287 287
 		}
288 288
 
289 289
 		$return = array_merge( $array, $add );
@@ -306,27 +306,27 @@  discard block
 block discarded – undo
306 306
 		foreach ( $default_args as $key => $arg ) {
307 307
 
308 308
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
309
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
309
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
310 310
 
311 311
 			// By default, use `tooltip` if defined.
312
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
312
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
313 313
 
314 314
 			// If there's no tooltip set, continue
315
-			if( empty( $tooltip ) ) {
315
+			if ( empty( $tooltip ) ) {
316 316
 				continue;
317 317
 			}
318 318
 
319 319
 			// Add the tooltip
320
-			$gv_tooltips[ 'gv_'.$key ] = array(
321
-				'title'	=> $arg['label'],
320
+			$gv_tooltips[ 'gv_' . $key ] = array(
321
+				'title'	=> $arg[ 'label' ],
322 322
 				'value'	=> $tooltip,
323 323
 			);
324 324
 
325 325
 		}
326 326
 
327
-		$gv_tooltips['gv_css_merge_tags'] = array(
328
-			'title' => __('CSS Merge Tags', 'gravityview'),
329
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
327
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
328
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
329
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
330 330
 		);
331 331
 
332 332
 		/**
@@ -344,9 +344,9 @@  discard block
 block discarded – undo
344 344
 
345 345
 		foreach ( $gv_tooltips as $key => $tooltip ) {
346 346
 
347
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
347
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
348 348
 
349
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
349
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
350 350
 		}
351 351
 
352 352
 		return $tooltips;
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 	 *
361 361
 	 * @return void
362 362
 	 */
363
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
363
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
364 364
 
365 365
 		$output = '';
366 366
 
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
383 383
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
384 384
 
385
-				$output = $template ? $template['label'] : $template_id_pretty;
385
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
386 386
 
387 387
 				break;
388 388
 
@@ -423,44 +423,44 @@  discard block
 block discarded – undo
423 423
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
424 424
 
425 425
 		// Either the form is empty or the form ID is 0, not yet set.
426
-		if( empty( $form ) ) {
426
+		if ( empty( $form ) ) {
427 427
 			return '';
428 428
 		}
429 429
 
430 430
 		// The $form is passed as the form ID
431
-		if( !is_array( $form ) ) {
431
+		if ( ! is_array( $form ) ) {
432 432
 			$form = gravityview_get_form( $form );
433 433
 		}
434 434
 
435
-		$form_id = $form['id'];
435
+		$form_id = $form[ 'id' ];
436 436
 		$links = array();
437 437
 
438
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
438
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
439 439
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
440
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
441
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
440
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
441
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
442 442
 		} else {
443
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
443
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
444 444
 		}
445 445
 
446
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
446
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
447 447
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
448
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
448
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
449 449
 		}
450 450
 
451
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
451
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
452 452
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
453
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
453
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
454 454
 		}
455 455
 
456
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
456
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
457 457
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
458
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
458
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
459 459
 		}
460 460
 
461 461
 		$output = '';
462 462
 
463
-		if( !empty( $include_form_link ) ) {
463
+		if ( ! empty( $include_form_link ) ) {
464 464
 			$output .= $form_link;
465 465
 		}
466 466
 
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 		 */
473 473
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
474 474
 
475
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
475
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
476 476
 
477 477
 		return $output;
478 478
 	}
@@ -486,8 +486,8 @@  discard block
 block discarded – undo
486 486
 		// Get the date column and save it for later to add back in.
487 487
 		// This adds it after the Data Source column.
488 488
 		// This way, we don't need to do array_slice, array_merge, etc.
489
-		$date = $columns['date'];
490
-		unset( $columns['date'] );
489
+		$date = $columns[ 'date' ];
490
+		unset( $columns[ 'date' ] );
491 491
 
492 492
 		$data_source_required_caps = array(
493 493
 			'gravityforms_edit_forms',
@@ -498,14 +498,14 @@  discard block
 block discarded – undo
498 498
 			'gravityforms_preview_forms',
499 499
 		);
500 500
 
501
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
502
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
501
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
502
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
503 503
 		}
504 504
 
505
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
505
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
506 506
 
507 507
 		// Add the date back in.
508
-		$columns['date'] = $date;
508
+		$columns[ 'date' ] = $date;
509 509
 
510 510
 		return $columns;
511 511
 	}
@@ -518,12 +518,12 @@  discard block
 block discarded – undo
518 518
 	 */
519 519
 	function save_postdata( $post_id ) {
520 520
 
521
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
521
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
522 522
 			return;
523 523
 		}
524 524
 
525 525
 		// validate post_type
526
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
526
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
527 527
 			return;
528 528
 		}
529 529
 
@@ -538,63 +538,63 @@  discard block
 block discarded – undo
538 538
 		$statii = array();
539 539
 
540 540
 		// check if this is a start fresh View
541
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
541
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
542 542
 
543
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
543
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
544 544
 			// save form id
545
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
545
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
546 546
 
547 547
 		}
548 548
 
549
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
549
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
550 550
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
551 551
 			return;
552 552
 		}
553 553
 
554 554
 		// Was this a start fresh?
555
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
556
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
555
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
556
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
557 557
 		} else {
558
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
558
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
559 559
 		}
560 560
 
561 561
 		// Check if we have a template id
562
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
562
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
563 563
 
564
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
564
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
565 565
 
566 566
 			// now save template id
567
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
567
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
568 568
 		}
569 569
 
570 570
 
571 571
 		// save View Configuration metabox
572
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
572
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
573 573
 
574 574
 			// template settings
575
-			if( empty( $_POST['template_settings'] ) ) {
576
-				$_POST['template_settings'] = array();
575
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
576
+				$_POST[ 'template_settings' ] = array();
577 577
 			}
578
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
578
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
579 579
 
580 580
 			// guard against unloaded View configuration page
581
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
581
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
582 582
 				$fields = array();
583 583
 
584
-				if ( ! empty( $_POST['gv_fields'] ) ) {
584
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
585 585
 					$fields = _gravityview_process_posted_fields();
586 586
 				}
587 587
 
588 588
 				$fields = wp_slash( $fields );
589 589
 
590
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
590
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
591 591
 			}
592 592
 
593 593
 			// Directory Visible Widgets
594
-			if( empty( $_POST['widgets'] ) ) {
595
-				$_POST['widgets'] = array();
594
+			if ( empty( $_POST[ 'widgets' ] ) ) {
595
+				$_POST[ 'widgets' ] = array();
596 596
 			}
597
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
597
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
598 598
 
599 599
 		} // end save view configuration
600 600
 
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
605 605
 		 * @since 1.17.2
606 606
 		 */
607
-		do_action('gravityview_view_saved', $post_id, $statii );
607
+		do_action( 'gravityview_view_saved', $post_id, $statii );
608 608
 
609 609
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
610 610
 	}
@@ -649,20 +649,20 @@  discard block
 block discarded – undo
649 649
 
650 650
 		$output = '';
651 651
 
652
-		if( !empty( $fields ) ) {
652
+		if ( ! empty( $fields ) ) {
653 653
 
654
-			foreach( $fields as $id => $details ) {
654
+			foreach ( $fields as $id => $details ) {
655 655
 
656
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
656
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
657 657
 					continue;
658 658
 				}
659 659
 
660 660
 				// Edit mode only allows editing the parent fields, not single inputs.
661
-				if( $context === 'edit' && ! empty( $details['parent'] ) ) {
661
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
662 662
 					continue;
663 663
 				}
664 664
 
665
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, array(), $form );
665
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form );
666 666
 
667 667
 			} // End foreach
668 668
 		}
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
670 670
 		echo $output;
671 671
 
672 672
 		// For the EDIT view we only want to allow the form fields.
673
-		if( $context === 'edit' ) {
673
+		if ( $context === 'edit' ) {
674 674
 			return;
675 675
 		}
676 676
 
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
 		$additional_fields = array(
690 690
 			array(
691 691
 				'label_text' => '+ ' . __( 'Add All Form Fields', 'gravityview' ),
692
-				'desc' => __('Insert all the form fields at once.', 'gravityview'),
692
+				'desc' => __( 'Insert all the form fields at once.', 'gravityview' ),
693 693
 				'field_id' => 'all-fields',
694 694
 				'label_type' => 'field',
695 695
 				'input_type' => null,
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 		 */
706 706
 		$additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields );
707 707
 
708
-		foreach ( (array) $additional_fields as $item ) {
708
+		foreach ( (array)$additional_fields as $item ) {
709 709
 
710 710
 			// Prevent items from not having index set
711 711
 			$item = wp_parse_args( $item, array(
@@ -716,16 +716,16 @@  discard block
 block discarded – undo
716 716
 				'field_options' => null,
717 717
 				'settings_html'	=> null,
718 718
 				'icon' => null,
719
-			));
719
+			) );
720 720
 
721 721
 			// Backward compat.
722
-			if( !empty( $item['field_options'] ) ) {
722
+			if ( ! empty( $item[ 'field_options' ] ) ) {
723 723
 				// Use settings_html from now on.
724
-				$item['settings_html'] = $item['field_options'];
724
+				$item[ 'settings_html' ] = $item[ 'field_options' ];
725 725
 			}
726 726
 
727 727
 			// Render a label for each of them
728
-			echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
728
+			echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
729 729
 
730 730
 		}
731 731
 
@@ -737,59 +737,59 @@  discard block
 block discarded – undo
737 737
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
738 738
 	 * @return array
739 739
 	 */
740
-	function get_entry_default_fields($form, $zone) {
740
+	function get_entry_default_fields( $form, $zone ) {
741 741
 
742 742
 		$entry_default_fields = array();
743 743
 
744
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
744
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
745 745
 
746 746
 			$entry_default_fields = array(
747 747
 				'id' => array(
748
-					'label' => __('Entry ID', 'gravityview'),
748
+					'label' => __( 'Entry ID', 'gravityview' ),
749 749
 					'type' => 'id',
750
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
750
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
751 751
 				),
752 752
 				'date_created' => array(
753
-					'label' => __('Entry Date', 'gravityview'),
754
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
753
+					'label' => __( 'Entry Date', 'gravityview' ),
754
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
755 755
 					'type' => 'date_created',
756 756
 				),
757 757
 				'date_updated' => array(
758
-						'label' => __( 'Date Updated', 'gravityview'),
759
-						'desc'	=> __('The date the entry was last updated.', 'gravityview'),
758
+						'label' => __( 'Date Updated', 'gravityview' ),
759
+						'desc'	=> __( 'The date the entry was last updated.', 'gravityview' ),
760 760
 						'type' => 'date_updated',
761 761
 				),
762 762
 				'source_url' => array(
763
-					'label' => __('Source URL', 'gravityview'),
763
+					'label' => __( 'Source URL', 'gravityview' ),
764 764
 					'type' => 'source_url',
765
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
765
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
766 766
 				),
767 767
 				'ip' => array(
768
-					'label' => __('User IP', 'gravityview'),
768
+					'label' => __( 'User IP', 'gravityview' ),
769 769
 					'type' => 'ip',
770
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
770
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
771 771
 				),
772 772
 				'created_by' => array(
773
-					'label' => __('User', 'gravityview'),
773
+					'label' => __( 'User', 'gravityview' ),
774 774
 					'type' => 'created_by',
775
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
775
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
776 776
 				),
777 777
 
778 778
 				/**
779 779
 				 * @since 1.7.2
780 780
 				 */
781 781
 			    'other_entries' => array(
782
-				    'label'	=> __('Other Entries', 'gravityview'),
782
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
783 783
 				    'type'	=> 'other_entries',
784
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
784
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
785 785
 			    ),
786 786
 	        );
787 787
 
788
-			if( 'single' !== $zone) {
788
+			if ( 'single' !== $zone ) {
789 789
 
790
-				$entry_default_fields['entry_link'] = array(
791
-					'label' => __('Link to Entry', 'gravityview'),
792
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
790
+				$entry_default_fields[ 'entry_link' ] = array(
791
+					'label' => __( 'Link to Entry', 'gravityview' ),
792
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
793 793
 					'type' => 'entry_link',
794 794
 				);
795 795
 			}
@@ -799,19 +799,19 @@  discard block
 block discarded – undo
799 799
 		/**
800 800
 		 * @since  1.2
801 801
 		 */
802
-		$entry_default_fields['custom']	= array(
803
-			'label'	=> __('Custom Content', 'gravityview'),
802
+		$entry_default_fields[ 'custom' ] = array(
803
+			'label'	=> __( 'Custom Content', 'gravityview' ),
804 804
 			'type'	=> 'custom',
805
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
805
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
806 806
 		);
807 807
 
808 808
 		/**
809 809
 		 * @since develop
810 810
 		 */
811
-		$entry_default_fields['sequence'] = array(
812
-			'label'	=> __('Result Number', 'gravityview'),
811
+		$entry_default_fields[ 'sequence' ] = array(
812
+			'label'	=> __( 'Result Number', 'gravityview' ),
813 813
 			'type'	=> 'sequence',
814
-			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'),
814
+			'desc'	=> __( 'Display a sequential result number for each entry.', 'gravityview' ),
815 815
 		);
816 816
 
817 817
 		/**
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 		 * @param  string|array $form form_ID or form object
821 821
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
822 822
 		 */
823
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
823
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
824 824
 	}
825 825
 
826 826
 	/**
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
 	 */
832 832
 	function get_available_fields( $form = '', $zone = NULL ) {
833 833
 
834
-		if( empty( $form ) ) {
834
+		if ( empty( $form ) ) {
835 835
 			gravityview()->log->error( '$form is empty' );
836 836
 			return array();
837 837
 		}
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
840 840
 		$fields = gravityview_get_form_fields( $form, true );
841 841
 
842 842
 		// get meta fields ( only if form was already created )
843
-		if( !is_array( $form ) ) {
843
+		if ( ! is_array( $form ) ) {
844 844
 			$meta_fields = gravityview_get_entry_meta( $form );
845 845
 		} else {
846 846
 			$meta_fields = array();
@@ -853,14 +853,14 @@  discard block
 block discarded – undo
853 853
 		$fields = $fields + $meta_fields + $default_fields;
854 854
 
855 855
 		// Move Custom Content to top
856
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
856
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
857 857
 
858 858
 		$gv_fields = GravityView_Fields::get_all();
859 859
 
860 860
 		foreach ( $fields as &$field ) {
861 861
 			foreach ( $gv_fields as $gv_field ) {
862
-				if ( $field['type'] === $gv_field->name ) {
863
-					$field['icon'] = $gv_field->icon;
862
+				if ( $field[ 'type' ] === $gv_field->name ) {
863
+					$field[ 'icon' ] = $gv_field->icon;
864 864
 				}
865 865
 			}
866 866
 		}
@@ -883,11 +883,11 @@  discard block
 block discarded – undo
883 883
 
884 884
 		$widgets = $this->get_registered_widgets();
885 885
 
886
-		if( !empty( $widgets ) ) {
886
+		if ( ! empty( $widgets ) ) {
887 887
 
888
-			foreach( $widgets as $id => $details ) {
888
+			foreach ( $widgets as $id => $details ) {
889 889
 
890
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
890
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
891 891
 
892 892
 			}
893 893
 		}
@@ -916,7 +916,7 @@  discard block
 block discarded – undo
916 916
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
917 917
 		global $post;
918 918
 
919
-		if( $type === 'widget' ) {
919
+		if ( $type === 'widget' ) {
920 920
 			$button_label = __( 'Add Widget', 'gravityview' );
921 921
 		} else {
922 922
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -942,10 +942,10 @@  discard block
 block discarded – undo
942 942
 		$form_id = null;
943 943
 
944 944
 		// if saved values, get available fields to label everyone
945
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
945
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
946 946
 
947
-			if( !empty( $_POST['template_id'] ) ) {
948
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
947
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
948
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
949 949
 			} else {
950 950
 				$form_id = $form = gravityview_get_form_id( $post->ID );
951 951
 			}
@@ -963,42 +963,42 @@  discard block
 block discarded – undo
963 963
 			}
964 964
 		}
965 965
 
966
-		foreach( $rows as $row ) :
967
-			foreach( $row as $col => $areas ) :
968
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
966
+		foreach ( $rows as $row ) :
967
+			foreach ( $row as $col => $areas ) :
968
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
969 969
 
970 970
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
971 971
 
972
-					<?php foreach( $areas as $area ) : 	?>
972
+					<?php foreach ( $areas as $area ) : 	?>
973 973
 
974
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
975
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
974
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
975
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
976 976
 								<?php // render saved fields
977
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
977
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
978 978
 
979
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
979
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
980 980
 
981 981
 										// Maybe has a form ID
982
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
982
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
983 983
 
984 984
 										$input_type = NULL;
985 985
 
986 986
 										if ( $form_id ) {
987
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
987
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
988 988
                                         } else {
989
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
989
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
990 990
                                         }
991 991
 
992
-										if ( !$original_item ) {
993
-											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
992
+										if ( ! $original_item ) {
993
+											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) );
994 994
 
995 995
 											$original_item = $field;
996 996
 										} else {
997
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
997
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
998 998
 										}
999 999
 
1000 1000
 										// Field options dialog box
1001
-										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
1001
+										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
1002 1002
 
1003 1003
 										$item = array(
1004 1004
 											'input_type' => $input_type,
@@ -1011,22 +1011,22 @@  discard block
 block discarded – undo
1011 1011
 											$item = wp_parse_args( $item, $original_item );
1012 1012
 										}
1013 1013
 
1014
-										switch( $type ) {
1014
+										switch ( $type ) {
1015 1015
 											case 'widget':
1016
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
1016
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
1017 1017
 												break;
1018 1018
 											default:
1019
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
1019
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
1020 1020
 										}
1021 1021
 									}
1022 1022
 
1023 1023
 								} // End if zone is not empty ?>
1024 1024
 
1025
-								<span class="drop-message"><?php echo sprintf( esc_html__('"+ %s" or drag existing %ss here.', 'gravityview'), esc_html( $button_label ), esc_html( $type ) ); ?></span>
1025
+								<span class="drop-message"><?php echo sprintf( esc_html__( '"+ %s" or drag existing %ss here.', 'gravityview' ), esc_html( $button_label ), esc_html( $type ) ); ?></span>
1026 1026
 							</div>
1027 1027
 							<div class="gv-droppable-area-action">
1028
-								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></button>
1029
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
1028
+								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></button>
1029
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
1030 1030
 							</div>
1031 1031
 						</div>
1032 1032
 
@@ -1054,7 +1054,7 @@  discard block
 block discarded – undo
1054 1054
 				// This is a new View, prefill the widgets
1055 1055
 				$widgets = array(
1056 1056
 					'header_top' => array(
1057
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
1057
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
1058 1058
 							'id' => 'search_bar',
1059 1059
 							'label' => __( 'Search Bar', 'gravityview' ),
1060 1060
 							'search_layout' => 'horizontal',
@@ -1129,12 +1129,12 @@  discard block
 block discarded – undo
1129 1129
 		if ( $post ) {
1130 1130
 			$source_form_id = gravityview_get_form_id( $post->ID );
1131 1131
 			if ( $source_form_id ) {
1132
-				$form_ids[] = $source_form_id;
1132
+				$form_ids[ ] = $source_form_id;
1133 1133
 			}
1134 1134
 
1135 1135
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
1136 1136
 			foreach ( $joined_forms as $joined_form ) {
1137
-				$form_ids[] = $joined_form->ID;
1137
+				$form_ids[ ] = $joined_form->ID;
1138 1138
 			}
1139 1139
 		}
1140 1140
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
 	 * @return string HTML of the active areas
1169 1169
 	 */
1170 1170
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1171
-		if( empty( $template_id ) ) {
1171
+		if ( empty( $template_id ) ) {
1172 1172
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1173 1173
 			return '';
1174 1174
 		}
@@ -1182,12 +1182,12 @@  discard block
 block discarded – undo
1182 1182
 		 */
1183 1183
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1184 1184
 
1185
-		if( empty( $template_areas ) ) {
1185
+		if ( empty( $template_areas ) ) {
1186 1186
 
1187 1187
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1188 1188
 			$output = '<div>';
1189
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
1190
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
1189
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
1190
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
1191 1191
 			$output .= '</div>';
1192 1192
 		} else {
1193 1193
 
@@ -1202,7 +1202,7 @@  discard block
 block discarded – undo
1202 1202
 
1203 1203
 		}
1204 1204
 
1205
-		if( $echo ) {
1205
+		if ( $echo ) {
1206 1206
 			echo $output;
1207 1207
 		}
1208 1208
 
@@ -1230,30 +1230,30 @@  discard block
 block discarded – undo
1230 1230
 		}
1231 1231
 
1232 1232
 		// Add the GV font (with the Astronaut)
1233
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1233
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1234 1234
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1235 1235
 
1236
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1236
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1237 1237
 
1238
-		if( GFForms::get_page() === 'form_list' ) {
1238
+		if ( GFForms::get_page() === 'form_list' ) {
1239 1239
 			wp_enqueue_style( 'gravityview_views_styles' );
1240 1240
 			return;
1241 1241
         }
1242 1242
 
1243 1243
 		// Don't process any scripts below here if it's not a GravityView page.
1244
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1244
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1245 1245
 		    return;
1246 1246
 		}
1247 1247
 
1248 1248
         wp_enqueue_script( 'jquery-ui-datepicker' );
1249
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1249
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1250 1250
 
1251 1251
         // Enqueue scripts
1252 1252
         wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1253 1253
 
1254
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1254
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1255 1255
             'cookiepath' => COOKIEPATH,
1256
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1256
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1257 1257
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1258 1258
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1259 1259
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1268,7 +1268,7 @@  discard block
 block discarded – undo
1268 1268
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1269 1269
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1270 1270
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1271
-        ));
1271
+        ) );
1272 1272
 
1273 1273
 		wp_enqueue_style( 'gravityview_views_styles' );
1274 1274
 
@@ -1295,7 +1295,7 @@  discard block
 block discarded – undo
1295 1295
 		);
1296 1296
 
1297 1297
 		if ( wp_is_mobile() ) {
1298
-		    $scripts[] = 'jquery-touch-punch';
1298
+		    $scripts[ ] = 'jquery-touch-punch';
1299 1299
 		}
1300 1300
 
1301 1301
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
includes/extensions/delete-entry/fields/delete_link.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@
 block discarded – undo
12 12
 extract( $gravityview_view->getCurrentField() );
13 13
 
14 14
 // Only show the link to logged-in users with the right caps.
15
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
15
+if ( ! GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
16 16
 	return;
17 17
 }
18 18
 
19
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
19
+$link_text = empty( $field_settings[ 'delete_link' ] ) ? __( 'Delete Entry', 'gravityview' ) : $field_settings[ 'delete_link' ];
20 20
 
21 21
 $link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
22 22
 
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
 		// Index 100 is the default GravityView template path.
167 167
 		// Index 110 is Edit Entry link
168
-		$file_paths[115] = self::$file;
168
+		$file_paths[ 115 ] = self::$file;
169 169
 
170 170
 		return $file_paths;
171 171
 	}
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
 		$attributes = array(
271 271
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
272
-			'tabindex' => ( GFCommon::$tab_index ++ ),
272
+			'tabindex' => ( GFCommon::$tab_index++ ),
273 273
 			'onclick' => self::get_confirm_dialog(),
274 274
 		);
275 275
 
@@ -305,12 +305,12 @@  discard block
 block discarded – undo
305 305
 		);
306 306
 
307 307
 		// If the form is not submitted, return early
308
-		if ( 'delete' !== $get_fields['action'] || empty( $get_fields['entry_id'] ) ) {
308
+		if ( 'delete' !== $get_fields[ 'action' ] || empty( $get_fields[ 'entry_id' ] ) ) {
309 309
 			return;
310 310
 		}
311 311
 
312 312
 		// Make sure it's a GravityView request
313
-		$valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) );
313
+		$valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) );
314 314
 
315 315
 		if ( ! $valid_nonce_key ) {
316 316
 			gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
@@ -319,10 +319,10 @@  discard block
 block discarded – undo
319 319
 		}
320 320
 
321 321
 		// Get the entry slug
322
-		$entry_slug = esc_attr( $get_fields['entry_id'] );
322
+		$entry_slug = esc_attr( $get_fields[ 'entry_id' ] );
323 323
 
324 324
 		// Redirect after deleting the entry.
325
-		$view = \GV\View::by_id( $get_fields['view_id'] );
325
+		$view = \GV\View::by_id( $get_fields[ 'view_id' ] );
326 326
 
327 327
 		// See if there's an entry there
328 328
 		$entry = gravityview_get_entry( $entry_slug, true, false, $view );
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
 			$this->_redirect_and_exit( $delete_redirect_base, $delete_response->get_error_message(), 'error' );
350 350
 		}
351 351
 
352
-		if ( (int) $view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
352
+		if ( (int)$view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
353 353
 
354
-			$form                 = GFAPI::get_form( $entry['form_id'] );
354
+			$form                 = GFAPI::get_form( $entry[ 'form_id' ] );
355 355
 			$redirect_url_setting = $view->settings->get( 'delete_redirect_url' );
356 356
 			$redirect_url         = GFCommon::replace_variables( $redirect_url_setting, $form, $entry, false, false, false, 'text' );
357 357
 
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 	 */
428 428
 	private function delete_or_trash_entry( $entry ) {
429 429
 
430
-		$entry_id = $entry['id'];
430
+		$entry_id = $entry[ 'id' ];
431 431
 
432 432
 		$mode = $this->get_delete_mode();
433 433
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
492 492
 
493 493
 		// The entry had no connected post
494
-		if ( empty( $entry['post_id'] ) ) {
494
+		if ( empty( $entry[ 'post_id' ] ) ) {
495 495
 			return;
496 496
 		}
497 497
 
@@ -509,9 +509,9 @@  discard block
 block discarded – undo
509 509
 		$action = current_action();
510 510
 
511 511
 		if ( 'gravityview/delete-entry/deleted' === $action ) {
512
-			$result = wp_delete_post( $entry['post_id'], true );
512
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
513 513
 		} else {
514
-			$result = wp_trash_post( $entry['post_id'] );
514
+			$result = wp_trash_post( $entry[ 'post_id' ] );
515 515
 		}
516 516
 
517 517
 		if ( false === $result ) {
@@ -542,13 +542,13 @@  discard block
 block discarded – undo
542 542
 	public function verify_nonce() {
543 543
 
544 544
 		// No delete entry request was made
545
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
545
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
546 546
 			return false;
547 547
 		}
548 548
 
549
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
549
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
550 550
 
551
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
551
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
552 552
 
553 553
 		/**
554 554
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
605 605
 		}
606 606
 
607
-		if ( $entry['status'] === 'trash' ) {
607
+		if ( $entry[ 'status' ] === 'trash' ) {
608 608
 			if ( 'trash' === $this->get_delete_mode() ) {
609 609
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
610 610
 			} else {
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 
649 649
 		$current_user = wp_get_current_user();
650 650
 
651
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
651
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
652 652
 
653 653
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
654 654
 		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
@@ -662,17 +662,17 @@  discard block
 block discarded – undo
662 662
 		if ( ! empty( $field ) ) {
663 663
 
664 664
 			// If capability is not defined, something is not right!
665
-			if ( empty( $field['allow_edit_cap'] ) ) {
665
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
666 666
 
667 667
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
668 668
 
669 669
 				return false;
670 670
 			}
671 671
 
672
-			if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
672
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
673 673
 
674 674
 				// Do not return true if cap is read, as we need to check if the current user created the entry
675
-				if ( $field['allow_edit_cap'] !== 'read' ) {
675
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
676 676
 					return true;
677 677
 				}
678 678
 			} else {
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 			}
684 684
 		}
685 685
 
686
-		if ( ! isset( $entry['created_by'] ) ) {
686
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
687 687
 
688 688
 			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
689 689
 
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 		}
700 700
 
701 701
 		// If the logged-in user is the same as the user who created the entry, we're good.
702
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
702
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
703 703
 
704 704
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
705 705
 
@@ -724,12 +724,12 @@  discard block
 block discarded – undo
724 724
 	 */
725 725
 	public function maybe_display_message( $current_view_id = 0 ) {
726 726
 
727
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
727
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
728 728
 			return;
729 729
 		}
730 730
 
731 731
 		// Entry wasn't deleted from current View
732
-		if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
732
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
733 733
 			return;
734 734
 		}
735 735
 
@@ -738,11 +738,11 @@  discard block
 block discarded – undo
738 738
 
739 739
 	public function display_message() {
740 740
 
741
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
741
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
742 742
 			return;
743 743
 		}
744 744
 
745
-		$status = esc_attr( $_GET['status'] );
745
+		$status = esc_attr( $_GET[ 'status' ] );
746 746
 		$message_from_url = \GV\Utils::_GET( 'message' );
747 747
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
748 748
 		$class = '';
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry-admin.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -83,9 +83,9 @@  discard block
 block discarded – undo
83 83
 		if ( $field_id === 'delete_link' ) {
84 84
 
85 85
 			// Remove other built-in caps.
86
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
86
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
87 87
 
88
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
88
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
89 89
 		}
90 90
 
91 91
 		return $caps;
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
 	public function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
109 109
 
110 110
 		// Always a link, never a filter
111
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
111
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
112 112
 
113 113
 		// Delete Entry link should only appear to visitors capable of editing entries
114
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
114
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
115 115
 
116
-		$add_option['delete_link'] = array(
116
+		$add_option[ 'delete_link' ] = array(
117 117
 			'type'       => 'text',
118 118
 			'label'      => __( 'Delete Link Text', 'gravityview' ),
119 119
 			'desc'       => null,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			'merge_tags' => true,
122 122
 		);
123 123
 
124
-		$field_options['allow_edit_cap'] = array(
124
+		$field_options[ 'allow_edit_cap' ] = array(
125 125
 			'type'    => 'select',
126 126
 			'label'   => __( 'Allow the following users to delete the entry:', 'gravityview' ),
127 127
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 */
147 147
 	public function add_available_field( $available_fields = array() ) {
148 148
 
149
-		$available_fields['delete_link'] = array(
149
+		$available_fields[ 'delete_link' ] = array(
150 150
 			'label_text'    => __( 'Delete Entry', 'gravityview' ),
151 151
 			'field_id'      => 'delete_link',
152 152
 			'label_type'    => 'field',
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
189 189
 
190 190
 		if ( 'edit' !== $zone ) {
191
-			$entry_default_fields['delete_link'] = array(
191
+			$entry_default_fields[ 'delete_link' ] = array(
192 192
 				'label' => __( 'Delete Entry', 'gravityview' ),
193 193
 				'type'  => 'delete_link',
194 194
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 		$setting_tabs = parent::get_app_settings_tabs();
119 119
 
120 120
 		foreach ( $setting_tabs as &$tab ) {
121
-			if ( 'uninstall' !== $tab['name'] ) {
121
+			if ( 'uninstall' !== $tab[ 'name' ] ) {
122 122
 				continue;
123 123
 			}
124 124
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 			}
130 130
 
131 131
 			// Add trash can icon to resemble the look and feel of the GF Settings page
132
-			$tab['icon'] = 'dashicons-trash';
132
+			$tab[ 'icon' ] = 'dashicons-trash';
133 133
 		}
134 134
 
135 135
 		return array_filter( $setting_tabs );
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function register_no_conflict( $items ) {
146 146
 
147
-		$items[] = 'gform_settings';
148
-		$items[] = 'gv-admin-edd-license';
147
+		$items[ ] = 'gform_settings';
148
+		$items[ ] = 'gv-admin-edd-license';
149 149
 
150 150
 		return $items;
151 151
 	}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
 		$href = add_query_arg( array( 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ), admin_url( 'edit.php' ) );
198 198
 
199
-		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ). '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
199
+		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
200 200
 
201 201
 		$html .= $uninstall_button;
202 202
 
@@ -215,10 +215,10 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	public function settings_save( $field, $echo = true ) {
217 217
 
218
-		$field['type']  = 'submit';
219
-		$field['name']  = 'gform-settings-save';
220
-		$field['class'] = 'button button-primary primary button-hero';
221
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
218
+		$field[ 'type' ]  = 'submit';
219
+		$field[ 'name' ]  = 'gform-settings-save';
220
+		$field[ 'class' ] = 'button button-primary primary button-hero';
221
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
222 222
 
223 223
 		$html = $this->as_html( $field, false );
224 224
 
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
 	 */
241 241
 	public function modify_app_settings_menu_title( $setting_tabs ) {
242 242
 
243
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
244
-		$setting_tabs[0]['icon']  = 'dashicons-admin-settings';
243
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
244
+		$setting_tabs[ 0 ][ 'icon' ]  = 'dashicons-admin-settings';
245 245
 
246 246
 		return $setting_tabs;
247 247
 	}
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 					$i = 0;
490 490
 					while ( $i < 11 ) {
491 491
 						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
492
-						$i ++;
492
+						$i++;
493 493
 					}
494 494
 					?>
495 495
 				</ul>
@@ -692,14 +692,14 @@  discard block
 block discarded – undo
692 692
 	 */
693 693
 	public function as_html( $field, $echo = true ) {
694 694
 
695
-		$field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit', 'reset', 'button' ) ) ) ? $field['type'] : 'submit';
695
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
696 696
 
697 697
 		$attributes    = $this->get_field_attributes( $field );
698 698
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
699
-		$value         = $this->get( $field['name'], $default_value );
699
+		$value         = $this->get( $field[ 'name' ], $default_value );
700 700
 
701
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary primary gfbutton';
702
-		$name                = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
701
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary primary gfbutton';
702
+		$name                = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
703 703
 
704 704
 		if ( empty( $value ) ) {
705 705
 			$value = __( 'Update Settings', 'gravityview' );
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 		$attributes = $this->get_field_attributes( $field );
709 709
 
710 710
 		$html = '<input
711
-                    type="' . $field['type'] . '"
711
+                    type="' . $field[ 'type' ] . '"
712 712
                     name="' . esc_attr( $name ) . '"
713 713
                     value="' . $value . '" ' .
714 714
 				implode( ' ', $attributes ) .
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
 	 */
743 743
 	public function is_save_postback() {
744 744
 
745
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
745
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
746 746
 	}
747 747
 
748 748
 	/**
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 
855 855
 		$scripts = parent::scripts();
856 856
 
857
-		$scripts[] = array(
857
+		$scripts[ ] = array(
858 858
 				'handle'  => 'gform_tooltip_init',
859 859
 				'enqueue' => array(
860 860
 						array(
@@ -875,7 +875,7 @@  discard block
 block discarded – undo
875 875
 
876 876
 		$styles = parent::styles();
877 877
 
878
-		$styles[] = array(
878
+		$styles[ ] = array(
879 879
 				'handle'  => 'gravityview_settings',
880 880
 				'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
881 881
 				'version' => Plugin::$version,
@@ -964,7 +964,7 @@  discard block
 block discarded – undo
964 964
 						'name'          => 'support-email',
965 965
 						'type'          => 'text',
966 966
 						'validate'      => 'email',
967
-						'default_value' => $default_settings['support-email'],
967
+						'default_value' => $default_settings[ 'support-email' ],
968 968
 						'label'         => __( 'Support Email', 'gravityview' ),
969 969
 						'description'   => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
970 970
 						'class'         => 'code regular-text',
@@ -976,7 +976,7 @@  discard block
 block discarded – undo
976 976
 						'name'          => 'support_port',
977 977
 						'type'          => 'radio',
978 978
 						'label'         => __( 'Show Support Port?', 'gravityview' ),
979
-						'default_value' => $default_settings['support_port'],
979
+						'default_value' => $default_settings[ 'support_port' ],
980 980
 						'horizontal'    => 1,
981 981
 						'choices'       => array(
982 982
 								array(
@@ -995,7 +995,7 @@  discard block
 block discarded – undo
995 995
 						'name'          => 'no-conflict-mode',
996 996
 						'type'          => 'radio',
997 997
 						'label'         => __( 'No-Conflict Mode', 'gravityview' ),
998
-						'default_value' => $default_settings['no-conflict-mode'],
998
+						'default_value' => $default_settings[ 'no-conflict-mode' ],
999 999
 						'horizontal'    => 1,
1000 1000
 						'choices'       => array(
1001 1001
 								array(
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 								'name'          => 'rest_api',
1018 1018
 								'type'          => 'radio',
1019 1019
 								'label'         => __( 'REST API', 'gravityview' ),
1020
-								'default_value' => $default_settings['rest_api'],
1020
+								'default_value' => $default_settings[ 'rest_api' ],
1021 1021
 								'horizontal'    => 1,
1022 1022
 								'choices'       => array(
1023 1023
 										array(
@@ -1036,7 +1036,7 @@  discard block
 block discarded – undo
1036 1036
 						'name'          => 'beta',
1037 1037
 						'type'          => 'checkbox',
1038 1038
 						'label'         => __( 'Become a Beta Tester', 'gravityview' ),
1039
-						'default_value' => $default_settings['beta'],
1039
+						'default_value' => $default_settings[ 'beta' ],
1040 1040
 						'horizontal'    => 1,
1041 1041
 						'choices'       => array(
1042 1042
 								array(
@@ -1070,17 +1070,17 @@  discard block
 block discarded – undo
1070 1070
 		 * @since 1.7.4
1071 1071
 		 */
1072 1072
 		foreach ( $fields as &$field ) {
1073
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
1074
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
1075
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
1076
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
1073
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
1074
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
1075
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
1076
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
1077 1077
 
1078 1078
 			if ( $disabled_attribute ) {
1079
-				$field['disabled'] = $disabled_attribute;
1079
+				$field[ 'disabled' ] = $disabled_attribute;
1080 1080
 			}
1081 1081
 
1082
-			if ( empty( $field['disabled'] ) ) {
1083
-				unset( $field['disabled'] );
1082
+			if ( empty( $field[ 'disabled' ] ) ) {
1083
+				unset( $field[ 'disabled' ] );
1084 1084
 			}
1085 1085
 		}
1086 1086
 
@@ -1092,23 +1092,23 @@  discard block
 block discarded – undo
1092 1092
 					'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
1093 1093
 					'type' => 'edd_license',
1094 1094
 					'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
1095
-					'default_value' => $default_settings['license_key'],
1095
+					'default_value' => $default_settings[ 'license_key' ],
1096 1096
 					'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
1097 1097
 			),
1098 1098
 			array(
1099 1099
 					'name' => 'license_key_response',
1100
-					'default_value' => $default_settings['license_key_response'],
1100
+					'default_value' => $default_settings[ 'license_key_response' ],
1101 1101
 					'type' => 'hidden',
1102 1102
 			),
1103 1103
 			array(
1104 1104
 					'name' => 'license_key_status',
1105
-					'default_value' => $default_settings['license_key_status'],
1105
+					'default_value' => $default_settings[ 'license_key_status' ],
1106 1106
 					'type' => 'hidden',
1107 1107
 			),
1108 1108
 		);
1109 1109
 
1110 1110
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1111
-			$license_fields[0] = array_merge( $license_fields[0], array(
1111
+			$license_fields[ 0 ] = array_merge( $license_fields[ 0 ], array(
1112 1112
 				'disabled' => true,
1113 1113
 				'title'    => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ),
1114 1114
 			) );
@@ -1119,7 +1119,7 @@  discard block
 block discarded – undo
1119 1119
 
1120 1120
 		if ( \gravityview()->plugin->is_GF_25() ) {
1121 1121
 
1122
-			$sections[] = array(
1122
+			$sections[ ] = array(
1123 1123
 					'title'       => __( 'GravityView License', 'gravityview' ),
1124 1124
 					'class'       => 'gform-settings-panel--full gv-settings-panel--license',
1125 1125
 					'description' => $version_info,
@@ -1137,7 +1137,7 @@  discard block
 block discarded – undo
1137 1137
 			) );
1138 1138
 		}
1139 1139
 
1140
-		$sections[] = array(
1140
+		$sections[ ] = array(
1141 1141
 			'title' => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ),
1142 1142
 			'class' => 'gform-settings-panel--full gv-settings-panel--core',
1143 1143
 			'fields'      => $fields,
@@ -1161,8 +1161,8 @@  discard block
 block discarded – undo
1161 1161
 
1162 1162
 			if ( $disabled_attribute ) {
1163 1163
 				foreach ( $extension_sections as &$section ) {
1164
-					foreach ( $section['fields'] as &$field ) {
1165
-						$field['disabled'] = $disabled_attribute;
1164
+					foreach ( $section[ 'fields' ] as &$field ) {
1165
+						$field[ 'disabled' ] = $disabled_attribute;
1166 1166
 					}
1167 1167
 				}
1168 1168
 			}
@@ -1228,7 +1228,7 @@  discard block
 block discarded – undo
1228 1228
 	public function settings_edd_license( $field, $echo = true ) {
1229 1229
 
1230 1230
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1231
-			$field['input_type'] = 'password';
1231
+			$field[ 'input_type' ] = 'password';
1232 1232
 		}
1233 1233
 
1234 1234
 		$text = $this->settings_text( $field, false );
@@ -1280,7 +1280,7 @@  discard block
 block discarded – undo
1280 1280
 
1281 1281
 		?>
1282 1282
 
1283
-		<tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1283
+		<tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1284 1284
 			<td colspan="2">
1285 1285
 				<?php $this->single_setting( $field ); ?>
1286 1286
 			</td>
@@ -1306,8 +1306,8 @@  discard block
 block discarded – undo
1306 1306
 	 */
1307 1307
 	public function single_setting_row( $field ) {
1308 1308
 
1309
-		$field['gv_description'] = Utils::get( $field, 'description' );
1310
-		$field['description']    = Utils::get( $field, 'subtitle' );
1309
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1310
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1311 1311
 		parent::single_setting_row( $field );
1312 1312
 	}
1313 1313
 
@@ -1368,8 +1368,8 @@  discard block
 block discarded – undo
1368 1368
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1369 1369
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
1370 1370
 
1371
-			unset( $posted_settings['license_key_response'] );
1372
-			unset( $posted_settings['license_key_status'] );
1371
+			unset( $posted_settings[ 'license_key_response' ] );
1372
+			unset( $posted_settings[ 'license_key_status' ] );
1373 1373
 
1374 1374
 			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1375 1375
 
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Spacing   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		);
103 103
 
104 104
 		if ( ! empty( $action ) ) {
105
-			$settings['edd_action'] = esc_attr( $action );
105
+			$settings[ 'edd_action' ] = esc_attr( $action );
106 106
 		}
107 107
 
108 108
 		return array_map( 'urlencode', $settings );
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			'format' => 'json',
159 159
 		) );
160 160
 
161
-		if ( $is_ajax && empty( $data['license'] ) ) {
161
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
162 162
 			die( -1 );
163 163
 		}
164 164
 
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 
187 187
 			$json = json_encode( $license_data );
188 188
 
189
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
189
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
190 190
 
191 191
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
192 192
 
193
-			do_action('gravityview/admin_installer/delete_downloads_data', true );
193
+			do_action( 'gravityview/admin_installer/delete_downloads_data', true );
194 194
 
195 195
 			if ( $is_check_action_button ) {
196 196
 				delete_transient( self::status_transient_key );
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			// most likely a mistake.
202 202
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
203 203
 
204
-				if ( ! empty( $data['field_id'] ) ) {
204
+				if ( ! empty( $data[ 'field_id' ] ) ) {
205 205
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
206 206
 				}
207 207
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			$class   = 'hide';
230 230
 			$message = '';
231 231
 		} else {
232
-			if( ! empty( $license_data->error ) ) {
232
+			if ( ! empty( $license_data->error ) ) {
233 233
 				$class = 'error';
234 234
 				$string_key = $license_data->error;
235 235
 			} else { $class = $license_data->license;
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function license_details( $response = array() ) {
255 255
 
256
-		$response = (array) $response;
256
+		$response = (array)$response;
257 257
 
258 258
 		$return = '';
259 259
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
260 260
 
261
-		if ( ! empty( $response['license_key'] ) ) {
261
+		if ( ! empty( $response[ 'license_key' ] ) ) {
262 262
 			$return .= '<h3>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>';
263 263
 
264 264
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
 					return sprintf( $wrapper, '' ); // Do not show redundant information - invalid/deactivated notice will be displayed by generate_license_box()
267 267
 				}
268 268
 
269
-				$return .= $this->strings( $response['license'], $response );
270
-			} elseif ( ! empty( $response['license_name'] ) ) {
269
+				$return .= $this->strings( $response[ 'license' ], $response );
270
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
271 271
 				$response_keys = array(
272 272
 					'license_name'   => '',
273 273
 					'license_limit'  => '',
@@ -282,21 +282,21 @@  discard block
 block discarded – undo
282 282
 				$response = wp_parse_args( $response, $response_keys );
283 283
 
284 284
 				$login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link';
285
-				$login_link    = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
286
-				$local_text    = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
287
-				$license_limit = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit'];
288
-
289
-				$details    = array(
290
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ),
291
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ),  '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link . '</span>',
292
-					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
293
-					'expires'     => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ),
294
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
285
+				$login_link    = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
286
+				$local_text    = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
287
+				$license_limit = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ];
288
+
289
+				$details = array(
290
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ),
291
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link . '</span>',
292
+					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
293
+					'expires'     => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ),
294
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
295 295
 				);
296 296
 
297
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
298
-					unset( $details['upgrade'] );
299
-					$details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
297
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
298
+					unset( $details[ 'upgrade' ] );
299
+					$details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
300 300
 				}
301 301
 
302 302
 				$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>';
@@ -322,20 +322,20 @@  discard block
 block discarded – undo
322 322
 		if ( ! empty( $upgrades ) ) {
323 323
 
324 324
 			$locale_parts = explode( '_', get_locale() );
325
-			$is_english = ( 'en' === $locale_parts[0] );
325
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
326 326
 
327 327
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
328 328
 			$output .= '<ul class="ul-disc">';
329 329
 
330 330
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
331
-				$upgrade = (object) $upgrade;
331
+				$upgrade = (object)$upgrade;
332 332
 
333 333
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
334 334
 
335 335
 				if ( $is_english && isset( $upgrade->description ) ) {
336 336
 					$message = esc_html( $upgrade->description );
337 337
 				} else {
338
-					switch( $upgrade->price_id ) {
338
+					switch ( $upgrade->price_id ) {
339 339
 						// Interstellar
340 340
 						case 1:
341 341
 						default:
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 			'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ),
415 415
 			'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license"
416 416
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
417
-			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
417
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
418 418
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
419 419
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
420 420
 			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 
443 443
 		if ( ! empty( $license_data->renewal_url ) ) {
444 444
 			$renew_license_url = $license_data->renewal_url;
445
-		} elseif( ! empty( $license_data->license_key ) ) {
445
+		} elseif ( ! empty( $license_data->license_key ) ) {
446 446
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
447 447
 		} else {
448 448
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 	 * @return array|\WP_Error
460 460
 	 */
461 461
 	private function _license_get_remote_response( $data, $license = '' ) {
462
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
462
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
463 463
 
464 464
 		$url = add_query_arg( $api_params, self::url );
465 465
 
@@ -499,9 +499,9 @@  discard block
 block discarded – undo
499 499
 	private function license_call_update_settings( $license_data, $data ) {
500 500
 		$settings = array();
501 501
 
502
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
503
-		$settings['license_key_status'] = $license_data->license;
504
-		$settings['license_key_response'] = (array)$license_data;
502
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
503
+		$settings[ 'license_key_status' ] = $license_data->license;
504
+		$settings[ 'license_key_response' ] = (array)$license_data;
505 505
 
506 506
 		$this->settings->set( $settings );
507 507
 	}
@@ -521,9 +521,9 @@  discard block
 block discarded – undo
521 521
 		$status = trim( $this->settings->get( 'license_key_status' ) );
522 522
 		$key = trim( $this->settings->get( 'license_key' ) );
523 523
 
524
-		if (  !empty( $key ) ) {
524
+		if ( ! empty( $key ) ) {
525 525
 			$response = $this->settings->get( 'license_key_response' );
526
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
526
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
527 527
 		} else {
528 528
 			$response = array();
529 529
 		}
@@ -566,11 +566,11 @@  discard block
 block discarded – undo
566 566
 
567 567
 		$submit = '<div class="gv-edd-button-wrapper">';
568 568
 		foreach ( $fields as $field ) {
569
-			$field['type'] = 'button';
570
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
571
-			$field['style'] = 'margin-left: 10px;';
572
-			if( $disabled_attribute ) {
573
-				$field['disabled'] = $disabled_attribute;
569
+			$field[ 'type' ] = 'button';
570
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
571
+			$field[ 'style' ] = 'margin-left: 10px;';
572
+			if ( $disabled_attribute ) {
573
+				$field[ 'disabled' ] = $disabled_attribute;
574 574
 			}
575 575
 			$submit .= $this->settings->as_html( $field, $echo );
576 576
 		}
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
 				    'url'        => home_url(),
650 650
 				    'site_data'  => $this->get_site_data(),
651 651
 			    ),
652
-			));
652
+			) );
653 653
 
654 654
 			// make sure the response came back okay
655 655
 			if ( is_wp_error( $response ) ) {
@@ -679,45 +679,45 @@  discard block
 block discarded – undo
679 679
 		$theme_data = wp_get_theme();
680 680
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
681 681
 
682
-		$data['gv_version']  = Plugin::$version;
683
-		$data['php_version']  = phpversion();
684
-		$data['wp_version']   = get_bloginfo( 'version' );
685
-		$data['gf_version']  = \GFForms::$version;
686
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
687
-		$data['multisite']    = is_multisite();
688
-		$data['theme']        = $theme;
689
-		$data['url']          = home_url();
690
-		$data['license_key']  = $this->settings->get( 'license_key' );
691
-		$data['beta']         = $this->settings->get( 'beta' );
682
+		$data[ 'gv_version' ]  = Plugin::$version;
683
+		$data[ 'php_version' ]  = phpversion();
684
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
685
+		$data[ 'gf_version' ]  = \GFForms::$version;
686
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
687
+		$data[ 'multisite' ]    = is_multisite();
688
+		$data[ 'theme' ]        = $theme;
689
+		$data[ 'url' ]          = home_url();
690
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
691
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
692 692
 
693 693
 		// View Data
694 694
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
695 695
 
696
-		$data['view_count'] = null;
697
-		$data['view_first'] = null;
698
-		$data['view_latest'] = null;
696
+		$data[ 'view_count' ] = null;
697
+		$data[ 'view_first' ] = null;
698
+		$data[ 'view_latest' ] = null;
699 699
 
700 700
 		if ( $gravityview_posts->publish ) {
701
-			$data['view_count'] = $gravityview_posts->publish;
701
+			$data[ 'view_count' ] = $gravityview_posts->publish;
702 702
 
703 703
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
704 704
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
705 705
 
706 706
 			if ( $first = array_shift( $first ) ) {
707
-				$data['view_first'] = $first->post_date;
707
+				$data[ 'view_first' ] = $first->post_date;
708 708
 			}
709 709
 			if ( $latest = array_pop( $latest ) ) {
710
-				$data['view_latest'] = $latest->post_date;
710
+				$data[ 'view_latest' ] = $latest->post_date;
711 711
 			}
712 712
 		}
713 713
 
714 714
 		// Form counts
715 715
 		if ( class_exists( 'GFFormsModel' ) ) {
716 716
 			$form_data = \GFFormsModel::get_form_count();
717
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
718
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
719
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
720
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
717
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
718
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
719
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
720
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
721 721
 		}
722 722
 
723 723
 		// Retrieve current plugin information
@@ -725,13 +725,13 @@  discard block
 block discarded – undo
725 725
 			include ABSPATH . '/wp-admin/includes/plugin.php';
726 726
 		}
727 727
 
728
-		$data['integrations']     = self::get_related_plugins_and_extensions();
729
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
730
-		$data['inactive_plugins'] = array();
731
-		$data['locale']           = get_locale();
728
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
729
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
730
+		$data[ 'inactive_plugins' ] = array();
731
+		$data[ 'locale' ]           = get_locale();
732 732
 
733 733
 		// Validate request on the GV server
734
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
734
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
735 735
 
736 736
 		return $data;
737 737
 	}
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 
762 762
 				$plugin_data = get_plugin_data( $active_plugin );
763 763
 
764
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
764
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
765 765
 			}
766 766
 
767 767
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravityformspartialentries.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$partial_entries_addon = GF_Partial_Entries::get_instance();
55 55
 
56
-		$feed_settings = $partial_entries_addon->get_feed_settings( $form['id'] );
56
+		$feed_settings = $partial_entries_addon->get_feed_settings( $form[ 'id' ] );
57 57
 
58 58
 		$is_enabled = \GV\Utils::get( $feed_settings, 'enable', 0 );
59 59
 
@@ -65,19 +65,19 @@  discard block
 block discarded – undo
65 65
 
66 66
 		$partial_entry_id = \GV\Utils::get( $entry, 'partial_entry_id' );
67 67
 
68
-		if ( empty ($partial_entry_id) ) {
68
+		if ( empty ( $partial_entry_id ) ) {
69 69
 			return;
70 70
 		}
71 71
 
72 72
 		// Set the expected $_POST key for the Add-On to use
73
-		$_POST['partial_entry_id'] = $partial_entry_id;
73
+		$_POST[ 'partial_entry_id' ] = $partial_entry_id;
74 74
 
75 75
 		gravityview()->log->debug( 'Saving partial entry (ID #{partial_entry_id}) for Entry #{entry_id}', array(
76 76
 			'partial_entry_id' => $partial_entry_id,
77 77
 			'entry_id'         => $entry_id
78 78
 		) );
79 79
 
80
-		$partial_entries_addon->maybe_save_partial_entry( $form['id'] );
80
+		$partial_entries_addon->maybe_save_partial_entry( $form[ 'id' ] );
81 81
 	}
82 82
 }
83 83
 
Please login to merge, or discard this patch.