Ensure no trailing dot in random filenames

[uguu.git] / includes / core.php

diff --git a/includes/core.php b/includes/core.php
index 04303eb0bde537f5f0d1652c1bd06a4756a92b65..5e915478074103c83c7efd21f2a5769c67619019 100644 (file)
--- 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;