← All changes | classes/Visualizer/Module/Admin.php +110 -334 3.0.8 → 1.7.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 |
		@@ -45,163 +46,74 @@
45	46	*
46	47	* @since 1.0.0
47	48	*
48	49	* @access public
49		- *
50	50	* @param Visualizer_Plugin $plugin The instance of the plugin.
51	51	*/
52	52	public function __construct( Visualizer_Plugin $plugin ) {
53	53	parent::__construct( $plugin );
	54	+
54	55	$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
55	56	$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
56	57	$this->_addAction( 'admin_footer', 'renderTempaltes' );
57		- $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
	58	+ $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts' );
58	59	$this->_addAction( 'admin_menu', 'registerAdminMenu' );
	60	+
59	61	$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
60	62	$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' );
	63	+ $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
71	64	}
72	65
73	66	/**
74		- * No limits on revisions.
	67	+ * Returns associated array of chart types and localized names.
	68	+ *
	69	+ * @since 1.0.0
	70	+ *
	71	+ * @static
	72	+ * @access private
	73	+ * @return array The associated array of chart types with localized names.
75	74	*/
76		- public function limitRevisions( $num, $post ) {
77		- if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
78		- return -1;
79		- }
80		- return $num;
81		- }
	75	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
	76	+ $types = array(
	77	+ 'pie' => array( 'name' => esc_html__( 'Pie', 'visualizer' ), 'enabled' => true ),
	78	+ 'line' => array( 'name' => esc_html__( 'Line', 'visualizer' ), 'enabled' => true ),
	79	+ 'area' => array( 'name' => esc_html__( 'Area', 'visualizer' ), 'enabled' => true ),
	80	+ 'geo' => array( 'name' => esc_html__( 'Geo', 'visualizer' ), 'enabled' => true ),
	81	+ 'bar' => array( 'name' => esc_html__( 'Bar', 'visualizer' ), 'enabled' => true ),
	82	+ 'column' => array( 'name' => esc_html__( 'Column', 'visualizer' ), 'enabled' => true ),
	83	+ 'gauge' => array( 'name' => esc_html__( 'Gauge', 'visualizer' ), 'enabled' => true ),
	84	+ 'scatter' => array( 'name' => esc_html__( 'Scatter', 'visualizer' ), 'enabled' => true ),
	85	+ 'candlestick' => array( 'name' => esc_html__( 'Candlestick', 'visualizer' ), 'enabled' => true ),
	86	+ // pro types
	87	+ 'table' => array( 'name' => esc_html__( 'Table', 'visualizer' ), 'enabled' => false ),
	88	+ 'timeline' => array( 'name' => esc_html__( 'Timeline', 'visualizer' ), 'enabled' => false ),
	89	+ 'combo' => array( 'name' => esc_html__( 'Combo', 'visualizer' ), 'enabled' => false ),
	90	+ );
82	91
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 );
	92	+ $types = apply_filters( 'visualizer_pro_chart_types', $types );
91	93
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		- }
	94	+ if ( $enabledOnly ) {
	95	+ $filtered = array();
	96	+ foreach ( $types as $type => $array ) {
	97	+ if ( ! $array['enabled'] ) { continue;
97	98	}
	99	+ $filtered[ $type ] = $array;
98	100	}
	101	+ $types = $filtered;
99	102	}
100		- }
101	103
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 );
109		-
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		- }
	104	+ if ( $get2Darray ) {
	105	+ $doubleD = array();
	106	+ foreach ( $types as $type => $array ) {
	107	+ $doubleD[ $type ] = $array['name'];
118	108	}
119		-
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		- }
	109	+ $types = $doubleD;
