X-Git-Url: https://jfr.im/git/uguu.git/blobdiff_plain/2f98035ac108db6733365c5f54236e0cb55ac69e..3de72c7f2fcac57b207b9446777ddbac567a4c99:/includes/core.php

diff --git a/includes/core.php b/includes/core.php
index 04303eb..5e91547 100644
--- a/includes/core.php
+++ b/includes/core.php
@@ -46,7 +46,11 @@ function save_file ($file, $name, $arg, $type){
     //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)
@@ -65,7 +69,10 @@ function gen_name($arg, $in){
         }
     switch($arg){
         case 'random':
-            return $name.'.'.$in;
+            if($in){
+                return $name.'.'.$in;
+            }
+            return $name;
             break;
         case 'custom_original':
             return $name.'_'.$in;