diff --git a/Modula.php b/Modula.php index bc2c2cc6..f39e6889 100644 --- a/Modula.php +++ b/Modula.php @@ -56,23 +56,6 @@ define ( 'MODULA_LITE_TRANSLATE', dirname( plugin_basename( __FILE__ ) ) . '/languages' ); -if( ! class_exists( 'Modula_Plugin_Usage_Tracker') ) { - require_once dirname( __FILE__ ) . '/includes/tracking/class-plugin-usage-tracker.php'; -} -if( ! function_exists( 'modula_best_grid_gallery_start_plugin_tracking' ) ) { - function modula_best_grid_gallery_start_plugin_tracking() { - $wisdom = new Modula_Plugin_Usage_Tracker( - __FILE__, - 'https://tracking.wp-modula.com/', - array(), - true, - true, - 0 - ); - } - modula_best_grid_gallery_start_plugin_tracking(); -} - /** * The code that runs during plugin activation. * This action is documented in includes/class-modula-activator.php diff --git a/changelog.txt b/changelog.txt index 513630fc..41293dcf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,7 @@ = 2.7.5 - TBD = Fixed: Lazy load not working properly ( [#688](https://github.com/WPChill/modula-lite/issues/688) ) ( [#37](https://github.com/WPChill/modula-lite/issues/37) ) Fixed: data-src attribute now contains the link to the original image instead of the scaled WP image. ( [#795](https://github.com/WPChill/modula-lite/issues/795) ) +Changed: Removed tracking ( [#798](https://github.com/WPChill/modula-lite/issues/798) ) = 2.7.4 - 28.03.2023 = Fixed: Undefined index if default value for gallery setting input fields not set ( [#788](https://github.com/WPChill/modula-lite/issues/788) ) diff --git a/includes/admin/class-modula-debug.php b/includes/admin/class-modula-debug.php index bcff6350..429e41be 100644 --- a/includes/admin/class-modula-debug.php +++ b/includes/admin/class-modula-debug.php @@ -94,15 +94,10 @@ public function modula_debug_information($info){ 'value' => count( Modula_Helper::get_galleries() ) - 1, 'debug' => 'Total number of galleries: ' . ( count( Modula_Helper::get_galleries() ) - 1 ) ), - 'track_data' => array( - 'label' => __( 'Track data', 'modula-best-grid-gallery' ), - 'value' => ( $troubleshoot_opt && isset( $troubleshoot_opt[ 'track_data' ] ) && '1' == $troubleshoot_opt[ 'track_data' ] ) ? __( 'Enabled', 'modula-best-grid-gallery' ) : __( 'Disabled', 'modula-best-grid-gallery' ), - 'debug' => ( $troubleshoot_opt && isset( $troubleshoot_opt[ 'track_data' ] ) && '1' == $troubleshoot_opt[ 'track_data' ] ) ? 'Track data enabled' : 'Track data disabled' - ), 'enqueue_files' => array( 'label' => __( 'Enqueue Modula\'s assets everywhere', 'modula-best-grid-gallery' ), - 'value' => ( $troubleshoot_opt && isset( $troubleshoot_opt[ 'enqueue_files' ] ) && '1' == $troubleshoot_opt[ 'track_data' ] ) ? __( 'Enabled', 'modula-best-grid-gallery' ) : __( 'Disabled', 'modula-best-grid-gallery' ), - 'debug' => ( $troubleshoot_opt && isset( $troubleshoot_opt[ 'enqueue_files' ] ) && '1' == $troubleshoot_opt[ 'track_data' ] ) ? 'Enqueue files everywhere' : 'Enqueue files disabled' + 'value' => ( $troubleshoot_opt && isset( $troubleshoot_opt[ 'enqueue_files' ] ) ) ? __( 'Enabled', 'modula-best-grid-gallery' ) : __( 'Disabled', 'modula-best-grid-gallery' ), + 'debug' => ( $troubleshoot_opt && isset( $troubleshoot_opt[ 'enqueue_files' ] ) ) ? 'Enqueue files everywhere' : 'Enqueue files disabled' ), 'grid_type' => array( 'label' => __( 'General grid type enqueued', 'modula-best-grid-gallery' ), diff --git a/includes/admin/tabs/troubleshooting-options.php b/includes/admin/tabs/troubleshooting-options.php index 5e757adf..560eeee8 100644 --- a/includes/admin/tabs/troubleshooting-options.php +++ b/includes/admin/tabs/troubleshooting-options.php @@ -8,7 +8,6 @@ 'lightboxes' => array(), 'lazy_load' => false, 'disable_edit' => false, - 'track_data' => false, 'disable_srcset' => false )); @@ -27,12 +26,6 @@ 'type' => 'toggle', 'priority' => 10, ), - 'track_data' => array( - 'label' => esc_html__( 'Track Data', 'modula-best-grid-gallery' ), - 'description' => esc_html__( 'We would like to track its usage on your site. We don\'t record any sensitive data, only information regarding the WordPress environment and Modula settings, which we will use to help us make improvements.', 'modula-best-grid-gallery' ), - 'type' => 'toggle', - 'priority' => 10, - ), 'disable_srcset' => array( 'label' => esc_html__( 'Disable images srcset', 'modula-best-grid-gallery' ), 'description' => esc_html__( 'If you want to disable the srcset of the front-end images check this option.', 'modula-best-grid-gallery' ), diff --git a/includes/tracking/class-plugin-usage-tracker.php b/includes/tracking/class-plugin-usage-tracker.php deleted file mode 100644 index d540d7f3..00000000 --- a/includes/tracking/class-plugin-usage-tracker.php +++ /dev/null @@ -1,1244 +0,0 @@ -plugin_file = $_plugin_file; - $this->home_url = trailingslashit( $_home_url ); - - - // If the filename is 'functions' then we're tracking a theme - if( basename( $this->plugin_file, '.php' ) != 'functions' ) { - $this->plugin_name = 'modula-best-grid-gallery'; - } else { - $this->what_am_i = 'theme'; - $theme = wp_get_theme(); - if( $theme->Name ) { - $this->plugin_name = sanitize_text_field( $theme->Name ); - } - } - - $this->options = $_options; - $this->require_optin = $_require_optin; - $this->include_goodbye_form = $_include_goodbye_form; - $this->marketing = $_marketing; - // Only use this on switching theme - //$this->theme_allows_tracking = get_theme_mod( 'modula-wisdom-allow-tracking', 0 ); - - // Schedule / deschedule tracking when activated / deactivated - if( $this->what_am_i == 'theme' ) { - // Need to think about scheduling for sites that have already activated the theme - add_action( 'after_switch_theme', array( $this, 'schedule_tracking' ) ); - add_action( 'switch_theme', array( $this, 'deactivate_this_plugin' ) ); - } else { - register_activation_hook( $this->plugin_file, array( $this, 'schedule_tracking' ) ); - register_deactivation_hook( $this->plugin_file, array( $this, 'deactivate_this_plugin' ) ); - } - - // Get it going - $this->init(); - - } - - public function init() { - // Check marketing - if( $this->marketing == 3 ) { - $this->set_can_collect_email( true, $this->plugin_name ); - } - - // Check whether opt-in is required - // If not, then tracking is allowed - if( ! $this->require_optin ) { - $this->set_can_collect_email( true, $this->plugin_name ); - $this->set_is_tracking_allowed( true ); - $this->update_block_notice(); - $this->do_tracking(); - } - - // Hook our do_tracking function to the weekly action - add_filter( 'cron_schedules', array( $this, 'schedule_weekly_event' ) ); - // It's called weekly, but in fact it could be daily, weekly or monthly - add_action( 'put_do_weekly_action', array( $this, 'do_tracking' ) ); - - // Use this action for local testing - // add_action( 'admin_init', array( $this, 'do_tracking' ) ); - - // Display the admin notice on activation - add_action( 'admin_init', array( $this, 'set_notification_time' ) ); - add_action( 'admin_notices', array( $this, 'optin_notice' ) ); - add_action( 'admin_notices', array( $this, 'marketing_notice' ) ); - - // Deactivation - add_filter( 'plugin_action_links_' . plugin_basename( $this->plugin_file ), array( $this, 'filter_action_links' ) ); - add_action( 'admin_footer-plugins.php', array( $this, 'goodbye_ajax' ) ); - add_action( 'wp_ajax_'.$this->plugin_name.'_goodbye_form', array( $this, 'goodbye_form_callback' ) ); - - add_filter( 'modula_uninstall_db_options', array( $this, 'tracking_uninstall_process' ), 30, 1 ); - - } - - /** - * When the plugin is activated - * Create scheduled event - * And check if tracking is enabled - perhaps the plugin has been reactivated - * - * @since 1.0.0 - */ - public function schedule_tracking() { - if ( ! wp_next_scheduled( 'put_do_weekly_action' ) ) { - $schedule = $this->get_schedule(); - wp_schedule_event( time(), $schedule, 'put_do_weekly_action' ); - } - $this->do_tracking( true ); - } - - /** - * Create weekly schedule - * - * @since 1.2.3 - */ - public function schedule_weekly_event( $schedules ) { - $schedules['weekly'] = array( - 'interval' => 604800, - 'display' => __( 'Once Weekly' ) - ); - $schedules['monthly'] = array( - 'interval' => 2635200, - 'display' => __( 'Once Monthly' ) - ); - return $schedules; - } - - /** - * Get how frequently data is tracked back - * - * @since 1.2.3 - */ - public function get_schedule() { - // Could be daily, weekly or monthly - $schedule = apply_filters( 'wisdom_filter_schedule_' . $this->plugin_name, 'monthly' ); - return $schedule; - } - - /** - * This is our function to get everything going - * Check that user has opted in - * Collect data - * Then send it back - * - * @since 1.0.0 - * @param $force Force tracking if it's not time - */ - /// FOR TESTING PURPOSES FORCE IS SET TO TRUE. BY DEFAULT IT IS FALSE . - public function do_tracking( $force=false ) { - - // If the home site hasn't been defined, we just drop out. Nothing much we can do. - if ( ! $this->home_url ) { - return; - } - - // Check to see if the user has opted in to tracking - $allow_tracking = $this->get_is_tracking_allowed(); - if( ! $allow_tracking ) { - return; - } - - // Check to see if it's time to track - // $track_time = $this->get_is_time_to_track(); - // if( ! $track_time && ! $force ) { - // return; - // } - - $this->set_admin_email(); - - // Get our data - $body = $this->get_data(); - - // Send the data - $this->send_data( $body ); - - } - - /** - * We hook this to admin_init when the user accepts tracking - * Ensures the email address is available - * - * @since 1.2.1 - */ - public function force_tracking() { - $this->do_tracking( true ); // Run this straightaway - } - - /** - * Send the data to the home site - * - * @since 1.0.0 - */ - public function send_data( $body ) { - - $request = wp_remote_post( - esc_url( $this->home_url . '?usage_tracker=hello' ), - array( - 'method' => 'POST', - 'timeout' => 20, - 'redirection' => 5, - 'httpversion' => '1.1', - 'blocking' => true, - 'body' => $body, - 'user-agent' => 'PUT/1.0.0; ' . home_url() - ) - ); - ini_set('xdebug.var_display_max_depth', '100'); - ini_set('xdebug.var_display_max_children', '25006'); - ini_set('xdebug.var_display_max_data', '102004'); - - $this->set_track_time(); - - if( is_wp_error( $request ) ) { - return $request; - } - - } - - /** - * Here we collect most of the data - * - * @since 1.0.0 - */ - public function get_data() { - - // Use this to pass error messages back if necessary - $body['message'] = ''; - - // Use this array to send data back - $body = array( - 'plugin_slug' => sanitize_text_field( $this->plugin_name ), - 'url' => home_url(), - 'site_name' => get_bloginfo( 'name' ), - 'site_version' => get_bloginfo( 'version' ), - 'site_language' => get_bloginfo( 'language' ), - 'charset' => get_bloginfo( 'charset' ), - 'wisdom_version' => $this->wisdom_version, - 'php_version' => phpversion(), - 'multisite' => is_multisite(), - 'file_location' => __FILE__, - 'product_type' => esc_html( $this->what_am_i ) - ); - - // Collect the email if the correct option has been set - if( $this->get_can_collect_email() ) { - $body['email'] = $this->get_admin_email(); - } - $body['marketing_method'] = $this->marketing; - - $body['server'] = isset( $_SERVER['SERVER_SOFTWARE'] ) ? sanitize_text_field( $_SERVER['SERVER_SOFTWARE'] ) : ''; - - // Extra PHP fields - $body['memory_limit'] = ini_get( 'memory_limit' ); - $body['upload_max_size'] = ini_get( 'upload_max_size' ); - $body['post_max_size'] = ini_get( 'post_max_size' ); - $body['upload_max_filesize'] = ini_get( 'upload_max_filesize' ); - $body['max_execution_time'] = ini_get( 'max_execution_time' ); - $body['max_input_time'] = ini_get( 'max_input_time' ); - - // Retrieve current plugin information - if( ! function_exists( 'get_plugins' ) ) { - include ABSPATH . '/wp-admin/includes/plugin.php'; - } - - $plugins = array_keys( get_plugins() ); - $active_plugins = get_option( 'active_plugins', array() ); - - foreach ( $plugins as $key => $plugin ) { - if ( in_array( $plugin, $active_plugins ) ) { - // Remove active plugins from list so we can show active and inactive separately - unset( $plugins[$key] ); - } - } - - $body['active_plugins'] = $active_plugins; - $body['inactive_plugins'] = $plugins; - - // Check text direction - $body['text_direction'] = 'LTR'; - if( function_exists( 'is_rtl' ) ) { - if( is_rtl() ) { - $body['text_direction'] = 'RTL'; - } - } else { - $body['text_direction'] = 'not set'; - } - - /** - * Get our plugin data - * Currently we grab plugin name and version - * Or, return a message if the plugin data is not available - * @since 1.0.0 - */ - $plugin = $this->plugin_data(); - $body['status'] = 'Active'; // Never translated - if( empty( $plugin ) ) { - // We can't find the plugin data - // Send a message back to our home site - $body['message'] .= __( 'We can\'t detect any product information. This is most probably because you have not included the code snippet.', 'singularity' ); - $body['status'] = 'Data not found'; // Never translated - } else { - if( isset( $plugin['Name'] ) ) { - $body['plugin'] = sanitize_text_field( $plugin['Name'] ); - } - if( isset( $plugin['Version'] ) ) { - $body['version'] = sanitize_text_field( $plugin['Version'] ); - } - - } - - /** - * Get our plugin options - * @since 1.0.0 - */ - $options = $this->options; - $plugin_options = array(); - if( ! empty( $options ) && is_array( $options ) ) { - foreach( $options as $option ) { - $fields = get_option( $option ); - // Check for permission to send this option - if( isset( $fields['wisdom_registered_setting'] ) ) { - foreach( $fields as $key=>$value ) { - $plugin_options[$key] = $value; - } - } - } - } - $body['plugin_options'] = $this->options; // Returns array - $body['plugin_options_fields'] = $plugin_options; // Returns object - - /** - * Get our theme data - * Currently we grab theme name and version - * @since 1.0.0 - */ - $theme = wp_get_theme(); - if( $theme->Name ) { - $body['theme'] = sanitize_text_field( $theme->Name ); - } - if( $theme->Version ) { - $body['theme_version'] = sanitize_text_field( $theme->Version ); - } - if( $theme->Template ) { - $body['theme_parent'] = sanitize_text_field( $theme->Template ); - } - - $body['modula_galleries'] = $this->get_galleries(); - - // Return the data - return $body; - - } - - /** - * Return plugin data - * @since 1.0.0 - */ - public function plugin_data() { - // Being cautious here - if( ! function_exists( 'get_plugin_data' ) ) { - include ABSPATH . '/wp-admin/includes/plugin.php'; - } - // Retrieve current plugin information - $plugin = get_plugin_data( $this->plugin_file ); - return $plugin; - } - - /** - * Deactivating plugin - * @since 1.0.0 - */ - public function deactivate_this_plugin() { - // Check to see if the user has opted in to tracking - if( $this->what_am_i == 'theme' ) { - $allow_tracking = $this->theme_allows_tracking; - } else { - $allow_tracking = $this->get_is_tracking_allowed(); - } - - if( ! $allow_tracking ) { - return; - } - - $body = $this->get_data(); - $body['status'] = 'Deactivated'; // Never translated - $body['deactivated_date'] = time(); - - // Add deactivation form data - if( false !== get_option( 'wisdom_deactivation_reason_' . $this->plugin_name ) ) { - $body['deactivation_reason'] = get_option( 'wisdom_deactivation_reason_' . $this->plugin_name ); - } - if( false !== get_option( 'wisdom_deactivation_details_' . $this->plugin_name ) ) { - $body['deactivation_details'] = get_option( 'wisdom_deactivation_details_' . $this->plugin_name ); - } - - if( false !== get_option( 'wisdom_deactivation_contact_email_' . $this->plugin_name ) ) { - $body['email'] = get_option( 'wisdom_deactivation_contact_email_' . $this->plugin_name ); - } - - $this->send_data( $body ); - - remove_action( 'wpchill_do_weekly_action', array( $this, 'do_tracking' ) ); - - // Clear scheduled update. - if ( ! has_action( 'wpchill_do_weekly_action' ) ) { - - wp_clear_scheduled_hook( 'wpchill_do_weekly_action' ); - } - - // Clear the wisdom_last_track_time value for this plugin - // @since 1.2.2 - $track_time = get_option( 'modula_wisdom_last_track_time' ); - if( isset( $track_time[$this->plugin_name]) ) { - unset( $track_time[$this->plugin_name] ); - } - update_option( 'modula_wisdom_last_track_time', $track_time ); - - } - - /** - * Is tracking allowed? - * @since 1.0.0 - */ - public function get_is_tracking_allowed() { - - // First, check if the user has changed their mind and opted out of tracking - if( $this->has_user_opted_out() ) { - $this->set_is_tracking_allowed( false, $this->plugin_name ); - return false; - } - - if( $this->what_am_i == 'theme' ) { - - $mod = get_theme_mod( 'modula-wisdom-allow-tracking', 0 ); - if( $mod ) { - return true; - } - - } else { - - // The wisdom_allow_tracking option is an array of plugins that are being tracked - $allow_tracking = get_option( 'modula_troubleshooting_option' ); - if ( is_array( $allow_tracking ) ) { - if( isset( $allow_tracking['track_data']) && true == $allow_tracking['track_data'] ) { - return true; - } - } - - } - - return false; - } - - /** - * Set if tracking is allowed - * Option is an array of all plugins with tracking permitted - * More than one plugin may be using the tracker - * @since 1.0.0 - * @param $is_allowed Boolean true if tracking is allowed, false if not - */ - public function set_is_tracking_allowed( $is_allowed, $plugin=null ) { - - if( empty( $plugin ) ) { - $plugin = $this->plugin_name; - } - - $block_notice = get_option( 'modula_wisdom_block_notice' ); - if( isset( $block_notice[$this->plugin_name] ) ) { - return; - } - - // The wisdom_allow_tracking option is an array of plugins that are being tracked - $allow_tracking = get_option( 'modula_troubleshooting_option' ); - $allow_tracking['track_data'] = false; - - // If the user has decided to opt out - if( $this->has_user_opted_out() ) { - if( $this->what_am_i == 'theme' ) { - set_theme_mod( 'modula-wisdom-allow-tracking', 0 ); - } else { - if( true == $allow_tracking['track_data'] ) { - $allow_tracking['track_data'] = false; - } - } - - } else if( $is_allowed || ! $this->require_optin ) { - // If the user has agreed to allow tracking or if opt-in is not required - - if( $this->what_am_i == 'theme' ) { - set_theme_mod( 'modula-wisdom-allow-tracking', 1 ); - } else { - if( false == $allow_tracking['track_data'] ) { - $allow_tracking['track_data'] = true; - } - } - - } else { - if( $this->what_am_i == 'theme' ) { - set_theme_mod( 'modula-wisdom-allow-tracking', 0 ); - } else { - if( true == $allow_tracking['track_data'] ) { - $allow_tracking['track_data'] = false; - } - } - - } - - update_option( 'modula_troubleshooting_option', $allow_tracking ); - } - - /** - * Has the user opted out of allowing tracking? - * Note that themes are opt in / plugins are opt out - * @since 1.1.0 - * @return Boolean - */ - public function has_user_opted_out() { - // Different opt-out methods for plugins and themes - if( $this->what_am_i == 'theme' ) { - // Look for the theme mod - $mod = get_theme_mod( 'modula-wisdom-allow-tracking', 0 ); - if( false === $mod ) { - // If the theme mod is not set, then return true - the user has opted out - return true; - } - } else { - // Iterate through the options that are being tracked looking for wisdom_opt_out setting - if( ! empty( $this->options ) ) { - foreach( $this->options as $option_name ) { - // Check each option - $options = get_option( $option_name ); - // If we find the setting, return true - if( ! empty( $options['wisdom_opt_out'] ) ) { - return true; - } - } - } - } - return false; - } - - /** - * Check if it's time to track - * @since 1.1.1 - */ - public function get_is_time_to_track() { - // Let's see if we're due to track this plugin yet - $track_times = get_option( 'modula_wisdom_last_track_time', array() ); - if( ! isset( $track_times[$this->plugin_name] ) ) { - // If we haven't set a time for this plugin yet, then we must track it - return true; - } else { - // If the time is set, let's get our schedule and check if it's time to track - $schedule = $this->get_schedule(); - if( $schedule == 'daily' ) { - $period = 'day'; - } else if( $schedule == 'weekly' ) { - $period = 'week'; - } else { - $period = 'month'; - } - if( $track_times[$this->plugin_name] < strtotime( '-1 ' . $period ) ) { - return true; - } - } - return false; - } - - /** - * Record the time we send tracking data - * @since 1.1.1 - */ - public function set_track_time() { - // We've tracked, so record the time - $track_times = get_option( 'modula_wisdom_last_track_time', array() ); - // Set different times according to plugin, in case we are tracking multiple plugins - $track_times[$this->plugin_name] = time(); - update_option( 'modula_wisdom_last_track_time', $track_times ); - } - - /** - * Set the time when we can display the opt-in notification - * Will display now unless filtered - * @since 1.2.4 - */ - public function set_notification_time() { - $notification_times = get_option( 'modula_wisdom_notification_times', array() ); - // Set different times according to plugin, in case we are tracking multiple plugins - if( ! isset( $notification_times[$this->plugin_name] ) ) { - $delay_notification = apply_filters( 'wisdom_delay_notification_' . $this->plugin_name, 0 ); - // We can delay the notification time - $notification_time = time() + absint( $delay_notification ); - $notification_times[$this->plugin_name] = $notification_time; - update_option( 'modula_wisdom_notification_times', $notification_times ); - } - } - - /** - * Get whether it's time to display the notification - * @since 1.2.4 - * @return Boolean - */ - public function get_is_notification_time() { - $notification_times = get_option( 'modula_wisdom_notification_times', array() ); - $time = time(); - // Set different times according to plugin, in case we are tracking multiple plugins - if( isset( $notification_times[$this->plugin_name] ) ) { - $notification_time = $notification_times[$this->plugin_name]; - if( $time >= $notification_time ) { - return true; - } - } - return false; - } - - /** - * Set if we should block the opt-in notice for this plugin - * Option is an array of all plugins that have received a response from the user - * @since 1.0.0 - */ - public function update_block_notice( $plugin=null ) { - if( empty( $plugin ) ) { - $plugin = $this->plugin_name; - } - $block_notice = get_option( 'modula_wisdom_block_notice' ); - if( empty( $block_notice ) || ! is_array( $block_notice ) ) { - // If nothing exists in the option yet, start a new array with the plugin name - $block_notice = array( $plugin => $plugin ); - } else { - // Else add the plugin name to the array - $block_notice[$plugin] = $plugin; - } - update_option( 'modula_wisdom_block_notice', $block_notice ); - } - - /** - * Can we collect the email address? - * @since 1.0.0 - */ - public function get_can_collect_email() { - // The wisdom_collect_email option is an array of plugins that are being tracked - $collect_email = get_option( 'modula_wisdom_collect_email' ); - // If this plugin is in the array, then we can collect the email address - if( isset( $collect_email[$this->plugin_name] ) ) { - return true; - } - return false; - } - - /** - * Set if user has allowed us to collect their email address - * Option is an array of all plugins with email collection permitted - * More than one plugin may be using the tracker - * @since 1.0.0 - * @param $can_collect Boolean true if collection is allowed, false if not - */ - public function set_can_collect_email( $can_collect, $plugin=null ) { - if( empty( $plugin ) ) { - $plugin = $this->plugin_name; - } - // The wisdom_collect_email option is an array of plugins that are being tracked - $collect_email = get_option( 'modula_wisdom_collect_email' ); - // If the user has agreed to allow tracking or if opt-in is not required - if( $can_collect ) { - if( empty( $collect_email ) || ! is_array( $collect_email ) ) { - // If nothing exists in the option yet, start a new array with the plugin name - $collect_email = array( $plugin => $plugin ); - } else { - // Else add the plugin name to the array - $collect_email[$plugin] = $plugin; - } - } else { - if( isset( $collect_email[$plugin] ) ) { - unset( $collect_email[$plugin] ); - } - } - update_option( 'modula_wisdom_collect_email', $collect_email ); - } - - /** - * Get the correct email address to use - * @since 1.1.2 - * @return Email address - */ - public function get_admin_email() { - // The wisdom_collect_email option is an array of plugins that are being tracked - $email = get_option( 'modula_wisdom_admin_emails' ); - // If this plugin is in the array, then we can collect the email address - if( isset( $email[$this->plugin_name] ) ) { - return $email[$this->plugin_name]; - } - return false; - } - - /** - * Set the correct email address to use - * There might be more than one admin on the site - * So we only use the first admin's email address - * @param $email Email address to set - * @param $plugin Plugin name to set email address for - * @since 1.1.2 - */ - public function set_admin_email( $email=null, $plugin=null ) { - if( empty( $plugin ) ) { - $plugin = $this->plugin_name; - } - // If no email address passed, try to get the current user's email - if( empty( $email ) ) { - // Have to check that current user object is available - if( function_exists( 'wp_get_current_user' ) ) { - $current_user = wp_get_current_user(); - $email = $current_user->user_email; - } - } - // The wisdom_admin_emails option is an array of admin email addresses - $admin_emails = get_option( 'wisdom_admin_emails' ); - if( empty( $admin_emails ) || ! is_array( $admin_emails ) ) { - // If nothing exists in the option yet, start a new array with the plugin name - $admin_emails = array( $plugin => sanitize_email( $email ) ); - } else if( empty( $admin_emails[$plugin] ) ) { - // Else add the email address to the array, if not already set - $admin_emails[$plugin] = sanitize_email( $email ); - } - update_option( 'modula_wisdom_admin_emails', $admin_emails ); - } - - /** - * Display the admin notice to users to allow them to opt in - * - * @since 1.0.0 - */ - public function optin_notice() { - // Check for plugin args - if ( isset( $_GET['plugin'] ) && $this->plugin_name === $_GET['plugin'] && isset( $_GET['plugin_action'] ) ) { - $plugin = sanitize_text_field( $_GET['plugin'] ); - $action = sanitize_text_field( $_GET['plugin_action'] ); - if( $action == 'yes' ) { - $this->set_is_tracking_allowed( true, $plugin ); - // Run this straightaway - add_action( 'admin_init', array( $this, 'force_tracking' ) ); - } else { - $this->set_is_tracking_allowed( false, $plugin ); - } - $this->update_block_notice( $plugin ); - } - - // Is it time to display the notification? - $is_time = $this->get_is_notification_time(); - if( ! $is_time ) { - return false; - } - - // Check whether to block the notice, e.g. because we're in a local environment - // wisdom_block_notice works the same as wisdom_allow_tracking, an array of plugin names - $block_notice = get_option( 'modula_wisdom_block_notice' ); - - if( isset( $block_notice[$this->plugin_name] ) ) { - return; - } - - if ( ! current_user_can( 'manage_options' ) ) { - return; - } - - // @credit EDD - // Don't bother asking user to opt in if they're in local dev - $is_local = false; - if( stristr( network_site_url( '/' ), '.dev' ) !== false || stristr( network_site_url( '/' ), 'localhost' ) !== false || stristr( network_site_url( '/' ), ':8888' ) !== false ) { - $is_local = true; - } - $is_local = apply_filters( 'wisdom_is_local_' . $this->plugin_name, $is_local ); - if ( $is_local ) { - $this->update_block_notice(); - } else { - - // Display the notice requesting permission to track - // Retrieve current plugin information - $plugin = $this->plugin_data(); - $plugin_name = $plugin['Name']; - - // Args to add to query if user opts in to tracking - $yes_args = array( - 'plugin' => $this->plugin_name, - 'plugin_action' => 'yes' - ); - - // Decide how to request permission to collect email addresses - if( $this->marketing == 1 ) { - // Option 1 combines permissions to track and collect email - $yes_args['marketing_optin'] = 'no'; - } else if( $this->marketing == 2 ) { - // Option 2 enables a second notice that fires after the user opts in to tracking - $yes_args['marketing'] = 'no'; - } - $url_yes = add_query_arg( $yes_args ); - $url_no = add_query_arg( array( - 'plugin' => $this->plugin_name, - 'plugin_action' => 'no' - ) ); - - // Decide on notice text - if( $this->marketing != 1 ) { - // Standard notice text - $notice_text = sprintf( - __( 'Thank you for installing our %1$s. We would like to track its usage on your site. We don\'t record any sensitive data, only information regarding the WordPress environment and %1$s settings, which we will use to help us make improvements to the %1$s. Tracking is completely optional. You can always opt out by going to Settings-> Misc and uncheck the track data field.', 'modula-best-grid-gallery' ), - $this->what_am_i - ); - } else { - // If we have option 1 for marketing, we include reference to sending product information here - $notice_text = sprintf( - __( 'Thank you for installing our %1$s. We\'d like your permission to track its usage on your site and subscribe you to our newsletter. We won\'t record any sensitive data, only information regarding the WordPress environment and %1$s settings, which we will use to help us make improvements to the %1$s. Tracking is completely optional.You can always opt out by going to Settings-> Misc and uncheck the track data field.', 'modula-best-grid-gallery' ), - $this->what_am_i - ); - } - // And we allow you to filter the text anyway - $notice_text = apply_filters( 'wisdom_notice_text_' . esc_attr( $this->plugin_name ), $notice_text ); ?> - -
-

' . esc_html( $plugin_name ) . ''; ?>

-

-

- - -

-
- set_can_collect_email( sanitize_text_field( $_GET['marketing_optin'] ), $this->plugin_name ); - // Do tracking - $this->do_tracking( true ); - } else if( isset( $_GET['marketing'] ) && $_GET['marketing']=='yes' ) { - // Display the notice requesting permission to collect email address - // Retrieve current plugin information - $plugin = $this->plugin_data(); - $plugin_name = $plugin['Name']; - - $url_yes = add_query_arg( array( - 'plugin' => $this->plugin_name, - 'marketing_optin' => 'yes' - ) ); - $url_no = add_query_arg( array( - 'plugin' => $this->plugin_name, - 'marketing_optin' => 'no' - ) ); - - $marketing_text = sprintf( - __( 'Thank you for opting in to tracking. Would you like to receive occasional news about this %s, including details of new features and special offers?', 'modula-best-grid-gallery' ), - $this->what_am_i - ); - $marketing_text = apply_filters( 'wisdom_marketing_text_' . esc_attr( $this->plugin_name ), $marketing_text ); ?> - -
-

' . esc_html( $plugin_name ) . ''; ?>

-

-

- - -

-
- get_is_tracking_allowed() ) { - return $links; - } - if ( isset( $links['deactivate'] ) && $this->include_goodbye_form ) { - $deactivation_link = $links['deactivate']; - // Insert an onClick action to allow form before deactivating. - $deactivation_link = str_replace( 'form_default_text(); - return apply_filters( 'wisdom_form_text_' . esc_attr( $this->plugin_name ), $form ); - } - - /** - * Form text strings - * These can be filtered - * - * @since 1.0.0 - */ - public function goodbye_ajax() { - global $wp_version; - // Get our strings for the form - $form = $this->form_filterable_text(); - - if ( ! isset( $form['heading'] ) || ! isset( $form['body'] ) || ! isset( $form['options'] ) || ! is_array( $form['options'] ) || ! isset( $form['details'] ) ) { - // If the form hasn't been filtered correctly, we revert to the default form. - $form = $this->form_default_text(); - } - // Build the HTML to go in the form. - $html = '
' . esc_html( $form['heading'] ) . '
'; - $html .= '

' . esc_html( $form['body'] ) . '

'; - - if ( is_array( $form['options'] ) ) { - - $html .= '
'; - foreach ( $form['options'] as $option ) { - $html .= '

'; - } - $html .= ''; - - $html .= '
'; - - $html .= '

'; - $html .= '

'; - $html .= '
'; - } - - - $html .= '' . esc_html__( 'What info do we collect?', 'modula-best-grid-gallery' ) . ''; - $html .= '
\ -
'; - - $html .= '
'; - $html .= ''; - ?> -
- - - plugin_name, $values ); - } - if( isset( $_POST['details'] ) ) { - $details = sanitize_text_field( wp_unslash( $_POST['details'] ) ); - update_option( 'wisdom_deactivation_details_' . $this->plugin_name, $details ); - } - if( isset( $_POST['email'] ) ) { - $email = sanitize_text_field( wp_unslash( $_POST['email'] ) ); - update_option( 'wisdom_deactivation_contact_email_' . $this->plugin_name, $email ); - } - $this->do_tracking(); // Run this straightaway - echo 'success'; - wp_die(); - } - - public function get_galleries() { - - $args = array( 'post_type' => 'modula-gallery', 'numberposts' => '-1'); - $galleries = get_posts( $args ); - $formatted_galleries = array() ; - - $license_key = get_option( 'modula_pro_license_key', false); - - $site_url = base64_encode( site_url() ); - - foreach ( $galleries as $gallery ) { - - if ( isset ( $gallery->post_title ) && strlen( $gallery->post_title) != 0 ) { - $formatted_galleries[ $gallery->ID ]['title'] = $gallery->post_title; - } - - $formatted_galleries[ $gallery->ID ]['license'] = $license_key; - $formatted_galleries[ $gallery->ID ]['site_url'] = $site_url; - $formatted_galleries[ $gallery->ID ]['id'] = $gallery->ID; - $formatted_galleries[ $gallery->ID ]['last_modified'] = $gallery->post_modified; - $formatted_galleries[ $gallery->ID ]['settings'] = get_post_meta( $gallery->ID, 'modula-settings', true); - $formatted_galleries[ $gallery->ID ]['last_modified'] = $gallery->post_modified; - - } - - return $formatted_galleries; - - } - - /** - * Add tracking options to uninstall process - * - * @param $db_options - * - * @return array - */ - public function tracking_uninstall_process( $db_options ) { - - $tracking_options = array( - 'modula_wisdom_last_track_time', - 'wisdom_deactivation_details_' . $this->plugin_name, - 'wisdom_deactivation_reason_' . $this->plugin_name, - 'modula_wisdom_admin_emails', - 'modula_wisdom_collect_email', - 'modula_wisdom_block_notice', - 'modula_wisdom_notification_times', - 'modula_wisdom_last_track_time', - - ); - - return array_merge( $db_options, $tracking_options ); - } - - } - -} diff --git a/readme.txt b/readme.txt index 28694c07..430a275b 100644 --- a/readme.txt +++ b/readme.txt @@ -265,6 +265,7 @@ Free support is included only with a PRO license: [Buy Modula PRO](https://wp-mo = 2.7.5 - TBD = Fixed: Lazy load not working properly ( [#688](https://github.com/WPChill/modula-lite/issues/688) ) ( [#37](https://github.com/WPChill/modula-lite/issues/37) ) Fixed: data-src attribute now contains the link to the original image instead of the scaled WP image. ( [#795](https://github.com/WPChill/modula-lite/issues/795) ) +Changed: Removed tracking ( [#798](https://github.com/WPChill/modula-lite/issues/798) ) = 2.7.4 - 28.03.2023 = Fixed: Undefined index if default value for gallery setting input fields not set ( [#788](https://github.com/WPChill/modula-lite/issues/788) )