PluginProbe
Visualizer – Tables & Charts Manager with Built-in AI Generator / 1.5.6
Visualizer – Tables & Charts Manager with Built-in AI Generator v1.5.6
4.0.7 4.0.6 4.0.5 4.0.4 4.0.3 3.0.5 3.0.6 3.0.7 3.0.8 3.0.9 3.1.0 3.1.1 3.1.2 3.1.3 3.10.0 3.10.1 3.10.10 3.10.11 3.10.12 3.10.13 3.10.14 3.10.15 3.10.2 3.10.3 3.10.4 All 148 releases
← All changes | classes/Visualizer/Module/Admin.php +211 -494 3.1.01.5.6 View file →
@@ -1,5 +1,6 @@
1 1 <?php
2 +
2 3 // +----------------------------------------------------------------------+
3 4 // | Copyright 2013 Madpixels (email : visualizer@madpixels.net) |
4 5 // +----------------------------------------------------------------------+
5 6 // | This program is free software; you can redistribute it and/or modify |
@@ -17,8 +18,9 @@
17 18 // | MA 02110-1301 USA |
18 19 // +----------------------------------------------------------------------+
19 20 // | Author: Eugene Manuilov <eugene@manuilov.org> |
20 21 // +----------------------------------------------------------------------+
22 +
21 23 /**
22 24 * The module for all admin stuff.
23 25 *
24 26 * @category Visualizer
@@ -45,160 +47,116 @@
45 47 *
46 48 * @since 1.0.0
47 49 *
48 50 * @access public
49 - *
50 51 * @param Visualizer_Plugin $plugin The instance of the plugin.
51 52 */
52 53 public function __construct( Visualizer_Plugin $plugin ) {
53 54 parent::__construct( $plugin );
55 +
54 56 $this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
55 57 $this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
56 - $this->_addAction( 'admin_footer', 'renderTemplates' );
57 - $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
58 + $this->_addAction( 'admin_footer', 'renderTempaltes' );
59 + $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts' );
58 60 $this->_addAction( 'admin_menu', 'registerAdminMenu' );
61 + // Added by Ash/Upwork for feedback
62 + $this->_addAction( 'admin_init', 'visualizerInitFeedback' );
63 + // Added by Ash/Upwork for feedback
64 +
59 65 $this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
60 66 $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 - // revision support.
66 - $this->_addFilter( 'wp_revisions_to_keep', 'limitRevisions', null, 10, 2 );
67 - $this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
68 - $this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
69 -
70 - $this->_addAction( 'admin_init', 'init' );
67 + $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
68 + $this->_addFilter( 'visualizer_admin_pointers', 'visualizerAdminPointers', 10, 2 );
69 + // Added by Ash/Upwork for feedback
70 + $this->_addFilter( 'visualizer_feedback_enqueue', 'visualizerFeedbackEnqueue', 10, 2 );
71 + $this->_addFilter( 'visualizer_feedback', 'visualizerFeedback', 10, 2 );
72 + $this->_addFilter( 'visualizer_feedback_config', 'visualizerFeedbackConfig', 10, 2 );
73 + $this->_addFilter( 'visualizer_feedback_action', 'visualizerFeedbackAction', 10, 2 );
74 + // Added by Ash/Upwork for feedback
71 75 }
72 76
73 - /**
74 - * No limits on revisions.
75 - */
76 - public function limitRevisions( $num, $post ) {
77 - if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
78 - return -1;
79 - }
80 - return $num;
81 - }
77 + // Added by Ash/Upwork for feedback
78 + function visualizerFeedbackConfig(){
79 + return array(
80 + "title" => "TITLE",
81 + "description" => "Message that will ask the user for review",
82 + "yes_btn_txt" => "Text to show on yes btn ",
83 + "no_btn_txt" => "txt to show on no btn",
84 + "yes_btn_link" => "link to redirect when click on the yes btn",
85 + );
86 + }
82 87
83 - /**
84 - * Add a revision.
85 - */
86 - public function addRevision( $revision_id ) {
87 - $parent_id = wp_is_post_revision( $revision_id );
88 - if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $parent_id ) ) {
89 - // add the meta data to this revision.
90 - $meta = get_post_meta( $parent_id, '', true );
88 + function visualizerFeedbackAction(){
89 + return array("type"=>"splash","action"=>array("type"=>"click","target"=>".add-new-h2"));
90 + }
91 91
92 - if ( $meta ) {
93 - foreach ( $meta as $key => $value ) {
94 - if ( 0 === strpos( $key, 'visualizer' ) ) {
95 - add_metadata( 'post', $revision_id, $key, maybe_unserialize( $value[0] ) );
96 - }
97 - }
98 - }
99 - }
100 - }
92 + function visualizerFeedback(){
93 + return true;
94 + }
101 95
102 - /**
103 - * Restore a revision.
104 - */
105 - public function restoreRevision( $post_id, $revision_id ) {
106 - if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $post_id ) ) {
107 - // get the meta information from the revision.
108 - $meta = get_metadata( 'post', $revision_id, '', true );
96 + function visualizerInitFeedback(){
97 + $file = trailingslashit(VISUALIZER_ABSPATH) . "feedback/PluginFeedbackTI.php";
98 + if (file_exists($file)) {
99 + include_once $file;
100 + new PluginFeedbackTI(Visualizer_Plugin::NAME, 1, Visualizer_Plugin::VERSION, "visualizer_feedback", "visualizer_feedback_config", "visualizer_feedback_action", "visualizer_feedback_enqueue");
101 + }
102 + }
109 103
110 - // delete all meta information from the post before adding.
111 - $post_meta = get_post_meta( $post_id, '', true );
112 - if ( $post_meta ) {
113 - foreach ( $meta as $key => $value ) {
114 - if ( 0 === strpos( $key, 'visualizer' ) ) {
115 - delete_post_meta( $post_id, $key );
116 - }
117 - }
118 - }
104 + function visualizerFeedbackEnqueue(){
105 + wp_register_script("ti-feedback-func", VISUALIZER_ABSURL . 'js/feedback-func.js');
106 + wp_enqueue_script("ti-feedback-func");
107 + }
108 + // Added by Ash/Upwork for feedback
119 109
120 - if ( $meta ) {
121 - foreach ( $meta as $key => $value ) {
122 - if ( 0 === strpos( $key, 'visualizer' ) ) {
123 - add_post_meta( $post_id, $key, maybe_unserialize( $value[0] ) );
124 - }
125 - }
126 - }
127 - }
128 - }
129 -
130 110 /**
131 - * Admin init.
111 + * Returns wp pointers for visualizer
132 112 *
133 - * @access public
134 - */
135 - public function init() {
136 - if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
137 - $this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
138 - $this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
139 - $this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
140 - }
141 - }
142 -
143 - /**
144 - * Load plugin translation for - TinyMCE API
113 + * @since 1.5
145 114 *
146 - * @access public
147 - * @param array $arr The tinymce_lang array.
148 - * @return array
115 + * @static
116 + * @access private
117 + * @return array The associated array of pointer
149 118 */
150 - public function add_tinymce_lang( $arr ) {
151 - $ui_lang = VISUALIZER_ABSPATH . '/classes/Visualizer/Module/Language.php';
152 - $ui_lang = apply_filters( 'visualizer_ui_lang_filter', $ui_lang );
153 - $arr[] = $ui_lang;
154 - return $arr;
119 + function visualizerAdminPointers( $p ) {
120 + $p['visualizer'] = array(
121 + 'target' => '#menu-media',
122 + 'options' => array(
123 + 'content' => sprintf( '<h3> %s </h3> <p> %s </p>',
124 + __( 'Visualizer New Features ' , Visualizer_Plugin::NAME),
125 + __( 'Right now the Visualizer Charts and Graphics plugin integrates a live editor and a new importing option for your charts. ',Visualizer_Plugin::NAME)
126 + ),
127 + 'position' => array( 'edge' => 'top', 'align' => 'middle' )
128 + )
129 + );
130 + return $p;
155 131 }
156 132
157 133 /**
158 - * Load custom js options - TinyMCE API
134 + * Returns associated array of chart types and localized names.
159 135 *
160 - * @access public
161 - * @param array $plugin_array The tinymce plugin array.
162 - * @return array
163 - */
164 - public function tinymce_plugin( $plugin_array ) {
165 - $plugin_array['visualizer_mce_button'] = VISUALIZER_ABSURL . 'js/mce.js';
166 - return $plugin_array;
167 - }
168 -
169 - /**
170 - * Register new button in the editor
136 + * @since 1.0.0
171 137 *
172 - * @access public
173 - * @param array $buttons The tinymce buttons array.
174 - * @return array
138 + * @static
139 + * @access private
140 + * @return array The associated array of chart types with localized names.
175 141 */
176 - public function register_mce_button( $buttons ) {
177 - array_push( $buttons, 'visualizer_mce_button' );
178 - return $buttons;
179 - }
142 + public static function _getChartTypesLocalized() {
143 + $types = array(
144 + 'all' => esc_html__( 'All', Visualizer_Plugin::NAME ),
145 + 'pie' => esc_html__( 'Pie', Visualizer_Plugin::NAME ),
146 + 'line' => esc_html__( 'Line', Visualizer_Plugin::NAME ),
147 + 'area' => esc_html__( 'Area', Visualizer_Plugin::NAME ),
148 + 'geo' => esc_html__( 'Geo', Visualizer_Plugin::NAME ),
149 + 'bar' => esc_html__( 'Bar', Visualizer_Plugin::NAME ),
150 + 'column' => esc_html__( 'Column', Visualizer_Plugin::NAME ),
151 + 'gauge' => esc_html__( 'Gauge', Visualizer_Plugin::NAME ),
152 + 'scatter' => esc_html__( 'Scatter', Visualizer_Plugin::NAME ),
153 + 'candlestick' => esc_html__( 'Candlestick', Visualizer_Plugin::NAME ),
154 + );
180 155
181 - /**
182 - * Whether to show the feedback review or not.
183 - *
184 - * @access public
185 - */
186 - public function feedbackReviewTrigger( $dumb ) {
187 - $query = new WP_Query(
188 - array(
189 - 'posts_per_page' => 50,
190 - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
191 - 'fields' => 'ids',
192 - 'update_post_meta_cache' => false,
193 - 'update_post_term_cache' => false,
194 - )
195 - );
156 + $types = apply_filters("visualizer_pro_chart_types", $types);
196 157
197 - if ( $query->have_posts() && $query->post_count > 0 ) {
198 - return true;
199 - }
200 - return false;
158 + return $types;
201 159 }
202 160
203 161 /**
204 162 * Enqueues media scripts and styles.
@@ -210,30 +168,20 @@
210 168 * @access public
211 169 */
212 170 public function enqueueMediaScripts() {
213 171 global $typenow;
172 +
214 173 if ( post_type_supports( $typenow, 'editor' ) ) {
215 174 wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216 175
217 - // Load all the assets for the different libraries we support.
218 - $deps = Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) );
219 - $deps += Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) );
220 -
221 - wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
222 - wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
176 + wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
177 + wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
178 + wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi' ), Visualizer_Plugin::VERSION, true );
179 + wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
223 180 wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
224 - wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
225 - wp_localize_script(
226 - 'visualizer-media-view',
227 - 'visualizer',
228 - array(
229 - 'i10n' => array(
230 - 'insert' => __( 'Insert', 'visualizer' ),
231 - ),
232 - )
233 - );
234 - wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
235 - wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
181 + wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
182 + wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
183 + wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
236 184 }
237 185 }
238 186
239 187 /**
@@ -241,33 +189,29 @@
241 189 *
242 190 * @since 1.0.0
243 191 *
244 192 * @access public
245 - *
246 193 * @param array $strings The array of media view strings.
247 - *
248 194 * @return array The extended array of media view strings.
249 195 */
250 196 public function setupMediaViewStrings( $strings ) {
251 - $chart_types = self::_getChartTypesLocalized( true, true, true );
252 197 $strings['visualizer'] = array(
253 - 'actions' => array(
198 + 'actions' => array(
254 199 'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
255 200 'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
256 201 ),
257 202 'controller' => array(
258 - 'title' => esc_html__( 'Visualizations', 'visualizer' ),
203 + 'title' => esc_html__( 'Visualizations', Visualizer_Plugin::NAME ),
259 204 ),
260 - 'routers' => array(
261 - 'library' => esc_html__( 'From Library', 'visualizer' ),
262 - 'create' => esc_html__( 'Create New', 'visualizer' ),
205 + 'routers' => array(
206 + 'library' => esc_html__( 'From Library', Visualizer_Plugin::NAME ),
207 + 'create' => esc_html__( 'Create New', Visualizer_Plugin::NAME ),
263 208 ),
264 - 'library' => array(
265 - 'filters' => $chart_types,
266 - 'types' => array_keys( $chart_types ),
209 + 'library' => array(
210 + 'filters' => self::_getChartTypesLocalized(),
267 211 ),
268 - 'nonce' => wp_create_nonce(),
269 - 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
212 + 'nonce' => wp_create_nonce(),
213 + 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
270 214 );
271 215
272 216 return $strings;
273 217 }
@@ -272,175 +216,8 @@
272 216 return $strings;
273 217 }
274 218
275 219 /**
276 - * Returns associated array of chart types and localized names.
277 - *
278 - * @since 1.0.0
279 - *
280 - * @static
281 - * @access private
282 - * @return array The associated array of chart types with localized names.
283 - */
284 - public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
285 - $additional = array();
286 - if ( $add_select ) {
287 - $additional['select'] = array(
288 - 'name' => esc_html__( 'All', 'visualizer' ),
289 - 'enabled' => true,
290 - );
291 - }
292 -
293 - $types = array_merge(
294 - $additional,
295 - array(
296 - 'dataTable' => array(
297 - 'name' => esc_html__( 'Table (New)', 'visualizer' ),
298 - 'enabled' => true,
299 - ),
300 - 'pie' => array(
301 - 'name' => esc_html__( 'Pie', 'visualizer' ),
302 - 'enabled' => true,
303 - ),
304 - 'line' => array(
305 - 'name' => esc_html__( 'Line', 'visualizer' ),
306 - 'enabled' => true,
307 - ),
308 - 'area' => array(
309 - 'name' => esc_html__( 'Area', 'visualizer' ),
310 - 'enabled' => true,
311 - ),
312 - 'geo' => array(
313 - 'name' => esc_html__( 'Geo', 'visualizer' ),
314 - 'enabled' => true,
315 - ),
316 - 'bar' => array(
317 - 'name' => esc_html__( 'Bar', 'visualizer' ),
318 - 'enabled' => true,
319 - ),
320 - 'column' => array(
321 - 'name' => esc_html__( 'Column', 'visualizer' ),
322 - 'enabled' => true,
323 - ),
324 - 'gauge' => array(
325 - 'name' => esc_html__( 'Gauge', 'visualizer' ),
326 - 'enabled' => true,
327 - ),
328 - 'scatter' => array(
329 - 'name' => esc_html__( 'Scatter', 'visualizer' ),
330 - 'enabled' => true,
331 - ),
332 - 'candlestick' => array(
333 - 'name' => esc_html__( 'Candlestick', 'visualizer' ),
334 - 'enabled' => true,
335 - ),
336 - // pro types
337 - 'table' => array(
338 - 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
339 - 'enabled' => false,
340 - ),
341 - 'timeline' => array(
342 - 'name' => esc_html__( 'Timeline', 'visualizer' ),
343 - 'enabled' => false,
344 - ),
345 - 'combo' => array(
346 - 'name' => esc_html__( 'Combo', 'visualizer' ),
347 - 'enabled' => false,
348 - ),
349 - )
350 - );
351 - $types = apply_filters( 'visualizer_pro_chart_types', $types );
352 - if ( $enabledOnly ) {
353 - $filtered = array();
354 - foreach ( $types as $type => $array ) {
355 - if ( ! is_array( $array ) ) {
356 - // support for old pro
357 - $array = array( 'enabled' => true, 'name' => $array );
358 - }
359 - if ( ! $array['enabled'] ) {
360 - continue;
361 - }
362 - $filtered[ $type ] = $array;
363 - }
364 - $types = $filtered;
365 - }
366 - if ( $get2Darray ) {
367 - $doubleD = array();
368 - foreach ( $types as $type => $array ) {
369 - if ( ! is_array( $array ) ) {
370 - // support for old pro
371 - $array = array( 'enabled' => true, 'name' => $array );
372 - }
373 - $doubleD[ $type ] = $array['name'];
374 - }
375 - $types = $doubleD;
376 - }
377 -
378 - return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
379 - }
380 -
381 - /**
382 - * Handle (soon-to-be) deprecated charts.
383 - */
384 - private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
385 - $deprecated = array();
386 -
387 - switch ( $where ) {
388 - case 'library':
389 - // if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
390 - if ( ! self::hasChartType( 'table' ) ) {
391 - $deprecated[] = 'table';
392 - if ( $get2Darray ) {
393 - $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
394 - } else {
395 - $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
396 - }
397 - }
398 -
399 - // if a user has a Gauge/Candlestick chart, then let them keep using it.
400 - if ( ! VISUALIZER_PRO ) {
401 - if ( ! self::hasChartType( 'gauge' ) ) {
402 - $deprecated[] = 'gauge';
403 - }
404 - if ( ! self::hasChartType( 'candlestick' ) ) {
405 - $deprecated[] = 'candlestick';
406 - }
407 - }
408 - break;
409 - default:
410 - // remove the option to create a Google Table chart.
411 - $deprecated[] = 'table';
412 -
413 - // rename the new table chart type.
414 - if ( self::hasChartType( 'table' ) ) {
415 - if ( $get2Darray ) {
416 - $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
417 - } else {
418 - $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
419 - }
420 - }
421 -
422 - // if a user has a Gauge/Candlestick chart, then let them keep using it.
423 - if ( ! VISUALIZER_PRO ) {
424 - if ( ! self::hasChartType( 'gauge' ) ) {
425 - $deprecated[] = 'gauge';
426 - }
427 - if ( ! self::hasChartType( 'candlestick' ) ) {
428 - $deprecated[] = 'candlestick';
429 - }
430 - }
431 - }
432 -
433 - if ( $deprecated ) {
434 - foreach ( $deprecated as $type ) {
435 - unset( $types[ $type ] );
436 - }
437 - }
438 -
439 - return $types;
440 - }
441 -
442 - /**
443 220 * Renders templates to use in media popup.
444 221 *
445 222 * @since 1.0.0
446 223 * @global string $pagenow The name of the current page.
@@ -446,13 +223,15 @@
446 223 * @global string $pagenow The name of the current page.
447 224 *
448 225 * @access public
449 226 */
450 - public function renderTemplates() {
227 + public function renderTempaltes() {
451 228 global $pagenow;
229 +
452 230 if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
453 231 return;
454 232 }
233 +
455 234 $render = new Visualizer_Render_Templates();
456 235 $render->render();
457 236 }
458 237
@@ -464,45 +243,62 @@
464 243 * @uses wp_enqueue_script() To enqueue javascript file.
465 244 * @uses wp_enqueue_media() To enqueue media stuff.
466 245 *
467 246 * @access public
468 - *
469 247 * @param string $suffix The current page suffix.
470 248 */
471 249 public function enqueueLibraryScripts( $suffix ) {
472 250 if ( $suffix == $this->_libraryPage ) {
473 251 wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
252 +
474 253 $this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
254 +
475 255 wp_enqueue_media();
476 - wp_enqueue_script(
477 - 'visualizer-library',
478 - VISUALIZER_ABSURL . 'js/library.js',
479 - array(
480 - 'jquery',
481 - 'media-views',
482 - ),
483 - Visualizer_Plugin::VERSION,
484 - true
485 - );
256 + wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
257 + wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
258 + wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array('google-jsapi-new'), null, true );
259 + wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
260 + }
261 + if ( get_bloginfo( 'version' ) < '3.3' )
262 + return;
486 263
487 - wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
488 264
489 - $query = $this->getQuery();
490 - while ( $query->have_posts() ) {
491 - $chart = $query->next_post();
492 - $library = $this->load_chart_type( $chart->ID );
493 - if ( is_null( $library ) ) {
494 - continue;
495 - }
496 - wp_enqueue_script(
497 - "visualizer-render-$library",
498 - VISUALIZER_ABSURL . 'js/render-facade.js',
499 - apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
500 - Visualizer_Plugin::VERSION,
501 - true
502 - );
503 - }
265 + // Get pointers for this screen
266 + $pointers = apply_filters( 'visualizer_admin_pointers', array() );
267 +
268 + if ( ! $pointers || ! is_array( $pointers ) )
269 + return;
270 +
271 + // Get dismissed pointers
272 + $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
273 + $valid_pointers =array();
274 + // Check pointers and remove dismissed ones.
275 + foreach ( $pointers as $pointer_id => $pointer ) {
276 +
277 + // Sanity check
278 + if ( in_array( $pointer_id, $dismissed ) || empty( $pointer ) || empty( $pointer_id ) || empty( $pointer['target'] ) || empty( $pointer['options'] ) )
279 + continue;
280 +
281 + $pointer['pointer_id'] = $pointer_id;
282 +
283 + // Add the pointer to $valid_pointers array
284 + $valid_pointers['pointers'][] = $pointer;
504 285 }
286 +
287 + // No valid pointers? Stop here.
288 + if ( empty( $valid_pointers ) )
289 + return;
290 +
291 + // Add pointers style to queue.
292 + wp_enqueue_style( 'wp-pointer' );
293 + // Add pointers script to queue. Add custom script.
294 + wp_enqueue_script( 'visualizer-pointer', VISUALIZER_ABSURL."js/visualizer-pointer.js", array( 'wp-pointer' ),Visualizer_Plugin::VERSION );
295 +
296 + // Add pointer options to script.
297 + wp_localize_script( 'visualizer-pointer', 'visualizer', $valid_pointers );
298 +
299 +
300 +
505 301 }
506 302
507 303 /**
508 304 * Adds visualizer tab for media upload tabs array.
@@ -509,16 +305,13 @@
509 305 *
510 306 * @since 1.0.0
511 307 *
512 308 * @access public
513 - *
514 309 * @param array $tabs The array of media upload tabs.
515 - *
516 310 * @return array Extended array of media upload tabs.
517 311 */
518 312 public function setupVisualizerTab( $tabs ) {
519 313 $tabs['visualizer'] = 'Visualizer';
520 -
521 314 return $tabs;
522 315 }
523 316
524 317 /**
@@ -528,34 +321,29 @@
528 321 *
529 322 * @access public
530 323 */
531 324 public function registerAdminMenu() {
532 - $title = esc_html__( 'Visualizer Library', 'visualizer' );
533 - $callback = array( $this, 'renderLibraryPage' );
325 + $title = esc_html__( 'Visualizer Library', Visualizer_Plugin::NAME );
326 + $callback = array( $this, 'renderLibraryPage' );
534 327 $this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
535 328 }
536 329
537 330 /**
538 - * Get the instance of WP_Query that fetches the charts as per the given criteria.
331 + * Renders visualizer library page.
332 + *
333 + * @since 1.0.0
334 + *
335 + * @access public
539 336 */
540 - private function getQuery() {
541 - static $q;
542 - if ( ! is_null( $q ) ) {
543 - return $q;
544 - }
545 -
337 + public function renderLibraryPage() {
546 338 // get current page
547 - $page = filter_input(
548 - INPUT_GET,
549 - 'vpage',
550 - FILTER_VALIDATE_INT,
551 - array(
552 - 'options' => array(
553 - 'min_range' => 1,
554 - 'default' => 1,
555 - ),
339 + $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
340 + 'options' => array(
341 + 'min_range' => 1,
342 + 'default' => 1,
556 343 )
557 - );
344 + ) );
345 +
558 346 // the initial query arguments to fetch charts
559 347 $query_args = array(
560 348 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
561 349 'posts_per_page' => 6,
@@ -560,8 +348,9 @@
560 348 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
561 349 'posts_per_page' => 6,
562 350 'paged' => $page,
563 351 );
352 +
564 353 // add chart type filter to the query arguments
565 354 $filter = filter_input( INPUT_GET, 'type' );
566 355 if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
567 356 $query_args['meta_query'] = array(
@@ -573,140 +362,72 @@
573 362 );
574 363 } else {
575 364 $filter = 'all';
576 365 }
577 - // Added by Ash/Upwork
578 - $filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
579 - if ( $filterByMeta ) {
580 - $query = array(
581 - 'key' => Visualizer_Plugin::CF_SETTINGS,
582 - 'value' => $filterByMeta,
583 - 'compare' => 'LIKE',
584 - );
585 - $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
586 - $meta[] = $query;
587 - $query_args['meta_query'] = $meta;
588 - }
589 - $q = new WP_Query( $query_args );
590 - return $q;
591 - }
592 366
593 - /**
594 - * Renders visualizer library page.
595 - *
596 - * @since 1.0.0
597 - *
598 - * @access public
599 - */
600 - public function renderLibraryPage() {
367 + // Added by Ash/Upwork
368 + $filterByMeta = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
369 + if($filterByMeta){
370 + $query = array(
371 + 'key' => Visualizer_Plugin::CF_SETTINGS,
372 + 'value' => $filterByMeta,
373 + 'compare' => 'LIKE',
374 + );
375 + $meta = isset($query_args['meta_query']) ? $query_args['meta_query'] : array();
376 + $meta[] = $query;
377 + $query_args['meta_query'] = $meta;
378 + }
379 + // Added by Ash/Upwork
380 +
381 + // fetch charts
601 382 $charts = array();
602 - $query = $this->getQuery();
603 -
604 - // get current page
605 - $page = filter_input(
606 - INPUT_GET,
607 - 'vpage',
608 - FILTER_VALIDATE_INT,
609 - array(
610 - 'options' => array(
611 - 'min_range' => 1,
612 - 'default' => 1,
613 - ),
614 - )
615 - );
616 - // add chart type filter to the query arguments
617 - $filter = filter_input( INPUT_GET, 'type' );
618 - if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
619 - $filter = 'all';
620 - }
621 -
622 - $css = '';
623 - while ( $query->have_posts() ) {
383 + $query = new WP_Query( $query_args );
384 + while( $query->have_posts() ) {
624 385 $chart = $query->next_post();
625 386
626 - // if the user has updated a chart and instead of saving it, has closed the modal. If the user refreshes, they should get the original chart.
627 - $chart = $this->handleExistingRevisions( $chart->ID, $chart );
628 - // refresh a "live" db query chart.
629 - $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
630 -
631 - $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
632 -
633 387 // fetch and update settings
634 388 $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
389 + unset( $settings['height'], $settings['width'] );
635 390
636 - $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
637 - if ( ! empty( $atts['settings'] ) ) {
638 - $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
639 - }
640 -
641 - unset( $settings['height'], $settings['width'] );
391 + $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
642 392 $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
643 - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
393 + $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
644 394
645 - $library = $this->load_chart_type( $chart->ID );
646 -
647 - $id = 'visualizer-' . $chart->ID;
648 - $arguments = $this->get_inline_custom_css( $id, $settings );
649 - if ( ! empty( $arguments ) ) {
650 - $css .= $arguments[0];
651 - $settings = $arguments[1];
652 - }
653 -
654 395 // add chart to the array
655 - $charts[ $id ] = array(
396 + $charts['visualizer-' . $chart->ID] = array(
656 397 'id' => $chart->ID,
657 398 'type' => $type,
658 399 'series' => $series,
659 400 'settings' => $settings,
660 401 'data' => $data,
661 - 'library' => $library,
662 402 );
663 403 }
404 +
664 405 // enqueue charts array
665 406 $ajaxurl = admin_url( 'admin-ajax.php' );
666 - wp_localize_script(
667 - 'visualizer-library',
668 - 'visualizer',
669 - array(
670 - 'language' => $this->get_language(),
671 - 'map_api_key' => get_option( 'visualizer-map-api-key' ),
672 - 'charts' => $charts,
673 - 'urls' => array(
674 - 'base' => add_query_arg( 'vpage', false ),
675 - 'create' => add_query_arg(
676 - array(
677 - 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
678 - 'library' => 'yes',
679 - 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
680 - ),
681 - $ajaxurl
682 - ),
683 - 'edit' => add_query_arg(
684 - array(
685 - 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
686 - 'library' => 'yes',
687 - ),
688 - $ajaxurl
689 - ),
690 - ),
691 - 'page_type' => 'library',
692 - )
693 - );
407 + wp_localize_script( 'visualizer-library', 'visualizer', array(
408 + 'charts' => $charts,
409 + 'urls' => array(
410 + 'base' => add_query_arg( 'vpage', false ),
411 + 'create' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, 'library' => 'yes' ), $ajaxurl ),
412 + 'edit' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
413 + ),
414 + ) );
415 +
694 416 // render library page
695 - $render = new Visualizer_Render_Library();
696 - $render->charts = $charts;
697 - $render->type = $filter;
698 - $render->types = self::_getChartTypesLocalized( false, false, false, true );
699 - $render->custom_css = $css;
700 - $render->pagination = paginate_links(
701 - array(
702 - 'base' => add_query_arg( 'vpage', '%#%' ),
703 - 'format' => '',
704 - 'current' => $page,
705 - 'total' => $query->max_num_pages,
706 - 'type' => 'array',
707 - )
708 - );
417 + $render = new Visualizer_Render_Library();
418 +
419 + $render->charts = $charts;
420 + $render->type = $filter;
421 + $render->types = self::_getChartTypesLocalized();
422 + $render->pagination = paginate_links( array(
423 + 'base' => add_query_arg( 'vpage', '%#%' ),
424 + 'format' => '',
425 + 'current' => $page,
426 + 'total' => $query->max_num_pages,
427 + 'type' => 'array',
428 + ) );
429 +
709 430 $render->render();
710 431 }
711 432
712 433 /**
@@ -714,12 +435,10 @@
714 435 *
715 436 * @since 1.0.0
716 437 *
717 438 * @access public
718 - *
719 - * @param array $links The array of original action links.
439 + * @param array $links The array of original action links.
720 440 * @param string $file The plugin basename.
721 - *
722 441 * @return array Updated array of action links.
723 442 */
724 443 public function getPluginActionLinks( $links, $file ) {
725 444 if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
@@ -727,9 +446,9 @@
727 446 $links,
728 447 sprintf(
729 448 '<a href="%s">%s</a>',
730 449 admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
731 - esc_html__( 'Library', 'visualizer' )
450 + esc_html__( 'Library', Visualizer_Plugin::NAME )
732 451 )
733 452 );
734 453 }
735 454
@@ -741,12 +460,10 @@
741 460 *
742 461 * @since 1.0.0
743 462 *
744 463 * @access public
745 - *
746 - * @param array $plugin_meta The array of a plugin meta links.
464 + * @param array $plugin_meta The array of a plugin meta links.
747 465 * @param string $plugin_file The plugin's basename.
748 - *
749 466 * @return array Updated array of plugin meta links.
750 467 */
751 468 public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
752 469 if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
@@ -752,14 +469,14 @@
752 469 if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
753 470 // knowledge base link
754 471 $plugin_meta[] = sprintf(
755 472 '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
756 - esc_html__( 'Knowledge Base', 'visualizer' )
473 + esc_html__( 'Knowledge Base', Visualizer_Plugin::NAME )
757 474 );
758 475 // flattr link
759 476 $plugin_meta[] = sprintf(
760 477 '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
761 - esc_html__( 'Pro Addon', 'visualizer' )
478 + esc_html__( 'Pro Addon', Visualizer_Plugin::NAME )
762 479 );
763 480 }
764 481
765 482 return $plugin_meta;
@@ -764,5 +481,5 @@
764 481
765 482 return $plugin_meta;
766 483 }
767 484
768 -}
485 +}