Pman/Roo.php

[Pman.Base] / Pman / Roo.php

diff --git a/Pman/Roo.php b/Pman/Roo.php
index a83bc9e..c9f4740 100644 (file)
--- a/Pman/Roo.php
+++ b/Pman/Roo.php
@@ -443,6 +443,20 @@ class Pman_Roo extends Pman
             'leave_open' => true
         );
         
+        if ($titles== '*') {
+            $titles= array_keys($x);
+        }
+        if ($cols== '*') {
+            $cols= array_keys($x);
+        }
+
+        if(!is_array($titles)) {
+            $titles = explode(',', $titles);
+        }
+        if(!is_array($cols)) {
+            $cols = explode(',', $cols);
+        }
+            
         
         $se = false;
         if (is_object($data)) {
@@ -454,11 +468,13 @@ 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);
-                    }
+                    
                     foreach($cols as $i=>$col) {
                         $se_config['cols'][] = array(
                             'header'=> isset($titles[$i]) ? $titles[$i] : $col,
@@ -494,19 +510,6 @@ 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(!is_array($titles)) {
-                $titles = explode(',', $titles);
-            }
-            if(!is_array($cols)) {
-                $cols = explode(',', $cols);
-            }
             
             if ($titles !== false) {
                 foreach($cols as $i=>$col) {