127	110	}
128		- }
129	111
130		- /**
131		- * Admin init.
132		- *
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		- }
	112	+ return $types;
141	113	}
142	114
143	115	/**
144		- * Load plugin translation for - TinyMCE API
145		- *
146		- * @access public
147		- * @param array $arr The tinymce_lang array.
148		- * @return array
149		- */
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;
155		- }
156		-
157		- /**
158		- * Load custom js options - TinyMCE API
159		- *
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
171		- *
172		- * @access public
173		- * @param array $buttons The tinymce buttons array.
174		- * @return array
175		- */
176		- public function register_mce_button( $buttons ) {
177		- array_push( $buttons, 'visualizer_mce_button' );
178		- return $buttons;
179		- }
180		-
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		- );
196		-
197		- if ( $query->have_posts() && $query->post_count > 0 ) {
198		- return true;
199		- }
200		- return false;
201		- }
202		-
203		- /**
204	116	* Enqueues media scripts and styles.
205	117	*
206	118	* @since 1.0.0
207	119	* @uses wp_enqueue_style To enqueue style file.
		@@ -210,25 +122,20 @@
210	122	* @access public
211	123	*/
212	124	public function enqueueMediaScripts() {
213	125	global $typenow;
	126	+
214	127	if ( post_type_supports( $typenow, 'editor' ) ) {
215	128	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216		- wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
217		- wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
218		- wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
219		- wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
	129	+
	130	+ wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
	131	+ wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
	132	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
	133	+ wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
220	134	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
221		- wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
222		- wp_localize_script(
223		- 'visualizer-media-view', 'visualizer', array(
224		- 'i10n' => array(
225		- 'insert' => __( 'Insert', 'visualizer' ),
226		- ),
227		- )
228		- );
229		- wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
230		- wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
	135	+ wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
	136	+ wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
	137	+ wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
231	138	}
232	139	}
233	140
234	141	/**
		@@ -236,17 +143,14 @@
236	143	*
237	144	* @since 1.0.0
238	145	*
239	146	* @access public
240		- *
241	147	* @param array $strings The array of media view strings.
242		- *
243	148	* @return array The extended array of media view strings.
244	149	*/
245	150	public function setupMediaViewStrings( $strings ) {
246		- $chart_types = self::_getChartTypesLocalized( true, true, true );
247	151	$strings['visualizer'] = array(
248		- 'actions' => array(
	152	+ 'actions' => array(
249	153	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
250	154	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
251	155	),
252	156	'controller' => array(
		@@ -251,18 +155,18 @@
251	155	),
252	156	'controller' => array(
253	157	'title' => esc_html__( 'Visualizations', 'visualizer' ),
254	158	),
255		- 'routers' => array(
	159	+ 'routers' => array(
256	160	'library' => esc_html__( 'From Library', 'visualizer' ),
257	161	'create' => esc_html__( 'Create New', 'visualizer' ),
258	162	),
259		- 'library' => array(
260		- 'filters' => $chart_types,
261		- 'types' => array_keys( $chart_types ),
	163	+ 'library' => array(
	164	+ 'filters' => self::_getChartTypesLocalized( true, true ),
	165	+ 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
262	166	),
263		- 'nonce' => wp_create_nonce(),
264		- 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
	167	+ 'nonce' => wp_create_nonce(),
	168	+ 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
265	169	);
266	170
267	171	return $strings;
268	172	}
		@@ -267,109 +171,8 @@
267	171	return $strings;
268	172	}
269	173
270	174	/**
271		- * Returns associated array of chart types and localized names.
272		- *
273		- * @since 1.0.0
274		- *
275		- * @static
276		- * @access private
277		- * @return array The associated array of chart types with localized names.
278		- */
279		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
280		- $additional = array();
281		- if ( $add_select ) {
282		- $additional['select'] = array(
283		- 'name' => esc_html__( 'All', 'visualizer' ),
284		- 'enabled' => true,
285		- );
286		- }
287		-
288		- $types = array_merge(
289		- $additional, array(
290		- 'pie' => array(
291		- 'name' => esc_html__( 'Pie', 'visualizer' ),
292		- 'enabled' => true,
293		- ),
294		- 'line' => array(
295		- 'name' => esc_html__( 'Line', 'visualizer' ),
296		- 'enabled' => true,
297		- ),
298		- 'area' => array(
299		- 'name' => esc_html__( 'Area', 'visualizer' ),
300		- 'enabled' => true,
301		- ),
302		- 'geo' => array(
303		- 'name' => esc_html__( 'Geo', 'visualizer' ),
304		- 'enabled' => true,
305		- ),
306		- 'bar' => array(
307		- 'name' => esc_html__( 'Bar', 'visualizer' ),
308		- 'enabled' => true,
309		- ),
310		- 'column' => array(
311		- 'name' => esc_html__( 'Column', 'visualizer' ),
312		- 'enabled' => true,
313		- ),
314		- 'gauge' => array(
315		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
316		- 'enabled' => true,
317		- ),
318		- 'scatter' => array(
319		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
320		- 'enabled' => true,
321		- ),
322		- 'candlestick' => array(
323		- 'name' => esc_html__( 'Candlestick', 'visualizer' ),
324		- 'enabled' => true,
325		- ),
326		- // pro types
327		- 'table' => array(
328		- 'name' => esc_html__( 'Table', 'visualizer' ),
329		- 'enabled' => false,
330		- ),
331		- 'timeline' => array(
332		- 'name' => esc_html__( 'Timeline', 'visualizer' ),
333		- 'enabled' => false,
334		- ),
335		- 'combo' => array(
336		- 'name' => esc_html__( 'Combo', 'visualizer' ),
337		- 'enabled' => false,
338		- ),
339		- )
340		- );
341		- $types = apply_filters( 'visualizer_pro_chart_types', $types );
342		- if ( $enabledOnly ) {
343		- $filtered = array();
344		- foreach ( $types as $type => $array ) {
345		- if ( ! is_array( $array ) ) {
346		- // support for old pro
347		- $array = array( 'enabled' => true, 'name' => $array );
348		- }
349		- if ( ! $array['enabled'] ) {
350		- continue;
351		- }
352		- $filtered[ $type ] = $array;
353		- }
354		- $types = $filtered;
355		- }
356		- if ( $get2Darray ) {
357		- $doubleD = array();
358		- foreach ( $types as $type => $array ) {
359		- if ( ! is_array( $array ) ) {
360		- // support for old pro
361		- $array = array( 'enabled' => true, 'name' => $array );
362		- }
363		- $doubleD[ $type ] = $array['name'];
364		- }
365		- $types = $doubleD;
366		- }
367		-
368		- return $types;
369		- }
370		-
371		- /**
372	175	* Renders templates to use in media popup.
373	176	*
374	177	* @since 1.0.0
375	178	* @global string $pagenow The name of the current page.
		@@ -377,11 +180,13 @@
377	180	* @access public
378	181	*/
379	182	public function renderTempaltes() {
380	183	global $pagenow;
	184	+
381	185	if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
382	186	return;
383	187	}
	188	+
384	189	$render = new Visualizer_Render_Templates();
385	190	$render->render();
386	191	}
387	192
		@@ -393,30 +198,21 @@
