← All changes | classes/Visualizer/Module/Admin.php +220 -60 3.0.5 → 3.0.12 View file →

		@@ -60,11 +60,126 @@
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' );
64	71	}
65	72
66	73	/**
	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	+ /**
67	182	* Whether to show the feedback review or not.
68	183	*
69	184	* @access public
70	185	*/
		@@ -103,8 +218,17 @@
103	218	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
104	219	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
105	220	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
106	221	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',
	224	+ 'visualizer',
	225	+ array(
	226	+ 'i10n' => array(
	227	+ 'insert' => __( 'Insert', 'visualizer' ),
	228	+ ),
	229	+ )
	230	+ );
107	231	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
108	232	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
109	233	}
110	234	}
		@@ -120,8 +244,9 @@
120	244	*
121	245	* @return array The extended array of media view strings.
122	246	*/
123	247	public function setupMediaViewStrings( $strings ) {
	248	+ $chart_types = self::_getChartTypesLocalized( true, true, true );
124	249	$strings['visualizer'] = array(
125	250	'actions' => array(
126	251	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
127	252	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -133,10 +258,10 @@
133	258	'library' => esc_html__( 'From Library', 'visualizer' ),
134	259	'create' => esc_html__( 'Create New', 'visualizer' ),
135	260	),
136	261	'library' => array(
137		- 'filters' => self::_getChartTypesLocalized( true, true ),
138		- 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
	262	+ 'filters' => $chart_types,
	263	+ 'types' => array_keys( $chart_types ),
139	264	),
140	265	'nonce' => wp_create_nonce(),
141	266	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
142	267	);
		@@ -152,59 +277,70 @@
152	277	* @static
153	278	* @access private
154	279	* @return array The associated array of chart types with localized names.
155	280	*/
156		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
157		- $types = array(
158		- 'pie' => array(
159		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	281	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
	282	+ $additional = array();
	283	+ if ( $add_select ) {
	284	+ $additional['select'] = array(
	285	+ 'name' => esc_html__( 'All', 'visualizer' ),
160	286	'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		- ),
	287	+ );
	288	+ }
	289	+
	290	+ $types = array_merge(
	291	+ $additional,
	292	+ array(
	293	+ 'pie' => array(
	294	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
	295	+ 'enabled' => true,
	296	+ ),
	297	+ 'line' => array(
	298	+ 'name' => esc_html__( 'Line', 'visualizer' ),
	299	+ 'enabled' => true,
	300	+ ),
	301	+ 'area' => array(
	302	+ 'name' => esc_html__( 'Area', 'visualizer' ),
	303	+ 'enabled' => true,
	304	+ ),
	305	+ 'geo' => array(
	306	+ 'name' => esc_html__( 'Geo', 'visualizer' ),
	307	+ 'enabled' => true,
	308	+ ),
	309	+ 'bar' => array(
	310	+ 'name' => esc_html__( 'Bar', 'visualizer' ),
	311	+ 'enabled' => true,
	312	+ ),
	313	+ 'column' => array(
	314	+ 'name' => esc_html__( 'Column', 'visualizer' ),
	315	+ 'enabled' => true,
	316	+ ),
	317	+ 'gauge' => array(
	318	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	319	+ 'enabled' => true,
	320	+ ),
	321	+ 'scatter' => array(
	322	+ 'name' => esc_html__( 'Scatter', 'visualizer' ),
	323	+ 'enabled' => true,
	324	+ ),
	325	+ 'candlestick' => array(
	326	+ 'name' => esc_html__( 'Candlestick', 'visualizer' ),
	327	+ 'enabled' => true,
	328	+ ),
	329	+ // pro types
	330	+ 'table' => array(
	331	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	332	+ 'enabled' => false,
	333	+ ),
	334	+ 'timeline' => array(
	335	+ 'name' => esc_html__( 'Timeline', 'visualizer' ),
	336	+ 'enabled' => false,
	337	+ ),
	338	+ 'combo' => array(
	339	+ 'name' => esc_html__( 'Combo', 'visualizer' ),
	340	+ 'enabled' => false,
	341	+ ),
	342	+ )
207	343	);
208	344	$types = apply_filters( 'visualizer_pro_chart_types', $types );
209	345	if ( $enabledOnly ) {
210	346	$filtered = array();
		@@ -269,20 +405,30 @@
269	405	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
270	406	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
271	407	wp_enqueue_media();
272	408	wp_enqueue_script(
273		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	409	+ 'visualizer-library',
	410	+ VISUALIZER_ABSURL . 'js/library.js',
	411	+ array(
274	412	'jquery',
275	413	'media-views',
276		- ), Visualizer_Plugin::VERSION, true
	414	+ ),
	415	+ Visualizer_Plugin::VERSION,
	416	+ true
277	417	);
278	418	wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
279	419	wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
	420	+ wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
280	421	wp_enqueue_script(
281		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
	422	+ 'visualizer-render',
	423	+ VISUALIZER_ABSURL . 'js/render.js',
	424	+ array(
282	425	'google-jsapi-old',
283	426	'visualizer-library',
284		- ), Visualizer_Plugin::VERSION, true
	427	+ 'visualizer-customization',
	428	+ ),
	429	+ Visualizer_Plugin::VERSION,
	430	+ true
285	431	);
286	432	}
287	433	}
288	434
		@@ -325,9 +471,12 @@
325	471	*/
326	472	public function renderLibraryPage() {
327	473	// get current page
328	474	$page = filter_input(
329		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	475	+ INPUT_GET,
	476	+ 'vpage',
	477	+ FILTER_VALIDATE_INT,
	478	+ array(
330	479	'options' => array(
331	480	'min_range' => 1,
332	481	'default' => 1,
333	482	),
		@@ -369,8 +518,12 @@
369	518	$charts = array();
370	519	$query = new WP_Query( $query_args );
371	520	while ( $query->have_posts() ) {
372	521	$chart = $query->next_post();
	522	+
	523	+ // 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.
	524	+ $chart = $this->handleExistingRevisions( $chart->ID, $chart );
	525	+
373	526	// fetch and update settings
374	527	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
375	528	unset( $settings['height'], $settings['width'] );
376	529	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
		@@ -387,9 +540,13 @@
387	540	}
388	541	// enqueue charts array
389	542	$ajaxurl = admin_url( 'admin-ajax.php' );
390	543	wp_localize_script(
391		- 'visualizer-library', 'visualizer', array(
	544	+ 'visualizer-library',
	545	+ 'visualizer',
	546	+ array(
	547	+ 'language' => $this->get_language(),
	548	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
392	549	'charts' => $charts,
393	550	'urls' => array(
394	551	'base' => add_query_arg( 'vpage', false ),
395	552	'create' => add_query_arg(
		@@ -395,15 +552,18 @@
395	552	'create' => add_query_arg(
396	553	array(
397	554	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
398	555	'library' => 'yes',
399		- ), $ajaxurl
	556	+ 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	557	+ ),
	558	+ $ajaxurl
400	559	),
401	560	'edit' => add_query_arg(
402	561	array(
403	562	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
404	563	'library' => 'yes',
405		- ), $ajaxurl
	564	+ ),
	565	+ $ajaxurl
406	566	),
407	567	),
408	568	)
409	569	);