Merge branch '2.x' into 2.1

zzplab · Nov 11, 2015 · afabbb2 · afabbb2
2 parents 50f4652 + 48d0f61
commit afabbb2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php
@@ -1456,6 +1456,11 @@ public function rename($hash, $name) {
 			return $this->setError(elFinder::ERROR_INVALID_NAME, $name);
 		}
 
+		$mimeByName = elFinderVolumeDriver::mimetypeInternalDetect($name);
+		if ($mimeByName && $mimeByName !== 'unknown' && !$this->allowPutMime($mimeByName)) {
+			return $this->setError(elFinder::ERROR_INVALID_NAME, $name);
+		}
+
 		if (!($file = $this->file($hash))) {
 			return $this->setError(elFinder::ERROR_FILE_NOT_FOUND);
 		}
@@ -1556,7 +1561,7 @@ public function upload($fp, $dst, $name, $tmpname) {
 			}
 		}
 
-		if (!$this->allowPutMime($mime) || ($mimeByName && !$this->allowPutMime($mimeByName))) {
+		if (!$this->allowPutMime($mime) || ($mimeByName && $mimeByName !== 'unknown' && !$this->allowPutMime($mimeByName))) {
 			return $this->setError(elFinder::ERROR_UPLOAD_FILE_MIME);
 		}