← All changes | classes/Visualizer/Module/Admin.php +95 -201 3.0.5 → 1.7.1 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,45 +46,50 @@
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' );
	63	+ $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
64	64	}
65	65
66	66	/**
67		- * Whether to show the feedback review or not.
	67	+ * Returns associated array of chart types and localized names.
68	68	*
69		- * @access public
	69	+ * @since 1.0.0
	70	+ *
	71	+ * @static
	72	+ * @access private
	73	+ * @return array The associated array of chart types with localized names.
70	74	*/
71		- public function feedbackReviewTrigger( $dumb ) {
72		- $query = new WP_Query(
73		- array(
74		- 'posts_per_page' => 50,
75		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
76		- 'fields' => 'ids',
77		- 'update_post_meta_cache' => false,
78		- 'update_post_term_cache' => false,
79		- )
	75	+ public static function _getChartTypesLocalized() {
	76	+ $types = array(
	77	+ 'all' => esc_html__( 'All', 'visualizer' ),
	78	+ 'pie' => esc_html__( 'Pie', 'visualizer' ),
	79	+ 'line' => esc_html__( 'Line', 'visualizer' ),
	80	+ 'area' => esc_html__( 'Area', 'visualizer' ),
	81	+ 'geo' => esc_html__( 'Geo', 'visualizer' ),
	82	+ 'bar' => esc_html__( 'Bar', 'visualizer' ),
	83	+ 'column' => esc_html__( 'Column', 'visualizer' ),
	84	+ 'gauge' => esc_html__( 'Gauge', 'visualizer' ),
	85	+ 'scatter' => esc_html__( 'Scatter', 'visualizer' ),
	86	+ 'candlestick' => esc_html__( 'Candlestick', 'visualizer' ),
80	87	);
81	88
82		- if ( $query->have_posts() && $query->post_count > 0 ) {
83		- return true;
84		- }
85		- return false;
	89	+ $types = apply_filters( 'visualizer_pro_chart_types', $types );
	90	+
	91	+ return $types;
86	92	}
87	93
88	94	/**
89	95	* Enqueues media scripts and styles.
		@@ -95,18 +101,20 @@
95	101	* @access public
96	102	*/
97	103	public function enqueueMediaScripts() {
98	104	global $typenow;
	105	+
99	106	if ( post_type_supports( $typenow, 'editor' ) ) {
100	107	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
101		- wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
102		- wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
103		- wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
104		- wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
	108	+
	109	+ wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
	110	+ wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
	111	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
	112	+ wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
105	113	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
106		- wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
107		- wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
108		- wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
	114	+ wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
	115	+ wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
	116	+ wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
109	117	}
110	118	}
111	119
112	120	/**
		@@ -114,16 +122,14 @@
114	122	*
115	123	* @since 1.0.0
116	124	*
117	125	* @access public
118		- *
119	126	* @param array $strings The array of media view strings.
120		- *
121	127	* @return array The extended array of media view strings.
122	128	*/
123	129	public function setupMediaViewStrings( $strings ) {
124	130	$strings['visualizer'] = array(
125		- 'actions' => array(
	131	+ 'actions' => array(
126	132	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
127	133	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
128	134	),
129	135	'controller' => array(
		@@ -128,18 +134,17 @@
128	134	),
129	135	'controller' => array(
130	136	'title' => esc_html__( 'Visualizations', 'visualizer' ),
131	137	),
132		- 'routers' => array(
	138	+ 'routers' => array(
133	139	'library' => esc_html__( 'From Library', 'visualizer' ),
134	140	'create' => esc_html__( 'Create New', 'visualizer' ),
135	141	),
136		- 'library' => array(
137		- 'filters' => self::_getChartTypesLocalized( true, true ),
138		- 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
	142	+ 'library' => array(
	143	+ 'filters' => self::_getChartTypesLocalized(),
139	144	),
140		- 'nonce' => wp_create_nonce(),
141		- 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
	145	+ 'nonce' => wp_create_nonce(),
	146	+ 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
142	147	);
143	148
144	149	return $strings;
145	150	}
		@@ -144,99 +149,8 @@
144	149	return $strings;
145	150	}
146	151
147	152	/**
148		- * Returns associated array of chart types and localized names.
149		- *
150		- * @since 1.0.0
151		- *
152		- * @static
153		- * @access private
154		- * @return array The associated array of chart types with localized names.
155		- */
156		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
157		- $types = array(
158		- 'pie' => array(
159		- 'name' => esc_html__( 'Pie', 'visualizer' ),
160		- 'enabled' => true,
161		- ),
162		- 'line' => array(
163		- 'name' => esc_html__( 'Line', 'visualizer' ),
164		- 'enabled' => true,
165		- ),
166		- 'area' => array(
167		- 'name' => esc_html__( 'Area', 'visualizer' ),
168		- 'enabled' => true,
169		- ),
170		- 'geo' => array(
171		- 'name' => esc_html__( 'Geo', 'visualizer' ),
172		- 'enabled' => true,
173		- ),
174		- 'bar' => array(
175		- 'name' => esc_html__( 'Bar', 'visualizer' ),
176		- 'enabled' => true,
177		- ),
178		- 'column' => array(
179		- 'name' => esc_html__( 'Column', 'visualizer' ),
180		- 'enabled' => true,
181		- ),
182		- 'gauge' => array(
183		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
184		- 'enabled' => true,
185		- ),
186		- 'scatter' => array(
187		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
188		- 'enabled' => true,
189		- ),
190		- 'candlestick' => array(
191		- 'name' => esc_html__( 'Candlestick', 'visualizer' ),
192		- 'enabled' => true,
193		- ),
194		- // pro types
195		- 'table' => array(
196		- 'name' => esc_html__( 'Table', 'visualizer' ),
197		- 'enabled' => false,
198		- ),
199		- 'timeline' => array(
200		- 'name' => esc_html__( 'Timeline', 'visualizer' ),
201		- 'enabled' => false,
202		- ),
203		- 'combo' => array(
204		- 'name' => esc_html__( 'Combo', 'visualizer' ),
205		- 'enabled' => false,
206		- ),
207		- );
208		- $types = apply_filters( 'visualizer_pro_chart_types', $types );
209		- if ( $enabledOnly ) {
210		- $filtered = array();
211		- foreach ( $types as $type => $array ) {
212		- if ( ! is_array( $array ) ) {
213		- // support for old pro
214		- $array = array( 'enabled' => true, 'name' => $array );
215		- }
216		- if ( ! $array['enabled'] ) {
217		- continue;
218		- }
219		- $filtered[ $type ] = $array;
220		- }
221		- $types = $filtered;
222		- }
223		- if ( $get2Darray ) {
224		- $doubleD = array();
225		- foreach ( $types as $type => $array ) {
226		- if ( ! is_array( $array ) ) {
227		- // support for old pro
228		- $array = array( 'enabled' => true, 'name' => $array );
229		- }
230		- $doubleD[ $type ] = $array['name'];
231		- }
232		- $types = $doubleD;
233		- }
234		-
235		- return $types;
236		- }
237		-
238		- /**
239	153	* Renders templates to use in media popup.
240	154	*
241	155	* @since 1.0.0
242	156	* @global string $pagenow The name of the current page.
		@@ -244,11 +158,13 @@
244	158	* @access public
245	159	*/
246	160	public function renderTempaltes() {
247	161	global $pagenow;
	162	+
248	163	if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
249	164	return;
250	165	}
	166	+
251	167	$render = new Visualizer_Render_Templates();
252	168	$render->render();
253	169	}
254	170
		@@ -260,30 +176,21 @@
260	176	* @uses wp_enqueue_script() To enqueue javascript file.
261	177	* @uses wp_enqueue_media() To enqueue media stuff.
262	178	*
263	179	* @access public
264		- *
265	180	* @param string $suffix The current page suffix.
266	181	*/
267	182	public function enqueueLibraryScripts( $suffix ) {
268	183	if ( $suffix == $this->_libraryPage ) {
269	184	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
	185	+
270	186	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
	187	+
271	188	wp_enqueue_media();
272		- wp_enqueue_script(
273		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
274		- 'jquery',
275		- 'media-views',
276		- ), Visualizer_Plugin::VERSION, true
277		- );
	189	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
278	190	wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
279	191	wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
280		- wp_enqueue_script(
281		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
282		- 'google-jsapi-old',
283		- 'visualizer-library',
284		- ), Visualizer_Plugin::VERSION, true
285		- );
	192	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
286	193	}
287	194	}
288	195
289	196	/**
		@@ -291,16 +198,13 @@
291	198	*
292	199	* @since 1.0.0
293	200	*
294	201	* @access public
295		- *
296	202	* @param array $tabs The array of media upload tabs.
297		- *
298	203	* @return array Extended array of media upload tabs.
299	204	*/
300	205	public function setupVisualizerTab( $tabs ) {
301	206	$tabs['visualizer'] = 'Visualizer';
302		-
303	207	return $tabs;
304	208	}
305	209
306	210	/**
		@@ -310,10 +214,10 @@
310	214	*
311	215	* @access public
312	216	*/
313	217	public function registerAdminMenu() {
314		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
315		- $callback = array( $this, 'renderLibraryPage' );
	218	+ $title = esc_html__( 'Visualizer Library', 'visualizer' );
	219	+ $callback = array( $this, 'renderLibraryPage' );
316	220	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
317	221	}
318	222
319	223	/**
		@@ -324,16 +228,15 @@
324	228	* @access public
325	229	*/
326	230	public function renderLibraryPage() {
327	231	// get current page
328		- $page = filter_input(
329		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
330		- 'options' => array(
331		- 'min_range' => 1,
332		- 'default' => 1,
333		- ),
334		- )
335		- );
	232	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	233	+ 'options' => array(
	234	+ 'min_range' => 1,
	235	+ 'default' => 1,
	236	+ ),
	237	+ ) );
	238	+
