← All changes | classes/Visualizer/Module/Admin.php +202 -346 3.0.8 → 1.5.5 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,112 @@
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	58	$this->_addAction( 'admin_footer', 'renderTempaltes' );
57		- $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
	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		- }
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		- )
	142	+ private static function _getChartTypesLocalized() {
	143	+ return 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__( 'Candelstick', Visualizer_Plugin::NAME ),
195	154	);
196		-
197		- if ( $query->have_posts() && $query->post_count > 0 ) {
198		- return true;
199		- }
200		- return false;
201	155	}
202	156
203	157	/**
204	158	* Enqueues media scripts and styles.
		@@ -210,25 +164,19 @@
210	164	* @access public
211	165	*/
212	166	public function enqueueMediaScripts() {
213	167	global $typenow;
	168	+
214	169	if ( post_type_supports( $typenow, 'editor' ) ) {
215	170	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 );
	171	+
	172	+ wp_enqueue_script( 'visualizer-google-jsapi', '//www.google.com/jsapi', array( 'media-editor' ), null, true );
	173	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi' ), Visualizer_Plugin::VERSION, true );
	174	+ wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
220	175	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 );
	176	+ wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
	177	+ wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
	178	+ wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
231	179	}
232	180	}
233	181
234	182	/**
		@@ -236,33 +184,29 @@
236	184	*
237	185	* @since 1.0.0
238	186	*
239	187	* @access public
240		- *
241	188	* @param array $strings The array of media view strings.
242		- *
243	189	* @return array The extended array of media view strings.
244	190	*/
245	191	public function setupMediaViewStrings( $strings ) {
246		- $chart_types = self::_getChartTypesLocalized( true, true, true );
247	192	$strings['visualizer'] = array(
248		- 'actions' => array(
	193	+ 'actions' => array(
249	194	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
250	195	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
251	196	),
252	197	'controller' => array(
253		- 'title' => esc_html__( 'Visualizations', 'visualizer' ),
	198	+ 'title' => esc_html__( 'Visualizations', Visualizer_Plugin::NAME ),
254	199	),
255		- 'routers' => array(
256		- 'library' => esc_html__( 'From Library', 'visualizer' ),
257		- 'create' => esc_html__( 'Create New', 'visualizer' ),
	200	+ 'routers' => array(
	201	+ 'library' => esc_html__( 'From Library', Visualizer_Plugin::NAME ),
	202	+ 'create' => esc_html__( 'Create New', Visualizer_Plugin::NAME ),
258	203	),
259		- 'library' => array(
260		- 'filters' => $chart_types,
261		- 'types' => array_keys( $chart_types ),
	204	+ 'library' => array(
	205	+ 'filters' => self::_getChartTypesLocalized(),
262	206	),
263		- 'nonce' => wp_create_nonce(),
264		- 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
	207	+ 'nonce' => wp_create_nonce(),
	208	+ 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
265	209	);
266	210
267	211	return $strings;
268	212	}
		@@ -267,109 +211,8 @@
267	211	return $strings;
268	212	}
269	213
270	214	/**
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	215	* Renders templates to use in media popup.
373	216	*
374	217	* @since 1.0.0
375	218	* @global string $pagenow The name of the current page.
		@@ -377,11 +220,13 @@
377	220	* @access public
378	221	*/
379	222	public function renderTempaltes() {
380	223	global $pagenow;
	224	+
381	225	if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
382	226	return;
383	227	}
	228	+
384	229	$render = new Visualizer_Render_Templates();
385	230	$render->render();
386	231	}
387	232
		@@ -393,31 +238,61 @@
393	238	* @uses wp_enqueue_script() To enqueue javascript file.
394	239	* @uses wp_enqueue_media() To enqueue media stuff.
395	240	*
396	241	* @access public
397		- *
398	242	* @param string $suffix The current page suffix.
399	243	*/
400	244	public function enqueueLibraryScripts( $suffix ) {
401	245	if ( $suffix == $this->_libraryPage ) {
402	246	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
	247	+
403	248	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
	249	+
404	250	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		- );
411		- wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
412		- 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		- );
	251	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
	252	+ wp_enqueue_script( 'google-jsapi', '//www.google.com/jsapi', array(), null, true );
	253	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
419	254	}
	255	+ if ( get_bloginfo( 'version' ) < '3.3' )
	256	+ return;
	257	+
	258	+
	259	+ // Get pointers for this screen
	260	+ $pointers = apply_filters( 'visualizer_admin_pointers', array() );
	261	+
	262	+ if ( ! $pointers || ! is_array( $pointers ) )
	263	+ return;
	264	+
	265	+ // Get dismissed pointers
	266	+ $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
	267	+ $valid_pointers =array();
	268	+ // Check pointers and remove dismissed ones.
	269	+ foreach ( $pointers as $pointer_id => $pointer ) {
	270	+
	271	+ // Sanity check
	272	+ if ( in_array( $pointer_id, $dismissed ) || empty( $pointer ) || empty( $pointer_id ) || empty( $pointer['target'] ) || empty( $pointer['options'] ) )
	273	+ continue;
	274	+
	275	+ $pointer['pointer_id'] = $pointer_id;
	276	+
	277	+ // Add the pointer to $valid_pointers array
	278	+ $valid_pointers['pointers'][] = $pointer;
	279	+ }
	280	+
	281	+ // No valid pointers? Stop here.
	282	+ if ( empty( $valid_pointers ) )
	283	+ return;
	284	+
	285	+ // Add pointers style to queue.
	286	+ wp_enqueue_style( 'wp-pointer' );
	287	+ // Add pointers script to queue. Add custom script.
	288	+ wp_enqueue_script( 'visualizer-pointer', VISUALIZER_ABSURL."js/visualizer-pointer.js", array( 'wp-pointer' ),Visualizer_Plugin::VERSION );
	289	+
	290	+ // Add pointer options to script.
	291	+ wp_localize_script( 'visualizer-pointer', 'visualizer', $valid_pointers );
	292	+
	293	+
	294	+
