← All changes | classes/Visualizer/Module/Admin.php +122 -439 3.1.1 → 2.1.1 View file →

		@@ -52,156 +52,32 @@
52	52	public function __construct( Visualizer_Plugin $plugin ) {
53	53	parent::__construct( $plugin );
54	54	$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
55	55	$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
56		- $this->_addAction( 'admin_footer', 'renderTemplates' );
57		- $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
	56	+ $this->_addAction( 'admin_footer', 'renderTempaltes' );
	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		- // 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' );
	61	+ $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
	62	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_TRACK, 'visualizer_enable_track' );
71	63	}
72	64
73	65	/**
74		- * No limits on revisions.
	66	+ * Enable track ajax action.
75	67	*/
76		- public function limitRevisions( $num, $post ) {
77		- if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
78		- return -1;
	68	+ public function visualizer_enable_track() {
	69	+ check_admin_referer( Visualizer_Plugin::ACTION_TRACK, 'nonce' );
	70	+ $status = $_GET['status'];
	71	+ if ( $status == 'yes' ) {
	72	+ update_option( 'visualizer_logger_flag', 'yes' );
	73	+ } else {
	74	+ update_option( 'visualizer_logger_flag', 'no' );
79	75	}
80		- return $num;
	76	+ wp_send_json_success( array( 'status' => $status ) );
81	77	}
82	78
83	79	/**
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 );
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		- }
101		-
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		- }
118		- }
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		- }
127		- }
128		- }
129		-
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		- }
141		- }
142		-
143		- /**
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	80	* Enqueues media scripts and styles.
205	81	*
206	82	* @since 1.0.0
207	83	* @uses wp_enqueue_style To enqueue style file.
		@@ -212,26 +88,14 @@
212	88	public function enqueueMediaScripts() {
213	89	global $typenow;
214	90	if ( post_type_supports( $typenow, 'editor' ) ) {
215	91	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216		-
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 );
	92	+ wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
	93	+ wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
	94	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
222	95	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
223	96	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
224	97	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	98	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
235	99	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
236	100	}
237	101	}
		@@ -247,9 +111,8 @@
247	111	*
248	112	* @return array The extended array of media view strings.
249	113	*/
250	114	public function setupMediaViewStrings( $strings ) {
251		- $chart_types = self::_getChartTypesLocalized( true, true, true );
252	115	$strings['visualizer'] = array(
253	116	'actions' => array(
254	117	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
255	118	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -261,10 +124,10 @@
261	124	'library' => esc_html__( 'From Library', 'visualizer' ),
262	125	'create' => esc_html__( 'Create New', 'visualizer' ),
263	126	),
264	127	'library' => array(
265		- 'filters' => $chart_types,
266		- 'types' => array_keys( $chart_types ),
	128	+ 'filters' => self::_getChartTypesLocalized( true, true ),
	129	+ 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
267	130	),
268	131	'nonce' => wp_create_nonce(),
269	132	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
270	133	);
		@@ -280,74 +143,59 @@
280	143	* @static
281	144	* @access private
282	145	* @return array The associated array of chart types with localized names.
283	146	*/
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' ),
	147	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
	148	+ $types = array(
	149	+ 'pie' => array(
	150	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
289	151	'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		- 'scatter' => array(
325		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
326		- 'enabled' => true,
327		- ),
328		- 'gauge' => array(
329		- 'name' => esc_html__( 'Gauge', '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		- )
	152	+ ),
	153	+ 'line' => array(
	154	+ 'name' => esc_html__( 'Line', 'visualizer' ),
	155	+ 'enabled' => true,
	156	+ ),
	157	+ 'area' => array(
	158	+ 'name' => esc_html__( 'Area', 'visualizer' ),
	159	+ 'enabled' => true,
	160	+ ),
	161	+ 'geo' => array(
	162	+ 'name' => esc_html__( 'Geo', 'visualizer' ),
	163	+ 'enabled' => true,
	164	+ ),
	165	+ 'bar' => array(
	166	+ 'name' => esc_html__( 'Bar', 'visualizer' ),
	167	+ 'enabled' => true,
	168	+ ),
	169	+ 'column' => array(
	170	+ 'name' => esc_html__( 'Column', 'visualizer' ),
	171	+ 'enabled' => true,
	172	+ ),
	173	+ 'gauge' => array(
	174	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	175	+ 'enabled' => true,
	176	+ ),
	177	+ 'scatter' => array(
	178	+ 'name' => esc_html__( 'Scatter', 'visualizer' ),
	179	+ 'enabled' => true,
	180	+ ),
	181	+ 'candlestick' => array(
	182	+ 'name' => esc_html__( 'Candlestick', 'visualizer' ),
	183	+ 'enabled' => true,
	184	+ ),
	185	+ // pro types
	186	+ 'table' => array(
	187	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	188	+ 'enabled' => false,
	189	+ ),
	190	+ 'timeline' => array(
	191	+ 'name' => esc_html__( 'Timeline', 'visualizer' ),
	192	+ 'enabled' => false,
	193	+ ),
	194	+ 'combo' => array(
	195	+ 'name' => esc_html__( 'Combo', 'visualizer' ),
	196	+ 'enabled' => false,
	197	+ ),
350	198	);
351	199	$types = apply_filters( 'visualizer_pro_chart_types', $types );
352	200	if ( $enabledOnly ) {
353	201	$filtered = array();
		@@ -374,83 +222,8 @@
374	222	}
375	223	$types = $doubleD;
376	224	}
377	225
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		- if ( $get2Darray ) {
403		- $deprecated[] = 'gauge';
404		- } else {
405		- $types['gauge']['enabled'] = false;
406		- }
407		- }
408		- if ( ! self::hasChartType( 'candlestick' ) ) {
409		- if ( $get2Darray ) {
410		- $deprecated[] = 'candlestick';
411		- } else {
412		- $types['candlestick']['enabled'] = false;
413		- }
414		- }
415		- }
416		- break;
417		- default:
418		- // remove the option to create a Google Table chart.
419		- $deprecated[] = 'table';
420		-
421		- // rename the new table chart type.
422		- if ( $get2Darray ) {
423		- $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
424		- } else {
425		- $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
426		- }
427		-
428		- // if a user has a Gauge/Candlestick chart, then let them keep using it.
429		- if ( ! VISUALIZER_PRO ) {
430		- if ( ! self::hasChartType( 'gauge' ) ) {
431		- if ( $get2Darray ) {
432		- $deprecated[] = 'gauge';
433		- } else {
434		- $types['gauge']['enabled'] = false;
435		- }
436		- }
437		- if ( ! self::hasChartType( 'candlestick' ) ) {
438		- if ( $get2Darray ) {
439		- $deprecated[] = 'candlestick';
440		- } else {
441		- $types['candlestick']['enabled'] = false;
442		- }
443		- }
444		- }
445		- }
446		-
447		- if ( $deprecated ) {
448		- foreach ( $deprecated as $type ) {
449		- unset( $types[ $type ] );
450		- }
451		- }
452		-
453	226	return $types;
454	227	}
455	228
456	229	/**
		@@ -460,9 +233,9 @@
460	233	* @global string $pagenow The name of the current page.
461	234	*
462	235	* @access public
463	236	*/
464		- public function renderTemplates() {
	237	+ public function renderTempaltes() {
465	238	global $pagenow;
466	239	if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
467	240	return;
468	241	}
		@@ -486,36 +259,18 @@
486	259	if ( $suffix == $this->_libraryPage ) {
487	260	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
488	261	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
489	262	wp_enqueue_media();
490		- wp_enqueue_script(
	263	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	264	+ 'jquery',
	265	+ 'media-views',
	266	+ ), Visualizer_Plugin::VERSION, true );
	267	+ wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	268	+ wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
	269	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
	270	+ 'google-jsapi-old',
491	271	'visualizer-library',
492		- VISUALIZER_ABSURL . 'js/library.js',
493		- array(
494		- 'jquery',
495		- 'media-views',
496		- ),
497		- Visualizer_Plugin::VERSION,
498		- true
499		- );
500		-
501		- wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
502		-
503		- $query = $this->getQuery();
504		- while ( $query->have_posts() ) {
505		- $chart = $query->next_post();
506		- $library = $this->load_chart_type( $chart->ID );
507		- if ( is_null( $library ) ) {
508		- continue;
509		- }
510		- wp_enqueue_script(
511		- "visualizer-render-$library",
512		- VISUALIZER_ABSURL . 'js/render-facade.js',
513		- apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
514		- Visualizer_Plugin::VERSION,
515		- true
516		- );
517		- }
	272	+ ), Visualizer_Plugin::VERSION, true );
