Merge pull request #212 from Codeinwp/development

Fix dependency for composer dependencies.

Author: selul

classes/Visualizer/Module.php

@@ -249,18 +249,25 @@ private function _getCSV( $rows, $filename ) {
 	 * @param string $filename The name of the file to use.
 	 */
 	private function _getExcel( $rows, $filename ) {
-		$chart      = $filename;
+		// PHPExcel does not like sheet names longer than 31 characters.
+		$chart      = substr( $filename, 0, 30 );
 		$filename   .= '.xlsx';
 
-		$doc        = new PHPExcel();
-		$doc->getActiveSheet()->fromArray( $rows, null, 'A1' );
-		$doc->getActiveSheet()->setTitle( $chart );
-		$doc        = apply_filters( 'visualizer_excel_doc', $doc );
-		$writer = PHPExcel_IOFactory::createWriter( $doc, 'Excel2007' );
-		ob_start();
-		$writer->save( 'php://output' );
-		$xlsData = ob_get_contents();
-		ob_end_clean();
+		$xlsData    = '';
+		if ( class_exists( 'PHPExcel' ) ) {
+			$doc        = new PHPExcel();
+			$doc->getActiveSheet()->fromArray( $rows, null, 'A1' );
+			$doc->getActiveSheet()->setTitle( $chart );
+			$doc        = apply_filters( 'visualizer_excel_doc', $doc );
+			$writer = PHPExcel_IOFactory::createWriter( $doc, 'Excel2007' );
+			ob_start();
+			$writer->save( 'php://output' );
+			$xlsData = ob_get_contents();
+			ob_end_clean();
+		} else {
+			do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Class PHPExcel does not exist!', 'error', __FILE__, __LINE__ );
+			error_log( 'Class PHPExcel does not exist!' );
+		}
 		return array(
 			'csv'  => 'data:application/vnd.ms-excel;base64,' . base64_encode( $xlsData ),
 			'name' => $filename,

classes/Visualizer/Plugin.php

@@ -28,7 +28,7 @@
 class Visualizer_Plugin {
 
 	const NAME = 'visualizer';
-	const VERSION = '3.0.1';
+	const VERSION = '3.0.2';
 
 	// custom post types
 	const CPT_VISUALIZER = 'visualizer';

classes/Visualizer/Render/Sidebar.php

@@ -208,7 +208,7 @@ protected function _renderActionSettings() {
 				esc_html__( 'To enable downloading the data as a CSV.', 'visualizer' )
 			);
 
-			$disabled   = ! ( extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) );
+			$disabled   = ! ( class_exists( 'PHPExcel' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) );
 			self::_renderCheckboxItem(
 				esc_html__( 'Excel', 'visualizer' ),
 				'actions[]',

composer.json

@@ -6,12 +6,6 @@
     "charts",
     "visualization"
   ],
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/Codeinwp/themeisle-sdk"
-    }
-  ],
   "homepage": "https://themeisle.com/plugins/visualizer/",
   "license": "GPL-2.0+",
   "authors": [

css/media.css

@@ -1,5 +1,5 @@
 /*
-	Version: 3.0.1
+	Version: 3.0.2
 */
 #visualizer-library-view {
 	padding: 30px 10px 10px 30px;

index.php

@@ -4,7 +4,7 @@
 	Plugin Name: Visualizer: Charts and Graphs Lite
 	Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/
 	Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases.
-	Version: 3.0.1
+	Version: 3.0.2
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later