| @@ -44,15 +44,18 @@ | ||
| 44 | 44 | |
| 45 | 45 | register_activation_hook( VISUALIZER_BASEFILE, array( $this, 'activate' ) ); |
| 46 | 46 | register_deactivation_hook( VISUALIZER_BASEFILE, array( $this, 'deactivate' ) ); |
| 47 | 47 | $this->_addAction( 'visualizer_schedule_refresh_db', 'refreshDbChart' ); |
| 48 | - $this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', null, 10, 3 ); | |
| 48 | + $this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', 10, 3 ); | |
| 49 | 49 | |
| 50 | + $this->_addAction( 'admin_init', 'adminInit' ); | |
| 50 | 51 | $this->_addAction( 'init', 'setupCustomPostTypes' ); |
| 51 | 52 | $this->_addAction( 'plugins_loaded', 'loadTextDomain' ); |
| 52 | 53 | $this->_addFilter( 'visualizer_logger_data', 'getLoggerData' ); |
| 53 | - $this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' ); | |
| 54 | + $this->_addFilter( 'visualizer_get_chart_counts', 'getUsage', 10, 2 ); | |
| 54 | 55 | |
| 56 | + // only for testing | |
| 57 | + // $this->_addAction( 'admin_init', 'getUsage' ); | |
| 55 | 58 | } |
| 56 | 59 | /** |
| 57 | 60 | * Fetches the SDK logger data. |
| 58 | 61 | * |
| @@ -60,36 +63,82 @@ | ||
| 60 | 63 | * |
| 61 | 64 | * @access public |
| 62 | 65 | */ |
| 63 | 66 | public function getLoggerData( $data ) { |
| 64 | - return $this->getChartCountsByTypeAndMeta(); | |
| 67 | + return $this->getUsage( $data ); | |
| 65 | 68 | } |
| 66 | 69 | |
| 67 | 70 | /** |
| 68 | - * Fetches the types of charts created and their counts. | |
| 71 | + * Fetches the usage of charts. | |
| 69 | 72 | * |
| 73 | + * @param array $data The default data that needs to be sent. | |
| 70 | 74 | * @param array $meta_keys An array of name vs. meta keys - to return how many charts have these keys. |
| 71 | - * @access private | |
| 75 | + * | |
| 76 | + * @access public | |
| 72 | 77 | */ |
| 73 | - public function getChartCountsByTypeAndMeta( $meta_keys = array() ) { | |
| 74 | - $charts = array(); | |
| 75 | - $charts['chart_types'] = array(); | |
| 76 | - // 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 ); | |
| 77 | 80 | $query_args = array( |
| 78 | 81 | 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, |
| 79 | 82 | 'posts_per_page' => 300, |
| 83 | + 'post_status' => 'publish', | |
| 80 | 84 | 'fields' => 'ids', |
| 81 | 85 | 'no_rows_found' => false, |
| 82 | 86 | 'update_post_meta_cache' => false, |
| 83 | 87 | 'update_post_term_cache' => false, |
| 88 | + ); | |
| 84 | 89 | |
| 90 | + // default permissions. | |
| 91 | + $default_perms = array( | |
| 92 | + 'read' => 'all', | |
| 93 | + 'read-specific' => null, | |
| 94 | + 'edit' => 'roles', | |
| 95 | + 'edit-specific' => array( 'administrator' ), | |
| 85 | 96 | ); |
| 86 | 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 | + ); | |
| 87 | 103 | $query = new WP_Query( $query_args ); |
| 88 | 104 | while ( $query->have_posts() ) { |
| 89 | 105 | $chart_id = $query->next_post(); |
| 90 | 106 | $type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 91 | - $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 | + | |
| 92 | 141 | if ( ! empty( $meta_keys ) ) { |
| 93 | 142 | foreach ( $meta_keys as $name => $key ) { |
| 94 | 143 | $data = get_post_meta( $chart_id, $key, true ); |
| 95 | 144 | if ( ! empty( $data ) ) { |
| @@ -99,8 +148,9 @@ | ||
| 99 | 148 | } |
| 100 | 149 | } |
| 101 | 150 | } |
| 102 | 151 | } |
| 152 | + | |
| 103 | 153 | return $charts; |
| 104 | 154 | } |
| 105 | 155 | |
| 106 | 156 | /** |
| @@ -142,24 +192,47 @@ | ||
| 142 | 192 | */ |
| 143 | 193 | public function activate() { |
| 144 | 194 | wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); |
| 145 | 195 | wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, 'hourly', 'visualizer_schedule_refresh_db' ); |
| 196 | + add_option( 'visualizer-activated', true ); | |
| 146 | 197 | } |
| 147 | 198 | |
| 148 | 199 | /** |
| 200 | + * Check if plugin has been activated and then redirect to the correct page. | |
| 201 | + */ | |
| 202 | + public function adminInit() { | |
| 203 | + if ( defined( 'TI_UNIT_TESTING' ) ) { | |
| 204 | + return; | |
| 205 | + } | |
| 206 | + | |
| 207 | + // fire any upgrades necessary. | |
| 208 | + Visualizer_Module_Upgrade::upgrade(); | |
| 209 | + | |
| 210 | + if ( get_option( 'visualizer-activated' ) ) { | |
| 211 | + delete_option( 'visualizer-activated' ); | |
| 212 | + if ( ! headers_sent() ) { | |
| 213 | + $page_name = Visualizer_Module::numberOfCharts() > 0 ? Visualizer_Plugin::NAME : 'viz-support'; | |
| 214 | + wp_redirect( add_query_arg( 'page', $page_name, admin_url( 'admin.php' ) ) ); | |
| 215 | + exit(); | |
| 216 | + } | |
| 217 | + } | |
| 218 | + } | |
| 219 | + | |
| 220 | + | |
| 221 | + /** | |
| 149 | 222 | * Deactivate the plugin |
| 150 | 223 | */ |
| 151 | 224 | public function deactivate() { |
| 152 | 225 | wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' ); |
| 226 | + delete_option( 'visualizer-activated', true ); | |
| 153 | 227 | } |
| 154 | 228 | |
| 155 | 229 | /** |
| 156 | - * Refresh the specific chart from the db. This is mostly for charts that have 0 refresh time i.e. live data. | |
| 230 | + * Refresh the specific chart from the db. | |
| 157 | 231 | * |
| 158 | 232 | * @param WP_Post $chart The chart object. |
| 159 | 233 | * @param int $chart_id The chart id. |
| 160 | - * @param bool $force If this is true, then the chart data will be refreshed no matter if the chart requests live data or cached data. | |
| 161 | - * If false, data will be refreshed only if the chart requests live data. | |
| 234 | + * @param bool $force If this is true, then the chart data will be force refreshed. If false, data will be refreshed only if the chart requests live data. | |
| 162 | 235 | * |
| 163 | 236 | * @access public |
| 164 | 237 | */ |
| 165 | 238 | public function refresh_db_for_chart( $chart, $chart_id, $force = false ) { |
| @@ -170,38 +243,81 @@ | ||
| 170 | 243 | if ( ! $chart ) { |
| 171 | 244 | $chart = get_post( $chart_id ); |
| 172 | 245 | } |
| 173 | 246 | |
| 174 | - // check if its a live-data chart or a cached-data chart. | |
| 175 | - if ( ! $force ) { | |
| 176 | - $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true ); | |
| 177 | - if ( ! empty( $hours ) ) { | |
| 178 | - // cached, bail! | |
| 179 | - return $chart; | |
| 180 | - } | |
| 247 | + if ( ! $chart ) { | |
| 248 | + return $chart; | |
| 181 | 249 | } |
| 182 | 250 | |
| 183 | 251 | // check if the source is correct. |
| 184 | 252 | $source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ); |
| 185 | - if ( $source !== 'Visualizer_Source_Query_Params' ) { | |
| 186 | - return $chart; | |
| 253 | + $load_series = false; | |
| 254 | + switch ( $source ) { | |
| 255 | + case 'Visualizer_Source_Query': | |
| 256 | + // check if its a live-data chart or a cached-data chart. | |
| 257 | + if ( ! $force ) { | |
| 258 | + $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true ); | |
| 259 | + if ( ! empty( $hours ) ) { | |
| 260 | + // cached, bail! | |
| 261 | + return $chart; | |
| 262 | + } | |
| 263 | + } | |
| 264 | + | |
| 265 | + $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true ); | |
| 266 | + $source = new Visualizer_Source_Query( $params, $chart_id ); | |
| 267 | + $source->fetch( false ); | |
| 268 | + $load_series = true; | |
| 269 | + break; | |
| 270 | + case 'Visualizer_Source_Json': | |
| 271 | + // check if its a live-data chart or a cached-data chart. | |
| 272 | + if ( ! $force ) { | |
| 273 | + $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true ); | |
| 274 | + if ( ! empty( $hours ) ) { | |
| 275 | + // cached, bail! | |
| 276 | + return $chart; | |
| 277 | + } | |
| 278 | + } | |
| 279 | + | |
| 280 | + $url = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL, true ); | |
| 281 | + $root = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT, true ); | |
| 282 | + $paging = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING, true ); | |
| 283 | + $series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ); | |
| 284 | + $source = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) ); | |
| 285 | + $source->refresh( $series ); | |
| 286 | + break; | |
| 287 | + case 'Visualizer_Source_Csv_Remote': | |
| 288 | + // check if its a live-data chart or a cached-data chart. | |
| 289 | + if ( ! $force ) { | |
| 290 | + $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true ); | |
| 291 | + if ( ! empty( $hours ) ) { | |
| 292 | + // cached, bail! | |
| 293 | + return $chart; | |
| 294 | + } | |
| 295 | + } | |
| 296 | + do_action( 'visualizer_schedule_import' ); | |
| 297 | + return get_post( $chart_id ); | |
| 298 | + default: | |
| 299 | + return $chart; | |
| 187 | 300 | } |
| 188 | 301 | |
| 189 | - $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true ); | |
| 190 | - $source = new Visualizer_Source_Query( $params ); | |
| 191 | - $source->fetch( false ); | |
| 192 | 302 | $error = $source->get_error(); |
| 193 | 303 | if ( empty( $error ) ) { |
| 194 | - update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); | |
| 304 | + $this->disableRevisionsTemporarily(); | |
| 305 | + if ( $load_series ) { | |
| 306 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); | |
| 307 | + } | |
| 195 | 308 | |
| 196 | 309 | wp_update_post( |
| 197 | 310 | array( |
| 198 | 311 | 'ID' => $chart_id, |
| 199 | - 'post_content' => $source->getData(), | |
| 312 | + 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ), | |
| 200 | 313 | ) |
| 201 | 314 | ); |
| 202 | 315 | |
| 203 | 316 | $chart = get_post( $chart_id ); |
| 317 | + delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR ); | |
| 318 | + } else { | |
| 319 | + update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Error while updating chart: %s', $error ) ); | |
| 204 | 320 | } |
| 205 | 321 | |
| 206 | 322 | return $chart; |
| 207 | 323 | } |
| @@ -229,9 +345,10 @@ | ||
| 229 | 345 | if ( $time > $now ) { |
| 230 | 346 | continue; |
| 231 | 347 | } |
| 232 | 348 | |
| 233 | - $this->refresh_db_for_chart( null, $chart_id, false ); | |
| 349 | + // if the time is nigh, we force an update. | |
| 350 | + $this->refresh_db_for_chart( null, $chart_id, true ); | |
| 234 | 351 | $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true ); |
| 235 | 352 | $new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS; |
| 236 | 353 | } |
| 237 | 354 | update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules ); |