fork

diff --git a/src/Classes/Upload.php b/src/Classes/Upload.php
index e7becc081b3af7afed0cd0fc3036df0315461239..e568d50a435172e43abe102f82b6c1ea8cd33f88 100644 (file)
--- a/src/Classes/Upload.php
+++ b/src/Classes/Upload.php
@@ -193,7 +193,7 @@
                 $USER_AGENT = filter_var($_SERVER['HTTP_USER_AGENT'], FILTER_SANITIZE_ENCODED);
                 $ip = null;
                 if ($this->Connector->CONFIG['LOG_IP']) {
-                    $ip = $_SERVER['REMOTE_ADDR'];
+                    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'];
                 }
                 $this->fingerPrintInfo = [
                    'timestamp'    => time(),
@@ -315,4 +315,4 @@
             } while ($this->Connector->dbCheckNameExists($NEW_NAME));
             return $NEW_NAME;
         }
-    }
\ No newline at end of file
+    }

diff --git a/src/config.json b/src/config.json
index 722255d67eb0057fdcc00a065428b37c9ee1b5fe..f6194dd46f0b28b5f64c0066cad59cff58e57cfd 100755 (executable)
--- a/src/config.json
+++ b/src/config.json
@@ -12,15 +12,14 @@
   "DEBUG": false,
   "max_upload_size": 128,
   "expireTime": "48",
-  "siteName": "Uguu",
+  "siteName": "i.jfr.im",
   "subTitle": "wahooo",
-  "DOMAIN": "domain.com",
-  "FILE_DOMAIN": "files.domain.com",
-  "abuseContact": "abuse@example.com",
-  "infoContact": "info@example.com",
-  "ServerCountryLocation": "Sweden",
-  "SiteMetaInfo": "SITENAME is a temporary file hosting service, upload files up to 128MiB for 24 hours.",
-  "ToolsDesc": "The following tools might need editing to work on this clone of Uguu, usually editing the URL works.",
+  "DOMAIN": "i.jfr.im",
+  "FILE_DOMAIN": "files.jfr.im",
+  "infoContact": "aboos@jfr.im",
+  "ServerCountryLocation": "US",
+  "SiteMetaInfo": "i.jfr.im",
+  "ToolsDesc": "Not reviewed at all",
   "donationBanner": false,
   "paypalUrl": "",
   "bitcoinAddress": "",
@@ -28,17 +27,17 @@
   "kofiUrl": "",
   "malwareBanner": false,
   "DB_MODE": "sqlite",
-  "DB_PATH": "/var/www/db/uguu.sq3",
+  "DB_PATH": "/var/www/uguu/db/uguu.sq3",
   "DB_USER": "NULL",
   "DB_PASS": "NULL",
-  "LOG_IP": false,
-  "ANTI_DUPE": false,
+  "LOG_IP": true,
+  "ANTI_DUPE": true,
   "BLACKLIST_DB": true,
   "FILTER_MODE": true,
   "RATE_LIMIT": false,
   "RATE_LIMIT_TIMEOUT": 60,
   "RATE_LIMIT_FILES": 100,
-  "FILES_ROOT": "/var/www/files/",
+  "FILES_ROOT": "/var/www/uguu/files/",
   "FILES_RETRIES": 15,
   "NAME_LENGTH": 8,
   "ID_CHARSET": "abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ",

diff --git a/src/templates/faq.ejs b/src/templates/faq.ejs
index 9becf5cde269f43b03e22e9f64dc3beaf1c80cd4..e4a64f541392f9b78cbc590ac59b7c68bca53740 100644 (file)
--- a/src/templates/faq.ejs
+++ b/src/templates/faq.ejs
@@ -8,8 +8,8 @@
         </div>
         <div class="alert alert-info">
             <h2>What is <%= siteName %>?</h2>
-            <p><%= siteName %> is a simple to use free file hosting service where files get
-                deleted after <%= expireTime %>. It lets you share your photos, documents, music, videos and more with
+            <p><%= siteName %> is a simple to use free file hosting service.
+                It lets you share your photos, documents, music, videos and more with
                 others online.</p>
             <h2>What files are allowed?</h2>
             <p>Any kind of file is allowed, as long as the file is legal in <%= ServerCountryLocation %> and you have the legal
@@ -26,33 +26,23 @@
             <% } %>
             <p>Downloads and visits are not tracked or logged in respect for your privacy.</p>
             <h2>Can you remove my copyrighted file?</h2>
-            <p>
-                Please submit your copyright takedown notice to
-                <a href="mailto:<%= abuseContact %>"><%= abuseContact %></a>
-                . We will
-                handle your notice within <%= expireTime %> and disable access to the infringing file after receiving a notice
-                compliant with the Copyright Act.
-            </p>
+
+            Send an email to
+            <a href="mailto:<%= infoContact %>"><%= infoContact %></a>
+            .
+
             <h2>Can you remove files that are defaming me or otherwise infringing my non-copyright rights?</h2>
-            <p>
-                <%= siteName %> respects takedowns for other files when accompanied with a certified <%= ServerCountryLocation %> court order. If
-                you are unable to obtain the order, a preliminary injuction or court order is typically also sufficient.
-                Please forward the notice to
-                <a href="mailto:<%= abuseContact %>"><%= abuseContact %></a>
-                .
-            </p>
+
+            Send an email to
+            <a href="mailto:<%= infoContact %>"><%= infoContact %></a>
+            .
+
             <h2>Can you remove illegal files?</h2>
-            <p>Please contact the appropriate law enforcement agency if you notice illegal files hosted on <%= siteName %>. We
-                have not been trained or qualified to investigate and fight crimes and enforce the law, so it's not
-                appropriate to send accusations of illegal activity to us.</p>
-            <p>
-                You must contact the appropriate law enforcement office. They may then contact us if appropriate.
-                If you are an law enforcement official and you need our assistance, please contact
-                <a href="mailto:<%= abuseContact %>"><%= abuseContact %></a>
-                . If you are a law enforcement official from another
-                country, we may voluntarily cooperate if the crime you are investigating would also be illegal in
-                <%= ServerCountryLocation %>.
-            </p>
+
+            Send an email to
+            <a href="mailto:<%= infoContact %>"><%= infoContact %></a>
+            .
+
             <h2>I have a question...</h2>
 
             Send an email to
@@ -61,4 +51,4 @@
 
         </div>
     </article>
-<%- include('./partials/footer.ejs'); -%>
\ No newline at end of file
+<%- include('./partials/footer.ejs'); -%>

diff --git a/src/templates/partials/lead.ejs b/src/templates/partials/lead.ejs
index 28ab9332e66204bfdc673e6b76ef7edb3d5159fa..268907bfb9704aee197ba11e3db194b10278f8f9 100644 (file)
--- a/src/templates/partials/lead.ejs
+++ b/src/templates/partials/lead.ejs
@@ -1,7 +1,7 @@
 <h1><%= siteName %>~</h1>
 <p class="lead">
-    Max upload size is <%= max_upload_size %>&nbsp;MiB & files expire after <%= expireTime %>H, read the
+    Max upload size is <%= max_upload_size %>&nbsp;MiB, read the
     <a href="faq.html">
         <abbr title="Frequently asked questions">FAQ</abbr>
     </a>
-</p>
\ No newline at end of file
+</p>