From: Alan Knowles <alan@roojs.com>
Date: Mon, 1 Apr 2013 09:05:22 +0000 (+0800)
Subject: ExcelToJson.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=8e393c49eac2a2698f298d882fa29ce5aaf13ee4

ExcelToJson.php
---

diff --git a/ExcelToJson.php b/ExcelToJson.php
index 25b298bf..39696cfc 100644
--- a/ExcelToJson.php
+++ b/ExcelToJson.php
@@ -51,7 +51,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo
         $cols = false;
         $header = false;
         $rows = array();
-        $ret = array();
+        $extra = array();
         
         while(false !== ($n = fgetcsv($fh,10000, ',', '"'))) {
             if(!array_filter($n)){
@@ -63,7 +63,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo
             }
             
             if(!$header){
-               $ret[preg_replace(array('/\s/', '/\:/'), '', $n[0])] = $n[1];
+               $extra[preg_replace(array('/\s/', '/\:/'), '', $n[0])] = $n[1];
                continue;
             }
             
@@ -89,6 +89,6 @@ class Pman_Core_ExcelToJson extends Pman_Roo
         }
         fclose($fh);
         
-        return array('extra' => $ret, 'data' => $rows);;
+        return array('extra' => $extra, 'data' => $rows);;
     }
 }
\ No newline at end of file