Review

Author: brcontainer

src/Drivers/CurlDriver.php

@@ -128,7 +128,7 @@ public function exec($url, &$httpStatus, &$contentType, &$errorCode, &$errorMess
 
         if ($code !== 0) {
             $errorCode = $code;
-            $errorMessage = $this->errorMessage ? $this->errorMessage : ('cURL: ' . curl_error($ch));
+            $errorMessage = $this->errorMessage ? $this->errorMessage : curl_error($ch);
 
             if ($this->httpStatus !== null) {
                 $httpStatus = $this->httpStatus;
@@ -146,6 +146,7 @@ public function exec($url, &$httpStatus, &$contentType, &$errorCode, &$errorMess
     private function abort($downloaded)
     {
         if ($downloaded > $this->maxDownloadSize) {
+            $this->errorMessage = 'Download aborted because file size exceeded the maximum allowed';
             return 1;
         }
 

src/Proxy.php

@@ -246,6 +246,11 @@ public function removeAllowedType($type)
     public function isAllowedType($type, &$errorMessage = null)
     {
         $type = trim($type);
+        $pos = strpos($type, ';');
+
+        if ($pos > 0) {
+            $type = substr($type, 0, $pos);
+        }
 
         if (array_key_exists($type, $this->allowedTypes)) {
             return true;
@@ -568,8 +573,7 @@ private function validateUrl($url)
                     '\\|' => '|'
                 ));
 
-                $this->allowedUrlsRegEx = '#^(' . $regex . ')#';
-                var_dump($this->allowedUrlsRegEx);
+                $this->allowedUrlsRegEx = '#^(' . $regex . ')#i';
             }
 
             if (!preg_match($this->allowedUrlsRegEx, $url)) {