393	198	* @uses wp_enqueue_script() To enqueue javascript file.
394	199	* @uses wp_enqueue_media() To enqueue media stuff.
395	200	*
396	201	* @access public
397		- *
398	202	* @param string $suffix The current page suffix.
399	203	*/
400	204	public function enqueueLibraryScripts( $suffix ) {
401	205	if ( $suffix == $this->_libraryPage ) {
402	206	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
	207	+
403	208	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
	209	+
404	210	wp_enqueue_media();
405		- wp_enqueue_script(
406		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
407		- 'jquery',
408		- 'media-views',
409		- ), Visualizer_Plugin::VERSION, true
410		- );
	211	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
411	212	wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
412	213	wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
413		- wp_enqueue_script(
414		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
415		- 'google-jsapi-old',
416		- 'visualizer-library',
417		- ), Visualizer_Plugin::VERSION, true
418		- );
	214	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
419	215	}
420	216	}
421	217
422	218	/**
		@@ -424,16 +220,13 @@
424	220	*
425	221	* @since 1.0.0
426	222	*
427	223	* @access public
428		- *
429	224	* @param array $tabs The array of media upload tabs.
430		- *
431	225	* @return array Extended array of media upload tabs.
432	226	*/
433	227	public function setupVisualizerTab( $tabs ) {
434	228	$tabs['visualizer'] = 'Visualizer';
435		-
436	229	return $tabs;
437	230	}
438	231
439	232	/**
		@@ -443,10 +236,10 @@
443	236	*
444	237	* @access public
445	238	*/
446	239	public function registerAdminMenu() {
447		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
448		- $callback = array( $this, 'renderLibraryPage' );
	240	+ $title = esc_html__( 'Visualizer Library', 'visualizer' );
	241	+ $callback = array( $this, 'renderLibraryPage' );
449	242	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
450	243	}
451	244
452	245	/**
		@@ -457,16 +250,15 @@
457	250	* @access public
458	251	*/
459	252	public function renderLibraryPage() {
460	253	// get current page
461		- $page = filter_input(
462		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
463		- 'options' => array(
464		- 'min_range' => 1,
465		- 'default' => 1,
466		- ),
467		- )
468		- );
	254	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	255	+ 'options' => array(
	256	+ 'min_range' => 1,
	257	+ 'default' => 1,
	258	+ ),
	259	+ ) );
	260	+
469	261	// the initial query arguments to fetch charts
470	262	$query_args = array(
471	263	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
472	264	'posts_per_page' => 6,
		@@ -471,8 +263,9 @@
471	263	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
472	264	'posts_per_page' => 6,
473	265	'paged' => $page,
474	266	);
	267	+
475	268	// add chart type filter to the query arguments
476	269	$filter = filter_input( INPUT_GET, 'type' );
477	270	if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
478	271	$query_args['meta_query'] = array(
		@@ -484,36 +277,36 @@
484	277	);
485	278	} else {
486	279	$filter = 'all';
487	280	}
	281	+
