← All changes | classes/Visualizer/Module/Admin.php +88 -198 3.0.7 → 2.1.8 View file →

		@@ -57,89 +57,13 @@
57	57	$this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
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 );
66	62	}
67	63
68		- /**
69		- * Admin init.
70		- *
71		- * @access public
72		- */
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 );
78		- }
79		- }
80	64
81	65	/**
82		- * Load plugin translation for - TinyMCE API
83		- *
84		- * @access public
85		- * @param array $arr The tinymce_lang array.
86		- * @return array
87		- */
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		- }
94		-
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;
105		- }
106		-
107		- /**
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	66	* Enqueues media scripts and styles.
143	67	*
144	68	* @since 1.0.0
145	69	* @uses wp_enqueue_style To enqueue style file.
		@@ -156,15 +80,8 @@
156	80	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
157	81	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
158	82	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
159	83	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
160		- wp_localize_script(
161		- 'visualizer-media-view', 'visualizer', array(
162		- 'i10n' => array(
163		- 'insert' => __( 'Insert', 'visualizer' ),
164		- ),
165		- )
166		- );
167	84	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
168	85	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
169	86	}
170	87	}
		@@ -180,9 +97,8 @@
180	97	*
181	98	* @return array The extended array of media view strings.
182	99	*/
183	100	public function setupMediaViewStrings( $strings ) {
184		- $chart_types = self::_getChartTypesLocalized( true, true, true );
185	101	$strings['visualizer'] = array(
186	102	'actions' => array(
187	103	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
188	104	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -194,10 +110,10 @@
194	110	'library' => esc_html__( 'From Library', 'visualizer' ),
195	111	'create' => esc_html__( 'Create New', 'visualizer' ),
196	112	),
197	113	'library' => array(
198		- 'filters' => $chart_types,
199		- 'types' => array_keys( $chart_types ),
	114	+ 'filters' => self::_getChartTypesLocalized( true, true ),
	115	+ 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
200	116	),
201	117	'nonce' => wp_create_nonce(),
202	118	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
203	119	);
		@@ -213,69 +129,59 @@
213	129	* @static
214	130	* @access private
215	131	* @return array The associated array of chart types with localized names.
216	132	*/
217		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
218		- $additional = array();
219		- if ( $add_select ) {
220		- $additional['select'] = array(
221		- 'name' => esc_html__( 'All', 'visualizer' ),
	133	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
	134	+ $types = array(
	135	+ 'pie' => array(
	136	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
222	137	'enabled' => true,
223		- );
224		- }
225		-
226		- $types = array_merge(
227		- $additional, array(
228		- 'pie' => array(
229		- 'name' => esc_html__( 'Pie', 'visualizer' ),
230		- 'enabled' => true,
231		- ),
232		- 'line' => array(
233		- 'name' => esc_html__( 'Line', 'visualizer' ),
234		- 'enabled' => true,
235		- ),
236		- 'area' => array(
237		- 'name' => esc_html__( 'Area', 'visualizer' ),
238		- 'enabled' => true,
239		- ),
240		- 'geo' => array(
241		- 'name' => esc_html__( 'Geo', 'visualizer' ),
242		- 'enabled' => true,
243		- ),
244		- 'bar' => array(
245		- 'name' => esc_html__( 'Bar', 'visualizer' ),
246		- 'enabled' => true,
247		- ),
248		- 'column' => array(
249		- 'name' => esc_html__( 'Column', 'visualizer' ),
250		- 'enabled' => true,
251		- ),
252		- 'gauge' => array(
253		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
254		- 'enabled' => true,
255		- ),
256		- 'scatter' => array(
257		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
258		- 'enabled' => true,
259		- ),
260		- 'candlestick' => array(
261		- 'name' => esc_html__( 'Candlestick', 'visualizer' ),
262		- 'enabled' => true,
263		- ),
264		- // pro types
265		- 'table' => array(
266		- 'name' => esc_html__( 'Table', 'visualizer' ),
267		- 'enabled' => false,
268		- ),
269		- 'timeline' => array(
270		- 'name' => esc_html__( 'Timeline', 'visualizer' ),
271		- 'enabled' => false,
272		- ),
273		- 'combo' => array(
274		- 'name' => esc_html__( 'Combo', 'visualizer' ),
275		- 'enabled' => false,
276		- ),
277		- )
	138	+ ),
	139	+ 'line' => array(
	140	+ 'name' => esc_html__( 'Line', 'visualizer' ),
	141	+ 'enabled' => true,
	142	+ ),
	143	+ 'area' => array(
	144	+ 'name' => esc_html__( 'Area', 'visualizer' ),
	145	+ 'enabled' => true,
	146	+ ),
	147	+ 'geo' => array(
	148	+ 'name' => esc_html__( 'Geo', 'visualizer' ),
	149	+ 'enabled' => true,
	150	+ ),
	151	+ 'bar' => array(
	152	+ 'name' => esc_html__( 'Bar', 'visualizer' ),
	153	+ 'enabled' => true,
	154	+ ),
	155	+ 'column' => array(
	156	+ 'name' => esc_html__( 'Column', 'visualizer' ),
	157	+ 'enabled' => true,
	158	+ ),
	159	+ 'gauge' => array(
	160	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	161	+ 'enabled' => true,
	162	+ ),
	163	+ 'scatter' => array(
	164	+ 'name' => esc_html__( 'Scatter', 'visualizer' ),
	165	+ 'enabled' => true,
	166	+ ),
	167	+ 'candlestick' => array(
	168	+ 'name' => esc_html__( 'Candlestick', 'visualizer' ),
	169	+ 'enabled' => true,
	170	+ ),
	171	+ // pro types
	172	+ 'table' => array(
	173	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	174	+ 'enabled' => false,
	175	+ ),
	176	+ 'timeline' => array(
	177	+ 'name' => esc_html__( 'Timeline', 'visualizer' ),
	178	+ 'enabled' => false,
	179	+ ),
	180	+ 'combo' => array(
	181	+ 'name' => esc_html__( 'Combo', 'visualizer' ),
	182	+ 'enabled' => false,
	183	+ ),
278	184	);
279	185	$types = apply_filters( 'visualizer_pro_chart_types', $types );
280	186	if ( $enabledOnly ) {
281	187	$filtered = array();
		@@ -339,22 +245,18 @@
339	245	if ( $suffix == $this->_libraryPage ) {
340	246	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
341	247	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
342	248	wp_enqueue_media();
343		- wp_enqueue_script(
344		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
345		- 'jquery',
346		- 'media-views',
347		- ), Visualizer_Plugin::VERSION, true
348		- );
	249	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	250	+ 'jquery',
	251	+ 'media-views',
	252	+ ), Visualizer_Plugin::VERSION, true );
349	253	wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
350	254	wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
351		- wp_enqueue_script(
352		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
353		- 'google-jsapi-old',
354		- 'visualizer-library',
355		- ), Visualizer_Plugin::VERSION, true
356		- );
	255	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
	256	+ 'google-jsapi-old',
	257	+ 'visualizer-library',
	258	+ ), Visualizer_Plugin::VERSION, true );