518	273	}
519	274	}
520	275
521	276	/**
		@@ -548,28 +303,22 @@
548	303	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
549	304	}
550	305
551	306	/**
552		- * Get the instance of WP_Query that fetches the charts as per the given criteria.
	307	+ * Renders visualizer library page.
	308	+ *
	309	+ * @since 1.0.0
	310	+ *
	311	+ * @access public
553	312	*/
554		- private function getQuery() {
555		- static $q;
556		- if ( ! is_null( $q ) ) {
557		- return $q;
558		- }
559		-
	313	+ public function renderLibraryPage() {
560	314	// get current page
561		- $page = filter_input(
562		- INPUT_GET,
563		- 'vpage',
564		- FILTER_VALIDATE_INT,
565		- array(
566		- 'options' => array(
567		- 'min_range' => 1,
568		- 'default' => 1,
569		- ),
570		- )
571		- );
	315	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	316	+ 'options' => array(
	317	+ 'min_range' => 1,
	318	+ 'default' => 1,
	319	+ ),
	320	+ ) );
572	321	// the initial query arguments to fetch charts
573	322	$query_args = array(
574	323	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
575	324	'posts_per_page' => 6,
		@@ -599,128 +348,62 @@
599	348	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
600	349	$meta[] = $query;
601	350	$query_args['meta_query'] = $meta;
602	351	}
603		- $q = new WP_Query( $query_args );
604		- return $q;
605		- }
606		-
607		- /**
608		- * Renders visualizer library page.
609		- *
610		- * @since 1.0.0
611		- *
612		- * @access public
613		- */
614		- public function renderLibraryPage() {
	352	+ // Added by Ash/Upwork
	353	+ // fetch charts
615	354	$charts = array();
616		- $query = $this->getQuery();
617		-
618		- // get current page
619		- $page = filter_input(
620		- INPUT_GET,
621		- 'vpage',
622		- FILTER_VALIDATE_INT,
623		- array(
624		- 'options' => array(
625		- 'min_range' => 1,
626		- 'default' => 1,
627		- ),
628		- )
629		- );
630		- // add chart type filter to the query arguments
631		- $filter = filter_input( INPUT_GET, 'type' );
632		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
633		- $filter = 'all';
634		- }
635		-
636		- $css = '';
	355	+ $query = new WP_Query( $query_args );
