From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 6 Feb 2018 14:08:48 +0000 (+0000)
Subject: #1933
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=240bdfb593d1ba3e91ac3f3cbc59a4758e0a0a14;p=cubeextranet.git

#1933
---

diff --git a/.htaccess b/.htaccess
index a7b0f2ef4..a2b022692 100644
--- a/.htaccess
+++ b/.htaccess
@@ -111,4 +111,24 @@ AddCharset UTF-8 log
 	RewriteRule ^([-,_a-zA-Z0-9\./]+)$ index.php/$1 [L]
 </IfModule>
 
+<IfModule mod_mime.c>
+	AddType video/ogg .ogm
+	AddType video/ogg .ogv
+	AddType video/ogg .ogg
+	AddType video/mp4 .mp4
+	AddType video/webm .webm
+	AddType image/svg+xml .svg
+	AddType image/svg+xml .svgz
+	AddType application/json .json
+	AddType application/vnd.ms-fontobject .eot
+	AddType application/octet-stream .otf
+	AddType application/octet-stream .ttf
+	AddType application/x-font-woff .woff
+	AddType application/font-woff2 .woff2
+	AddType text/cache-manifest .appcache
+	AddType application/octet-stream .apk
+
+	AddEncoding gzip svgz
+</IfModule>
+
 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 63e22d23f..8e8d501f4 100644
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -549,17 +549,6 @@ class commonUrl {
 		}
 
 		cubeHTTP::xsendFile(FTPROOT . $path, false, true);
-
-		$dir = md5($path . (rand(1, 235548684) * 50.5));
-
-		if ($relay) {
-			files::$mimeType['ipa'] = 'application/octet-stream';
-			cubeHTTP::relayFile(FTPROOT . $path);
-		} else {
-			@mkdir(ROOT . '/cache/download/' . $dir, 0755, true);
-			copy(FTPROOT . $path, ROOT . '/cache/download/' . $dir . '/' . $nom);
-			http::redirect('/cache/download/' . $dir . '/' . $nom);
-		}
 	}
 
 	public static function upload($args) {
diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 73ff303f2..9baa3bc95 100644
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -20,12 +20,11 @@ define('DEV', $dev);
 
 define('AMARCORD', true);
 define('SERVER', 'avanger');
-define('DB_HOST', 'localhost');
+define('DB_HOST', 'alien.cubedesigners.com');
 define('DB_NAME', 'extranet');
 define('DB_USER', 'extranet');
 define('DB_PASSWORD', 'WvcAeYBDnrB93RXa');
 
-
 define('EXTRANET_URL', SCHEME . '://extranet.cubedesigners.com');
 define('WS_URL', SCHEME . '://workshop.fluidbook.com');
 
diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index 282579f66..e905e1f2a 100644
--- 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);
 			$writer->save(self::_getXLSFile($bid, $annee, $mois));
 		} catch (Exception $e) {
-
 		}
 
 		return $res;