(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.tools.php b/inc/extranet/Controlleur/class.extranet.tools.php
index 72cf43fada3da2bbbecd9a06bd0496a57e4f4479..7d9b57f25db93d2f8548a974585888e610367dfd 100644 (file)
--- 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 ffb344e719b2def3b0192b9253ae4a2cf2cb1032..f2f6614d7d8e26130d03cc226506be9d55b7061b 100644 (file)
--- 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';\r
                } else {\r
                        $filesToDelete[] = 'data/background/*/p*.jpg';\r
+                       $filesToDelete[] = 'data/contents/p*.svg';\r
                }\r
                $rm = new cubeCommandLine('rm');\r
                $rm->setPath(CONVERTER_PATH);\r

diff --git a/js/browserInfos.js b/js/browserInfos.js
new file mode 100644 (file)
index 0000000..d08aaea
--- /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