Soper/sugoi
1
0
Fork 0
forked from gitbot/uguu
Code Issues Pull Requests 1 Projects Releases Wiki Activity

WIP: updating to match uguu #1

Draft
Soper wants to merge 51 commits from gitbot:master into master
pull from: gitbot:master
merge into: Soper:master
Conversation 0 Commits 51 Files Changed 50 +21 -6
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb13a2a304 - Show all commits

2
dist.json
View File

@ -3,7 +3,7 @@
"allowErrors": false "allowErrors": false
}, },
"dest": "dist", "dest": "dist",
"pkgVersion": "1.5.0", "pkgVersion": "1.5.1",
"banners": [ "banners": [
"banners/malware_scans.swig", "banners/malware_scans.swig",
"banners/donations.swig" "banners/donations.swig"

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "uguu", "name": "uguu",
"version": "1.5.0", "version": "1.5.1",
"description": "Kawaii file host", "description": "Kawaii file host",
"homepage": "https://uguu.se/", "homepage": "https://uguu.se/",
"repository": { "repository": {

23
static/php/includes/Upload.class.php
View File

@ -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() public static function fileInfo()
{ {
if (isset($_FILES['files'])) { if (isset($_FILES['files'])) {
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
self::$FILE_MIME = finfo_file($finfo, self::$TEMP_FILE); self::$FILE_MIME = finfo_file($finfo, self::$TEMP_FILE);
$extension = explode('.', self::$FILE_NAME, 2);
self::$FILE_EXTENSION = $extension['1'];
finfo_close($finfo); finfo_close($finfo);
$extension = explode('.', self::$FILE_NAME);
self::$FILE_EXTENSION = $extension[count($extension)-2].'.'.$extension[count($extension)-1];
if (Settings::$LOG_IP) { if (Settings::$LOG_IP) {
self::$IP = $_SERVER['REMOTE_ADDR']; self::getIP();
} else { } else {
self::$IP = '0'; self::$IP = null;
} }
} }
} }