357	259	}
358	260	}
359	261
360	262	/**
		@@ -395,16 +297,14 @@
395	297	* @access public
396	298	*/
397	299	public function renderLibraryPage() {
398	300	// get current page
399		- $page = filter_input(
400		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
401		- 'options' => array(
402		- 'min_range' => 1,
403		- 'default' => 1,
404		- ),
405		- )
406		- );
	301	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	302	+ 'options' => array(
	303	+ 'min_range' => 1,
	304	+ 'default' => 1,
	305	+ ),
	306	+ ) );
407	307	// the initial query arguments to fetch charts
408	308	$query_args = array(
409	309	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
410	310	'posts_per_page' => 6,
		@@ -457,44 +357,34 @@
457	357	);
458	358	}
459	359	// enqueue charts array
460	360	$ajaxurl = admin_url( 'admin-ajax.php' );
461		- wp_localize_script(
462		- 'visualizer-library', 'visualizer', array(
463		- 'language' => $this->get_language(),
464		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
465		- 'charts' => $charts,
466		- 'urls' => array(
467		- 'base' => add_query_arg( 'vpage', false ),
468		- 'create' => add_query_arg(
469		- array(
470		- 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
471		- 'library' => 'yes',
472		- ), $ajaxurl
473		- ),
474		- 'edit' => add_query_arg(
475		- array(
476		- 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
477		- 'library' => 'yes',
478		- ), $ajaxurl
479		- ),
480		- ),
481		- )
482		- );
	361	+ wp_localize_script( 'visualizer-library', 'visualizer', array(
	362	+ 'charts' => $charts,
	363	+ 'urls' => array(
	364	+ 'base' => add_query_arg( 'vpage', false ),
	365	+ 'create' => add_query_arg( array(
	366	+ 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
	367	+ 'library' => 'yes',
	368	+ ), $ajaxurl ),
	369	+ 'edit' => add_query_arg( array(
	370	+ 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
	371	+ 'library' => 'yes',
	372	+ ), $ajaxurl ),
	373	+ ),
	374	+ ) );
483	375	// render library page
484	376	$render = new Visualizer_Render_Library();
485	377	$render->charts = $charts;
486	378	$render->type = $filter;
487	379	$render->types = self::_getChartTypesLocalized();
488		- $render->pagination = paginate_links(
489		- array(
490		- 'base' => add_query_arg( 'vpage', '%#%' ),
491		- 'format' => '',
492		- 'current' => $page,
493		- 'total' => $query->max_num_pages,
494		- 'type' => 'array',
495		- )
496		- );
	380	+ $render->pagination = paginate_links( array(
	381	+ 'base' => add_query_arg( 'vpage', '%#%' ),
	382	+ 'format' => '',
	383	+ 'current' => $page,
	384	+ 'total' => $query->max_num_pages,
	385	+ 'type' => 'array',
	386	+ ) );
497	387	$render->render();
498	388	}
499	389
500	390	/**