[BUGFIX] use i18n string_id to avoid "FIXME" errors in install.php

[jirafeau_mojo42.git] / f.php

diff --git a/f.php b/f.php
index f6fe6fd997b3f0e307db5743be5bee8da4753cb2..f7f378648fdf839aded9820adbbede0dfe880af5 100644 (file)
--- a/f.php
+++ b/f.php
@@ -142,7 +142,7 @@ if (!empty($link['key'])) {
              '<legend>' . t('PSW_PROTEC') .
              '</legend><table><tr><td>' .
              t('GIMME_PSW') . ' : ' .
              '<legend>' . t('PSW_PROTEC') .
              '</legend><table><tr><td>' .
              t('GIMME_PSW') . ' : ' .

-             '<input type = "password" name = "key" />' .
+             '<input type = "password" name = "key" autocomplete = "current-password"/>' .

              '</td></tr>' .
              '<tr><td>' .
              t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
              '</td></tr>' .
              '<tr><td>' .
              t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .


@@ -167,7 +167,6 @@ if (!empty($link['key'])) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
             document.getElementById('submit_preview').submit ();"/><?php
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
             document.getElementById('submit_preview').submit ();"/><?php

-

         }
         echo '</td></tr></table></fieldset></form></div>';
         require(JIRAFEAU_ROOT.'lib/template/footer.php');
         }
         echo '</td></tr></table></fieldset></form></div>';
         require(JIRAFEAU_ROOT.'lib/template/footer.php');


@@ -220,7 +219,6 @@ if (!$password_challenged && !$do_download && !$do_preview) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php

-

         }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';
         }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';


@@ -253,7 +251,7 @@ if ($cfg['litespeed_workaround']) {
     }
 }
 /* Read encrypted file. */
     }
 }
 /* Read encrypted file. */

-else if ($link['crypted']) {
+elseif ($link['crypted']) {

     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */


@@ -274,11 +272,16 @@ else if ($link['crypted']) {
 }
 /* Read file. */
 else {
 }
 /* Read file. */
 else {

-    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
-    while (!feof($r)) {
-        print fread($r, 1024);
+    if ($cfg['use_xsendfile']) {
+        $file_web_path = preg_replace('#^' . $_SERVER['DOCUMENT_ROOT'] . '#', '', VAR_FILES);
+        header('X-Sendfile: ' . $file_web_path . $p . $link['hash']);
+    } else {
+        $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
+        while (!feof($r)) {
+            print fread($r, 1024);
+        }
+        fclose($r);

     }
     }

-    fclose($r);

 }
 
 if ($link['onetime'] == 'O') {
 }
 
 if ($link['onetime'] == 'O') {