| @@ -46,14 +46,16 @@ | ||
| 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( 'activated_plugin', 'onActivation' ); | |
| 50 | + $this->_addAction( 'admin_init', 'adminInit' ); | |
| 51 | 51 | $this->_addAction( 'init', 'setupCustomPostTypes' ); |
| 52 | 52 | $this->_addAction( 'plugins_loaded', 'loadTextDomain' ); |
| 53 | 53 | $this->_addFilter( 'visualizer_logger_data', 'getLoggerData' ); |
| 54 | - $this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' ); | |
| 54 | + $this->_addFilter( 'visualizer_get_chart_counts', 'getUsage', 10, 2 ); | |
| 55 | 55 | |
| 56 | + // only for testing | |
| 57 | + // $this->_addAction( 'admin_init', 'getUsage' ); | |
| 56 | 58 | } |
| 57 | 59 | /** |
| 58 | 60 | * Fetches the SDK logger data. |
| 59 | 61 | * |
| @@ -61,36 +63,82 @@ | ||
| 61 | 63 | * |
| 62 | 64 | * @access public |
| 63 | 65 | */ |
| 64 | 66 | public function getLoggerData( $data ) { |
| 65 | - return $this->getChartCountsByTypeAndMeta(); | |
| 67 | + return $this->getUsage( $data ); | |
| 66 | 68 | } |
| 67 | 69 | |
| 68 | 70 | /** |
| 69 | - * Fetches the types of charts created and their counts. | |
| 71 | + * Fetches the usage of charts. | |
| 70 | 72 | * |
| 73 | + * @param array $data The default data that needs to be sent. | |
| 71 | 74 | * @param array $meta_keys An array of name vs. meta keys - to return how many charts have these keys. |
| 72 | - * @access private | |
| 75 | + * | |
| 76 | + * @access public | |
| 73 | 77 | */ |
| 74 | - public function getChartCountsByTypeAndMeta( $meta_keys = array() ) { | |
| 75 | - $charts = array(); | |
| 76 | - $charts['chart_types'] = array(); | |
| 77 | - // the initial query arguments to fetch charts | |
| 78 | + public function getUsage( $data, $meta_keys = array() ) { | |
| 79 | + $charts = array( 'types' => array(), 'sources' => array(), 'library' => array(), 'permissions' => 0, 'manual_config' => 0, 'scheduled' => 0 ); | |
| 78 | 80 | $query_args = array( |
| 79 | 81 | 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, |
| 80 | 82 | 'posts_per_page' => 300, |
| 83 | + 'post_status' => 'publish', | |
| 81 | 84 | 'fields' => 'ids', |
| 82 | 85 | 'no_rows_found' => false, |
| 83 | 86 | 'update_post_meta_cache' => false, |
| 84 | 87 | 'update_post_term_cache' => false, |
| 88 | + ); | |
| 85 | 89 | |
| 90 | + // default permissions. | |
| 91 | + $default_perms = array( | |
| 92 | + 'read' => 'all', | |
| 93 | + 'read-specific' => null, | |
| 94 | + 'edit' => 'roles', | |
| 95 | + 'edit-specific' => array( 'administrator' ), | |
| 86 | 96 | ); |
| 87 | 97 | |
| 98 | + // collect all schedules chart ids. | |
| 99 | + $scheduled = array_merge( | |
| 100 | + array_keys( get_option( Visualizer_Plugin::CF_CHART_SCHEDULE, array() ) ), | |
| 101 | + array_keys( get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() ) ) | |
| 102 | + ); | |
| 88 | 103 | $query = new WP_Query( $query_args ); |
| 89 | 104 | while ( $query->have_posts() ) { |
| 90 | 105 | $chart_id = $query->next_post(); |
| 91 | 106 | $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 92 | - $charts['chart_types'][ $type ] = isset( $charts['chart_types'][ $type ] ) ? $charts['chart_types'][ $type ] + 1 : 1; | |
| 107 | + $charts['types'][ $type ] = isset( $charts['types'][ $type ] ) ? $charts['types'][ $type ] + 1 : 1; | |
| 108 | + $source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ); | |
| 109 | + $charts['sources'][ $source ] = isset( $charts['sources'][ $source ] ) ? $charts['sources'][ $source ] + 1 : 1; | |
| 110 | + $lib = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true ); | |
| 111 | + $charts['library'][ $lib ] = isset( $charts['library'][ $lib ] ) ? $charts['library'][ $lib ] + 1 : 1; | |
| 112 | + $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 113 | + if ( array_key_exists( 'manual', $settings ) && ! empty( $settings['manual'] ) ) { | |
| 114 | + $charts['manual_config'] = $charts['manual_config'] + 1; | |
| 115 | + } | |
| 116 | + | |
| 117 | + // phpcs:ignore WordPress.PHP.StrictInArray.FoundNonStrictFalse | |
| 118 | + if ( in_array( $chart_id, $scheduled, false ) ) { | |
| 119 | + $charts['scheduled'] = $charts['scheduled'] + 1; | |
| 120 | + } | |
| 121 | + | |
| 122 | + if ( Visualizer_Module::is_pro() ) { | |
| 123 | + $permissions = get_post_meta( $chart_id, Visualizer_PRO::CF_PERMISSIONS, true ); | |
| 124 | + if ( empty( $permissions ) ) { | |
| 125 | + continue; | |
| 126 | + } | |
| 127 | + $permissions = $permissions['permissions']; | |
| 128 | + $customized = false; | |
| 129 | + foreach ( $default_perms as $key => $val ) { | |
| 130 | + if ( ! is_array( $val ) && ! is_null( $val ) && isset( $permissions[ $key ] ) && $permissions[ $key ] !== $val ) { | |
| 131 | + $customized = true; | |
| 132 | + } elseif ( is_array( $val ) && ! is_null( $val ) && isset( $permissions[ $key ] ) && count( $permissions[ $key ] ) !== count( $val ) ) { | |
| 133 | + $customized = true; | |
| 134 | + } | |
| 135 | + } | |
| 136 | + if ( $customized ) { | |
| 137 | + $charts['permissions'] = $charts['permissions'] + 1; | |
| 138 | + } | |
| 139 | + } | |
| 140 | + | |
| 93 | 141 | if ( ! empty( $meta_keys ) ) { |
| 94 | 142 | foreach ( $meta_keys as $name => $key ) { |
| 95 | 143 | $data = get_post_meta( $chart_id, $key, true ); |
| 96 | 144 | if ( ! empty( $data ) ) { |
| @@ -100,8 +148,9 @@ | ||
| 100 | 148 | } |
| 101 | 149 | } |
| 102 | 150 | } |
| 103 | 151 | } |
| 152 | + | |
| 104 | 153 | return $charts; |
| 105 | 154 | } |
| 106 | 155 | |
| 107 | 156 | /** |
| @@ -140,36 +189,75 @@ | ||
| 140 | 189 | |
| 141 | 190 | /** |
| 142 | 191 | * Activate the plugin |
| 143 | 192 | */ |
| 144 | - public function activate() { | |
| 193 | + public function activate( $network_wide ) { | |
| 194 | + if ( is_multisite() && $network_wide ) { | |
| 195 | + foreach ( get_sites( array( 'fields' => 'ids' ) ) as $blog_id ) { | |
| 196 | + switch_to_blog( $blog_id ); | |
| 197 | + $this->activate_on_site(); | |
| 198 | + restore_current_blog(); | |
| 199 | + } | |
| 200 | + } else { | |
| 201 | + $this->activate_on_site(); | |
| 202 | + } | |
| 203 | + } | |
| 204 | + | |
| 205 | + /** | |
| 206 | + * Activates the plugin on a particular blog instance (supports multisite and single site). | |
| 207 | + */ | |
| 208 | + private function activate_on_site() { | |
| 145 | 209 | wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); |
| 146 | - wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, 'hourly', 'visualizer_schedule_refresh_db' ); | |
| 210 | + wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, apply_filters( 'visualizer_chart_schedule_interval', 'hourly' ), 'visualizer_schedule_refresh_db' ); | |
| 211 | + add_option( 'visualizer-activated', true ); | |
| 147 | 212 | } |
| 148 | 213 | |
| 149 | 214 | /** |
| 150 | - * On activation of the plugin | |
| 215 | + * Deactivate the plugin | |
| 151 | 216 | */ |
| 152 | - public function onActivation( $plugin ) { | |
| 217 | + public function deactivate( $network_wide ) { | |
| 218 | + if ( is_multisite() && $network_wide ) { | |
| 219 | + foreach ( get_sites( array( 'fields' => 'ids' ) ) as $blog_id ) { | |
| 220 | + switch_to_blog( $blog_id ); | |
| 221 | + $this->deactivate_on_site(); | |
| 222 | + restore_current_blog(); | |
| 223 | + } | |
| 224 | + } else { | |
| 225 | + $this->deactivate_on_site(); | |
| 226 | + } | |
| 227 | + } | |
| 228 | + | |
| 229 | + /** | |
| 230 | + * Deactivates the plugin on a particular blog instance (supports multisite and single site). | |
| 231 | + */ | |
| 232 | + private function deactivate_on_site() { | |
| 233 | + wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); | |
| 234 | + delete_option( 'visualizer-activated', true ); | |
| 235 | + } | |
| 236 | + | |
| 237 | + /** | |
| 238 | + * Check if plugin has been activated and then redirect to the correct page. | |
| 239 | + */ | |
| 240 | + public function adminInit() { | |
| 153 | 241 | if ( defined( 'TI_UNIT_TESTING' ) ) { |
| 154 | 242 | return; |
| 155 | 243 | } |
| 156 | 244 | |
| 157 | - if ( $plugin == VISUALIZER_BASENAME ) { | |
| 158 | - wp_redirect( admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ) ); | |
| 159 | - exit(); | |
| 245 | + // fire any upgrades necessary. | |
| 246 | + Visualizer_Module_Upgrade::upgrade(); | |
| 247 | + | |
| 248 | + if ( get_option( 'visualizer-activated' ) ) { | |
| 249 | + delete_option( 'visualizer-activated' ); | |
| 250 | + if ( ! headers_sent() ) { | |
| 251 | + $page_name = Visualizer_Module::numberOfCharts() > 0 ? Visualizer_Plugin::NAME : 'viz-support'; | |
| 252 | + wp_redirect( add_query_arg( 'page', $page_name, admin_url( 'admin.php' ) ) ); | |
| 253 | + exit(); | |
| 254 | + } | |
| 160 | 255 | } |
| 161 | 256 | } |
| 162 | 257 | |
| 163 | 258 | |
| 164 | 259 | /** |
| 165 | - * Deactivate the plugin | |
| 166 | - */ | |
| 167 | - public function deactivate() { | |
| 168 | - wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); | |
| 169 | - } | |
| 170 | - | |
| 171 | - /** | |
| 172 | 260 | * Refresh the specific chart from the db. |
| 173 | 261 | * |
| 174 | 262 | * @param WP_Post $chart The chart object. |
| 175 | 263 | * @param int $chart_id The chart id. |
| @@ -191,37 +279,91 @@ | ||
| 191 | 279 | } |
| 192 | 280 | |
| 193 | 281 | // check if the source is correct. |
| 194 | 282 | $source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ); |
| 195 | - if ( $source !== 'Visualizer_Source_Query' ) { | |
| 196 | - return $chart; | |
| 197 | - } | |
| 283 | + $load_series = false; | |
| 284 | + switch ( $source ) { | |
| 285 | + case 'Visualizer_Source_Query': | |
| 286 | + // check if its a live-data chart or a cached-data chart. | |
| 287 | + if ( ! $force ) { | |
| 288 | + $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true ); | |
| 289 | + if ( ! empty( $hours ) ) { | |
| 290 | + // cached, bail! | |
| 291 | + return $chart; | |
| 292 | + } | |
| 293 | + } | |
| 198 | 294 | |
| 199 | - // check if its a live-data chart or a cached-data chart. | |
| 200 | - if ( ! $force ) { | |
| 201 | - $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true ); | |
| 202 | - if ( ! empty( $hours ) ) { | |
| 203 | - // cached, bail! | |
| 295 | + $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true ); | |
| 296 | + $source = new Visualizer_Source_Query( $params, $chart_id ); | |
| 297 | + $source->fetch( false ); | |
| 298 | + $load_series = true; | |
| 299 | + break; | |
| 300 | + case 'Visualizer_Source_Json': | |
| 301 | + // check if its a live-data chart or a cached-data chart. | |
| 302 | + if ( ! $force ) { | |
| 303 | + $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true ); | |
| 304 | + if ( ! empty( $hours ) ) { | |
| 305 | + // cached, bail! | |
| 306 | + return $chart; | |
| 307 | + } | |
| 308 | + } | |
| 309 | + | |
| 310 | + $url = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL, true ); | |
| 311 | + $root = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT, true ); | |
| 312 | + $paging = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING, true ); | |
| 313 | + $series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ); | |
| 314 | + $source = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) ); | |
| 315 | + $source->refresh( $series ); | |
| 316 | + break; | |
| 317 | + case 'Visualizer_Source_Csv_Remote': | |
| 318 | + // check if its a live-data chart or a cached-data chart. | |
| 319 | + if ( ! $force ) { | |
| 320 | + $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true ); | |
| 321 | + if ( ! empty( $hours ) ) { | |
| 322 | + // cached, bail! | |
| 323 | + return $chart; | |
| 324 | + } | |
| 325 | + } | |
| 326 | + do_action( 'visualizer_schedule_import' ); | |
| 327 | + return get_post( $chart_id ); | |
| 328 | + default: | |
| 204 | 329 | return $chart; |
| 205 | - } | |
| 206 | 330 | } |
| 207 | 331 | |
| 208 | - $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true ); | |
| 209 | - $source = new Visualizer_Source_Query( $params ); | |
| 210 | - $source->fetch( false ); | |
| 211 | - | |
| 212 | 332 | $error = $source->get_error(); |
| 213 | 333 | if ( empty( $error ) ) { |
| 214 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); | |
| 334 | + $this->disableRevisionsTemporarily(); | |
| 335 | + if ( $load_series ) { | |
| 336 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); | |
| 337 | + } | |
| 215 | 338 | |
| 339 | + $allow_html = false; | |
| 340 | + $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 341 | + if ( isset( $settings['allowHtml'] ) && intval( $settings['allowHtml'] ) === 1 ) { | |
| 342 | + $allow_html = true; | |
| 343 | + } | |
| 344 | + | |
| 345 | + $allow_html = apply_filters( 'visualizer_allow_html_content', $allow_html, $chart_id, $chart ); | |
| 346 | + | |
| 347 | + if ( $allow_html ) { | |
| 348 | + kses_remove_filters(); | |
| 349 | + } | |
| 350 | + | |
| 216 | 351 | wp_update_post( |
| 217 | 352 | array( |
| 218 | 353 | 'ID' => $chart_id, |
| 219 | - 'post_content' => $source->getData(), | |
| 354 | + 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ), | |
| 220 | 355 | ) |
| 221 | 356 | ); |
| 222 | 357 | |
| 358 | + if ( $allow_html ) { | |
| 359 | + kses_init_filters(); | |
| 360 | + } | |
| 361 | + | |
| 223 | 362 | $chart = get_post( $chart_id ); |
| 363 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR ); | |
| 364 | + } else { | |
| 365 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Error while updating chart: %s', $error ) ); | |
| 224 | 366 | } |
| 225 | 367 | |
| 226 | 368 | return $chart; |
| 227 | 369 | } |
| @@ -251,8 +393,13 @@ | ||
| 251 | 393 | } |
| 252 | 394 | |
| 253 | 395 | // if the time is nigh, we force an update. |
| 254 | 396 | $this->refresh_db_for_chart( null, $chart_id, true ); |
| 397 | + // Clear existing chart cache. | |
| 398 | + $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id; | |
| 399 | + if ( get_transient( $cache_key ) ) { | |
| 400 | + delete_transient( $cache_key ); | |
| 401 | + } | |
| 255 | 402 | $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true ); |
| 256 | 403 | $new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS; |
| 257 | 404 | } |
| 258 | 405 | update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules ); |