@@ -16,17 +16,17 @@ |
||
16 | 16 | */ |
17 | 17 | function gravityview_register_gravityview_widgets() { |
18 | 18 | |
19 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' ); |
|
19 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' ); |
|
20 | 20 | |
21 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' ); |
|
22 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' ); |
|
23 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-gravityforms.php' ); |
|
24 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' ); |
|
25 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' ); |
|
26 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' ); |
|
21 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' ); |
|
22 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' ); |
|
23 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-gravityforms.php' ); |
|
24 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' ); |
|
25 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' ); |
|
26 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' ); |
|
27 | 27 | |
28 | - if( class_exists('GFPolls') ) { |
|
29 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' ); |
|
28 | + if ( class_exists( 'GFPolls' ) ) { |
|
29 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' ); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | } |
@@ -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' ) ) { |
@@ -76,7 +76,7 @@ discard block |
||
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 |
||
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 | |
@@ -156,46 +156,46 @@ discard block |
||
156 | 156 | |
157 | 157 | // $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know. |
158 | 158 | // TODO: Un-hack this |
159 | - $hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
160 | - $settings_link = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class ); |
|
159 | + $hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
160 | + $settings_link = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class ); |
|
161 | 161 | |
162 | 162 | // When a field label is empty, use the Field ID |
163 | 163 | $label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title; |
164 | 164 | |
165 | 165 | // If there's a custom label, and show label is checked, use that as the field heading |
166 | - if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) { |
|
167 | - $label = $this->settings['custom_label']; |
|
168 | - } else if ( ! empty( $this->item['customLabel'] ) ) { |
|
169 | - $label = $this->item['customLabel']; |
|
166 | + if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) { |
|
167 | + $label = $this->settings[ 'custom_label' ]; |
|
168 | + } else if ( ! empty( $this->item[ 'customLabel' ] ) ) { |
|
169 | + $label = $this->item[ 'customLabel' ]; |
|
170 | 170 | } |
171 | 171 | $label = esc_attr( $label ); |
172 | 172 | |
173 | 173 | $field_icon = ''; |
174 | 174 | |
175 | 175 | $form = ! empty( $this->form_id ) ? GVCommon::get_form( $this->form_id ) : false; |
176 | - $nonexistent_form_field = $form && $this->id && preg_match('/^\d+\.\d+$|^\d+$/', $this->id) && ! gravityview_get_field( $form, $this->id ); |
|
176 | + $nonexistent_form_field = $form && $this->id && preg_match( '/^\d+\.\d+$|^\d+$/', $this->id ) && ! gravityview_get_field( $form, $this->id ); |
|
177 | 177 | |
178 | - if ( $this->item['icon'] && ! \GV\Utils::get( $this->item, 'parent' ) ) { |
|
178 | + if ( $this->item[ 'icon' ] && ! \GV\Utils::get( $this->item, 'parent' ) ) { |
|
179 | 179 | |
180 | - $has_gf_icon = ( false !== strpos( $this->item['icon'], 'gform-icon' ) ); |
|
181 | - $has_dashicon = ( false !== strpos( $this->item['icon'], 'dashicons' ) ); |
|
180 | + $has_gf_icon = ( false !== strpos( $this->item[ 'icon' ], 'gform-icon' ) ); |
|
181 | + $has_dashicon = ( false !== strpos( $this->item[ 'icon' ], 'dashicons' ) ); |
|
182 | 182 | |
183 | - if ( 0 === strpos( $this->item['icon'], 'data:' ) ) { |
|
183 | + if ( 0 === strpos( $this->item[ 'icon' ], 'data:' ) ) { |
|
184 | 184 | // Inline icon SVG |
185 | - $field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item['icon'] ) . '\');"></i>'; |
|
186 | - } elseif( $has_gf_icon && gravityview()->plugin->is_GF_25() ) { |
|
185 | + $field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item[ 'icon' ] ) . '\');"></i>'; |
|
186 | + } elseif ( $has_gf_icon && gravityview()->plugin->is_GF_25() ) { |
|
187 | 187 | // Gravity Forms icon font |
188 | - $field_icon = '<i class="gform-icon ' . esc_attr( $this->item['icon'] ) . '"></i>'; |
|
189 | - } elseif( $has_dashicon ) { |
|
188 | + $field_icon = '<i class="gform-icon ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>'; |
|
189 | + } elseif ( $has_dashicon ) { |
|
190 | 190 | // Dashicon; prefix with "dashicons" |
191 | - $field_icon = '<i class="dashicons ' . esc_attr( $this->item['icon'] ) . '"></i>'; |
|
191 | + $field_icon = '<i class="dashicons ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>'; |
|
192 | 192 | } else { |
193 | 193 | // Not dashicon icon |
194 | - $field_icon = '<i class="' . esc_attr( $this->item['icon'] ) . '"></i>'; |
|
194 | + $field_icon = '<i class="' . esc_attr( $this->item[ 'icon' ] ) . '"></i>'; |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | $field_icon = $field_icon . ' '; |
198 | - } elseif( \GV\Utils::get( $this->item, 'parent' ) ) { |
|
198 | + } elseif ( \GV\Utils::get( $this->item, 'parent' ) ) { |
|
199 | 199 | $field_icon = '<i class="gv-icon gv-icon-level-down"></i>' . ' '; |
200 | 200 | } |
201 | 201 | |
@@ -222,19 +222,19 @@ discard block |
||
222 | 222 | |
223 | 223 | $output .= '</h5>'; |
224 | 224 | |
225 | - $container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : ''; |
|
225 | + $container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : ''; |
|
226 | 226 | |
227 | 227 | $container_class .= $nonexistent_form_field ? ' gv-nonexistent-form-field' : ''; |
228 | 228 | |
229 | - $container_class .= empty( $this->settings['show_as_link'] ) ? '' : ' has-single-entry-link'; |
|
229 | + $container_class .= empty( $this->settings[ 'show_as_link' ] ) ? '' : ' has-single-entry-link'; |
|
230 | 230 | |
231 | - $container_class .= empty( $this->settings['only_loggedin'] ) ? '' : ' has-custom-visibility'; |
|
231 | + $container_class .= empty( $this->settings[ 'only_loggedin' ] ) ? '' : ' has-custom-visibility'; |
|
232 | 232 | |
233 | - $data_form_id = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
233 | + $data_form_id = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
234 | 234 | |
235 | - $data_parent_label = ! empty( $this->item['parent'] ) ? ' data-parent-label="' . esc_attr( $this->item['parent']['label'] ) . '"' : ''; |
|
235 | + $data_parent_label = ! empty( $this->item[ 'parent' ] ) ? ' data-parent-label="' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . '"' : ''; |
|
236 | 236 | |
237 | - $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>'; |
|
237 | + $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>'; |
|
238 | 238 | |
239 | 239 | return $output; |
240 | 240 | } |
@@ -252,12 +252,12 @@ discard block |
||
252 | 252 | |
253 | 253 | $icons = array( |
254 | 254 | 'show_as_link' => array( |
255 | - 'visible' => ( ! empty( $this->settings['show_as_link'] ) ), |
|
255 | + 'visible' => ( ! empty( $this->settings[ 'show_as_link' ] ) ), |
|
256 | 256 | 'title' => __( 'This field links to the Single Entry', 'gravityview' ), |
257 | 257 | 'css_class' => 'dashicons dashicons-media-default icon-link-to-single-entry', |
258 | 258 | ), |
259 | 259 | 'only_loggedin' => array( |
260 | - 'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings['allow_edit_cap'] ) && 'read' !== $this->settings['allow_edit_cap'] ), |
|
260 | + 'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings[ 'allow_edit_cap' ] ) && 'read' !== $this->settings[ 'allow_edit_cap' ] ), |
|
261 | 261 | 'title' => __( 'This field has modified visibility', 'gravityview' ), |
262 | 262 | 'css_class' => 'dashicons dashicons-lock icon-custom-visibility', |
263 | 263 | ), |
@@ -271,21 +271,21 @@ discard block |
||
271 | 271 | * @param array $icons Array of icons to be shown, with `visible`, `title`, `css_class` keys. |
272 | 272 | * @param array $item_settings Settings for the current item (widget or field) |
273 | 273 | */ |
274 | - $icons = (array) apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings ); |
|
274 | + $icons = (array)apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings ); |
|
275 | 275 | |
276 | 276 | foreach ( $icons as $icon ) { |
277 | 277 | |
278 | - if ( empty( $icon['css_class'] ) || empty( $icon['title'] ) ) { |
|
278 | + if ( empty( $icon[ 'css_class' ] ) || empty( $icon[ 'title' ] ) ) { |
|
279 | 279 | continue; |
280 | 280 | } |
281 | 281 | |
282 | - $css_class = trim( $icon['css_class'] ); |
|
282 | + $css_class = trim( $icon[ 'css_class' ] ); |
|
283 | 283 | |
284 | - if ( empty( $icon['visible'] ) ) { |
|
284 | + if ( empty( $icon[ 'visible' ] ) ) { |
|
285 | 285 | $css_class .= ' hide-if-js'; |
286 | 286 | } |
287 | 287 | |
288 | - $output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon['title'] ) . '"></span>'; |
|
288 | + $output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon[ 'title' ] ) . '"></span>'; |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | return $output; |
@@ -50,26 +50,26 @@ |
||
50 | 50 | |
51 | 51 | if ( ! empty( $quiz_fields ) ) { |
52 | 52 | |
53 | - $fields['gquiz_score'] = array( |
|
53 | + $fields[ 'gquiz_score' ] = array( |
|
54 | 54 | 'label' => __( 'Quiz Score Total', 'gravityview' ), |
55 | 55 | 'type' => 'quiz_score', |
56 | 56 | 'desc' => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ), |
57 | 57 | 'icon' => 'dashicons-forms', |
58 | 58 | ); |
59 | - $fields['gquiz_percent'] = array( |
|
59 | + $fields[ 'gquiz_percent' ] = array( |
|
60 | 60 | 'label' => __( 'Quiz Percentage Grade', 'gravityview' ), |
61 | 61 | 'type' => 'quiz_percent', |
62 | 62 | 'desc' => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ), |
63 | 63 | 'icon' => 'dashicons-forms', |
64 | 64 | ); |
65 | - $fields['gquiz_grade'] = array( |
|
65 | + $fields[ 'gquiz_grade' ] = array( |
|
66 | 66 | /* translators: This is a field type used by the Gravity Forms Quiz Addon. "A" is 100-90, "B" is 89-80, "C" is 79-70, etc. */ |
67 | 67 | 'label' => __( 'Quiz Letter Grade', 'gravityview' ), |
68 | 68 | 'type' => 'quiz_grade', |
69 | 69 | 'desc' => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ), |
70 | 70 | 'icon' => 'dashicons-forms', |
71 | 71 | ); |
72 | - $fields['gquiz_is_pass'] = array( |
|
72 | + $fields[ 'gquiz_is_pass' ] = array( |
|
73 | 73 | 'label' => __( 'Quiz Pass/Fail', 'gravityview' ), |
74 | 74 | 'type' => 'quiz_is_pass', |
75 | 75 | 'desc' => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ), |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | $value = $this->get_value( $atts ); |
62 | 62 | |
63 | 63 | if ( false === $operator && is_null( $value ) ) { |
64 | - if ( false !== $atts['if'] ) { // Only-if test |
|
65 | - $match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) ); |
|
64 | + if ( false !== $atts[ 'if' ] ) { // Only-if test |
|
65 | + $match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) ); |
|
66 | 66 | } else { |
67 | 67 | $match = $authed; // Just login test |
68 | 68 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | // Need to match all AND |
83 | 83 | foreach ( $and_values as $and_value ) { |
84 | - $match = $authed && \GVCommon::matches_operation( $atts['if'], $and_value, $operator ); |
|
84 | + $match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $and_value, $operator ); |
|
85 | 85 | if ( ! $match ) { |
86 | 86 | break; |
87 | 87 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | // Only need to match a single OR |
93 | 93 | foreach ( $or_values as $or_value ) { |
94 | 94 | |
95 | - $match = \GVCommon::matches_operation( $atts['if'], $or_value, $operator ); |
|
95 | + $match = \GVCommon::matches_operation( $atts[ 'if' ], $or_value, $operator ); |
|
96 | 96 | |
97 | 97 | // Negate the negative operators |
98 | 98 | if ( ( $authed && $match ) || ( $authed && ( ! $match && in_array( $operator, array( 'isnot', 'not_contains', 'not_in' ) ) ) ) ) { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | } else { |
104 | - $match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator ); |
|
104 | + $match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator ); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | $output = $this->get_output( $match, $atts, $output ); |
@@ -189,8 +189,8 @@ discard block |
||
189 | 189 | * @return string The output. |
190 | 190 | */ |
191 | 191 | private function get_output( $match, $atts, $content ) { |
192 | - if ( ! $match && ! empty( $atts['else'] ) ) { |
|
193 | - return $atts['else']; // Attributized else is easy :) |
|
192 | + if ( ! $match && ! empty( $atts[ 'else' ] ) ) { |
|
193 | + return $atts[ 'else' ]; // Attributized else is easy :) |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | $if = ''; |
@@ -317,18 +317,18 @@ discard block |
||
317 | 317 | $atts = array_intersect_key( $supplied_atts, $atts ); |
318 | 318 | |
319 | 319 | // Strip whitespace if it's not default false |
320 | - if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) { |
|
321 | - $atts['if'] = trim( $atts['if'] ); |
|
320 | + if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) { |
|
321 | + $atts[ 'if' ] = trim( $atts[ 'if' ] ); |
|
322 | 322 | } else { |
323 | - $atts['if'] = false; |
|
323 | + $atts[ 'if' ] = false; |
|
324 | 324 | } |
325 | 325 | |
326 | - if ( isset( $atts['logged_in'] ) ) { |
|
326 | + if ( isset( $atts[ 'logged_in' ] ) ) { |
|
327 | 327 | // Truthy |
328 | - if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) { |
|
329 | - $atts['logged_in'] = false; |
|
328 | + if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) { |
|
329 | + $atts[ 'logged_in' ] = false; |
|
330 | 330 | } else { |
331 | - $atts['logged_in'] = true; |
|
331 | + $atts[ 'logged_in' ] = true; |
|
332 | 332 | } |
333 | 333 | } |
334 | 334 |
@@ -61,14 +61,16 @@ discard block |
||
61 | 61 | $value = $this->get_value( $atts ); |
62 | 62 | |
63 | 63 | if ( false === $operator && is_null( $value ) ) { |
64 | - if ( false !== $atts['if'] ) { // Only-if test |
|
64 | + if ( false !== $atts['if'] ) { |
|
65 | +// Only-if test |
|
65 | 66 | $match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) ); |
66 | 67 | } else { |
67 | 68 | $match = $authed; // Just login test |
68 | 69 | } |
69 | 70 | |
70 | 71 | $output = $this->get_output( $match, $atts, $content ); |
71 | - } else { // Regular test |
|
72 | + } else { |
|
73 | +// Regular test |
|
72 | 74 | |
73 | 75 | $output = $content; |
74 | 76 | |
@@ -199,12 +201,15 @@ discard block |
||
199 | 201 | $opens = 0; // inner opens |
200 | 202 | $found = false; // found split position |
201 | 203 | |
202 | - while ( $content ) { // scan |
|
204 | + while ( $content ) { |
|
205 | +// scan |
|
203 | 206 | |
204 | 207 | if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches ) ) { |
205 | - if ( ! $found ) { // We're still iffing. |
|
208 | + if ( ! $found ) { |
|
209 | +// We're still iffing. |
|
206 | 210 | $if .= $content; |
207 | - } else { // We are elsing |
|
211 | + } else { |
|
212 | +// We are elsing |
|
208 | 213 | $else .= $content; |
209 | 214 | } |
210 | 215 | break; // No more shortcodes |
@@ -212,9 +217,11 @@ discard block |
||
212 | 217 | |
213 | 218 | list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches; |
214 | 219 | |
215 | - if ( ! $found ) { // We're still iffing. |
|
220 | + if ( ! $found ) { |
|
221 | +// We're still iffing. |
|
216 | 222 | $if .= $before_shortcode; |
217 | - } else { // We are elsing |
|
223 | + } else { |
|
224 | +// We are elsing |
|
218 | 225 | $else .= $before_shortcode; |
219 | 226 | } |
220 | 227 | |
@@ -238,9 +245,11 @@ discard block |
||
238 | 245 | } |
239 | 246 | |
240 | 247 | // Tack on the shortcode |
241 | - if ( ! $found ) { // We're still iffing. |
|
248 | + if ( ! $found ) { |
|
249 | +// We're still iffing. |
|
242 | 250 | $if .= $shortcode; |
243 | - } else { // We are elsing |
|
251 | + } else { |
|
252 | +// We are elsing |
|
244 | 253 | $else .= $shortcode; |
245 | 254 | } |
246 | 255 | } |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | add_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10, 4 ); |
24 | 24 | add_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) ); |
25 | 25 | |
26 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') ); |
|
27 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') ); |
|
26 | + add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
27 | + add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); |
|
28 | 28 | |
29 | 29 | add_action( 'gravityview/template/after', array( $this, 'print_scripts' ) ); |
30 | 30 | |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | remove_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10 ); |
93 | 93 | remove_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) ); |
94 | 94 | |
95 | - remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') ); |
|
96 | - remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') ); |
|
95 | + remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
96 | + remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); |
|
97 | 97 | |
98 | 98 | remove_action( 'wp_footer', array( $this, 'output_footer' ) ); |
99 | 99 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_link' ), 10, 5 ); |
12 | 12 | |
13 | 13 | // Add script to enable edit link |
14 | - add_action( 'admin_head', array( $this, 'add_edit_script') ); |
|
14 | + add_action( 'admin_head', array( $this, 'add_edit_script' ) ); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | /** |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | 'page' => 'gf_entries', |
61 | 61 | 'view' => 'entry', |
62 | 62 | 'id' => (int)$form_id, |
63 | - 'lid' => (int)$lead["id"], |
|
63 | + 'lid' => (int)$lead[ "id" ], |
|
64 | 64 | 'screen_mode' => 'edit', |
65 | 65 | ); |
66 | 66 | ?> |
67 | 67 | |
68 | 68 | <span class="edit edit_entry"> |
69 | 69 | | |
70 | - <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page='.$query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a> |
|
70 | + <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview' ); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page=' . $query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a> |
|
71 | 71 | </span> |
72 | 72 | <?php |
73 | 73 | } |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | 'GravityView_DataTables_Template' => array( |
60 | 60 | 'slug' => 'dt_placeholder', |
61 | 61 | 'label' => __( 'DataTables Table', 'gv-datatables', 'gravityview' ), |
62 | - 'description' => __('Display items in a dynamic table powered by DataTables.', 'gravityview'), |
|
63 | - 'logo' => plugins_url('assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ), |
|
62 | + 'description' => __( 'Display items in a dynamic table powered by DataTables.', 'gravityview' ), |
|
63 | + 'logo' => plugins_url( 'assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ), |
|
64 | 64 | 'buy_source' => 'https://gravityview.co/pricing/?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=datatables', |
65 | 65 | 'preview' => 'https://try.gravityview.co/demo/view/datatables/?utm_source=plugin&utm_medium=try_demo&utm_campaign=view_type&utm_term=datatables', |
66 | 66 | 'license' => esc_html__( 'All Access', 'gravityview' ), |
@@ -102,13 +102,13 @@ discard block |
||
102 | 102 | continue; |
103 | 103 | } |
104 | 104 | |
105 | - $license_price_id = (int) \GV\Utils::get( $license, 'price_id', 0 ); |
|
106 | - $placeholder_price_id = (int) \GV\Utils::get( $placeholder, 'price_id' ); |
|
105 | + $license_price_id = (int)\GV\Utils::get( $license, 'price_id', 0 ); |
|
106 | + $placeholder_price_id = (int)\GV\Utils::get( $placeholder, 'price_id' ); |
|
107 | 107 | |
108 | - $placeholder['type'] = 'custom'; |
|
109 | - $placeholder['included'] = ( $license_price_id >= $placeholder_price_id ); |
|
108 | + $placeholder[ 'type' ] = 'custom'; |
|
109 | + $placeholder[ 'included' ] = ( $license_price_id >= $placeholder_price_id ); |
|
110 | 110 | |
111 | - new GravityView_Placeholder_Template( $placeholder['slug'], $placeholder ); |
|
111 | + new GravityView_Placeholder_Template( $placeholder[ 'slug' ], $placeholder ); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | } catch ( Exception $exception ) { |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | function load() { |
26 | 26 | |
27 | - if( !is_admin() ) { |
|
27 | + if ( ! is_admin() ) { |
|
28 | 28 | return; |
29 | 29 | } |
30 | 30 | |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 ); |
39 | 39 | |
40 | 40 | // add tooltips |
41 | - add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') ); |
|
41 | + add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) ); |
|
42 | 42 | |
43 | 43 | // custom fields' options for zone EDIT |
44 | 44 | add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 ); |
@@ -77,12 +77,12 @@ discard block |
||
77 | 77 | */ |
78 | 78 | function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
79 | 79 | |
80 | - if( $zone !== 'edit' ) { |
|
80 | + if ( $zone !== 'edit' ) { |
|
81 | 81 | |
82 | - $entry_default_fields['edit_link'] = array( |
|
83 | - 'label' => __('Link to Edit Entry', 'gravityview'), |
|
82 | + $entry_default_fields[ 'edit_link' ] = array( |
|
83 | + 'label' => __( 'Link to Edit Entry', 'gravityview' ), |
|
84 | 84 | 'type' => 'edit_link', |
85 | - 'desc' => __('A link to edit the entry. Visible based on View settings.', 'gravityview'), |
|
85 | + 'desc' => __( 'A link to edit the entry. Visible based on View settings.', 'gravityview' ), |
|
86 | 86 | 'icon' => 'dashicons-welcome-write-blog', |
87 | 87 | ); |
88 | 88 | |
@@ -107,12 +107,12 @@ discard block |
||
107 | 107 | $caps = $visibility_caps; |
108 | 108 | |
109 | 109 | // If we're configuring fields in the edit context, we want a limited selection |
110 | - if( $context === 'edit' ) { |
|
110 | + if ( $context === 'edit' ) { |
|
111 | 111 | |
112 | 112 | // Remove other built-in caps. |
113 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
113 | + unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] ); |
|
114 | 114 | |
115 | - $caps['read'] = _x('Entry Creator','User capability', 'gravityview'); |
|
115 | + $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | return $caps; |
@@ -132,20 +132,20 @@ discard block |
||
132 | 132 | function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
133 | 133 | |
134 | 134 | // Always a link, never a filter |
135 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
135 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] ); |
|
136 | 136 | |
137 | 137 | // Edit Entry link should only appear to visitors capable of editing entries |
138 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
138 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
139 | 139 | |
140 | - $add_option['edit_link'] = array( |
|
140 | + $add_option[ 'edit_link' ] = array( |
|
141 | 141 | 'type' => 'text', |
142 | 142 | 'label' => __( 'Edit Link Text', 'gravityview' ), |
143 | 143 | 'desc' => NULL, |
144 | - 'value' => __('Edit Entry', 'gravityview'), |
|
144 | + 'value' => __( 'Edit Entry', 'gravityview' ), |
|
145 | 145 | 'merge_tags' => true, |
146 | 146 | ); |
147 | 147 | |
148 | - $add_option['new_window'] = array( |
|
148 | + $add_option[ 'new_window' ] = array( |
|
149 | 149 | 'type' => 'checkbox', |
150 | 150 | 'label' => __( 'Open link in a new tab or window?', 'gravityview' ), |
151 | 151 | 'value' => false, |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | |
166 | 166 | $return = $tooltips; |
167 | 167 | |
168 | - $return['allow_edit_cap'] = array( |
|
169 | - 'title' => __('Limiting Edit Access', 'gravityview'), |
|
170 | - 'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'), |
|
168 | + $return[ 'allow_edit_cap' ] = array( |
|
169 | + 'title' => __( 'Limiting Edit Access', 'gravityview' ), |
|
170 | + 'value' => __( 'Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview' ), |
|
171 | 171 | ); |
172 | 172 | |
173 | 173 | return $return; |
@@ -188,12 +188,12 @@ discard block |
||
188 | 188 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
189 | 189 | |
190 | 190 | // We only want to modify the settings for the edit context |
191 | - if( 'edit' !== $context ) { |
|
191 | + if ( 'edit' !== $context ) { |
|
192 | 192 | return $field_options; |
193 | 193 | } |
194 | 194 | |
195 | 195 | // Entry field is only for logged in users |
196 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
196 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
197 | 197 | |
198 | 198 | $add_options = array( |
199 | 199 | 'allow_edit_cap' => array( |
@@ -10,42 +10,42 @@ discard block |
||
10 | 10 | */ |
11 | 11 | |
12 | 12 | if ( ! defined( 'WPINC' ) ) { |
13 | - die; |
|
13 | + die; |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | |
17 | 17 | class GravityView_Edit_Entry_Admin { |
18 | 18 | |
19 | - protected $loader; |
|
19 | + protected $loader; |
|
20 | 20 | |
21 | - function __construct( GravityView_Edit_Entry $loader ) { |
|
22 | - $this->loader = $loader; |
|
23 | - } |
|
21 | + function __construct( GravityView_Edit_Entry $loader ) { |
|
22 | + $this->loader = $loader; |
|
23 | + } |
|
24 | 24 | |
25 | - function load() { |
|
25 | + function load() { |
|
26 | 26 | |
27 | - if( !is_admin() ) { |
|
28 | - return; |
|
29 | - } |
|
27 | + if( !is_admin() ) { |
|
28 | + return; |
|
29 | + } |
|
30 | 30 | |
31 | - // Add Edit Link as a default field, outside those set in the Gravity Form form |
|
32 | - add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
|
31 | + // Add Edit Link as a default field, outside those set in the Gravity Form form |
|
32 | + add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
|
33 | 33 | |
34 | - // For the Edit Entry Link, you don't want visible to all users. |
|
35 | - add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 ); |
|
34 | + // For the Edit Entry Link, you don't want visible to all users. |
|
35 | + add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 ); |
|
36 | 36 | |
37 | - // Modify the field options based on the name of the field type |
|
38 | - add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 ); |
|
37 | + // Modify the field options based on the name of the field type |
|
38 | + add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 ); |
|
39 | 39 | |
40 | - // add tooltips |
|
41 | - add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') ); |
|
40 | + // add tooltips |
|
41 | + add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') ); |
|
42 | 42 | |
43 | - // custom fields' options for zone EDIT |
|
44 | - add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 ); |
|
43 | + // custom fields' options for zone EDIT |
|
44 | + add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 ); |
|
45 | 45 | |
46 | - // Add Edit Entry settings to View Settings |
|
47 | - add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) ); |
|
48 | - } |
|
46 | + // Add Edit Entry settings to View Settings |
|
47 | + add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) ); |
|
48 | + } |
|
49 | 49 | |
50 | 50 | /** |
51 | 51 | * Render Edit Entry View metabox settings |
@@ -73,109 +73,109 @@ discard block |
||
73 | 73 | GravityView_Render_Settings::render_setting_row( 'action_label_cancel', $current_settings ); |
74 | 74 | } |
75 | 75 | |
76 | - /** |
|
77 | - * Add Edit Link as a default field, outside those set in the Gravity Form form |
|
78 | - * @param array $entry_default_fields Existing fields |
|
79 | - * @param string|array $form form_ID or form object |
|
80 | - * @param string $zone Either 'single', 'directory', 'header', 'footer' |
|
81 | - */ |
|
82 | - function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
|
83 | - |
|
84 | - if( $zone !== 'edit' ) { |
|
85 | - |
|
86 | - $entry_default_fields['edit_link'] = array( |
|
87 | - 'label' => __('Link to Edit Entry', 'gravityview'), |
|
88 | - 'type' => 'edit_link', |
|
89 | - 'desc' => __('A link to edit the entry. Visible based on View settings.', 'gravityview'), |
|
90 | - 'icon' => 'dashicons-welcome-write-blog', |
|
91 | - ); |
|
92 | - |
|
93 | - } |
|
94 | - |
|
95 | - return $entry_default_fields; |
|
96 | - } |
|
97 | - |
|
98 | - /** |
|
99 | - * Change wording for the Edit context to read Entry Creator |
|
100 | - * |
|
101 | - * @param array $visibility_caps Array of capabilities to display in field dropdown. |
|
102 | - * @param string $field_type Type of field options to render (`field` or `widget`) |
|
103 | - * @param string $template_id Table slug |
|
104 | - * @param float $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by` |
|
105 | - * @param string $context What context are we in? Example: `single` or `directory` |
|
106 | - * @param string $input_type (textarea, list, select, etc.) |
|
107 | - * @return array Array of field options with `label`, `value`, `type`, `default` keys |
|
108 | - */ |
|
109 | - function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
|
110 | - |
|
111 | - $caps = $visibility_caps; |
|
112 | - |
|
113 | - // If we're configuring fields in the edit context, we want a limited selection |
|
114 | - if( $context === 'edit' ) { |
|
115 | - |
|
116 | - // Remove other built-in caps. |
|
117 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
118 | - |
|
119 | - $caps['read'] = _x('Entry Creator','User capability', 'gravityview'); |
|
120 | - } |
|
121 | - |
|
122 | - return $caps; |
|
123 | - } |
|
124 | - |
|
125 | - /** |
|
126 | - * Add "Edit Link Text" setting to the edit_link field settings |
|
127 | - * |
|
128 | - * @param array $field_options |
|
129 | - * @param string $template_id |
|
130 | - * @param string $field_id |
|
131 | - * @param string $context |
|
132 | - * @param string $input_type |
|
133 | - * |
|
134 | - * @return array $field_options, with "Edit Link Text" field option |
|
135 | - */ |
|
136 | - function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
|
137 | - |
|
138 | - // Always a link, never a filter |
|
139 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
140 | - |
|
141 | - // Edit Entry link should only appear to visitors capable of editing entries |
|
142 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
143 | - |
|
144 | - $add_option['edit_link'] = array( |
|
145 | - 'type' => 'text', |
|
146 | - 'label' => __( 'Edit Link Text', 'gravityview' ), |
|
147 | - 'desc' => NULL, |
|
148 | - 'value' => __('Edit Entry', 'gravityview'), |
|
149 | - 'merge_tags' => true, |
|
150 | - ); |
|
151 | - |
|
152 | - $add_option['new_window'] = array( |
|
153 | - 'type' => 'checkbox', |
|
154 | - 'label' => __( 'Open link in a new tab or window?', 'gravityview' ), |
|
155 | - 'value' => false, |
|
156 | - 'group' => 'display', |
|
157 | - 'priority' => 1300, |
|
158 | - ); |
|
159 | - |
|
160 | - return array_merge( $add_option, $field_options ); |
|
161 | - } |
|
162 | - |
|
163 | - /** |
|
164 | - * Add tooltips |
|
165 | - * @param array $tooltips Existing tooltips |
|
166 | - * @return array Modified tooltips |
|
167 | - */ |
|
168 | - function tooltips( $tooltips ) { |
|
169 | - |
|
170 | - $return = $tooltips; |
|
171 | - |
|
172 | - $return['allow_edit_cap'] = array( |
|
173 | - 'title' => __('Limiting Edit Access', 'gravityview'), |
|
174 | - 'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'), |
|
175 | - ); |
|
176 | - |
|
177 | - return $return; |
|
178 | - } |
|
76 | + /** |
|
77 | + * Add Edit Link as a default field, outside those set in the Gravity Form form |
|
78 | + * @param array $entry_default_fields Existing fields |
|
79 | + * @param string|array $form form_ID or form object |
|
80 | + * @param string $zone Either 'single', 'directory', 'header', 'footer' |
|
81 | + */ |
|
82 | + function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
|
83 | + |
|
84 | + if( $zone !== 'edit' ) { |
|
85 | + |
|
86 | + $entry_default_fields['edit_link'] = array( |
|
87 | + 'label' => __('Link to Edit Entry', 'gravityview'), |
|
88 | + 'type' => 'edit_link', |
|
89 | + 'desc' => __('A link to edit the entry. Visible based on View settings.', 'gravityview'), |
|
90 | + 'icon' => 'dashicons-welcome-write-blog', |
|
91 | + ); |
|
92 | + |
|
93 | + } |
|
94 | + |
|
95 | + return $entry_default_fields; |
|
96 | + } |
|
97 | + |
|
98 | + /** |
|
99 | + * Change wording for the Edit context to read Entry Creator |
|
100 | + * |
|
101 | + * @param array $visibility_caps Array of capabilities to display in field dropdown. |
|
102 | + * @param string $field_type Type of field options to render (`field` or `widget`) |
|
103 | + * @param string $template_id Table slug |
|
104 | + * @param float $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by` |
|
105 | + * @param string $context What context are we in? Example: `single` or `directory` |
|
106 | + * @param string $input_type (textarea, list, select, etc.) |
|
107 | + * @return array Array of field options with `label`, `value`, `type`, `default` keys |
|
108 | + */ |
|
109 | + function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
|
110 | + |
|
111 | + $caps = $visibility_caps; |
|
112 | + |
|
113 | + // If we're configuring fields in the edit context, we want a limited selection |
|
114 | + if( $context === 'edit' ) { |
|
115 | + |
|
116 | + // Remove other built-in caps. |
|
117 | + unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
118 | + |
|
119 | + $caps['read'] = _x('Entry Creator','User capability', 'gravityview'); |
|
120 | + } |
|
121 | + |
|
122 | + return $caps; |
|
123 | + } |
|
124 | + |
|
125 | + /** |
|
126 | + * Add "Edit Link Text" setting to the edit_link field settings |
|
127 | + * |
|
128 | + * @param array $field_options |
|
129 | + * @param string $template_id |
|
130 | + * @param string $field_id |
|
131 | + * @param string $context |
|
132 | + * @param string $input_type |
|
133 | + * |
|
134 | + * @return array $field_options, with "Edit Link Text" field option |
|
135 | + */ |
|
136 | + function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
|
137 | + |
|
138 | + // Always a link, never a filter |
|
139 | + unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
140 | + |
|
141 | + // Edit Entry link should only appear to visitors capable of editing entries |
|
142 | + unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
143 | + |
|
144 | + $add_option['edit_link'] = array( |
|
145 | + 'type' => 'text', |
|
146 | + 'label' => __( 'Edit Link Text', 'gravityview' ), |
|
147 | + 'desc' => NULL, |
|
148 | + 'value' => __('Edit Entry', 'gravityview'), |
|
149 | + 'merge_tags' => true, |
|
150 | + ); |
|
151 | + |
|
152 | + $add_option['new_window'] = array( |
|
153 | + 'type' => 'checkbox', |
|
154 | + 'label' => __( 'Open link in a new tab or window?', 'gravityview' ), |
|
155 | + 'value' => false, |
|
156 | + 'group' => 'display', |
|
157 | + 'priority' => 1300, |
|
158 | + ); |
|
159 | + |
|
160 | + return array_merge( $add_option, $field_options ); |
|
161 | + } |
|
162 | + |
|
163 | + /** |
|
164 | + * Add tooltips |
|
165 | + * @param array $tooltips Existing tooltips |
|
166 | + * @return array Modified tooltips |
|
167 | + */ |
|
168 | + function tooltips( $tooltips ) { |
|
169 | + |
|
170 | + $return = $tooltips; |
|
171 | + |
|
172 | + $return['allow_edit_cap'] = array( |
|
173 | + 'title' => __('Limiting Edit Access', 'gravityview'), |
|
174 | + 'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'), |
|
175 | + ); |
|
176 | + |
|
177 | + return $return; |
|
178 | + } |
|
179 | 179 | |
180 | 180 | /** |
181 | 181 | * Add "Edit Link Text" setting to the edit_link field settings |
@@ -191,28 +191,28 @@ discard block |
||
191 | 191 | */ |
192 | 192 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
193 | 193 | |
194 | - // We only want to modify the settings for the edit context |
|
195 | - if( 'edit' !== $context ) { |
|
196 | - return $field_options; |
|
197 | - } |
|
198 | - |
|
199 | - // Entry field is only for logged in users |
|
200 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
201 | - |
|
202 | - $add_options = array( |
|
203 | - 'allow_edit_cap' => array( |
|
204 | - 'type' => 'select', |
|
205 | - 'label' => __( 'Make field editable to:', 'gravityview' ), |
|
206 | - 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
|
207 | - 'tooltip' => 'allow_edit_cap', |
|
208 | - 'class' => 'widefat', |
|
209 | - 'value' => 'read', // Default: entry creator |
|
210 | - 'group' => 'visibility', |
|
211 | - ), |
|
212 | - ); |
|
213 | - |
|
214 | - return array_merge( $field_options, $add_options ); |
|
215 | - } |
|
194 | + // We only want to modify the settings for the edit context |
|
195 | + if( 'edit' !== $context ) { |
|
196 | + return $field_options; |
|
197 | + } |
|
198 | + |
|
199 | + // Entry field is only for logged in users |
|
200 | + unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
201 | + |
|
202 | + $add_options = array( |
|
203 | + 'allow_edit_cap' => array( |
|
204 | + 'type' => 'select', |
|
205 | + 'label' => __( 'Make field editable to:', 'gravityview' ), |
|
206 | + 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
|
207 | + 'tooltip' => 'allow_edit_cap', |
|
208 | + 'class' => 'widefat', |
|
209 | + 'value' => 'read', // Default: entry creator |
|
210 | + 'group' => 'visibility', |
|
211 | + ), |
|
212 | + ); |
|
213 | + |
|
214 | + return array_merge( $field_options, $add_options ); |
|
215 | + } |
|
216 | 216 | |
217 | 217 | |
218 | 218 | } // end class |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | |
21 | 21 | if ( ! empty( $passed_post ) ) { |
22 | 22 | $id_or_id_array = $this->maybe_get_view_id( $passed_post ); |
23 | - foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
23 | + foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
24 | 24 | if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) { |
25 | 25 | $this->views->add( \GV\View::by_id( $view_id ) ); |
26 | 26 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | foreach ( $passed_post as &$post ) { |
79 | 79 | $views = \GV\View_Collection::from_post( $post ); |
80 | 80 | foreach ( $views->all() as $view ) { |
81 | - $ids []= $view->ID; |
|
81 | + $ids [ ] = $view->ID; |
|
82 | 82 | |
83 | 83 | /** And as a side-effect... add each view to the global scope. */ |
84 | 84 | if ( ! $this->views->contains( $view->ID ) ) { |
@@ -92,18 +92,18 @@ discard block |
||
92 | 92 | if ( is_string( $passed_post ) ) { |
93 | 93 | $shortcodes = \GV\Shortcode::parse( $passed_post ); |
94 | 94 | foreach ( $shortcodes as $shortcode ) { |
95 | - if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) { |
|
96 | - $ids []= $shortcode->atts['id']; |
|
95 | + if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) { |
|
96 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
97 | 97 | |
98 | 98 | /** And as a side-effect... add each view to the global scope. */ |
99 | - if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) { |
|
100 | - $this->views->add( $shortcode->atts['id'] ); |
|
99 | + if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) { |
|
100 | + $this->views->add( $shortcode->atts[ 'id' ] ); |
|
101 | 101 | } |
102 | 102 | } |
103 | 103 | } |
104 | 104 | } else { |
105 | 105 | $id = $this->get_id_from_atts( $passed_post ); |
106 | - $ids[] = intval( $id ); |
|
106 | + $ids[ ] = intval( $id ); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | // If it's just one ID, return that. |
115 | 115 | // Otherwise, return array of IDs |
116 | - return ( count( $ids ) === 1 ) ? $ids[0] : $ids; |
|
116 | + return ( count( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public static function getInstance( $passed_post = NULL ) { |
123 | 123 | |
124 | - if( empty( self::$instance ) ) { |
|
124 | + if ( empty( self::$instance ) ) { |
|
125 | 125 | self::$instance = new GravityView_View_Data( $passed_post ); |
126 | 126 | } |
127 | 127 | |
@@ -137,8 +137,8 @@ discard block |
||
137 | 137 | return array(); |
138 | 138 | } |
139 | 139 | return array_combine( |
140 | - array_map( function ( $view ) { return $view->ID; }, $this->views->all() ), |
|
141 | - array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
140 | + array_map( function( $view ) { return $view->ID; }, $this->views->all() ), |
|
141 | + array_map( function( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
142 | 142 | ); |
143 | 143 | } |
144 | 144 | |
@@ -252,22 +252,22 @@ discard block |
||
252 | 252 | public function parse_post_content( $content ) { |
253 | 253 | $ids = array(); |
254 | 254 | foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) { |
255 | - if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) { |
|
256 | - if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) { |
|
257 | - $this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) ); |
|
255 | + if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
256 | + if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) { |
|
257 | + $this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) ); |
|
258 | 258 | } |
259 | 259 | /** |
260 | 260 | * The original function outputs the ID even though it wasn't added by ::add_view() |
261 | 261 | * Wether this is a bug or not remains a mystery. But we need to emulate this behavior |
262 | 262 | * until better times. |
263 | 263 | */ |
264 | - $ids []= $shortcode->atts['id']; |
|
264 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
265 | 265 | } |
266 | 266 | } |
267 | 267 | if ( empty ( $ids ) ) { |
268 | 268 | return null; |
269 | 269 | } |
270 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
270 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | /** |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | // Not invalid if not set! |
291 | 291 | if ( empty( $post_id ) || empty( $view_id ) ) { |
292 | 292 | |
293 | - if( $empty_is_valid ) { |
|
293 | + if ( $empty_is_valid ) { |
|
294 | 294 | return true; |
295 | 295 | } |
296 | 296 | |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() ); |
324 | 324 | |
325 | 325 | // The post or page specified does not contain the shortcode. |
326 | - if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) { |
|
326 | + if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) { |
|
327 | 327 | $message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' ); |
328 | 328 | } |
329 | 329 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | if ( ! $message ) { |
332 | 332 | // It's a View |
333 | 333 | if ( \GV\View::exists( $post_id ) ) { |
334 | - $message = esc_html__( 'The ID is already a View.', 'gravityview' );; |
|
334 | + $message = esc_html__( 'The ID is already a View.', 'gravityview' ); ; |
|
335 | 335 | } |
336 | 336 | } |
337 | 337 |