Merge pull request #536 from Codeinwp/development

Increase minimum requirement to PHP 5.6
Fixed issue with loading customization.js on multisites
Fixed issue with manually editing a remotely loaded chart
Fixed issues with cloning
Fixed issues with ChartJS assigning default colors
Fix security issues in block editor

Author: contactashish13

.travis.yml

@@ -8,17 +8,12 @@ matrix:
     - php: 7.1
     - php: 7.0
     - php: '5.6'
+    - name: Wraith
+      php: '5.6'
       install: true
       before_script: chmod +x bin/wraith.sh
       env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
       script: "./bin/wraith.sh"
-    - php: 5.5
-      env: WP_VERSION=5.1
-    - php: 5.4
-      env: WP_VERSION=5.1
-    - php: 5.3
-      env: WP_VERSION=5.1
-      dist: precise
   allow_failures:
     - env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
 branches:

classes/Visualizer/Gutenberg/Block.php

@@ -60,6 +60,7 @@ private function __construct() {
 		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_gutenberg_scripts' ) );
 		add_action( 'init', array( $this, 'register_block_type' ) );
 		add_action( 'rest_api_init', array( $this, 'register_rest_endpoints' ) );
+		add_filter( 'rest_visualizer_query', array( $this, 'add_rest_query_vars' ), 9, 2 );
 	}
 
 	/**
@@ -191,6 +192,10 @@ public function register_rest_endpoints() {
 	 * Get Post Meta Fields
 	 */
 	public function get_visualizer_data( $post ) {
+		if ( ! current_user_can( 'edit_posts' ) ) {
+			return false;
+		}
+
 		$data = array();
 		$post_id = $post['id'];
 
@@ -238,6 +243,10 @@ public function get_visualizer_data( $post ) {
 	 * Rest Callback Method
 	 */
 	public function update_chart_data( $data ) {
+		if ( ! current_user_can( 'edit_posts' ) ) {
+			return false;
+		}
+
 		if ( $data['id'] && ! is_wp_error( $data['id'] ) ) {
 
 			update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $data['visualizer-chart-type'] );
@@ -351,6 +360,10 @@ public function toUTF8( $datum ) {
 	 * Handle remote CSV data
 	 */
 	public function upload_csv_data( $data ) {
+		if ( ! current_user_can( 'edit_posts' ) ) {
+			return false;
+		}
+
 		if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) {
 			$source = new Visualizer_Source_Csv_Remote( $data['url'] );
 			if ( $source->fetch() ) {
@@ -374,6 +387,10 @@ public function upload_csv_data( $data ) {
 	 * Get permission data
 	 */
 	public function get_permission_data( $data ) {
+		if ( ! current_user_can( 'edit_posts' ) ) {
+			return false;
+		}
+
 		$options = array();
 		switch ( $data['type'] ) {
 			case 'users':
@@ -413,4 +430,15 @@ public function get_permission_data( $data ) {
 		return $options;
 	}
 
+	/**
+	 * Filter Rest Query
+	 */
+	public function add_rest_query_vars( $args, \WP_REST_Request $request ) {
+		if ( isset( $request['meta_key'] ) && isset( $request['meta_value'] ) ) {
+			$args['meta_key'] = $request->get_param( 'meta_key' );
+			$args['meta_value'] = $request->get_param( 'meta_value' );
+			$args['meta_compare'] = '!=';
+		}
+		return $args;
+	}
 }

classes/Visualizer/Gutenberg/build/block.css

@@ -17,7 +17,8 @@
 		"merge": "^1.2.1",
 		"react": "16.4.1",
 		"react-google-charts": "^3.0.8",
-		"react-json-editor-ajrm": "^2.5.8"
+		"react-json-editor-ajrm": "^2.5.8",
+		"uuid": "^3.3.3"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.1.6",

classes/Visualizer/Gutenberg/build/block.js

@@ -46,7 +46,7 @@ class Charts extends Component {
 	async componentDidMount() {
 
 		// Fetch review again if block loaded after saving.
-		let result = await apiFetch({ path: 'wp/v2/visualizer/?per_page=6' });
+		let result = await apiFetch({ path: 'wp/v2/visualizer/?per_page=6&meta_key=visualizer-chart-library&meta_value=ChartJS' });
 		this.setState({ charts: result });
 	}
 
@@ -56,7 +56,7 @@ class Charts extends Component {
 
 		this.setState({ isBusy: true });
 
-		let result = await apiFetch({ path: `wp/v2/visualizer/?per_page=6&offset=${ offset }` });
+		let result = await apiFetch({ path: `wp/v2/visualizer/?per_page=6&meta_key=visualizer-chart-library&meta_value=ChartJS&offset=${ offset }` });
 
 		if ( 6 > result.length ) {
 			chartsLoaded = true;