Add uploader's ip in link file

diff --git a/index.php b/index.php
index af1efb41838724b6a09dc2a14b2f8bff101e0100..7ee8ea29ec4b00e5760eaf0fd5a759526aa2867f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -55,7 +55,7 @@ if($writable && isset($_POST['jirafeau'])) {
     break;
   }
 
     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');
 }
 
 require(JIRAFEAU_ROOT . 'lib/template/header.php');

diff --git a/lib/functions.php b/lib/functions.php
index cb2226a2a15285968dfb2a4e8a1d9e73d12aba10..48bdefdb993d9f13e38f8348c4ac08d8c775d45e 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -111,11 +111,12 @@ function jirafeau_upload_errstr($code) {
  * @param $key if not empty, protect the file with this key
  * @param $time the time of validity of the file
  * @param $cfg the current configuration
  * @param $key if not empty, protect the file with this key
  * @param $time the time of validity of the file
  * @param $cfg the current configuration

+ * @param $ip uploader's ip

  * @returns an array containing some information
  *   'error' => information on possible errors
  *   'link' => the link name of the uploaded file
  */
  * @returns an array containing some information
  *   'error' => information on possible errors
  *   'link' => the link name of the uploaded file
  */

-function jirafeau_upload($file, $one_time_download, $key, $time, $cfg) {
+function jirafeau_upload($file, $one_time_download, $key, $time, $cfg, $ip) {

   if(empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) {
     return(array('error' => array('has_error' => true, 'why' => jirafeau_upload_errstr($file['error'])), 'link' => ''));
   }
   if(empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) {
     return(array('error' => array('has_error' => true, 'why' => jirafeau_upload_errstr($file['error'])), 'link' => ''));
   }


@@ -161,7 +162,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $cfg) {
   /* create link file */
   $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp';
   $handle = fopen($link_tmp_name, 'w');
   /* create link file */
   $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp';
   $handle = fopen($link_tmp_name, 'w');

-  fwrite($handle, $name . NL . $mime_type . NL . $size . NL . $key . NL . $time . NL . $md5 . NL . ($one_time_download ? 'O' : 'R') . NL . date('U') . NL);
+  fwrite($handle, $name . NL . $mime_type . NL . $size . NL . $key . NL . $time . NL . $md5 . NL . ($one_time_download ? 'O' : 'R') . NL . date('U') . NL . $ip . NL);

   fclose($handle);
   $md5_link = md5_file($link_tmp_name);
   if(!rename($link_tmp_name, VAR_LINKS . $md5_link)) {
   fclose($handle);
   $md5_link = md5_file($link_tmp_name);
   if(!rename($link_tmp_name, VAR_LINKS . $md5_link)) {