fix extension fix

diff --git a/dist.json b/dist.json
index c9f1e8a6fe5f8adbc82e178207b297d5399241b0..e0c4b20f866e160c835e6997b65d98d19ddb6cb2 100644 (file)
--- a/dist.json
+++ b/dist.json
@@ -3,7 +3,7 @@
     "allowErrors": false
   },
   "dest": "dist",
-  "pkgVersion": "1.5.0",
+  "pkgVersion": "1.5.1",
   "banners": [
     "banners/malware_scans.swig",
     "banners/donations.swig"

diff --git a/package.json b/package.json
index 6aa703bbf0553af6b64acfc6e9fd17e34051e54a..c3ce9501ec67da826711cd404965bd8a5e19c9e8 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uguu",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Kawaii file host",
   "homepage": "https://uguu.se/",
   "repository": {

diff --git a/static/php/includes/Upload.class.php b/static/php/includes/Upload.class.php
index 31bb2d1ab628f581900006111735d6cdb990d6a5..4318eea33b29b00a9ffa057d98330f1956cff531 100644 (file)
--- a/static/php/includes/Upload.class.php
+++ b/static/php/includes/Upload.class.php
@@ -119,19 +119,34 @@ class Upload
         ];
     }
 
+    public static function getIP()
+    {
+        if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+            self::$IP = $_SERVER['HTTP_CLIENT_IP'];
+        }
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            self::$IP = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        }
+        if (!isset(self::$IP)) {
+            self::$IP = $_SERVER['REMOTE_ADDR'];
+        }
+    }
+
     public static function fileInfo()
     {
         if (isset($_FILES['files'])) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
             self::$FILE_MIME = finfo_file($finfo, self::$TEMP_FILE);
-            $extension = explode('.', self::$FILE_NAME, 2);
-            self::$FILE_EXTENSION = $extension['1'];
             finfo_close($finfo);
 
+            $extension = explode('.', self::$FILE_NAME);
+            self::$FILE_EXTENSION = $extension[count($extension)-2].'.'.$extension[count($extension)-1];
+
+
             if (Settings::$LOG_IP) {
-                self::$IP = $_SERVER['REMOTE_ADDR'];
+                self::getIP();
             } else {
-                self::$IP = '0';
+                self::$IP = null;
             }
         }
     }