637	356	while ( $query->have_posts() ) {
638	357	$chart = $query->next_post();
639		-
640		- // 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.
641		- $chart = $this->handleExistingRevisions( $chart->ID, $chart );
642		- // refresh a "live" db query chart.
643		- $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
644		-
645		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
646		-
647	358	// fetch and update settings
648	359	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
649		-
650		- $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
651		- if ( ! empty( $atts['settings'] ) ) {
652		- $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
653		- }
654		-
655	360	unset( $settings['height'], $settings['width'] );
	361	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
656	362	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
657	363	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
658		-
659		- $library = $this->load_chart_type( $chart->ID );
660		-
661		- $id = 'visualizer-' . $chart->ID;
662		- $arguments = $this->get_inline_custom_css( $id, $settings );
663		- if ( ! empty( $arguments ) ) {
664		- $css .= $arguments[0];
665		- $settings = $arguments[1];
666		- }
667		-
668	364	// add chart to the array
669		- $charts[ $id ] = array(
	365	+ $charts[ 'visualizer-' . $chart->ID ] = array(
670	366	'id' => $chart->ID,
671	367	'type' => $type,
672	368	'series' => $series,
673	369	'settings' => $settings,
674	370	'data' => $data,
675		- 'library' => $library,
676	371	);
677	372	}
678	373	// enqueue charts array
679	374	$ajaxurl = admin_url( 'admin-ajax.php' );
680		- wp_localize_script(
681		- 'visualizer-library',
682		- 'visualizer',
683		- array(
684		- 'language' => $this->get_language(),
685		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
686		- 'charts' => $charts,
687		- 'urls' => array(
688		- 'base' => add_query_arg( 'vpage', false ),
689		- 'create' => add_query_arg(
690		- array(
691		- 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
692		- 'library' => 'yes',
693		- 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
694		- ),
695		- $ajaxurl
696		- ),
697		- 'edit' => add_query_arg(
698		- array(
699		- 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
700		- 'library' => 'yes',
701		- ),
702		- $ajaxurl
703		- ),
704		- ),
705		- 'page_type' => 'library',
706		- )
707		- );
	375	+ wp_localize_script( 'visualizer-library', 'visualizer', array(
	376	+ 'charts' => $charts,
	377	+ 'urls' => array(
	378	+ 'base' => add_query_arg( 'vpage', false ),
	379	+ 'create' => add_query_arg( array(
	380	+ 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
	381	+ 'library' => 'yes',
	382	+ ), $ajaxurl ),
	383	+ 'edit' => add_query_arg( array(
	384	+ 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
	385	+ 'library' => 'yes',
	386	+ ), $ajaxurl ),
	387	+ 'logger' => add_query_arg( array(
	388	+ 'action' => Visualizer_Plugin::ACTION_TRACK,
	389	+ 'library' => 'yes',
	390	+ 'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_TRACK ),
	391	+ ), $ajaxurl ),
	392	+ ),
	393	+ ) );
708	394	// render library page
709	395	$render = new Visualizer_Render_Library();
710	396	$render->charts = $charts;
711	397	$render->type = $filter;
712		- $render->types = self::_getChartTypesLocalized( false, false, false, true );
713		- $render->custom_css = $css;
714		- $render->pagination = paginate_links(
715		- array(
716		- 'base' => add_query_arg( 'vpage', '%#%' ),
717		- 'format' => '',
718		- 'current' => $page,
719		- 'total' => $query->max_num_pages,
720		- 'type' => 'array',
721		- )
722		- );
	398	+ $render->types = self::_getChartTypesLocalized();
	399	+ $render->pagination = paginate_links( array(
	400	+ 'base' => add_query_arg( 'vpage', '%#%' ),
	401	+ 'format' => '',
	402	+ 'current' => $page,
	403	+ 'total' => $query->max_num_pages,
	404	+ 'type' => 'array',
	405	+ ) );
723	406	$render->render();
724	407	}
725	408
726	409	/**