Incrementally use ->fields for recordsets, ->f is not supported by upstream adodb.

diff --git a/domains.php b/domains.php
index d114dd54bc6db5990e8ba200de1a3f9d9359fb86..3fdf3fdd2e272369d29774036109940e24d93616 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.24 2006/06/18 00:02:48 xzilla Exp $
+        * $Id: domains.php,v 1.25 2007/01/26 17:55:42 soranzo Exp $
         */
 
        // Include application functions
@@ -45,20 +45,20 @@
                
                if ($domaindata->recordCount() > 0) {
                        if (!isset($_POST['domname'])) {                                
-                               $_POST['domtype'] = $domaindata->f['domtype'];
-                               $_POST['domdefault'] = $domaindata->f['domdef'];
-                               $domaindata->f['domnotnull'] = $data->phpBool($domaindata->f['domnotnull']);
-                               if ($domaindata->f['domnotnull']) $_POST['domnotnull'] = 'on';
-                               $_POST['domowner'] = $domaindata->f['domowner'];
+                               $_POST['domtype'] = $domaindata->fields['domtype'];
+                               $_POST['domdefault'] = $domaindata->fields['domdef'];
+                               $domaindata->fields['domnotnull'] = $data->phpBool($domaindata->fields['domnotnull']);
+                               if ($domaindata->fields['domnotnull']) $_POST['domnotnull'] = 'on';
+                               $_POST['domowner'] = $domaindata->fields['domowner'];
                        }
                        
                        // Display domain info
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data left required\" width=\"70\">{$lang['strname']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domname']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($domaindata->fields['domname']), "</td></tr>\n";
                        echo "<tr><th class=\"data left required\">{$lang['strtype']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domtype']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($domaindata->fields['domtype']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\"><label for=\"domnotnull\">{$lang['strnotnull']}</label></th>\n";
                        echo "<td class=\"data1\"><input type=\"checkbox\" id=\"domnotnull\" name=\"domnotnull\"", (isset($_POST['domnotnull']) ? ' checked="checked"' : ''), " /></td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";
@@ -67,7 +67,7 @@
                        echo "<tr><th class=\"data left required\">{$lang['strowner']}</th>\n";
                        echo "<td class=\"data1\"><select name=\"domowner\">";
                        while (!$users->EOF) {
-                               $uname = $users->f['usename'];
+                               $uname = $users->fields['usename'];
                                echo "<option value=\"", htmlspecialchars($uname), "\"",
                                        ($uname == $_POST['domowner']) ? ' selected="selected"' : '', ">", htmlspecialchars($uname), "</option>\n";
                                $users->moveNext();
@@ -185,22 +185,22 @@
                
                if ($domaindata->recordCount() > 0) {
                        // Show comment if any
-                       if ($domaindata->f['domcomment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($domaindata->f['domcomment']), "</p>\n";
+                       if ($domaindata->fields['domcomment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($domaindata->fields['domcomment']), "</p>\n";
 
                        // Display domain info
-                       $domaindata->f['domnotnull'] = $data->phpBool($domaindata->f['domnotnull']);
+                       $domaindata->fields['domnotnull'] = $data->phpBool($domaindata->fields['domnotnull']);
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strname']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domname']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($domaindata->fields['domname']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strtype']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domtype']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($domaindata->fields['domtype']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strnotnull']}</th>\n";
-                       echo "<td class=\"data1\">", ($domaindata->f['domnotnull'] ? 'NOT NULL' : ''), "</td></tr>\n";
+                       echo "<td class=\"data1\">", ($domaindata->fields['domnotnull'] ? 'NOT NULL' : ''), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domdef']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($domaindata->fields['domdef']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strowner']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domowner']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($domaindata->fields['domowner']), "</td></tr>\n";
                        echo "</table>\n";
                        
                        // Display domain constraints
@@ -214,13 +214,13 @@
                                        
                                        while (!$domaincons->EOF) {
                                                $id = (($i % 2 ) == 0 ? '1' : '2');
-                                               echo "<tr><td class=\"data{$id}\">", $misc->printVal($domaincons->f['conname']), "</td>";
+                                               echo "<tr><td class=\"data{$id}\">", $misc->printVal($domaincons->fields['conname']), "</td>";
                                                echo "<td class=\"data{$id}\">";
-                                               echo $misc->printVal($domaincons->f['consrc']);
+                                               echo $misc->printVal($domaincons->fields['consrc']);
                                                echo "</td>";
                                                echo "<td class=\"opbutton{$id}\">";
-                                               echo "<a href=\"$PHP_SELF?action=confirm_drop_con&amp;{$misc->href}&amp;constraint=", urlencode($domaincons->f['conname']),
-                                                       "&amp;domain=", urlencode($_REQUEST['domain']), "&amp;type=", urlencode($domaincons->f['contype']), "\">{$lang['strdrop']}</a></td></tr>\n";
+                                               echo "<a href=\"$PHP_SELF?action=confirm_drop_con&amp;{$misc->href}&amp;constraint=", urlencode($domaincons->fields['conname']),
+                                                       "&amp;domain=", urlencode($_REQUEST['domain']), "&amp;type=", urlencode($domaincons->fields['contype']), "\">{$lang['strdrop']}</a></td></tr>\n";
                
                                                $domaincons->moveNext();
                                                $i++;
@@ -306,9 +306,9 @@
                // Output return type list              
                echo "<select name=\"domtype\">\n";
                while (!$types->EOF) {
-                       echo "<option value=\"", htmlspecialchars($types->f['typname']), "\"", 
-                               ($types->f['typname'] == $_POST['domtype']) ? ' selected="selected"' : '', ">",
-                               $misc->printVal($types->f['typname']), "</option>\n";
+                       echo "<option value=\"", htmlspecialchars($types->fields['typname']), "\"", 
+                               ($types->fields['typname'] == $_POST['domtype']) ? ' selected="selected"' : '', ">",
+                               $misc->printVal($types->fields['typname']), "</option>\n";
                        $types->moveNext();
                }
                echo "</select>\n";

diff --git a/info.php b/info.php
index 697b090ea114d10a7cede10bd2a8eee578a117cb..d776d782d14ccd67413d272fe124869dd6df3796 100644 (file)
--- a/info.php
+++ b/info.php
@@ -3,7 +3,7 @@
        /**
         * List extra information on a table
         *
-        * $Id: info.php,v 1.12 2007/01/26 17:03:01 xzilla Exp $
+        * $Id: info.php,v 1.13 2007/01/26 17:55:42 soranzo Exp $
         */
 
        // Include application functions
@@ -64,14 +64,14 @@
                                        $id = ( ($i % 2 ) == 0 ? '1' : '2' );
                                        echo "\t<tr>\n\t\t";
                                        if ($data->hasSchemas()) {
-                                               echo "<td class=\"data{$id}\">", $misc->printVal($referrers->f['nspname']), "</td>";
+                                               echo "<td class=\"data{$id}\">", $misc->printVal($referrers->fields['nspname']), "</td>";
                                        }
-                                       echo "<td class=\"data{$id}\">", $misc->printVal($referrers->f['relname']), "</td>";
-                                       echo "<td class=\"data{$id}\">", $misc->printVal($referrers->f['conname']), "</td>";
-                                       echo "<td class=\"data{$id}\">", $misc->printVal($referrers->f['consrc']), "</td>";
+                                       echo "<td class=\"data{$id}\">", $misc->printVal($referrers->fields['relname']), "</td>";
+                                       echo "<td class=\"data{$id}\">", $misc->printVal($referrers->fields['conname']), "</td>";
+                                       echo "<td class=\"data{$id}\">", $misc->printVal($referrers->fields['consrc']), "</td>";
                                        echo "<td class=\"opbutton{$id}\"><a href=\"constraints.php?{$misc->href}", 
-                                               "&amp;schema=", urlencode($referrers->f['nspname']),
-                                               "&amp;table=", urlencode($referrers->f['relname']), "\">{$lang['strproperties']}</a></td>\n";
+                                               "&amp;schema=", urlencode($referrers->fields['nspname']),
+                                               "&amp;table=", urlencode($referrers->fields['relname']), "\">{$lang['strproperties']}</a></td>\n";
                                        echo "\t</tr>\n";
                                        $referrers->movenext();
                                        $i++;
@@ -97,12 +97,12 @@
                                        $id = ( ($i % 2 ) == 0 ? '1' : '2' );
                                        echo "\t<tr>\n";
                                        if ($data->hasSchemas()) {
-                                               echo "\t\t<td class=\"data{$id}\">", $misc->printVal($parents->f['nspname']), "</td>";
+                                               echo "\t\t<td class=\"data{$id}\">", $misc->printVal($parents->fields['nspname']), "</td>";
                                        }
-                                       echo "<td class=\"data{$id}\">", $misc->printVal($parents->f['relname']), "</td>";
+                                       echo "<td class=\"data{$id}\">", $misc->printVal($parents->fields['relname']), "</td>";
                                        echo "<td class=\"opbutton{$id}\"><a href=\"tblproperties.php?{$misc->href}",
-                                               "&amp;schema=", urlencode($parents->f['nspname']),
-                                               "&amp;table=", urlencode($parents->f['relname']), "\">{$lang['strproperties']}</a></td>\n";
+                                               "&amp;schema=", urlencode($parents->fields['nspname']),
+                                               "&amp;table=", urlencode($parents->fields['relname']), "\">{$lang['strproperties']}</a></td>\n";
                                        echo "\t</tr>\n";
                                        $parents->movenext();
                                        $i++;
@@ -128,12 +128,12 @@
                                        $id = ( ($i % 2 ) == 0 ? '1' : '2' );
                                        echo "\t<tr>\n";
                                        if ($data->hasSchemas()) {
-                                               echo "\t\t<td class=\"data{$id}\">", $misc->printVal($children->f['schemaname']), "</td>";
+                                               echo "\t\t<td class=\"data{$id}\">", $misc->printVal($children->fields['schemaname']), "</td>";
                                        }
-                                       echo "<td class=\"data{$id}\">", $misc->printVal($children->f['relname']), "</td>";
+                                       echo "<td class=\"data{$id}\">", $misc->printVal($children->fields['relname']), "</td>";
                                        echo "<td class=\"opbutton{$id}\"><a href=\"tblproperties.php?{$misc->href}",
-                                               "&amp;schema=", urlencode($children->f['schemaname']),
-                                               "&amp;table=", urlencode($children->f['relname']), "\">{$lang['strproperties']}</a></td>\n";
+                                               "&amp;schema=", urlencode($children->fields['schemaname']),
+                                               "&amp;table=", urlencode($children->fields['relname']), "\">{$lang['strproperties']}</a></td>\n";
                                        echo "\t</tr>\n";
                                        $children->movenext();
                                        $i++;
@@ -167,13 +167,13 @@
                                while (!$tablestatstups->EOF) {
                                        $id = ( ($i % 2 ) == 0 ? '1' : '2' );
                                        echo "\t<tr>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->f['seq_scan'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->f['seq_tup_read'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->f['idx_scan'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->f['idx_tup_fetch'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->f['n_tup_ins'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->f['n_tup_upd'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->f['n_tup_del'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->fields['seq_scan'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->fields['seq_tup_read'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->fields['idx_scan'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->fields['idx_tup_fetch'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->fields['n_tup_ins'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->fields['n_tup_upd'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatstups->fields['n_tup_del'], 'int4', $shownull), "</td>\n";
                                        echo "\t</tr>\n";
                                        $tablestatstups->movenext();
                                        $i++;
@@ -213,32 +213,32 @@
                                        $id = ( ($i % 2 ) == 0 ? '1' : '2' );
                                        echo "\t<tr>\n";
     
-                                       $total = $tablestatsio->f['heap_blks_hit'] + $tablestatsio->f['heap_blks_read'];
-                                       if ($total > 0) $percentage = round(($tablestatsio->f['heap_blks_hit'] / $total) * 100);
+                                       $total = $tablestatsio->fields['heap_blks_hit'] + $tablestatsio->fields['heap_blks_read'];
+                                       if ($total > 0) $percentage = round(($tablestatsio->fields['heap_blks_hit'] / $total) * 100);
                                        else $percentage = 0;
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['heap_blks_read'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['heap_blks_hit'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['heap_blks_read'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['heap_blks_hit'], 'int4', $shownull), "</td>\n";
                                        echo "\t\t<td class=\"data{$id}\">({$percentage}{$lang['strpercent']})</td>\n";
     
-                                       $total = $tablestatsio->f['idx_blks_hit'] + $tablestatsio->f['idx_blks_read'];
-                                       if ($total > 0) $percentage = round(($tablestatsio->f['idx_blks_hit'] / $total) * 100);
+                                       $total = $tablestatsio->fields['idx_blks_hit'] + $tablestatsio->fields['idx_blks_read'];
+                                       if ($total > 0) $percentage = round(($tablestatsio->fields['idx_blks_hit'] / $total) * 100);
                                        else $percentage = 0;
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['idx_blks_read'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['idx_blks_hit'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['idx_blks_read'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['idx_blks_hit'], 'int4', $shownull), "</td>\n";
                                        echo "\t\t<td class=\"data{$id}\">({$percentage}{$lang['strpercent']})</td>\n";
     
-                                       $total = $tablestatsio->f['toast_blks_hit'] + $tablestatsio->f['toast_blks_read'];
-                                       if ($total > 0) $percentage = round(($tablestatsio->f['toast_blks_hit'] / $total) * 100);
+                                       $total = $tablestatsio->fields['toast_blks_hit'] + $tablestatsio->fields['toast_blks_read'];
+                                       if ($total > 0) $percentage = round(($tablestatsio->fields['toast_blks_hit'] / $total) * 100);
                                        else $percentage = 0;
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['toast_blks_read'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['toast_blks_hit'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['toast_blks_read'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['toast_blks_hit'], 'int4', $shownull), "</td>\n";
                                        echo "\t\t<td class=\"data{$id}\">({$percentage}{$lang['strpercent']})</td>\n";
     
-                                       $total = $tablestatsio->f['tidx_blks_hit'] + $tablestatsio->f['tidx_blks_read'];
-                                       if ($total > 0) $percentage = round(($tablestatsio->f['tidx_blks_hit'] / $total) * 100);
+                                       $total = $tablestatsio->fields['tidx_blks_hit'] + $tablestatsio->fields['tidx_blks_read'];
+                                       if ($total > 0) $percentage = round(($tablestatsio->fields['tidx_blks_hit'] / $total) * 100);
                                        else $percentage = 0;
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['tidx_blks_read'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->f['tidx_blks_hit'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['tidx_blks_read'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($tablestatsio->fields['tidx_blks_hit'], 'int4', $shownull), "</td>\n";
                                        echo "\t\t<td class=\"data{$id}\">({$percentage}{$lang['strpercent']})</td>\n";
                                        echo "\t</tr>\n";
                                        $tablestatsio->movenext();
@@ -264,10 +264,10 @@
                                while (!$indexstatstups->EOF) {
                                        $id = ( ($i % 2 ) == 0 ? '1' : '2' );
                                        echo "\t<tr>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->f['indexrelname']), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->f['idx_scan'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->f['idx_tup_read'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->f['idx_tup_fetch'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->fields['indexrelname']), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->fields['idx_scan'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->fields['idx_tup_read'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatstups->fields['idx_tup_fetch'], 'int4', $shownull), "</td>\n";
                                        echo "\t</tr>\n";
                                        $indexstatstups->movenext();
                                        $i++;
@@ -292,12 +292,12 @@
                                while (!$indexstatsio->EOF) {
                                        $id = ( ($i % 2 ) == 0 ? '1' : '2' );
                                        echo "\t<tr>\n";
-                                       $total = $indexstatsio->f['idx_blks_hit'] + $indexstatsio->f['idx_blks_read'];
-                                       if ($total > 0) $percentage = round(($indexstatsio->f['idx_blks_hit'] / $total) * 100);
+                                       $total = $indexstatsio->fields['idx_blks_hit'] + $indexstatsio->fields['idx_blks_read'];
+                                       if ($total > 0) $percentage = round(($indexstatsio->fields['idx_blks_hit'] / $total) * 100);
                                        else $percentage = 0;
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatsio->f['indexrelname']), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatsio->f['idx_blks_read'], 'int4', $shownull), "</td>\n";
-                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatsio->f['idx_blks_hit'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatsio->fields['indexrelname']), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatsio->fields['idx_blks_read'], 'int4', $shownull), "</td>\n";
+                                       echo "\t\t<td class=\"data{$id}\">", $misc->printVal($indexstatsio->fields['idx_blks_hit'], 'int4', $shownull), "</td>\n";
                                        echo "\t\t<td class=\"data{$id}\">({$percentage}{$lang['strpercent']})</td>\n";
                                        echo "\t</tr>\n";
                                        $indexstatsio->movenext();

diff --git a/reports.php b/reports.php
index 41096a9001d50f566ba7f0ec6497b3d7febecd0e..9cf5b542effa50a59f41143e64344363983727ee 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.23 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: reports.php,v 1.24 2007/01/26 17:55:42 soranzo Exp $
         */
 
        // Include application functions
@@ -22,16 +22,16 @@
                // If it's a first, load then get the data from the database
                $report = $reportsdb->getReport($_REQUEST['report_id']);
                if ($_REQUEST['action'] == 'edit') {                    
-                       $_POST['report_name'] = $report->f['report_name'];
-                       $_POST['db_name'] = $report->f['db_name'];
-                       $_POST['descr'] = $report->f['descr'];
-                       $_POST['report_sql'] = $report->f['report_sql'];
+                       $_POST['report_name'] = $report->fields['report_name'];
+                       $_POST['db_name'] = $report->fields['db_name'];
+                       $_POST['descr'] = $report->fields['descr'];
+                       $_POST['report_sql'] = $report->fields['report_sql'];
                }
 
                // Get a list of available databases
                $databases = $data->getDatabases();
 
-               $_REQUEST['report'] = $report->f['report_name'];
+               $_REQUEST['report'] = $report->fields['report_name'];
                $misc->printTrail('report');
                $misc->printTitle($lang['stredit']);
                $misc->printMsg($msg);
@@ -45,7 +45,7 @@
                echo "<tr><th class=\"data left required\">{$lang['strdatabase']}</th>\n";
                echo "<td class=\"data1\"><select name=\"db_name\">\n";
                while (!$databases->EOF) {
-                       $dbname = $databases->f['datname'];
+                       $dbname = $databases->fields['datname'];
                        echo "<option value=\"", htmlspecialchars($dbname), "\"",
                        ($dbname == $_POST['db_name']) ? ' selected="selected"' : '', ">",
                                htmlspecialchars($dbname), "</option>\n";
@@ -62,7 +62,7 @@
                echo "<p><input type=\"hidden\" name=\"action\" value=\"save_edit\" />\n";
                echo "<input type=\"submit\" value=\"{$lang['strsave']}\" />\n";
                echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
-               echo "<input type=\"hidden\" name=\"report_id\" value=\"{$report->f['report_id']}\" />\n";
+               echo "<input type=\"hidden\" name=\"report_id\" value=\"{$report->fields['report_id']}\" />\n";
                echo "</form>\n";
        }
 
@@ -99,7 +99,7 @@
 
                $report = $reportsdb->getReport($_REQUEST['report_id']);
 
-               $_REQUEST['report'] = $report->f['report_name'];
+               $_REQUEST['report'] = $report->fields['report_name'];
                $misc->printTrail('report');
                $misc->printTitle($lang['strproperties']);
                $misc->printMsg($msg);
@@ -107,19 +107,19 @@
                if ($report->recordCount() == 1) {
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\">{$lang['strname']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($report->f['report_name']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($report->fields['report_name']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strdatabase']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($report->f['db_name']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($report->fields['db_name']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($report->f['descr']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($report->fields['descr']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strsql']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($report->f['report_sql']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($report->fields['report_sql']), "</td></tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strinvalidparam']}</p>\n";
 
                echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallreports']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"$PHP_SELF?action=edit&amp;{$misc->href}&amp;report_id={$report->f['report_id']}\">{$lang['stredit']}</a></p>\n";
+               echo "<a class=\"navlink\" href=\"$PHP_SELF?action=edit&amp;{$misc->href}&amp;report_id={$report->fields['report_id']}\">{$lang['stredit']}</a></p>\n";
        }
 
        /**
@@ -149,7 +149,7 @@
                echo "<tr><th class=\"data left required\">{$lang['strdatabase']}</th>\n";
                echo "<td class=\"data1\"><select name=\"db_name\">\n";
                while (!$databases->EOF) {
-                       $dbname = $databases->f['datname'];
+                       $dbname = $databases->fields['datname'];
                        echo "<option value=\"", htmlspecialchars($dbname), "\"",
                        ($dbname == $_REQUEST['db_name']) ? ' selected="selected"' : '', ">",
                                htmlspecialchars($dbname), "</option>\n";
@@ -205,11 +205,11 @@
                        // Fetch report from the database
                        $report = $reportsdb->getReport($_REQUEST['report_id']);
 
-                       $_REQUEST['report'] = $report->f['report_name'];
+                       $_REQUEST['report'] = $report->fields['report_name'];
                        $misc->printTrail('report');
                        $misc->printTitle($lang['strdrop']);
 
-                       echo "<p>", sprintf($lang['strconfdropreport'], $misc->printVal($report->f['report_name'])), "</p>\n";
+                       echo "<p>", sprintf($lang['strconfdropreport'], $misc->printVal($report->fields['report_name'])), "</p>\n";
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo $misc->form;