Merge pull request #36 from thxo/remove-dot-suffix-randomname

[uguu.git] / includes / core.php

diff --git a/includes/core.php b/includes/core.php
index 5f93645819b1590df2ff2ae325f55c96c4c2925d..8f48a5145ecfb710516429fc8ebdaeda9ac75b85 100644 (file)
--- a/includes/core.php
+++ b/includes/core.php
@@ -55,7 +55,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;
@@ -65,7 +68,7 @@ function gen_name($arg, $in){
 
 //Verify that the extension is allowed
 function verify_extension($ext, $type){
-    if(CONFIG_EXTENSION_BLOCKING_MODE == "WHITELIST") {
+    if(CONFIG_EXTENSION_BLOCKING_MODE === "WHITELIST") {
         $allowed = in_array($ext, unserialize(CONFIG_ALLOWED_EXTENSIONS));
     }else{
         $allowed = !in_array($ext, unserialize(CONFIG_BLOCKED_EXTENSIONS));