1 files changed, 24 insertions, 1 deletions
diff --git a/lib/helper.php b/lib/helper.php
index 412f0e6b764..beb10280d93 100755
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -354,6 +354,26 @@ class OC_Helper {
 	}
 
 	/**
+	 * get the mimetype form a data string
+	 * @param string data
+	 * @return string
+	 */
+	static function getStringMimeType($data){
+		if(function_exists('finfo_open') and function_exists('finfo_file')){
+			$finfo=finfo_open(FILEINFO_MIME);
+			return finfo_buffer($finfo, $data);
+		}else{
+			$tmpFile=OC_Helper::tmpFile();
+			$fh=fopen($tmpFile,'wb');
+			fwrite($fh,$data,8024);
+			fclose($fh);
+			$mime=self::getMimeType($tmpFile);
+			unset($tmpFile);
+			return $mime;
+		}
+	}
+
+	/**
 	 * @brief Checks $_REQUEST contains a var for the $s key. If so, returns the html-escaped value of this var; otherwise returns the default value provided by $d.
 	 * @param $s name of the var to escape, if set.
 	 * @param $d default value.
@@ -502,6 +522,9 @@ class OC_Helper {
      */
     public static function buildNotExistingFileName($path, $filename)
     {
+	    if($path==='/'){
+		    $path='';
+	    }
         if ($pos = strrpos($filename, '.')) {
             $name = substr($filename, 0, $pos);
             $ext = substr($filename, $pos);
@@ -518,6 +541,6 @@ class OC_Helper {
             $counter++;
         }
 
-        return $newname;
+        return $newpath;
     }
 }