From: Jerome Jutteau <mojo@couak.net>
Date: Tue, 7 Apr 2015 11:36:45 +0000 (+0200)
Subject: remove option which shows download page
X-Git-Tag: 1.1~124
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/90462b6a06d67c66d616dc2792f62895613613e0?ds=inline;hp=68892c7ee6ea5f3f30d1e5d1051cd7029b2cbd41

remove option which shows download page

This commit make Jirafeau to always have the download page link available.
This option is maybe not really usefull anymore as the user already have a
download link and a preview link after the upload.
---

diff --git a/f.php b/f.php
index 31b5d06..59717b9 100644
--- a/f.php
+++ b/f.php
@@ -152,7 +152,7 @@ if (!empty ($link['key']))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
         document.getElementById('submit_download').submit ();"/><?php
-        if ($cfg['download_page'] && $cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
+        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='
@@ -182,7 +182,7 @@ if (!empty ($link['key']))
     }
 }
 
-if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_preview)
+if (!$password_challenged && !$do_download && !$do_preview)
 {
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
@@ -216,7 +216,7 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev
 ?>';
         document.getElementById('submit_post').submit ();"/><?php
 
-        if ($cfg['download_page'] && $cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
+        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='
diff --git a/index.php b/index.php
index 1a5c6aa..dade552 100644
--- a/index.php
+++ b/index.php
@@ -97,13 +97,11 @@ if (jirafeau_has_upload_password ($cfg))
     <p><?php echo t('File uploaded !') ?></p>
     <br />
 
-    <?php if ($cfg['download_page'] == true) { ?>
     <div id="upload_finished_download_page">
     <?php echo t('Download page') ?>
     <p><a id="upload_link" href=""></a></p>
     <br />
     </div>
-    <?php } ?>
 
     <div id="upload_password_page">
     <p><?php echo t('Download page') ?>:</p>
diff --git a/lib/config.original.php b/lib/config.original.php
index 7eaa6c4..f731171 100644
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -37,8 +37,6 @@ $cfg['lang'] = 'auto';
 $cfg['style'] = 'courgette';
 /* Propose a preview link if file type is previewable is set to true. */
 $cfg['preview'] = true;
-/* Download page: propose a link to a download page is set to true. */
-$cfg['download_page'] = true;
 /* Encryption feature. disable it by default.
  * By enabling it, file-level deduplication won't work.
  */