(no commit message)

diff --git a/.htaccess b/.htaccess
index 3e459f656e58e850e3bb17fd9e82b023efdd903d..cdd2680f360ae93713de39efb12f63d77db3fe21 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -36,6 +36,7 @@ AddCharset UTF-8 log
 \r
        RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L]\r
        RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L]\r
+       RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L]\r
        RewriteRule ^([-_a-zA-Z0-9/]+)$ index.php/$1 [L]\r
 \r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L]\r

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 71e96f112a5d3ece2550384ef4ac0824094aa5e0..694ebfbc67a834545ffa805531384d8ad0d2776f 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -7,7 +7,10 @@ class commonUrl {
                $args = cubePage::getArgs($args);\r
                // Si l'utilisateur n'est pas connecté, on affiche le formulaire\r
                // de login\r
-               if ((!isset($args[0]) || $args[0] != 'stats') && (is_null($core->user) || !$core->user)) {\r
+               \r
+               $bypass=array('stats','telecharger','telechargerr');\r
+               \r
+               if ((!isset($args[0]) || !in_array($args[0],$bypass)) && (is_null($core->user) || !$core->user)) {\r
                        $args = array('login');\r
                } else {\r
                        if (isset($args[0]) && $args[0] == 'login') {\r
@@ -455,7 +458,7 @@ class commonUrl {
                        $bundle = $infos['CFBundleIdentifier'];\r
                        $appName = $infos['CFBundleDisplayName'];\r
                        $version = $infos['CFBundleVersion'];\r
-                       $ipaURL = 'http://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . self::hashFile($fichier->relPath . '//') . '/' . $fichier->relPath;\r
+                       $ipaURL = 'http://' . $_SERVER['HTTP_HOST'] . '/telechargerr/' . self::hashFile($fichier->relPath . '//') . '/' . $fichier->relPath;\r
 \r
                        $xml = '<?xml version="1.0" encoding="UTF-8"?>\r
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\r
@@ -502,9 +505,11 @@ class commonUrl {
                return sha1('!!//' . $path . '||--');\r
        }\r
 \r
-       public static function telecharger($args) {\r
-\r
+       public static function telechargerr($args) {\r
+               return self::telecharger($args, true);\r
+       }\r
 \r
+       public static function telecharger($args, $relay = false) {\r
                array_shift($args);\r
                $hash = array_shift($args);\r
                $path = implode('/', $args);\r
@@ -518,10 +523,15 @@ class commonUrl {
 \r
                $dir = md5($path . (rand(1, 235548684) * 50.5));\r
 \r
-               @mkdir(ROOT . '/cache/download/' . $dir, 0755, true);\r
-               copy(FTPROOT . $path, ROOT . '/cache/download/' . $dir . '/' . $nom);\r
+               if ($relay) {\r
+                       files::$mimeType['ipa'] = 'application/octet-stream';\r
 \r
-               http::redirect(WEBROOT . '/cache/download/' . $dir . '/' . $nom);\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