← All changes | classes/Visualizer/Module/Admin.php +37 -39 1.6.6 → 1.7.0 View file →

		@@ -18,9 +18,8 @@
18	18	// | MA 02110-1301 USA |
19	19	// +----------------------------------------------------------------------+
20	20	// | Author: Eugene Manuilov <eugene@manuilov.org> |
21	21	// +----------------------------------------------------------------------+
22		-
23	22	/**
24	23	* The module for all admin stuff.
25	24	*
26	25	* @category Visualizer
		@@ -74,23 +73,23 @@
74	73	* @return array The associated array of chart types with localized names.
75	74	*/
76	75	public static function _getChartTypesLocalized() {
77	76	$types = array(
78		- 'all' => esc_html__( 'All', Visualizer_Plugin::NAME ),
79		- 'pie' => esc_html__( 'Pie', Visualizer_Plugin::NAME ),
80		- 'line' => esc_html__( 'Line', Visualizer_Plugin::NAME ),
81		- 'area' => esc_html__( 'Area', Visualizer_Plugin::NAME ),
82		- 'geo' => esc_html__( 'Geo', Visualizer_Plugin::NAME ),
83		- 'bar' => esc_html__( 'Bar', Visualizer_Plugin::NAME ),
84		- 'column' => esc_html__( 'Column', Visualizer_Plugin::NAME ),
85		- 'gauge' => esc_html__( 'Gauge', Visualizer_Plugin::NAME ),
86		- 'scatter' => esc_html__( 'Scatter', Visualizer_Plugin::NAME ),
87		- 'candlestick' => esc_html__( 'Candlestick', Visualizer_Plugin::NAME ),
	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' ),
88	87	);
89	88
90		- $types = apply_filters("visualizer_pro_chart_types", $types);
	89	+ $types = apply_filters( 'visualizer_pro_chart_types', $types );
91	90
92		- return $types;
	91	+ return $types;
93	92	}
94	93
95	94	/**
96	95	* Enqueues media scripts and styles.
		@@ -133,13 +132,13 @@
133	132	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
134	133	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
135	134	),
136	135	'controller' => array(
137		- 'title' => esc_html__( 'Visualizations', Visualizer_Plugin::NAME ),
	136	+ 'title' => esc_html__( 'Visualizations', 'visualizer' ),
138	137	),
139	138	'routers' => array(
140		- 'library' => esc_html__( 'From Library', Visualizer_Plugin::NAME ),
141		- 'create' => esc_html__( 'Create New', Visualizer_Plugin::NAME ),
	139	+ 'library' => esc_html__( 'From Library', 'visualizer' ),
	140	+ 'create' => esc_html__( 'Create New', 'visualizer' ),
142	141	),
143	142	'library' => array(
144	143	'filters' => self::_getChartTypesLocalized(),
145	144	),
		@@ -188,9 +187,9 @@
188	187
189	188	wp_enqueue_media();
190	189	wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
191	190	wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
192		- wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array('google-jsapi-new'), null, true );
	191	+ wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
193	192	wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
194	193	}
195	194	}
196	195
		@@ -215,9 +214,9 @@
215	214	*
216	215	* @access public
217	216	*/
218	217	public function registerAdminMenu() {
219		- $title = esc_html__( 'Visualizer Library', Visualizer_Plugin::NAME );
	218	+ $title = esc_html__( 'Visualizer Library', 'visualizer' );
220	219	$callback = array( $this, 'renderLibraryPage' );
221	220	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
222	221	}
223	222
		@@ -233,9 +232,9 @@
233	232	$page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
234	233	'options' => array(
235	234	'min_range' => 1,
236	235	'default' => 1,
237		- )
	236	+ ),
