← All changes | classes/Visualizer/Module/Frontend.php +18 -173 3.0.7 → 1.4 View file →

		@@ -18,8 +18,9 @@
18	18	// | MA 02110-1301 USA |
19	19	// +----------------------------------------------------------------------+
20	20	// | Author: Eugene Manuilov <eugene@manuilov.org> |
21	21	// +----------------------------------------------------------------------+
	22	+
22	23	/**
23	24	* Frontend module class.
24	25	*
25	26	* @category Visualizer
		@@ -53,101 +54,15 @@
53	54	public function __construct( Visualizer_Plugin $plugin ) {
54	55	parent::__construct( $plugin );
55	56
56	57	$this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' );
57		- $this->_addFilter( 'visualizer_get_language', 'getLanguage' );
58	58	$this->_addShortcode( 'visualizer', 'renderChart' );
59	59
60		- // add do_shortocde hook for widget_text filter
61		- if ( ! has_filter( 'widget_text', 'do_shortcode' ) ) {
62		- add_filter( 'widget_text', 'do_shortcode' );
63		- }
64		-
65		- // add do_shortcode hook for term_description filter
66		- if ( ! has_filter( 'term_description', 'do_shortcode' ) ) {
67		- add_filter( 'term_description', 'do_shortcode' );
68		- }
69		-
70		- add_action( 'rest_api_init', array( $this, 'endpoint_register' ) );
	60	+ add_filter( 'widget_text', 'do_shortcode' );
	61	+ add_filter( 'term_description', 'do_shortcode' );
71	62	}
72	63
73	64	/**
74		- * Returns the language/locale.
75		- */
76		- function getLanguage( $dummy, $only_language ) {
77		- return $this->get_language();
78		- }
79		-
80		-
81		- /**
82		- * Registers the endpoints
83		- */
84		- function endpoint_register() {
85		- register_rest_route(
86		- 'visualizer/v' . VISUALIZER_REST_VERSION,
87		- '/action/(?P<chart>\d+)/(?P<type>.+)/',
88		- array(
89		- 'methods' => array( 'GET', 'POST' ),
90		- 'callback' => array( $this, 'perform_action' ),
91		- )
92		- );
93		- }
94		-
95		- /**
96		- * All possible actions and their labels
97		- *
98		- * @access private
99		- */
100		- private function get_actions() {
101		- return apply_filters(
102		- 'visualizer_action_buttons', array(
103		- 'print' => __( 'Print', 'visualizer' ),
104		- 'csv' => __( 'CSV', 'visualizer' ),
105		- 'xls' => __( 'Excel', 'visualizer' ),
106		- 'copy' => __( 'Copy', 'visualizer' ),
107		- )
108		- );
109		- }
110		-
111		- /**
112		- * The print button
113		- *
114		- * @since 1.0.0
115		- *
116		- * @access public
117		- */
118		- public function perform_action( WP_REST_Request $params ) {
119		- $chart_id = filter_var( sanitize_text_field( $params['chart'] ), FILTER_VALIDATE_INT );
120		- $type = sanitize_text_field( $params['type'] );
121		- $data = null;
122		-
123		- if ( ! $chart_id ) {
124		- return new WP_REST_Response( array( 'error' => new WP_Error( __( 'Invalid chart ID', 'visualizer' ) ) ) );
125		- }
126		-
127		- if ( ! $type ) {
128		- return new WP_REST_Response( array( 'error' => new WP_Error( __( 'Invalid action', 'visualizer' ) ) ) );
129		- }
130		-
131		- switch ( $type ) {
132		- case 'print':
133		- $data = $this->_getDataAs( $chart_id, 'print' );
134		- break;
135		- case 'csv':
136		- $data = $this->_getDataAs( $chart_id, 'csv' );
137		- break;
138		- case 'xls':
139		- $data = $this->_getDataAs( $chart_id, 'xls' );
140		- break;
141		- default:
142		- $data = apply_filters( 'visualizer_action_data', $data, $chart_id, $type, $params, $this );
143		- break;
144		- }
145		-
146		- return new WP_REST_Response( array( 'data' => $data ) );
147		- }
148		-
149		- /**
150	65	* Registers scripts for charts rendering.
151	66	*
152	67	* @since 1.0.0
153	68	* @uses wp_register_script To register javascript file.
		@@ -154,14 +69,10 @@
154	69	*
155	70	* @access public
156	71	*/
157	72	public function enqueueScripts() {
158		- wp_register_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
159		- wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
160		- wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true );
161		- wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
162		- wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION );
163		- do_action( 'visualizer_pro_frontend_load_resources' );
	73	+ wp_register_script( 'google-jsapi', '//www.google.com/jsapi', array(), null, true );
	74	+ wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi', 'jquery' ), Visualizer_Plugin::VERSION, true );
