Merge remote-tracking branch 'origin/master'

diff --git a/f.php b/f.php
index 59717b9cd2c0b1dadc8a905f6aff38a94ac3b6d3..99a67df9dd1fcd968d7830952e352d965a5b6b05 100644 (file)
--- a/f.php
+++ b/f.php
@@ -240,6 +240,7 @@ if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $do_downlo
 else
     header ('Content-Disposition: filename="' . $link['file_name'] . '"');
 header ('Content-Type: ' . $link['mime_type']);
+header ('Content-MD5: ' . hex_to_base64($link['md5']));
 
 /* Read encrypted file. */
 if ($link['crypted'])

diff --git a/lib/functions.php b/lib/functions.php
index 77acae1bd973f281586111e295bf096eef3234bd..18002314ca841697eb58a6e8c230eee5744d9726 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1134,3 +1134,14 @@ function get_ip_address($cfg) {
     }
     return $_SERVER['REMOTE_ADDR'];
 }
+
+/**
+ * Convert hexadecimal string to base64
+ */
+function hex_to_base64($hex)
+{
+    $b = '';
+    foreach (str_split ($hex, 2) as $pair)
+        $b .= chr (hexdec ($pair));
+    return base64_encode ($b);
+}