X-Git-Url: https://jfr.im/git/uguu.git/blobdiff_plain/4366df0a56fc76485668a71ff2acc4d8f36b2653..7bc98e88525b25f26b53a77921159a36343d1d65:/includes/core.php

diff --git a/includes/core.php b/includes/core.php
index 8e4c0bf..5aca11b 100644
--- a/includes/core.php
+++ b/includes/core.php
@@ -1,34 +1,57 @@
 <?php
-function save_file ($file, $name, $arg){
-    //Where to save
-    $path='/home/neku/www/files/';
+//Loading configuration file
+require_once "config.php";
+
+//Saving the file on the server
+function save_file ($file, $name, $arg, $type){
     //Generate name depending on arg
     switch($arg){
         case 'random':
             $ext = pathinfo($file.$name, PATHINFO_EXTENSION);
+            $ext = strtolower($ext);
+            verify_extension($ext, $type);
             $file_name = gen_name('random', $ext);
-            while(file_exists($path.$file_name)){
-                $file_name = gen_name('random', $ext);
+            while(file_exists(CONFIG_FILES_PATH.$file_name)){
+              $file_name = gen_name('random', $ext);
             }
             break;
         case 'custom_original':
+            $name = stripslashes(str_replace('/', '', $name));
             $name = strip_tags(preg_replace('/\s+/', '', $name));
-            $file_name = gen_name('custom_original', $name);
-            while(file_exists($path.$file_name)){
+                $file_name = gen_name('custom_original', $name);
+                $ext = pathinfo($file_name, PATHINFO_EXTENSION);
+                $ext = strtolower($ext);
+                verify_extension($ext, $type);
+            while(file_exists(CONFIG_FILES_PATH.$file_name)){
                 $file_name = gen_name('custom_original', $name);
             }
             break;
     }
     //Move the file to the above location with said filename
-    move_uploaded_file($file,$path.$file_name);
-    //Return url+filename to the user
-    echo 'http://a.uguu.se/'.urlencode($file_name);
+    move_uploaded_file($file,CONFIG_FILES_PATH.$file_name);
+    //Check if html or plain text should be returned
+    if($type==='tool'){
+    //Return url+filename to the user (plain text)
+    if(CONFIG_SUBUPLOAD_URL_ENABLED == "true"){
+    echo CONFIG_SUBUPLOAD_URL.'/'.urlencode($file_name);
+    }else{
+    echo CONFIG_ROOT_URL.'/files/'.urlencode($file_name);
+    }
+    exit(0);
+    }elseif($type==='normal'){
+    //Return url+filename to the user (HTML)
+    $n=urlencode($file_name);
+    include_once(CONFIG_ROOT_PATH.'upload-done.php');
+    exit(0);
+    }
 }
+
+#Generate a random name for the uploaded file
 function gen_name($arg, $in){
-    $chars = 'abcdefghijklmnopqrstuvwxyz';
+    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
     $name = '';
-    for ($i = 0; $i < 6; $i++) {
-    $name .= $chars[mt_rand(0, 25)];
+    for ($i = 0; $i < CONFIG_RANDOM_LENGTH; $i++) {
+    $name .= $chars[mt_rand(0, 60)];
         }
     switch($arg){
         case 'random':
@@ -39,4 +62,21 @@ function gen_name($arg, $in){
             break;
     }
 }
-?>
+
+//Verify that the extension is allowed
+function verify_extension($ext, $type){
+    if(CONFIG_EXTENSION_BLOCKING_MODE === "WHITELIST") {
+        $allowed = in_array($ext, unserialize(CONFIG_ALLOWED_EXTENSIONS));
+    }else{
+        $allowed = !in_array($ext, unserialize(CONFIG_BLOCKED_EXTENSIONS));
+    }
+
+    if(!$allowed){
+        if($type==='normal'){
+            include_once(CONFIG_ROOT_PATH.'error_meow.php');
+            exit(0);
+        }else{
+            exit('File type not allowed.');
+        }
+    }
+}