diff --git a/css/settings.css b/css/settings.css index 8670b66..1d24b6e 100755 --- a/css/settings.css +++ b/css/settings.css @@ -99,4 +99,23 @@ .msa-vertical-tabs-content-current { display: block; +} + +/* ===================================================== + * + * Licensing + * + ==================================================== */ + +p.msa-activation-message { + color: inherit; +} + +p.msa-license-valid { + color: green; +} + +p.msa-license-invalid, +p.msa-license-expired { + color: red; } \ No newline at end of file diff --git a/functions/admin-notices.php b/functions/admin-notices.php index b615e25..7c0881a 100644 --- a/functions/admin-notices.php +++ b/functions/admin-notices.php @@ -78,7 +78,7 @@ function msa_admin_notices() { if ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) { ?>
-

DISABLED! My Site Audit needs WP Cron to be enabled in order to create an audit. Please read our', 'msa'); ?>

+

DISABLED! My Site Audit needs WP Cron to be enabled in order to create an audit. Please read our', 'msa'); ?>

get_site_url(), 'activate_text' => __('Activate', 'msa'), 'deactivate_text' => __('Deactivate', 'msa'), - 'no_license_key' => __('Please add or activate your License Key to get automatic updates. Without a valid license key you will not receive regular updates. You can find your license key', 'msa') . ' here', - 'expired' => __('EXPIRED LICENSE KEY: This license key has expired. Please renew your license key', 'msa') . ' here', + 'no_license_key' => __('Please add or activate your License Key to get automatic updates. Without a valid license key you will not receive regular updates. You can find your license key', 'msa') . ' here', + 'expired' => __('EXPIRED LICENSE KEY: This license key has expired. Please renew your license key', 'msa') . ' here', 'inactive' => __('INACTIVE LICENSE KEY: The license key is not active for this site. Please activate it by clicking the Activate button to the right.', 'msa'), - 'activation_error' => __('INVALID LICENSE KEY: The license key is not valid please try again. You can find your license key', 'msa') . ' here.', + 'activation_error' => __('INVALID LICENSE KEY: The license key is not valid please try again. You can find your license key', 'msa') . ' here.', 'activation_valid' => __('SUCCESS: Your license key is valid.', 'msa'), 'deactivation_valid' => __('SUCCESS: This site has been deactivated.', 'msa'), 'deactivation_error' => __('DEACTIVATION FAILED: This site could not be deactivated.', 'msa'), @@ -386,6 +386,8 @@ function msa_settings() { */ function msa_extensions() { - require_once(MY_SITE_AUDIT_PLUGIN_DIR . 'controllers/extensions.php'); + msa_force_redirect('https://99robots.com/products/category/my-site-audit/'); + + //require_once(MY_SITE_AUDIT_PLUGIN_DIR . 'controllers/extensions.php'); } \ No newline at end of file diff --git a/functions/common.php b/functions/common.php index 3664c81..992dee7 100644 --- a/functions/common.php +++ b/functions/common.php @@ -120,7 +120,7 @@ function msa_add_new_audit_check($data) { $audit_model = new MSA_Audits_Model(); $audits = $audit_model->get_data(); - if ( count($audits) >= MY_SITE_AUDIT_MAX_AUDITS ) { + if ( count($audits) >= msa_get_max_audits() ) { return false; } @@ -137,11 +137,11 @@ function msa_add_new_audit_check($data) { */ function msa_save_more_audits_extension($audits) { - if ( count($audits) >= MY_SITE_AUDIT_MAX_AUDITS ) { + if ( count($audits) >= msa_get_max_audits() ) { $audits[] = array( 'extension' => true, - 'extension-link' => 'https://mysiteaudit.com/?post_type=download&p=74&utm_source=plugin&utm_campaign=extension', + 'extension-link' => 'https://99robots.com/products/msa-conditions-control?utm_source=plugin&utm_campaign=extension', 'score' => 1, 'name' => __('Want to Save more Audits? Get the Extension!', 'msa'), 'date' => date('Y-m-d H:i:s'), @@ -153,4 +153,14 @@ function msa_save_more_audits_extension($audits) { return $audits; } -add_filter('msa_all_audits_table_items', 'msa_save_more_audits_extension', 10, 1); \ No newline at end of file +add_filter('msa_all_audits_table_items', 'msa_save_more_audits_extension', 10, 1); + +/** + * Get the maximum number of audits a user is allowed to have + * + * @access public + * @return void + */ +function msa_get_max_audits() { + return apply_filters('msa_get_max_audits', MY_SITE_AUDIT_MAX_AUDITS); +} \ No newline at end of file diff --git a/functions/extension.php b/functions/extension.php index 484af1f..faf2778 100644 --- a/functions/extension.php +++ b/functions/extension.php @@ -48,7 +48,7 @@ function msa_get_remote_extensions() { $remote_extensions = array(); - $response = wp_remote_get( 'https://mysiteaudit.com/extensions.json' ); + $response = wp_remote_get( 'https://99robots.com/msa-extensions.json' ); if ( is_array($response) ) { $remote_extensions = json_decode($response['body'], true); diff --git a/functions/plugin.php b/functions/plugin.php index 8f9b7d6..8443f70 100644 --- a/functions/plugin.php +++ b/functions/plugin.php @@ -69,7 +69,7 @@ function msa_plugin_row_meta( $input, $file ) { 'utm_source' => 'plugins-page', 'utm_medium' => 'plugin-row', 'utm_campaign' => 'admin', - ), 'https://mysiteaudit.com/extensions' ) + ), MY_SITE_AUDIT_EXT_URL ) ); $links = array( diff --git a/functions/system-info.php b/functions/system-info.php index dc7e9a2..3ec5f85 100644 --- a/functions/system-info.php +++ b/functions/system-info.php @@ -53,7 +53,7 @@ function msa_settings_tab_system_info_content($content) { $system_status_table .= ' ' . __('PHP Version', 'msa') . ' - ' . __('The required minimum version of PHP is v' . MY_SITE_AUDIT_MIN_PHP_VERSION . ' and your version is v' . phpversion() . '. Your version of PHP is outdated and we strongly recommend that you update your version of PHP to at least v' . MY_SITE_AUDIT_MIN_PHP_VERSION . '.', 'msa') . ' + ' . __('The required minimum version of PHP is v' . MY_SITE_AUDIT_MIN_PHP_VERSION . ' and your version is v' . phpversion() . '. Your version of PHP is outdated and we strongly recommend that you update your version of PHP to at least v' . MY_SITE_AUDIT_MIN_PHP_VERSION . '.', 'msa') . ' '; $bad++; @@ -71,7 +71,7 @@ function msa_settings_tab_system_info_content($content) { $system_status_table .= ' ' . __('WP Cron', 'msa') . ' - ' . __('WP Cron is DISABLED! My Site Audit needs WP Cron to be enabled in order to create an audit. Please read our', 'msa'); ?> + ' . __('WP Cron is DISABLED! My Site Audit needs WP Cron to be enabled in order to create an audit. Please read our', 'msa'); ?> '; $bad++; diff --git a/functions/welcome.php b/functions/welcome.php index 2a7dc22..a9093b8 100644 --- a/functions/welcome.php +++ b/functions/welcome.php @@ -263,7 +263,7 @@ function msa_welcome_credits_page() { -

+

diff --git a/js/licensing.js b/js/licensing.js index 9c7ef83..4878d58 100644 --- a/js/licensing.js +++ b/js/licensing.js @@ -91,22 +91,22 @@ jQuery(document).ready(function($){ if ( response == 'valid' ) { element.parent().append(license_deactivate_button); - element.parent().append('

' + msa_licensing_data.activation_valid + '

'); + element.parent().append('

' + msa_licensing_data.activation_valid + '

'); } else if ( response == 'expired' ) { element.parent().append(license_activate_button); - element.parent().append('

' + msa_licensing_data.expired + '

'); + element.parent().append('

' + msa_licensing_data.expired + '

'); } else if ( response == 'inactive' ) { element.parent().append(license_activate_button); - element.parent().append('

' + msa_licensing_data.inactive + '

'); + element.parent().append('

' + msa_licensing_data.inactive + '

'); } else { element.parent().append(license_activate_button); - element.parent().append('

' + msa_licensing_data.activation_error + '

'); + element.parent().append('

' + msa_licensing_data.activation_error + '

'); } @@ -132,9 +132,9 @@ jQuery(document).ready(function($){ element.parent().append(spinner); - $('.msa-activation-message').remove(); - $('.msa-activate-license').remove(); - $('.msa-deactivate-license').remove(); + element.parent().find('.msa-activation-message').remove(); + element.parent().find('.msa-activate-license').remove(); + element.parent().find('.msa-deactivate-license').remove(); var data = { 'action': 'msa_license_action', @@ -150,12 +150,12 @@ jQuery(document).ready(function($){ if ( response == 'valid' ) { element.parent().append(license_deactivate_button); - element.parent().append('

' + msa_licensing_data.activation_valid + '

'); + element.parent().append('

' + msa_licensing_data.activation_valid + '

'); } else { element.parent().append(license_activate_button); - element.parent().append('

' + msa_licensing_data.activation_error + '

'); + element.parent().append('

' + msa_licensing_data.activation_error + '

'); } @@ -175,9 +175,9 @@ jQuery(document).ready(function($){ element.parent().append(spinner); - $('.msa-activation-message').remove(); - $('.msa-activate-license').remove(); - $('.msa-deactivate-license').remove(); + element.parent().find('.msa-activation-message').remove(); + element.parent().find('.msa-activate-license').remove(); + element.parent().find('.msa-deactivate-license').remove(); var data = { 'action': 'msa_license_action', diff --git a/my-site-audit.php b/my-site-audit.php index d6c12b1..5becf2e 100755 --- a/my-site-audit.php +++ b/my-site-audit.php @@ -1,9 +1,9 @@
-

+