|
@@ -27,32 +27,32 @@ discard block |
|
|
block discarded – undo |
|
27
|
27
|
add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 ); |
|
28
|
28
|
|
|
29
|
29
|
// Tooltips |
|
30
|
|
- add_filter( 'gform_tooltips', array( $this, 'tooltips') ); |
|
|
30
|
+ add_filter( 'gform_tooltips', array( $this, 'tooltips' ) ); |
|
31
|
31
|
|
|
32
|
32
|
// adding styles and scripts |
|
33
|
|
- add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 ); |
|
34
|
|
- add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') ); |
|
35
|
|
- add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') ); |
|
36
|
|
- add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') ); |
|
37
|
|
- add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') ); |
|
38
|
|
- |
|
39
|
|
- add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 ); |
|
40
|
|
- add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 ); |
|
41
|
|
- add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers') ); |
|
42
|
|
- add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 ); |
|
43
|
|
- add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') ); |
|
44
|
|
- add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 ); |
|
|
33
|
+ add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 ); |
|
|
34
|
+ add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) ); |
|
|
35
|
+ add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
|
|
36
|
+ add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) ); |
|
|
37
|
+ add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
|
|
38
|
+ |
|
|
39
|
+ add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 ); |
|
|
40
|
+ add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 ); |
|
|
41
|
+ add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ) ); |
|
|
42
|
+ add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 ); |
|
|
43
|
+ add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) ); |
|
|
44
|
+ add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 ); |
|
45
|
45
|
|
|
46
|
46
|
// @todo check if this hook is needed.. |
|
47
|
47
|
//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 ); |
|
48
|
48
|
|
|
49
|
49
|
// Add Connected Form column |
|
50
|
|
- add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) ); |
|
|
50
|
+ add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) ); |
|
51
|
51
|
|
|
52
|
52
|
add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 ); |
|
53
|
53
|
add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 ); |
|
54
|
54
|
|
|
55
|
|
- add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 ); |
|
|
55
|
+ add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 ); |
|
56
|
56
|
|
|
57
|
57
|
add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) ); |
|
58
|
58
|
|
|
@@ -71,11 +71,11 @@ discard block |
|
|
block discarded – undo |
|
71
|
71
|
*/ |
|
72
|
72
|
function suggest_support_articles( $localization_data = array() ) { |
|
73
|
73
|
|
|
74
|
|
- if( ! gravityview()->request->is_view() ) { |
|
|
74
|
+ if ( ! gravityview()->request->is_view() ) { |
|
75
|
75
|
return $localization_data; |
|
76
|
76
|
} |
|
77
|
77
|
|
|
78
|
|
- $localization_data['suggest'] = array( |
|
|
78
|
+ $localization_data[ 'suggest' ] = array( |
|
79
|
79
|
'57ef23539033602e61d4a560', |
|
80
|
80
|
'54c67bb9e4b0512429885513', |
|
81
|
81
|
'54c67bb9e4b0512429885512', |
|
@@ -96,13 +96,13 @@ discard block |
|
|
block discarded – undo |
|
96
|
96
|
public function filter_pre_get_posts_by_gravityview_form_id( &$query ) { |
|
97
|
97
|
global $pagenow; |
|
98
|
98
|
|
|
99
|
|
- if ( !is_admin() ) { |
|
|
99
|
+ if ( ! is_admin() ) { |
|
100
|
100
|
return; |
|
101
|
101
|
} |
|
102
|
102
|
|
|
103
|
|
- $form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false; |
|
|
103
|
+ $form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false; |
|
104
|
104
|
|
|
105
|
|
- if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) { |
|
|
105
|
+ if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) { |
|
106
|
106
|
return; |
|
107
|
107
|
} |
|
108
|
108
|
|
|
@@ -119,18 +119,18 @@ discard block |
|
|
block discarded – undo |
|
119
|
119
|
function add_view_dropdown() { |
|
120
|
120
|
$current_screen = get_current_screen(); |
|
121
|
121
|
|
|
122
|
|
- if( 'gravityview' !== $current_screen->post_type ) { |
|
|
122
|
+ if ( 'gravityview' !== $current_screen->post_type ) { |
|
123
|
123
|
return; |
|
124
|
124
|
} |
|
125
|
125
|
|
|
126
|
126
|
$forms = gravityview_get_forms(); |
|
127
|
127
|
$current_form = \GV\Utils::_GET( 'gravityview_form_id' ); |
|
128
|
128
|
// If there are no forms to select, show no forms. |
|
129
|
|
- if( !empty( $forms ) ) { ?> |
|
|
129
|
+ if ( ! empty( $forms ) ) { ?> |
|
130
|
130
|
<select name="gravityview_form_id" id="gravityview_form_id"> |
|
131
|
131
|
<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option> |
|
132
|
|
- <?php foreach( $forms as $form ) { ?> |
|
133
|
|
- <option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option> |
|
|
132
|
+ <?php foreach ( $forms as $form ) { ?> |
|
|
133
|
+ <option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option> |
|
134
|
134
|
<?php } ?> |
|
135
|
135
|
</select> |
|
136
|
136
|
<?php } |
|
@@ -143,7 +143,7 @@ discard block |
|
|
block discarded – undo |
|
143
|
143
|
*/ |
|
144
|
144
|
public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) { |
|
145
|
145
|
_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' ); |
|
146
|
|
- GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id ); |
|
|
146
|
+ GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id ); |
|
147
|
147
|
} |
|
148
|
148
|
|
|
149
|
149
|
/** |
|
@@ -165,7 +165,7 @@ discard block |
|
|
block discarded – undo |
|
165
|
165
|
public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) { |
|
166
|
166
|
|
|
167
|
167
|
// Don't show on Trashed forms |
|
168
|
|
- if( 'trash' === rgget( 'filter') ) { |
|
|
168
|
+ if ( 'trash' === rgget( 'filter' ) ) { |
|
169
|
169
|
return $menu_items; |
|
170
|
170
|
} |
|
171
|
171
|
|
|
@@ -173,13 +173,13 @@ discard block |
|
|
block discarded – undo |
|
173
|
173
|
|
|
174
|
174
|
$priority = 0; |
|
175
|
175
|
|
|
176
|
|
- if( 'form_list' === GFForms::get_page() ) { |
|
|
176
|
+ if ( 'form_list' === GFForms::get_page() ) { |
|
177
|
177
|
$priority = 790; |
|
178
|
178
|
} |
|
179
|
179
|
|
|
180
|
|
- if( empty( $connected_views ) ) { |
|
|
180
|
+ if ( empty( $connected_views ) ) { |
|
181
|
181
|
|
|
182
|
|
- $menu_items['gravityview'] = array( |
|
|
182
|
+ $menu_items[ 'gravityview' ] = array( |
|
183
|
183
|
'label' => esc_attr__( 'Create a View', 'gravityview' ), |
|
184
|
184
|
'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', |
|
185
|
185
|
'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), |
|
@@ -195,22 +195,22 @@ discard block |
|
|
block discarded – undo |
|
195
|
195
|
$sub_menu_items = array(); |
|
196
|
196
|
foreach ( (array)$connected_views as $view ) { |
|
197
|
197
|
|
|
198
|
|
- if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) { |
|
|
198
|
+ if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) { |
|
199
|
199
|
continue; |
|
200
|
200
|
} |
|
201
|
201
|
|
|
202
|
|
- $label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title; |
|
|
202
|
+ $label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title; |
|
203
|
203
|
|
|
204
|
|
- $sub_menu_items[] = array( |
|
|
204
|
+ $sub_menu_items[ ] = array( |
|
205
|
205
|
'label' => esc_attr( $label ), |
|
206
|
|
- 'url' => admin_url( 'post.php?action=edit&post='.$view->ID ), |
|
|
206
|
+ 'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ), |
|
207
|
207
|
); |
|
208
|
208
|
} |
|
209
|
209
|
|
|
210
|
210
|
// If there were no items added, then let's create the parent menu |
|
211
|
|
- if( $sub_menu_items ) { |
|
|
211
|
+ if ( $sub_menu_items ) { |
|
212
|
212
|
|
|
213
|
|
- $sub_menu_items[] = array( |
|
|
213
|
+ $sub_menu_items[ ] = array( |
|
214
|
214
|
'label' => esc_attr__( 'Create a View', 'gravityview' ), |
|
215
|
215
|
'link_class' => 'gv-create-view', |
|
216
|
216
|
'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), |
|
@@ -219,14 +219,14 @@ discard block |
|
|
block discarded – undo |
|
219
|
219
|
); |
|
220
|
220
|
|
|
221
|
221
|
// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown |
|
222
|
|
- $sub_menu_items[] = array( |
|
|
222
|
+ $sub_menu_items[ ] = array( |
|
223
|
223
|
'url' => '#', |
|
224
|
224
|
'label' => '', |
|
225
|
225
|
'menu_class' => 'hidden', |
|
226
|
226
|
'capabilities' => '', |
|
227
|
227
|
); |
|
228
|
228
|
|
|
229
|
|
- $menu_items['gravityview'] = array( |
|
|
229
|
+ $menu_items[ 'gravityview' ] = array( |
|
230
|
230
|
'label' => __( 'Connected Views', 'gravityview' ), |
|
231
|
231
|
'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', |
|
232
|
232
|
'title' => __( 'GravityView Views using this form as a data source', 'gravityview' ), |
|
@@ -255,8 +255,8 @@ discard block |
|
|
block discarded – undo |
|
255
|
255
|
$add = array( 'captcha', 'page' ); |
|
256
|
256
|
|
|
257
|
257
|
// Don't allowing editing the following values: |
|
258
|
|
- if( $context === 'edit' ) { |
|
259
|
|
- $add[] = 'post_id'; |
|
|
258
|
+ if ( $context === 'edit' ) { |
|
|
259
|
+ $add[ ] = 'post_id'; |
|
260
|
260
|
} |
|
261
|
261
|
|
|
262
|
262
|
$return = array_merge( $array, $add ); |
|
@@ -279,32 +279,32 @@ discard block |
|
|
block discarded – undo |
|
279
|
279
|
foreach ( $default_args as $key => $arg ) { |
|
280
|
280
|
|
|
281
|
281
|
// If an arg has `tooltip` defined, but it's false, don't display a tooltip |
|
282
|
|
- if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; } |
|
|
282
|
+ if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; } |
|
283
|
283
|
|
|
284
|
284
|
// By default, use `tooltip` if defined. |
|
285
|
|
- $tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip']; |
|
|
285
|
+ $tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ]; |
|
286
|
286
|
|
|
287
|
287
|
// Otherwise, use the description as a tooltip. |
|
288
|
|
- if( empty( $tooltip ) && !empty( $arg['desc'] ) ) { |
|
289
|
|
- $tooltip = $arg['desc']; |
|
|
288
|
+ if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) { |
|
|
289
|
+ $tooltip = $arg[ 'desc' ]; |
|
290
|
290
|
} |
|
291
|
291
|
|
|
292
|
292
|
// If there's no tooltip set, continue |
|
293
|
|
- if( empty( $tooltip ) ) { |
|
|
293
|
+ if ( empty( $tooltip ) ) { |
|
294
|
294
|
continue; |
|
295
|
295
|
} |
|
296
|
296
|
|
|
297
|
297
|
// Add the tooltip |
|
298
|
|
- $gv_tooltips[ 'gv_'.$key ] = array( |
|
299
|
|
- 'title' => $arg['label'], |
|
|
298
|
+ $gv_tooltips[ 'gv_' . $key ] = array( |
|
|
299
|
+ 'title' => $arg[ 'label' ], |
|
300
|
300
|
'value' => $tooltip, |
|
301
|
301
|
); |
|
302
|
302
|
|
|
303
|
303
|
} |
|
304
|
304
|
|
|
305
|
|
- $gv_tooltips['gv_css_merge_tags'] = array( |
|
306
|
|
- 'title' => __('CSS Merge Tags', 'gravityview'), |
|
307
|
|
- 'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' ) |
|
|
305
|
+ $gv_tooltips[ 'gv_css_merge_tags' ] = array( |
|
|
306
|
+ 'title' => __( 'CSS Merge Tags', 'gravityview' ), |
|
|
307
|
+ 'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' ) |
|
308
|
308
|
); |
|
309
|
309
|
|
|
310
|
310
|
/** |
|
@@ -322,9 +322,9 @@ discard block |
|
|
block discarded – undo |
|
322
|
322
|
|
|
323
|
323
|
foreach ( $gv_tooltips as $key => $tooltip ) { |
|
324
|
324
|
|
|
325
|
|
- $title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>'; |
|
|
325
|
+ $title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>'; |
|
326
|
326
|
|
|
327
|
|
- $tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) ); |
|
|
327
|
+ $tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) ); |
|
328
|
328
|
} |
|
329
|
329
|
|
|
330
|
330
|
return $tooltips; |
|
@@ -338,7 +338,7 @@ discard block |
|
|
block discarded – undo |
|
338
|
338
|
* |
|
339
|
339
|
* @return void |
|
340
|
340
|
*/ |
|
341
|
|
- public function add_custom_column_content( $column_name = NULL, $post_id ) { |
|
|
341
|
+ public function add_custom_column_content( $column_name = NULL, $post_id ) { |
|
342
|
342
|
|
|
343
|
343
|
$output = ''; |
|
344
|
344
|
|
|
@@ -360,7 +360,7 @@ discard block |
|
|
block discarded – undo |
|
360
|
360
|
// Generate backup if label doesn't exist: `example_name` => `Example Name` |
|
361
|
361
|
$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) ); |
|
362
|
362
|
|
|
363
|
|
- $output = $template ? $template['label'] : $template_id_pretty; |
|
|
363
|
+ $output = $template ? $template[ 'label' ] : $template_id_pretty; |
|
364
|
364
|
|
|
365
|
365
|
break; |
|
366
|
366
|
|
|
@@ -401,44 +401,44 @@ discard block |
|
|
block discarded – undo |
|
401
|
401
|
static public function get_connected_form_links( $form, $include_form_link = true ) { |
|
402
|
402
|
|
|
403
|
403
|
// Either the form is empty or the form ID is 0, not yet set. |
|
404
|
|
- if( empty( $form ) ) { |
|
|
404
|
+ if ( empty( $form ) ) { |
|
405
|
405
|
return ''; |
|
406
|
406
|
} |
|
407
|
407
|
|
|
408
|
408
|
// The $form is passed as the form ID |
|
409
|
|
- if( !is_array( $form ) ) { |
|
|
409
|
+ if ( ! is_array( $form ) ) { |
|
410
|
410
|
$form = gravityview_get_form( $form ); |
|
411
|
411
|
} |
|
412
|
412
|
|
|
413
|
|
- $form_id = $form['id']; |
|
|
413
|
+ $form_id = $form[ 'id' ]; |
|
414
|
414
|
$links = array(); |
|
415
|
415
|
|
|
416
|
|
- if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) { |
|
|
416
|
+ if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) { |
|
417
|
417
|
$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&id=%d', $form_id ) ); |
|
418
|
|
- $form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>'; |
|
419
|
|
- $links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>'; |
|
|
418
|
+ $form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>'; |
|
|
419
|
+ $links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>'; |
|
420
|
420
|
} else { |
|
421
|
|
- $form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>'; |
|
|
421
|
+ $form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>'; |
|
422
|
422
|
} |
|
423
|
423
|
|
|
424
|
|
- if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) { |
|
|
424
|
+ if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) { |
|
425
|
425
|
$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&id=%d', $form_id ) ); |
|
426
|
|
- $links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>'; |
|
|
426
|
+ $links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>'; |
|
427
|
427
|
} |
|
428
|
428
|
|
|
429
|
|
- if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) { |
|
|
429
|
+ if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) { |
|
430
|
430
|
$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&view=settings&id=%d', $form_id ) ); |
|
431
|
|
- $links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>'; |
|
|
431
|
+ $links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>'; |
|
432
|
432
|
} |
|
433
|
433
|
|
|
434
|
|
- if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) { |
|
|
434
|
+ if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) { |
|
435
|
435
|
$preview_url = site_url( sprintf( '?gf_page=preview&id=%d', $form_id ) ); |
|
436
|
|
- $links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>'; |
|
|
436
|
+ $links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>'; |
|
437
|
437
|
} |
|
438
|
438
|
|
|
439
|
439
|
$output = ''; |
|
440
|
440
|
|
|
441
|
|
- if( !empty( $include_form_link ) ) { |
|
|
441
|
+ if ( ! empty( $include_form_link ) ) { |
|
442
|
442
|
$output .= $form_link; |
|
443
|
443
|
} |
|
444
|
444
|
|
|
@@ -450,7 +450,7 @@ discard block |
|
|
block discarded – undo |
|
450
|
450
|
*/ |
|
451
|
451
|
$links = apply_filters( 'gravityview_connected_form_links', $links, $form ); |
|
452
|
452
|
|
|
453
|
|
- $output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>'; |
|
|
453
|
+ $output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>'; |
|
454
|
454
|
|
|
455
|
455
|
return $output; |
|
456
|
456
|
} |
|
@@ -464,8 +464,8 @@ discard block |
|
|
block discarded – undo |
|
464
|
464
|
// Get the date column and save it for later to add back in. |
|
465
|
465
|
// This adds it after the Data Source column. |
|
466
|
466
|
// This way, we don't need to do array_slice, array_merge, etc. |
|
467
|
|
- $date = $columns['date']; |
|
468
|
|
- unset( $columns['date'] ); |
|
|
467
|
+ $date = $columns[ 'date' ]; |
|
|
468
|
+ unset( $columns[ 'date' ] ); |
|
469
|
469
|
|
|
470
|
470
|
$data_source_required_caps = array( |
|
471
|
471
|
'gravityforms_edit_forms', |
|
@@ -476,14 +476,14 @@ discard block |
|
|
block discarded – undo |
|
476
|
476
|
'gravityforms_preview_forms', |
|
477
|
477
|
); |
|
478
|
478
|
|
|
479
|
|
- if( GVCommon::has_cap( $data_source_required_caps ) ) { |
|
480
|
|
- $columns['gv_connected_form'] = __( 'Data Source', 'gravityview' ); |
|
|
479
|
+ if ( GVCommon::has_cap( $data_source_required_caps ) ) { |
|
|
480
|
+ $columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' ); |
|
481
|
481
|
} |
|
482
|
482
|
|
|
483
|
|
- $columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' ); |
|
|
483
|
+ $columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' ); |
|
484
|
484
|
|
|
485
|
485
|
// Add the date back in. |
|
486
|
|
- $columns['date'] = $date; |
|
|
486
|
+ $columns[ 'date' ] = $date; |
|
487
|
487
|
|
|
488
|
488
|
return $columns; |
|
489
|
489
|
} |
|
@@ -497,12 +497,12 @@ discard block |
|
|
block discarded – undo |
|
497
|
497
|
*/ |
|
498
|
498
|
function save_postdata( $post_id ) { |
|
499
|
499
|
|
|
500
|
|
- if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){ |
|
|
500
|
+ if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { |
|
501
|
501
|
return; |
|
502
|
502
|
} |
|
503
|
503
|
|
|
504
|
504
|
// validate post_type |
|
505
|
|
- if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) { |
|
|
505
|
+ if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) { |
|
506
|
506
|
return; |
|
507
|
507
|
} |
|
508
|
508
|
|
|
@@ -517,65 +517,65 @@ discard block |
|
|
block discarded – undo |
|
517
|
517
|
$statii = array(); |
|
518
|
518
|
|
|
519
|
519
|
// check if this is a start fresh View |
|
520
|
|
- if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) { |
|
|
520
|
+ if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) { |
|
521
|
521
|
|
|
522
|
|
- $form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : ''; |
|
|
522
|
+ $form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : ''; |
|
523
|
523
|
// save form id |
|
524
|
|
- $statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id ); |
|
|
524
|
+ $statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id ); |
|
525
|
525
|
|
|
526
|
526
|
} |
|
527
|
527
|
|
|
528
|
|
- if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) { |
|
|
528
|
+ if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) { |
|
529
|
529
|
gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) ); |
|
530
|
530
|
return; |
|
531
|
531
|
} |
|
532
|
532
|
|
|
533
|
533
|
// Was this a start fresh? |
|
534
|
|
- if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) { |
|
535
|
|
- $statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 ); |
|
|
534
|
+ if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) { |
|
|
535
|
+ $statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 ); |
|
536
|
536
|
} else { |
|
537
|
|
- $statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' ); |
|
|
537
|
+ $statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' ); |
|
538
|
538
|
} |
|
539
|
539
|
|
|
540
|
540
|
// Check if we have a template id |
|
541
|
|
- if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) { |
|
|
541
|
+ if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) { |
|
542
|
542
|
|
|
543
|
|
- $template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : ''; |
|
|
543
|
+ $template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : ''; |
|
544
|
544
|
|
|
545
|
545
|
// now save template id |
|
546
|
|
- $statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id ); |
|
|
546
|
+ $statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id ); |
|
547
|
547
|
} |
|
548
|
548
|
|
|
549
|
549
|
|
|
550
|
550
|
// save View Configuration metabox |
|
551
|
|
- if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) { |
|
|
551
|
+ if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) { |
|
552
|
552
|
|
|
553
|
553
|
// template settings |
|
554
|
|
- if( empty( $_POST['template_settings'] ) ) { |
|
555
|
|
- $_POST['template_settings'] = array(); |
|
|
554
|
+ if ( empty( $_POST[ 'template_settings' ] ) ) { |
|
|
555
|
+ $_POST[ 'template_settings' ] = array(); |
|
556
|
556
|
} |
|
557
|
|
- $statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] ); |
|
|
557
|
+ $statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] ); |
|
558
|
558
|
|
|
559
|
559
|
$fields = array(); |
|
560
|
560
|
|
|
561
|
561
|
// Directory&single Visible Fields |
|
562
|
|
- if( !empty( $preset_fields ) ) { |
|
|
562
|
+ if ( ! empty( $preset_fields ) ) { |
|
563
|
563
|
|
|
564
|
564
|
$fields = $preset_fields; |
|
565
|
565
|
|
|
566
|
|
- } elseif( !empty( $_POST['gv_fields'] ) ) { |
|
|
566
|
+ } elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) { |
|
567
|
567
|
$fields = _gravityview_process_posted_fields(); |
|
568
|
568
|
} |
|
569
|
569
|
|
|
570
|
570
|
$fields = wp_slash( $fields ); |
|
571
|
571
|
|
|
572
|
|
- $statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields ); |
|
|
572
|
+ $statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields ); |
|
573
|
573
|
|
|
574
|
574
|
// Directory Visible Widgets |
|
575
|
|
- if( empty( $_POST['widgets'] ) ) { |
|
576
|
|
- $_POST['widgets'] = array(); |
|
|
575
|
+ if ( empty( $_POST[ 'widgets' ] ) ) { |
|
|
576
|
+ $_POST[ 'widgets' ] = array(); |
|
577
|
577
|
} |
|
578
|
|
- $statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] ); |
|
|
578
|
+ $statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] ); |
|
579
|
579
|
|
|
580
|
580
|
} // end save view configuration |
|
581
|
581
|
|
|
@@ -585,7 +585,7 @@ discard block |
|
|
block discarded – undo |
|
585
|
585
|
* @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. |
|
586
|
586
|
* @since 1.17.2 |
|
587
|
587
|
*/ |
|
588
|
|
- do_action('gravityview_view_saved', $post_id, $statii ); |
|
|
588
|
+ do_action( 'gravityview_view_saved', $post_id, $statii ); |
|
589
|
589
|
|
|
590
|
590
|
gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) ); |
|
591
|
591
|
} |
|
@@ -629,20 +629,20 @@ discard block |
|
|
block discarded – undo |
|
629
|
629
|
|
|
630
|
630
|
$output = ''; |
|
631
|
631
|
|
|
632
|
|
- if( !empty( $fields ) ) { |
|
|
632
|
+ if ( ! empty( $fields ) ) { |
|
633
|
633
|
|
|
634
|
|
- foreach( $fields as $id => $details ) { |
|
|
634
|
+ foreach ( $fields as $id => $details ) { |
|
635
|
635
|
|
|
636
|
|
- if( in_array( $details['type'], (array) $blacklist_field_types ) ) { |
|
|
636
|
+ if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) { |
|
637
|
637
|
continue; |
|
638
|
638
|
} |
|
639
|
639
|
|
|
640
|
640
|
// Edit mode only allows editing the parent fields, not single inputs. |
|
641
|
|
- if( $context === 'edit' && !empty( $details['parent'] ) ) { |
|
|
641
|
+ if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) { |
|
642
|
642
|
continue; |
|
643
|
643
|
} |
|
644
|
644
|
|
|
645
|
|
- $output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form ); |
|
|
645
|
+ $output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form ); |
|
646
|
646
|
|
|
647
|
647
|
} // End foreach |
|
648
|
648
|
} |
|
@@ -650,7 +650,7 @@ discard block |
|
|
block discarded – undo |
|
650
|
650
|
echo $output; |
|
651
|
651
|
|
|
652
|
652
|
// For the EDIT view we only want to allow the form fields. |
|
653
|
|
- if( $context === 'edit' ) { |
|
|
653
|
+ if ( $context === 'edit' ) { |
|
654
|
654
|
return; |
|
655
|
655
|
} |
|
656
|
656
|
|
|
@@ -674,16 +674,16 @@ discard block |
|
|
block discarded – undo |
|
674
|
674
|
$additional_fields = apply_filters( 'gravityview_additional_fields', array( |
|
675
|
675
|
array( |
|
676
|
676
|
'label_text' => __( '+ Add All Fields', 'gravityview' ), |
|
677
|
|
- 'desc' => __('Add all the available fields at once.', 'gravityview'), |
|
|
677
|
+ 'desc' => __( 'Add all the available fields at once.', 'gravityview' ), |
|
678
|
678
|
'field_id' => 'all-fields', |
|
679
|
679
|
'label_type' => 'field', |
|
680
|
680
|
'input_type' => NULL, |
|
681
|
681
|
'field_options' => NULL, |
|
682
|
682
|
'settings_html' => NULL, |
|
683
|
683
|
) |
|
684
|
|
- )); |
|
|
684
|
+ ) ); |
|
685
|
685
|
|
|
686
|
|
- if( !empty( $additional_fields )) { |
|
|
686
|
+ if ( ! empty( $additional_fields ) ) { |
|
687
|
687
|
foreach ( (array)$additional_fields as $item ) { |
|
688
|
688
|
|
|
689
|
689
|
// Prevent items from not having index set |
|
@@ -694,16 +694,16 @@ discard block |
|
|
block discarded – undo |
|
694
|
694
|
'input_type' => NULL, |
|
695
|
695
|
'field_options' => NULL, |
|
696
|
696
|
'settings_html' => NULL, |
|
697
|
|
- )); |
|
|
697
|
+ ) ); |
|
698
|
698
|
|
|
699
|
699
|
// Backward compat. |
|
700
|
|
- if( !empty( $item['field_options'] ) ) { |
|
|
700
|
+ if ( ! empty( $item[ 'field_options' ] ) ) { |
|
701
|
701
|
// Use settings_html from now on. |
|
702
|
|
- $item['settings_html'] = $item['field_options']; |
|
|
702
|
+ $item[ 'settings_html' ] = $item[ 'field_options' ]; |
|
703
|
703
|
} |
|
704
|
704
|
|
|
705
|
705
|
// Render a label for each of them |
|
706
|
|
- echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form ); |
|
|
706
|
+ echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form ); |
|
707
|
707
|
|
|
708
|
708
|
} |
|
709
|
709
|
} |
|
@@ -716,54 +716,54 @@ discard block |
|
|
block discarded – undo |
|
716
|
716
|
* @param string $zone Either 'single', 'directory', 'header', 'footer' |
|
717
|
717
|
* @return array |
|
718
|
718
|
*/ |
|
719
|
|
- function get_entry_default_fields($form, $zone) { |
|
|
719
|
+ function get_entry_default_fields( $form, $zone ) { |
|
720
|
720
|
|
|
721
|
721
|
$entry_default_fields = array(); |
|
722
|
722
|
|
|
723
|
|
- if( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
|
723
|
+ if ( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
724
|
724
|
|
|
725
|
725
|
$entry_default_fields = array( |
|
726
|
726
|
'id' => array( |
|
727
|
|
- 'label' => __('Entry ID', 'gravityview'), |
|
|
727
|
+ 'label' => __( 'Entry ID', 'gravityview' ), |
|
728
|
728
|
'type' => 'id', |
|
729
|
|
- 'desc' => __('The unique ID of the entry.', 'gravityview'), |
|
|
729
|
+ 'desc' => __( 'The unique ID of the entry.', 'gravityview' ), |
|
730
|
730
|
), |
|
731
|
731
|
'date_created' => array( |
|
732
|
|
- 'label' => __('Entry Date', 'gravityview'), |
|
733
|
|
- 'desc' => __('The date the entry was created.', 'gravityview'), |
|
|
732
|
+ 'label' => __( 'Entry Date', 'gravityview' ), |
|
|
733
|
+ 'desc' => __( 'The date the entry was created.', 'gravityview' ), |
|
734
|
734
|
'type' => 'date_created', |
|
735
|
735
|
), |
|
736
|
736
|
'source_url' => array( |
|
737
|
|
- 'label' => __('Source URL', 'gravityview'), |
|
|
737
|
+ 'label' => __( 'Source URL', 'gravityview' ), |
|
738
|
738
|
'type' => 'source_url', |
|
739
|
|
- 'desc' => __('The URL of the page where the form was submitted.', 'gravityview'), |
|
|
739
|
+ 'desc' => __( 'The URL of the page where the form was submitted.', 'gravityview' ), |
|
740
|
740
|
), |
|
741
|
741
|
'ip' => array( |
|
742
|
|
- 'label' => __('User IP', 'gravityview'), |
|
|
742
|
+ 'label' => __( 'User IP', 'gravityview' ), |
|
743
|
743
|
'type' => 'ip', |
|
744
|
|
- 'desc' => __('The IP Address of the user who created the entry.', 'gravityview'), |
|
|
744
|
+ 'desc' => __( 'The IP Address of the user who created the entry.', 'gravityview' ), |
|
745
|
745
|
), |
|
746
|
746
|
'created_by' => array( |
|
747
|
|
- 'label' => __('User', 'gravityview'), |
|
|
747
|
+ 'label' => __( 'User', 'gravityview' ), |
|
748
|
748
|
'type' => 'created_by', |
|
749
|
|
- 'desc' => __('Details of the logged-in user who created the entry (if any).', 'gravityview'), |
|
|
749
|
+ 'desc' => __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ), |
|
750
|
750
|
), |
|
751
|
751
|
|
|
752
|
752
|
/** |
|
753
|
753
|
* @since 1.7.2 |
|
754
|
754
|
*/ |
|
755
|
755
|
'other_entries' => array( |
|
756
|
|
- 'label' => __('Other Entries', 'gravityview'), |
|
|
756
|
+ 'label' => __( 'Other Entries', 'gravityview' ), |
|
757
|
757
|
'type' => 'other_entries', |
|
758
|
|
- 'desc' => __('Display other entries created by the entry creator.', 'gravityview'), |
|
|
758
|
+ 'desc' => __( 'Display other entries created by the entry creator.', 'gravityview' ), |
|
759
|
759
|
), |
|
760
|
760
|
); |
|
761
|
761
|
|
|
762
|
|
- if( 'single' !== $zone) { |
|
|
762
|
+ if ( 'single' !== $zone ) { |
|
763
|
763
|
|
|
764
|
|
- $entry_default_fields['entry_link'] = array( |
|
765
|
|
- 'label' => __('Link to Entry', 'gravityview'), |
|
766
|
|
- 'desc' => __('A dedicated link to the single entry with customizable text.', 'gravityview'), |
|
|
764
|
+ $entry_default_fields[ 'entry_link' ] = array( |
|
|
765
|
+ 'label' => __( 'Link to Entry', 'gravityview' ), |
|
|
766
|
+ 'desc' => __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ), |
|
767
|
767
|
'type' => 'entry_link', |
|
768
|
768
|
); |
|
769
|
769
|
} |
|
@@ -773,19 +773,19 @@ discard block |
|
|
block discarded – undo |
|
773
|
773
|
/** |
|
774
|
774
|
* @since 1.2 |
|
775
|
775
|
*/ |
|
776
|
|
- $entry_default_fields['custom'] = array( |
|
777
|
|
- 'label' => __('Custom Content', 'gravityview'), |
|
|
776
|
+ $entry_default_fields[ 'custom' ] = array( |
|
|
777
|
+ 'label' => __( 'Custom Content', 'gravityview' ), |
|
778
|
778
|
'type' => 'custom', |
|
779
|
|
- 'desc' => __('Insert custom text or HTML.', 'gravityview'), |
|
|
779
|
+ 'desc' => __( 'Insert custom text or HTML.', 'gravityview' ), |
|
780
|
780
|
); |
|
781
|
781
|
|
|
782
|
782
|
/** |
|
783
|
783
|
* @since develop |
|
784
|
784
|
*/ |
|
785
|
|
- $entry_default_fields['sequence'] = array( |
|
786
|
|
- 'label' => __('Result Number', 'gravityview'), |
|
|
785
|
+ $entry_default_fields[ 'sequence' ] = array( |
|
|
786
|
+ 'label' => __( 'Result Number', 'gravityview' ), |
|
787
|
787
|
'type' => 'sequence', |
|
788
|
|
- 'desc' => __('Display a sequential result number for each entry.', 'gravityview'), |
|
|
788
|
+ 'desc' => __( 'Display a sequential result number for each entry.', 'gravityview' ), |
|
789
|
789
|
); |
|
790
|
790
|
|
|
791
|
791
|
/** |
|
@@ -794,7 +794,7 @@ discard block |
|
|
block discarded – undo |
|
794
|
794
|
* @param string|array $form form_ID or form object |
|
795
|
795
|
* @param string $zone Either 'single', 'directory', 'header', 'footer' |
|
796
|
796
|
*/ |
|
797
|
|
- return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone); |
|
|
797
|
+ return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone ); |
|
798
|
798
|
} |
|
799
|
799
|
|
|
800
|
800
|
/** |
|
@@ -805,7 +805,7 @@ discard block |
|
|
block discarded – undo |
|
805
|
805
|
*/ |
|
806
|
806
|
function get_available_fields( $form = '', $zone = NULL ) { |
|
807
|
807
|
|
|
808
|
|
- if( empty( $form ) ) { |
|
|
808
|
+ if ( empty( $form ) ) { |
|
809
|
809
|
gravityview()->log->error( '$form is empty' ); |
|
810
|
810
|
return array(); |
|
811
|
811
|
} |
|
@@ -814,7 +814,7 @@ discard block |
|
|
block discarded – undo |
|
814
|
814
|
$fields = gravityview_get_form_fields( $form, true ); |
|
815
|
815
|
|
|
816
|
816
|
// get meta fields ( only if form was already created ) |
|
817
|
|
- if( !is_array( $form ) ) { |
|
|
817
|
+ if ( ! is_array( $form ) ) { |
|
818
|
818
|
$meta_fields = gravityview_get_entry_meta( $form ); |
|
819
|
819
|
} else { |
|
820
|
820
|
$meta_fields = array(); |
|
@@ -827,7 +827,7 @@ discard block |
|
|
block discarded – undo |
|
827
|
827
|
$fields = $fields + $meta_fields + $default_fields; |
|
828
|
828
|
|
|
829
|
829
|
// Move Custom Content to top |
|
830
|
|
- $fields = array( 'custom' => $fields['custom'] ) + $fields; |
|
|
830
|
+ $fields = array( 'custom' => $fields[ 'custom' ] ) + $fields; |
|
831
|
831
|
|
|
832
|
832
|
return $fields; |
|
833
|
833
|
} |
|
@@ -841,11 +841,11 @@ discard block |
|
|
block discarded – undo |
|
841
|
841
|
|
|
842
|
842
|
$widgets = $this->get_registered_widgets(); |
|
843
|
843
|
|
|
844
|
|
- if( !empty( $widgets ) ) { |
|
|
844
|
+ if ( ! empty( $widgets ) ) { |
|
845
|
845
|
|
|
846
|
|
- foreach( $widgets as $id => $details ) { |
|
|
846
|
+ foreach ( $widgets as $id => $details ) { |
|
847
|
847
|
|
|
848
|
|
- echo new GravityView_Admin_View_Widget( $details['label'], $id, $details ); |
|
|
848
|
+ echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details ); |
|
849
|
849
|
|
|
850
|
850
|
} |
|
851
|
851
|
} |
|
@@ -874,7 +874,7 @@ discard block |
|
|
block discarded – undo |
|
874
|
874
|
function render_active_areas( $template_id, $type, $zone, $rows, $values ) { |
|
875
|
875
|
global $post; |
|
876
|
876
|
|
|
877
|
|
- if( $type === 'widget' ) { |
|
|
877
|
+ if ( $type === 'widget' ) { |
|
878
|
878
|
$button_label = __( 'Add Widget', 'gravityview' ); |
|
879
|
879
|
} else { |
|
880
|
880
|
$button_label = __( 'Add Field', 'gravityview' ); |
|
@@ -886,10 +886,10 @@ discard block |
|
|
block discarded – undo |
|
886
|
886
|
$form_id = null; |
|
887
|
887
|
|
|
888
|
888
|
// if saved values, get available fields to label everyone |
|
889
|
|
- if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) { |
|
|
889
|
+ if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) { |
|
890
|
890
|
|
|
891
|
|
- if( !empty( $_POST['template_id'] ) ) { |
|
892
|
|
- $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
|
891
|
+ if ( ! empty( $_POST[ 'template_id' ] ) ) { |
|
|
892
|
+ $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
893
|
893
|
} else { |
|
894
|
894
|
$form_id = $form = gravityview_get_form_id( $post->ID ); |
|
895
|
895
|
} |
|
@@ -907,44 +907,44 @@ discard block |
|
|
block discarded – undo |
|
907
|
907
|
} |
|
908
|
908
|
} |
|
909
|
909
|
|
|
910
|
|
- foreach( $rows as $row ) : |
|
911
|
|
- foreach( $row as $col => $areas ) : |
|
912
|
|
- $column = ($col == '2-2') ? '1-2' : $col; ?> |
|
|
910
|
+ foreach ( $rows as $row ) : |
|
|
911
|
+ foreach ( $row as $col => $areas ) : |
|
|
912
|
+ $column = ( $col == '2-2' ) ? '1-2' : $col; ?> |
|
913
|
913
|
|
|
914
|
914
|
<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> |
|
915
|
915
|
|
|
916
|
|
- <?php foreach( $areas as $area ) : ?> |
|
|
916
|
+ <?php foreach ( $areas as $area ) : ?> |
|
917
|
917
|
|
|
918
|
|
- <div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"> |
|
919
|
|
- <div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"> |
|
|
918
|
+ <div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"> |
|
|
919
|
+ <div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"> |
|
920
|
920
|
|
|
921
|
921
|
<?php // render saved fields |
|
922
|
922
|
|
|
923
|
|
- if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) { |
|
|
923
|
+ if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) { |
|
924
|
924
|
|
|
925
|
|
- foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) { |
|
|
925
|
+ foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) { |
|
926
|
926
|
|
|
927
|
927
|
// Maybe has a form ID |
|
928
|
|
- $form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id']; |
|
|
928
|
+ $form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ]; |
|
929
|
929
|
|
|
930
|
930
|
$input_type = NULL; |
|
931
|
931
|
|
|
932
|
932
|
if ( $form_id ) { |
|
933
|
|
- $original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ; |
|
|
933
|
+ $original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false; |
|
934
|
934
|
} else { |
|
935
|
|
- $original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ; |
|
|
935
|
+ $original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false; |
|
936
|
936
|
} |
|
937
|
937
|
|
|
938
|
|
- if ( !$original_item ) { |
|
939
|
|
- 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 ) ) ); |
|
|
938
|
+ if ( ! $original_item ) { |
|
|
939
|
+ 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 ) ) ); |
|
940
|
940
|
|
|
941
|
941
|
$original_item = $field; |
|
942
|
942
|
} else { |
|
943
|
|
- $input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL; |
|
|
943
|
+ $input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL; |
|
944
|
944
|
} |
|
945
|
945
|
|
|
946
|
946
|
// Field options dialog box |
|
947
|
|
- $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 ); |
|
|
947
|
+ $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 ); |
|
948
|
948
|
|
|
949
|
949
|
$item = array( |
|
950
|
950
|
'input_type' => $input_type, |
|
@@ -957,23 +957,23 @@ discard block |
|
|
block discarded – undo |
|
957
|
957
|
$item = wp_parse_args( $item, $original_item ); |
|
958
|
958
|
} |
|
959
|
959
|
|
|
960
|
|
- switch( $type ) { |
|
|
960
|
+ switch ( $type ) { |
|
961
|
961
|
case 'widget': |
|
962
|
|
- echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field ); |
|
|
962
|
+ echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field ); |
|
963
|
963
|
break; |
|
964
|
964
|
default: |
|
965
|
|
- echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id ); |
|
|
965
|
+ echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id ); |
|
966
|
966
|
} |
|
967
|
967
|
} |
|
968
|
968
|
|
|
969
|
969
|
} // End if zone is not empty ?> |
|
970
|
970
|
|
|
971
|
|
- <span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span> |
|
|
971
|
+ <span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span> |
|
972
|
972
|
</div> |
|
973
|
973
|
<div class="gv-droppable-area-action"> |
|
974
|
|
- <a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></a> |
|
|
974
|
+ <a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a> |
|
975
|
975
|
|
|
976
|
|
- <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"> – <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p> |
|
|
976
|
+ <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"> – <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p> |
|
977
|
977
|
</div> |
|
978
|
978
|
</div> |
|
979
|
979
|
|
|
@@ -996,7 +996,7 @@ discard block |
|
|
block discarded – undo |
|
996
|
996
|
$default_widget_areas = \GV\Widget::get_default_widget_areas(); |
|
997
|
997
|
|
|
998
|
998
|
$widgets = array(); |
|
999
|
|
- if( !empty( $post_id ) ) { |
|
|
999
|
+ if ( ! empty( $post_id ) ) { |
|
1000
|
1000
|
$widgets = gravityview_get_directory_widgets( $post_id ); |
|
1001
|
1001
|
} |
|
1002
|
1002
|
|
|
@@ -1029,7 +1029,7 @@ discard block |
|
|
block discarded – undo |
|
1029
|
1029
|
// list of available fields to be shown in the popup |
|
1030
|
1030
|
$forms = gravityview_get_forms( 'any' ); |
|
1031
|
1031
|
|
|
1032
|
|
- $form_ids = array_map( function ($form) { return $form['id']; }, $forms); |
|
|
1032
|
+ $form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms ); |
|
1033
|
1033
|
|
|
1034
|
1034
|
foreach ( $form_ids as $form_id ) { |
|
1035
|
1035
|
$filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id ); |
|
@@ -1042,7 +1042,7 @@ discard block |
|
|
block discarded – undo |
|
1042
|
1042
|
</div> |
|
1043
|
1043
|
|
|
1044
|
1044
|
<div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox"> |
|
1045
|
|
- <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?> |
|
|
1045
|
+ <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?> |
|
1046
|
1046
|
</div> |
|
1047
|
1047
|
|
|
1048
|
1048
|
<div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div> |
|
@@ -1061,7 +1061,7 @@ discard block |
|
|
block discarded – undo |
|
1061
|
1061
|
* @return string HTML of the active areas |
|
1062
|
1062
|
*/ |
|
1063
|
1063
|
function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) { |
|
1064
|
|
- if( empty( $template_id ) ) { |
|
|
1064
|
+ if ( empty( $template_id ) ) { |
|
1065
|
1065
|
gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) ); |
|
1066
|
1066
|
return ''; |
|
1067
|
1067
|
} |
|
@@ -1075,12 +1075,12 @@ discard block |
|
|
block discarded – undo |
|
1075
|
1075
|
*/ |
|
1076
|
1076
|
$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context ); |
|
1077
|
1077
|
|
|
1078
|
|
- if( empty( $template_areas ) ) { |
|
|
1078
|
+ if ( empty( $template_areas ) ) { |
|
1079
|
1079
|
|
|
1080
|
1080
|
gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) ); |
|
1081
|
1081
|
$output = '<div>'; |
|
1082
|
|
- $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>'; |
|
1083
|
|
- $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>'; |
|
|
1082
|
+ $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>'; |
|
|
1083
|
+ $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>'; |
|
1084
|
1084
|
$output .= '</div>'; |
|
1085
|
1085
|
} else { |
|
1086
|
1086
|
|
|
@@ -1095,7 +1095,7 @@ discard block |
|
|
block discarded – undo |
|
1095
|
1095
|
|
|
1096
|
1096
|
} |
|
1097
|
1097
|
|
|
1098
|
|
- if( $echo ) { |
|
|
1098
|
+ if ( $echo ) { |
|
1099
|
1099
|
echo $output; |
|
1100
|
1100
|
} |
|
1101
|
1101
|
|
|
@@ -1115,32 +1115,32 @@ discard block |
|
|
block discarded – undo |
|
1115
|
1115
|
$is_widgets_page = ( $pagenow === 'widgets.php' ); |
|
1116
|
1116
|
|
|
1117
|
1117
|
// Add the GV font (with the Astronaut) |
|
1118
|
|
- wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version ); |
|
|
1118
|
+ wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version ); |
|
1119
|
1119
|
wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version ); |
|
1120
|
1120
|
|
|
1121
|
|
- wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true ); |
|
|
1121
|
+ wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true ); |
|
1122
|
1122
|
|
|
1123
|
|
- if( GFForms::get_page() === 'form_list' ) { |
|
|
1123
|
+ if ( GFForms::get_page() === 'form_list' ) { |
|
1124
|
1124
|
wp_enqueue_style( 'gravityview_views_styles' ); |
|
1125
|
1125
|
return; |
|
1126
|
1126
|
} |
|
1127
|
1127
|
|
|
1128
|
1128
|
// Don't process any scripts below here if it's not a GravityView page. |
|
1129
|
|
- if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) { |
|
|
1129
|
+ if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) { |
|
1130
|
1130
|
return; |
|
1131
|
1131
|
} |
|
1132
|
1132
|
|
|
1133
|
1133
|
wp_enqueue_script( 'jquery-ui-datepicker' ); |
|
1134
|
|
- wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version ); |
|
|
1134
|
+ wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version ); |
|
1135
|
1135
|
|
|
1136
|
|
- $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; |
|
|
1136
|
+ $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
1137
|
1137
|
|
|
1138
|
1138
|
//enqueue scripts |
|
1139
|
1139
|
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 ); |
|
1140
|
1140
|
|
|
1141
|
|
- wp_localize_script('gravityview_views_scripts', 'gvGlobals', array( |
|
|
1141
|
+ wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array( |
|
1142
|
1142
|
'cookiepath' => COOKIEPATH, |
|
1143
|
|
- 'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ), |
|
|
1143
|
+ 'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ), |
|
1144
|
1144
|
'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ), |
|
1145
|
1145
|
'label_viewname' => __( 'Enter View name here', 'gravityview' ), |
|
1146
|
1146
|
'label_close' => __( 'Close', 'gravityview' ), |
|
@@ -1152,7 +1152,7 @@ discard block |
|
|
block discarded – undo |
|
1152
|
1152
|
'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ), |
|
1153
|
1153
|
'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ), |
|
1154
|
1154
|
'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' ), |
|
1155
|
|
- )); |
|
|
1155
|
+ ) ); |
|
1156
|
1156
|
|
|
1157
|
1157
|
wp_enqueue_style( 'gravityview_views_styles' ); |
|
1158
|
1158
|
|
|
@@ -1179,7 +1179,7 @@ discard block |
|
|
block discarded – undo |
|
1179
|
1179
|
); |
|
1180
|
1180
|
|
|
1181
|
1181
|
if ( wp_is_mobile() ) { |
|
1182
|
|
- $scripts[] = 'jquery-touch-punch'; |
|
|
1182
|
+ $scripts[ ] = 'jquery-touch-punch'; |
|
1183
|
1183
|
} |
|
1184
|
1184
|
|
|
1185
|
1185
|
wp_enqueue_script( $scripts ); |