420	295	}
421	296
422	297	/**
423	298	* Adds visualizer tab for media upload tabs array.
		@@ -424,16 +299,13 @@
424	299	*
425	300	* @since 1.0.0
426	301	*
427	302	* @access public
428		- *
429	303	* @param array $tabs The array of media upload tabs.
430		- *
431	304	* @return array Extended array of media upload tabs.
432	305	*/
433	306	public function setupVisualizerTab( $tabs ) {
434	307	$tabs['visualizer'] = 'Visualizer';
435		-
436	308	return $tabs;
437	309	}
438	310
439	311	/**
		@@ -443,10 +315,10 @@
443	315	*
444	316	* @access public
445	317	*/
446	318	public function registerAdminMenu() {
447		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
448		- $callback = array( $this, 'renderLibraryPage' );
	319	+ $title = esc_html__( 'Visualizer Library', Visualizer_Plugin::NAME );
	320	+ $callback = array( $this, 'renderLibraryPage' );
449	321	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
450	322	}
451	323
452	324	/**
		@@ -457,16 +329,15 @@
457	329	* @access public
458	330	*/
459	331	public function renderLibraryPage() {
460	332	// 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		- ),
	333	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	334	+ 'options' => array(
	335	+ 'min_range' => 1,
	336	+ 'default' => 1,
467	337	)
468		- );
	338	+ ) );
	339	+
469	340	// the initial query arguments to fetch charts
470	341	$query_args = array(
471	342	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
472	343	'posts_per_page' => 6,
		@@ -471,8 +342,9 @@
471	342	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
472	343	'posts_per_page' => 6,
473	344	'paged' => $page,
474	345	);
	346	+
475	347	// add chart type filter to the query arguments
476	348	$filter = filter_input( INPUT_GET, 'type' );
477	349	if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
478	350	$query_args['meta_query'] = array(
		@@ -484,38 +356,39 @@
484	356	);
485	357	} else {
486	358	$filter = 'all';
487	359	}
488		- // Added by Ash/Upwork
489		- $filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
490		- if ( $filterByMeta ) {
491		- $query = array(
492		- 'key' => Visualizer_Plugin::CF_SETTINGS,
493		- 'value' => $filterByMeta,
494		- 'compare' => 'LIKE',
495		- );
496		- $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
497		- $meta[] = $query;
498		- $query_args['meta_query'] = $meta;
499		- }
500		- // Added by Ash/Upwork
	360	+
	361	+ // Added by Ash/Upwork
	362	+ $filterByMeta = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
	363	+ if($filterByMeta){
	364	+ $query = array(
	365	+ 'key' => Visualizer_Plugin::CF_SETTINGS,
	366	+ 'value' => $filterByMeta,
	367	+ 'compare' => 'LIKE',
	368	+ );
	369	+ $meta = isset($query_args['meta_query']) ? $query_args['meta_query'] : array();
	370	+ $meta[] = $query;
	371	+ $query_args['meta_query'] = $meta;
	372	+ }
	373	+ // Added by Ash/Upwork
	374	+
