From 3539e3d2c5ddf7363eaf996d1277fb8a5541f25b Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 28 Feb 2012 09:56:17 +0000
Subject: [PATCH]

---
 .../Controlleur/class.extranet.tools.php      | 24 +++++++++++++++++++
 .../Util/packager/class.ws.packager.html.php  |  1 +
 js/browserInfos.js                            | 10 ++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 js/browserInfos.js

diff --git a/inc/extranet/Controlleur/class.extranet.tools.php b/inc/extranet/Controlleur/class.extranet.tools.php
index 72cf43fad..7d9b57f25 100644
--- a/inc/extranet/Controlleur/class.extranet.tools.php
+++ b/inc/extranet/Controlleur/class.extranet.tools.php
@@ -22,6 +22,30 @@ class extranetTools {
 		}
 	}
 
+	public static function browserInfos($args) {
+		global $core;
+		global $jsnomerge;
+		global $js;
+		global $jsvar;
+
+		$jsnomerge[] = 'http://www.featureblend.com/flash_detect_1-0-4/flash_detect_min.js';
+		$js[] = JS_PATH . '/browserInfos.js';
+		$jsvar['NO_FLASH'] = __("Adobe Flash Player non détecté");
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
+		$res.='<table class="liste">';
+		$res.='<tr><th colspan="2"><strong>' . __('Informations concernant votre navigateur') . '</strong></th></tr>';
+		$res.='<tr><td>' . __('Navigateur') . '</td><td>' . $_SERVER['HTTP_USER_AGENT'] . '</td></tr>';
+		$res.='<tr><td>' . __('Adresse IP') . '</td><td>' . $_SERVER['REMOTE_ADDR'] . '</td></tr>';
+		$res.='<tr><td>' . __('Adobe Flash Player') . '</td><td class="flashversion"></td></tr>';
+		$res.='</table>';
+		$res .= '</div>';
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
+		return $res;
+	}
+
 	public static function favicon($args) {
 		global $core;
 		$res = commonPage::barre();
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index ffb344e71..f2f6614d7 100644
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -182,6 +182,7 @@ class wsPackagerHTML extends wsPackager {
 			$filesToDelete[] = 'data/background/contents/p*.html';
 		} else {
 			$filesToDelete[] = 'data/background/*/p*.jpg';
+			$filesToDelete[] = 'data/contents/p*.svg';
 		}
 		$rm = new cubeCommandLine('rm');
 		$rm->setPath(CONVERTER_PATH);
diff --git a/js/browserInfos.js b/js/browserInfos.js
new file mode 100644
index 000000000..d08aaeae7
--- /dev/null
+++ b/js/browserInfos.js
@@ -0,0 +1,10 @@
+TO_LOAD[TO_LOAD.length]='load_browser_infos();';
+function load_browser_infos(){
+	$(".flashversion").each(function(){
+		if(!FlashDetect.installed){
+			$(this).html(NO_FLASH);
+		}else{
+			$(this).html(FlashDetect.major+"."+FlashDetect.minor+"."+FlashDetect.revision);
+		}
+	});
+}
\ No newline at end of file
-- 
2.39.5