X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/2b7fd594eb127b5a7e01e664ed54a5fa0be860c2..0316db1a4d73d10c7c5fe5b12c8ff1407050914b:/f.php?ds=sidebyside

diff --git a/f.php b/f.php
index e3f4420..109ac53 100644
--- a/f.php
+++ b/f.php
@@ -19,10 +19,9 @@
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
+require (JIRAFEAU_ROOT . 'lib/lang.php');
 
 if (!isset ($_GET['h']) || empty ($_GET['h']))
 {
@@ -58,7 +57,7 @@ if (count ($link) == 0)
 if (count ($link) == 0)
 {
     require (JIRAFEAU_ROOT.'lib/template/header.php');
-    echo '<div class="error"><p>' . t('Sorry, the requested file is not found....' . $link_name) .
+    echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
     '</p></div>';
     require (JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
@@ -130,7 +129,7 @@ if (!empty ($link['key']))
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
              '<form action = "';
-        echo $cfg['web_root'] . '/f.php';
+        echo JIRAFEAU_ABSPREFIX . 'f.php';
         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
@@ -141,7 +140,7 @@ if (!empty ($link['key']))
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . $cfg['web_root'] . '/tos.php' . '">' . t('Term Of Service') . '</a>' .
+             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
         if ($link['onetime'] == 'O')
@@ -152,9 +151,8 @@ if (!empty ($link['key']))
         }
 
         ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
-        onclick="document.getElementById('submit_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;d=1';
+        onclick="document.getElementById('submit_post').action='<?php
+        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
@@ -162,9 +160,8 @@ if (!empty ($link['key']))
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
         {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
-            onclick="document.getElementById('submit_post').action='
-            <?php
-            echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;p=1';
+            onclick="document.getElementById('submit_post').action='<?php
+            echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key))
                 echo '&amp;k=' . urlencode($crypt_key);
             ?>';
@@ -180,6 +177,7 @@ if (!empty ($link['key']))
             $password_challenged = true;
 	else
         {
+            sleep (2);
             require (JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';
@@ -193,17 +191,17 @@ if (!$password_challenged && !$do_download && !$do_preview)
 {
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
-             '<form action = "';
-        echo $cfg['web_root'] . '/f.php';
+             '<form action="';
+        echo JIRAFEAU_ABSPREFIX . 'f.php';
         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
         echo '<fieldset><legend>' . htmlspecialchars($link['file_name']) . '</legend><table>' .
              '<tr><td>' .
-             t('You are about to download') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ')' .
+             t('You are about to download') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . $cfg['web_root'] . '/tos.php' . '">' . t('Term Of Service') . '</a>' .
+             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
         if ($link['onetime'] == 'O')
@@ -215,9 +213,8 @@ if (!$password_challenged && !$do_download && !$do_preview)
 
         ?>
         <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
-        onclick="document.getElementById('submit_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;d=1';
+        onclick="document.getElementById('submit_post').action='<?php
+        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
@@ -226,9 +223,8 @@ if (!$password_challenged && !$do_download && !$do_preview)
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
         {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
-            onclick="document.getElementById('submit_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;p=1';
+            onclick="document.getElementById('submit_post').action='<?php
+        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';