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

diff --git a/database.php b/database.php
index fa2f35765d4704e6af1e97deaac8fe0056c38366..a87a6b5825abe3b9e22874919c991df0cbc32abb 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.90 2007/04/01 16:02:07 xzilla Exp $
+        * $Id: database.php,v 1.91 2007/04/16 16:59:46 soranzo Exp $
         */
 
        // Include application functions
@@ -89,21 +89,21 @@
                                $curr = '';
                                while (!$rs->EOF) {
                                        // Output a new header if the current type has changed, but not if it's just changed the rule type
-                                       if ($rs->f['type'] != $curr) {
+                                       if ($rs->fields['type'] != $curr) {
                                                // Short-circuit in the case of changing from table rules to view rules; table cols to view cols;
                                                // table constraints to domain constraints
-                                               if ($rs->f['type'] == 'RULEVIEW' && $curr == 'RULETABLE') {
-                                                       $curr = $rs->f['type'];
+                                               if ($rs->fields['type'] == 'RULEVIEW' && $curr == 'RULETABLE') {
+                                                       $curr = $rs->fields['type'];
                                                }
-                                               elseif ($rs->f['type'] == 'COLUMNVIEW' && $curr == 'COLUMNTABLE') {
-                                                       $curr = $rs->f['type'];
+                                               elseif ($rs->fields['type'] == 'COLUMNVIEW' && $curr == 'COLUMNTABLE') {
+                                                       $curr = $rs->fields['type'];
                                                }
-                                               elseif ($rs->f['type'] == 'CONSTRAINTTABLE' && $curr == 'CONSTRAINTDOMAIN') {
-                                                       $curr = $rs->f['type'];
+                                               elseif ($rs->fields['type'] == 'CONSTRAINTTABLE' && $curr == 'CONSTRAINTDOMAIN') {
+                                                       $curr = $rs->fields['type'];
                                                }
                                                else {
                                                        if ($curr != '') echo "</ul>\n";
-                                                       $curr = $rs->f['type'];
+                                                       $curr = $rs->fields['type'];
                                                        echo "<h3>";
                                                        switch ($curr) {
                                                                case 'SCHEMA':
@@ -168,97 +168,97 @@
                                        
                                        // Generate schema prefix
                                        if ($data->hasSchemas())
-                                               $prefix = $rs->f['schemaname'] . '.';
+                                               $prefix = $rs->fields['schemaname'] . '.';
                                        else
                                                $prefix = '';
                                                
                                        switch ($curr) {
                                                case 'SCHEMA':                                          
-                                                       echo "<li><a href=\"database.php?{$misc->href}\">", _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"database.php?{$misc->href}\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'TABLE':
-                                                       echo "<li><a href=\"tblproperties.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;table=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"tblproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
+                                                               urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'VIEW':
-                                                       echo "<li><a href=\"views.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;view=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"views.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;view=", 
+                                                               urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'SEQUENCE':
-                                                       echo "<li><a href=\"sequences.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), 
-                                                               "&amp;sequence=", urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"sequences.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), 
+                                                               "&amp;sequence=", urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'COLUMNTABLE':
-                                                       echo "<li><a href=\"tblproperties.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;table=", 
-                                                               urlencode($rs->f['relname']), "&amp;column=", urlencode($rs->f['name']), "&amp;action=properties\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"tblproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
+                                                               urlencode($rs->fields['relname']), "&amp;column=", urlencode($rs->fields['name']), "&amp;action=properties\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'COLUMNVIEW':
-                                                       echo "<li><a href=\"viewproperties.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;view=", 
-                                                               urlencode($rs->f['relname']), "&amp;column=", urlencode($rs->f['name']), "&amp;action=properties\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"viewproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;view=", 
+                                                               urlencode($rs->fields['relname']), "&amp;column=", urlencode($rs->fields['name']), "&amp;action=properties\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'INDEX':
-                                                       echo "<li><a href=\"indexes.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;table=", 
-                                                               urlencode($rs->f['relname']), "\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"indexes.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
+                                                               urlencode($rs->fields['relname']), "\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'CONSTRAINTTABLE':
-                                                       echo "<li><a href=\"constraints.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;table=", 
-                                                               urlencode($rs->f['relname']), "\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"constraints.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
+                                                               urlencode($rs->fields['relname']), "\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'CONSTRAINTDOMAIN':
-                                                       echo "<li><a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;domain=", 
-                                                               urlencode($rs->f['relname']), "\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;domain=", 
+                                                               urlencode($rs->fields['relname']), "\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'TRIGGER':
-                                                       echo "<li><a href=\"triggers.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;table=", 
-                                                               urlencode($rs->f['relname']), "\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"triggers.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
+                                                               urlencode($rs->fields['relname']), "\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'RULETABLE':
-                                                       echo "<li><a href=\"rules.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;reltype=table&amp;relation=", 
-                                                               urlencode($rs->f['relname']), "\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"rules.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;reltype=table&amp;relation=", 
+                                                               urlencode($rs->fields['relname']), "\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'RULEVIEW':
-                                                       echo "<li><a href=\"rules.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;reltype=view&amp;relation=", 
-                                                               urlencode($rs->f['relname']), "\">", 
-                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"rules.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;reltype=view&amp;relation=", 
+                                                               urlencode($rs->fields['relname']), "\">", 
+                                                               $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'FUNCTION':
-                                                       echo "<li><a href=\"functions.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;function=", 
-                                                               urlencode($rs->f['name']), "&amp;function_oid=", urlencode($rs->f['oid']), "\">", 
-                                                               $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"functions.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;function=", 
+                                                               urlencode($rs->fields['name']), "&amp;function_oid=", urlencode($rs->fields['oid']), "\">", 
+                                                               $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'TYPE':
-                                                       echo "<li><a href=\"types.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;type=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"types.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;type=", 
+                                                               urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'DOMAIN':
-                                                       echo "<li><a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;domain=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;domain=", 
+                                                               urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'OPERATOR':
-                                                       echo "<li><a href=\"operators.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "&amp;operator=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"operators.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;operator=", 
+                                                               urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'CONVERSION':
-                                                       echo "<li><a href=\"conversions.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), 
-                                                               "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"conversions.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), 
+                                                               "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'LANGUAGE':
-                                                       echo "<li><a href=\"languages.php?{$misc->href}\">", _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"languages.php?{$misc->href}\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'AGGREGATE':
-                                                       echo "<li><a href=\"aggregates.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "\">",
-                                                               $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"aggregates.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">",
+                                                               $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'OPCLASS':
-                                                       echo "<li><a href=\"opclasses.php?{$misc->href}&amp;schema=", urlencode($rs->f['schemaname']), "\">",
-                                                               $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                       echo "<li><a href=\"opclasses.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">",
+                                                               $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                        }
                                        $rs->moveNext();        
@@ -430,7 +430,7 @@
                else $actions = array();
                
                // Remove query start time for <7.4
-               if (!isset($processes->f['query_start'])) unset($columns['start_time']);
+               if (!isset($processes->fields['query_start'])) unset($columns['start_time']);
 
                $misc->printTable($processes, $columns, $actions, $lang['strnodata']);
        }
@@ -587,7 +587,7 @@
 
                                if($data->hasAutovacuum()) {
                                        $enabled = $data->getVariable('autovacuum');
-                                       echo "<h3>{$lang['strautovacuum']} ". (($enabled->f['autovacuum'] == 'on') ? $lang['strturnedon'] : $lang['strturnedoff'] ) ."</h3>";
+                                       echo "<h3>{$lang['strautovacuum']} ". (($enabled->fields['autovacuum'] == 'on') ? $lang['strturnedon'] : $lang['strturnedoff'] ) ."</h3>";
                                        // Autovacuum
                                        // Fetch the processes from the database
                                        $autovac = $data->getAutovacuum();
@@ -686,33 +686,33 @@
                                $i = 0;
                                $nCC = 0;
                                while (!$attrs->EOF) {
-                                       $szValueName = "values[{$attrs->f['attname']}]";
+                                       $szValueName = "values[{$attrs->fields['attname']}]";
                                        $szEvents = "";
                                        $szDivPH = "";
                                        
-                                       $attrs->f['attnotnull'] = $data->phpBool($attrs->f['attnotnull']);
+                                       $attrs->fields['attnotnull'] = $data->phpBool($attrs->fields['attnotnull']);
                                        $id = (($i % 2) == 0 ? '1' : '2');
                                        
                                        // Initialise variables
-                                       if (!isset($_REQUEST['format'][$attrs->f['attname']]))
-                                               $_REQUEST['format'][$attrs->f['attname']] = 'VALUE';
+                                       if (!isset($_REQUEST['format'][$attrs->fields['attname']]))
+                                               $_REQUEST['format'][$attrs->fields['attname']] = 'VALUE';
                                        
                                        echo "<tr>\n";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->f['attname']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->fields['attname']), "</td>";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">\n";
-                                       echo $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod']));
-                                       echo "<input type=\"hidden\" name=\"types[", htmlspecialchars($attrs->f['attname']), "]\" value=\"", 
-                                               htmlspecialchars($attrs->f['type']), "\" /></td>";
+                                       echo $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod']));
+                                       echo "<input type=\"hidden\" name=\"types[", htmlspecialchars($attrs->fields['attname']), "]\" value=\"", 
+                                               htmlspecialchars($attrs->fields['type']), "\" /></td>";
                                        $elements++;
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">\n";
-                                       echo "<select name=\"format[", htmlspecialchars($attrs->f['attname']), "]\">\n";
-                                       echo "<option value=\"VALUE\"", ($_REQUEST['format'][$attrs->f['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>\n";
-                                       echo "<option value=\"EXPRESSION\"", ($_REQUEST['format'][$attrs->f['attname']] == 'EXPRESSION') ? ' selected="selected"' : '', ">{$lang['strexpression']}</option>\n";
+                                       echo "<select name=\"format[", htmlspecialchars($attrs->fields['attname']), "]\">\n";
+                                       echo "<option value=\"VALUE\"", ($_REQUEST['format'][$attrs->fields['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>\n";
+                                       echo "<option value=\"EXPRESSION\"", ($_REQUEST['format'][$attrs->fields['attname']] == 'EXPRESSION') ? ' selected="selected"' : '', ">{$lang['strexpression']}</option>\n";
                                        echo "</select>\n</td>\n";
                                        $elements++;
 
                                        echo "<td class=\"data{$id}\" id=\"aciwp{$i}\" nowrap=\"nowrap\">";
-                                       echo $data->printField($szValueName, $rs->f[$attrs->f['attname']], $attrs->f['type'],array(),$szEvents) . $szDivPH;
+                                       echo $data->printField($szValueName, $rs->fields[$attrs->fields['attname']], $attrs->fields['type'],array(),$szEvents) . $szDivPH;
                                        echo "</td>";
                                        $elements++;
                                        echo "</tr>\n";

diff --git a/display.php b/display.php
index ad45c20f5eda8a1bb3888c1cdc1a879226c94335..9d0af2831ab5c263ebbb3b24467f7d4acb0a04aa 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.59 2007/03/24 02:15:54 xzilla Exp $
+        * $Id: display.php,v 1.60 2007/04/16 16:59:46 soranzo Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -76,11 +76,11 @@
 
                                $i = 0;
                                while (!$attrs->EOF) {
-                                       $szValueName = "values[{$attrs->f['attname']}]";
+                                       $szValueName = "values[{$attrs->fields['attname']}]";
                                        $szEvents = '';
                                        $szDivPH = '';
                                        if($bAllowAC) {
-                                               $idxFound = array_search($attrs->f['attname'], $arrayLocals);
+                                               $idxFound = array_search($attrs->fields['attname'], $arrayLocals);
                                                // In PHP < 4.2.0 array_search returns NULL on failure
                                                if ($idxFound !== NULL && $idxFound !== FALSE) {
                                                        $szEvent = "makeAC('{$szValueName}',{$i},'{$arrayRefs[$idxFound][0]}','{$arrayRefs[$idxFound][1]}','{$_REQUEST['server']}','{$_REQUEST['database']}');";
@@ -88,35 +88,35 @@
                                                        $szDivPH = "<div id=\"fac{$i}_ph\"></div>";
                                                }
                                        }
-                                       $attrs->f['attnotnull'] = $data->phpBool($attrs->f['attnotnull']);
+                                       $attrs->fields['attnotnull'] = $data->phpBool($attrs->fields['attnotnull']);
                                        $id = (($i % 2) == 0 ? '1' : '2');
                                        
                                        // Initialise variables
-                                       if (!isset($_REQUEST['format'][$attrs->f['attname']]))
-                                               $_REQUEST['format'][$attrs->f['attname']] = 'VALUE';
+                                       if (!isset($_REQUEST['format'][$attrs->fields['attname']]))
+                                               $_REQUEST['format'][$attrs->fields['attname']] = 'VALUE';
                                        
                                        echo "<tr>\n";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->f['attname']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->fields['attname']), "</td>";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">\n";
-                                       echo $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod']));
-                                       echo "<input type=\"hidden\" name=\"types[", htmlspecialchars($attrs->f['attname']), "]\" value=\"", 
-                                               htmlspecialchars($attrs->f['type']), "\" /></td>";
+                                       echo $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod']));
+                                       echo "<input type=\"hidden\" name=\"types[", htmlspecialchars($attrs->fields['attname']), "]\" value=\"", 
+                                               htmlspecialchars($attrs->fields['type']), "\" /></td>";
                                        $elements++;
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">\n";
-                                       echo "<select name=\"format[", htmlspecialchars($attrs->f['attname']), "]\">\n";
-                                       echo "<option value=\"VALUE\"", ($_REQUEST['format'][$attrs->f['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>\n";
-                                       echo "<option value=\"EXPRESSION\"", ($_REQUEST['format'][$attrs->f['attname']] == 'EXPRESSION') ? ' selected="selected"' : '', ">{$lang['strexpression']}</option>\n";
+                                       echo "<select name=\"format[", htmlspecialchars($attrs->fields['attname']), "]\">\n";
+                                       echo "<option value=\"VALUE\"", ($_REQUEST['format'][$attrs->fields['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>\n";
+                                       echo "<option value=\"EXPRESSION\"", ($_REQUEST['format'][$attrs->fields['attname']] == 'EXPRESSION') ? ' selected="selected"' : '', ">{$lang['strexpression']}</option>\n";
                                        echo "</select>\n</td>\n";
                                        $elements++;
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
                                        // Output null box if the column allows nulls (doesn't look at CHECKs or ASSERTIONS)
-                                       if (!$attrs->f['attnotnull']) {
+                                       if (!$attrs->fields['attnotnull']) {
                                                // Set initial null values
-                                               if ($_REQUEST['action'] == 'confeditrow' && $rs->f[$attrs->f['attname']] === null) {
-                                                       $_REQUEST['nulls'][$attrs->f['attname']] = 'on';
+                                               if ($_REQUEST['action'] == 'confeditrow' && $rs->fields[$attrs->fields['attname']] === null) {
+                                                       $_REQUEST['nulls'][$attrs->fields['attname']] = 'on';
                                                }
-                                               echo "<input type=\"checkbox\" name=\"nulls[{$attrs->f['attname']}]\"",
-                                                       isset($_REQUEST['nulls'][$attrs->f['attname']]) ? ' checked="checked"' : '', " /></td>\n";
+                                               echo "<input type=\"checkbox\" name=\"nulls[{$attrs->fields['attname']}]\"",
+                                                       isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " /></td>\n";
                                                $elements++;
                                        }
                                        else
@@ -127,12 +127,12 @@
                                        // NULL checkbox as soon as anything is entered in the field.  We use the $elements variable to 
                                        // keep track of which element offset we're up to.  We can't refer to the null checkbox by name
                                        // as it contains '[' and ']' characters.
-                                       if (!$attrs->f['attnotnull']) {
-                                               echo $data->printField($szValueName, $rs->f[$attrs->f['attname']], $attrs->f['type'], 
+                                       if (!$attrs->fields['attnotnull']) {
+                                               echo $data->printField($szValueName, $rs->fields[$attrs->fields['attname']], $attrs->fields['type'], 
                                                                                                        array('onChange' => 'elements[' . ($elements - 1) . '].checked = false;'),$szEvents) . $szDivPH;
                                        }
                                        else {
-                                               echo $data->printField($szValueName, $rs->f[$attrs->f['attname']], $attrs->f['type'],array(),$szEvents) . $szDivPH;
+                                               echo $data->printField($szValueName, $rs->fields[$attrs->fields['attname']], $attrs->fields['type'],array(),$szEvents) . $szDivPH;
                                        }
                                        echo "</td>";
                                        $elements++;
@@ -335,7 +335,7 @@
                        foreach ($key as $v) {
                                // If a key column is not found in the record set, then we
                                // can't use the key.
-                               if (!in_array($v, array_keys($rs->f))) {
+                               if (!in_array($v, array_keys($rs->fields))) {
                                        $key = array();
                                        break;
                                }
@@ -345,7 +345,7 @@
                                echo "<th colspan=\"2\" class=\"data\">{$lang['stractions']}</th>\n";
 
                        $j = 0;         
-                       foreach ($rs->f as $k => $v) {
+                       foreach ($rs->fields as $k => $v) {
                                if (isset($object) && $k == $data->id && !$conf['show_oids']) {
                                        $j++;
                                        continue;
@@ -370,7 +370,7 @@
                        echo "</tr>\n";
        
                        $i = 0;         
-                       reset($rs->f);
+                       reset($rs->fields);
                        while (!$rs->EOF) {
                                $id = (($i % 2) == 0 ? '1' : '2');
                                echo "<tr>\n";
@@ -379,12 +379,12 @@
                                        $key_str = '';
                                        $has_nulls = false;
                                        foreach ($key as $v) {
-                                               if ($rs->f[$v] === null) {
+                                               if ($rs->fields[$v] === null) {
                                                        $has_nulls = true;
                                                        break;
                                                }
                                                if ($key_str != '') $key_str .= '&amp;';
-                                               $key_str .= urlencode("key[{$v}]") . '=' . urlencode($rs->f[$v]);
+                                               $key_str .= urlencode("key[{$v}]") . '=' . urlencode($rs->fields[$v]);
                                        }
                                        if ($has_nulls) {
                                                echo "<td class=\"data{$id}\" colspan=\"2\">&nbsp;</td>\n";
@@ -398,7 +398,7 @@
                                        }
                                }
                                $j = 0;
-                               foreach ($rs->f as $k => $v) {
+                               foreach ($rs->fields as $k => $v) {
                                        $finfo = $rs->fetchField($j++);
                                        if (isset($_REQUEST['table']) && $k == $data->id && !$conf['show_oids']) continue;
                                        elseif ($v !== null && $v == '') echo "<td class=\"data{$id}\">&nbsp;</td>";

diff --git a/functions.php b/functions.php
index 99c3178fac8d9668c35b7addecaca17c875ef2fc..ef0b05f534b28558a8eaf475cbcf1d53b969d547 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.59 2007/02/15 18:30:23 xzilla Exp $
+        * $Id: functions.php,v 1.60 2007/04/16 16:59:46 soranzo Exp $
         */
 
        // Include application functions
@@ -54,20 +54,20 @@
                $fndata = $data->getFunction($_REQUEST['function_oid']);
 
                if ($fndata->recordCount() > 0) {
-                       $fndata->f['proretset'] = $data->phpBool($fndata->f['proretset']);
+                       $fndata->fields['proretset'] = $data->phpBool($fndata->fields['proretset']);
 
                        // Initialise variables
-                       if (!isset($_POST['formDefinition'])) $_POST['formDefinition'] = $fndata->f['prosrc'];
-                       if (!isset($_POST['formProperties'])) $_POST['formProperties'] = $data->getFunctionProperties($fndata->f);
-                       if (!isset($_POST['formFunction'])) $_POST['formFunction'] = $fndata->f['proname'];
-                       if (!isset($_POST['formComment'])) $_POST['formComment'] = $fndata->f['procomment'];
-                       if (!isset($_POST['formObjectFile'])) $_POST['formObjectFile'] = $fndata->f['probin'];
-                       if (!isset($_POST['formLinkSymbol'])) $_POST['formLinkSymbol'] = $fndata->f['prosrc'];
+                       if (!isset($_POST['formDefinition'])) $_POST['formDefinition'] = $fndata->fields['prosrc'];
+                       if (!isset($_POST['formProperties'])) $_POST['formProperties'] = $data->getFunctionProperties($fndata->fields);
+                       if (!isset($_POST['formFunction'])) $_POST['formFunction'] = $fndata->fields['proname'];
+                       if (!isset($_POST['formComment'])) $_POST['formComment'] = $fndata->fields['procomment'];
+                       if (!isset($_POST['formObjectFile'])) $_POST['formObjectFile'] = $fndata->fields['probin'];
+                       if (!isset($_POST['formLinkSymbol'])) $_POST['formLinkSymbol'] = $fndata->fields['prosrc'];
 
                        // Deal with named parameters
                        if ($data->hasNamedParams()) {
-                               $args_arr = explode(', ', $fndata->f['proarguments']);
-                               $names_arr = $data->phpArray($fndata->f['proargnames']);
+                               $args_arr = explode(', ', $fndata->fields['proarguments']);
+                               $names_arr = $data->phpArray($fndata->fields['proargnames']);
                                $args = '';
                                $i = 0;
                                for ($i = 0; $i < sizeof($args_arr); $i++) {
@@ -80,10 +80,10 @@
                                }
                        }
                        else {
-                               $args = $fndata->f['proarguments'];
+                               $args = $fndata->fields['proarguments'];
                        }
 
-                       $func_full = $fndata->f['proname'] . "(". $fndata->f['proarguments'] .")";
+                       $func_full = $fndata->fields['proname'] . "(". $fndata->fields['proarguments'] .")";
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table width=\"90%\">\n";
                        echo "<tr>\n";
@@ -96,7 +96,7 @@
 
                        echo "<tr>\n";
                        echo "<td class=\"data1\">";
-                       echo "<input type=\"hidden\" name=\"original_function\" value=\"", htmlspecialchars($fndata->f['proname']),"\" />\n"; 
+                       echo "<input type=\"hidden\" name=\"original_function\" value=\"", htmlspecialchars($fndata->fields['proname']),"\" />\n"; 
                        echo "<input name=\"formFunction\" style=\"width: 100%\" maxlength=\"{$data->_maxNameLen}\" value=\"", htmlspecialchars($_POST['formFunction']), "\" />";
                        echo "</td>\n";
 
@@ -105,18 +105,18 @@
                        echo "</td>\n";
 
                        echo "<td class=\"data1\">";
-                       if ($fndata->f['proretset']) echo "setof ";
-                       echo $misc->printVal($fndata->f['proresult']), "\n";
-                       echo "<input type=\"hidden\" name=\"original_returns\" value=\"", htmlspecialchars($fndata->f['proresult']), "\" />\n"; 
-                       if ($fndata->f['proretset'])
+                       if ($fndata->fields['proretset']) echo "setof ";
+                       echo $misc->printVal($fndata->fields['proresult']), "\n";
+                       echo "<input type=\"hidden\" name=\"original_returns\" value=\"", htmlspecialchars($fndata->fields['proresult']), "\" />\n"; 
+                       if ($fndata->fields['proretset'])
                                echo "<input type=\"hidden\" name=\"original_setof\" value=\"yes\" />\n"; 
                        echo "</td>\n";
 
-                       echo "<td class=\"data1\">", $misc->printVal($fndata->f['prolanguage']), "\n";
-                       echo "<input type=\"hidden\" name=\"original_lang\" value=\"", htmlspecialchars($fndata->f['prolanguage']), "\" />\n"; 
+                       echo "<td class=\"data1\">", $misc->printVal($fndata->fields['prolanguage']), "\n";
+                       echo "<input type=\"hidden\" name=\"original_lang\" value=\"", htmlspecialchars($fndata->fields['prolanguage']), "\" />\n"; 
                        echo "</td>\n";
                        
-                       $fnlang = strtolower($fndata->f['prolanguage']);
+                       $fnlang = strtolower($fndata->fields['prolanguage']);
                        if ($fnlang == 'c') {
                                echo "<tr><th class=\"data required\" colspan=\"2\">{$lang['strobjectfile']}</th>\n";
                                echo "<th class=\"data\" colspan=\"2\">{$lang['strlinksymbol']}</th></tr>\n";
@@ -183,8 +183,8 @@
                if ($funcdata->recordCount() > 0) {
                        // Deal with named parameters
                        if ($data->hasNamedParams()) {
-                               $args_arr = explode(', ', $funcdata->f['proarguments']);
-                               $names_arr = $data->phpArray($funcdata->f['proargnames']);
+                               $args_arr = explode(', ', $funcdata->fields['proarguments']);
+                               $names_arr = $data->phpArray($funcdata->fields['proargnames']);
                                $args = '';
                                $i = 0;
                                for ($i = 0; $i < sizeof($args_arr); $i++) {
@@ -197,46 +197,46 @@
                                }
                        }
                        else {
-                               $args = $funcdata->f['proarguments'];
+                               $args = $funcdata->fields['proarguments'];
                        }
 
                        // Show comment if any
-                       if ($funcdata->f['procomment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($funcdata->f['procomment']), "</p>\n";
+                       if ($funcdata->fields['procomment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($funcdata->fields['procomment']), "</p>\n";
 
-                       $funcdata->f['proretset'] = $data->phpBool($funcdata->f['proretset']);
-                       $func_full = $funcdata->f['proname'] . "(". $funcdata->f['proarguments'] .")";
+                       $funcdata->fields['proretset'] = $data->phpBool($funcdata->fields['proretset']);
+                       $func_full = $funcdata->fields['proname'] . "(". $funcdata->fields['proarguments'] .")";
                        echo "<table width=\"90%\">\n";
                        echo "<tr><th class=\"data\">{$lang['strfunction']}</th>\n";
                        echo "<th class=\"data\">{$lang['strarguments']}</th>\n";
                        echo "<th class=\"data\">{$lang['strreturns']}</th>\n";
                        echo "<th class=\"data\">{$lang['strproglanguage']}</th></tr>\n";
-                       echo "<tr><td class=\"data1\">", $misc->printVal($funcdata->f['proname']), "</td>\n";
+                       echo "<tr><td class=\"data1\">", $misc->printVal($funcdata->fields['proname']), "</td>\n";
                        echo "<td class=\"data1\">", $misc->printVal($args), "</td>\n";
                        echo "<td class=\"data1\">";
-                       if ($funcdata->f['proretset']) echo "setof ";                   
-                       echo $misc->printVal($funcdata->f['proresult']), "</td>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($funcdata->f['prolanguage']), "</td></tr>\n";
+                       if ($funcdata->fields['proretset']) echo "setof ";                      
+                       echo $misc->printVal($funcdata->fields['proresult']), "</td>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($funcdata->fields['prolanguage']), "</td></tr>\n";
                        
-                       $fnlang = strtolower($funcdata->f['prolanguage']);
+                       $fnlang = strtolower($funcdata->fields['prolanguage']);
                        if ($fnlang == 'c') {
                                echo "<tr><th class=\"data\" colspan=\"2\">{$lang['strobjectfile']}</th>\n";
                                echo "<th class=\"data\" colspan=\"2\">{$lang['strlinksymbol']}</th></tr>\n";
-                               echo "<tr><td class=\"data1\" colspan=\"2\">", $misc->printVal($funcdata->f['probin']), "</td>\n";
-                               echo "<td class=\"data1\" colspan=\"2\">", $misc->printVal($funcdata->f['prosrc']), "</td></tr>\n";
+                               echo "<tr><td class=\"data1\" colspan=\"2\">", $misc->printVal($funcdata->fields['probin']), "</td>\n";
+                               echo "<td class=\"data1\" colspan=\"2\">", $misc->printVal($funcdata->fields['prosrc']), "</td></tr>\n";
                        } else if ($fnlang == 'internal') {
                                echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strlinksymbol']}</th></tr>\n";
-                               echo "<tr><td class=\"data1\" colspan=\"4\">", $misc->printVal($funcdata->f['prosrc']), "</td></tr>\n";
+                               echo "<tr><td class=\"data1\" colspan=\"4\">", $misc->printVal($funcdata->fields['prosrc']), "</td></tr>\n";
                        } else {
                                include_once('./libraries/highlight.php');              
                                echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
                                // Check to see if we have syntax highlighting for this language
-                               if (isset($data->langmap[$funcdata->f['prolanguage']])) {
-                                       $temp = syntax_highlight(htmlspecialchars($funcdata->f['prosrc']), $data->langmap[$funcdata->f['prolanguage']]);
+                               if (isset($data->langmap[$funcdata->fields['prolanguage']])) {
+                                       $temp = syntax_highlight(htmlspecialchars($funcdata->fields['prosrc']), $data->langmap[$funcdata->fields['prolanguage']]);
                                        $tag = 'prenoescape';
                                }
                                else {
-                                       $temp = $funcdata->f['prosrc'];
+                                       $temp = $funcdata->fields['prosrc'];
                                        $tag = 'pre';
                                }
                                echo "<tr><td class=\"data1\" colspan=\"4\">", $misc->printVal($temp, $tag, array('lineno' => true, 'class' => 'data1')), "</td></tr>\n";
@@ -245,7 +245,7 @@
                        // Show flags
                        if (is_array($data->funcprops) && sizeof($data->funcprops) > 0) {
                                // Fetch an array of the function properties
-                               $funcprops = $data->getFunctionProperties($funcdata->f);
+                               $funcprops = $data->getFunctionProperties($funcdata->fields);
                                echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strproperties']}</th></tr>\n";
                                echo "<tr><td class=\"data1\" colspan=\"4\">\n";
                                foreach ($funcprops as $v) {
@@ -343,11 +343,11 @@
                $szTypes = "";
                while (!$types->EOF) {
                        $szSelected = "";
-                       if($types->f['typname'] == $_POST['formReturns']) {
+                       if($types->fields['typname'] == $_POST['formReturns']) {
                                $szSelected = " selected=\"selected\"";
                        }
-                       $szTypes .= "<option value=\"". htmlspecialchars($types->f['typname']) ."\"{$szSelected}>";
-                       $szTypes .= $misc->printVal($types->f['typname']) ."</option>";
+                       $szTypes .= "<option value=\"". htmlspecialchars($types->fields['typname']) ."\"{$szSelected}>";
+                       $szTypes .= $misc->printVal($types->fields['typname']) ."</option>";
                        $types->moveNext();
                }
 
@@ -397,12 +397,12 @@
                        $szLanguage .= "<select name=\"formLanguage\">";
                        while (!$langs->EOF) {
                                $szSelected = "";
-                               if($langs->f['lanname'] == $_POST['formLanguage']) {
+                               if($langs->fields['lanname'] == $_POST['formLanguage']) {
                                        $szSelected = " selected=\"selected\"";
                                }
-                               if (strtolower($langs->f['lanname']) != 'c' && strtolower($langs->f['lanname']) != 'internal')
-                                       $szLanguage .= "<option value=\"". htmlspecialchars($langs->f['lanname']). "\"{$szSelected}>".
-                                               $misc->printVal($langs->f['lanname']) ."</option>";
+                               if (strtolower($langs->fields['lanname']) != 'c' && strtolower($langs->fields['lanname']) != 'internal')
+                                       $szLanguage .= "<option value=\"". htmlspecialchars($langs->fields['lanname']). "\"{$szSelected}>".
+                                               $misc->printVal($langs->fields['lanname']) ."</option>";
                                $langs->moveNext();
                        }
                        $szLanguage .= "</select>\n";

diff --git a/tables.php b/tables.php
index ef0b5ea8cf9f2c8754791335932ac42116d9f134..ceaa0f81a2b06a3d14f05e2d90101206b23b44f8 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.88 2007/04/01 16:02:07 xzilla Exp $
+        * $Id: tables.php,v 1.89 2007/04/16 16:59:46 soranzo Exp $
         */
 
        // Include application functions
@@ -61,7 +61,7 @@
                                                ($_REQUEST['spcname'] == '') ? ' selected="selected"' : '', "></option>\n";
                                        // Display all other tablespaces
                                        while (!$tablespaces->EOF) {
-                                               $spcname = htmlspecialchars($tablespaces->f['spcname']);
+                                               $spcname = htmlspecialchars($tablespaces->fields['spcname']);
                                                echo "\t\t\t\t<option value=\"{$spcname}\"",
                                                        ($spcname == $_REQUEST['spcname']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
                                                $tablespaces->moveNext();
@@ -133,7 +133,7 @@
                                        }
                                        $types->moveFirst();
                                        while (!$types->EOF) {
-                                               $typname = $types->f['typname'];
+                                               $typname = $types->fields['typname'];
                                                $types_for_js[$typname] = 1;
                                                echo "\t\t\t\t<option value=\"", htmlspecialchars($typname), "\"",
                                                (isset($_REQUEST['type'][$i]) && $typname == $_REQUEST['type'][$i]) ? ' selected="selected"' : '', ">",
@@ -275,29 +275,29 @@
 
                                $i = 0;
                                while (!$attrs->EOF) {
-                                       $attrs->f['attnotnull'] = $data->phpBool($attrs->f['attnotnull']);
+                                       $attrs->fields['attnotnull'] = $data->phpBool($attrs->fields['attnotnull']);
                                        // Set up default value if there isn't one already
-                                       if (!isset($_REQUEST['values'][$attrs->f['attname']]))
-                                               $_REQUEST['values'][$attrs->f['attname']] = null;
-                                       if (!isset($_REQUEST['ops'][$attrs->f['attname']]))
-                                               $_REQUEST['ops'][$attrs->f['attname']] = null;
+                                       if (!isset($_REQUEST['values'][$attrs->fields['attname']]))
+                                               $_REQUEST['values'][$attrs->fields['attname']] = null;
+                                       if (!isset($_REQUEST['ops'][$attrs->fields['attname']]))
+                                               $_REQUEST['ops'][$attrs->fields['attname']] = null;
                                        // Continue drawing row
                                        $id = (($i % 2) == 0 ? '1' : '2');
                                        echo "<tr>\n";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
-                                       echo "<input type=\"checkbox\" name=\"show[", htmlspecialchars($attrs->f['attname']), "]\"",
-                                               isset($_REQUEST['show'][$attrs->f['attname']]) ? ' checked="checked"' : '', " /></td>";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->f['attname']), "</td>";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod'])), "</td>";
+                                       echo "<input type=\"checkbox\" name=\"show[", htmlspecialchars($attrs->fields['attname']), "]\"",
+                                               isset($_REQUEST['show'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " /></td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->fields['attname']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])), "</td>";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
-                                       echo "<select name=\"ops[{$attrs->f['attname']}]\">\n";
+                                       echo "<select name=\"ops[{$attrs->fields['attname']}]\">\n";
                                        foreach (array_keys($data->selectOps) as $v) {
-                                               echo "<option value=\"", htmlspecialchars($v), "\"", ($v == $_REQUEST['ops'][$attrs->f['attname']]) ? ' selected="selected"' : '', 
+                                               echo "<option value=\"", htmlspecialchars($v), "\"", ($v == $_REQUEST['ops'][$attrs->fields['attname']]) ? ' selected="selected"' : '', 
                                                ">", htmlspecialchars($v), "</option>\n";
                                        }
                                        echo "</select>\n";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $data->printField("values[{$attrs->f['attname']}]",
-                                               $_REQUEST['values'][$attrs->f['attname']], $attrs->f['type']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $data->printField("values[{$attrs->fields['attname']}]",
+                                               $_REQUEST['values'][$attrs->fields['attname']], $attrs->fields['type']), "</td>";
                                        echo "</tr>\n";
                                        $i++;
                                        $attrs->moveNext();
@@ -392,11 +392,11 @@
                                
                                $i = 0;
                                while (!$attrs->EOF) {
-                                       $szValueName = "values[{$attrs->f['attname']}]";
+                                       $szValueName = "values[{$attrs->fields['attname']}]";
                                        $szEvents = '';
                                        $szDivPH = '';
                                        if($bAllowAC) {
-                                               $idxFound = array_search($attrs->f['attname'], $arrayLocals);
+                                               $idxFound = array_search($attrs->fields['attname'], $arrayLocals);
                                                // In PHP < 4.2.0 array_search returns NULL on failure
                                                if ($idxFound !== NULL && $idxFound !== FALSE) { 
                                                        $szEvent = "makeAC('{$szValueName}',{$i},'{$arrayRefs[$idxFound][0]}','{$arrayRefs[$idxFound][1]}','{$_REQUEST['server']}','{$_REQUEST['database']}');";
@@ -404,38 +404,38 @@
                                                        $szDivPH = "<div id=\"fac{$i}_ph\"></div>";
                                                }
                                        }
-                                       $attrs->f['attnotnull'] = $data->phpBool($attrs->f['attnotnull']);
+                                       $attrs->fields['attnotnull'] = $data->phpBool($attrs->fields['attnotnull']);
                                        // Set up default value if there isn't one already
-                                       if (!isset($_REQUEST['values'][$attrs->f['attname']]))
-                                               $_REQUEST['values'][$attrs->f['attname']] = $attrs->f['adsrc'];
+                                       if (!isset($_REQUEST['values'][$attrs->fields['attname']]))
+                                               $_REQUEST['values'][$attrs->fields['attname']] = $attrs->fields['adsrc'];
                                        // Default format to 'VALUE' if there is no default,
                                        // otherwise default to 'EXPRESSION'
-                                       if (!isset($_REQUEST['format'][$attrs->f['attname']]))
-                                               $_REQUEST['format'][$attrs->f['attname']] = ($attrs->f['adsrc'] === null) ? 'VALUE' : 'EXPRESSION';
+                                       if (!isset($_REQUEST['format'][$attrs->fields['attname']]))
+                                               $_REQUEST['format'][$attrs->fields['attname']] = ($attrs->fields['adsrc'] === null) ? 'VALUE' : 'EXPRESSION';
                                        // Continue drawing row
                                        $id = (($i % 2) == 0 ? '1' : '2');
                                        echo "<tr>\n";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->f['attname']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->fields['attname']), "</td>";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">\n";
-                                       echo $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod']));
-                                       echo "<input type=\"hidden\" name=\"types[", htmlspecialchars($attrs->f['attname']), "]\" value=\"", 
-                                               htmlspecialchars($attrs->f['type']), "\" /></td>";
+                                       echo $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod']));
+                                       echo "<input type=\"hidden\" name=\"types[", htmlspecialchars($attrs->fields['attname']), "]\" value=\"", 
+                                               htmlspecialchars($attrs->fields['type']), "\" /></td>";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">\n";
-                                       echo "<select name=\"format[", htmlspecialchars($attrs->f['attname']), "]\">\n";
-                                       echo "<option value=\"VALUE\"", ($_REQUEST['format'][$attrs->f['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>\n";
-                                       echo "<option value=\"EXPRESSION\"", ($_REQUEST['format'][$attrs->f['attname']] == 'EXPRESSION') ? ' selected="selected"' : '', ">{$lang['strexpression']}</option>\n";
+                                       echo "<select name=\"format[", htmlspecialchars($attrs->fields['attname']), "]\">\n";
+                                       echo "<option value=\"VALUE\"", ($_REQUEST['format'][$attrs->fields['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>\n";
+                                       echo "<option value=\"EXPRESSION\"", ($_REQUEST['format'][$attrs->fields['attname']] == 'EXPRESSION') ? ' selected="selected"' : '', ">{$lang['strexpression']}</option>\n";
                                        echo "</select>\n</td>\n";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
                                        // Output null box if the column allows nulls (doesn't look at CHECKs or ASSERTIONS)
-                                       if (!$attrs->f['attnotnull']) {
-                                               echo "<input type=\"checkbox\" name=\"nulls[", htmlspecialchars($attrs->f['attname']), "]\"",
-                                                       isset($_REQUEST['nulls'][$attrs->f['attname']]) ? ' checked="checked"' : '', " /></td>";
+                                       if (!$attrs->fields['attnotnull']) {
+                                               echo "<input type=\"checkbox\" name=\"nulls[", htmlspecialchars($attrs->fields['attname']), "]\"",
+                                                       isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " /></td>";
                                        }
                                        else {
                                                echo "&nbsp;</td>";
                                        }
                                        echo "<td class=\"data{$id}\" id=\"aciwp{$i}\" nowrap=\"nowrap\">", $data->printField($szValueName,
-                                       $_REQUEST['values'][$attrs->f['attname']], $attrs->f['type'],array(),$szEvents),$szDivPH ,"</td>";
+                                       $_REQUEST['values'][$attrs->fields['attname']], $attrs->fields['type'],array(),$szEvents),$szDivPH ,"</td>";
                                        echo "</tr>\n";
                                        $i++;
                                        $attrs->moveNext();

diff --git a/views.php b/views.php
index be2226ddcc6bfc22d32a2f4b5894896a50920b37..4890447f3a897822794d11b91b63e3284a4e4bc4 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.61 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: views.php,v 1.62 2007/04/16 16:59:46 soranzo Exp $
         */
 
        // Include application functions
@@ -52,29 +52,29 @@
 
                                $i = 0;
                                while (!$attrs->EOF) {
-                                       $attrs->f['attnotnull'] = $data->phpBool($attrs->f['attnotnull']);
+                                       $attrs->fields['attnotnull'] = $data->phpBool($attrs->fields['attnotnull']);
                                        // Set up default value if there isn't one already
-                                       if (!isset($_REQUEST['values'][$attrs->f['attname']]))
-                                               $_REQUEST['values'][$attrs->f['attname']] = null;
-                                       if (!isset($_REQUEST['ops'][$attrs->f['attname']]))
-                                               $_REQUEST['ops'][$attrs->f['attname']] = null;
+                                       if (!isset($_REQUEST['values'][$attrs->fields['attname']]))
+                                               $_REQUEST['values'][$attrs->fields['attname']] = null;
+                                       if (!isset($_REQUEST['ops'][$attrs->fields['attname']]))
+                                               $_REQUEST['ops'][$attrs->fields['attname']] = null;
                                        // Continue drawing row
                                        $id = (($i % 2) == 0 ? '1' : '2');
                                        echo "<tr>\n";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
-                                       echo "<input type=\"checkbox\" name=\"show[", htmlspecialchars($attrs->f['attname']), "]\"",
-                                               isset($_REQUEST['show'][$attrs->f['attname']]) ? ' checked="checked"' : '', " /></td>";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->f['attname']), "</td>";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod'])), "</td>";
+                                       echo "<input type=\"checkbox\" name=\"show[", htmlspecialchars($attrs->fields['attname']), "]\"",
+                                               isset($_REQUEST['show'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " /></td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($attrs->fields['attname']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])), "</td>";
                                        echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
-                                       echo "<select name=\"ops[{$attrs->f['attname']}]\">\n";
+                                       echo "<select name=\"ops[{$attrs->fields['attname']}]\">\n";
                                        foreach (array_keys($data->selectOps) as $v) {
-                                               echo "<option value=\"", htmlspecialchars($v), "\"", ($v == $_REQUEST['ops'][$attrs->f['attname']]) ? ' selected="selected"' : '', 
+                                               echo "<option value=\"", htmlspecialchars($v), "\"", ($v == $_REQUEST['ops'][$attrs->fields['attname']]) ? ' selected="selected"' : '', 
                                                ">", htmlspecialchars($v), "</option>\n";
                                        }
                                        echo "</select>\n";
-                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $data->printField("values[{$attrs->f['attname']}]",
-                                               $_REQUEST['values'][$attrs->f['attname']], $attrs->f['type']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $data->printField("values[{$attrs->fields['attname']}]",
+                                               $_REQUEST['values'][$attrs->fields['attname']], $attrs->fields['type']), "</td>";
                                        echo "</tr>\n";
                                        $i++;
                                        $attrs->moveNext();
@@ -205,10 +205,10 @@
                                $attrs = $data->getTableAttributes($arrSelTables[$i]['tablename']);
                                while (!$attrs->EOF) {
                                        if ($data->hasSchemas() ) {
-                                               $arrFields["{$arrSelTables[$i]['schemaname']}.{$arrSelTables[$i]['tablename']}.{$attrs->f['attname']}"] = serialize(array('schemaname' => $arrSelTables[$i]['schemaname'], 'tablename' => $arrSelTables[$i]['tablename'], 'fieldname' => $attrs->f['attname']) );
+                                               $arrFields["{$arrSelTables[$i]['schemaname']}.{$arrSelTables[$i]['tablename']}.{$attrs->fields['attname']}"] = serialize(array('schemaname' => $arrSelTables[$i]['schemaname'], 'tablename' => $arrSelTables[$i]['tablename'], 'fieldname' => $attrs->fields['attname']) );
                                        }
                                        else {
-                                               $arrFields["{$arrSelTables[$i]['tablename']}.{$attrs->f['attname']}"] = serialize(array('schemaname' => NULL, 'tablename' => $arrSelTables[$i]['tablename'], 'fieldname' => $attrs->f['attname']) );
+                                               $arrFields["{$arrSelTables[$i]['tablename']}.{$attrs->fields['attname']}"] = serialize(array('schemaname' => NULL, 'tablename' => $arrSelTables[$i]['tablename'], 'fieldname' => $attrs->fields['attname']) );
                                        }
                                        $attrs->moveNext();
                                }
@@ -252,8 +252,8 @@
                                echo "<tr>\n<td class=\"$rowClass\">\n";
                                
                                if ($data->hasForeignKeysInfo() && !$rsLinkKeys->EOF) {
-                                       $curLeftLink = htmlspecialchars(serialize(array('schemaname' => $rsLinkKeys->f['p_schema'], 'tablename' => $rsLinkKeys->f['p_table'], 'fieldname' => $rsLinkKeys->f['p_field']) ) );
-                                       $curRightLink = htmlspecialchars(serialize(array('schemaname' => $rsLinkKeys->f['f_schema'], 'tablename' => $rsLinkKeys->f['f_table'], 'fieldname' => $rsLinkKeys->f['f_field']) ) );
+                                       $curLeftLink = htmlspecialchars(serialize(array('schemaname' => $rsLinkKeys->fields['p_schema'], 'tablename' => $rsLinkKeys->fields['p_table'], 'fieldname' => $rsLinkKeys->fields['p_field']) ) );
+                                       $curRightLink = htmlspecialchars(serialize(array('schemaname' => $rsLinkKeys->fields['f_schema'], 'tablename' => $rsLinkKeys->fields['f_table'], 'fieldname' => $rsLinkKeys->fields['f_field']) ) );
                                        $rsLinkKeys->moveNext();
                                }
                                else {
@@ -323,13 +323,13 @@
                $arrTables = array();
                while (!$tables->EOF) {                                         
                        $arrTmp = array();
-                       $arrTmp['schemaname'] = $tables->f['nspname'];
-                       $arrTmp['tablename'] = $tables->f['relname'];
+                       $arrTmp['schemaname'] = $tables->fields['nspname'];
+                       $arrTmp['tablename'] = $tables->fields['relname'];
                        if ($data->hasSchemas() ) { //if schemas aren't available don't show them in the interface
-                               $arrTables[$tables->f['nspname'] . '.' . $tables->f['relname']] = serialize($arrTmp);
+                               $arrTables[$tables->fields['nspname'] . '.' . $tables->fields['relname']] = serialize($arrTmp);
                        }
                        else {
-                               $arrTables[$tables->f['relname']] = serialize($arrTmp);
+                               $arrTables[$tables->fields['relname']] = serialize($arrTmp);
                        }
                        $tables->moveNext();
                }