Merge pull request #203 from Codeinwp/v221

Adds support manual configuration according to Google Visualization API.
Improves compatibility with more features from the pro version.

Author: selul

.travis.yml

@@ -7,6 +7,7 @@ php:
 - '5.4'
 - '5.3'
 sudo: false
+dist: precise
 matrix:
   include:
   - php: '5.6'

classes/Visualizer/Module.php

@@ -146,11 +146,11 @@ protected function _addShortcode( $tag, $method ) {
 	/**
 	 * Extracts the data for a chart and prepares it for the given type.
 	 *
-	 * @access protected
+	 * @access public
 	 * @param int    $chart_id The chart id.
 	 * @param string $type The exported type.
 	 */
-	protected function _getDataAs( $chart_id, $type ) {
+	public function _getDataAs( $chart_id, $type ) {
 		$final       = null;
 		$success    = false;
 		if ( $chart_id ) {

classes/Visualizer/Module/Admin.php

@@ -58,10 +58,10 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addAction( 'admin_menu', 'registerAdminMenu' );
 		$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
 		$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );
-		$this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
+		$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
+		$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
 	}
 
-
 	/**
 	 * Enqueues media scripts and styles.
 	 *

classes/Visualizer/Module/Chart.php

@@ -228,13 +228,17 @@ public function renderChartPages() {
 						'focusTarget' => 'datum',
 					)
 				);
+				do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
 			}
 			wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
 			defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
 		}
 		// enqueue and register scripts and styles
-		wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array(), Visualizer_Plugin::VERSION );
-		wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
+		wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
+		wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
+
+		wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
+		wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
 		wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
 		wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
 		wp_register_script(
@@ -257,15 +261,19 @@ public function renderChartPages() {
 		}
 		// dispatch pages
 		$this->_chart = get_post( $chart_id );
-		switch ( isset( $_GET['tab'] ) ? $_GET['tab'] : '' ) {
+		$tab    = isset( $_GET['tab'] ) || empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
+		switch ( $tab ) {
 			case 'settings':
 				// changed by Ash/Upwork
 				$this->_handleDataAndSettingsPage();
 				break;
-			case 'type':
-			default:
+			case 'type': // fall through.
+			case 'visualizer': // fall through.
 				$this->_handleTypesPage();
 				break;
+			default:
+				do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
+				break;
 		}
 		defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
 	}
@@ -313,11 +321,21 @@ private function _handleDataAndSettingsPage() {
 			'visualizer-render', 'visualizer', array(
 				'l10n'   => array(
 					'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
+					'loading'       => esc_html__( 'Loading...', 'visualizer' ),
 				),
 				'charts' => array(
 					'canvas' => $data,
 				),
 				'map_api_key' => get_option( 'visualizer-map-api-key' ),
+				'ajax'                 => array(
+					'url'     => admin_url( 'admin-ajax.php' ),
+					'nonces'  => array(
+						'permissions'   => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
+					),
+					'actions' => array(
+						'permissions'   => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
+					),
+				),
 			)
 		);
 		$render          = new Visualizer_Render_Page_Data();
@@ -412,6 +430,12 @@ public function uploadData() {
 		if ( ! isset( $_POST['vz-import-time'] ) ) {
 			apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
 		}
+
+		if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
+			// delete the filters in case this chart is being uploaded from other data sources
+			delete_post_meta( $chart_id, 'visualizer-filter-config' );
+		}
+
 		$source = null;
 		$render = new Visualizer_Render_Page_Update();
 		if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
@@ -548,6 +572,7 @@ private function _handleDataPage() {
 			'visualizer-render', 'visualizer', array(
 				'l10n'   => array(
 					'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
+					'loading'       => esc_html__( 'Loading...', 'visualizer' ),
 				),
 				'charts' => array(
 					'canvas' => $data,

classes/Visualizer/Module/Frontend.php

@@ -77,7 +77,7 @@ function endpoint_register() {
 			'visualizer/v' . VISUALIZER_REST_VERSION,
 			'/action/(?P<chart>\d+)/(?P<type>.+)/',
 			array(
-				'methods'  => 'GET',
+				'methods'  => array( 'GET', 'POST' ),
 				'callback' => array( $this, 'perform_action' ),
 			)
 		);
@@ -130,7 +130,7 @@ public function perform_action( WP_REST_Request $params ) {
 				$data   = $this->_getDataAs( $chart_id, 'xls' );
 				break;
 			default:
-				$data   = apply_filters( 'visualizer_action_data', $data, $chart_id, $type );
+				$data   = apply_filters( 'visualizer_action_data', $data, $chart_id, $type, $params, $this );
 				break;
 		}
 
@@ -151,6 +151,8 @@ public function enqueueScripts() {
 		wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true );
 		wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
 		wp_enqueue_script( 'visualizer-clipboardjs' );
+		wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION );
+		do_action( 'visualizer_pro_frontend_load_resources' );
 	}
 
 	/**
@@ -182,6 +184,10 @@ public function renderChart( $atts ) {
 			return '';
 		}
 
+		if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) {
+			return '';
+		}
+
 		$id = 'visualizer-' . $atts['id'];
 		$defaultClass   = 'visualizer-front';
 		$class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );
@@ -213,7 +219,11 @@ public function renderChart( $atts ) {
 			$data = apply_filters( $atts['data'], $data, $chart->ID, $type );
 		}
 
-		$id = $id . '-' . rand();
+		$id         = $id . '-' . rand();
+		$arguments  = array( '', $id, $settings );
+		apply_filters_ref_array( 'visualizer_pro_inline_css', array( &$arguments ) );
+		$css        = $arguments[0];
+		$settings   = $arguments[2];
 
 		// add chart to the array
 		$this->_charts[ $id ] = array(
@@ -235,12 +245,14 @@ public function renderChart( $atts ) {
 				),
 			)
 		);
+		wp_enqueue_style( 'visualizer-front' );
 
 		$actions_div            = '';
-		if ( ! empty( $settings['actions'] ) ) {
+		$actions_visible        = apply_filters( 'visualizer_pro_add_actions', isset( $settings['actions'] ) ? $settings['actions'] : array(), $atts['id'] );
+		if ( ! empty( $actions_visible ) ) {
 			$actions            = $this->get_actions();
 			$actions_div        = '<div class="visualizer-actions">';
-			foreach ( $settings['actions'] as $action_type ) {
+			foreach ( $actions_visible as $action_type ) {
 				$key            = $action_type;
 				$mime           = '';
 				if ( strpos( $action_type, ';' ) !== false ) {
@@ -262,8 +274,10 @@ public function renderChart( $atts ) {
 
 			$actions_div        .= '</div>';
 		}
+
+		$actions_div            .= $css;
+
 		// return placeholder div
 		return $actions_div . '<div id="' . $id . '"' . $class . '></div>';
 	}
-
 }

classes/Visualizer/Module/Setup.php

@@ -44,6 +44,57 @@ public function __construct( Visualizer_Plugin $plugin ) {
 
 		$this->_addAction( 'init', 'setupCustomPostTypes' );
 		$this->_addAction( 'plugins_loaded', 'loadTextDomain' );
+		$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
+		$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
+	}
+	/**
+	 * Fetches the SDK logger data.
+	 *
+	 * @param array $data The default data that needs to be sent.
+	 *
+	 * @access public
+	 */
+	public function getLoggerData( $data ) {
+		return $this->getChartCountsByTypeAndMeta();
+	}
+
+	/**
+	 * Fetches the types of charts created and their counts.
+	 *
+	 * @param array $meta_keys An array of name vs. meta keys - to return how many charts have these keys.
+	 * @access private
+	 */
+	public function getChartCountsByTypeAndMeta( $meta_keys = array() ) {
+		$charts                 = array();
+		$charts['chart_types']  = array();
+		// the initial query arguments to fetch charts
+		$query_args = array(
+			'post_type'         => Visualizer_Plugin::CPT_VISUALIZER,
+			'posts_per_page'    => 300,
+			'fields'            => 'ids',
+			'no_rows_found'     => false,
+			'update_post_meta_cache' => false,
+			'update_post_term_cache' => false,
+
+		);
+
+		$query  = new WP_Query( $query_args );
+		while ( $query->have_posts() ) {
+			$chart_id   = $query->next_post();
+			$type       = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
+			$charts['chart_types'][ $type ]    = isset( $charts['chart_types'][ $type ] ) ? $charts['chart_types'][ $type ] + 1 : 1;
+			if ( ! empty( $meta_keys ) ) {
+				foreach ( $meta_keys as $name => $key ) {
+					$data   = get_post_meta( $chart_id, $key, true );
+					if ( ! empty( $data ) ) {
+						$charts[ $name ] = isset( $charts[ $name ] ) ? $charts[ $name ] + 1 : 1;
+					} else {
+						$charts[ $name ] = 0;
+					}
+				}
+			}
+		}
+		return $charts;
 	}
 
 	/**

classes/Visualizer/Module/Sources.php

@@ -130,11 +130,12 @@ public function filterChartData( $data, $chart_id ) {
 	 * @return string The new html code.
 	 */
 	public function addProUpsell( $old, $feature = null ) {
+		$biz_features   = array( 'schedule-chart', 'chart-permissions' );
 		$return  = '';
 		$feature = strval( $feature );
-		if ( empty( $feature ) || ( $feature == 'schedule-chart' && ! apply_filters( 'visualizer_is_business', false ) ) ) {
+		if ( empty( $feature ) || ( in_array( $feature, $biz_features ) && ! apply_filters( 'visualizer_is_business', false ) ) ) {
 			$plan = 'PRO';
-			if ( $feature === 'schedule-chart' ) {
+			if ( in_array( $feature, $biz_features ) ) {
 				$plan = 'BUSINESS';
 			}
 			$return = '<div class="only-pro-content">';

classes/Visualizer/Plugin.php

@@ -28,7 +28,7 @@
 class Visualizer_Plugin {
 
 	const NAME = 'visualizer';
-	const VERSION = '2.2.0';
+	const VERSION = '3.0.0';
 
 	// custom post types
 	const CPT_VISUALIZER = 'visualizer';
@@ -40,6 +40,8 @@ class Visualizer_Plugin {
 	const CF_DEFAULT_DATA = 'visualizer-default-data';
 	const CF_SETTINGS = 'visualizer-settings';
 
+	const CF_SOURCE_FILTER = 'visualizer-source-filter';
+
 	// custom actions
 	const ACTION_GET_CHARTS = 'visualizer-get-charts';
 	const ACTION_CREATE_CHART = 'visualizer-create-chart';
@@ -50,6 +52,11 @@ class Visualizer_Plugin {
 	// Added by Ash/Upwork
 	const ACTION_EXPORT_DATA = 'visualizer-export-data';
 
+	/**
+	 *Action used for fetching specific users/roles for permissions.
+	 */
+	const ACTION_FETCH_PERMISSIONS_DATA = 'visualizer-fetch-permissions-data';
+
 	// custom filters
 	const FILTER_CHART_WRAPPER_CLASS = 'visualizer-chart-wrapper-class';
 	const FILTER_GET_CHART_SERIES = 'visualizer-get-chart-series';

classes/Visualizer/Render/Library.php

@@ -217,6 +217,8 @@ private function _renderSidebar() {
 			echo '<h3>' . __( 'Gain more editing power', 'visualizer' ) . '</h3><ul>';
 			echo '<li>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>';
 			echo '<li>' . __( 'Import from other charts', 'visualizer' ) . '</li>';
+			echo '<li>' . __( 'Frontend editor', 'visualizer' ) . '</li>';
+			echo '<li>' . __( 'Private charts', 'visualizer' ) . '</li>';
 			echo '<li>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li>';
 			echo '<li>' . __( '3 more chart types', 'visualizer' ) . '</li></ul>';
 			echo '<a href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a>';