← All changes | classes/Visualizer/Source/Query.php +33 -145 4.0.5 → 3.2.0 View file →

		@@ -35,55 +35,18 @@
35	35	*/
36	36	protected $_query;
37	37
38	38	/**
39		- * The chart id.
40		- *
41		- * @access protected
42		- * @var int
43		- */
44		- protected $_chart_id;
45		-
46		- /**
47		- * Any additional parameters (e.g. for connecting to a remote db).
48		- *
49		- * @access protected
50		- * @var array
51		- */
52		- protected $_params;
53		-
54		- /**
55	39	* Constructor.
56	40	*
57	41	* @access public
58	42	* @param string $query The query.
59		- * @param int $chart_id The chart id.
60		- * @param array $params Any additional parameters (e.g. for connecting to a remote db).
61	43	*/
62		- public function __construct( $query = null, $chart_id = null, $params = null ) {
63		- $this->_query = $this->strip_sql_comments( $query );
64		- $this->_chart_id = $chart_id;
65		- $this->_params = $params;
	44	+ public function __construct( $query = null ) {
	45	+ $this->_query = $query;
66	46	}
67	47
68	48	/**
69		- * Strips SQL comments from the query.
70		- *
71		- * @param string $query The query.
72		- *
73		- * @return string
74		- */
75		- private function strip_sql_comments( $query = '' ) {
76		- if ( empty( $query ) ) {
77		- return $query;
78		- }
79		-
80		- // Regex https://regex101.com/r/xd5Vrg/1
81		- $sql_comments_regex = '@(--[^\r\n]*)|(\#[^\r\n]*)|(/\*[\w\W]*?(?=\*/)\*/)@ms';
82		- return trim( preg_replace( $sql_comments_regex, '', $query ) );
83		- }
84		-
85		- /**
86	49	* Fetches information from source, parses it and builds series and data arrays.
87	50	*
88	51	* @param bool $as_html Should the result be fetched as an HTML table or as an object.
89	52	* @param bool $results_as_numeric_array Should the result be fetched as ARRAY_N instead of ARRAY_A.
		@@ -95,128 +58,52 @@
95	58	if ( empty( $this->_query ) ) {
96	59	return false;
97	60	}
98	61
99		- // only select queries allowed. must start with SELECT keyword.
100		- if ( ! preg_match( '/^(\bselect\b)\s/i', $this->_query ) ) {
101		- $this->_error = __( 'Only SELECT queries are allowed', 'visualizer' );
102		- return false;
103		- }
104		-
105		- // if previous check passed, check for disallowed query parts to prevent subqueries and other harmful queries.
106		- $disallow_query_parts = array(
107		- 'CREATE',
108		- 'ALTER',
109		- 'TRUNCATE',
110		- 'DROP',
111		-
112		- 'INSERT',
113		- 'DELETE',
114		- 'UPDATE',
115		- 'REPLACE',
116		-
117		- 'RENAME',
118		- 'COMMIT',
119		- 'ROLLBACK',
120		- 'MERGE',
121		- 'CALL',
122		- 'EXPLAIN',
123		- 'LOCK',
124		- 'GRANT',
125		- 'REVOKE',
126		- 'SAVEPOINT',
127		- 'TRANSACTION',
128		- 'SET',
129		- );
130		- $disallow_regex = implode(
131		- '|',
132		- array_map(
133		- function ( $value ) {
134		- return '\b' . $value . '\b';
135		- }, $disallow_query_parts
136		- )
137		- );
138		-
139		- if ( preg_match( '/(' . $disallow_regex . ')/i', $this->_query) !== 0 ) {
140		- $this->_error = __( 'Only SELECT queries are allowed', 'visualizer' );
141		- return false;
142		- }
143		-
144	62	// impose a limit if no limit clause is provided.
145	63	if ( strpos( strtolower( $this->_query ), ' limit ' ) === false ) {
146		- $this->_query .= ' LIMIT ' . apply_filters( 'visualizer_sql_query_limit', 1000, $this->_chart_id );
	64	+ $this->_query .= ' LIMIT ' . apply_filters( 'visualizer_sql_query_limit', 1000 );
147	65	}
148	66
149		- $this->_query = apply_filters( 'visualizer_db_query', $this->_query, $this->_chart_id, $this->_params );
	67	+ global $wpdb;
	68	+ $wpdb->hide_errors();
	69	+ // @codingStandardsIgnoreStart
	70	+ $rows = $wpdb->get_results( $this->_query, $results_as_numeric_array ? ARRAY_N : ARRAY_A );
	71	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Firing query %s to get results %s with error %s', $this->_query, print_r( $rows, true ), print_r( $wpdb->last_error, true ) ), 'debug', __FILE__, __LINE__ );
	72	+ // @codingStandardsIgnoreEnd
	73	+ $wpdb->show_errors();
150	74
151		- $results = array();
152		- $headers = array();
153		-
154		- // short circuit results for remote dbs.
155		- $remote_results = apply_filters( 'visualizer_db_query_execute', false, $this->_query, $as_html, $results_as_numeric_array, $raw_results, $this->_chart_id, $this->_params );
156		- if ( false !== $remote_results ) {
157		- $error = $remote_results['error'];
158		- if ( empty( $error ) ) {
159		- $results = $remote_results['results'];
160		- $headers = $remote_results['headers'];
161		- }
162		-
163		- $this->_error = $error;
164		-
165		- if ( $raw_results ) {
166		- return $results;
167		- }
	75	+ if ( $raw_results ) {
	76	+ return $rows;
168	77	}
169	78
170		- if ( ! ( $results && $headers ) ) {
171		- global $wpdb;
172		- $wpdb->hide_errors();
173		- // @codingStandardsIgnoreStart
174		- $rows = $wpdb->get_results( $this->_query, $results_as_numeric_array ? ARRAY_N : ARRAY_A );
175		- // @codingStandardsIgnoreEnd
176		- $wpdb->show_errors();
177		-
178		- if ( $raw_results ) {
179		- return $rows;
180		- }
181		-
182		- if ( $wpdb->last_error ) {
183		- $this->_error = $wpdb->last_error;
184		- return array();
185		- }
186		-
	79	+ if ( $rows ) {
	80	+ $results = array();
	81	+ $headers = array();
187	82	if ( $rows ) {
188		- $results = array();
189		- $headers = array();
190		- if ( $rows ) {
191		- $row_num = 0;
192		- foreach ( $rows as $row ) {
193		- $result = array();
194		- $col_num = 0;
195		- foreach ( $row as $k => $v ) {
196		- $result[] = $v;
197		- if ( 0 === $row_num ) {
198		- $headers[] = array( 'type' => $this->get_col_type( $col_num++ ), 'label' => $k );
199		- }
	83	+ $row_num = 0;
	84	+ foreach ( $rows as $row ) {
	85	+ $result = array();
	86	+ $col_num = 0;
	87	+ foreach ( $row as $k => $v ) {
	88	+ $result[] = $v;
	89	+ if ( 0 === $row_num ) {
	90	+ $headers[] = array( 'type' => $this->get_col_type( $col_num++ ), 'label' => $k );
200	91	}
201		- $results[] = $result;
202		- ++$row_num;
203	92	}
	93	+ $results[] = $result;
	94	+ $row_num++;
204	95	}
	96	+ }
205	97
206		- $this->_error = $wpdb->last_error;
	98	+ if ( $as_html ) {
	99	+ return $this->html( $headers, $results );
207	100	}
	101	+ return $this->object( $headers, $results );
208	102	}
209		- // Query log.
210		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Firing query %s to get results %s with error %s', $this->_query, print_r( $rows, true ), print_r( $wpdb->last_error, true ) ), 'debug', __FILE__, __LINE__ );
211	103
212		- if ( $as_html ) {
213		- $results = $this->html( $headers, $results );
214		- } else {
215		- $results = $this->object( $headers, $results );
216		- }
217		-
218		- return apply_filters( 'visualizer_db_query_results', $results, $headers, $as_html, $results_as_numeric_array, $raw_results, $this->_query, $this->_chart_id, $this->_params );
	104	+ $this->_error = $wpdb->last_error;
	105	+ return null;
219	106	}
220	107
221	108	/**
222	109	* Get the data type of the column.
		@@ -278,9 +165,10 @@
278	165	foreach ( $results as $row ) {
279	166	$data[] = $this->_normalizeData( $row );
280	167	}
281	168	$this->_data = $data;
282		- return $this->_data;
	169	+
	170	+ return true;
283	171	}
284	172
285	173	/**
286	174	* Returns the final query.