164	75	}
165	76
166	77	/**
167	78	* Returns placeholder for chart according to visualizer shortcode attributes.
		@@ -176,34 +87,20 @@
176	87	* @access public
177	88	* @param array $atts The array of shortcode attributes.
178	89	*/
179	90	public function renderChart( $atts ) {
180		- global $wp_version;
181		- $atts = shortcode_atts(
182		- array(
183		- 'id' => false, // chart id
184		- 'class' => false, // chart class
185		- 'series' => false, // series filter hook
186		- 'data' => false, // data filter hook
187		- 'settings' => false, // data filter hook
188		- ), $atts
189		- );
	91	+ $atts = shortcode_atts( array(
	92	+ 'id' => false, // chart id
	93	+ 'series' => false, // series filter hook
	94	+ 'data' => false, // data filter hook
	95	+ ), $atts );
190	96
191	97	// if empty id or chart does not exists, then return empty string
192		- if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	98	+ if ( !$atts['id'] || !( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
193	99	return '';
194	100	}
195	101
196		- if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) {
197		- return '';
198		- }
199		-
200	102	$id = 'visualizer-' . $atts['id'];
201		- $defaultClass = 'visualizer-front';
202		- $class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );
203		- $class = $defaultClass . ' ' . $class . ' ' . 'visualizer-front-' . $atts['id'];
204		- $class = ! empty( $class ) ? ' class="' . trim( $class ) . '"' : '';
205		-
206	103	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
207	104
208	105	// faetch and update settings
209	106	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
		@@ -212,31 +109,20 @@
212	109	}
213	110
214	111	// handle series filter hooks
215	112	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
216		- if ( ! empty( $atts['series'] ) ) {
	113	+ if ( !empty( $atts['series'] ) ) {
217	114	$series = apply_filters( $atts['series'], $series, $chart->ID, $type );
218	115	}
219		- // handle settings filter hooks
220		- $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
221		- if ( ! empty( $atts['settings'] ) ) {
222		- $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
223		- }
224	116
225	117	// handle data filter hooks
226	118	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
227		- if ( ! empty( $atts['data'] ) ) {
	119	+ if ( !empty( $atts['data'] ) ) {
228	120	$data = apply_filters( $atts['data'], $data, $chart->ID, $type );
229	121	}
230	122
231		- $id = $id . '-' . rand();
232		- $arguments = array( '', $id, $settings );
233		- apply_filters_ref_array( 'visualizer_pro_inline_css', array( &$arguments ) );
234		- $css = $arguments[0];
235		- $settings = $arguments[2];
236		-
237	123	// add chart to the array
238		- $this->_charts[ $id ] = array(
	124	+ $this->_charts[$id] = array(
239	125	'type' => $type,
240	126	'series' => $series,
241	127	'settings' => $settings,
242	128	'data' => $data,
		@@ -243,52 +129,11 @@
243	129	);
244	130
245	131	// enqueue visualizer render and update render localizations
246	132	wp_enqueue_script( 'visualizer-render' );
247		- wp_localize_script(
248		- 'visualizer-render', 'visualizer', array(
249		- 'charts' => $this->_charts,
250		- 'language' => $this->get_language(),
251		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
252		- 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
253		- 'i10n' => array(
254		- 'copied' => __( 'Copied!', 'visualizer' ),
255		- ),
256		- )
257		- );
258		- wp_enqueue_style( 'visualizer-front' );
	133	+ wp_localize_script( 'visualizer-render', 'visualizer', array( 'charts' => $this->_charts ) );
259	134
260		- $actions_div = '';
261		- $actions_visible = apply_filters( 'visualizer_pro_add_actions', isset( $settings['actions'] ) ? $settings['actions'] : array(), $atts['id'] );
262		- if ( ! empty( $actions_visible ) ) {
263		- $actions = $this->get_actions();
264		- $actions_div = '<div class="visualizer-actions">';
265		- foreach ( $actions_visible as $action_type ) {
266		- $key = $action_type;
267		- $mime = '';
268		- if ( strpos( $action_type, ';' ) !== false ) {
269		- $array = explode( ';', $action_type );
270		- $key = $array[0];
271		- $mime = end( $array );
272		- }
273		- $label = $actions[ $key ];
274		- $actions_div .= '<a href="#" class="visualizer-action visualizer-action-' . $key . '" data-visualizer-type="' . $key . '" data-visualizer-chart-id="' . $atts['id'] . '" data-visualizer-mime="' . $mime . '" title="' . $label . '" ';
275		-
276		- if ( 'copy' === $key ) {
277		- $copy = $this->_getDataAs( $atts['id'], 'csv' );
278		- $actions_div .= ' data-clipboard-text="' . esc_attr( $copy['csv'] ) . '"';
279		- wp_enqueue_script( 'visualizer-clipboardjs' );
280		- }
281		-
282		- $actions_div .= apply_filters( 'visualizer_action_attributes', '', $key, $atts['id'] );
283		- $actions_div .= '>' . $label . '</a> &nbsp;';
284		- }
285		-
286		- $actions_div .= '</div>';
287		- }
288		-
289		- $actions_div .= $css;
290		-
291	135	// return placeholder div
292		- return $actions_div . '<div id="' . $id . '"' . $class . '></div>';
	136	+ return '<div id="' . $id . '"></div>';
293	137	}
294		-}
	138	+
	139	+}