projects
/
Pman.Base
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b92ce07
)
Pman/Roo.php
author
Edward
<edward@roojs.com>
Mon, 7 Jan 2019 07:04:37 +0000
(15:04 +0800)
committer
Edward
<edward@roojs.com>
Mon, 7 Jan 2019 07:04:37 +0000
(15:04 +0800)
Pman/Roo.php
patch
|
blob
|
history
diff --git
a/Pman/Roo.php
b/Pman/Roo.php
index
037f25c
..
162bc63
100644
(file)
--- a/
Pman/Roo.php
+++ b/
Pman/Roo.php
@@
-443,6
+443,20
@@
class Pman_Roo extends Pman
'leave_open' => true
);
'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)) {
$se = false;
if (is_object($data)) {
@@
-460,12
+474,7
@@
class Pman_Roo extends Pman
}
if ($titles !== false) {
}
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,
foreach($cols as $i=>$col) {
$se_config['cols'][] = array(
'header'=> isset($titles[$i]) ? $titles[$i] : $col,
@@
-501,12
+510,7
@@
class Pman_Roo extends Pman
foreach($data as $x) {
//echo "<PRE>"; print_r(array($_REQUEST['csvCols'], $x->toArray())); exit;
$line = array();
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) {
if ($titles !== false) {
foreach($cols as $i=>$col) {