336	239	// the initial query arguments to fetch charts
337	240	$query_args = array(
338	241	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
339	242	'posts_per_page' => 6,
		@@ -338,8 +241,9 @@
338	241	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
339	242	'posts_per_page' => 6,
340	243	'paged' => $page,
341	244	);
	245	+
342	246	// add chart type filter to the query arguments
343	247	$filter = filter_input( INPUT_GET, 'type' );
344	248	if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
345	249	$query_args['meta_query'] = array(
		@@ -351,32 +255,36 @@
351	255	);
352	256	} else {
353	257	$filter = 'all';
354	258	}
	259	+
355	260	// Added by Ash/Upwork
356		- $filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
	261	+ $filterByMeta = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
357	262	if ( $filterByMeta ) {
358		- $query = array(
359		- 'key' => Visualizer_Plugin::CF_SETTINGS,
360		- 'value' => $filterByMeta,
361		- 'compare' => 'LIKE',
	263	+ $query = array(
	264	+ 'key' => Visualizer_Plugin::CF_SETTINGS,
	265	+ 'value' => $filterByMeta,
	266	+ 'compare' => 'LIKE',
362	267	);
363		- $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
364		- $meta[] = $query;
365		- $query_args['meta_query'] = $meta;
	268	+ $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
	269	+ $meta[] = $query;
	270	+ $query_args['meta_query'] = $meta;
366	271	}
367	272	// Added by Ash/Upwork
368	273	// fetch charts
369	274	$charts = array();
370		- $query = new WP_Query( $query_args );
	275	+ $query = new WP_Query( $query_args );
371	276	while ( $query->have_posts() ) {
372	277	$chart = $query->next_post();
	278	+
373	279	// fetch and update settings
374	280	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
375	281	unset( $settings['height'], $settings['width'] );
376		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	282	+
	283	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
377	284	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
378		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	285	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
	286	+
379	287	// add chart to the array
380	288	$charts[ 'visualizer-' . $chart->ID ] = array(
381	289	'id' => $chart->ID,
382	290	'type' => $type,
		@@ -384,44 +292,34 @@
384	292	'settings' => $settings,
385	293	'data' => $data,
386	294	);
387	295	}
	296	+
388	297	// enqueue charts array
389	298	$ajaxurl = admin_url( 'admin-ajax.php' );
390		- wp_localize_script(
391		- 'visualizer-library', 'visualizer', array(
392		- 'charts' => $charts,
393		- 'urls' => array(
394		- 'base' => add_query_arg( 'vpage', false ),
395		- 'create' => add_query_arg(
396		- array(
397		- 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
398		- 'library' => 'yes',
399		- ), $ajaxurl
400		- ),
401		- 'edit' => add_query_arg(
402		- array(
403		- 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
404		- 'library' => 'yes',
405		- ), $ajaxurl
406		- ),
407		- ),
408		- )
409		- );
	299	+ wp_localize_script( 'visualizer-library', 'visualizer', array(
	300	+ 'charts' => $charts,
	301	+ 'urls' => array(
	302	+ 'base' => add_query_arg( 'vpage', false ),
	303	+ 'create' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, 'library' => 'yes' ), $ajaxurl ),
	304	+ 'edit' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
	305	+ ),
	306	+ ) );
	307	+
