Better fallback for loading HTML (when using loadView() never check i…

…f it's a file)
SpartnerNL · Feb 27, 2014 · ee51853 · ee51853
1 parent 9cc5f67
commit ee51853
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Laravel 4 Wrapper for PHPExcel v0.2.5
+## Laravel 4 Wrapper for PHPExcel v0.2.6
 
 #Installation
 

diff --git a/src/Maatwebsite/Excel/Excel.php b/src/Maatwebsite/Excel/Excel.php
@@ -185,7 +185,7 @@ public function loadHTML($string){
         include_once('Readers/HTML_reader.php');
 
         $this->reader = new HTML_reader;
-        $this->excel = $this->reader->load($string);
+        $this->excel = $this->reader->load($string, true);
 
         return $this;
 

diff --git a/src/Maatwebsite/Excel/Readers/HTML_reader.php b/src/Maatwebsite/Excel/Readers/HTML_reader.php
@@ -128,13 +128,13 @@ class HTML_reader extends \PHPExcel_Reader_HTML
      * @return  PHPExcel
      * @throws  PHPExcel_Reader_Exception
      */
-    public function load($pFilename)
+    public function load($pFilename, $isString = false)
     {
         // Create new PHPExcel
         $objPHPExcel = new \PHPExcel();
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $objPHPExcel);
+        return $this->loadIntoExisting($pFilename, $objPHPExcel, $isString);
     }
 
     /**
@@ -145,20 +145,27 @@ public function load($pFilename)
      * @return  PHPExcel
      * @throws  PHPExcel_Reader_Exception
      */
-    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel, $isString = false)
     {
-        $isHtmlFile = FALSE;
-        if(is_file($pFilename)){
-           $isHtmlFile = TRUE;
-           // Open file to validate
-           $this->_openFile($pFilename);
 
-           if (!$this->_isValidFormat()) {
-             fclose ($this->_fileHandle);
-             throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid HTML file.");
-           }
+        $isHtmlFile = FALSE;
 
-            fclose ($this->_fileHandle);
+        // Check if it's a string or file
+        if(!$isString)
+        {
+            // Double check if it's a file
+            if(is_file($pFilename)){
+               $isHtmlFile = TRUE;
+               // Open file to validate
+               $this->_openFile($pFilename);
+
+               if (!$this->_isValidFormat()) {
+                 fclose ($this->_fileHandle);
+                 throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid HTML file.");
+               }
+
+                fclose ($this->_fileHandle);
+            }
         }
 
         // Create new PHPExcel