← All changes | classes/Visualizer/Source/Query.php +43 -82 3.10.1 → 3.1.1 View file →

		@@ -35,35 +35,23 @@
35	35	*/
36	36	protected $_query;
37	37
38	38	/**
39		- * The chart id.
	39	+ * The error message.
40	40	*
41	41	* @access protected
42		- * @var int
	42	+ * @var string
43	43	*/
44		- protected $_chart_id;
	44	+ protected $_error;
45	45
46	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	47	* Constructor.
56	48	*
57	49	* @access public
58	50	* @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	51	*/
62		- public function __construct( $query = null, $chart_id = null, $params = null ) {
	52	+ public function __construct( $query = null ) {
63	53	$this->_query = $query;
64		- $this->_chart_id = $chart_id;
65		- $this->_params = $params;
66	54	}
67	55
68	56	/**
69	57	* Fetches information from source, parses it and builds series and data arrays.
		@@ -68,93 +56,55 @@
68	56	/**
69	57	* Fetches information from source, parses it and builds series and data arrays.
70	58	*
71	59	* @param bool $as_html Should the result be fetched as an HTML table or as an object.
72		- * @param bool $results_as_numeric_array Should the result be fetched as ARRAY_N instead of ARRAY_A.
73		- * @param bool $raw_results Should the result be returned without processing.
74	60	* @access public
75	61	* @return boolean TRUE on success, otherwise FALSE.
76	62	*/
77		- public function fetch( $as_html = false, $results_as_numeric_array = false, $raw_results = false ) {
	63	+ public function fetch( $as_html = false ) {
78	64	if ( empty( $this->_query ) ) {
79	65	return false;
80	66	}
81	67
82		- // only select queries allowed.
83		- if ( preg_match( '/^\s*(insert|delete|update|replace|create|alter|drop|truncate)\s/i', $this->_query ) ) {
84		- $this->_error = __( 'Only SELECT queries are allowed', 'visualizer' );
85		- return false;
86		- }
87		-
88	68	// impose a limit if no limit clause is provided.
89	69	if ( strpos( strtolower( $this->_query ), ' limit ' ) === false ) {
90		- $this->_query .= ' LIMIT ' . apply_filters( 'visualizer_sql_query_limit', 1000, $this->_chart_id );
	70	+ $this->_query .= ' LIMIT ' . apply_filters( 'visualizer_sql_query_limit', 300 );
91	71	}
92	72
93		- $this->_query = apply_filters( 'visualizer_db_query', $this->_query, $this->_chart_id, $this->_params );
	73	+ global $wpdb;
	74	+ $wpdb->hide_errors();
	75	+ // @codingStandardsIgnoreStart
	76	+ $rows = $wpdb->get_results( $this->_query, ARRAY_A );
	77	+ // @codingStandardsIgnoreEnd
	78	+ $wpdb->show_errors();
94	79
95		- $results = array();
96		- $headers = array();
97		-
98		- // short circuit results for remote dbs.
99		- if ( false !== ( $remote_results = apply_filters( 'visualizer_db_query_execute', false, $this->_query, $as_html, $results_as_numeric_array, $raw_results, $this->_chart_id, $this->_params ) ) ) {
100		- $error = $remote_results['error'];
101		- if ( empty( $error ) ) {
102		- $results = $remote_results['results'];
103		- $headers = $remote_results['headers'];
104		- }
105		-
106		- $this->_error = $error;
107		-
108		- if ( $raw_results ) {
109		- return $results;
110		- }
111		- }
112		-
113		- if ( ! ( $results && $headers ) ) {
114		- global $wpdb;
115		- $wpdb->hide_errors();
116		- // @codingStandardsIgnoreStart
117		- $rows = $wpdb->get_results( $this->_query, $results_as_numeric_array ? ARRAY_N : ARRAY_A );
118		- // @codingStandardsIgnoreEnd
119		- $wpdb->show_errors();
120		-
121		- if ( $raw_results ) {
122		- return $rows;
123		- }
124		-
	80	+ if ( $rows ) {
	81	+ $results = array();
	82	+ $headers = array();
125	83	if ( $rows ) {
126		- $results = array();
127		- $headers = array();
128		- if ( $rows ) {
129		- $row_num = 0;
130		- foreach ( $rows as $row ) {
131		- $result = array();
132		- $col_num = 0;
133		- foreach ( $row as $k => $v ) {
134		- $result[] = $v;
135		- if ( 0 === $row_num ) {
136		- $headers[] = array( 'type' => $this->get_col_type( $col_num++ ), 'label' => $k );
137		- }
	84	+ $row_num = 0;
	85	+ foreach ( $rows as $row ) {
	86	+ $result = array();
	87	+ $col_num = 0;
	88	+ foreach ( $row as $k => $v ) {
	89	+ $result[] = $v;
	90	+ if ( 0 === $row_num ) {
	91	+ $headers[] = array( 'type' => $this->get_col_type( $col_num++ ), 'label' => $k );
138	92	}
139		- $results[] = $result;
140		- $row_num++;
141	93	}
	94	+ $results[] = $result;
	95	+ $row_num++;
142	96	}
	97	+ }
143	98
144		- $this->_error = $wpdb->last_error;
	99	+ if ( $as_html ) {
	100	+ return $this->html( $headers, $results );
145	101	}
	102	+ return $this->object( $headers, $results );
146	103	}
147		- // Query log.
148		- 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__ );
149	104
150		- if ( $as_html ) {
151		- $results = $this->html( $headers, $results );
152		- } else {
153		- $results = $this->object( $headers, $results );
154		- }
155		-
156		- return apply_filters( 'visualizer_db_query_results', $results, $headers, $as_html, $results_as_numeric_array, $raw_results, $this->_query, $this->_chart_id, $this->_params );
	105	+ $this->_error = $wpdb->last_error;
	106	+ return null;
157	107	}
158	108
159	109	/**
160	110	* Get the data type of the column.
		@@ -216,9 +166,20 @@
216	166	foreach ( $results as $row ) {
217	167	$data[] = $this->_normalizeData( $row );
218	168	}
219	169	$this->_data = $data;
220		- return $this->_data;
	170	+
	171	+ return true;
	172	+ }
	173	+
	174	+ /**
	175	+ * Returns the error, if any.
	176	+ *
	177	+ * @access public
	178	+ * @return string
	179	+ */
	180	+ public function get_error() {
	181	+ return $this->_error;
221	182	}
222	183
223	184	/**
224	185	* Returns the final query.