238	237	) );
239	238
240	239	// the initial query arguments to fetch charts
241	240	$query_args = array(
		@@ -257,26 +256,25 @@
257	256	} else {
258	257	$filter = 'all';
259	258	}
260	259
261		- // Added by Ash/Upwork
262		- $filterByMeta = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
263		- if($filterByMeta){
264		- $query = array(
	260	+ // Added by Ash/Upwork
	261	+ $filterByMeta = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
	262	+ if ( $filterByMeta ) {
	263	+ $query = array(
265	264	'key' => Visualizer_Plugin::CF_SETTINGS,
266	265	'value' => $filterByMeta,
267	266	'compare' => 'LIKE',
268		- );
269		- $meta = isset($query_args['meta_query']) ? $query_args['meta_query'] : array();
270		- $meta[] = $query;
271		- $query_args['meta_query'] = $meta;
272		- }
273		- // Added by Ash/Upwork
274		-
	267	+ );
	268	+ $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
	269	+ $meta[] = $query;
	270	+ $query_args['meta_query'] = $meta;
	271	+ }
	272	+ // Added by Ash/Upwork
275	273	// fetch charts
276	274	$charts = array();
277	275	$query = new WP_Query( $query_args );
278		- while( $query->have_posts() ) {
	276	+ while ( $query->have_posts() ) {
279	277	$chart = $query->next_post();
280	278
281	279	// fetch and update settings
282	280	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
		@@ -286,9 +284,9 @@
286	284	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
287	285	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
288	286
289	287	// add chart to the array
290		- $charts['visualizer-' . $chart->ID] = array(
	288	+ $charts[ 'visualizer-' . $chart->ID ] = array(
291	289	'id' => $chart->ID,
292	290	'type' => $type,
293	291	'series' => $series,
294	292	'settings' => $settings,
		@@ -302,9 +300,9 @@
302	300	'charts' => $charts,
303	301	'urls' => array(
304	302	'base' => add_query_arg( 'vpage', false ),
305	303	'create' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, 'library' => 'yes' ), $ajaxurl ),
306		- 'edit' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
	304	+ 'edit' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
307	305	),
308	306	) );
309	307
310	308	// render library page
		@@ -329,9 +327,9 @@
329	327	*
330	328	* @since 1.0.0
331	329	*
332	330	* @access public
333		- * @param array $links The array of original action links.
	331	+ * @param array $links The array of original action links.
334	332	* @param string $file The plugin basename.
335	333	* @return array Updated array of action links.
336	334	*/
337	335	public function getPluginActionLinks( $links, $file ) {
		@@ -340,9 +338,9 @@
340	338	$links,
341	339	sprintf(
342	340	'<a href="%s">%s</a>',
343	341	admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
344		- esc_html__( 'Library', Visualizer_Plugin::NAME )
	342	+ esc_html__( 'Library', 'visualizer' )
345	343	)
346	344	);
347	345	}
348	346
		@@ -354,9 +352,9 @@
354	352	*
355	353	* @since 1.0.0
356	354	*
357	355	* @access public
358		- * @param array $plugin_meta The array of a plugin meta links.
	356	+ * @param array $plugin_meta The array of a plugin meta links.
359	357	* @param string $plugin_file The plugin's basename.
360	358	* @return array Updated array of plugin meta links.
361	359	*/
362	360	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
		@@ -363,14 +361,14 @@
363	361	if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
364	362	// knowledge base link
365	363	$plugin_meta[] = sprintf(
366	364	'<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
367		- esc_html__( 'Knowledge Base', Visualizer_Plugin::NAME )
	365	+ esc_html__( 'Knowledge Base', 'visualizer' )
368	366	);
369	367	// flattr link
370	368	$plugin_meta[] = sprintf(
371	369	'<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
372		- esc_html__( 'Pro Addon', Visualizer_Plugin::NAME )
	370	+ esc_html__( 'Pro Addon', 'visualizer' )
373	371	);
374	372	}
375	373
376	374	return $plugin_meta;
		@@ -375,5 +373,5 @@
375	373
376	374	return $plugin_meta;
377	375	}
378	376
379		-}
	377	+}