← All changes | classes/Visualizer/Module/Admin.php +52 -192 3.0.9 → 3.0.5 View file →

		@@ -60,126 +60,11 @@
60	60	$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );
61	61	$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
62	62	$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
63	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' );
71	64	}
72	65
73	66	/**
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		- }
82		-
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 );
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.
132		- *
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
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;
155		- }
156		-
157		- /**
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	67	* Whether to show the feedback review or not.
183	68	*
184	69	* @access public
185	70	*/
		@@ -218,15 +103,8 @@
218	103	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
219	104	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
220	105	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
221	106	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	107	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
230	108	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
231	109	}
232	110	}
		@@ -242,9 +120,8 @@
242	120	*
243	121	* @return array The extended array of media view strings.
244	122	*/
245	123	public function setupMediaViewStrings( $strings ) {
246		- $chart_types = self::_getChartTypesLocalized( true, true, true );
247	124	$strings['visualizer'] = array(
248	125	'actions' => array(
249	126	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
250	127	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -256,10 +133,10 @@
256	133	'library' => esc_html__( 'From Library', 'visualizer' ),
257	134	'create' => esc_html__( 'Create New', 'visualizer' ),
258	135	),
259	136	'library' => array(
260		- 'filters' => $chart_types,
261		- 'types' => array_keys( $chart_types ),
	137	+ 'filters' => self::_getChartTypesLocalized( true, true ),
	138	+ 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
262	139	),
263	140	'nonce' => wp_create_nonce(),
264	141	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
265	142	);
		@@ -275,69 +152,59 @@
275	152	* @static
276	153	* @access private
277	154	* @return array The associated array of chart types with localized names.
278	155	*/
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' ),
	156	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
	157	+ $types = array(
	158	+ 'pie' => array(
	159	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
284	160	'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		- )
	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	+ ),
340	207	);
341	208	$types = apply_filters( 'visualizer_pro_chart_types', $types );
342	209	if ( $enabledOnly ) {
343	210	$filtered = array();
		@@ -502,12 +369,8 @@
502	369	$charts = array();
503	370	$query = new WP_Query( $query_args );
504	371	while ( $query->have_posts() ) {
505	372	$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	373	// fetch and update settings
511	374	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
512	375	unset( $settings['height'], $settings['width'] );
513	376	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
		@@ -525,10 +388,8 @@
525	388	// enqueue charts array
526	389	$ajaxurl = admin_url( 'admin-ajax.php' );
527	390	wp_localize_script(
528	391	'visualizer-library', 'visualizer', array(
529		- 'language' => $this->get_language(),
530		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
531	392	'charts' => $charts,
532	393	'urls' => array(
533	394	'base' => add_query_arg( 'vpage', false ),
534	395	'create' => add_query_arg(
		@@ -534,9 +395,8 @@
534	395	'create' => add_query_arg(
535	396	array(
536	397	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
537	398	'library' => 'yes',
538		- 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
539	399	), $ajaxurl
540	400	),
541	401	'edit' => add_query_arg(
542	402	array(