@@ -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,47 +187,47 @@ 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(); |
|
| 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 | 198 | |
| 199 | 199 | // View Data |
| 200 | - $gravityview_posts = get_posts('numberposts=-1&post_type=gravityview&post_status=publish&order=ASC'); |
|
| 200 | + $gravityview_posts = get_posts( 'numberposts=-1&post_type=gravityview&post_status=publish&order=ASC' ); |
|
| 201 | 201 | |
| 202 | 202 | if ( ! empty( $gravityview_posts ) ) { |
| 203 | 203 | $first = array_shift( $gravityview_posts ); |
| 204 | 204 | $latest = array_pop( $gravityview_posts ); |
| 205 | - $data['view_count'] = count( $gravityview_posts ); |
|
| 206 | - $data['view_first'] = $first->post_date; |
|
| 207 | - $data['view_latest'] = $latest->post_date; |
|
| 205 | + $data[ 'view_count' ] = count( $gravityview_posts ); |
|
| 206 | + $data[ 'view_first' ] = $first->post_date; |
|
| 207 | + $data[ 'view_latest' ] = $latest->post_date; |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // Form counts |
| 211 | 211 | if ( class_exists( 'GFFormsModel' ) ) { |
| 212 | 212 | $form_data = GFFormsModel::get_form_count(); |
| 213 | - $data['forms_total'] = rgar( $form_data, 'total', 0 ); |
|
| 214 | - $data['forms_active'] = rgar( $form_data, 'active', 0 ); |
|
| 215 | - $data['forms_inactive'] = rgar( $form_data, 'inactive', 0 ); |
|
| 216 | - $data['forms_trash'] = rgar( $form_data, 'inactive', 0 ); |
|
| 213 | + $data[ 'forms_total' ] = rgar( $form_data, 'total', 0 ); |
|
| 214 | + $data[ 'forms_active' ] = rgar( $form_data, 'active', 0 ); |
|
| 215 | + $data[ 'forms_inactive' ] = rgar( $form_data, 'inactive', 0 ); |
|
| 216 | + $data[ 'forms_trash' ] = rgar( $form_data, 'inactive', 0 ); |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | // Retrieve current plugin information |
| 220 | - if( ! function_exists( 'get_plugins' ) ) { |
|
| 220 | + if ( ! function_exists( 'get_plugins' ) ) { |
|
| 221 | 221 | include ABSPATH . '/wp-admin/includes/plugin.php'; |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | - $data['integrations'] = self::get_related_plugins_and_extensions(); |
|
| 225 | - $data['active_plugins'] = get_option( 'active_plugins', array() ); |
|
| 226 | - $data['inactive_plugins'] = array(); |
|
| 227 | - $data['locale'] = get_locale(); |
|
| 224 | + $data[ 'integrations' ] = self::get_related_plugins_and_extensions(); |
|
| 225 | + $data[ 'active_plugins' ] = get_option( 'active_plugins', array() ); |
|
| 226 | + $data[ 'inactive_plugins' ] = array(); |
|
| 227 | + $data[ 'locale' ] = get_locale(); |
|
| 228 | 228 | |
| 229 | 229 | // Validate request on the GV server |
| 230 | - $data['hash'] = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] ); |
|
| 230 | + $data[ 'hash' ] = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] ); |
|
| 231 | 231 | |
| 232 | 232 | return $data; |
| 233 | 233 | } |
@@ -259,10 +259,10 @@ discard block |
||
| 259 | 259 | |
| 260 | 260 | $plugin_data = get_plugin_data( $active_plugin ); |
| 261 | 261 | |
| 262 | - $extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] ); |
|
| 262 | + $extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] ); |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | - if( ! empty( $extensions ) ) { |
|
| 265 | + if ( ! empty( $extensions ) ) { |
|
| 266 | 266 | set_site_transient( self::related_plugins_key, $extensions, HOUR_IN_SECONDS ); |
| 267 | 267 | } else { |
| 268 | 268 | return 'There was an error fetching related plugins.'; |
@@ -281,37 +281,37 @@ discard block |
||
| 281 | 281 | $status = trim( $this->Addon->get_app_setting( 'license_key_status' ) ); |
| 282 | 282 | $key = trim( $this->Addon->get_app_setting( 'license_key' ) ); |
| 283 | 283 | |
| 284 | - if( !empty( $key ) ) { |
|
| 284 | + if ( ! empty( $key ) ) { |
|
| 285 | 285 | $response = $this->Addon->get_app_setting( 'license_key_response' ); |
| 286 | - $response = is_array( $response ) ? (object) $response : json_decode( $response ); |
|
| 286 | + $response = is_array( $response ) ? (object)$response : json_decode( $response ); |
|
| 287 | 287 | } else { |
| 288 | 288 | $response = array(); |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array( |
| 292 | 292 | 'license_box' => $this->get_license_message( $response ) |
| 293 | - )); |
|
| 293 | + ) ); |
|
| 294 | 294 | |
| 295 | 295 | |
| 296 | 296 | $fields = array( |
| 297 | 297 | array( |
| 298 | 298 | 'name' => 'edd-activate', |
| 299 | - 'value' => __('Activate License', 'gravityview'), |
|
| 300 | - 'data-pending_text' => __('Verifying license…', 'gravityview'), |
|
| 299 | + 'value' => __( 'Activate License', 'gravityview' ), |
|
| 300 | + 'data-pending_text' => __( 'Verifying license…', 'gravityview' ), |
|
| 301 | 301 | 'data-edd_action' => 'activate_license', |
| 302 | 302 | 'class' => 'button-primary', |
| 303 | 303 | ), |
| 304 | 304 | array( |
| 305 | 305 | 'name' => 'edd-deactivate', |
| 306 | - 'value' => __('Deactivate License', 'gravityview'), |
|
| 307 | - 'data-pending_text' => __('Deactivating license…', 'gravityview'), |
|
| 306 | + 'value' => __( 'Deactivate License', 'gravityview' ), |
|
| 307 | + 'data-pending_text' => __( 'Deactivating license…', 'gravityview' ), |
|
| 308 | 308 | 'data-edd_action' => 'deactivate_license', |
| 309 | 309 | 'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ), |
| 310 | 310 | ), |
| 311 | 311 | array( |
| 312 | 312 | 'name' => 'edd-check', |
| 313 | - 'value' => __('Check License', 'gravityview'), |
|
| 314 | - 'data-pending_text' => __('Verifying license…', 'gravityview'), |
|
| 313 | + 'value' => __( 'Check License', 'gravityview' ), |
|
| 314 | + 'data-pending_text' => __( 'Verifying license…', 'gravityview' ), |
|
| 315 | 315 | 'title' => 'Check the license before saving it', |
| 316 | 316 | 'data-edd_action' => 'check_license', |
| 317 | 317 | 'class' => 'button-secondary', |
@@ -321,17 +321,17 @@ discard block |
||
| 321 | 321 | |
| 322 | 322 | $class = 'button gv-edd-action'; |
| 323 | 323 | |
| 324 | - $class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide'; |
|
| 324 | + $class .= ( ! empty( $key ) && $status !== 'valid' ) ? '' : ' hide'; |
|
| 325 | 325 | |
| 326 | 326 | $disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled'; |
| 327 | 327 | |
| 328 | 328 | $submit = '<div class="gv-edd-button-wrapper">'; |
| 329 | 329 | foreach ( $fields as $field ) { |
| 330 | - $field['type'] = 'button'; |
|
| 331 | - $field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class; |
|
| 332 | - $field['style'] = 'margin-left: 10px;'; |
|
| 333 | - if( $disabled_attribute ) { |
|
| 334 | - $field['disabled'] = $disabled_attribute; |
|
| 330 | + $field[ 'type' ] = 'button'; |
|
| 331 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class; |
|
| 332 | + $field[ 'style' ] = 'margin-left: 10px;'; |
|
| 333 | + if ( $disabled_attribute ) { |
|
| 334 | + $field[ 'disabled' ] = $disabled_attribute; |
|
| 335 | 335 | } |
| 336 | 336 | $submit .= $this->Addon->settings_submit( $field, $echo ); |
| 337 | 337 | } |
@@ -347,8 +347,8 @@ discard block |
||
| 347 | 347 | */ |
| 348 | 348 | private function setup_edd() { |
| 349 | 349 | |
| 350 | - if( !class_exists('EDD_SL_Plugin_Updater') ) { |
|
| 351 | - require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php'); |
|
| 350 | + if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) { |
|
| 351 | + require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php' ); |
|
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | // setup the updater |
@@ -385,8 +385,8 @@ discard block |
||
| 385 | 385 | 'url' => home_url(), |
| 386 | 386 | ); |
| 387 | 387 | |
| 388 | - if( !empty( $action ) ) { |
|
| 389 | - $settings['edd_action'] = esc_attr( $action ); |
|
| 388 | + if ( ! empty( $action ) ) { |
|
| 389 | + $settings[ 'edd_action' ] = esc_attr( $action ); |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | $settings = array_map( 'urlencode', $settings ); |
@@ -400,14 +400,14 @@ discard block |
||
| 400 | 400 | */ |
| 401 | 401 | private function _license_get_remote_response( $data, $license = '' ) { |
| 402 | 402 | |
| 403 | - $api_params = $this->_get_edd_settings( $data['edd_action'], $license ); |
|
| 403 | + $api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license ); |
|
| 404 | 404 | |
| 405 | 405 | $url = add_query_arg( $api_params, self::url ); |
| 406 | 406 | |
| 407 | 407 | $response = wp_remote_get( $url, array( |
| 408 | 408 | 'timeout' => 15, |
| 409 | 409 | 'sslverify' => false, |
| 410 | - )); |
|
| 410 | + ) ); |
|
| 411 | 411 | |
| 412 | 412 | if ( is_wp_error( $response ) ) { |
| 413 | 413 | return array(); |
@@ -440,11 +440,11 @@ discard block |
||
| 440 | 440 | */ |
| 441 | 441 | function get_license_message( $license_data ) { |
| 442 | 442 | |
| 443 | - if( empty( $license_data ) ) { |
|
| 443 | + if ( empty( $license_data ) ) { |
|
| 444 | 444 | $message = ''; |
| 445 | 445 | } else { |
| 446 | 446 | |
| 447 | - if( ! empty( $license_data->error ) ) { |
|
| 447 | + if ( ! empty( $license_data->error ) ) { |
|
| 448 | 448 | $class = 'error'; |
| 449 | 449 | $string_key = $license_data->error; |
| 450 | 450 | } else { |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | $string_key = $license_data->license; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - $message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) ); |
|
| 455 | + $message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings( 'status' ), $this->strings( $string_key, $license_data ) ); |
|
| 456 | 456 | |
| 457 | 457 | $message = $this->generate_license_box( $message, $class ); |
| 458 | 458 | } |
@@ -489,18 +489,18 @@ discard block |
||
| 489 | 489 | */ |
| 490 | 490 | public function license_details( $response = array() ) { |
| 491 | 491 | |
| 492 | - $response = (array) $response; |
|
| 492 | + $response = (array)$response; |
|
| 493 | 493 | |
| 494 | 494 | $return = ''; |
| 495 | 495 | $wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>'; |
| 496 | 496 | |
| 497 | - if( ! empty( $response['license_key'] ) ) { |
|
| 497 | + if ( ! empty( $response[ 'license_key' ] ) ) { |
|
| 498 | 498 | |
| 499 | 499 | $return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>'; |
| 500 | 500 | |
| 501 | 501 | if ( in_array( rgar( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) { |
| 502 | - $return .= $this->strings( $response['license'], $response ); |
|
| 503 | - } elseif ( ! empty( $response['license_name'] ) ) { |
|
| 502 | + $return .= $this->strings( $response[ 'license' ], $response ); |
|
| 503 | + } elseif ( ! empty( $response[ 'license_name' ] ) ) { |
|
| 504 | 504 | |
| 505 | 505 | $response_keys = array( |
| 506 | 506 | 'license_name' => '', |
@@ -515,19 +515,19 @@ discard block |
||
| 515 | 515 | // Make sure all the keys are set |
| 516 | 516 | $response = wp_parse_args( $response, $response_keys ); |
| 517 | 517 | |
| 518 | - $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' ) ); |
|
| 519 | - $local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
| 518 | + $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' ) ); |
|
| 519 | + $local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
| 520 | 520 | $details = array( |
| 521 | - 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ), |
|
| 522 | - '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, |
|
| 523 | - 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text, |
|
| 524 | - 'expires' => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ), |
|
| 525 | - 'upgrade' => $this->get_upgrade_html( $response['upgrades'] ), |
|
| 521 | + 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ), |
|
| 522 | + '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, |
|
| 523 | + 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text, |
|
| 524 | + 'expires' => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ), |
|
| 525 | + 'upgrade' => $this->get_upgrade_html( $response[ 'upgrades' ] ), |
|
| 526 | 526 | ); |
| 527 | 527 | |
| 528 | - if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) { |
|
| 529 | - unset( $details['upgrade'] ); |
|
| 530 | - $details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
| 528 | + if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) { |
|
| 529 | + unset( $details[ 'upgrade' ] ); |
|
| 530 | + $details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | $return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>'; |
@@ -550,11 +550,11 @@ discard block |
||
| 550 | 550 | |
| 551 | 551 | $output = ''; |
| 552 | 552 | |
| 553 | - if( ! empty( $upgrades ) ) { |
|
| 553 | + if ( ! empty( $upgrades ) ) { |
|
| 554 | 554 | |
| 555 | 555 | $locale_parts = explode( '_', get_locale() ); |
| 556 | 556 | |
| 557 | - $is_english = ( 'en' === $locale_parts[0] ); |
|
| 557 | + $is_english = ( 'en' === $locale_parts[ 0 ] ); |
|
| 558 | 558 | |
| 559 | 559 | $output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>'; |
| 560 | 560 | |
@@ -562,14 +562,14 @@ discard block |
||
| 562 | 562 | |
| 563 | 563 | foreach ( $upgrades as $upgrade_id => $upgrade ) { |
| 564 | 564 | |
| 565 | - $upgrade = (object) $upgrade; |
|
| 565 | + $upgrade = (object)$upgrade; |
|
| 566 | 566 | |
| 567 | 567 | $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 ) ); |
| 568 | 568 | |
| 569 | - if( $is_english && isset( $upgrade->description ) ) { |
|
| 569 | + if ( $is_english && isset( $upgrade->description ) ) { |
|
| 570 | 570 | $message = esc_html( $upgrade->description ); |
| 571 | 571 | } else { |
| 572 | - switch( $upgrade->price_id ) { |
|
| 572 | + switch ( $upgrade->price_id ) { |
|
| 573 | 573 | // Interstellar |
| 574 | 574 | case 1: |
| 575 | 575 | default: |
@@ -607,16 +607,16 @@ discard block |
||
| 607 | 607 | */ |
| 608 | 608 | public function license_call( $array = array() ) { |
| 609 | 609 | |
| 610 | - $is_ajax = ( defined('DOING_AJAX') && DOING_AJAX ); |
|
| 611 | - $data = empty( $array ) ? $_POST['data'] : $array; |
|
| 610 | + $is_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
| 611 | + $data = empty( $array ) ? $_POST[ 'data' ] : $array; |
|
| 612 | 612 | $has_cap = GVCommon::has_cap( 'gravityview_edit_settings' ); |
| 613 | 613 | |
| 614 | - if ( $is_ajax && empty( $data['license'] ) ) { |
|
| 615 | - die( - 1 ); |
|
| 614 | + if ( $is_ajax && empty( $data[ 'license' ] ) ) { |
|
| 615 | + die( -1 ); |
|
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | // If the user isn't allowed to edit settings, show an error message |
| 619 | - if( ! $has_cap && empty( $data['all_caps'] ) ) { |
|
| 619 | + if ( ! $has_cap && empty( $data[ 'all_caps' ] ) ) { |
|
| 620 | 620 | $license_data = new stdClass(); |
| 621 | 621 | $license_data->error = 'capability'; |
| 622 | 622 | $license_data->message = $this->get_license_message( $license_data ); |
@@ -640,9 +640,9 @@ discard block |
||
| 640 | 640 | |
| 641 | 641 | $json = json_encode( $license_data ); |
| 642 | 642 | |
| 643 | - $update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) ); |
|
| 643 | + $update_license = ( ! isset( $data[ 'update' ] ) || ! empty( $data[ 'update' ] ) ); |
|
| 644 | 644 | |
| 645 | - $is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
| 645 | + $is_check_action_button = ( 'check_license' === $data[ 'edd_action' ] && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
| 646 | 646 | |
| 647 | 647 | // Failed is the response from trying to de-activate a license and it didn't work. |
| 648 | 648 | // This likely happened because people entered in a different key and clicked "Deactivate", |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | // most likely a mistake. |
| 651 | 651 | if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) { |
| 652 | 652 | |
| 653 | - if ( ! empty( $data['field_id'] ) ) { |
|
| 653 | + if ( ! empty( $data[ 'field_id' ] ) ) { |
|
| 654 | 654 | set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS ); |
| 655 | 655 | } |
| 656 | 656 | |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | if ( $is_ajax ) { |
| 662 | 662 | exit( $json ); |
| 663 | 663 | } else { // Non-ajax call |
| 664 | - return ( rgget('format', $data ) === 'object' ) ? $license_data : $json; |
|
| 664 | + return ( rgget( 'format', $data ) === 'object' ) ? $license_data : $json; |
|
| 665 | 665 | } |
| 666 | 666 | } |
| 667 | 667 | |
@@ -675,9 +675,9 @@ 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'] ); |
|
| 679 | - $settings['license_key_status'] = $license_data->license; |
|
| 680 | - $settings['license_key_response'] = (array)$license_data; |
|
| 678 | + $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] ); |
|
| 679 | + $settings[ 'license_key_status' ] = $license_data->license; |
|
| 680 | + $settings[ 'license_key_response' ] = (array)$license_data; |
|
| 681 | 681 | |
| 682 | 682 | $this->Addon->update_app_settings( $settings ); |
| 683 | 683 | } |
@@ -690,7 +690,7 @@ discard block |
||
| 690 | 690 | */ |
| 691 | 691 | private function get_license_renewal_url( $license_data ) { |
| 692 | 692 | $license_data = is_array( $license_data ) ? (object)$license_data : $license_data; |
| 693 | - $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/'; |
|
| 693 | + $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 | 694 | return $renew_license_url; |
| 695 | 695 | } |
| 696 | 696 | |
@@ -705,31 +705,31 @@ discard block |
||
| 705 | 705 | |
| 706 | 706 | |
| 707 | 707 | $strings = array( |
| 708 | - 'status' => esc_html__('Status', 'gravityview'), |
|
| 709 | - 'error' => esc_html__('There was an error processing the request.', 'gravityview'), |
|
| 710 | - 'failed' => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'), |
|
| 711 | - 'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'), |
|
| 712 | - 'inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'), |
|
| 713 | - '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>' ), |
|
| 714 | - 'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'), |
|
| 715 | - 'valid' => esc_html__('The license key is valid and active.', 'gravityview'), |
|
| 716 | - 'invalid' => esc_html__('The license key entered is invalid.', 'gravityview'), |
|
| 717 | - 'missing' => esc_html__('Invalid license key.', 'gravityview'), |
|
| 718 | - 'revoked' => esc_html__('This license key has been revoked.', 'gravityview'), |
|
| 719 | - '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>' ), |
|
| 708 | + 'status' => esc_html__( 'Status', 'gravityview' ), |
|
| 709 | + 'error' => esc_html__( 'There was an error processing the request.', 'gravityview' ), |
|
| 710 | + 'failed' => esc_html__( 'Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview' ), |
|
| 711 | + 'site_inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ), |
|
| 712 | + 'inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ), |
|
| 713 | + '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>' ), |
|
| 714 | + 'deactivated' => esc_html__( 'The license has been deactivated.', 'gravityview' ), |
|
| 715 | + 'valid' => esc_html__( 'The license key is valid and active.', 'gravityview' ), |
|
| 716 | + 'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), |
|
| 717 | + 'missing' => esc_html__( 'Invalid license key.', 'gravityview' ), |
|
| 718 | + 'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ), |
|
| 719 | + '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>' ), |
|
| 720 | 720 | 'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ), |
| 721 | 721 | |
| 722 | - 'verifying_license' => esc_html__('Verifying license…', 'gravityview'), |
|
| 723 | - 'activate_license' => esc_html__('Activate License', 'gravityview'), |
|
| 724 | - 'deactivate_license' => esc_html__('Deactivate License', 'gravityview'), |
|
| 725 | - 'check_license' => esc_html__('Verify License', 'gravityview'), |
|
| 722 | + 'verifying_license' => esc_html__( 'Verifying license…', 'gravityview' ), |
|
| 723 | + 'activate_license' => esc_html__( 'Activate License', 'gravityview' ), |
|
| 724 | + 'deactivate_license' => esc_html__( 'Deactivate License', 'gravityview' ), |
|
| 725 | + 'check_license' => esc_html__( 'Verify License', 'gravityview' ), |
|
| 726 | 726 | ); |
| 727 | 727 | |
| 728 | - if( empty( $status ) ) { |
|
| 728 | + if ( empty( $status ) ) { |
|
| 729 | 729 | return $strings; |
| 730 | 730 | } |
| 731 | 731 | |
| 732 | - if( isset( $strings[ $status ] ) ) { |
|
| 732 | + if ( isset( $strings[ $status ] ) ) { |
|
| 733 | 733 | return $strings[ $status ]; |
| 734 | 734 | } |
| 735 | 735 | |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | ) ); |
| 108 | 108 | |
| 109 | 109 | // This is just HTML we don't need. |
| 110 | - unset( $response['message'] ); |
|
| 110 | + unset( $response[ 'message' ] ); |
|
| 111 | 111 | |
| 112 | - switch ( intval( $response['license_limit'] ) ) { |
|
| 112 | + switch ( intval( $response[ 'license_limit' ] ) ) { |
|
| 113 | 113 | case 1: |
| 114 | 114 | $package = 'Sol'; |
| 115 | 115 | break; |
@@ -120,24 +120,24 @@ discard block |
||
| 120 | 120 | $package = 'Interstellar'; |
| 121 | 121 | break; |
| 122 | 122 | default: |
| 123 | - $package = sprintf( '%d-Site License', $response['license_limit'] ); |
|
| 123 | + $package = sprintf( '%d-Site License', $response[ 'license_limit' ] ); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $data = array( |
| 127 | 127 | 'email' => GravityView_Settings::getSetting( 'support-email' ), |
| 128 | - 'name' => $response['customer_name'], |
|
| 129 | - 'Valid License?' => ucwords( $response['license'] ), |
|
| 130 | - 'License Key' => $response['license_key'], |
|
| 128 | + 'name' => $response[ 'customer_name' ], |
|
| 129 | + 'Valid License?' => ucwords( $response[ 'license' ] ), |
|
| 130 | + 'License Key' => $response[ 'license_key' ], |
|
| 131 | 131 | 'License Level' => $package, |
| 132 | 132 | 'Site Admin Email' => get_bloginfo( 'admin_email' ), |
| 133 | 133 | 'Support Email' => GravityView_Settings::getSetting( 'support-email' ), |
| 134 | - 'License Limit' => $response['license_limit'], |
|
| 135 | - 'Site Count' => $response['site_count'], |
|
| 136 | - 'License Expires' => $response['expires'], |
|
| 137 | - 'Activations Left' => $response['activations_left'], |
|
| 138 | - 'Payment ID' => $response['payment_id'], |
|
| 139 | - 'Payment Name' => $response['customer_name'], |
|
| 140 | - 'Payment Email' => $response['customer_email'], |
|
| 134 | + 'License Limit' => $response[ 'license_limit' ], |
|
| 135 | + 'Site Count' => $response[ 'site_count' ], |
|
| 136 | + 'License Expires' => $response[ 'expires' ], |
|
| 137 | + 'Activations Left' => $response[ 'activations_left' ], |
|
| 138 | + 'Payment ID' => $response[ 'payment_id' ], |
|
| 139 | + 'Payment Name' => $response[ 'customer_name' ], |
|
| 140 | + 'Payment Email' => $response[ 'customer_email' ], |
|
| 141 | 141 | 'WordPress Version' => get_bloginfo( 'version', 'display' ), |
| 142 | 142 | 'PHP Version' => phpversion(), |
| 143 | 143 | 'GravityView Version' => GravityView_Plugin::version, |