X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/0d601dd942a8b709adf5812045afcdc5873706c8..6ceeb5ff538f89833b1ab3f2ecd3cf89a3d8e17e:/file.php?ds=sidebyside

diff --git a/file.php b/file.php
index 8cd7000..400cb73 100644
--- a/file.php
+++ b/file.php
@@ -35,7 +35,7 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
     if (!preg_match ('/[0-9a-f]{32}$/', $link_name))
     {
         require (JIRAFEAU_ROOT.'lib/template/header.php');
-        echo '<div class="error"><p>' . _('Sorry, the requested file is not found') . '</p></div>';
+        echo '<div class="error"><p>' . t('Sorry, the requested file is not found') . '</p></div>';
         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }
@@ -44,17 +44,17 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
     if (count ($link) == 0)
     {
         require (JIRAFEAU_ROOT.'lib/template/header.php');
-        echo '<div class="error"><p>' . _('Sorry, the requested file is not found') .
+        echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
         '</p></div>';
         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }
-    
-    if (!file_exists (VAR_FILES . $link['md5']))
+    $p = s2p ($link['md5']);
+    if (!file_exists (VAR_FILES . $p . $link['md5']))
     {
-        jirafeau_delete ($link_name);
+        jirafeau_delete_link ($link_name);
         require (JIRAFEAU_ROOT.'lib/template/header.php');
-        echo '<div class="error"><p>'._('File not available.').
+        echo '<div class="error"><p>'.t('File not available.').
         '</p></div>';
         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
@@ -62,23 +62,23 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
 
     if (!empty ($delete_code) && $delete_code == $link['link_code'])
     {
-        jirafeau_delete ($link_name);
+        jirafeau_delete_link ($link_name);
         require (JIRAFEAU_ROOT.'lib/template/header.php');
-        echo '<div class="message"><p>'._('File has been deleted.').
+        echo '<div class="message"><p>'.t('File has been deleted.').
          '</p></div>';
         require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }
 
-    if ($link['time'] != JIRAFEAU_INFINITY && time ()> $link['time'])
+    if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
     {
-        jirafeau_delete ($link_name);
+        jirafeau_delete_link ($link_name);
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div class="error"><p>'.
-        _('The time limit of this file has expired.') . ' ' .
-        _('File has been deleted.') .
+        t('The time limit of this file has expired.') . ' ' .
+        t('File has been deleted.') .
         '</p></div>';
-        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        require (JIRAFEAU_ROOT . 'lib/template/footer.php');
         exit;
     }
 
@@ -92,13 +92,13 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
             "<?php echo $_SERVER['REQUEST_URI']; ?>" method =
             "post"> <input type = "hidden" name = "jirafeau" value =
             "<?php echo JIRAFEAU_VERSION; ?>" /><fieldset>
-            <legend><?php echo _('Password protection');
+            <legend><?php echo t('Password protection');
         ?></legend> <table> <tr>
-            <td><?php echo _('Give the password of this file:');
+            <td><?php echo t('Give the password of this file') . ' : ';
         ?><input type = "password" name =
             "key" /></td> </tr> <tr> <td><input type =
             "submit" value =
-            "<?php echo _('I have the right to download this file'); ?>"
+            "<?php echo t('Download'); ?>"
             /></td> </tr> </table> </fieldset> </form> </div>
             <?php require (JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
@@ -108,9 +108,8 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
         if ($link['key'] != md5 ($_POST['key']))
         {
             header ("Access denied");
-
             require (JIRAFEAU_ROOT.'lib/template/header.php');
-            echo '<div class="error"><p>' . _('Access denied') .
+            echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';
             require (JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
@@ -120,15 +119,15 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
 
     header ('Content-Length: ' . $link['file_size']);
     header ('Content-Type: ' . $link['mime_type']);
-    if (!jirafeau_is_viewable ($link['mime_type']))
+    if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'])
     {
         header ('Content-Disposition: attachment; filename="' .
             $link['file_name'] . '"');
     }
-    readfile (VAR_FILES . $link['md5']);
+    readfile (VAR_FILES . $p . $link['md5']);
 
     if ($link['onetime'] == 'O')
-        jirafeau_delete ($link_name);
+        jirafeau_delete_link ($link_name);
     exit;
 }
 else