Changeset 34 for trunk/phpgwapi/inc/adodb/tohtml.inc.php

Timestamp:

06/29/07 15:17:46 (17 years ago)

Author:

niltonneto

Message:

Versão nova do ADODB (4.5 para 4.95)

File:

• trunk/phpgwapi/inc/adodb/tohtml.inc.php (modified) (5 diffs)

trunk/phpgwapi/inc/adodb/tohtml.inc.php

@@ -1 +1 @@
 <?php 
 /*
-  V4.51 29 July 2004  (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
+  V4.93 10 Oct 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -10 +10 @@
   
 // specific code for tohtml
-GLOBAL $gSQLMaxRows,$gSQLBlockRows;
-         
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
+
+$ADODB_ROUND=4; // rounding
 $gSQLMaxRows = 1000; // max no of rows to download
 $gSQLBlockRows=20; // max no of rows per table block
@@ -36 +37 @@
 //
 // RETURNS: number of rows displayed
+
+
 function rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true,$echo = true)
 {
 $s ='';$rows=0;$docnt = false;
-GLOBAL $gSQLMaxRows,$gSQLBlockRows;
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 
         if (!$rs) {
@@ -53 +56 @@
         for ($i=0; $i < $ncols; $i++) { 
                 $field = $rs->FetchField($i);
-                if ($zheaderarray) $fname = $zheaderarray[$i];
-                else $fname = htmlspecialchars($field->name);   
-                $typearr[$i] = $rs->MetaType($field->type,$field->max_length);
-                //print " $field->name $field->type $typearr[$i] ";
-                        
+                if ($field) {
+                        if ($zheaderarray) $fname = $zheaderarray[$i];
+                        else $fname = htmlspecialchars($field->name);   
+                        $typearr[$i] = $rs->MetaType($field->type,$field->max_length);
+                        //print " $field->name $field->type $typearr[$i] ";
+                } else {
+                        $fname = 'Field '.($i+1);
+                        $typearr[$i] = 'C';
+                }
                 if (strlen($fname)==0) $fname = '&nbsp;';
                 $hdr .= "<TH>$fname</TH>";
@@ -78 +85 @@
                         switch($type) {
                         case 'D':
-                                if (!strpos($v,':')) {
+                                if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
+                                else if (!strpos($v,':')) {
                                         $s .= " <TD>".$rs->UserDate($v,"D d, M Y") ."&nbsp;</TD>\n";
-                                        break;
                                 }
+                                break;
                         case 'T':
-                                $s .= " <TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ."&nbsp;</TD>\n";
+                                if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
+                                else $s .= "    <TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ."&nbsp;</TD>\n";
                         break;
+                        
+                        case 'N':
+                                if (abs(abs($v) - round($v,0)) < 0.00000001)
+                                        $v = round($v);
+                                else
+                                        $v = round($v,$ADODB_ROUND);
                         case 'I':
-                        case 'N':
                                 $s .= " <TD align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";