@@ -21,13 +21,13 @@ |
||
21 | 21 | 'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ), |
22 | 22 | ); |
23 | 23 | |
24 | - $field_options['make_clickable'] = array( |
|
25 | - 'type' => 'checkbox', |
|
26 | - 'merge_tags' => false, |
|
27 | - 'value' => 0, |
|
28 | - 'label' => __( 'Convert text URLs to HTML links', 'gravityview' ), |
|
29 | - 'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ), |
|
30 | - ); |
|
24 | + $field_options['make_clickable'] = array( |
|
25 | + 'type' => 'checkbox', |
|
26 | + 'merge_tags' => false, |
|
27 | + 'value' => 0, |
|
28 | + 'label' => __( 'Convert text URLs to HTML links', 'gravityview' ), |
|
29 | + 'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ), |
|
30 | + ); |
|
31 | 31 | |
32 | 32 | return $field_options; |
33 | 33 | } |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | |
26 | 26 | function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
27 | 27 | |
28 | - if( 'edit' === $context ) { |
|
28 | + if ( 'edit' === $context ) { |
|
29 | 29 | return $field_options; |
30 | 30 | } |
31 | 31 | |
32 | - $field_options['trim_words'] = array( |
|
32 | + $field_options[ 'trim_words' ] = array( |
|
33 | 33 | 'type' => 'number', |
34 | 34 | 'merge_tags' => false, |
35 | 35 | 'value' => null, |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | 'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ), |
38 | 38 | ); |
39 | 39 | |
40 | - $field_options['make_clickable'] = array( |
|
40 | + $field_options[ 'make_clickable' ] = array( |
|
41 | 41 | 'type' => 'checkbox', |
42 | 42 | 'merge_tags' => false, |
43 | 43 | 'value' => 0, |
@@ -255,7 +255,6 @@ |
||
255 | 255 | * Get the default date format for a field based on the field ID and the time format setting |
256 | 256 | * |
257 | 257 | * @since 1.14 |
258 | - |
|
259 | 258 | * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14} |
260 | 259 | * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14} |
261 | 260 | * |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 ); |
61 | 61 | |
62 | - add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 ); |
|
62 | + add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 ); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -100,31 +100,31 @@ discard block |
||
100 | 100 | public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) { |
101 | 101 | |
102 | 102 | // If the search is being sorted |
103 | - if( ! empty( $criteria['sorting']['key'] ) ) { |
|
103 | + if ( ! empty( $criteria[ 'sorting' ][ 'key' ] ) ) { |
|
104 | 104 | |
105 | - $pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] ); |
|
105 | + $pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] ); |
|
106 | 106 | |
107 | 107 | /** |
108 | 108 | * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL |
109 | 109 | * @see modify_sort_id() |
110 | 110 | */ |
111 | - if( ! empty( $pieces[1] ) ) { |
|
111 | + if ( ! empty( $pieces[ 1 ] ) ) { |
|
112 | 112 | |
113 | 113 | // Pass these to the _modify_query_sort_by_time_hack() method |
114 | - $this->_time_format = $pieces[1]; |
|
115 | - $this->_date_format = $pieces[2]; |
|
114 | + $this->_time_format = $pieces[ 1 ]; |
|
115 | + $this->_date_format = $pieces[ 2 ]; |
|
116 | 116 | |
117 | 117 | // Remove fake input IDs (5.1 doesn't exist. Use 5) |
118 | - $criteria['sorting']['key'] = floor( $pieces[0] ); |
|
118 | + $criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] ); |
|
119 | 119 | |
120 | 120 | /** |
121 | 121 | * Make sure sorting is numeric (# of seconds). IMPORTANT. |
122 | 122 | * @see GVCommon::is_field_numeric() is_numeric should also be set here |
123 | 123 | */ |
124 | - $criteria['sorting']['is_numeric'] = true; |
|
124 | + $criteria[ 'sorting' ][ 'is_numeric' ] = true; |
|
125 | 125 | |
126 | 126 | // Modify the Gravity Forms WP Query |
127 | - add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) ); |
|
127 | + add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) ); |
|
128 | 128 | } |
129 | 129 | } |
130 | 130 | |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | * then we want to modify the query. |
148 | 148 | * @see GFFormsModel::sort_by_field_query() |
149 | 149 | */ |
150 | - if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) { |
|
150 | + if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) { |
|
151 | 151 | |
152 | - if( $this->_time_format === '24' ) { |
|
152 | + if ( $this->_time_format === '24' ) { |
|
153 | 153 | $sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )"; |
154 | 154 | } else { |
155 | 155 | $sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )"; |
@@ -195,18 +195,18 @@ discard block |
||
195 | 195 | // Set variables |
196 | 196 | parent::field_options( $field_options, $template_id, $field_id, $context, $input_type ); |
197 | 197 | |
198 | - if( 'edit' === $context ) { |
|
198 | + if ( 'edit' === $context ) { |
|
199 | 199 | return $field_options; |
200 | 200 | } |
201 | 201 | |
202 | 202 | /** |
203 | 203 | * Set default date format based on field ID and Form ID |
204 | 204 | */ |
205 | - add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
205 | + add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
206 | 206 | |
207 | - $this->add_field_support('date_display', $field_options ); |
|
207 | + $this->add_field_support( 'date_display', $field_options ); |
|
208 | 208 | |
209 | - remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
209 | + remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
210 | 210 | |
211 | 211 | return $field_options; |
212 | 212 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | private function _get_time_format() { |
222 | 222 | global $post; |
223 | 223 | |
224 | - $current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID ); |
|
224 | + $current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID ); |
|
225 | 225 | |
226 | 226 | return self::_get_time_format_for_field( $this->_field_id, $current_form ); |
227 | 227 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | // GF defaults to 12, so should we. |
241 | 241 | $time_format = '12'; |
242 | 242 | |
243 | - if( $form_id ) { |
|
243 | + if ( $form_id ) { |
|
244 | 244 | $form = GFAPI::get_form( $form_id ); |
245 | 245 | |
246 | 246 | if ( $form ) { |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | $default = 'h:i A'; |
288 | 288 | |
289 | 289 | // This doesn't take into account 24-hour |
290 | - switch( $field_input_id ) { |
|
290 | + switch ( $field_input_id ) { |
|
291 | 291 | // Hours |
292 | 292 | case 1: |
293 | 293 | return ( $time_format === '12' ) ? 'h' : 'H'; |
@@ -69,7 +69,7 @@ |
||
69 | 69 | * |
70 | 70 | * @since 1.16 |
71 | 71 | * |
72 | - * @param int|string $value Number value for the field |
|
72 | + * @param string $value Number value for the field |
|
73 | 73 | * |
74 | 74 | * @return string Based on $value; `1`: "One-Time Payment"; `2`: "Subscription" |
75 | 75 | */ |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | public function get_content( $output, $entry = array(), $field_settings = array(), $field = array() ) { |
60 | 60 | |
61 | 61 | /** Overridden by a template. */ |
62 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
62 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
63 | 63 | |
64 | 64 | return $this->get_string_from_value( $output ); |
65 | 65 | } |
@@ -78,11 +78,11 @@ discard block |
||
78 | 78 | switch ( intval( $value ) ) { |
79 | 79 | case self::ONE_TIME_PAYMENT: |
80 | 80 | default: |
81 | - $return = __('One-Time Payment', 'gravityview'); |
|
81 | + $return = __( 'One-Time Payment', 'gravityview' ); |
|
82 | 82 | break; |
83 | 83 | |
84 | 84 | case self::SUBSCRIPTION: |
85 | - $return = __('Subscription', 'gravityview'); |
|
85 | + $return = __( 'Subscription', 'gravityview' ); |
|
86 | 86 | break; |
87 | 87 | } |
88 | 88 |
@@ -295,7 +295,8 @@ discard block |
||
295 | 295 | if ( empty( $license_data ) ) { |
296 | 296 | if ( $is_ajax ) { |
297 | 297 | exit( json_encode( array() ) ); |
298 | - } else { // Non-ajax call |
|
298 | + } else { |
|
299 | +// Non-ajax call |
|
299 | 300 | return json_encode( array() ); |
300 | 301 | } |
301 | 302 | } |
@@ -325,7 +326,8 @@ discard block |
||
325 | 326 | |
326 | 327 | if ( $is_ajax ) { |
327 | 328 | exit( $json ); |
328 | - } else { // Non-ajax call |
|
329 | + } else { |
|
330 | +// Non-ajax call |
|
329 | 331 | return ( rgget('format', $data ) === 'object' ) ? $license_data : $json; |
330 | 332 | } |
331 | 333 | } |
@@ -86,7 +86,6 @@ discard block |
||
86 | 86 | * |
87 | 87 | * @since 1.19.3 |
88 | 88 | * |
89 | - * @param bool $force Whether to force checking license, even if AJAX |
|
90 | 89 | * |
91 | 90 | * @return void |
92 | 91 | */ |
@@ -272,6 +271,9 @@ discard block |
||
272 | 271 | return $implode ? implode( $implode, $extensions ) : $extensions; |
273 | 272 | } |
274 | 273 | |
274 | + /** |
|
275 | + * @param boolean $echo |
|
276 | + */ |
|
275 | 277 | function settings_edd_license_activation( $field, $echo ) { |
276 | 278 | |
277 | 279 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
@@ -464,7 +466,7 @@ discard block |
||
464 | 466 | * Generate the status message box HTML based on the current status |
465 | 467 | * |
466 | 468 | * @since 1.7.4 |
467 | - * @param $message |
|
469 | + * @param string $message |
|
468 | 470 | * @param string $class |
469 | 471 | * |
470 | 472 | * @return string |
@@ -115,14 +115,14 @@ discard block |
||
115 | 115 | // Call the custom API. |
116 | 116 | $response = wp_remote_post( self::url, array( |
117 | 117 | 'timeout' => 15, |
118 | - 'sslverify' => false, |
|
119 | - 'body' => array( |
|
120 | - 'edd_action' => 'check_license', |
|
121 | - 'license' => trim( $this->Addon->get_app_setting( 'license_key' ) ), |
|
122 | - 'item_name' => self::name, |
|
123 | - 'url' => home_url(), |
|
124 | - 'site_data' => $this->get_site_data(), |
|
125 | - ), |
|
118 | + 'sslverify' => false, |
|
119 | + 'body' => array( |
|
120 | + 'edd_action' => 'check_license', |
|
121 | + 'license' => trim( $this->Addon->get_app_setting( 'license_key' ) ), |
|
122 | + 'item_name' => self::name, |
|
123 | + 'url' => home_url(), |
|
124 | + 'site_data' => $this->get_site_data(), |
|
125 | + ), |
|
126 | 126 | )); |
127 | 127 | |
128 | 128 | // make sure the response came back okay |
@@ -675,7 +675,7 @@ discard block |
||
675 | 675 | // Update option with passed data license |
676 | 676 | $settings = $this->Addon->get_app_settings(); |
677 | 677 | |
678 | - $settings['license_key'] = $license_data->license_key = trim( $data['license'] ); |
|
678 | + $settings['license_key'] = $license_data->license_key = trim( $data['license'] ); |
|
679 | 679 | $settings['license_key_status'] = $license_data->license; |
680 | 680 | $settings['license_key_response'] = (array)$license_data; |
681 | 681 |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * @return GV_License_Handler |
47 | 47 | */ |
48 | 48 | public static function get_instance( GravityView_Settings $GFAddOn ) { |
49 | - if( empty( self::$instance ) ) { |
|
49 | + if ( empty( self::$instance ) ) { |
|
50 | 50 | self::$instance = new self( $GFAddOn ); |
51 | 51 | } |
52 | 52 | return self::$instance; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | 'url' => home_url(), |
124 | 124 | 'site_data' => $this->get_site_data(), |
125 | 125 | ), |
126 | - )); |
|
126 | + ) ); |
|
127 | 127 | |
128 | 128 | // make sure the response came back okay |
129 | 129 | if ( is_wp_error( $response ) ) { |
@@ -149,12 +149,12 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function refresh_license_status() { |
151 | 151 | |
152 | - if ( defined('DOING_AJAX') && DOING_AJAX ) { |
|
152 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { |
|
153 | 153 | return; |
154 | 154 | } |
155 | 155 | |
156 | 156 | // The transient is fresh; don't fetch. |
157 | - if( $status = get_transient( self::status_transient_key ) ) { |
|
157 | + if ( $status = get_transient( self::status_transient_key ) ) { |
|
158 | 158 | return; |
159 | 159 | } |
160 | 160 | |
@@ -187,48 +187,48 @@ discard block |
||
187 | 187 | $theme_data = wp_get_theme(); |
188 | 188 | $theme = $theme_data->Name . ' ' . $theme_data->Version; |
189 | 189 | |
190 | - $data['gv_version'] = GravityView_Plugin::version; |
|
191 | - $data['php_version'] = phpversion(); |
|
192 | - $data['wp_version'] = get_bloginfo( 'version' ); |
|
193 | - $data['gf_version'] = GFForms::$version; |
|
194 | - $data['server'] = isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : ''; |
|
195 | - $data['multisite'] = is_multisite(); |
|
196 | - $data['theme'] = $theme; |
|
197 | - $data['url'] = home_url(); |
|
198 | - $data['license_key'] = GravityView_Settings::get_instance()->get_app_setting( 'license_key' ); |
|
190 | + $data[ 'gv_version' ] = GravityView_Plugin::version; |
|
191 | + $data[ 'php_version' ] = phpversion(); |
|
192 | + $data[ 'wp_version' ] = get_bloginfo( 'version' ); |
|
193 | + $data[ 'gf_version' ] = GFForms::$version; |
|
194 | + $data[ 'server' ] = isset( $_SERVER[ 'SERVER_SOFTWARE' ] ) ? $_SERVER[ 'SERVER_SOFTWARE' ] : ''; |
|
195 | + $data[ 'multisite' ] = is_multisite(); |
|
196 | + $data[ 'theme' ] = $theme; |
|
197 | + $data[ 'url' ] = home_url(); |
|
198 | + $data[ 'license_key' ] = GravityView_Settings::get_instance()->get_app_setting( 'license_key' ); |
|
199 | 199 | |
200 | 200 | // View Data |
201 | - $gravityview_posts = get_posts('numberposts=-1&post_type=gravityview&post_status=publish&order=ASC'); |
|
201 | + $gravityview_posts = get_posts( 'numberposts=-1&post_type=gravityview&post_status=publish&order=ASC' ); |
|
202 | 202 | |
203 | 203 | if ( ! empty( $gravityview_posts ) ) { |
204 | 204 | $first = array_shift( $gravityview_posts ); |
205 | 205 | $latest = array_pop( $gravityview_posts ); |
206 | - $data['view_count'] = count( $gravityview_posts ); |
|
207 | - $data['view_first'] = $first->post_date; |
|
208 | - $data['view_latest'] = $latest->post_date; |
|
206 | + $data[ 'view_count' ] = count( $gravityview_posts ); |
|
207 | + $data[ 'view_first' ] = $first->post_date; |
|
208 | + $data[ 'view_latest' ] = $latest->post_date; |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | // Form counts |
212 | 212 | if ( class_exists( 'GFFormsModel' ) ) { |
213 | 213 | $form_data = GFFormsModel::get_form_count(); |
214 | - $data['forms_total'] = rgar( $form_data, 'total', 0 ); |
|
215 | - $data['forms_active'] = rgar( $form_data, 'active', 0 ); |
|
216 | - $data['forms_inactive'] = rgar( $form_data, 'inactive', 0 ); |
|
217 | - $data['forms_trash'] = rgar( $form_data, 'inactive', 0 ); |
|
214 | + $data[ 'forms_total' ] = rgar( $form_data, 'total', 0 ); |
|
215 | + $data[ 'forms_active' ] = rgar( $form_data, 'active', 0 ); |
|
216 | + $data[ 'forms_inactive' ] = rgar( $form_data, 'inactive', 0 ); |
|
217 | + $data[ 'forms_trash' ] = rgar( $form_data, 'inactive', 0 ); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | // Retrieve current plugin information |
221 | - if( ! function_exists( 'get_plugins' ) ) { |
|
221 | + if ( ! function_exists( 'get_plugins' ) ) { |
|
222 | 222 | include ABSPATH . '/wp-admin/includes/plugin.php'; |
223 | 223 | } |
224 | 224 | |
225 | - $data['integrations'] = self::get_related_plugins_and_extensions(); |
|
226 | - $data['active_plugins'] = get_option( 'active_plugins', array() ); |
|
227 | - $data['inactive_plugins'] = array(); |
|
228 | - $data['locale'] = get_locale(); |
|
225 | + $data[ 'integrations' ] = self::get_related_plugins_and_extensions(); |
|
226 | + $data[ 'active_plugins' ] = get_option( 'active_plugins', array() ); |
|
227 | + $data[ 'inactive_plugins' ] = array(); |
|
228 | + $data[ 'locale' ] = get_locale(); |
|
229 | 229 | |
230 | 230 | // Validate request on the GV server |
231 | - $data['hash'] = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] ); |
|
231 | + $data[ 'hash' ] = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] ); |
|
232 | 232 | |
233 | 233 | return $data; |
234 | 234 | } |
@@ -260,10 +260,10 @@ discard block |
||
260 | 260 | |
261 | 261 | $plugin_data = get_plugin_data( $active_plugin ); |
262 | 262 | |
263 | - $extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] ); |
|
263 | + $extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] ); |
|
264 | 264 | } |
265 | 265 | |
266 | - if( ! empty( $extensions ) ) { |
|
266 | + if ( ! empty( $extensions ) ) { |
|
267 | 267 | set_site_transient( self::related_plugins_key, $extensions, HOUR_IN_SECONDS ); |
268 | 268 | } else { |
269 | 269 | return 'There was an error fetching related plugins.'; |
@@ -282,37 +282,37 @@ discard block |
||
282 | 282 | $status = trim( $this->Addon->get_app_setting( 'license_key_status' ) ); |
283 | 283 | $key = trim( $this->Addon->get_app_setting( 'license_key' ) ); |
284 | 284 | |
285 | - if( !empty( $key ) ) { |
|
285 | + if ( ! empty( $key ) ) { |
|
286 | 286 | $response = $this->Addon->get_app_setting( 'license_key_response' ); |
287 | - $response = is_array( $response ) ? (object) $response : json_decode( $response ); |
|
287 | + $response = is_array( $response ) ? (object)$response : json_decode( $response ); |
|
288 | 288 | } else { |
289 | 289 | $response = array(); |
290 | 290 | } |
291 | 291 | |
292 | 292 | wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array( |
293 | 293 | 'license_box' => $this->get_license_message( $response ) |
294 | - )); |
|
294 | + ) ); |
|
295 | 295 | |
296 | 296 | |
297 | 297 | $fields = array( |
298 | 298 | array( |
299 | 299 | 'name' => 'edd-activate', |
300 | - 'value' => __('Activate License', 'gravityview'), |
|
301 | - 'data-pending_text' => __('Verifying license…', 'gravityview'), |
|
300 | + 'value' => __( 'Activate License', 'gravityview' ), |
|
301 | + 'data-pending_text' => __( 'Verifying license…', 'gravityview' ), |
|
302 | 302 | 'data-edd_action' => 'activate_license', |
303 | 303 | 'class' => 'button-primary', |
304 | 304 | ), |
305 | 305 | array( |
306 | 306 | 'name' => 'edd-deactivate', |
307 | - 'value' => __('Deactivate License', 'gravityview'), |
|
308 | - 'data-pending_text' => __('Deactivating license…', 'gravityview'), |
|
307 | + 'value' => __( 'Deactivate License', 'gravityview' ), |
|
308 | + 'data-pending_text' => __( 'Deactivating license…', 'gravityview' ), |
|
309 | 309 | 'data-edd_action' => 'deactivate_license', |
310 | 310 | 'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ), |
311 | 311 | ), |
312 | 312 | array( |
313 | 313 | 'name' => 'edd-check', |
314 | - 'value' => __('Check License', 'gravityview'), |
|
315 | - 'data-pending_text' => __('Verifying license…', 'gravityview'), |
|
314 | + 'value' => __( 'Check License', 'gravityview' ), |
|
315 | + 'data-pending_text' => __( 'Verifying license…', 'gravityview' ), |
|
316 | 316 | 'title' => 'Check the license before saving it', |
317 | 317 | 'data-edd_action' => 'check_license', |
318 | 318 | 'class' => 'button-secondary', |
@@ -322,17 +322,17 @@ discard block |
||
322 | 322 | |
323 | 323 | $class = 'button gv-edd-action'; |
324 | 324 | |
325 | - $class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide'; |
|
325 | + $class .= ( ! empty( $key ) && $status !== 'valid' ) ? '' : ' hide'; |
|
326 | 326 | |
327 | 327 | $disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled'; |
328 | 328 | |
329 | 329 | $submit = '<div class="gv-edd-button-wrapper">'; |
330 | 330 | foreach ( $fields as $field ) { |
331 | - $field['type'] = 'button'; |
|
332 | - $field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class; |
|
333 | - $field['style'] = 'margin-left: 10px;'; |
|
334 | - if( $disabled_attribute ) { |
|
335 | - $field['disabled'] = $disabled_attribute; |
|
331 | + $field[ 'type' ] = 'button'; |
|
332 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class; |
|
333 | + $field[ 'style' ] = 'margin-left: 10px;'; |
|
334 | + if ( $disabled_attribute ) { |
|
335 | + $field[ 'disabled' ] = $disabled_attribute; |
|
336 | 336 | } |
337 | 337 | $submit .= $this->Addon->settings_submit( $field, $echo ); |
338 | 338 | } |
@@ -348,8 +348,8 @@ discard block |
||
348 | 348 | */ |
349 | 349 | private function setup_edd() { |
350 | 350 | |
351 | - if( !class_exists('EDD_SL_Plugin_Updater') ) { |
|
352 | - require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php'); |
|
351 | + if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) { |
|
352 | + require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php' ); |
|
353 | 353 | } |
354 | 354 | |
355 | 355 | // setup the updater |
@@ -386,8 +386,8 @@ discard block |
||
386 | 386 | 'url' => home_url(), |
387 | 387 | ); |
388 | 388 | |
389 | - if( !empty( $action ) ) { |
|
390 | - $settings['edd_action'] = esc_attr( $action ); |
|
389 | + if ( ! empty( $action ) ) { |
|
390 | + $settings[ 'edd_action' ] = esc_attr( $action ); |
|
391 | 391 | } |
392 | 392 | |
393 | 393 | $settings = array_map( 'urlencode', $settings ); |
@@ -401,14 +401,14 @@ discard block |
||
401 | 401 | */ |
402 | 402 | private function _license_get_remote_response( $data, $license = '' ) { |
403 | 403 | |
404 | - $api_params = $this->_get_edd_settings( $data['edd_action'], $license ); |
|
404 | + $api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license ); |
|
405 | 405 | |
406 | 406 | $url = add_query_arg( $api_params, self::url ); |
407 | 407 | |
408 | 408 | $response = wp_remote_get( $url, array( |
409 | 409 | 'timeout' => 15, |
410 | 410 | 'sslverify' => false, |
411 | - )); |
|
411 | + ) ); |
|
412 | 412 | |
413 | 413 | if ( is_wp_error( $response ) ) { |
414 | 414 | return array(); |
@@ -441,11 +441,11 @@ discard block |
||
441 | 441 | */ |
442 | 442 | function get_license_message( $license_data ) { |
443 | 443 | |
444 | - if( empty( $license_data ) ) { |
|
444 | + if ( empty( $license_data ) ) { |
|
445 | 445 | $message = ''; |
446 | 446 | } else { |
447 | 447 | |
448 | - if( ! empty( $license_data->error ) ) { |
|
448 | + if ( ! empty( $license_data->error ) ) { |
|
449 | 449 | $class = 'error'; |
450 | 450 | $string_key = $license_data->error; |
451 | 451 | } else { |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | $string_key = $license_data->license; |
454 | 454 | } |
455 | 455 | |
456 | - $message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) ); |
|
456 | + $message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings( 'status' ), $this->strings( $string_key, $license_data ) ); |
|
457 | 457 | |
458 | 458 | $message = $this->generate_license_box( $message, $class ); |
459 | 459 | } |
@@ -490,18 +490,18 @@ discard block |
||
490 | 490 | */ |
491 | 491 | public function license_details( $response = array() ) { |
492 | 492 | |
493 | - $response = (array) $response; |
|
493 | + $response = (array)$response; |
|
494 | 494 | |
495 | 495 | $return = ''; |
496 | 496 | $wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>'; |
497 | 497 | |
498 | - if( ! empty( $response['license_key'] ) ) { |
|
498 | + if ( ! empty( $response[ 'license_key' ] ) ) { |
|
499 | 499 | |
500 | 500 | $return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>'; |
501 | 501 | |
502 | 502 | if ( in_array( rgar( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) { |
503 | - $return .= $this->strings( $response['license'], $response ); |
|
504 | - } elseif ( ! empty( $response['license_name'] ) ) { |
|
503 | + $return .= $this->strings( $response[ 'license' ], $response ); |
|
504 | + } elseif ( ! empty( $response[ 'license_name' ] ) ) { |
|
505 | 505 | |
506 | 506 | $response_keys = array( |
507 | 507 | 'license_name' => '', |
@@ -516,19 +516,19 @@ discard block |
||
516 | 516 | // Make sure all the keys are set |
517 | 517 | $response = wp_parse_args( $response, $response_keys ); |
518 | 518 | |
519 | - $login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) ); |
|
520 | - $local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
519 | + $login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) ); |
|
520 | + $local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
521 | 521 | $details = array( |
522 | - 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ), |
|
523 | - 'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link, |
|
524 | - 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text, |
|
525 | - 'expires' => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ), |
|
526 | - 'upgrade' => $this->get_upgrade_html( $response['upgrades'] ), |
|
522 | + 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ), |
|
523 | + 'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link, |
|
524 | + 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text, |
|
525 | + 'expires' => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ), |
|
526 | + 'upgrade' => $this->get_upgrade_html( $response[ 'upgrades' ] ), |
|
527 | 527 | ); |
528 | 528 | |
529 | - if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) { |
|
530 | - unset( $details['upgrade'] ); |
|
531 | - $details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
529 | + if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) { |
|
530 | + unset( $details[ 'upgrade' ] ); |
|
531 | + $details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
532 | 532 | } |
533 | 533 | |
534 | 534 | $return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>'; |
@@ -551,11 +551,11 @@ discard block |
||
551 | 551 | |
552 | 552 | $output = ''; |
553 | 553 | |
554 | - if( ! empty( $upgrades ) ) { |
|
554 | + if ( ! empty( $upgrades ) ) { |
|
555 | 555 | |
556 | 556 | $locale_parts = explode( '_', get_locale() ); |
557 | 557 | |
558 | - $is_english = ( 'en' === $locale_parts[0] ); |
|
558 | + $is_english = ( 'en' === $locale_parts[ 0 ] ); |
|
559 | 559 | |
560 | 560 | $output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>'; |
561 | 561 | |
@@ -563,14 +563,14 @@ discard block |
||
563 | 563 | |
564 | 564 | foreach ( $upgrades as $upgrade_id => $upgrade ) { |
565 | 565 | |
566 | - $upgrade = (object) $upgrade; |
|
566 | + $upgrade = (object)$upgrade; |
|
567 | 567 | |
568 | 568 | $anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) ); |
569 | 569 | |
570 | - if( $is_english && isset( $upgrade->description ) ) { |
|
570 | + if ( $is_english && isset( $upgrade->description ) ) { |
|
571 | 571 | $message = esc_html( $upgrade->description ); |
572 | 572 | } else { |
573 | - switch( $upgrade->price_id ) { |
|
573 | + switch ( $upgrade->price_id ) { |
|
574 | 574 | // Interstellar |
575 | 575 | case 1: |
576 | 576 | default: |
@@ -608,16 +608,16 @@ discard block |
||
608 | 608 | */ |
609 | 609 | public function license_call( $array = array() ) { |
610 | 610 | |
611 | - $is_ajax = ( defined('DOING_AJAX') && DOING_AJAX ); |
|
612 | - $data = empty( $array ) ? $_POST['data'] : $array; |
|
611 | + $is_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
612 | + $data = empty( $array ) ? $_POST[ 'data' ] : $array; |
|
613 | 613 | $has_cap = GVCommon::has_cap( 'gravityview_edit_settings' ); |
614 | 614 | |
615 | - if ( $is_ajax && empty( $data['license'] ) ) { |
|
616 | - die( - 1 ); |
|
615 | + if ( $is_ajax && empty( $data[ 'license' ] ) ) { |
|
616 | + die( -1 ); |
|
617 | 617 | } |
618 | 618 | |
619 | 619 | // If the user isn't allowed to edit settings, show an error message |
620 | - if( ! $has_cap && empty( $data['all_caps'] ) ) { |
|
620 | + if ( ! $has_cap && empty( $data[ 'all_caps' ] ) ) { |
|
621 | 621 | $license_data = new stdClass(); |
622 | 622 | $license_data->error = 'capability'; |
623 | 623 | $license_data->message = $this->get_license_message( $license_data ); |
@@ -641,9 +641,9 @@ discard block |
||
641 | 641 | |
642 | 642 | $json = json_encode( $license_data ); |
643 | 643 | |
644 | - $update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) ); |
|
644 | + $update_license = ( ! isset( $data[ 'update' ] ) || ! empty( $data[ 'update' ] ) ); |
|
645 | 645 | |
646 | - $is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
646 | + $is_check_action_button = ( 'check_license' === $data[ 'edd_action' ] && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
647 | 647 | |
648 | 648 | // Failed is the response from trying to de-activate a license and it didn't work. |
649 | 649 | // This likely happened because people entered in a different key and clicked "Deactivate", |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | // most likely a mistake. |
652 | 652 | if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) { |
653 | 653 | |
654 | - if ( ! empty( $data['field_id'] ) ) { |
|
654 | + if ( ! empty( $data[ 'field_id' ] ) ) { |
|
655 | 655 | set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS ); |
656 | 656 | } |
657 | 657 | |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | if ( $is_ajax ) { |
663 | 663 | exit( $json ); |
664 | 664 | } else { // Non-ajax call |
665 | - return ( rgget('format', $data ) === 'object' ) ? $license_data : $json; |
|
665 | + return ( rgget( 'format', $data ) === 'object' ) ? $license_data : $json; |
|
666 | 666 | } |
667 | 667 | } |
668 | 668 | |
@@ -676,9 +676,9 @@ discard block |
||
676 | 676 | // Update option with passed data license |
677 | 677 | $settings = $this->Addon->get_app_settings(); |
678 | 678 | |
679 | - $settings['license_key'] = $license_data->license_key = trim( $data['license'] ); |
|
680 | - $settings['license_key_status'] = $license_data->license; |
|
681 | - $settings['license_key_response'] = (array)$license_data; |
|
679 | + $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] ); |
|
680 | + $settings[ 'license_key_status' ] = $license_data->license; |
|
681 | + $settings[ 'license_key_response' ] = (array)$license_data; |
|
682 | 682 | |
683 | 683 | $this->Addon->update_app_settings( $settings ); |
684 | 684 | } |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | */ |
692 | 692 | private function get_license_renewal_url( $license_data ) { |
693 | 693 | $license_data = is_array( $license_data ) ? (object)$license_data : $license_data; |
694 | - $renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1', $license_data->license_key ) : 'https://gravityview.co/account/'; |
|
694 | + $renew_license_url = ( ! empty( $license_data ) && ! empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1', $license_data->license_key ) : 'https://gravityview.co/account/'; |
|
695 | 695 | return $renew_license_url; |
696 | 696 | } |
697 | 697 | |
@@ -706,31 +706,31 @@ discard block |
||
706 | 706 | |
707 | 707 | |
708 | 708 | $strings = array( |
709 | - 'status' => esc_html__('Status', 'gravityview'), |
|
710 | - 'error' => esc_html__('There was an error processing the request.', 'gravityview'), |
|
711 | - 'failed' => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'), |
|
712 | - 'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'), |
|
713 | - 'inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'), |
|
714 | - 'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview') . ' ' . sprintf( esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>' ), |
|
715 | - 'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'), |
|
716 | - 'valid' => esc_html__('The license key is valid and active.', 'gravityview'), |
|
717 | - 'invalid' => esc_html__('The license key entered is invalid.', 'gravityview'), |
|
718 | - 'missing' => esc_html__('Invalid license key.', 'gravityview'), |
|
719 | - 'revoked' => esc_html__('This license key has been revoked.', 'gravityview'), |
|
720 | - 'expired' => sprintf( esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ), |
|
709 | + 'status' => esc_html__( 'Status', 'gravityview' ), |
|
710 | + 'error' => esc_html__( 'There was an error processing the request.', 'gravityview' ), |
|
711 | + 'failed' => esc_html__( 'Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview' ), |
|
712 | + 'site_inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ), |
|
713 | + 'inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ), |
|
714 | + 'no_activations_left' => esc_html__( 'Invalid: this license has reached its activation limit.', 'gravityview' ) . ' ' . sprintf( esc_html__( 'You can manage license activations %son your GravityView account page%s.', 'gravityview' ), '<a href="https://gravityview.co/account/#licenses">', '</a>' ), |
|
715 | + 'deactivated' => esc_html__( 'The license has been deactivated.', 'gravityview' ), |
|
716 | + 'valid' => esc_html__( 'The license key is valid and active.', 'gravityview' ), |
|
717 | + 'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), |
|
718 | + 'missing' => esc_html__( 'Invalid license key.', 'gravityview' ), |
|
719 | + 'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ), |
|
720 | + 'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ), |
|
721 | 721 | 'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ), |
722 | 722 | |
723 | - 'verifying_license' => esc_html__('Verifying license…', 'gravityview'), |
|
724 | - 'activate_license' => esc_html__('Activate License', 'gravityview'), |
|
725 | - 'deactivate_license' => esc_html__('Deactivate License', 'gravityview'), |
|
726 | - 'check_license' => esc_html__('Verify License', 'gravityview'), |
|
723 | + 'verifying_license' => esc_html__( 'Verifying license…', 'gravityview' ), |
|
724 | + 'activate_license' => esc_html__( 'Activate License', 'gravityview' ), |
|
725 | + 'deactivate_license' => esc_html__( 'Deactivate License', 'gravityview' ), |
|
726 | + 'check_license' => esc_html__( 'Verify License', 'gravityview' ), |
|
727 | 727 | ); |
728 | 728 | |
729 | - if( empty( $status ) ) { |
|
729 | + if ( empty( $status ) ) { |
|
730 | 730 | return $strings; |
731 | 731 | } |
732 | 732 | |
733 | - if( isset( $strings[ $status ] ) ) { |
|
733 | + if ( isset( $strings[ $status ] ) ) { |
|
734 | 734 | return $strings[ $status ]; |
735 | 735 | } |
736 | 736 |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | |
57 | 57 | parent::add_hooks(); |
58 | 58 | |
59 | - if( gravityview_is_admin_page() ) { |
|
59 | + if ( gravityview_is_admin_page() ) { |
|
60 | 60 | |
61 | 61 | // Make Yoast metabox go down to the bottom please. |
62 | 62 | add_filter( 'wpseo_metabox_prio', array( $this, '__return_low' ) ); |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | global $pagenow; |
84 | 84 | |
85 | 85 | // New View page |
86 | - if( $pagenow === 'post-new.php' ) { |
|
87 | - $options['hideeditbox-gravityview'] = true; |
|
86 | + if ( $pagenow === 'post-new.php' ) { |
|
87 | + $options[ 'hideeditbox-gravityview' ] = true; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | return $options; |
@@ -78,7 +78,7 @@ |
||
78 | 78 | $gv_page = gravityview_is_admin_page( '', 'single' ); |
79 | 79 | |
80 | 80 | // New View or Edit View page |
81 | - if( $gv_page && $pagenow === 'post-new.php' ) { |
|
81 | + if ( $gv_page && $pagenow === 'post-new.php' ) { |
|
82 | 82 | remove_meta_box( 'woothemes-settings', 'gravityview', 'normal' ); |
83 | 83 | } |
84 | 84 | } |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | function init() { |
22 | 22 | |
23 | 23 | $icon = is_admin() ? '<i class="icon gv-icon-astronaut-head"></i> ' : NULL; |
24 | - $this->title( $icon . __('GravityView', 'gravityview') ); |
|
24 | + $this->title( $icon . __( 'GravityView', 'gravityview' ) ); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | function get_warnings() { |
28 | 28 | |
29 | - if( is_null( $this->warnings ) ) { |
|
29 | + if ( is_null( $this->warnings ) ) { |
|
30 | 30 | $this->warnings = GravityView_Logging::get_errors(); |
31 | 31 | } |
32 | 32 | |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | function get_notices() { |
37 | 37 | |
38 | - if( is_null( $this->notices ) ) { |
|
38 | + if ( is_null( $this->notices ) ) { |
|
39 | 39 | $this->notices = GravityView_Logging::get_notices(); |
40 | 40 | } |
41 | 41 | |
@@ -84,27 +84,27 @@ discard block |
||
84 | 84 | </style> |
85 | 85 | <div id='debug-bar-gravityview'>"; |
86 | 86 | |
87 | - $output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="alignright" alt="" width="100" height="132" />'; |
|
87 | + $output .= '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="alignright" alt="" width="100" height="132" />'; |
|
88 | 88 | |
89 | 89 | |
90 | 90 | $warnings = $this->get_warnings(); |
91 | 91 | $notices = $this->get_notices(); |
92 | 92 | |
93 | - if(count($warnings)) { |
|
94 | - $output .= '<h3><span>'.__('Warnings', 'gravityview').'</span></h3>'; |
|
93 | + if ( count( $warnings ) ) { |
|
94 | + $output .= '<h3><span>' . __( 'Warnings', 'gravityview' ) . '</span></h3>'; |
|
95 | 95 | $output .= '<ol>'; |
96 | - foreach ( $warnings as $key => $notice) { |
|
97 | - if(empty($notice['message'])) { continue; } |
|
98 | - $output .= '<li><a href="#'.sanitize_html_class( 'gv-warning-' . $key ).'">'.strip_tags($notice['message']).'</a></li>'; |
|
96 | + foreach ( $warnings as $key => $notice ) { |
|
97 | + if ( empty( $notice[ 'message' ] ) ) { continue; } |
|
98 | + $output .= '<li><a href="#' . sanitize_html_class( 'gv-warning-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>'; |
|
99 | 99 | } |
100 | 100 | $output .= '</ol><hr />'; |
101 | 101 | } |
102 | - if(count($notices)) { |
|
103 | - $output .= '<h3><span>'.__('Logs', 'gravityview').'</span></h3>'; |
|
102 | + if ( count( $notices ) ) { |
|
103 | + $output .= '<h3><span>' . __( 'Logs', 'gravityview' ) . '</span></h3>'; |
|
104 | 104 | $output .= '<ol>'; |
105 | - foreach ( $notices as $key => $notice) { |
|
106 | - if(empty($notice['message'])) { continue; } |
|
107 | - $output .= '<li><a href="#'.sanitize_html_class( 'gv-notice-' . $key ).'">'.strip_tags($notice['message']).'</a></li>'; |
|
105 | + foreach ( $notices as $key => $notice ) { |
|
106 | + if ( empty( $notice[ 'message' ] ) ) { continue; } |
|
107 | + $output .= '<li><a href="#' . sanitize_html_class( 'gv-notice-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>'; |
|
108 | 108 | } |
109 | 109 | $output .= '</ol><hr />'; |
110 | 110 | } |
@@ -112,14 +112,14 @@ discard block |
||
112 | 112 | if ( count( $warnings ) ) { |
113 | 113 | $output .= '<h3>Warnings</h3>'; |
114 | 114 | $output .= '<ol class="debug-bar-php-list">'; |
115 | - foreach ( $warnings as $key => $notice) { $output .= $this->render_item( $notice, 'gv-warning-' . $key ); } |
|
115 | + foreach ( $warnings as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-warning-' . $key ); } |
|
116 | 116 | $output .= '</ol>'; |
117 | 117 | } |
118 | 118 | |
119 | 119 | if ( count( $notices ) ) { |
120 | 120 | $output .= '<h3>Notices</h3>'; |
121 | 121 | $output .= '<ol class="debug-bar-php-list">'; |
122 | - foreach ( $notices as $key => $notice) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); } |
|
122 | + foreach ( $notices as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); } |
|
123 | 123 | $output .= '</ol>'; |
124 | 124 | } |
125 | 125 | |
@@ -133,17 +133,17 @@ discard block |
||
133 | 133 | * @param string|array $item Unescaped |
134 | 134 | * @return string Escaped HTML |
135 | 135 | */ |
136 | - function esc_html_recursive($item) { |
|
137 | - if(is_object($item)) { |
|
138 | - foreach($item as $key => $value) { |
|
139 | - $item->{$key} = $this->esc_html_recursive($value); |
|
136 | + function esc_html_recursive( $item ) { |
|
137 | + if ( is_object( $item ) ) { |
|
138 | + foreach ( $item as $key => $value ) { |
|
139 | + $item->{$key} = $this->esc_html_recursive( $value ); |
|
140 | 140 | } |
141 | - } else if(is_array($item)) { |
|
142 | - foreach($item as $key => $value) { |
|
143 | - $item[$key] = $this->esc_html_recursive($value); |
|
141 | + } else if ( is_array( $item ) ) { |
|
142 | + foreach ( $item as $key => $value ) { |
|
143 | + $item[ $key ] = $this->esc_html_recursive( $value ); |
|
144 | 144 | } |
145 | 145 | } else { |
146 | - $item = esc_html($item); |
|
146 | + $item = esc_html( $item ); |
|
147 | 147 | } |
148 | 148 | return $item; |
149 | 149 | } |
@@ -159,26 +159,26 @@ discard block |
||
159 | 159 | |
160 | 160 | $output = ''; |
161 | 161 | |
162 | - if(!empty($notice['message'])) { |
|
163 | - $output .= '<a id="'.sanitize_html_class( $anchor ).'"></a>'; |
|
162 | + if ( ! empty( $notice[ 'message' ] ) ) { |
|
163 | + $output .= '<a id="' . sanitize_html_class( $anchor ) . '"></a>'; |
|
164 | 164 | $output .= "<li class='debug-bar-php-notice'>"; |
165 | 165 | } |
166 | 166 | |
167 | 167 | $output .= '<div class="clear"></div>'; |
168 | 168 | |
169 | 169 | // Title |
170 | - $output .= '<div class="gravityview-debug-bar-title">'.esc_attr( $notice['message'] ).'</div>'; |
|
170 | + $output .= '<div class="gravityview-debug-bar-title">' . esc_attr( $notice[ 'message' ] ) . '</div>'; |
|
171 | 171 | |
172 | 172 | // Debugging Output |
173 | - if( empty( $notice['data'] ) ) { |
|
174 | - if( !is_null( $notice['data'] ) ) { |
|
175 | - $output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>'; |
|
173 | + if ( empty( $notice[ 'data' ] ) ) { |
|
174 | + if ( ! is_null( $notice[ 'data' ] ) ) { |
|
175 | + $output .= '<em>' . _x( 'Empty', 'Debugging output data is empty.', 'gravityview' ) . '</em>'; |
|
176 | 176 | } |
177 | 177 | } else { |
178 | - $output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) ); |
|
178 | + $output .= sprintf( '<pre>%s</pre>', print_r( $this->esc_html_recursive( $notice[ 'data' ] ), true ) ); |
|
179 | 179 | } |
180 | 180 | |
181 | - if(!empty($notice['message'])) { |
|
181 | + if ( ! empty( $notice[ 'message' ] ) ) { |
|
182 | 182 | $output .= '</li>'; |
183 | 183 | } |
184 | 184 |
@@ -5,4 +5,4 @@ |
||
5 | 5 | * @deprecated 1.7.5 |
6 | 6 | */ |
7 | 7 | |
8 | -include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' ); |
|
8 | +include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' ); |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
29 | 29 | |
30 | - unset ( $field_options['search_filter'], $field_options['show_as_link'] ); |
|
30 | + unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] ); |
|
31 | 31 | |
32 | 32 | return $field_options; |
33 | 33 | } |