Pman/Roo.php

[Pman.Base] / Pman / Roo.php

diff --git a/Pman/Roo.php b/Pman/Roo.php
index ec6e74f..362dfb7 100644 (file)
--- a/Pman/Roo.php
+++ b/Pman/Roo.php
@@ -334,7 +334,7 @@ class Pman_Roo extends Pman
         
         if (!empty($_REQUEST['csvCols']) && !empty($_REQUEST['csvTitles']) ) {
             
-            die("here?");
+            
             $this->toCsv($ret, $_REQUEST['csvCols'], $_REQUEST['csvTitles'],
                         empty($_REQUEST['csvFilename']) ? '' : $_REQUEST['csvFilename']
                          );
@@ -454,11 +454,18 @@ class Pman_Roo extends Pman
                 if ($cols == '*') {  /// did we get cols sent to us?
                     $cols = array_keys($x);
                 }
+                
+                if(!is_array($cols)) {
+                    $cols = explode(',', $cols);
+                }
                
                 if ($titles !== false) {
                     if ($titles== '*') {
                         $titles= array_keys($x);
                     }
+                    if(!is_array($titles)) {
+                        $titles = explode(',', $titles);
+                    }
                     foreach($cols as $i=>$col) {
                         $se_config['cols'][] = array(
                             'header'=> isset($titles[$i]) ? $titles[$i] : $col,
@@ -494,12 +501,7 @@ class Pman_Roo extends Pman
         foreach($data as $x) {
             //echo "<PRE>"; print_r(array($_REQUEST['csvCols'], $x->toArray())); exit;
             $line = array();
-            if ($titles== '*') {
-                $titles= array_keys($x);
-            }
-            if ($cols== '*') {
-                $cols= array_keys($x);
-            }
+            
             if ($titles !== false) {
                 foreach($cols as $i=>$col) {
                     $se_config['cols'][] = array(