#1933

diff --git a/.htaccess b/.htaccess
index a7b0f2ef44c6f5cf1f6aa81f443680d54bec838c..a2b022692dc8e985941e9d0efdd9553311b61372 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -111,4 +111,24 @@ AddCharset UTF-8 log
        RewriteRule ^([-,_a-zA-Z0-9\./]+)$ index.php/$1 [L]\r
 </IfModule>\r
 \r
+<IfModule mod_mime.c>\r
+       AddType video/ogg .ogm\r
+       AddType video/ogg .ogv\r
+       AddType video/ogg .ogg\r
+       AddType video/mp4 .mp4\r
+       AddType video/webm .webm\r
+       AddType image/svg+xml .svg\r
+       AddType image/svg+xml .svgz\r
+       AddType application/json .json\r
+       AddType application/vnd.ms-fontobject .eot\r
+       AddType application/octet-stream .otf\r
+       AddType application/octet-stream .ttf\r
+       AddType application/x-font-woff .woff\r
+       AddType application/font-woff2 .woff2\r
+       AddType text/cache-manifest .appcache\r
+       AddType application/octet-stream .apk\r
+\r
+       AddEncoding gzip svgz\r
+</IfModule>\r
+\r
 XSendFile On
\ No newline at end of file

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 63e22d23f92fe3b0eb5252c2a08d750b4ac401a6..8e8d501f417e88b3f76db3a2633c8a637132088e 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -549,17 +549,6 @@ class commonUrl {
                }\r
 \r
                cubeHTTP::xsendFile(FTPROOT . $path, false, true);\r
-\r
-               $dir = md5($path . (rand(1, 235548684) * 50.5));\r
-\r
-               if ($relay) {\r
-                       files::$mimeType['ipa'] = 'application/octet-stream';\r
-                       cubeHTTP::relayFile(FTPROOT . $path);\r
-               } else {\r
-                       @mkdir(ROOT . '/cache/download/' . $dir, 0755, true);\r
-                       copy(FTPROOT . $path, ROOT . '/cache/download/' . $dir . '/' . $nom);\r
-                       http::redirect('/cache/download/' . $dir . '/' . $nom);\r
-               }\r
        }\r
 \r
        public static function upload($args) {\r

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 73ff303f2377d266db332fc76b4a61abc833383f..9baa3bc95afb99cc6ace99c63a0f88616ed47d41 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -20,12 +20,11 @@ define('DEV', $dev);
 \r
 define('AMARCORD', true);\r
 define('SERVER', 'avanger');\r
-define('DB_HOST', 'localhost');\r
+define('DB_HOST', 'alien.cubedesigners.com');\r
 define('DB_NAME', 'extranet');\r
 define('DB_USER', 'extranet');\r
 define('DB_PASSWORD', 'WvcAeYBDnrB93RXa');\r
 \r
-\r
 define('EXTRANET_URL', SCHEME . '://extranet.cubedesigners.com');\r
 define('WS_URL', SCHEME . '://workshop.fluidbook.com');\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index 282579f66a78a9466b2034ff3c98756c4c92853f..e905e1f2a8fdf11c83075504c4c28e102e2ba19c 100644 (file)
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -119,7 +119,6 @@ class wsStats {
                        $writer->setPHPExcel(self::$xls);\r
                        $writer->save(self::_getXLSFile($bid, $annee, $mois));\r
                } catch (Exception $e) {\r
-\r
                }\r
 \r
                return $res;\r