488	282	// Added by Ash/Upwork
489		- $filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
	283	+ $filterByMeta = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
490	284	if ( $filterByMeta ) {
491		- $query = array(
492		- 'key' => Visualizer_Plugin::CF_SETTINGS,
493		- 'value' => $filterByMeta,
494		- 'compare' => 'LIKE',
	285	+ $query = array(
	286	+ 'key' => Visualizer_Plugin::CF_SETTINGS,
	287	+ 'value' => $filterByMeta,
	288	+ 'compare' => 'LIKE',
495	289	);
496		- $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
497		- $meta[] = $query;
498		- $query_args['meta_query'] = $meta;
	290	+ $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
	291	+ $meta[] = $query;
	292	+ $query_args['meta_query'] = $meta;
499	293	}
500	294	// Added by Ash/Upwork
501	295	// fetch charts
502	296	$charts = array();
503		- $query = new WP_Query( $query_args );
	297	+ $query = new WP_Query( $query_args );
504	298	while ( $query->have_posts() ) {
505	299	$chart = $query->next_post();
506	300
507		- // 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.
508		- $chart = $this->handleExistingRevisions( $chart->ID, $chart );
509		-
510	301	// fetch and update settings
511	302	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
512	303	unset( $settings['height'], $settings['width'] );
513		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	304	+
	305	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
514	306	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
515		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	307	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
	308	+
516	309	// add chart to the array
517	310	$charts[ 'visualizer-' . $chart->ID ] = array(
518	311	'id' => $chart->ID,
519	312	'type' => $type,
		@@ -521,47 +314,34 @@
521	314	'settings' => $settings,
522	315	'data' => $data,
523	316	);
524	317	}
	318	+
525	319	// enqueue charts array
526	320	$ajaxurl = admin_url( 'admin-ajax.php' );
527		- wp_localize_script(
528		- 'visualizer-library', 'visualizer', array(
529		- 'language' => $this->get_language(),
530		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
531		- 'charts' => $charts,
532		- 'urls' => array(
533		- 'base' => add_query_arg( 'vpage', false ),
534		- 'create' => add_query_arg(
535		- array(
536		- 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
537		- 'library' => 'yes',
538		- 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
539		- ), $ajaxurl
540		- ),
541		- 'edit' => add_query_arg(
542		- array(
543		- 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
544		- 'library' => 'yes',
545		- ), $ajaxurl
546		- ),
547		- ),
548		- )
549		- );
	321	+ wp_localize_script( 'visualizer-library', 'visualizer', array(
	322	+ 'charts' => $charts,
	323	+ 'urls' => array(
	324	+ 'base' => add_query_arg( 'vpage', false ),
	325	+ 'create' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, 'library' => 'yes' ), $ajaxurl ),
	326	+ 'edit' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
	327	+ ),
	328	+ ) );
	329	+
550	330	// render library page
551		- $render = new Visualizer_Render_Library();
552		- $render->charts = $charts;
553		- $render->type = $filter;
554		- $render->types = self::_getChartTypesLocalized();
555		- $render->pagination = paginate_links(
556		- array(
557		- 'base' => add_query_arg( 'vpage', '%#%' ),
558		- 'format' => '',
559		- 'current' => $page,
560		- 'total' => $query->max_num_pages,
561		- 'type' => 'array',
562		- )
563		- );
	331	+ $render = new Visualizer_Render_Library();
	332	+
	333	+ $render->charts = $charts;
	334	+ $render->type = $filter;
	335	+ $render->types = self::_getChartTypesLocalized();
	336	+ $render->pagination = paginate_links( array(
	337	+ 'base' => add_query_arg( 'vpage', '%#%' ),
	338	+ 'format' => '',
	339	+ 'current' => $page,
	340	+ 'total' => $query->max_num_pages,
	341	+ 'type' => 'array',
	342	+ ) );
	343	+
564	344	$render->render();
565	345	}
566	346
567	347	/**
		@@ -569,12 +349,10 @@
569	349	*
570	350	* @since 1.0.0
571	351	*
572	352	* @access public
573		- *
574	353	* @param array $links The array of original action links.
575	354	* @param string $file The plugin basename.
576		- *
577	355	* @return array Updated array of action links.
578	356	*/
579	357	public function getPluginActionLinks( $links, $file ) {
580	358	if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
		@@ -596,12 +374,10 @@
596	374	*
597	375	* @since 1.0.0
598	376	*
599	377	* @access public
600		- *
601	378	* @param array $plugin_meta The array of a plugin meta links.
602	379	* @param string $plugin_file The plugin's basename.
603		- *
604	380	* @return array Updated array of plugin meta links.
605	381	*/
606	382	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
607	383	if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {