← All changes | classes/Visualizer/Source/Json.php +14 -107 4.0.3 → 3.4.8 View file →

		@@ -69,18 +69,8 @@
69	69	*/
70	70	protected $_headers;
71	71
72	72	/**
73		- * The other headers.
74		- *
75		- * @since 3.4.11
76		- *
77		- * @access protected
78		- * @var array
79		- */
80		- protected $_additional_headers;
81		-
82		- /**
83	73	* The array that contains the definition of the data.
84	74	*
85	75	* @since 1.0.0
86	76	*
		@@ -118,11 +108,8 @@
118	108	}
119	109	if ( isset( $this->_args['method'] ) ) {
120	110	$this->_headers['method'] = $this->_args['method'];
121	111	}
122		- if ( isset( $this->_args['additional_headers'] ) ) {
123		- $this->_additional_headers = $this->_args['additional_headers'];
124		- }
125	112	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Constructor called for params = %s', print_r( $params, true ) ), 'debug', __FILE__, __LINE__ );
126	113	}
127	114
128	115	/**
		@@ -320,8 +307,9 @@
320	307	$rows[] = $row;
321	308	}
322	309
323	310	return $rows;
	311	+
324	312	}
325	313
326	314	/**
327	315	* Get the next page URL.
		@@ -329,9 +317,9 @@
329	317	* @since ?
330	318	*
331	319	* @access private
332	320	*/
333		- private function getNextPage( $data ) {
	321	+ private function getNextPage( $array ) {
334	322	if ( empty( $this->_paging ) ) {
335	323	return null;
336	324	}
337	325
		@@ -337,12 +325,12 @@
337	325
338	326	$root = explode( self::TAG_SEPARATOR, $this->_paging );
339	327	// get rid of the first element as that is the faux root element indicator
340	328	array_shift( $root );
341		- $leaf = $data;
	329	+ $leaf = $array;
342	330	foreach ( $root as $tag ) {
343	331	if ( array_key_exists( $tag, $leaf ) ) {
344		- $leaf = $leaf[ $tag ];
	332	+ $leaf = $array[ $tag ];
345	333	} else {
346	334	// if the tag does not exist, we assume it is present in the 0th element of the current array.
347	335	// TODO: we may want to change this to a filter later.
348	336	$leaf = $leaf[0][ $tag ];
		@@ -360,21 +348,21 @@
360	348	* @since ?
361	349	*
362	350	* @access private
363	351	*/
364		- private function getRootElements( $parent_key, $now, $root, $data ) {
365		- if ( is_null( $data ) ) {
	352	+ private function getRootElements( $parent, $now, $root, $array ) {
	353	+ if ( is_null( $array ) ) {
366	354	return null;
367	355	}
368	356
369		- $root[] = $parent_key;
370		- foreach ( $data as $key => $value ) {
	357	+ $root[] = $parent;
	358	+ foreach ( $array as $key => $value ) {
371	359	if ( is_array( $value ) && ! empty( $value ) ) {
372	360	if ( ! is_numeric( $key ) ) {
373		- $now = sprintf( '%s%s%s', $parent_key, self::TAG_SEPARATOR, $key );
	361	+ $now = sprintf( '%s%s%s', $parent, self::TAG_SEPARATOR, $key );
374	362	$root[] = $now;
375	363	} else {
376		- $now = $parent_key;
	364	+ $now = $parent;
377	365	}
378	366	$root = $this->getRootElements( $now, $key, $root, $value );
379	367	}
380	368	}
		@@ -402,12 +390,9 @@
402	390	}
403	391
404	392	// this filter can be used to rearrange columns e.g. in candlestick charts
405	393	// or to add additional data to the root.
406		- $bom = pack( 'H*', 'EFBBBF' );
407		- $response_body = wp_remote_retrieve_body( $response );
408		- $response_body = preg_replace( "/^$bom/", '', $response_body );
409		- $array = apply_filters( 'visualizer_json_massage_data', json_decode( $response_body, true ), $url );
	394	+ $array = apply_filters( 'visualizer_json_massage_data', json_decode( wp_remote_retrieve_body( $response ), true ), $url );
410	395
411	396	do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'JSON array for the endpoint is %s = ', print_r( $array, true ) ), 'debug', __FILE__, __LINE__ );
412	397
413	398	return $array;
		@@ -424,13 +409,9 @@
424	409	$args = array( 'method' => 'GET' );
425	410	if ( ! empty( $this->_headers ) ) {
426	411	$args = array( 'method' => strtoupper( $this->_headers['method'] ) );
427	412	if ( array_key_exists( 'auth', $this->_headers ) ) {
428		- if ( ! empty( $this->_headers['auth'] ) ) {
429		- $header_auth = explode( ':', $this->_headers['auth'] );
430		- $header_key = explode( ' ', reset( $header_auth ) );
431		- $args['headers'] = array( 'Authorization' => reset( $header_key ) . ' ' . base64_encode( end( $header_key ) . ':' . end( $header_auth ) ) );
432		- }
	413	+ $args['headers'] = array( 'Authorization' => $this->_headers['auth'] );
433	414	} elseif ( array_key_exists( 'username', $this->_headers ) && array_key_exists( 'password', $this->_headers ) && ! empty( $this->_headers['username'] ) && ! empty( $this->_headers['password'] ) ) {
434	415	$args['headers'] = array( 'Authorization' => 'Basic ' . base64_encode( $this->_headers['username'] . ':' . $this->_headers['password'] ) );
435	416	}
436	417	}
		@@ -435,40 +416,10 @@
435	416	}
436	417	}
437	418
438	419	$args = apply_filters( 'visualizer_json_args', $args, $url );
439		- if ( ! empty( $this->_additional_headers ) ) {
440		- $this->_additional_headers = explode( ',', $this->_additional_headers );
441		- $this->_additional_headers = array_filter( $this->_additional_headers );
442		- if ( ! empty( $this->_additional_headers ) ) {
443		- $this->_additional_headers = array_map(
444		- function ( $headers ) {
445		- $headers = explode( ':', $headers );
446		- $headers = array_map( 'trim', $headers );
447		- return $headers;
448		- },
449		- $this->_additional_headers
450		- );
451		- foreach ( $this->_additional_headers as $additional_headers ) {
452		- $header_key = reset( $additional_headers );
453		- $header_value = end( $additional_headers );
454		- $args['headers'][ $header_key ] = $header_value;
455		- }
456		- }
457		- }
	420	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Connecting to %s with args = %s ', $url, print_r( $args, true ) ), 'debug', __FILE__, __LINE__ );
458	421
459		- // Check if this is a WooCommerce endpoint request and add verification token.
460		- if ( $this->is_woocommerce_request( $url ) ) {
461		- // Generate a unique token for this specific request.
462		- $token = wp_generate_password( 32, false );
463		- set_transient( 'visualizer_wc_token_' . $token, time(), 60 );
464		- if ( ! isset( $args['headers'] ) ) {
465		- $args['headers'] = array();
466		- }
467		- $args['headers']['X-Visualizer-Token'] = $token;
468		- }
469		-
470		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Connecting to %s with args = %s ', $url, print_r( $args, true ) ), 'debug', __FILE__, __LINE__ );
471	422	return wp_remote_request( $url, $args );
472	423	}
473	424
474	425	/**
		@@ -498,53 +449,8 @@
498	449	return true;
499	450	}
500	451
501	452	/**
502		- * Check if the URL is a WooCommerce endpoint request.
503		- *
504		- * @access private
505		- * @param string $url The URL to check.
506		- * @return bool True if it's a WooCommerce request, false otherwise.
507		- */
508		- private function is_woocommerce_request( $url ) {
509		- if ( empty( $url ) ) {
510		- return false;
511		- }
512		-
513		- $parsed_url = function_exists( 'wp_parse_url' ) ? wp_parse_url( $url ) : parse_url( $url );
514		- if ( empty( $parsed_url ) || empty( $parsed_url['host'] ) || empty( $parsed_url['path'] ) ) {
515		- return false;
516		- }
517		-
518		- $site_url = function_exists( 'home_url' ) ? home_url() : ( function_exists( 'site_url' ) ? site_url() : '' );
519		- $site_parts = $site_url ? ( function_exists( 'wp_parse_url' ) ? wp_parse_url( $site_url ) : parse_url( $site_url ) ) : array();
520		- if ( empty( $site_parts['host'] ) ) {
521		- return false;
522		- }
523		-
524		- $target_host = strtolower( $parsed_url['host'] );
525		- $site_host = strtolower( $site_parts['host'] );
526		- if ( $target_host !== $site_host ) {
527		- return false;
528		- }
529		-
530		- $path = '/' . ltrim( $parsed_url['path'], '/' );
531		- $wc_patterns = array(
532		- '/wp-json/wc/',
533		- '/wp-json/wc-analytics/',
534		- '/wc-analytics/',
535		- );
536		-
537		- foreach ( $wc_patterns as $pattern ) {
538		- if ( strpos( $path, $pattern ) !== false ) {
539		- return true;
540		- }
541		- }
542		-
543		- return false;
544		- }
545		-
546		- /**
547	453	* Returns source name.
548	454	*
549	455	* @since 1.0.0
550	456	*
		@@ -553,5 +459,6 @@
553	459	*/
554	460	public function getSourceName() {
555	461	return __CLASS__;
556	462	}
	463	+
557	464	}