DataObjects/Core_notify_recur.php

[Pman.Core] / SimpleExcel.php

diff --git a/SimpleExcel.php b/SimpleExcel.php
index 23a81b5..675e348 100644 (file)
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -299,10 +299,13 @@ class Pman_Core_SimpleExcel extends Pman
             $worksheet->setRow($start_row +$r, $cfg['row_height']);
         }
         
-        foreach($cfg['cols']  as $c=>$col_cfg) {
+        $line_height = (isset($cfg['line_height'])) ? $cfg['line_height'] : 12;
+        $height = 0;
+        
+        foreach($cfg['cols']  as $c => $col_cfg) {
             
             if(isset($col_cfg['dataIndex']) && isset($cl[$col_cfg['dataIndex']])){
-                $v = @iconv("UTF-8", "UTF-8//IGNORE", $cl[$col_cfg['dataIndex']]);
+                $v =    $cl[$col_cfg['dataIndex']]  ;
                 
             }else{
                 if(isset($col_cfg['fillBlank'])){
@@ -327,7 +330,7 @@ class Pman_Core_SimpleExcel extends Pman
                 continue;
             }
             
-            $v = @iconv('UTF-8', 'UTF-8//IGNORE', $v);
+            $v = @iconv('UTF-8', 'UTF-8//TRANSLIT//IGNORE', $v);
             
             $dataFormat = empty($col_cfg['dataFormat']) ? '' : $col_cfg['dataFormat'];
               
@@ -343,6 +346,12 @@ class Pman_Core_SimpleExcel extends Pman
           
                 $worksheet->write($start_row+$r, $c, $v, $format);
             }
+            
+            if(isset($col_cfg['autoHeight'])){
+                $vv = explode("\n", $v);
+                $height = MAX(count($vv) * $line_height, $height);;
+                $worksheet->setRow($start_row+$r, $height);
+            }
         }
         $this->start_row++;