remove clear text password storage

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index af1efb41838724b6a09dc2a14b2f8bff101e0100..9e1222c572a0b093a84af1bc155e46159a657d07 100644 (file)
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 
 /* check if the destination dirs are writable */
-$writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS) && is_writable(VAR_TRASH);
+$writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS);
 
 $res = array();
 if($writable && isset($_POST['jirafeau'])) {
@@ -55,7 +55,7 @@ if($writable && isset($_POST['jirafeau'])) {
     break;
   }
 
-  $res = jirafeau_upload($_FILES['file'], isset($_POST['one_time_download']), $key, $time, $cfg);
+  $res = jirafeau_upload($_FILES['file'], isset($_POST['one_time_download']), $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
 }
 
 require(JIRAFEAU_ROOT . 'lib/template/header.php');
@@ -69,10 +69,6 @@ if(!is_writable(VAR_LINKS)) {
   add_error (_('The link directory is not writable!'), VAR_LINKS);
 }
 
-if(!is_writable(VAR_TRASH)) {
-  add_error (_('The trash directory is not writable!'), VAR_TRASH);
-}
-
 /* Check if the install.php script is still in the directory. */
 if (file_exists(JIRAFEAU_ROOT . 'install.php')) {
   add_error (_('Installer script still present'),
@@ -84,11 +80,16 @@ if(!has_error() && !empty($res)) {
       add_error (_('An error occurred.'), $res['error']['why']);
   } else {
     $link = $cfg['web_root'];
+    $delete_link = $cfg['web_root'];
+
     if($cfg['rewrite']) {
       $link .= 'file-' . $res['link'];
+      $delete_link .= 'file-' . $res['link'] . '-delete-' . $res['delete_link'];
     } else {
       $link .= 'file.php?h=' . $res['link']; // h because 'h' looks like a jirafeau ;)
+      $delete_link .= 'file.php?h=' . $res['link'] . '&d=' . $res['delete_link'];
     }
+
     echo '<div class="message">' . NL;
     echo '<p>' . _('File uploaded! Copy the following URL to get it:') . '<br />' . NL;
     echo '<a href="' . $link . '">' . $link . '</a>' . NL;
@@ -98,6 +99,11 @@ if(!has_error() && !empty($res)) {
     }
 
     echo '</p></div>';
+
+    echo '<div class="message">' . NL;
+    echo '<p>' . _('Keep the following URL to delete it:') . '<br />' . NL;
+    echo '<a href="' . $delete_link . '">' . $delete_link . '</a>' . NL;
+    echo '</p></div>';
   }
 }