← All changes | classes/Visualizer/Plugin.php +34 -73 3.0.9 → 1.1.2 View file →

		@@ -1,5 +1,6 @@
1	1	<?php
	2	+
2	3	// +----------------------------------------------------------------------+
3	4	// | Copyright 2013 Madpixels (email : visualizer@madpixels.net) |
4	5	// +----------------------------------------------------------------------+
5	6	// | This program is free software; you can redistribute it and/or modify |
		@@ -17,8 +18,9 @@
17	18	// | MA 02110-1301 USA |
18	19	// +----------------------------------------------------------------------+
19	20	// | Author: Eugene Manuilov <eugene@manuilov.org> |
20	21	// +----------------------------------------------------------------------+
	22	+
21	23	/**
22	24	* The core plugin class.
23	25	*
24	26	* @category Visualizer
		@@ -26,52 +28,33 @@
26	28	* @since 1.0.0
27	29	*/
28	30	class Visualizer_Plugin {
29	31
30		- const NAME = 'visualizer';
31		- const VERSION = '3.0.9';
	32	+ const NAME = 'visualizer';
	33	+ const VERSION = '1.1.2';
32	34
33	35	// custom post types
34	36	const CPT_VISUALIZER = 'visualizer';
35	37
36	38	// custom meta fields
37		- const CF_CHART_TYPE = 'visualizer-chart-type';
38		- const CF_SOURCE = 'visualizer-source';
39		- const CF_SERIES = 'visualizer-series';
	39	+ const CF_CHART_TYPE = 'visualizer-chart-type';
	40	+ const CF_SOURCE = 'visualizer-source';
	41	+ const CF_SERIES = 'visualizer-series';
40	42	const CF_DEFAULT_DATA = 'visualizer-default-data';
41		- const CF_SETTINGS = 'visualizer-settings';
	43	+ const CF_SETTINGS = 'visualizer-settings';
42	44
43		- const CF_SOURCE_FILTER = 'visualizer-source-filter';
44		-
45	45	// custom actions
46		- const ACTION_GET_CHARTS = 'visualizer-get-charts';
	46	+ const ACTION_GET_CHARTS = 'visualizer-get-charts';
47	47	const ACTION_CREATE_CHART = 'visualizer-create-chart';
48		- const ACTION_EDIT_CHART = 'visualizer-edit-chart';
49		- const ACTION_CLONE_CHART = 'visualizer-clone-chart';
	48	+ const ACTION_EDIT_CHART = 'visualizer-edit-chart';
	49	+ const ACTION_CLONE_CHART = 'visualizer-clone-chart';
50	50	const ACTION_DELETE_CHART = 'visualizer-delete-chart';
51		- const ACTION_UPLOAD_DATA = 'visualizer-upload-data';
52		- // Added by Ash/Upwork
53		- const ACTION_EXPORT_DATA = 'visualizer-export-data';
	51	+ const ACTION_UPLOAD_DATA = 'visualizer-upload-data';
54	52
55		- /**
56		- *Action used for fetching specific users/roles for permissions.
57		- */
58		- const ACTION_FETCH_PERMISSIONS_DATA = 'visualizer-fetch-permissions-data';
59		-
60	53	// custom filters
61		- const FILTER_CHART_WRAPPER_CLASS = 'visualizer-chart-wrapper-class';
62	54	const FILTER_GET_CHART_SERIES = 'visualizer-get-chart-series';
63		- const FILTER_GET_CHART_DATA = 'visualizer-get-chart-data';
64		- const FILTER_GET_CHART_SETTINGS = 'visualizer-get-chart-settings';
65		- const FILTER_UNDO_REVISIONS = 'visualizer-undo-revisions';
66		- const FILTER_HANDLE_REVISIONS = 'visualizer-handle-revisions';
	55	+ const FILTER_GET_CHART_DATA = 'visualizer-get-chart-data';
67	56
68		- const CF_CHART_URL = 'visualizer-chart-url';
69		- const CF_CHART_SCHEDULE = 'visualizer-chart-schedule';
70		- // Added by Ash/Upwork
71		- const PRO_TEASER_URL = 'http://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/';
72		- const PRO_TEASER_TITLE = 'Check PRO version ';
73		- // Added by Ash/Upwork
74	57	/**
75	58	* Singletone instance of the plugin.
76	59	*
77	60	* @since 1.0.0
		@@ -97,15 +80,20 @@
97	80	* @since 1.0.0
98	81	*
99	82	* @access private
100	83	*/
101		- private function __construct() {
102		- if ( VISUALIZER_DEBUG ) {
103		- add_action( 'themeisle_log_event', array( $this, 'themeisle_log_event_debug' ), 10, 5 );
104		- }
105		- }
	84	+ private function __construct() {}
106	85
107	86	/**
	87	+ * Private clone method.
	88	+ *
	89	+ * @since 1.0.0
	90	+ *
	91	+ * @access private
	92	+ */
	93	+ private function __clone() {}
	94	+
	95	+ /**
108	96	* Returns singletone instance of the plugin.
109	97	*
110	98	* @since 1.0.0
111	99	*
		@@ -121,35 +109,18 @@
121	109	return self::$_instance;
122	110	}
123	111
124	112	/**
125		- * Returns chart types.
126		- *
127		- * @since 1.0.0
128		- *
129		- * @static
130		- * @access public
131		- * @return array
132		- */
133		- public static function getChartTypes() {
134		- $array = array_keys( Visualizer_Module_Admin::_getChartTypesLocalized() );
135		-
136		- return $array;
137		- }
138		-
139		- /**
140	113	* Returns a module if it was registered before. Otherwise NULL.
141	114	*
142	115	* @since 1.0.0
143	116	*
144	117	* @access public
145		- *
146	118	* @param string $name The name of the module to return.
147		- *
148	119	* @return Visualizer_Module|null Returns a module if it was registered or NULL.
149	120	*/
150	121	public function getModule( $name ) {
151		- return isset( $this->_modules[ $name ] ) ? $this->_modules[ $name ] : null;
	122	+ return isset( $this->_modules[$name] ) ? $this->_modules[$name] : null;
152	123	}
153	124
154	125	/**
155	126	* Determines whether the module has been registered or not.
		@@ -156,15 +127,13 @@
156	127	*
157	128	* @since 1.0.0
158	129	*
159	130	* @access public
160		- *
161	131	* @param string $name The name of a module to check.
162		- *
163	132	* @return boolean TRUE if the module has been registered. Otherwise FALSE.
164	133	*/
165	134	public function hasModule( $name ) {
166		- return isset( $this->_modules[ $name ] );
	135	+ return isset( $this->_modules[$name] );
167	136	}
168	137
169	138	/**
170	139	* Register new module in the plugin.
		@@ -171,32 +140,24 @@
171	140	*
172	141	* @since 1.0.0
173	142	*
174	143	* @access public
175		- *
176		- * @param string $class The name of the module to use in the plugin.
	144	+ * @param string $module The name of the module to use in the plugin.
177	145	*/
178	146	public function setModule( $class ) {
179		- $this->_modules[ $class ] = new $class( $this );
	147	+ $this->_modules[$class] = new $class( $this );
180	148	}
181	149
182	150	/**
183		- * Private clone method.
	151	+ * Returns chart types.
184	152	*
185	153	* @since 1.0.0
186	154	*
187		- * @access private
	155	+ * @static
	156	+ * @access public
	157	+ * @return array
188	158	*/
189		- private function __clone() {
	159	+ public static function getChartTypes() {
	160	+ return array( 'line', 'area', 'bar', 'column', 'pie', 'geo', 'scatter', 'candlestick', 'gauge' );
190	161	}
191	162
192		- /**
193		- * For local testing, overrides the 'themeisle_log_event' hook and redirects to error.log.
194		- */
195		- final function themeisle_log_event_debug( $name, $message, $type, $file, $line ) {
196		- if ( Visualizer_Plugin::NAME !== $name ) {
197		- return;
198		- }
199		- error_log( sprintf( '%s (%s): %s in %s:%s', $name, $type, $message, $file, $line ) );
200		- }
201		-
202		-}
	163	+}