Merge branch 'fix_legacy_upload' into 'next-release'

[jirafeau/jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 7ac4c9e3f4eb18fb27c2e443131e339b1cf54227..948a436de4843bd28f1b1210e1fcc3f379a8923f 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -464,9 +464,9 @@ function jirafeau_handle_add_file_encryption($crypt_module_enabled, $file_path)
         error_log("PHP extension sodium not loaded, won't encrypt in Jirafeau");
     }
     if ($crypt_module_enabled == true && extension_loaded('sodium') == true) {
         error_log("PHP extension sodium not loaded, won't encrypt in Jirafeau");
     }
     if ($crypt_module_enabled == true && extension_loaded('sodium') == true) {

-        $crypt_key = jirafeau_encrypt_file($file_path, $file_path.'crypt');
+        $crypt_key = jirafeau_encrypt_file($file_path, $file_path.'.crypt');

         if (strlen($crypt_key) > 0) {
         if (strlen($crypt_key) > 0) {

-            if (rename($file_path.'crypt', $file_path) === true) {
+            if (rename($file_path.'.crypt', $file_path) === true) {

                 $crypted = true;
             }
         }
                 $crypted = true;
             }
         }


@@ -544,7 +544,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
     /* hash password or empty. */
     $password = '';
     if (!empty($key)) {
     /* hash password or empty. */
     $password = '';
     if (!empty($key)) {

-        $password = md5($key);
+        $password = '[SHA256]' . hash('sha256', $key);

     }
 
     /* create link file */
     }
 
     /* create link file */


@@ -554,7 +554,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
         $handle,
         $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
             NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .
         $handle,
         $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
             NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .

-            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')
+            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C2' : 'O')

     );
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
     );
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);


@@ -623,7 +623,7 @@ function jirafeau_is_viewable($mime)
     if (!empty($mime)) {
         $viewable = array('image', 'video', 'audio');
         $decomposed = explode('/', $mime);
     if (!empty($mime)) {
         $viewable = array('image', 'video', 'audio');
         $decomposed = explode('/', $mime);

-        if (in_array($decomposed[0], $viewable) && stripos($mime, 'image/svg+xml') === false) {
+        if (in_array($decomposed[0], $viewable) && stripos($mime, 'image/svg+xml') === false && strpos($mime, ',') === false) {

             return true;
         }
         $viewable = array('text/plain');
             return true;
         }
         $viewable = array('text/plain');


@@ -771,6 +771,9 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                     if (!empty($link_hash) && $link_hash != $node) {
                         continue;
                     }
                     if (!empty($link_hash) && $link_hash != $node) {
                         continue;
                     }

+
+                    /* Get download statistics */
+                    $ld = jirafeau_get_download_stats($node);

                     /* Print link information. */
                     echo '<tr>';
                     echo '<td><strong>';
                     /* Print link information. */
                     echo '<tr>';
                     echo '<td><strong>';


@@ -793,6 +796,11 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                     if (strlen($l['ip']) > 0) {
                         echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
                     }
                     if (strlen($l['ip']) > 0) {
                         echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
                     }

+                    echo t('DOWNLOAD_COUNT') . ': ' . $ld['count'] . '<br/>';
+                    if ($ld['count'] > 0) {
+                        echo t('DOWNLOAD_DATE') . ': ' . jirafeau_get_datetimefield($ld['date']) . '<br/>';
+                        echo t('DOWNLOAD_IP') . ': ' . $ld['ip'] . '<br/>';
+                    }

                     echo '</td><td>';
 
                     if (!$l['crypted'] && !$l['crypted_legacy']) {
                     echo '</td><td>';
 
                     if (!$l['crypted'] && !$l['crypted_legacy']) {


@@ -1080,10 +1088,10 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
     $w_path = $p . $ref . '_data';
     touch($w_path);
 
     $w_path = $p . $ref . '_data';
     touch($w_path);
 

-    /* md5 password or empty */
+    /* sha256 password or empty */

     $password = '';
     if (!empty($key)) {
     $password = '';
     if (!empty($key)) {

-        $password = md5($key);
+        $password = '[SHA256]' . hash('sha256', $key);

     }
 
     /* Store information. */
     }
 
     /* Store information. */


@@ -1634,7 +1642,7 @@ function jirafeau_escape($string)
 function jirafeau_admin_session_start()
 {
     $_SESSION['admin_auth'] = true;
 function jirafeau_admin_session_start()
 {
     $_SESSION['admin_auth'] = true;

-    $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true));
+    $_SESSION['admin_csrf'] = hash('sha256', uniqid(mt_rand(), true));

 }
 
 function jirafeau_session_end()
 }
 
 function jirafeau_session_end()


@@ -1779,7 +1787,7 @@ function jirafeau_write_download_stats($hash, $ip)
     fclose($handle);
 }
 
     fclose($handle);
 }
 

-function jirafeau_create_upload_finished_box($preview = true)
+function jirafeau_create_upload_finished_box($preview = true, $download_pass = null)

 {
     ?>
 
 {
     ?>
 


@@ -1796,6 +1804,21 @@ function jirafeau_create_upload_finished_box($preview = true)
     </p>
     </div>
 
     </p>
     </div>
 

+    <?php if (!is_null($download_pass)) { ?>
+    <div id="show_password">
+    <p><?php echo t('PSW') ?></p>
+
+    <div id="download_password">
+    <p>
+        <?php echo '<input id="output_key" value="' . $download_pass . '" readonly/>'?>
+        <button id="password_copy_button">&#128203;</button>
+    </p>
+    </div>
+    </div>
+    <?php
+    }?>
+
+

     <?php
     if ($preview == true) { ?>
     <div id="upload_finished_preview">
     <?php
     if ($preview == true) { ?>
     <div id="upload_finished_preview">