From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 14 Mar 2018 14:54:39 +0000 (+0000)
Subject: wip #1981 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=84cb57a165c492d4e150586ac7ce7b417d443b8c;p=cubeextranet.git

wip #1981 @2
---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index cc7a863d9..28115162e 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -189,6 +189,7 @@ class wsFlash extends cubeFlashGateway {
 				continue;
 			}
 			$fname = cubeFiles::tidyName($infos['name']);
+			$res = $fname;
 			$dir = WS_THEMES . '/' . $this->args['theme_id'] . '/';
 			$dest = $dir . $fname;
 
@@ -218,6 +219,16 @@ class wsFlash extends cubeFlashGateway {
 				$icotool->execute();
 			}
 
+			if (in_array(strtolower(files::getExtension($dest)), array('svg'))) {
+				// Optimize & rasterize SVG
+				$orig = str_replace('.svg', '.o.svg', $dest);
+				rename($dest, $orig);
+				$png = str_replace('.svg', '.png', $dest);
+
+				`/usr/local/bin/svgcleaner $orig $dest`;
+				`convert -background none $dest $png`;
+			}
+
 			$this->xml->addChild('file', $fname);
 			return;
 		}
@@ -246,10 +257,25 @@ class wsFlash extends cubeFlashGateway {
 			}
 			$dest = $dir . $fname;
 			move_uploaded_file($infos['tmp_name'], $dest);
-			if (in_array(strtolower(files::getExtension($dest)), array('flv', 'f4v', 'mp4'))) {
-				// convert uploaded file as webvideo (ogv and mp4)
-				wsTools::encodeWebVideos($dest, null, true, false);
+			switch (strtolower(files::getExtension($dest))) {
+				case 'flv':
+				case 'f4v':
+				case 'mp4':
+					// convert uploaded file as webvideo (ogv and mp4)
+					wsTools::encodeWebVideos($dest, null, true, false);
+					break;
+				case 'svg':
+					// Optimize & rasterize SVG
+					$orig = str_replace('.svg', '.o.svg', $dest);
+					rename($dest, $orig);
+					$png = str_replace('.svg', '.png', $dest);
+					`/usr/local/bin/svgcleaner $orig $dest`;
+					`convert -background none $dest $png`;
+					break;
+				default:
+					break;
 			}
+
 			$this->xml->addChild('file', $fname);
 			return;
 		}
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 5f51385b9..21106428d 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -211,8 +211,8 @@ class wsThemeParametres extends wsParametres {
 		/* Menu bar logo */
 
 		$imageFilter = new stdClass();
-		$imageFilter->name = __('Image PNG') . ' (*.png)';
-		$imageFilter->extensions = '*.png';
+		$imageFilter->name = __('Image PNG ou SVG') . ' (*.png, *.svg)';
+		$imageFilter->extensions = '*.svg;*.png';
 
 		$this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,
 		                              'label' => __('Logo'),