Better Filename finder for File Responses

MichaelJ2324 · Aug 15, 2016 · bcb6226 · bcb6226
1 parent 5295d08
commit bcb6226
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Endpoint/Abstracts/GET/AbstractGetFileEndpoint.php b/src/Endpoint/Abstracts/GET/AbstractGetFileEndpoint.php
@@ -23,7 +23,7 @@ public function __construct($url, array $options = array()){
         parent::__construct($url, $options);
     }
 
-    public function configureResponse(){
+    protected function configureResponse(){
         $this->Response->setDestinationPath($this->downloadDir);
         parent::configureResponse();
     }

diff --git a/src/Response/File.php b/src/Response/File.php
@@ -62,7 +62,8 @@ protected function extractFileName(){
         foreach (explode("\r\n", $this->headers) as $header)
         {
             if (strpos($header, 'filename')!==FALSE){
-                $this->setFileName(substr($header, (strpos($header, "\"")+1), -1));
+                $fileName = substr($header, (strpos($header, "=")+1), -1);
+                $this->setFileName($fileName);
             }
         }
     }
@@ -73,6 +74,8 @@ protected function extractFileName(){
      * @return self
      */
     public function setFileName($fileName){
+        $fileName = preg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $fileName);
+        $fileName = preg_replace("([\.]{2,})", '', $fileName);
         $this->fileName = $fileName;
         return $this;
     }