← All changes | classes/Visualizer/Module/Admin.php +111 -257 3.0.8 → 2.0.2 View file →

		@@ -53,155 +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		- // 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->_addFilter( 'visualizer_logger_flag', 'get_logger_flag', 10, 1 );
	63	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_TRACK, 'visualizer_enable_track' );
71	64	}
72	65
73	66	/**
74		- * No limits on revisions.
	67	+ * Enable track ajax action.
75	68	*/
76		- public function limitRevisions( $num, $post ) {
77		- if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
78		- return -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' );
79	76	}
80		- return $num;
	77	+ wp_send_json_success( array( 'status' => $status ) );
81	78	}
82	79
83	80	/**
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.
	81	+ * Either the tracking is active or not.
132	82	*
133		- * @access public
	83	+ * @return bool The flag status.
134	84	*/
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		- }
	85	+ public function get_logger_flag() {
	86	+ $flag = get_option( 'visualizer_logger_flag', 'no' );
142	87
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;
	88	+ return ( $flag === 'yes' );
155	89	}
156	90
157	91	/**
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	92	* Enqueues media scripts and styles.
205	93	*
206	94	* @since 1.0.0
207	95	* @uses wp_enqueue_style To enqueue style file.
		@@ -218,15 +106,8 @@
218	106	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
219	107	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
220	108	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
221	109	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	110	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
230	111	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
231	112	}
232	113	}
		@@ -242,9 +123,8 @@
242	123	*
243	124	* @return array The extended array of media view strings.
244	125	*/
245	126	public function setupMediaViewStrings( $strings ) {
246		- $chart_types = self::_getChartTypesLocalized( true, true, true );
247	127	$strings['visualizer'] = array(
248	128	'actions' => array(
249	129	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
250	130	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -256,10 +136,10 @@
256	136	'library' => esc_html__( 'From Library', 'visualizer' ),
257	137	'create' => esc_html__( 'Create New', 'visualizer' ),
258	138	),
259	139	'library' => array(
260		- 'filters' => $chart_types,
261		- 'types' => array_keys( $chart_types ),
	140	+ 'filters' => self::_getChartTypesLocalized( true, true ),
	141	+ 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
262	142	),
263	143	'nonce' => wp_create_nonce(),
264	144	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
265	145	);
		@@ -275,69 +155,59 @@
275	155	* @static
276	156	* @access private
277	157	* @return array The associated array of chart types with localized names.
278	158	*/
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' ),
	159	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
	160	+ $types = array(
	161	+ 'pie' => array(
	162	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
284	163	'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		- )
	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	+ ),
340	210	);
341	211	$types = apply_filters( 'visualizer_pro_chart_types', $types );
342	212	if ( $enabledOnly ) {
343	213	$filtered = array();
		@@ -401,22 +271,18 @@
401	271	if ( $suffix == $this->_libraryPage ) {
402	272	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
403	273	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
404	274	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		- );
	275	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	276	+ 'jquery',
	277	+ 'media-views',
	278	+ ), Visualizer_Plugin::VERSION, true );
411	279	wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
412	280	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		- );
	281	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
	282	+ 'google-jsapi-old',
	283	+ 'visualizer-library',
	284	+ ), Visualizer_Plugin::VERSION, true );
419	285	}
420	286	}
421	287
422	288	/**
		@@ -457,16 +323,14 @@
457	323	* @access public
458	324	*/
459	325	public function renderLibraryPage() {
460	326	// 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		- ),
467		- )
468		- );
	327	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	328	+ 'options' => array(
	329	+ 'min_range' => 1,
	330	+ 'default' => 1,
	331	+ ),
	332	+ ) );
469	333	// the initial query arguments to fetch charts
470	334	$query_args = array(
471	335	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
472	336	'posts_per_page' => 6,
		@@ -502,18 +366,14 @@
502	366	$charts = array();
503	367	$query = new WP_Query( $query_args );
504	368	while ( $query->have_posts() ) {
505	369	$chart = $query->next_post();
506		-
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	370	// fetch and update settings
511	371	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
512	372	unset( $settings['height'], $settings['width'] );
513	373	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
514	374	$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 );
	375	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
516	376	// add chart to the array
517	377	$charts[ 'visualizer-' . $chart->ID ] = array(
518	378	'id' => $chart->ID,
519	379	'type' => $type,
		@@ -523,45 +383,39 @@
523	383	);
524	384	}
525	385	// enqueue charts array
526	386	$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		- );
	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	+ ) );
550	406	// render library page
551	407	$render = new Visualizer_Render_Library();
552	408	$render->charts = $charts;
553	409	$render->type = $filter;
554	410	$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->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	+ ) );
564	418	$render->render();
565	419	}
566	420
567	421	/**