@@ -84,7 +84,7 @@ |
||
84 | 84 | * @see \Gamajo_Template_Loader::set_template_data |
85 | 85 | * @see \GV\Template::pop_template_data |
86 | 86 | * |
87 | - * @return \Gamajo_Template_Loader The current instance. |
|
87 | + * @return Template The current instance. |
|
88 | 88 | */ |
89 | 89 | public function push_template_data( $data, $var_name = 'data' ) { |
90 | 90 | if ( ! isset( self::$data_stack[ $var_name ] ) ) { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) { |
43 | 43 | |
44 | - if( ! empty( $output ) ) { |
|
44 | + if ( ! empty( $output ) ) { |
|
45 | 45 | $output = gravity_flow()->translate_status_label( $output ); |
46 | 46 | } |
47 | 47 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | foreach ( $search_fields as & $search_field ) { |
66 | 66 | if ( $this->name === \GV\Utils::get( $search_field, 'key' ) ) { |
67 | - $search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options(); |
|
67 | + $search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options(); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 |
@@ -4,10 +4,10 @@ discard block |
||
4 | 4 | |
5 | 5 | function __construct() { |
6 | 6 | |
7 | - if( ! is_admin() ) { return; } |
|
7 | + if ( ! is_admin() ) { return; } |
|
8 | 8 | |
9 | 9 | // If Gravity Forms isn't active or compatibile, stop loading |
10 | - if( false === GravityView_Compatibility::is_valid() ) { |
|
10 | + if ( false === GravityView_Compatibility::is_valid() ) { |
|
11 | 11 | return; |
12 | 12 | } |
13 | 13 | |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) ); |
49 | 49 | add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) ); |
50 | 50 | |
51 | - add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) ); |
|
51 | + add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) ); |
|
52 | 52 | |
53 | 53 | add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 ); |
54 | 54 | |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public static function no_views_text() { |
66 | 66 | |
67 | - if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) { |
|
67 | + if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) { |
|
68 | 68 | return __( 'No Views found in Trash', 'gravityview' ); |
69 | - } elseif( ! empty( $_GET['s'] ) ) { |
|
69 | + } elseif ( ! empty( $_GET[ 's' ] ) ) { |
|
70 | 70 | return __( 'No Views found.', 'gravityview' ); |
71 | 71 | } |
72 | 72 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $error .= ' ' . esc_html__( 'or select another form.', 'gravityview' ); |
111 | 111 | } |
112 | 112 | |
113 | - if( $error ) { |
|
113 | + if ( $error ) { |
|
114 | 114 | ?> |
115 | 115 | <div class="wp-dialog notice-warning inline error wp-clearfix"> |
116 | 116 | <?php echo gravityview_get_floaty(); ?> |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | public function backend_actions() { |
130 | 130 | |
131 | 131 | /** @define "GRAVITYVIEW_DIR" "../" */ |
132 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' ); |
|
133 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' ); |
|
134 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' ); |
|
135 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' ); |
|
136 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' ); |
|
137 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' ); |
|
138 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' ); |
|
139 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-installer.php' ); |
|
140 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' ); |
|
141 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
132 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' ); |
|
133 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' ); |
|
134 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' ); |
|
135 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' ); |
|
136 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' ); |
|
137 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' ); |
|
138 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' ); |
|
139 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-installer.php' ); |
|
140 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' ); |
|
141 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
142 | 142 | |
143 | 143 | /** |
144 | 144 | * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded |
145 | 145 | * |
146 | 146 | * Nice place to insert extensions' backend stuff |
147 | 147 | */ |
148 | - do_action('gravityview_include_backend_actions'); |
|
148 | + do_action( 'gravityview_include_backend_actions' ); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
@@ -161,12 +161,12 @@ discard block |
||
161 | 161 | |
162 | 162 | $actions = array(); |
163 | 163 | |
164 | - if( GVCommon::has_cap( 'gravityview_view_settings' ) ) { |
|
165 | - $actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) ); |
|
164 | + if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) { |
|
165 | + $actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) ); |
|
166 | 166 | } |
167 | 167 | |
168 | - if( GVCommon::has_cap( 'gravityview_support_port' ) ) { |
|
169 | - $actions[] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>'; |
|
168 | + if ( GVCommon::has_cap( 'gravityview_support_port' ) ) { |
|
169 | + $actions[ ] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>'; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | return array_merge( $actions, $links ); |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | // By default, there will only be one item being modified. |
195 | 195 | // When in the `bulk_post_updated_messages` filter, there will be passed a number |
196 | 196 | // of modified items that will override this array. |
197 | - $bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts; |
|
197 | + $bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts; |
|
198 | 198 | |
199 | 199 | // If we're starting fresh, a new form was created. |
200 | 200 | // We should let the user know this is the case. |
@@ -202,60 +202,60 @@ discard block |
||
202 | 202 | |
203 | 203 | $new_form_text = ''; |
204 | 204 | |
205 | - if( !empty( $start_fresh ) ) { |
|
205 | + if ( ! empty( $start_fresh ) ) { |
|
206 | 206 | |
207 | 207 | // Get the form that was created |
208 | 208 | $connected_form = gravityview_get_form_id( $post_id ); |
209 | 209 | |
210 | - if( !empty( $connected_form ) ) { |
|
210 | + if ( ! empty( $connected_form ) ) { |
|
211 | 211 | $form = gravityview_get_form( $connected_form ); |
212 | - $form_name = esc_attr( $form['title'] ); |
|
212 | + $form_name = esc_attr( $form[ 'title' ] ); |
|
213 | 213 | $image = self::get_floaty(); |
214 | - $new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>'; |
|
215 | - $new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s |
|
214 | + $new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>'; |
|
215 | + $new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s |
|
216 | 216 | |
217 | 217 | You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don’t forget to %scustomize the form settings%s. |
218 | - ', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&view=settings&id='.$connected_form ).'">', '</a>'); |
|
218 | + ', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&view=settings&id=' . $connected_form ) . '">', '</a>' ); |
|
219 | 219 | $new_form_text = wpautop( $new_form_text ); |
220 | 220 | |
221 | 221 | delete_post_meta( $post_id, '_gravityview_start_fresh' ); |
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | - $messages['gravityview'] = array( |
|
225 | + $messages[ 'gravityview' ] = array( |
|
226 | 226 | 0 => '', // Unused. Messages start at index 1. |
227 | 227 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
228 | - 1 => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'), |
|
228 | + 1 => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ), |
|
229 | 229 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
230 | - 2 => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'), |
|
230 | + 2 => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ), |
|
231 | 231 | 3 => __( 'View deleted.', 'gravityview' ), |
232 | 232 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
233 | - 4 => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'), |
|
233 | + 4 => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ), |
|
234 | 234 | /* translators: %s: date and time of the revision */ |
235 | - 5 => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, |
|
235 | + 5 => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false, |
|
236 | 236 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
237 | - 6 => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
|
237 | + 6 => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text, |
|
238 | 238 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
239 | - 7 => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
|
239 | + 7 => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text, |
|
240 | 240 | 8 => __( 'View submitted.', 'gravityview' ), |
241 | 241 | 9 => sprintf( |
242 | 242 | /* translators: Date and time the View is scheduled to be published */ |
243 | 243 | __( 'View scheduled for: %1$s.', 'gravityview' ), |
244 | 244 | // translators: Publish box date format, see http://php.net/date |
245 | - date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) ) |
|
245 | + date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) ) |
|
246 | 246 | ) . $new_form_text, |
247 | 247 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
248 | - 10 => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
|
248 | + 10 => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text, |
|
249 | 249 | |
250 | 250 | /** |
251 | 251 | * These apply to `bulk_post_updated_messages` |
252 | 252 | * @file wp-admin/edit.php |
253 | 253 | */ |
254 | - 'updated' => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ), |
|
255 | - 'locked' => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ), |
|
256 | - 'deleted' => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ), |
|
257 | - 'trashed' => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ), |
|
258 | - 'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ), |
|
254 | + 'updated' => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ), |
|
255 | + 'locked' => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ), |
|
256 | + 'deleted' => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ), |
|
257 | + 'trashed' => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ), |
|
258 | + 'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ), |
|
259 | 259 | ); |
260 | 260 | |
261 | 261 | return $messages; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * @return void |
93 | 93 | */ |
94 | 94 | public static function connected_form_warning( $form_id = 0 ) { |
95 | - global $pagenow; |
|
95 | + global $pagenow; |
|
96 | 96 | |
97 | 97 | if ( empty( $form_id ) || $pagenow === 'post-new.php' ) { |
98 | 98 | return; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | <?php |
120 | 120 | } |
121 | 121 | |
122 | - remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) ); |
|
122 | + remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) ); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | 7 => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
242 | 242 | 8 => __( 'View submitted.', 'gravityview' ), |
243 | 243 | 9 => sprintf( |
244 | - /* translators: Date and time the View is scheduled to be published */ |
|
244 | + /* translators: Date and time the View is scheduled to be published */ |
|
245 | 245 | __( 'View scheduled for: %1$s.', 'gravityview' ), |
246 | 246 | // translators: Publish box date format, see http://php.net/date |
247 | 247 | date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) ) |
@@ -298,7 +298,6 @@ discard block |
||
298 | 298 | * |
299 | 299 | * @deprecated since 1.12 |
300 | 300 | * @see GravityView_Compatibility::get_plugin_status() |
301 | - |
|
302 | 301 | * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive |
303 | 302 | */ |
304 | 303 | static function get_plugin_status( $location = '' ) { |
@@ -7,15 +7,15 @@ |
||
7 | 7 | |
8 | 8 | $gravityview_view = GravityView_View::getInstance(); |
9 | 9 | $view_id = $gravityview_view->getViewId(); |
10 | -$value = $gravityview_view->search_field['value']; |
|
11 | -$label = $gravityview_view->search_field['label']; |
|
10 | +$value = $gravityview_view->search_field[ 'value' ]; |
|
11 | +$label = $gravityview_view->search_field[ 'label' ]; |
|
12 | 12 | |
13 | 13 | $html_input_type = RGFormsModel::is_html5_enabled() ? 'search' : 'text'; |
14 | 14 | ?> |
15 | 15 | |
16 | 16 | <div class="gv-search-box gv-search-field-text gv-search-field-search_all"> |
17 | 17 | <div class="gv-search"> |
18 | - <?php if( ! gv_empty( $label, false, false ) ) { ?> |
|
18 | + <?php if ( ! gv_empty( $label, false, false ) ) { ?> |
|
19 | 19 | <label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label> |
20 | 20 | <?php } ?> |
21 | 21 | <p><input type="<?php echo $html_input_type; ?>" name="gv_search" id="gv_search_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p> |
@@ -7,13 +7,13 @@ |
||
7 | 7 | |
8 | 8 | $gravityview_view = GravityView_View::getInstance(); |
9 | 9 | $view_id = $gravityview_view->getViewId(); |
10 | -$value = $gravityview_view->search_field['value']; |
|
11 | -$label = $gravityview_view->search_field['label']; |
|
10 | +$value = $gravityview_view->search_field[ 'value' ]; |
|
11 | +$label = $gravityview_view->search_field[ 'label' ]; |
|
12 | 12 | ?> |
13 | 13 | |
14 | 14 | <div class="gv-search-box gv-search-field-entry_id"> |
15 | 15 | <div class="gv-search"> |
16 | - <?php if( ! gv_empty( $label, false, false ) ) { ?> |
|
16 | + <?php if ( ! gv_empty( $label, false, false ) ) { ?> |
|
17 | 17 | <label for="gv_entry_id_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label> |
18 | 18 | <?php } ?> |
19 | 19 | <p><input type="text" name="gv_id" id="gv_entry_id_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p> |
@@ -7,17 +7,17 @@ |
||
7 | 7 | |
8 | 8 | $gravityview_view = GravityView_View::getInstance(); |
9 | 9 | $view_id = $gravityview_view->getViewId(); |
10 | -$value = $gravityview_view->search_field['value']; |
|
11 | -$label = $gravityview_view->search_field['label']; |
|
10 | +$value = $gravityview_view->search_field[ 'value' ]; |
|
11 | +$label = $gravityview_view->search_field[ 'label' ]; |
|
12 | 12 | |
13 | 13 | ?> |
14 | 14 | |
15 | 15 | <div class="gv-search-box gv-search-date gv-search-date-range gv-search-field-entry_date"> |
16 | - <?php if( ! gv_empty( $label, false, false ) ) { ?> |
|
16 | + <?php if ( ! gv_empty( $label, false, false ) ) { ?> |
|
17 | 17 | <label for="gv_start_date_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label> |
18 | 18 | <?php } ?> |
19 | 19 | <p> |
20 | - <input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo $value['start']; ?>"> |
|
21 | - <input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo $value['end']; ?>"> |
|
20 | + <input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo $value[ 'start' ]; ?>"> |
|
21 | + <input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo $value[ 'end' ]; ?>"> |
|
22 | 22 | </p> |
23 | 23 | </div> |
24 | 24 | \ No newline at end of file |
@@ -7,17 +7,17 @@ |
||
7 | 7 | |
8 | 8 | $gravityview_view = GravityView_View::getInstance(); |
9 | 9 | $view_id = $gravityview_view->getViewId(); |
10 | -$value = $gravityview_view->search_field['value']; |
|
11 | -$label = $gravityview_view->search_field['label']; |
|
12 | -$name = $gravityview_view->search_field['name']; |
|
10 | +$value = $gravityview_view->search_field[ 'value' ]; |
|
11 | +$label = $gravityview_view->search_field[ 'label' ]; |
|
12 | +$name = $gravityview_view->search_field[ 'name' ]; |
|
13 | 13 | ?> |
14 | 14 | |
15 | 15 | <div class="gv-search-box gv-search-date gv-search-date-range"> |
16 | - <?php if( ! gv_empty( $label, false, false ) ) { ?> |
|
17 | - <label for="search-box-<?php echo esc_attr( $name ).'-start'; ?>"><?php echo esc_html( $label ); ?></label> |
|
16 | + <?php if ( ! gv_empty( $label, false, false ) ) { ?> |
|
17 | + <label for="search-box-<?php echo esc_attr( $name ) . '-start'; ?>"><?php echo esc_html( $label ); ?></label> |
|
18 | 18 | <?php } ?> |
19 | 19 | <p> |
20 | - <input name="<?php echo esc_attr( $name ).'[start]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['start'] ); ?>"> |
|
21 | - <input name="<?php echo esc_attr( $name ).'[end]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['end'] ); ?>"> |
|
20 | + <input name="<?php echo esc_attr( $name ) . '[start]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'start' ] ); ?>"> |
|
21 | + <input name="<?php echo esc_attr( $name ) . '[end]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'end' ] ); ?>"> |
|
22 | 22 | </p> |
23 | 23 | </div> |
24 | 24 | \ No newline at end of file |
@@ -79,8 +79,9 @@ |
||
79 | 79 | * Check permissions. |
80 | 80 | */ |
81 | 81 | while ( $error = $view->can_render( array( 'shortcode' ), $request ) ) { |
82 | - if ( ! is_wp_error( $error ) ) |
|
83 | - break; |
|
82 | + if ( ! is_wp_error( $error ) ) { |
|
83 | + break; |
|
84 | + } |
|
84 | 85 | |
85 | 86 | switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) { |
86 | 87 | case 'post_password_required': |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | 'class' => '', |
44 | 44 | ) ); |
45 | 45 | |
46 | - if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) { |
|
47 | - if ( $atts['detail'] && $view = $request->is_view() ) { |
|
46 | + if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) { |
|
47 | + if ( $atts[ 'detail' ] && $view = $request->is_view() ) { |
|
48 | 48 | $view_id = $view->ID; |
49 | 49 | } |
50 | 50 | } |
@@ -114,12 +114,12 @@ discard block |
||
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
117 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
117 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
118 | 118 | |
119 | 119 | /** |
120 | 120 | * View details. |
121 | 121 | */ |
122 | - if ( $atts['detail'] ) { |
|
122 | + if ( $atts[ 'detail' ] ) { |
|
123 | 123 | $entries = $view->get_entries( $request ); |
124 | 124 | return self::_return( $this->detail( $view, $entries, $atts ) ); |
125 | 125 | |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | return self::_return( '' ); |
137 | 137 | } |
138 | 138 | |
139 | - if ( $entry['status'] != 'active' ) { |
|
139 | + if ( $entry[ 'status' ] != 'active' ) { |
|
140 | 140 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
141 | 141 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
142 | 142 | } |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | } |
148 | 148 | |
149 | 149 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
150 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
150 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
151 | 151 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
152 | 152 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
153 | 153 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $entryset = $entry->is_multi() ? $entry->entries : array( $entry ); |
171 | 171 | |
172 | 172 | foreach ( $entryset as $e ) { |
173 | - if ( $e['status'] != 'active' ) { |
|
173 | + if ( $e[ 'status' ] != 'active' ) { |
|
174 | 174 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
175 | 175 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
176 | 176 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | } |
182 | 182 | |
183 | 183 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
184 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
184 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
185 | 185 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
186 | 186 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
187 | 187 | } |
@@ -206,10 +206,10 @@ discard block |
||
206 | 206 | |
207 | 207 | // Mock the request with the actual View, not the global one |
208 | 208 | $mock_request = new \GV\Mock_Request(); |
209 | - $mock_request->returns['is_view'] = $view; |
|
210 | - $mock_request->returns['is_entry'] = $request->is_entry( $view->form ? $view->form->ID : 0 ); |
|
211 | - $mock_request->returns['is_edit_entry'] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ); |
|
212 | - $mock_request->returns['is_search'] = $request->is_search(); |
|
209 | + $mock_request->returns[ 'is_view' ] = $view; |
|
210 | + $mock_request->returns[ 'is_entry' ] = $request->is_entry( $view->form ? $view->form->ID : 0 ); |
|
211 | + $mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ); |
|
212 | + $mock_request->returns[ 'is_search' ] = $request->is_search(); |
|
213 | 213 | |
214 | 214 | $request = $mock_request; |
215 | 215 | } |
@@ -245,16 +245,16 @@ discard block |
||
245 | 245 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
246 | 246 | |
247 | 247 | // Only keep the passed attributes after making sure that they're valid pairs |
248 | - $filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts ); |
|
248 | + $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts ); |
|
249 | 249 | |
250 | 250 | $atts = array(); |
251 | 251 | |
252 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
252 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
253 | 253 | |
254 | 254 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
255 | 255 | $passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value ); |
256 | 256 | |
257 | - switch( $defaults[ $key ]['type'] ) { |
|
257 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
258 | 258 | |
259 | 259 | /** |
260 | 260 | * Make sure number fields are numeric. |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
263 | 263 | */ |
264 | 264 | case 'number': |
265 | - if( is_numeric( $passed_value ) ) { |
|
265 | + if ( is_numeric( $passed_value ) ) { |
|
266 | 266 | $atts[ $key ] = ( $passed_value + 0 ); |
267 | 267 | } |
268 | 268 | break; |
@@ -277,8 +277,8 @@ discard block |
||
277 | 277 | */ |
278 | 278 | case 'select': |
279 | 279 | case 'radio': |
280 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
281 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
280 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
281 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
282 | 282 | $atts[ $key ] = $passed_value; |
283 | 283 | } |
284 | 284 | break; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | } |
291 | 291 | } |
292 | 292 | |
293 | - $atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
293 | + $atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
294 | 294 | |
295 | 295 | return $atts; |
296 | 296 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | private function detail( $view, $entries, $atts ) { |
308 | 308 | $output = ''; |
309 | 309 | |
310 | - switch ( $key = $atts['detail'] ): |
|
310 | + switch ( $key = $atts[ 'detail' ] ): |
|
311 | 311 | case 'total_entries': |
312 | 312 | $output = number_format_i18n( $entries->total() ); |
313 | 313 | break; |
@@ -49,7 +49,7 @@ |
||
49 | 49 | * |
50 | 50 | * @param array $items Scripts or styles to exclude from no-conflict |
51 | 51 | * |
52 | - * @return array |
|
52 | + * @return string[] |
|
53 | 53 | */ |
54 | 54 | public function register_noconflict( $items ) { |
55 | 55 |
@@ -449,9 +449,7 @@ |
||
449 | 449 | $button_label = sprintf( __( 'Upgrade to %s for Access', 'gravityview' ), $required_license ); |
450 | 450 | $button_class = 'button-primary button-large'; |
451 | 451 | $href = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
452 | - } |
|
453 | - |
|
454 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
452 | + } elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
455 | 453 | $spinner = false; |
456 | 454 | $status = 'notinstalled'; |
457 | 455 | $status_label = __( 'Coming Soon', 'gravityview' ); |
@@ -66,9 +66,9 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function add_downloads_data_filters() { |
68 | 68 | |
69 | - $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT ); |
|
69 | + $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT ); |
|
70 | 70 | |
71 | - if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) { |
|
71 | + if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) { |
|
72 | 72 | return; |
73 | 73 | } |
74 | 74 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | */ |
98 | 98 | public function add_admin_menu() { |
99 | 99 | |
100 | - $menu_text = _x( 'Manage Add-Ons', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
100 | + $menu_text = _x( 'Manage Add-Ons', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
101 | 101 | |
102 | 102 | $menu_text = sprintf( '<span title="%s" style="margin: 0">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text ); |
103 | 103 | |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
115 | - * When on the Installer page, show a different notice than on the Settings page |
|
116 | - * |
|
115 | + * When on the Installer page, show a different notice than on the Settings page |
|
116 | + * |
|
117 | 117 | * @param array $notice |
118 | 118 | * |
119 | 119 | * @return string License notice |
@@ -121,10 +121,10 @@ discard block |
||
121 | 121 | public function maybe_modify_license_notice( $notice = '' ) { |
122 | 122 | |
123 | 123 | if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) { |
124 | - return $notice; |
|
125 | - } |
|
124 | + return $notice; |
|
125 | + } |
|
126 | 126 | |
127 | - return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
127 | + return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -167,43 +167,43 @@ discard block |
||
167 | 167 | * Get downloads data from transient or from API; save transient after getting data from API |
168 | 168 | * |
169 | 169 | * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: { |
170 | - * @type array $info { |
|
171 | - * @type string $id int 17 |
|
172 | - * @type string $slug Extension slug |
|
173 | - * @type string $title Extension title |
|
174 | - * @type string $create_date in '2018-07-19 20:03:10' format |
|
175 | - * @type string $modified_date |
|
176 | - * @type string $status |
|
177 | - * @type string $link URL to public plugin page |
|
178 | - * @type string $content |
|
179 | - * @type string $excerpt |
|
180 | - * @type string $thumbnail URL to thumbnail |
|
181 | - * @type array $category Taxonomy details for the plugin's category { |
|
182 | - * @type int $term_id => int 30 |
|
183 | - * @type string $name => string 'Plugins' (length=7) |
|
184 | - * @type string $slug => string 'plugins' (length=7) |
|
185 | - * @type int $term_group => int 0 |
|
186 | - * @type int $term_taxonomy_id => int 30 |
|
187 | - * @type string $taxonomy => string 'download_category' (length=17) |
|
188 | - * @type string $description => string '' (length=0) |
|
189 | - * @type int $parent => int 0 |
|
190 | - * @type int $count => int 4 |
|
191 | - * @type string $filter => string 'raw' (length=3) |
|
192 | - * } |
|
193 | - * @type array $tags {see $category above} |
|
194 | - * @type string $textdomain string 'gravityview' (length=11) |
|
195 | - * } |
|
196 | - * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
197 | - * @type array $licensing { |
|
198 | - * @type bool $enabled Is licensing enabled for the extension |
|
199 | - * @type string $version Version number |
|
200 | - * @type string $exp_unit Expiration unit ('years') |
|
201 | - * @type string $exp_length Expiration length ('1') |
|
202 | - * } |
|
203 | - * @type array $files Array of files. Empty if user has no access to the file. { |
|
204 | - * @type string $file string URL of the file download |
|
205 | - * } |
|
206 | - * } |
|
170 | + * @type array $info { |
|
171 | + * @type string $id int 17 |
|
172 | + * @type string $slug Extension slug |
|
173 | + * @type string $title Extension title |
|
174 | + * @type string $create_date in '2018-07-19 20:03:10' format |
|
175 | + * @type string $modified_date |
|
176 | + * @type string $status |
|
177 | + * @type string $link URL to public plugin page |
|
178 | + * @type string $content |
|
179 | + * @type string $excerpt |
|
180 | + * @type string $thumbnail URL to thumbnail |
|
181 | + * @type array $category Taxonomy details for the plugin's category { |
|
182 | + * @type int $term_id => int 30 |
|
183 | + * @type string $name => string 'Plugins' (length=7) |
|
184 | + * @type string $slug => string 'plugins' (length=7) |
|
185 | + * @type int $term_group => int 0 |
|
186 | + * @type int $term_taxonomy_id => int 30 |
|
187 | + * @type string $taxonomy => string 'download_category' (length=17) |
|
188 | + * @type string $description => string '' (length=0) |
|
189 | + * @type int $parent => int 0 |
|
190 | + * @type int $count => int 4 |
|
191 | + * @type string $filter => string 'raw' (length=3) |
|
192 | + * } |
|
193 | + * @type array $tags {see $category above} |
|
194 | + * @type string $textdomain string 'gravityview' (length=11) |
|
195 | + * } |
|
196 | + * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
197 | + * @type array $licensing { |
|
198 | + * @type bool $enabled Is licensing enabled for the extension |
|
199 | + * @type string $version Version number |
|
200 | + * @type string $exp_unit Expiration unit ('years') |
|
201 | + * @type string $exp_length Expiration length ('1') |
|
202 | + * } |
|
203 | + * @type array $files Array of files. Empty if user has no access to the file. { |
|
204 | + * @type string $file string URL of the file download |
|
205 | + * } |
|
206 | + * } |
|
207 | 207 | */ |
208 | 208 | public function get_downloads_data() { |
209 | 209 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | ) ); |
236 | 236 | |
237 | 237 | if ( is_wp_error( $response ) ) { |
238 | - gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
238 | + gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
239 | 239 | return $response; |
240 | 240 | } |
241 | 241 | |
@@ -288,10 +288,10 @@ discard block |
||
288 | 288 | <div class="gv-admin-installer-notice notice inline error"> |
289 | 289 | <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3> |
290 | 290 | <?php |
291 | - if ( is_wp_error( $downloads_data ) ) { |
|
292 | - echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
293 | - } |
|
294 | - ?> |
|
291 | + if ( is_wp_error( $downloads_data ) ) { |
|
292 | + echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
293 | + } |
|
294 | + ?> |
|
295 | 295 | </div> |
296 | 296 | </div> |
297 | 297 | <?php |
@@ -379,9 +379,9 @@ discard block |
||
379 | 379 | */ |
380 | 380 | protected function render_download( $download, $wp_plugins ) { |
381 | 381 | |
382 | - $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
382 | + $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
383 | 383 | |
384 | - $download_info = $details['download_info']; |
|
384 | + $download_info = $details['download_info']; |
|
385 | 385 | |
386 | 386 | ?> |
387 | 387 | <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
@@ -405,45 +405,45 @@ discard block |
||
405 | 405 | |
406 | 406 | <div class="addon-excerpt"><?php |
407 | 407 | |
408 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
408 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
409 | 409 | |
410 | - // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
411 | - $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
412 | - $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
410 | + // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
411 | + $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
412 | + $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
413 | 413 | |
414 | - $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
415 | - $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
414 | + $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
415 | + $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
416 | 416 | $excerpt = str_replace( $replacements, $tags, $excerpt ); |
417 | 417 | |
418 | 418 | echo wpautop( $excerpt ); |
419 | - ?></div> |
|
419 | + ?></div> |
|
420 | 420 | </div> |
421 | 421 | </div> |
422 | 422 | <?php |
423 | 423 | } |
424 | 424 | |
425 | 425 | /** |
426 | - * Generates details array for the download to keep the render_download() method a bit tidier |
|
427 | - * |
|
426 | + * Generates details array for the download to keep the render_download() method a bit tidier |
|
427 | + * |
|
428 | 428 | * @since 2.10 Allow managing installed add-ons whether or not the user's license shows they have access. |
429 | 429 | * |
430 | 430 | * @param array $download Single download, as returned by {@see get_downloads_data} |
431 | 431 | * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()} |
432 | 432 | * |
433 | 433 | * @return array { |
434 | - * @type array $download_info |
|
435 | - * @type string $plugin_path |
|
436 | - * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
437 | - * @type string $status_label |
|
438 | - * @type string $button_title Title attribute to show when hovering over the download's button |
|
439 | - * @type string $button_class CSS class to use for the button |
|
440 | - * @type string $button_label Text to use for the download's anchor link |
|
441 | - * @type string $href URL for the download's button |
|
442 | - * @type bool $spinner Whether to show the spinner icon |
|
443 | - * @type string $item_class CSS class for the download container |
|
444 | - * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
445 | - * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
446 | - * } |
|
434 | + * @type array $download_info |
|
435 | + * @type string $plugin_path |
|
436 | + * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
437 | + * @type string $status_label |
|
438 | + * @type string $button_title Title attribute to show when hovering over the download's button |
|
439 | + * @type string $button_class CSS class to use for the button |
|
440 | + * @type string $button_label Text to use for the download's anchor link |
|
441 | + * @type string $href URL for the download's button |
|
442 | + * @type bool $spinner Whether to show the spinner icon |
|
443 | + * @type string $item_class CSS class for the download container |
|
444 | + * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
445 | + * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
446 | + * } |
|
447 | 447 | */ |
448 | 448 | private function get_download_display_details( $download, $wp_plugins ) { |
449 | 449 | |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | 'slug' => '', |
455 | 455 | 'excerpt' => '', |
456 | 456 | 'link' => '', |
457 | - 'coming_soon' => false, |
|
457 | + 'coming_soon' => false, |
|
458 | 458 | 'installer_title' => null, // May not be defined |
459 | 459 | 'installer_excerpt' => null, // May not be defined |
460 | 460 | ) ); |
@@ -496,14 +496,14 @@ discard block |
||
496 | 496 | $href = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
497 | 497 | } |
498 | 498 | |
499 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
500 | - $spinner = false; |
|
501 | - $status = 'notinstalled'; |
|
502 | - $status_label = __( 'Coming Soon', 'gravityview' ); |
|
503 | - $button_label = __( 'Learn More', 'gravityview' ); |
|
504 | - $button_class = 'button-primary button-large'; |
|
505 | - $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
506 | - } |
|
499 | + elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
500 | + $spinner = false; |
|
501 | + $status = 'notinstalled'; |
|
502 | + $status_label = __( 'Coming Soon', 'gravityview' ); |
|
503 | + $button_label = __( 'Learn More', 'gravityview' ); |
|
504 | + $button_class = 'button-primary button-large'; |
|
505 | + $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
506 | + } |
|
507 | 507 | |
508 | 508 | // Access but the plugin is not installed |
509 | 509 | elseif ( ! $wp_plugin ) { |
@@ -547,18 +547,18 @@ discard block |
||
547 | 547 | $download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] ); |
548 | 548 | |
549 | 549 | return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
550 | - } |
|
550 | + } |
|
551 | 551 | |
552 | 552 | /** |
553 | - * Returns the base price for an extension |
|
554 | - * |
|
553 | + * Returns the base price for an extension |
|
554 | + * |
|
555 | 555 | * @param array $download |
556 | 556 | * |
557 | 557 | * @return float Base price for an extension. If not for sale separately, returns 0 |
558 | 558 | */ |
559 | 559 | private function get_download_base_price( $download ) { |
560 | 560 | |
561 | - $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
561 | + $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
562 | 562 | $base_price = \GFCommon::to_number( $base_price ); |
563 | 563 | |
564 | 564 | unset( $download['pricing']['amount'] ); |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | } |
570 | 570 | |
571 | 571 | return floatval( $base_price ); |
572 | - } |
|
572 | + } |
|
573 | 573 | |
574 | 574 | /** |
575 | 575 | * Handle AJAX request to activate extension |
@@ -587,8 +587,8 @@ discard block |
||
587 | 587 | |
588 | 588 | if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
589 | 589 | wp_send_json_error( array( |
590 | - 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
591 | - ) ); |
|
590 | + 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
591 | + ) ); |
|
592 | 592 | } |
593 | 593 | |
594 | 594 | wp_send_json_success(); |
@@ -609,10 +609,10 @@ discard block |
||
609 | 609 | deactivate_plugins( $data['path'] ); |
610 | 610 | |
611 | 611 | if( is_plugin_active( $data['path'] ) ) { |
612 | - wp_send_json_error( array( |
|
613 | - 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
614 | - ) ); |
|
615 | - } |
|
612 | + wp_send_json_error( array( |
|
613 | + 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
614 | + ) ); |
|
615 | + } |
|
616 | 616 | |
617 | 617 | wp_send_json_success(); |
618 | 618 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function register_noconflict( $items ) { |
55 | 55 | |
56 | - $items[] = 'gravityview-admin-installer'; |
|
56 | + $items[ ] = 'gravityview-admin-installer'; |
|
57 | 57 | |
58 | 58 | return $items; |
59 | 59 | } |
@@ -68,21 +68,21 @@ discard block |
||
68 | 68 | |
69 | 69 | $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT ); |
70 | 70 | |
71 | - if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) { |
|
71 | + if ( ! $downloads_data && ! isset( $_GET[ 'cache' ] ) ) { |
|
72 | 72 | return; |
73 | 73 | } |
74 | 74 | |
75 | - add_filter( 'plugins_api', function ( $data, $action, $args ) use ( $downloads_data ) { |
|
75 | + add_filter( 'plugins_api', function( $data, $action, $args ) use ( $downloads_data ) { |
|
76 | 76 | foreach ( $downloads_data as $extension ) { |
77 | - if ( empty( $extension['info'] ) || empty( $args->slug ) || $args->slug !== $extension['info']['slug'] ) { |
|
77 | + if ( empty( $extension[ 'info' ] ) || empty( $args->slug ) || $args->slug !== $extension[ 'info' ][ 'slug' ] ) { |
|
78 | 78 | continue; |
79 | 79 | } |
80 | 80 | |
81 | - return (object) array( |
|
82 | - 'slug' => $extension['info']['slug'], |
|
83 | - 'name' => $extension['info']['title'], |
|
84 | - 'version' => $extension['licensing']['version'], |
|
85 | - 'download_link' => $extension['files'][0]['file'], |
|
81 | + return (object)array( |
|
82 | + 'slug' => $extension[ 'info' ][ 'slug' ], |
|
83 | + 'name' => $extension[ 'info' ][ 'title' ], |
|
84 | + 'version' => $extension[ 'licensing' ][ 'version' ], |
|
85 | + 'download_link' => $extension[ 'files' ][ 0 ][ 'file' ], |
|
86 | 86 | ); |
87 | 87 | } |
88 | 88 | |
@@ -149,13 +149,13 @@ discard block |
||
149 | 149 | |
150 | 150 | foreach ( $all_plugins as $path => $plugin ) { |
151 | 151 | |
152 | - if ( empty( $plugin['TextDomain'] ) ) { |
|
152 | + if ( empty( $plugin[ 'TextDomain' ] ) ) { |
|
153 | 153 | continue; |
154 | 154 | } |
155 | 155 | |
156 | - $wp_plugins[ $plugin['TextDomain'] ] = array( |
|
156 | + $wp_plugins[ $plugin[ 'TextDomain' ] ] = array( |
|
157 | 157 | 'path' => $path, |
158 | - 'version' => $plugin['Version'], |
|
158 | + 'version' => $plugin[ 'Version' ], |
|
159 | 159 | 'activated' => is_plugin_active( $path ) |
160 | 160 | ); |
161 | 161 | } |
@@ -209,11 +209,11 @@ discard block |
||
209 | 209 | |
210 | 210 | $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT ); |
211 | 211 | |
212 | - if ( $downloads_data && ! isset( $_GET['cache'] ) ) { |
|
212 | + if ( $downloads_data && ! isset( $_GET[ 'cache' ] ) ) { |
|
213 | 213 | return $downloads_data; |
214 | 214 | } |
215 | 215 | |
216 | - if( \GV\Plugin::is_network_activated() ) { |
|
216 | + if ( \GV\Plugin::is_network_activated() ) { |
|
217 | 217 | $home_url = network_home_url(); |
218 | 218 | } else { |
219 | 219 | $home_url = home_url(); |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | |
242 | 242 | $downloads_data = json_decode( wp_remote_retrieve_body( $response ), true ); |
243 | 243 | |
244 | - if ( empty( $downloads_data['products'] ) ) { |
|
244 | + if ( empty( $downloads_data[ 'products' ] ) ) { |
|
245 | 245 | return array(); |
246 | 246 | } |
247 | 247 | |
248 | - $this->set_downloads_data( $downloads_data['products'] ); |
|
248 | + $this->set_downloads_data( $downloads_data[ 'products' ] ); |
|
249 | 249 | |
250 | - return $downloads_data['products']; |
|
250 | + return $downloads_data[ 'products' ]; |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | |
308 | 308 | <h2><?php esc_html_e( 'The following plugins extend GravityView and Gravity Forms functionality:', 'gravityview' ); ?></h2> |
309 | 309 | |
310 | - <a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg(array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a> |
|
310 | + <a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg( array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a> |
|
311 | 311 | |
312 | 312 | <hr class="wp-header-end" /> |
313 | 313 | |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | |
325 | 325 | $this->render_section( 'extensions', esc_html__( 'GravityView Extensions', 'gravityview' ), $downloads_data, $wp_plugins ); |
326 | 326 | |
327 | - $this->render_section( 'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
327 | + $this->render_section( 'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
328 | 328 | |
329 | - $this->render_section( 'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
329 | + $this->render_section( 'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
330 | 330 | |
331 | - $this->render_section( 'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
331 | + $this->render_section( 'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
332 | 332 | ?> |
333 | 333 | </div> |
334 | 334 | </div> |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | continue; |
356 | 356 | } |
357 | 357 | |
358 | - if ( empty( $download['info'] ) ) { |
|
358 | + if ( empty( $download[ 'info' ] ) ) { |
|
359 | 359 | continue; |
360 | 360 | } |
361 | 361 | |
@@ -383,31 +383,31 @@ discard block |
||
383 | 383 | |
384 | 384 | $details = $this->get_download_display_details( $download, $wp_plugins ); |
385 | 385 | |
386 | - $download_info = $details['download_info']; |
|
386 | + $download_info = $details[ 'download_info' ]; |
|
387 | 387 | |
388 | 388 | ?> |
389 | - <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
|
389 | + <div class="item <?php echo esc_attr( $details[ 'item_class' ] ); ?>"> |
|
390 | 390 | <div class="addon-inner"> |
391 | - <a href="<?php echo esc_url( $download_info['link'] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info['thumbnail'] ); ?>" alt="" /></a> |
|
392 | - <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info['title'] ) ); ?></h3> |
|
391 | + <a href="<?php echo esc_url( $download_info[ 'link' ] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info[ 'thumbnail' ] ); ?>" alt="" /></a> |
|
392 | + <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info[ 'title' ] ) ); ?></h3> |
|
393 | 393 | <div> |
394 | - <?php if( ! empty( $details['status_label'] ) ) { ?> |
|
395 | - <div class="status <?php echo esc_attr( $details['status'] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details['status_label'] ) ); ?>"> |
|
396 | - <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details['status_label'] ); ?></span> |
|
394 | + <?php if ( ! empty( $details[ 'status_label' ] ) ) { ?> |
|
395 | + <div class="status <?php echo esc_attr( $details[ 'status' ] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details[ 'status_label' ] ) ); ?>"> |
|
396 | + <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details[ 'status_label' ] ); ?></span> |
|
397 | 397 | </div> |
398 | 398 | <?php } ?> |
399 | 399 | |
400 | - <?php if ( 'gravityview' !== $download_info['slug'] ) { ?> |
|
401 | - <a data-status="<?php echo esc_attr( $details['status'] ); ?>" data-plugin-path="<?php echo esc_attr( $details['plugin_path'] ); ?>" href="<?php echo esc_url( $details['href'] ); ?>" class="button <?php echo esc_attr( $details['button_class'] ); ?>" title="<?php echo esc_attr( $details['button_title'] ); ?>"> |
|
402 | - <span class="title"><?php echo esc_html( $details['button_label'] ); ?></span> |
|
403 | - <?php if( $details['spinner'] ) { ?><span class="spinner"></span><?php } ?> |
|
400 | + <?php if ( 'gravityview' !== $download_info[ 'slug' ] ) { ?> |
|
401 | + <a data-status="<?php echo esc_attr( $details[ 'status' ] ); ?>" data-plugin-path="<?php echo esc_attr( $details[ 'plugin_path' ] ); ?>" href="<?php echo esc_url( $details[ 'href' ] ); ?>" class="button <?php echo esc_attr( $details[ 'button_class' ] ); ?>" title="<?php echo esc_attr( $details[ 'button_title' ] ); ?>"> |
|
402 | + <span class="title"><?php echo esc_html( $details[ 'button_label' ] ); ?></span> |
|
403 | + <?php if ( $details[ 'spinner' ] ) { ?><span class="spinner"></span><?php } ?> |
|
404 | 404 | </a> |
405 | 405 | <?php } ?> |
406 | 406 | </div> |
407 | 407 | |
408 | 408 | <div class="addon-excerpt"><?php |
409 | 409 | |
410 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
410 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info[ 'excerpt' ] ); |
|
411 | 411 | |
412 | 412 | // Allow some pure HTML tags, but remove everything else from the excerpt. |
413 | 413 | $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | */ |
450 | 450 | private function get_download_display_details( $download, $wp_plugins ) { |
451 | 451 | |
452 | - $download_info = wp_parse_args( (array) $download['info'], array( |
|
452 | + $download_info = wp_parse_args( (array)$download[ 'info' ], array( |
|
453 | 453 | 'thumbnail' => '', |
454 | 454 | 'title' => '', |
455 | 455 | 'textdomain' => '', |
@@ -461,9 +461,9 @@ discard block |
||
461 | 461 | 'installer_excerpt' => null, // May not be defined |
462 | 462 | ) ); |
463 | 463 | |
464 | - $wp_plugin = \GV\Utils::get( $wp_plugins, $download_info['textdomain'], false ); |
|
464 | + $wp_plugin = \GV\Utils::get( $wp_plugins, $download_info[ 'textdomain' ], false ); |
|
465 | 465 | |
466 | - $has_access = ! empty( $download['files'] ); |
|
466 | + $has_access = ! empty( $download[ 'files' ] ); |
|
467 | 467 | $spinner = true; |
468 | 468 | $href = $plugin_path = '#'; |
469 | 469 | $status = $item_class = $button_title = $button_class = ''; |
@@ -473,11 +473,11 @@ discard block |
||
473 | 473 | $required_license = $galactic_only ? __( 'All Access', 'gravityview' ) : __( 'Core + Extensions', 'gravityview' ); |
474 | 474 | |
475 | 475 | // The license is not active - no matter what level, this should not work |
476 | - if( ! $is_active && empty( $base_price ) ) { |
|
476 | + if ( ! $is_active && empty( $base_price ) ) { |
|
477 | 477 | $spinner = false; |
478 | 478 | $status_label = ''; |
479 | 479 | $button_label = sprintf( __( 'Active %s License is Required.', 'gravityview' ), $required_license ); |
480 | - $href = $download_info['link']; |
|
480 | + $href = $download_info[ 'link' ]; |
|
481 | 481 | $button_class = 'button-primary'; |
482 | 482 | } |
483 | 483 | |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | $status_label = ''; |
488 | 488 | $button_label = sprintf( __( 'Purchase Now for %s', 'gravityview' ), '$' . $base_price ); |
489 | 489 | $button_class = 'button-primary button-large'; |
490 | - $href = $download_info['link']; |
|
490 | + $href = $download_info[ 'link' ]; |
|
491 | 491 | $item_class = 'featured'; |
492 | 492 | } |
493 | 493 | |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | $href = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
501 | 501 | } |
502 | 502 | |
503 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
503 | + elseif ( ! empty( $download_info[ 'coming_soon' ] ) ) { |
|
504 | 504 | $spinner = false; |
505 | 505 | $status = 'notinstalled'; |
506 | 506 | $status_label = __( 'Coming Soon', 'gravityview' ); |
@@ -515,8 +515,8 @@ discard block |
||
515 | 515 | $href = add_query_arg( |
516 | 516 | array( |
517 | 517 | 'action' => 'install-plugin', |
518 | - 'plugin' => $download_info['slug'], |
|
519 | - '_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info['slug'] ), |
|
518 | + 'plugin' => $download_info[ 'slug' ], |
|
519 | + '_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info[ 'slug' ] ), |
|
520 | 520 | ), |
521 | 521 | self_admin_url( 'update.php' ) |
522 | 522 | ); |
@@ -532,12 +532,12 @@ discard block |
||
532 | 532 | $status = 'inactive'; |
533 | 533 | $status_label = __( 'Inactive', 'gravityview' ); |
534 | 534 | $button_label = __( 'Activate', 'gravityview' ); |
535 | - $plugin_path = $wp_plugin['path']; |
|
535 | + $plugin_path = $wp_plugin[ 'path' ]; |
|
536 | 536 | $button_class = 'button-secondary'; |
537 | 537 | } |
538 | 538 | // The plugin is installed and active |
539 | - elseif ( ! empty( $wp_plugin['path'] ) ) { |
|
540 | - $plugin_path = $wp_plugin['path']; |
|
539 | + elseif ( ! empty( $wp_plugin[ 'path' ] ) ) { |
|
540 | + $plugin_path = $wp_plugin[ 'path' ]; |
|
541 | 541 | $status = 'active'; |
542 | 542 | $status_label = __( 'Active', 'gravityview' ); |
543 | 543 | $button_label = __( 'Deactivate', 'gravityview' ); |
@@ -550,9 +550,9 @@ discard block |
||
550 | 550 | $href = add_query_arg( array( 'license_key' => $license_key ), $href ); |
551 | 551 | } |
552 | 552 | |
553 | - $download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] ); |
|
553 | + $download_info[ 'link' ] = add_query_arg( array( 'license_key' => $license_key ), $download_info[ 'link' ] ); |
|
554 | 554 | |
555 | - return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
|
555 | + return compact( 'download_info', 'plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
|
556 | 556 | } |
557 | 557 | |
558 | 558 | /** |
@@ -567,11 +567,11 @@ discard block |
||
567 | 567 | $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
568 | 568 | $base_price = \GFCommon::to_number( $base_price ); |
569 | 569 | |
570 | - unset( $download['pricing']['amount'] ); |
|
570 | + unset( $download[ 'pricing' ][ 'amount' ] ); |
|
571 | 571 | |
572 | 572 | // Price options array, not single price |
573 | - if ( ! $base_price && ! empty( $download['pricing'] ) ) { |
|
574 | - $base_price = array_shift( $download['pricing'] ); |
|
573 | + if ( ! $base_price && ! empty( $download[ 'pricing' ] ) ) { |
|
574 | + $base_price = array_shift( $download[ 'pricing' ] ); |
|
575 | 575 | } |
576 | 576 | |
577 | 577 | return floatval( $base_price ); |
@@ -585,13 +585,13 @@ discard block |
||
585 | 585 | public function activate_download() { |
586 | 586 | $data = \GV\Utils::_POST( 'data', array() ); |
587 | 587 | |
588 | - if ( empty( $data['path'] ) ) { |
|
588 | + if ( empty( $data[ 'path' ] ) ) { |
|
589 | 589 | return; |
590 | 590 | } |
591 | 591 | |
592 | - $result = activate_plugin( $data['path'] ); |
|
592 | + $result = activate_plugin( $data[ 'path' ] ); |
|
593 | 593 | |
594 | - if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
|
594 | + if ( is_wp_error( $result ) || ! is_plugin_active( $data[ 'path' ] ) ) { |
|
595 | 595 | wp_send_json_error( array( |
596 | 596 | 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
597 | 597 | ) ); |
@@ -608,13 +608,13 @@ discard block |
||
608 | 608 | public function deactivate_download() { |
609 | 609 | $data = \GV\Utils::_POST( 'data', array() ); |
610 | 610 | |
611 | - if ( empty( $data['path'] ) ) { |
|
611 | + if ( empty( $data[ 'path' ] ) ) { |
|
612 | 612 | return; |
613 | 613 | } |
614 | 614 | |
615 | - deactivate_plugins( $data['path'] ); |
|
615 | + deactivate_plugins( $data[ 'path' ] ); |
|
616 | 616 | |
617 | - if( is_plugin_active( $data['path'] ) ) { |
|
617 | + if ( is_plugin_active( $data[ 'path' ] ) ) { |
|
618 | 618 | wp_send_json_error( array( |
619 | 619 | 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
620 | 620 | ) ); |