cleanest distinction bewteen 'delete' and 'download'

Also fix typo

diff --git a/f.php b/f.php
index a5c6228a8bed197be0c3b75c05b72dd66e8bfb71..a1f084aa059738aef5faddc71d02e4261328e350 100644 (file)
--- a/f.php
+++ b/f.php
@@ -58,7 +58,7 @@ if (count ($link) == 0)
 }
 
 $delete_code = '';
 }
 
 $delete_code = '';

-if (isset ($_GET['d']) && !empty ($_GET['d']))
+if (isset ($_GET['d']) && !empty ($_GET['d']) &&  $_GET['d'] != '1')

     $delete_code = $_GET['d'];
 
 $crypt_key = '';
     $delete_code = $_GET['d'];
 
 $crypt_key = '';


@@ -66,7 +66,7 @@ if (isset ($_GET['k']) && !empty ($_GET['k']))
     $crypt_key = $_GET['k'];
 
 $do_download = false;
     $crypt_key = $_GET['k'];
 
 $do_download = false;

-if (isset ($_GET['d']) && !empty ($_GET['d']))
+if (isset ($_GET['d']) && $_GET['d'] == '1')

     $do_download = true;
 
 $do_preview = false;
     $do_download = true;
 
 $do_preview = false;

diff --git a/lib/functions.php b/lib/functions.php
index b98486f80fd4ed59888b1f086e2b78079d59f08f..89c36b015f49c45adf333017c31cae972d7b57fd 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -443,7 +443,7 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name
 }
 
 /**
 }
 
 /**

- * tells if a mime-type is viewable in a browser
+ * Tells if a mime-type is viewable in a browser

  * @param $mime the mime type
  * @returns a boolean telling if a mime type is viewable
  */
  * @param $mime the mime type
  * @returns a boolean telling if a mime type is viewable
  */