@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | |
32 | 32 | <?php |
33 | 33 | |
34 | - do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
34 | + do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
35 | 35 | |
36 | - do_action('gravityview_render_field_pickers', 'directory' ); |
|
36 | + do_action('gravityview_render_field_pickers', 'directory' ); |
|
37 | 37 | |
38 | - ?> |
|
38 | + ?> |
|
39 | 39 | |
40 | 40 | <?php // list of available widgets to be shown in the popup ?> |
41 | 41 | <div id="directory-available-widgets" class="hide-if-js gv-tooltip"> |
@@ -60,13 +60,13 @@ discard block |
||
60 | 60 | |
61 | 61 | <div id="single-active-fields" class="gv-grid"> |
62 | 62 | <?php |
63 | - if(!empty( $curr_template ) ) { |
|
64 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
65 | - } |
|
66 | - ?> |
|
63 | + if(!empty( $curr_template ) ) { |
|
64 | + do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
65 | + } |
|
66 | + ?> |
|
67 | 67 | </div> |
68 | 68 | <?php |
69 | - do_action('gravityview_render_field_pickers', 'single' ); |
|
69 | + do_action('gravityview_render_field_pickers', 'single' ); |
|
70 | 70 | ?> |
71 | 71 | </div> |
72 | 72 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | </div> |
86 | 86 | |
87 | 87 | <?php |
88 | - do_action('gravityview_render_field_pickers', 'edit' ); |
|
88 | + do_action('gravityview_render_field_pickers', 'edit' ); |
|
89 | 89 | ?> |
90 | 90 | |
91 | 91 | </div> |
@@ -15,32 +15,32 @@ discard block |
||
15 | 15 | |
16 | 16 | <div id="directory-fields" class="gv-section"> |
17 | 17 | |
18 | - <h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4> |
|
18 | + <h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4> |
|
19 | 19 | |
20 | - <?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?> |
|
20 | + <?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?> |
|
21 | 21 | |
22 | - <h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4> |
|
22 | + <h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4> |
|
23 | 23 | |
24 | 24 | <div id="directory-active-fields" class="gv-grid"> |
25 | - <?php if(!empty( $curr_template ) ) { |
|
26 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true ); |
|
25 | + <?php if ( ! empty( $curr_template ) ) { |
|
26 | + do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true ); |
|
27 | 27 | } ?> |
28 | 28 | </div> |
29 | 29 | |
30 | - <h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4> |
|
30 | + <h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4> |
|
31 | 31 | |
32 | 32 | <?php |
33 | 33 | |
34 | - do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
34 | + do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
35 | 35 | |
36 | - do_action('gravityview_render_field_pickers', 'directory' ); |
|
36 | + do_action( 'gravityview_render_field_pickers', 'directory' ); |
|
37 | 37 | |
38 | 38 | ?> |
39 | 39 | |
40 | 40 | <?php // list of available widgets to be shown in the popup ?> |
41 | 41 | <div id="directory-available-widgets" class="hide-if-js gv-tooltip"> |
42 | 42 | <span class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></span> |
43 | - <?php do_action('gravityview_render_available_widgets' ); ?> |
|
43 | + <?php do_action( 'gravityview_render_available_widgets' ); ?> |
|
44 | 44 | </div> |
45 | 45 | |
46 | 46 | </div> |
@@ -56,17 +56,17 @@ discard block |
||
56 | 56 | |
57 | 57 | <div id="single-fields" class="gv-section"> |
58 | 58 | |
59 | - <h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4> |
|
59 | + <h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4> |
|
60 | 60 | |
61 | 61 | <div id="single-active-fields" class="gv-grid"> |
62 | 62 | <?php |
63 | - if(!empty( $curr_template ) ) { |
|
64 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
63 | + if ( ! empty( $curr_template ) ) { |
|
64 | + do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
65 | 65 | } |
66 | 66 | ?> |
67 | 67 | </div> |
68 | 68 | <?php |
69 | - do_action('gravityview_render_field_pickers', 'single' ); |
|
69 | + do_action( 'gravityview_render_field_pickers', 'single' ); |
|
70 | 70 | ?> |
71 | 71 | </div> |
72 | 72 | |
@@ -76,16 +76,16 @@ discard block |
||
76 | 76 | |
77 | 77 | <div id="edit-fields" class="gv-section"> |
78 | 78 | |
79 | - <h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4> |
|
79 | + <h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4> |
|
80 | 80 | |
81 | 81 | <div id="edit-active-fields" class="gv-grid"> |
82 | 82 | <?php |
83 | - do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true ); |
|
83 | + do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true ); |
|
84 | 84 | ?> |
85 | 85 | </div> |
86 | 86 | |
87 | 87 | <?php |
88 | - do_action('gravityview_render_field_pickers', 'edit' ); |
|
88 | + do_action( 'gravityview_render_field_pickers', 'edit' ); |
|
89 | 89 | ?> |
90 | 90 | |
91 | 91 | </div> |
@@ -22,27 +22,27 @@ |
||
22 | 22 | |
23 | 23 | <?php // list all the available templates (type= fresh or custom ) ?> |
24 | 24 | <div class="gv-grid"> |
25 | - <?php foreach( $templates as $id => $template ) { |
|
25 | + <?php foreach ( $templates as $id => $template ) { |
|
26 | 26 | $selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?> |
27 | 27 | |
28 | 28 | <div class="gv-grid-col-1-3"> |
29 | - <div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>"> |
|
29 | + <div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>"> |
|
30 | 30 | <div class="gv-view-types-hover"> |
31 | 31 | <div> |
32 | - <?php if( !empty( $template['buy_source'] ) ) { ?> |
|
33 | - <p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p> |
|
32 | + <?php if ( ! empty( $template[ 'buy_source' ] ) ) { ?> |
|
33 | + <p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p> |
|
34 | 34 | <?php } else { ?> |
35 | - <p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></button></p> |
|
36 | - <?php if( !empty( $template['preview'] ) ) { ?> |
|
37 | - <a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a> |
|
35 | + <p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></button></p> |
|
36 | + <?php if ( ! empty( $template[ 'preview' ] ) ) { ?> |
|
37 | + <a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a> |
|
38 | 38 | <?php } ?> |
39 | 39 | <?php } ?> |
40 | 40 | </div> |
41 | 41 | </div> |
42 | 42 | <div class="gv-view-types-normal"> |
43 | - <img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>"> |
|
44 | - <h5><?php echo esc_html( $template['label'] ); ?></h5> |
|
45 | - <p class="description"><?php echo esc_html( $template['description'] ); ?></p> |
|
43 | + <img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>"> |
|
44 | + <h5><?php echo esc_html( $template[ 'label' ] ); ?></h5> |
|
45 | + <p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p> |
|
46 | 46 | </div> |
47 | 47 | </div> |
48 | 48 | </div> |
@@ -10,13 +10,13 @@ discard block |
||
10 | 10 | wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' ); |
11 | 11 | |
12 | 12 | //current value |
13 | -$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) ); |
|
13 | +$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) ); |
|
14 | 14 | |
15 | 15 | // If form is in trash or not existing, show error |
16 | 16 | GravityView_Admin::connected_form_warning( $current_form ); |
17 | 17 | |
18 | 18 | // check for available gravity forms |
19 | -$forms = gravityview_get_forms('any'); |
|
19 | +$forms = gravityview_get_forms( 'any' ); |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @param int $current_form Form currently selected in the View (0 if none selected) |
@@ -35,24 +35,24 @@ discard block |
||
35 | 35 | ?> |
36 | 36 | <a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a> |
37 | 37 | |
38 | - <?php if( !empty( $forms ) ) { ?> |
|
38 | + <?php if ( ! empty( $forms ) ) { ?> |
|
39 | 39 | <span> <?php esc_html_e( 'or use an existing form', 'gravityview' ); ?> </span> |
40 | 40 | <?php } |
41 | 41 | } |
42 | 42 | |
43 | 43 | // If there are no forms to select, show no forms. |
44 | - if( !empty( $forms ) ) { ?> |
|
44 | + if ( ! empty( $forms ) ) { ?> |
|
45 | 45 | <select name="gravityview_form_id" id="gravityview_form_id"> |
46 | 46 | <option value="" <?php selected( '', $current_form, true ); ?>>— <?php esc_html_e( 'list of forms', 'gravityview' ); ?> —</option> |
47 | - <?php foreach( $forms as $form ) { ?> |
|
48 | - <option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option> |
|
47 | + <?php foreach ( $forms as $form ) { ?> |
|
48 | + <option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option> |
|
49 | 49 | <?php } ?> |
50 | 50 | </select> |
51 | 51 | <?php } else { ?> |
52 | 52 | <select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select> |
53 | 53 | <?php } ?> |
54 | 54 | |
55 | - <button class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button> |
|
55 | + <button class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button> |
|
56 | 56 | </p> |
57 | 57 | |
58 | 58 | <?php // confirm dialog box ?> |
@@ -44,12 +44,12 @@ discard block |
||
44 | 44 | */ |
45 | 45 | protected $form_id; |
46 | 46 | |
47 | - function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) { |
|
47 | + function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) { |
|
48 | 48 | |
49 | 49 | // Backward compat |
50 | - if ( ! empty( $item['type'] ) ) { |
|
51 | - $item['input_type'] = $item['type']; |
|
52 | - unset( $item['type'] ); |
|
50 | + if ( ! empty( $item[ 'type' ] ) ) { |
|
51 | + $item[ 'input_type' ] = $item[ 'type' ]; |
|
52 | + unset( $item[ 'type' ] ); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) { |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $this->id = $item_id; |
76 | 76 | $this->form_id = $form_id; |
77 | 77 | $this->settings = $settings; |
78 | - $this->label_type = $item['label_type']; |
|
78 | + $this->label_type = $item[ 'label_type' ]; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -119,14 +119,14 @@ discard block |
||
119 | 119 | |
120 | 120 | foreach ( $field_info_items as $item ) { |
121 | 121 | |
122 | - if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) { |
|
122 | + if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) { |
|
123 | 123 | continue; |
124 | 124 | } |
125 | 125 | |
126 | - $class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description'; |
|
126 | + $class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description'; |
|
127 | 127 | // Add the title in case the value's long, in which case, it'll be truncated by CSS. |
128 | 128 | $output .= '<span class="' . $class . '">'; |
129 | - $output .= esc_html( $item['value'] ); |
|
129 | + $output .= esc_html( $item[ 'value' ] ); |
|
130 | 130 | $output .= '</span>'; |
131 | 131 | } |
132 | 132 | |
@@ -154,21 +154,21 @@ discard block |
||
154 | 154 | |
155 | 155 | // $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know. |
156 | 156 | // TODO: Un-hack this |
157 | - $hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
158 | - $settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class ); |
|
157 | + $hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
158 | + $settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class ); |
|
159 | 159 | |
160 | 160 | // Should we show the icon that the field is being used as a link to single entry? |
161 | - $hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : ''; |
|
161 | + $hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : ''; |
|
162 | 162 | $show_as_link = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>'; |
163 | 163 | |
164 | 164 | // When a field label is empty, use the Field ID |
165 | 165 | $label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title; |
166 | 166 | |
167 | 167 | // If there's a custom label, and show label is checked, use that as the field heading |
168 | - if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) { |
|
169 | - $label = $this->settings['custom_label']; |
|
170 | - } else if ( ! empty( $this->item['customLabel'] ) ) { |
|
171 | - $label = $this->item['customLabel']; |
|
168 | + if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) { |
|
169 | + $label = $this->settings[ 'custom_label' ]; |
|
170 | + } else if ( ! empty( $this->item[ 'customLabel' ] ) ) { |
|
171 | + $label = $this->item[ 'customLabel' ]; |
|
172 | 172 | } |
173 | 173 | $label = esc_attr( $label ); |
174 | 174 | |
@@ -176,8 +176,8 @@ discard block |
||
176 | 176 | |
177 | 177 | $output .= '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">'; |
178 | 178 | |
179 | - if ( ! empty( $this->item['parent'] ) ) { |
|
180 | - $label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>'; |
|
179 | + if ( ! empty( $this->item[ 'parent' ] ) ) { |
|
180 | + $label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>'; |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | // Name of field / widget |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | |
194 | 194 | $output .= '</h5>'; |
195 | 195 | |
196 | - $container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : ''; |
|
197 | - $data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
196 | + $container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : ''; |
|
197 | + $data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
198 | 198 | |
199 | - $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>'; |
|
199 | + $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>'; |
|
200 | 200 | |
201 | 201 | return $output; |
202 | 202 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), array( __CLASS__, 'render' ), 20000 ); |
27 | 27 | wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true ); |
28 | 28 | |
29 | - if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) { |
|
29 | + if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) { |
|
30 | 30 | add_action( 'template_redirect', array( __CLASS__, 'render_provider_request' ) ); |
31 | 31 | } |
32 | 32 | |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | * @return void |
44 | 44 | */ |
45 | 45 | public static function render_provider_request() { |
46 | - if ( ! empty( $_GET['url'] ) ) { |
|
47 | - $url = $_GET['url']; |
|
46 | + if ( ! empty( $_GET[ 'url' ] ) ) { |
|
47 | + $url = $_GET[ 'url' ]; |
|
48 | 48 | } else { |
49 | 49 | header( 'HTTP/1.0 404 Not Found' ); |
50 | 50 | exit; |
@@ -111,18 +111,18 @@ discard block |
||
111 | 111 | */ |
112 | 112 | private static function parse_matches( $matches, $url ) { |
113 | 113 | // If not using permalinks, re-assign values for matching groups |
114 | - if ( ! empty( $matches['entry_slug2'] ) ) { |
|
115 | - $matches['is_cpt'] = $matches['is_cpt2']; |
|
116 | - $matches['slug'] = $matches['slug2']; |
|
117 | - $matches['entry_slug'] = $matches['entry_slug2']; |
|
118 | - unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] ); |
|
114 | + if ( ! empty( $matches[ 'entry_slug2' ] ) ) { |
|
115 | + $matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ]; |
|
116 | + $matches[ 'slug' ] = $matches[ 'slug2' ]; |
|
117 | + $matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ]; |
|
118 | + unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] ); |
|
119 | 119 | } |
120 | 120 | |
121 | - if ( empty( $matches['entry_slug'] ) ) { |
|
121 | + if ( empty( $matches[ 'entry_slug' ] ) ) { |
|
122 | 122 | gravityview()->log->error( 'Entry slug not parsed by regex.', array( 'data' => $matches ) ); |
123 | 123 | return null; |
124 | 124 | } else { |
125 | - $entry_id = $matches['entry_slug']; |
|
125 | + $entry_id = $matches[ 'entry_slug' ]; |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) { |
@@ -140,12 +140,12 @@ discard block |
||
140 | 140 | if ( ! $view ) { |
141 | 141 | |
142 | 142 | // If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID |
143 | - if( is_numeric( $matches['slug'] ) ) { |
|
144 | - $view = \GV\View::by_id( $matches['slug'] ); |
|
143 | + if ( is_numeric( $matches[ 'slug' ] ) ) { |
|
144 | + $view = \GV\View::by_id( $matches[ 'slug' ] ); |
|
145 | 145 | } |
146 | 146 | |
147 | - if( ! $view ) { |
|
148 | - $view = \GV\View::from_post( get_page_by_path( $matches['slug'], OBJECT, 'gravityview' ) ); |
|
147 | + if ( ! $view ) { |
|
148 | + $view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) ); |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | |
@@ -176,9 +176,9 @@ discard block |
||
176 | 176 | |
177 | 177 | return ' |
178 | 178 | <div class="loading-placeholder" style="background-color:#e6f0f5;"> |
179 | - <h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3> |
|
179 | + <h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3> |
|
180 | 180 | <p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;"> |
181 | - '.$embed_text.' |
|
181 | + '.$embed_text . ' |
|
182 | 182 | </p> |
183 | 183 | <br style="clear: both;"> |
184 | 184 | </div>'; |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | private static function render_preview_notice() { |
193 | 193 | $floaty = \GravityView_Admin::get_floaty(); |
194 | 194 | $title = esc_html__( 'This will look better when it is embedded.', 'gravityview' ); |
195 | - $message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview'); |
|
196 | - return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>'; |
|
195 | + $message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' ); |
|
196 | + return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>'; |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | /** |
@@ -212,13 +212,13 @@ discard block |
||
212 | 212 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
213 | 213 | } |
214 | 214 | |
215 | - if ( $entry && 'active' !== $entry['status'] ) { |
|
215 | + if ( $entry && 'active' !== $entry[ 'status' ] ) { |
|
216 | 216 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
217 | 217 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
218 | 218 | } |
219 | 219 | |
220 | 220 | if ( $view->settings->get( 'show_only_approved' ) ) { |
221 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
221 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
222 | 222 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
223 | 223 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
224 | 224 | } |
@@ -249,9 +249,9 @@ discard block |
||
249 | 249 | * Mocks old context, etc. |
250 | 250 | */ |
251 | 251 | $loader = \GravityView_Edit_Entry::getInstance(); |
252 | - $render = $loader->instances['render']; |
|
252 | + $render = $loader->instances[ 'render' ]; |
|
253 | 253 | |
254 | - $form = \GFAPI::get_form( $entry['form_id'] ); |
|
254 | + $form = \GFAPI::get_form( $entry[ 'form_id' ] ); |
|
255 | 255 | |
256 | 256 | // @todo We really need to rewrite Edit Entry soon |
257 | 257 | \GravityView_View::$instance = null; |
@@ -260,13 +260,13 @@ discard block |
||
260 | 260 | $data = \GravityView_View_Data::getInstance( get_post( $view->ID ) ); |
261 | 261 | $template = \GravityView_View::getInstance( array( |
262 | 262 | 'form' => $form, |
263 | - 'form_id' => $form['id'], |
|
263 | + 'form_id' => $form[ 'id' ], |
|
264 | 264 | 'view_id' => $view->ID, |
265 | 265 | 'entries' => array( $entry->as_entry() ), |
266 | 266 | 'atts' => \GVCommon::get_template_settings( $view->ID ), |
267 | 267 | ) ); |
268 | 268 | |
269 | - ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view ); |
|
269 | + ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view ); |
|
270 | 270 | $output = ob_get_clean(); // Render :) |
271 | 271 | } else { |
272 | 272 | /** Remove the back link. */ |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | // Catch either |
311 | 311 | $match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})"; |
312 | 312 | |
313 | - return '#'.$match_regex.'#i'; |
|
313 | + return '#' . $match_regex . '#i'; |
|
314 | 314 | } |
315 | 315 | |
316 | 316 | /** |
@@ -67,20 +67,20 @@ discard block |
||
67 | 67 | $result = array(); |
68 | 68 | if ( ! $lock_holder_user_id ) { |
69 | 69 | $this->set_lock( $object_id ); |
70 | - $result['html'] = __( 'You now have control', 'gravityforms' ); |
|
71 | - $result['status'] = 'lock_obtained'; |
|
70 | + $result[ 'html' ] = __( 'You now have control', 'gravityforms' ); |
|
71 | + $result[ 'status' ] = 'lock_obtained'; |
|
72 | 72 | } else { |
73 | 73 | |
74 | - if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
74 | + if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
75 | 75 | $user = get_userdata( $lock_holder_user_id ); |
76 | - $result['html'] = sprintf( __( 'Your request has been sent to %s.', 'gravityforms' ), $user->display_name ); |
|
76 | + $result[ 'html' ] = sprintf( __( 'Your request has been sent to %s.', 'gravityforms' ), $user->display_name ); |
|
77 | 77 | } else { |
78 | - $result['html'] = __( 'Your request has been sent.', 'gravityforms' ); |
|
78 | + $result[ 'html' ] = __( 'Your request has been sent.', 'gravityforms' ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | $this->update_lock_request_meta( $object_id, $user_id ); |
82 | 82 | |
83 | - $result['status'] = 'lock_requested'; |
|
83 | + $result[ 'status' ] = 'lock_requested'; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return $result; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | return; |
106 | 106 | } |
107 | 107 | |
108 | - $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET['gform_debug'] ) ? '' : '.min'; |
|
108 | + $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET[ 'gform_debug' ] ) ? '' : '.min'; |
|
109 | 109 | $locking_path = GFCommon::get_base_url() . '/includes/locking/'; |
110 | 110 | |
111 | 111 | wp_enqueue_script( 'gforms_locking', $locking_path . "js/locking{$min}.js", array( 'jquery', 'heartbeat' ), GFCommon::$version ); |
@@ -114,20 +114,20 @@ discard block |
||
114 | 114 | $translations = array_map( 'wp_strip_all_tags', $this->get_strings() ); |
115 | 115 | |
116 | 116 | $strings = array( |
117 | - 'noResponse' => $translations['no_response'], |
|
118 | - 'requestAgain' => $translations['request_again'], |
|
119 | - 'requestError' => $translations['request_error'], |
|
120 | - 'gainedControl' => $translations['gained_control'], |
|
121 | - 'rejected' => $translations['request_rejected'], |
|
122 | - 'pending' => $translations['request_pending'], |
|
117 | + 'noResponse' => $translations[ 'no_response' ], |
|
118 | + 'requestAgain' => $translations[ 'request_again' ], |
|
119 | + 'requestError' => $translations[ 'request_error' ], |
|
120 | + 'gainedControl' => $translations[ 'gained_control' ], |
|
121 | + 'rejected' => $translations[ 'request_rejected' ], |
|
122 | + 'pending' => $translations[ 'request_pending' ], |
|
123 | 123 | ); |
124 | 124 | |
125 | - $lock_user_id = $this->check_lock( $entry['id'] ); |
|
125 | + $lock_user_id = $this->check_lock( $entry[ 'id' ] ); |
|
126 | 126 | |
127 | 127 | $vars = array( |
128 | 128 | 'hasLock' => ! $lock_user_id ? 1 : 0, |
129 | 129 | 'lockUI' => $this->get_lock_ui( $lock_user_id ), |
130 | - 'objectID' => $entry['id'], |
|
130 | + 'objectID' => $entry[ 'id' ], |
|
131 | 131 | 'objectType' => 'entry', |
132 | 132 | 'strings' => $strings, |
133 | 133 | ); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $hidden = $locked ? '' : ' hidden'; |
158 | 158 | if ( $locked ) { |
159 | 159 | |
160 | - if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
160 | + if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
161 | 161 | $avatar = get_avatar( $user->ID, 64 ); |
162 | 162 | $person_editing_text = $user->display_name; |
163 | 163 | } else { |
@@ -264,11 +264,11 @@ discard block |
||
264 | 264 | |
265 | 265 | $current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) ); |
266 | 266 | |
267 | - if ( isset( $_GET['get-edit-lock'] ) ) { |
|
267 | + if ( isset( $_GET[ 'get-edit-lock' ] ) ) { |
|
268 | 268 | $this->set_lock( $entry_id ); |
269 | 269 | echo '<script>window.location = ' . json_encode( remove_query_arg( 'get-edit-lock', $current_url ) ) . ';</script>'; |
270 | 270 | exit(); |
271 | - } else if ( isset( $_GET['release-edit-lock'] ) ) { |
|
271 | + } else if ( isset( $_GET[ 'release-edit-lock' ] ) ) { |
|
272 | 272 | $this->delete_lock_meta( $entry_id ); |
273 | 273 | $current_url = remove_query_arg( 'edit', $current_url ); |
274 | 274 | echo '<script>window.location = ' . json_encode( remove_query_arg( 'release-edit-lock', $current_url ) ) . ';</script>'; |