- $table->cell($value,array('name'=>$h['header'], 'display'=>'table-cell'));
- //$node_string.= "\"".$value."\",";
-}
-else
-{
- //$value = $node[$h['tagname']];
- $value = $this->convert_data($node[$h['tagname']], $h['type']);
- $table->cell($value,array('name'=>$h['header'], 'display'=>'table-cell'));
- //$node_string.= "\"".$value."\",";
-}
-}
-else
- if ($node[$h['tagname']])
- {
- $value = $this->convert_data($node[$h['tagname']], $h['type']);
- $table->cell($value, array('name'=>$h['header'], 'display'=>'none'));
+ foreach ($this->all_headers as $h) {
+
+ if (! get_array($h, 'fixed')) {
+
+ if ($h['visible'] != "") {
+
+ if ($h['source'] == "comon") {
+ //print("<br>Searching for ".$h['tagname']."at ".$node);
+ if ($this->ComonData != "")
+ $value = $this->convert_data($this->ComonData[$node['hostname']][$h['tagname']], $h['tagname']);
+ else
+ $value = "n/a";
+
+ $table->cell($value,array('name'=>$h['header'], 'display'=>'table-cell'));
+ //$node_string.= "\"".$value."\",";
+ } else if ($h['source'] == "tophat") {
+ if ($this->TopHatData != "")
+ $value = $this->convert_data($this->TopHatData[$node['hostname']][$h['tagname']], $h['type']);
+ else
+ $value = "n/a";
+
+ $table->cell($value,array('name'=>$h['header'], 'display'=>'table-cell'));
+ //$node_string.= "\"".$value."\",";
+ } else {
+ //$value = $node[$h['tagname']];
+ $value = $this->convert_data($node[$h['tagname']], $h['type']);
+ $table->cell($value,array('name'=>$h['header'], 'display'=>'table-cell'));
+ //$node_string.= "\"".$value."\",";
+ }
+ } else if (get_array($node, $h['tagname'])) {
+ $value = $this->convert_data($node[$h['tagname']], $h['type']);
+ $table->cell($value, array('name'=>$h['header'], 'display'=>'none'));
+ } else {
+ $table->cell("n/a", array('name'=>$h['header'], 'display'=>'none'));
+ }
+ }