501	375	// fetch charts
502	376	$charts = array();
503		- $query = new WP_Query( $query_args );
504		- while ( $query->have_posts() ) {
	377	+ $query = new WP_Query( $query_args );
	378	+ while( $query->have_posts() ) {
505	379	$chart = $query->next_post();
506	380
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	381	// fetch and update settings
511	382	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
512	383	unset( $settings['height'], $settings['width'] );
513		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	384	+
	385	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
514	386	$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 );
	387	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
	388	+
516	389	// add chart to the array
517		- $charts[ 'visualizer-' . $chart->ID ] = array(
	390	+ $charts['visualizer-' . $chart->ID] = array(
518	391	'id' => $chart->ID,
519	392	'type' => $type,
520	393	'series' => $series,
521	394	'settings' => $settings,
		@@ -521,47 +394,34 @@
521	394	'settings' => $settings,
522	395	'data' => $data,
523	396	);
524	397	}
	398	+
525	399	// enqueue charts array
526	400	$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		- );
	401	+ wp_localize_script( 'visualizer-library', 'visualizer', array(
	402	+ 'charts' => $charts,
	403	+ 'urls' => array(
	404	+ 'base' => add_query_arg( 'vpage', false ),
	405	+ 'create' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, 'library' => 'yes' ), $ajaxurl ),
	406	+ 'edit' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
	407	+ ),
	408	+ ) );
	409	+
550	410	// 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		- );
	411	+ $render = new Visualizer_Render_Library();
	412	+
	413	+ $render->charts = $charts;
	414	+ $render->type = $filter;
	415	+ $render->types = self::_getChartTypesLocalized();
	416	+ $render->pagination = paginate_links( array(
	417	+ 'base' => add_query_arg( 'vpage', '%#%' ),
	418	+ 'format' => '',
	419	+ 'current' => $page,
	420	+ 'total' => $query->max_num_pages,
	421	+ 'type' => 'array',
	422	+ ) );
	423	+
564	424	$render->render();
565	425	}
566	426
567	427	/**
		@@ -569,12 +429,10 @@
569	429	*
570	430	* @since 1.0.0
571	431	*
572	432	* @access public
573		- *
574		- * @param array $links The array of original action links.
	433	+ * @param array $links The array of original action links.
575	434	* @param string $file The plugin basename.
576		- *
577	435	* @return array Updated array of action links.
578	436	*/
579	437	public function getPluginActionLinks( $links, $file ) {
580	438	if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
		@@ -582,9 +440,9 @@
582	440	$links,
583	441	sprintf(
584	442	'<a href="%s">%s</a>',
585	443	admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
586		- esc_html__( 'Library', 'visualizer' )
	444	+ esc_html__( 'Library', Visualizer_Plugin::NAME )
587	445	)
588	446	);
589	447	}
590	448
		@@ -596,12 +454,10 @@
596	454	*
597	455	* @since 1.0.0
598	456	*
599	457	* @access public
600		- *
601		- * @param array $plugin_meta The array of a plugin meta links.
	458	+ * @param array $plugin_meta The array of a plugin meta links.
602	459	* @param string $plugin_file The plugin's basename.
603		- *
604	460	* @return array Updated array of plugin meta links.
605	461	*/
606	462	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
607	463	if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
		@@ -607,14 +463,14 @@
607	463	if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
608	464	// knowledge base link
609	465	$plugin_meta[] = sprintf(
610	466	'<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
611		- esc_html__( 'Knowledge Base', 'visualizer' )
	467	+ esc_html__( 'Knowledge Base', Visualizer_Plugin::NAME )
612	468	);
613	469	// flattr link
614	470	$plugin_meta[] = sprintf(
615	471	'<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
616		- esc_html__( 'Pro Addon', 'visualizer' )
	472	+ esc_html__( 'Pro Addon', Visualizer_Plugin::NAME )
617	473	);
618	474	}
619	475
620	476	return $plugin_meta;
		@@ -619,5 +475,5 @@
619	475
620	476	return $plugin_meta;
621	477	}
622	478
623		-}
	479	+}