410	308	// render library page
411		- $render = new Visualizer_Render_Library();
412		- $render->charts = $charts;
413		- $render->type = $filter;
414		- $render->types = self::_getChartTypesLocalized();
415		- $render->pagination = paginate_links(
416		- array(
417		- 'base' => add_query_arg( 'vpage', '%#%' ),
418		- 'format' => '',
419		- 'current' => $page,
420		- 'total' => $query->max_num_pages,
421		- 'type' => 'array',
422		- )
423		- );
	309	+ $render = new Visualizer_Render_Library();
	310	+
	311	+ $render->charts = $charts;
	312	+ $render->type = $filter;
	313	+ $render->types = self::_getChartTypesLocalized();
	314	+ $render->pagination = paginate_links( array(
	315	+ 'base' => add_query_arg( 'vpage', '%#%' ),
	316	+ 'format' => '',
	317	+ 'current' => $page,
	318	+ 'total' => $query->max_num_pages,
	319	+ 'type' => 'array',
	320	+ ) );
	321	+
424	322	$render->render();
425	323	}
426	324
427	325	/**
		@@ -429,12 +327,10 @@
429	327	*
430	328	* @since 1.0.0
431	329	*
432	330	* @access public
433		- *
434	331	* @param array $links The array of original action links.
435	332	* @param string $file The plugin basename.
436		- *
437	333	* @return array Updated array of action links.
438	334	*/
439	335	public function getPluginActionLinks( $links, $file ) {
440	336	if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
		@@ -456,12 +352,10 @@
456	352	*
457	353	* @since 1.0.0
458	354	*
459	355	* @access public
460		- *
461	356	* @param array $plugin_meta The array of a plugin meta links.
462	357	* @param string $plugin_file The plugin's basename.
463		- *
464	358	* @return array Updated array of plugin meta links.
465	359	*/
466	360	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
467	361	if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {