← All changes | classes/Visualizer/Module/Admin.php +111 -181 3.0.6 → 2.0.3 View file →

		@@ -53,93 +53,43 @@
53	53	parent::__construct( $plugin );
54	54	$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
55	55	$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
56	56	$this->_addAction( 'admin_footer', 'renderTempaltes' );
57		- $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
	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		- $this->_addAction( 'admin_init', 'init' );
	61	+ $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
	62	+ $this->_addFilter( 'visualizer_logger_flag', 'get_logger_flag', 10, 1 );
	63	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_TRACK, 'visualizer_enable_track' );
66	64	}
67	65
68	66	/**
69		- * Admin init.
70		- *
71		- * @access public
	67	+ * Enable track ajax action.
72	68	*/
73		- public function init() {
74		- if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
75		- $this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
76		- $this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
77		- $this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
	69	+ public function visualizer_enable_track() {
	70	+ check_admin_referer( Visualizer_Plugin::ACTION_TRACK, 'nonce' );
	71	+ $status = $_GET['status'];
	72	+ if ( $status == 'yes' ) {
	73	+ update_option( 'visualizer_logger_flag', 'yes' );
	74	+ } else {
	75	+ update_option( 'visualizer_logger_flag', 'no' );
78	76	}
	77	+ wp_send_json_success( array( 'status' => $status ) );
79	78	}
80	79
81	80	/**
82		- * Load plugin translation for - TinyMCE API
	81	+ * Either the tracking is active or not.
83	82	*
84		- * @access public
85		- * @param array $arr The tinymce_lang array.
86		- * @return array
	83	+ * @return bool The flag status.
87	84	*/
88		- public function add_tinymce_lang( $arr ) {
89		- $ui_lang = VISUALIZER_ABSPATH . '/classes/Visualizer/Module/Language.php';
90		- $ui_lang = apply_filters( 'visualizer_ui_lang_filter', $ui_lang );
91		- $arr[] = $ui_lang;
92		- return $arr;
93		- }
	85	+ public function get_logger_flag() {
	86	+ $flag = get_option( 'visualizer_logger_flag', 'no' );
94	87
95		- /**
96		- * Load custom js options - TinyMCE API
97		- *
98		- * @access public
99		- * @param array $plugin_array The tinymce plugin array.
100		- * @return array
101		- */
102		- public function tinymce_plugin( $plugin_array ) {
103		- $plugin_array['visualizer_mce_button'] = VISUALIZER_ABSURL . 'js/mce.js';
104		- return $plugin_array;
	88	+ return ( $flag === 'yes' );
105	89	}
106	90
107	91	/**
108		- * Register new button in the editor
109		- *
110		- * @access public
111		- * @param array $buttons The tinymce buttons array.
112		- * @return array
113		- */
114		- public function register_mce_button( $buttons ) {
115		- array_push( $buttons, 'visualizer_mce_button' );
116		- return $buttons;
117		- }
118		-
119		- /**
120		- * Whether to show the feedback review or not.
121		- *
122		- * @access public
123		- */
124		- public function feedbackReviewTrigger( $dumb ) {
125		- $query = new WP_Query(
126		- array(
127		- 'posts_per_page' => 50,
128		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
129		- 'fields' => 'ids',
130		- 'update_post_meta_cache' => false,
131		- 'update_post_term_cache' => false,
132		- )
133		- );
134		-
135		- if ( $query->have_posts() && $query->post_count > 0 ) {
136		- return true;
137		- }
138		- return false;
139		- }
140		-
141		- /**
142	92	* Enqueues media scripts and styles.
143	93	*
144	94	* @since 1.0.0
145	95	* @uses wp_enqueue_style To enqueue style file.
		@@ -173,9 +123,8 @@
173	123	*
174	124	* @return array The extended array of media view strings.
175	125	*/
176	126	public function setupMediaViewStrings( $strings ) {
177		- $chart_types = self::_getChartTypesLocalized( true, true, true );
178	127	$strings['visualizer'] = array(
179	128	'actions' => array(
180	129	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
181	130	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -187,10 +136,10 @@
187	136	'library' => esc_html__( 'From Library', 'visualizer' ),
188	137	'create' => esc_html__( 'Create New', 'visualizer' ),
189	138	),
190	139	'library' => array(
191		- 'filters' => $chart_types,
192		- 'types' => array_keys( $chart_types ),
	140	+ 'filters' => self::_getChartTypesLocalized( true, true ),
	141	+ 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
193	142	),
194	143	'nonce' => wp_create_nonce(),
195	144	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
196	145	);
		@@ -206,69 +155,59 @@
206	155	* @static
207	156	* @access private
208	157	* @return array The associated array of chart types with localized names.
209	158	*/
210		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
211		- $additional = array();
212		- if ( $add_select ) {
213		- $additional['select'] = array(
214		- 'name' => esc_html__( 'All', 'visualizer' ),
	159	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
	160	+ $types = array(
	161	+ 'pie' => array(
	162	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
215	163	'enabled' => true,
216		- );
217		- }
218		-
219		- $types = array_merge(
220		- $additional, array(
221		- 'pie' => array(
222		- 'name' => esc_html__( 'Pie', 'visualizer' ),
223		- 'enabled' => true,
224		- ),
225		- 'line' => array(
226		- 'name' => esc_html__( 'Line', 'visualizer' ),
227		- 'enabled' => true,
228		- ),
229		- 'area' => array(
230		- 'name' => esc_html__( 'Area', 'visualizer' ),
231		- 'enabled' => true,
232		- ),
233		- 'geo' => array(
234		- 'name' => esc_html__( 'Geo', 'visualizer' ),
235		- 'enabled' => true,
236		- ),
237		- 'bar' => array(
238		- 'name' => esc_html__( 'Bar', 'visualizer' ),
239		- 'enabled' => true,
240		- ),
241		- 'column' => array(
242		- 'name' => esc_html__( 'Column', 'visualizer' ),
243		- 'enabled' => true,
244		- ),
245		- 'gauge' => array(
246		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
247		- 'enabled' => true,
248		- ),
249		- 'scatter' => array(
250		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
251		- 'enabled' => true,
252		- ),
253		- 'candlestick' => array(
254		- 'name' => esc_html__( 'Candlestick', 'visualizer' ),
255		- 'enabled' => true,
256		- ),
257		- // pro types
258		- 'table' => array(
259		- 'name' => esc_html__( 'Table', 'visualizer' ),
260		- 'enabled' => false,
261		- ),
262		- 'timeline' => array(
263		- 'name' => esc_html__( 'Timeline', 'visualizer' ),
264		- 'enabled' => false,
265		- ),
266		- 'combo' => array(
267		- 'name' => esc_html__( 'Combo', 'visualizer' ),
268		- 'enabled' => false,
269		- ),
270		- )
	164	+ ),
	165	+ 'line' => array(
	166	+ 'name' => esc_html__( 'Line', 'visualizer' ),
	167	+ 'enabled' => true,
	168	+ ),
	169	+ 'area' => array(
	170	+ 'name' => esc_html__( 'Area', 'visualizer' ),
	171	+ 'enabled' => true,
	172	+ ),
	173	+ 'geo' => array(
	174	+ 'name' => esc_html__( 'Geo', 'visualizer' ),
	175	+ 'enabled' => true,
	176	+ ),
	177	+ 'bar' => array(
	178	+ 'name' => esc_html__( 'Bar', 'visualizer' ),
	179	+ 'enabled' => true,
	180	+ ),
	181	+ 'column' => array(
	182	+ 'name' => esc_html__( 'Column', 'visualizer' ),
	183	+ 'enabled' => true,
	184	+ ),
	185	+ 'gauge' => array(
	186	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	187	+ 'enabled' => true,
	188	+ ),
	189	+ 'scatter' => array(
	190	+ 'name' => esc_html__( 'Scatter', 'visualizer' ),
	191	+ 'enabled' => true,
	192	+ ),
	193	+ 'candlestick' => array(
	194	+ 'name' => esc_html__( 'Candlestick', 'visualizer' ),
	195	+ 'enabled' => true,
	196	+ ),
	197	+ // pro types
	198	+ 'table' => array(
	199	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	200	+ 'enabled' => false,
	201	+ ),
	202	+ 'timeline' => array(
	203	+ 'name' => esc_html__( 'Timeline', 'visualizer' ),
	204	+ 'enabled' => false,
	205	+ ),
	206	+ 'combo' => array(
	207	+ 'name' => esc_html__( 'Combo', 'visualizer' ),
	208	+ 'enabled' => false,
	209	+ ),
271	210	);
272	211	$types = apply_filters( 'visualizer_pro_chart_types', $types );
273	212	if ( $enabledOnly ) {
274	213	$filtered = array();
		@@ -332,22 +271,18 @@
332	271	if ( $suffix == $this->_libraryPage ) {
333	272	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
334	273	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
335	274	wp_enqueue_media();
336		- wp_enqueue_script(
337		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
338		- 'jquery',
339		- 'media-views',
340		- ), Visualizer_Plugin::VERSION, true
341		- );
	275	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	276	+ 'jquery',
	277	+ 'media-views',
	278	+ ), Visualizer_Plugin::VERSION, true );
342	279	wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
343	280	wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
344		- wp_enqueue_script(
345		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
346		- 'google-jsapi-old',
347		- 'visualizer-library',
348		- ), Visualizer_Plugin::VERSION, true
349		- );
	281	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
	282	+ 'google-jsapi-old',
	283	+ 'visualizer-library',
	284	+ ), Visualizer_Plugin::VERSION, true );
350	285	}
351	286	}
352	287
353	288	/**
		@@ -388,16 +323,14 @@
388	323	* @access public
389	324	*/
390	325	public function renderLibraryPage() {
391	326	// get current page
392		- $page = filter_input(
393		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
394		- 'options' => array(
395		- 'min_range' => 1,
396		- 'default' => 1,
397		- ),
398		- )
399		- );
	327	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	328	+ 'options' => array(
	329	+ 'min_range' => 1,
	330	+ 'default' => 1,
	331	+ ),
	332	+ ) );
400	333	// the initial query arguments to fetch charts
401	334	$query_args = array(
402	335	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
403	336	'posts_per_page' => 6,
		@@ -438,9 +371,9 @@
438	371	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
439	372	unset( $settings['height'], $settings['width'] );
440	373	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
441	374	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
442		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	375	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
443	376	// add chart to the array
444	377	$charts[ 'visualizer-' . $chart->ID ] = array(
445	378	'id' => $chart->ID,
446	379	'type' => $type,
		@@ -450,42 +383,39 @@
450	383	);
451	384	}
452	385	// enqueue charts array
453	386	$ajaxurl = admin_url( 'admin-ajax.php' );
454		- wp_localize_script(
455		- 'visualizer-library', 'visualizer', array(
456		- 'charts' => $charts,
457		- 'urls' => array(
458		- 'base' => add_query_arg( 'vpage', false ),
459		- 'create' => add_query_arg(
460		- array(
461		- 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
462		- 'library' => 'yes',
463		- ), $ajaxurl
464		- ),
465		- 'edit' => add_query_arg(
466		- array(
467		- 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
468		- 'library' => 'yes',
469		- ), $ajaxurl
470		- ),
471		- ),
472		- )
473		- );
	387	+ wp_localize_script( 'visualizer-library', 'visualizer', array(
	388	+ 'charts' => $charts,
	389	+ 'urls' => array(
	390	+ 'base' => add_query_arg( 'vpage', false ),
	391	+ 'create' => add_query_arg( array(
	392	+ 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
	393	+ 'library' => 'yes',
	394	+ ), $ajaxurl ),
	395	+ 'edit' => add_query_arg( array(
	396	+ 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
	397	+ 'library' => 'yes',
	398	+ ), $ajaxurl ),
	399	+ 'logger' => add_query_arg( array(
	400	+ 'action' => Visualizer_Plugin::ACTION_TRACK,
	401	+ 'library' => 'yes',
	402	+ 'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_TRACK ),
	403	+ ), $ajaxurl ),
	404	+ ),
	405	+ ) );
474	406	// render library page
475	407	$render = new Visualizer_Render_Library();
476	408	$render->charts = $charts;
477	409	$render->type = $filter;
478	410	$render->types = self::_getChartTypesLocalized();
479		- $render->pagination = paginate_links(
480		- array(
481		- 'base' => add_query_arg( 'vpage', '%#%' ),
482		- 'format' => '',
483		- 'current' => $page,
484		- 'total' => $query->max_num_pages,
485		- 'type' => 'array',
486		- )
487		- );
	411	+ $render->pagination = paginate_links( array(
	412	+ 'base' => add_query_arg( 'vpage', '%#%' ),
	413	+ 'format' => '',
	414	+ 'current' => $page,
	415	+ 'total' => $query->max_num_pages,
	416	+ 'type' => 'array',
	417	+ ) );
488	418	$render->render();
489	419	}
490	420
491	421	/**