[FEATURE] allow admin to not log users IP in Jirafeau

New option 'store_uploader_ip' set to true by default.

closes #248

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>

diff --git a/lib/config.original.php b/lib/config.original.php
index 1b16f3273a1a6abf8c6393f9b298911a3f55fdf6..d8722ac4d228b3785db6d42f3662f6194519fadd 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -181,6 +181,11 @@ $cfg['file_hash'] = 'md5';
  */
 $cfg['litespeed_workaround'] = false;
 
  */
 $cfg['litespeed_workaround'] = false;
 

+/* Store uploader's IP along with 'link' file.
+ * Depending of your legislation, you may have to adjust this parameter.
+ */
+$cfg['store_uploader_ip'] = true;
+

 /* Required flag to test if the installation is already installed
  * or needs to start the installation script
  */
 /* Required flag to test if the installation is already installed
  * or needs to start the installation script
  */

diff --git a/lib/functions.php b/lib/functions.php
index b3dc9045f930dc9462bf5c6cbcdcc7a7daeee72f..546decc0806fb2fdf96098be4db0cd05df8c2628 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -680,7 +680,9 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '<br/>';
                 echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '<br/>';
                 echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '<br/>';
                 echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '<br/>';
                 echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '<br/>';
                 echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '<br/>';

-                echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
+                if (strlen($l['ip']) > 0) {
+                    echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
+                }

                 echo '</td><td>';
                 echo '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "download"/>' .
                 echo '</td><td>';
                 echo '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "download"/>' .

diff --git a/script.php b/script.php
index b8c4bcf10e92e0bce463ada017e7ecb875fa7608..434a2c33bae3d50938a1b091973ddae370d9497e 100644 (file)
--- a/script.php
+++ b/script.php
@@ -127,12 +127,18 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
         exit;
     }
 
         exit;
     }
 

+    if ($cfg['store_uploader_ip']) {
+        $ip = get_ip_address($cfg);
+    } else {
+        $ip = "";
+    }
+    

     $res = jirafeau_upload(
         $_FILES['file'],
         isset($_POST['one_time_download']),
         $key,
         $time,
     $res = jirafeau_upload(
         $_FILES['file'],
         isset($_POST['one_time_download']),
         $key,
         $time,

-        get_ip_address($cfg),
+        $ip,

         $cfg['enable_crypt'],
         $cfg['link_name_length'],
         $cfg['file_hash']
         $cfg['enable_crypt'],
         $cfg['link_name_length'],
         $cfg['file_hash']


@@ -461,13 +467,20 @@ elseif (isset($_GET['init_async'])) {
                 break;
         }
     }
                 break;
         }
     }

+
+    if ($cfg['store_uploader_ip']) {
+        $ip = get_ip_address($cfg);
+    } else {
+        $ip = "";
+    }
+    

     echo jirafeau_async_init(
         $_POST['filename'],
         $type,
         isset($_POST['one_time_download']),
         $key,
         $time,
     echo jirafeau_async_init(
         $_POST['filename'],
         $type,
         isset($_POST['one_time_download']),
         $key,
         $time,

-        get_ip_address($cfg)
+        $ip

     );
 }
 /* Continue an asynchronous upload. */
     );
 }
 /* Continue an asynchronous upload. */