|
|
@ -1820,7 +1820,21 @@ function processcustompage($pagename, $sections, $sum, $namemap) |
|
|
|
foreach ($result as $sec => $row) |
|
|
|
foreach ($result as $sec => $row) |
|
|
|
{ |
|
|
|
{ |
|
|
|
$secname = preg_replace('/\d/', '', $sec); |
|
|
|
$secname = preg_replace('/\d/', '', $sec); |
|
|
|
if (secmatch($section, $secname) && isset($row[$field])) |
|
|
|
if (secmatch($section, $secname)) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if ($field === '*') |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
foreach ($row as $f => $v) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
$showfields[$f] = 1; |
|
|
|
|
|
|
|
$map = $section.'.'.$f; |
|
|
|
|
|
|
|
if (isset($namemap[$map])) |
|
|
|
|
|
|
|
$showhead[$namemap[$map]] = 1; |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
$showhead[$f] = 1; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
elseif (isset($row[$field])) |
|
|
|
{ |
|
|
|
{ |
|
|
|
$showfields[$field] = 1; |
|
|
|
$showfields[$field] = 1; |
|
|
|
$map = $section.'.'.$field; |
|
|
|
$map = $section.'.'.$field; |
|
|
@ -1830,6 +1844,7 @@ function processcustompage($pagename, $sections, $sum, $namemap) |
|
|
|
$showhead[$field] = 1; |
|
|
|
$showhead[$field] = 1; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (count($showfields) > 0) |
|
|
|
if (count($showfields) > 0) |
|
|
|
{ |
|
|
|
{ |
|
|
|