| @@ -53,93 +53,43 @@ | ||
| 53 | 53 | parent::__construct( $plugin ); |
| 54 | 54 | $this->_addAction( 'load-post.php', 'enqueueMediaScripts' ); |
| 55 | 55 | $this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' ); |
| 56 | 56 | $this->_addAction( 'admin_footer', 'renderTempaltes' ); |
| 57 | - $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 ); | |
| 57 | + $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 9 ); | |
| 58 | 58 | $this->_addAction( 'admin_menu', 'registerAdminMenu' ); |
| 59 | 59 | $this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' ); |
| 60 | 60 | $this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 ); |
| 61 | - $this->_addFilter( 'visualizer_logger_data', 'getLoggerData' ); | |
| 62 | - $this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' ); | |
| 63 | - $this->_addFilter( 'visualizer_feedback_review_trigger', 'feedbackReviewTrigger' ); | |
| 64 | - | |
| 65 | - $this->_addAction( 'admin_init', 'init' ); | |
| 61 | + $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 ); | |
| 62 | + $this->_addFilter( 'visualizer_logger_flag', 'get_logger_flag', 10, 1 ); | |
| 63 | + $this->_addAjaxAction( Visualizer_Plugin::ACTION_TRACK, 'visualizer_enable_track' ); | |
| 66 | 64 | } |
| 67 | 65 | |
| 68 | 66 | /** |
| 69 | - * Admin init. | |
| 70 | - * | |
| 71 | - * @access public | |
| 67 | + * Enable track ajax action. | |
| 72 | 68 | */ |
| 73 | - public function init() { | |
| 74 | - if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) { | |
| 75 | - $this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 ); | |
| 76 | - $this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 ); | |
| 77 | - $this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 ); | |
| 69 | + public function visualizer_enable_track() { | |
| 70 | + check_admin_referer( Visualizer_Plugin::ACTION_TRACK, 'nonce' ); | |
| 71 | + $status = $_GET['status']; | |
| 72 | + if ( $status == 'yes' ) { | |
| 73 | + update_option( 'visualizer_logger_flag', 'yes' ); | |
| 74 | + } else { | |
| 75 | + update_option( 'visualizer_logger_flag', 'no' ); | |
| 78 | 76 | } |
| 77 | + wp_send_json_success( array( 'status' => $status ) ); | |
| 79 | 78 | } |
| 80 | 79 | |
| 81 | 80 | /** |
| 82 | - * Load plugin translation for - TinyMCE API | |
| 81 | + * Either the tracking is active or not. | |
| 83 | 82 | * |
| 84 | - * @access public | |
| 85 | - * @param array $arr The tinymce_lang array. | |
| 86 | - * @return array | |
| 83 | + * @return bool The flag status. | |
| 87 | 84 | */ |
| 88 | - public function add_tinymce_lang( $arr ) { | |
| 89 | - $ui_lang = VISUALIZER_ABSPATH . '/classes/Visualizer/Module/Language.php'; | |
| 90 | - $ui_lang = apply_filters( 'visualizer_ui_lang_filter', $ui_lang ); | |
| 91 | - $arr[] = $ui_lang; | |
| 92 | - return $arr; | |
| 93 | - } | |
| 85 | + public function get_logger_flag() { | |
| 86 | + $flag = get_option( 'visualizer_logger_flag', 'no' ); | |
| 94 | 87 | |
| 95 | - /** | |
| 96 | - * Load custom js options - TinyMCE API | |
| 97 | - * | |
| 98 | - * @access public | |
| 99 | - * @param array $plugin_array The tinymce plugin array. | |
| 100 | - * @return array | |
| 101 | - */ | |
| 102 | - public function tinymce_plugin( $plugin_array ) { | |
| 103 | - $plugin_array['visualizer_mce_button'] = VISUALIZER_ABSURL . 'js/mce.js'; | |
| 104 | - return $plugin_array; | |
| 88 | + return ( $flag === 'yes' ); | |
| 105 | 89 | } |
| 106 | 90 | |
| 107 | 91 | /** |
| 108 | - * Register new button in the editor | |
| 109 | - * | |
| 110 | - * @access public | |
| 111 | - * @param array $buttons The tinymce buttons array. | |
| 112 | - * @return array | |
| 113 | - */ | |
| 114 | - public function register_mce_button( $buttons ) { | |
| 115 | - array_push( $buttons, 'visualizer_mce_button' ); | |
| 116 | - return $buttons; | |
| 117 | - } | |
| 118 | - | |
| 119 | - /** | |
| 120 | - * Whether to show the feedback review or not. | |
| 121 | - * | |
| 122 | - * @access public | |
| 123 | - */ | |
| 124 | - public function feedbackReviewTrigger( $dumb ) { | |
| 125 | - $query = new WP_Query( | |
| 126 | - array( | |
| 127 | - 'posts_per_page' => 50, | |
| 128 | - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 129 | - 'fields' => 'ids', | |
| 130 | - 'update_post_meta_cache' => false, | |
| 131 | - 'update_post_term_cache' => false, | |
| 132 | - ) | |
| 133 | - ); | |
| 134 | - | |
| 135 | - if ( $query->have_posts() && $query->post_count > 0 ) { | |
| 136 | - return true; | |
| 137 | - } | |
| 138 | - return false; | |
| 139 | - } | |
| 140 | - | |
| 141 | - /** | |
| 142 | 92 | * Enqueues media scripts and styles. |
| 143 | 93 | * |
| 144 | 94 | * @since 1.0.0 |
| 145 | 95 | * @uses wp_enqueue_style To enqueue style file. |
| @@ -156,15 +106,8 @@ | ||
| 156 | 106 | wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true ); |
| 157 | 107 | wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true ); |
| 158 | 108 | wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true ); |
| 159 | 109 | wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true ); |
| 160 | - wp_localize_script( | |
| 161 | - 'visualizer-media-view', 'visualizer', array( | |
| 162 | - 'i10n' => array( | |
| 163 | - 'insert' => __( 'Insert', 'visualizer' ), | |
| 164 | - ), | |
| 165 | - ) | |
| 166 | - ); | |
| 167 | 110 | wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true ); |
| 168 | 111 | wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true ); |
| 169 | 112 | } |
| 170 | 113 | } |
| @@ -180,9 +123,8 @@ | ||
| 180 | 123 | * |
| 181 | 124 | * @return array The extended array of media view strings. |
| 182 | 125 | */ |
| 183 | 126 | public function setupMediaViewStrings( $strings ) { |
| 184 | - $chart_types = self::_getChartTypesLocalized( true, true, true ); | |
| 185 | 127 | $strings['visualizer'] = array( |
| 186 | 128 | 'actions' => array( |
| 187 | 129 | 'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS, |
| 188 | 130 | 'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART, |
| @@ -194,10 +136,10 @@ | ||
| 194 | 136 | 'library' => esc_html__( 'From Library', 'visualizer' ), |
| 195 | 137 | 'create' => esc_html__( 'Create New', 'visualizer' ), |
| 196 | 138 | ), |
| 197 | 139 | 'library' => array( |
| 198 | - 'filters' => $chart_types, | |
| 199 | - 'types' => array_keys( $chart_types ), | |
| 140 | + 'filters' => self::_getChartTypesLocalized( true, true ), | |
| 141 | + 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ), | |
| 200 | 142 | ), |
| 201 | 143 | 'nonce' => wp_create_nonce(), |
| 202 | 144 | 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ), |
| 203 | 145 | ); |
| @@ -213,69 +155,59 @@ | ||
| 213 | 155 | * @static |
| 214 | 156 | * @access private |
| 215 | 157 | * @return array The associated array of chart types with localized names. |
| 216 | 158 | */ |
| 217 | - public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) { | |
| 218 | - $additional = array(); | |
| 219 | - if ( $add_select ) { | |
| 220 | - $additional['select'] = array( | |
| 221 | - 'name' => esc_html__( 'All', 'visualizer' ), | |
| 159 | + public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) { | |
| 160 | + $types = array( | |
| 161 | + 'pie' => array( | |
| 162 | + 'name' => esc_html__( 'Pie', 'visualizer' ), | |
| 222 | 163 | 'enabled' => true, |
| 223 | - ); | |
| 224 | - } | |
| 225 | - | |
| 226 | - $types = array_merge( | |
| 227 | - $additional, array( | |
| 228 | - 'pie' => array( | |
| 229 | - 'name' => esc_html__( 'Pie', 'visualizer' ), | |
| 230 | - 'enabled' => true, | |
| 231 | - ), | |
| 232 | - 'line' => array( | |
| 233 | - 'name' => esc_html__( 'Line', 'visualizer' ), | |
| 234 | - 'enabled' => true, | |
| 235 | - ), | |
| 236 | - 'area' => array( | |
| 237 | - 'name' => esc_html__( 'Area', 'visualizer' ), | |
| 238 | - 'enabled' => true, | |
| 239 | - ), | |
| 240 | - 'geo' => array( | |
| 241 | - 'name' => esc_html__( 'Geo', 'visualizer' ), | |
| 242 | - 'enabled' => true, | |
| 243 | - ), | |
| 244 | - 'bar' => array( | |
| 245 | - 'name' => esc_html__( 'Bar', 'visualizer' ), | |
| 246 | - 'enabled' => true, | |
| 247 | - ), | |
| 248 | - 'column' => array( | |
| 249 | - 'name' => esc_html__( 'Column', 'visualizer' ), | |
| 250 | - 'enabled' => true, | |
| 251 | - ), | |
| 252 | - 'gauge' => array( | |
| 253 | - 'name' => esc_html__( 'Gauge', 'visualizer' ), | |
| 254 | - 'enabled' => true, | |
| 255 | - ), | |
| 256 | - 'scatter' => array( | |
| 257 | - 'name' => esc_html__( 'Scatter', 'visualizer' ), | |
| 258 | - 'enabled' => true, | |
| 259 | - ), | |
| 260 | - 'candlestick' => array( | |
| 261 | - 'name' => esc_html__( 'Candlestick', 'visualizer' ), | |
| 262 | - 'enabled' => true, | |
| 263 | - ), | |
| 264 | - // pro types | |
| 265 | - 'table' => array( | |
| 266 | - 'name' => esc_html__( 'Table', 'visualizer' ), | |
| 267 | - 'enabled' => false, | |
| 268 | - ), | |
| 269 | - 'timeline' => array( | |
| 270 | - 'name' => esc_html__( 'Timeline', 'visualizer' ), | |
| 271 | - 'enabled' => false, | |
| 272 | - ), | |
| 273 | - 'combo' => array( | |
| 274 | - 'name' => esc_html__( 'Combo', 'visualizer' ), | |
| 275 | - 'enabled' => false, | |
| 276 | - ), | |
| 277 | - ) | |
| 164 | + ), | |
| 165 | + 'line' => array( | |
| 166 | + 'name' => esc_html__( 'Line', 'visualizer' ), | |
| 167 | + 'enabled' => true, | |
| 168 | + ), | |
| 169 | + 'area' => array( | |
| 170 | + 'name' => esc_html__( 'Area', 'visualizer' ), | |
| 171 | + 'enabled' => true, | |
| 172 | + ), | |
| 173 | + 'geo' => array( | |
| 174 | + 'name' => esc_html__( 'Geo', 'visualizer' ), | |
| 175 | + 'enabled' => true, | |
| 176 | + ), | |
| 177 | + 'bar' => array( | |
| 178 | + 'name' => esc_html__( 'Bar', 'visualizer' ), | |
| 179 | + 'enabled' => true, | |
| 180 | + ), | |
| 181 | + 'column' => array( | |
| 182 | + 'name' => esc_html__( 'Column', 'visualizer' ), | |
| 183 | + 'enabled' => true, | |
| 184 | + ), | |
| 185 | + 'gauge' => array( | |
| 186 | + 'name' => esc_html__( 'Gauge', 'visualizer' ), | |
| 187 | + 'enabled' => true, | |
| 188 | + ), | |
| 189 | + 'scatter' => array( | |
| 190 | + 'name' => esc_html__( 'Scatter', 'visualizer' ), | |
| 191 | + 'enabled' => true, | |
| 192 | + ), | |
| 193 | + 'candlestick' => array( | |
| 194 | + 'name' => esc_html__( 'Candlestick', 'visualizer' ), | |
| 195 | + 'enabled' => true, | |
| 196 | + ), | |
| 197 | + // pro types | |
| 198 | + 'table' => array( | |
| 199 | + 'name' => esc_html__( 'Table', 'visualizer' ), | |
| 200 | + 'enabled' => false, | |
| 201 | + ), | |
| 202 | + 'timeline' => array( | |
| 203 | + 'name' => esc_html__( 'Timeline', 'visualizer' ), | |
| 204 | + 'enabled' => false, | |
| 205 | + ), | |
| 206 | + 'combo' => array( | |
| 207 | + 'name' => esc_html__( 'Combo', 'visualizer' ), | |
| 208 | + 'enabled' => false, | |
| 209 | + ), | |
| 278 | 210 | ); |
| 279 | 211 | $types = apply_filters( 'visualizer_pro_chart_types', $types ); |
| 280 | 212 | if ( $enabledOnly ) { |
| 281 | 213 | $filtered = array(); |
| @@ -339,22 +271,18 @@ | ||
| 339 | 271 | if ( $suffix == $this->_libraryPage ) { |
| 340 | 272 | wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION ); |
| 341 | 273 | $this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' ); |
| 342 | 274 | wp_enqueue_media(); |
| 343 | - wp_enqueue_script( | |
| 344 | - 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( | |
| 345 | - 'jquery', | |
| 346 | - 'media-views', | |
| 347 | - ), Visualizer_Plugin::VERSION, true | |
| 348 | - ); | |
| 275 | + wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( | |
| 276 | + 'jquery', | |
| 277 | + 'media-views', | |
| 278 | + ), Visualizer_Plugin::VERSION, true ); | |
| 349 | 279 | wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); |
| 350 | 280 | wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true ); |
| 351 | - wp_enqueue_script( | |
| 352 | - 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( | |
| 353 | - 'google-jsapi-old', | |
| 354 | - 'visualizer-library', | |
| 355 | - ), Visualizer_Plugin::VERSION, true | |
| 356 | - ); | |
| 281 | + wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( | |
| 282 | + 'google-jsapi-old', | |
| 283 | + 'visualizer-library', | |
| 284 | + ), Visualizer_Plugin::VERSION, true ); | |
| 357 | 285 | } |
| 358 | 286 | } |
| 359 | 287 | |
| 360 | 288 | /** |
| @@ -395,16 +323,14 @@ | ||
| 395 | 323 | * @access public |
| 396 | 324 | */ |
| 397 | 325 | public function renderLibraryPage() { |
| 398 | 326 | // get current page |
| 399 | - $page = filter_input( | |
| 400 | - INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array( | |
| 401 | - 'options' => array( | |
| 402 | - 'min_range' => 1, | |
| 403 | - 'default' => 1, | |
| 404 | - ), | |
| 405 | - ) | |
| 406 | - ); | |
| 327 | + $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array( | |
| 328 | + 'options' => array( | |
| 329 | + 'min_range' => 1, | |
| 330 | + 'default' => 1, | |
| 331 | + ), | |
| 332 | + ) ); | |
| 407 | 333 | // the initial query arguments to fetch charts |
| 408 | 334 | $query_args = array( |
| 409 | 335 | 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, |
| 410 | 336 | 'posts_per_page' => 6, |
| @@ -445,9 +371,9 @@ | ||
| 445 | 371 | $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); |
| 446 | 372 | unset( $settings['height'], $settings['width'] ); |
| 447 | 373 | $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 448 | 374 | $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type ); |
| 449 | - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type ); | |
| 375 | + $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type ); | |
| 450 | 376 | // add chart to the array |
| 451 | 377 | $charts[ 'visualizer-' . $chart->ID ] = array( |
| 452 | 378 | 'id' => $chart->ID, |
| 453 | 379 | 'type' => $type, |
| @@ -457,44 +383,39 @@ | ||
| 457 | 383 | ); |
| 458 | 384 | } |
| 459 | 385 | // enqueue charts array |
| 460 | 386 | $ajaxurl = admin_url( 'admin-ajax.php' ); |
| 461 | - wp_localize_script( | |
| 462 | - 'visualizer-library', 'visualizer', array( | |
| 463 | - 'language' => $this->get_language(), | |
| 464 | - 'map_api_key' => get_option( 'visualizer-map-api-key' ), | |
| 465 | - 'charts' => $charts, | |
| 466 | - 'urls' => array( | |
| 467 | - 'base' => add_query_arg( 'vpage', false ), | |
| 468 | - 'create' => add_query_arg( | |
| 469 | - array( | |
| 470 | - 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, | |
| 471 | - 'library' => 'yes', | |
| 472 | - ), $ajaxurl | |
| 473 | - ), | |
| 474 | - 'edit' => add_query_arg( | |
| 475 | - array( | |
| 476 | - 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, | |
| 477 | - 'library' => 'yes', | |
| 478 | - ), $ajaxurl | |
| 479 | - ), | |
| 480 | - ), | |
| 481 | - ) | |
| 482 | - ); | |
| 387 | + wp_localize_script( 'visualizer-library', 'visualizer', array( | |
| 388 | + 'charts' => $charts, | |
| 389 | + 'urls' => array( | |
| 390 | + 'base' => add_query_arg( 'vpage', false ), | |
| 391 | + 'create' => add_query_arg( array( | |
| 392 | + 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, | |
| 393 | + 'library' => 'yes', | |
| 394 | + ), $ajaxurl ), | |
| 395 | + 'edit' => add_query_arg( array( | |
| 396 | + 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, | |
| 397 | + 'library' => 'yes', | |
| 398 | + ), $ajaxurl ), | |
| 399 | + 'logger' => add_query_arg( array( | |
| 400 | + 'action' => Visualizer_Plugin::ACTION_TRACK, | |
| 401 | + 'library' => 'yes', | |
| 402 | + 'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_TRACK ), | |
| 403 | + ), $ajaxurl ), | |
| 404 | + ), | |
| 405 | + ) ); | |
| 483 | 406 | // render library page |
| 484 | 407 | $render = new Visualizer_Render_Library(); |
| 485 | 408 | $render->charts = $charts; |
| 486 | 409 | $render->type = $filter; |
| 487 | 410 | $render->types = self::_getChartTypesLocalized(); |
| 488 | - $render->pagination = paginate_links( | |
| 489 | - array( | |
| 490 | - 'base' => add_query_arg( 'vpage', '%#%' ), | |
| 491 | - 'format' => '', | |
| 492 | - 'current' => $page, | |
| 493 | - 'total' => $query->max_num_pages, | |
| 494 | - 'type' => 'array', | |
| 495 | - ) | |
| 496 | - ); | |
| 411 | + $render->pagination = paginate_links( array( | |
| 412 | + 'base' => add_query_arg( 'vpage', '%#%' ), | |
| 413 | + 'format' => '', | |
| 414 | + 'current' => $page, | |
| 415 | + 'total' => $query->max_num_pages, | |
| 416 | + 'type' => 'array', | |
| 417 | + ) ); | |
| 497 | 418 | $render->render(); |
| 498 | 419 | } |
| 499 | 420 | |
| 500 | 421 | /** |
