| @@ -46,16 +46,14 @@ | ||
| 46 | 46 | register_deactivation_hook( VISUALIZER_BASEFILE, array( $this, 'deactivate' ) ); |
| 47 | 47 | $this->_addAction( 'visualizer_schedule_refresh_db', 'refreshDbChart' ); |
| 48 | 48 | $this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', 10, 3 ); |
| 49 | 49 | |
| 50 | - $this->_addAction( 'admin_init', 'adminInit' ); | |
| 50 | + $this->_addAction( 'activated_plugin', 'onActivation' ); | |
| 51 | 51 | $this->_addAction( 'init', 'setupCustomPostTypes' ); |
| 52 | 52 | $this->_addAction( 'plugins_loaded', 'loadTextDomain' ); |
| 53 | 53 | $this->_addFilter( 'visualizer_logger_data', 'getLoggerData' ); |
| 54 | 54 | $this->_addFilter( 'visualizer_get_chart_counts', 'getUsage', 10, 2 ); |
| 55 | 55 | |
| 56 | - $this->_addAction( 'init', 'checkIsExistingUser' ); | |
| 57 | - | |
| 58 | 56 | // only for testing |
| 59 | 57 | // $this->_addAction( 'admin_init', 'getUsage' ); |
| 60 | 58 | } |
| 61 | 59 | /** |
| @@ -191,95 +189,40 @@ | ||
| 191 | 189 | |
| 192 | 190 | /** |
| 193 | 191 | * Activate the plugin |
| 194 | 192 | */ |
| 195 | - public function activate( $network_wide ) { | |
| 196 | - if ( is_multisite() && $network_wide ) { | |
| 197 | - foreach ( get_sites( array( 'fields' => 'ids' ) ) as $blog_id ) { | |
| 198 | - switch_to_blog( $blog_id ); | |
| 199 | - $this->activate_on_site(); | |
| 200 | - restore_current_blog(); | |
| 201 | - } | |
| 202 | - } else { | |
| 203 | - $this->activate_on_site(); | |
| 204 | - } | |
| 193 | + public function activate() { | |
| 194 | + wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); | |
| 195 | + wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, 'hourly', 'visualizer_schedule_refresh_db' ); | |
| 205 | 196 | } |
| 206 | 197 | |
| 207 | 198 | /** |
| 208 | - * Activates the plugin on a particular blog instance (supports multisite and single site). | |
| 199 | + * On activation of the plugin | |
| 209 | 200 | */ |
| 210 | - private function activate_on_site() { | |
| 211 | - wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); | |
| 212 | - wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, apply_filters( 'visualizer_chart_schedule_interval', 'hourly' ), 'visualizer_schedule_refresh_db' ); | |
| 213 | - add_option( 'visualizer-activated', true ); | |
| 214 | - $is_fresh_install = get_option( 'visualizer_fresh_install', false ); | |
| 215 | - if ( ! defined( 'TI_CYPRESS_TESTING' ) && false === $is_fresh_install ) { | |
| 216 | - update_option( 'visualizer_fresh_install', '1' ); | |
| 201 | + public function onActivation( $plugin ) { | |
| 202 | + if ( defined( 'TI_UNIT_TESTING' ) ) { | |
| 203 | + return; | |
| 217 | 204 | } |
| 218 | - } | |
| 219 | 205 | |
| 220 | - /** | |
| 221 | - * Deactivate the plugin | |
| 222 | - */ | |
| 223 | - public function deactivate( $network_wide ) { | |
| 224 | - if ( is_multisite() && $network_wide ) { | |
| 225 | - foreach ( get_sites( array( 'fields' => 'ids' ) ) as $blog_id ) { | |
| 226 | - switch_to_blog( $blog_id ); | |
| 227 | - $this->deactivate_on_site(); | |
| 228 | - restore_current_blog(); | |
| 206 | + if ( $plugin === VISUALIZER_BASENAME ) { | |
| 207 | + if ( Visualizer_Module::numberOfCharts() > 0 ) { | |
| 208 | + wp_redirect( admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ) ); | |
| 209 | + } else { | |
| 210 | + wp_redirect( admin_url( 'admin.php?page=viz-support' ) ); | |
| 229 | 211 | } |
| 230 | - } else { | |
| 231 | - $this->deactivate_on_site(); | |
| 212 | + exit(); | |
| 232 | 213 | } |
| 233 | 214 | } |
| 234 | 215 | |
| 216 | + | |
| 235 | 217 | /** |
| 236 | - * Deactivates the plugin on a particular blog instance (supports multisite and single site). | |
| 218 | + * Deactivate the plugin | |
| 237 | 219 | */ |
| 238 | - private function deactivate_on_site() { | |
| 220 | + public function deactivate() { | |
| 239 | 221 | wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); |
| 240 | - delete_option( 'visualizer-activated', true ); | |
| 241 | 222 | } |
| 242 | 223 | |
| 243 | 224 | /** |
| 244 | - * Check if plugin has been activated and then redirect to the correct page. | |
| 245 | - */ | |
| 246 | - public function adminInit() { | |
| 247 | - if ( defined( 'TI_UNIT_TESTING' ) ) { | |
| 248 | - return; | |
| 249 | - } | |
| 250 | - | |
| 251 | - define( 'VISUALIZER_SURVEY', Visualizer_Module::is_pro() ? 'https://forms.gle/7Zo7FuZbvQ8DTvRi6' : 'https://forms.gle/muMtbcyvHn1aTvmJ7' ); | |
| 252 | - // fire any upgrades necessary. | |
| 253 | - Visualizer_Module_Upgrade::upgrade(); | |
| 254 | - | |
| 255 | - if ( get_option( 'visualizer-activated' ) ) { | |
| 256 | - delete_option( 'visualizer-activated' ); | |
| 257 | - if ( ! headers_sent() ) { | |
| 258 | - if ( ! Visualizer_Module::is_pro() && ! empty( get_option( 'visualizer_fresh_install', false ) ) ) { | |
| 259 | - $redirect_url = array( | |
| 260 | - 'page' => 'visualizer-setup-wizard', | |
| 261 | - 'tab' => '#step-1', | |
| 262 | - ); | |
| 263 | - } else { | |
| 264 | - $page_name = Visualizer_Module::numberOfCharts() > 0 ? Visualizer_Plugin::NAME : 'viz-support'; | |
| 265 | - $redirect_url = array( | |
| 266 | - 'page' => $page_name, | |
| 267 | - ); | |
| 268 | - } | |
| 269 | - wp_safe_redirect( | |
| 270 | - add_query_arg( | |
| 271 | - $redirect_url, | |
| 272 | - admin_url( 'admin.php' ) | |
| 273 | - ) | |
| 274 | - ); | |
| 275 | - exit(); | |
| 276 | - } | |
| 277 | - } | |
| 278 | - } | |
| 279 | - | |
| 280 | - | |
| 281 | - /** | |
| 282 | 225 | * Refresh the specific chart from the db. |
| 283 | 226 | * |
| 284 | 227 | * @param WP_Post $chart The chart object. |
| 285 | 228 | * @param int $chart_id The chart id. |
| @@ -352,36 +295,20 @@ | ||
| 352 | 295 | } |
| 353 | 296 | |
| 354 | 297 | $error = $source->get_error(); |
| 355 | 298 | if ( empty( $error ) ) { |
| 356 | - $this->disableRevisionsTemporarily(); | |
| 299 | + add_filter( 'wp_revisions_to_keep', '__return_false' ); | |
| 357 | 300 | if ( $load_series ) { |
| 358 | 301 | update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 359 | 302 | } |
| 360 | 303 | |
| 361 | - $allow_html = false; | |
| 362 | - $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 363 | - if ( isset( $settings['allowHtml'] ) && intval( $settings['allowHtml'] ) === 1 ) { | |
| 364 | - $allow_html = true; | |
| 365 | - } | |
| 366 | - | |
| 367 | - $allow_html = apply_filters( 'visualizer_allow_html_content', $allow_html, $chart_id, $chart ); | |
| 368 | - | |
| 369 | - if ( $allow_html ) { | |
| 370 | - kses_remove_filters(); | |
| 371 | - } | |
| 372 | - | |
| 373 | 304 | wp_update_post( |
| 374 | 305 | array( |
| 375 | 306 | 'ID' => $chart_id, |
| 376 | - 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ), | |
| 307 | + 'post_content' => $source->getData(), | |
| 377 | 308 | ) |
| 378 | 309 | ); |
| 379 | 310 | |
| 380 | - if ( $allow_html ) { | |
| 381 | - kses_init_filters(); | |
| 382 | - } | |
| 383 | - | |
| 384 | 311 | $chart = get_post( $chart_id ); |
| 385 | 312 | delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR ); |
| 386 | 313 | } else { |
| 387 | 314 | update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Error while updating chart: %s', $error ) ); |
| @@ -415,32 +342,11 @@ | ||
| 415 | 342 | } |
| 416 | 343 | |
| 417 | 344 | // if the time is nigh, we force an update. |
| 418 | 345 | $this->refresh_db_for_chart( null, $chart_id, true ); |
| 419 | - // Clear existing chart cache. | |
| 420 | - $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id; | |
| 421 | - if ( get_transient( $cache_key ) ) { | |
| 422 | - delete_transient( $cache_key ); | |
| 423 | - } | |
| 424 | 346 | $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true ); |
| 425 | 347 | $new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS; |
| 426 | 348 | } |
| 427 | 349 | update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules ); |
| 428 | - } | |
| 429 | - | |
| 430 | - /** | |
| 431 | - * Save flag for existing users. | |
| 432 | - */ | |
| 433 | - public function checkIsExistingUser() { | |
| 434 | - $chart_exists = get_option( 'visualizer-new-user', '' ); | |
| 435 | - if ( '' === $chart_exists ) { | |
| 436 | - $charts = get_posts( | |
| 437 | - array( | |
| 438 | - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 439 | - 'fields' => 'ids', | |
| 440 | - ) | |
| 441 | - ); | |
| 442 | - update_option( 'visualizer-new-user', ! empty( $charts ) ? 'no' : 'yes' ); | |
| 443 | - } | |
| 444 | 350 | } |
| 445 | 351 | |
| 446 | 352 | } |