From 1cba0739a5d866c2fe52d515b8e0e892c269ee5f Mon Sep 17 00:00:00 2001 From: soranzo Date: Mon, 16 Apr 2007 16:59:46 +0000 Subject: [PATCH] Incrementally use ->fields for recordsets, ->f is not supported by upstream adodb. --- database.php | 142 +++++++++++++++++++++++++------------------------- display.php | 54 +++++++++---------- functions.php | 92 ++++++++++++++++---------------- tables.php | 68 ++++++++++++------------ views.php | 44 ++++++++-------- 5 files changed, 200 insertions(+), 200 deletions(-) diff --git a/database.php b/database.php index fa2f3576..a87a6b58 100755 --- 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 "\n"; - $curr = $rs->f['type']; + $curr = $rs->fields['type']; echo "

"; 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 "
  • href}\">", _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'TABLE': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&table=", - urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&table=", + urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'VIEW': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&view=", - urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&view=", + urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'SEQUENCE': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), - "&sequence=", urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), + "&sequence=", urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'COLUMNTABLE': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&table=", - urlencode($rs->f['relname']), "&column=", urlencode($rs->f['name']), "&action=properties\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&table=", + urlencode($rs->fields['relname']), "&column=", urlencode($rs->fields['name']), "&action=properties\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'COLUMNVIEW': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&view=", - urlencode($rs->f['relname']), "&column=", urlencode($rs->f['name']), "&action=properties\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&view=", + urlencode($rs->fields['relname']), "&column=", urlencode($rs->fields['name']), "&action=properties\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'INDEX': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&table=", - urlencode($rs->f['relname']), "\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&table=", + urlencode($rs->fields['relname']), "\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'CONSTRAINTTABLE': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&table=", - urlencode($rs->f['relname']), "\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&table=", + urlencode($rs->fields['relname']), "\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'CONSTRAINTDOMAIN': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&domain=", - urlencode($rs->f['relname']), "\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&domain=", + urlencode($rs->fields['relname']), "\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'TRIGGER': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&table=", - urlencode($rs->f['relname']), "\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&table=", + urlencode($rs->fields['relname']), "\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'RULETABLE': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&reltype=table&relation=", - urlencode($rs->f['relname']), "\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&reltype=table&relation=", + urlencode($rs->fields['relname']), "\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'RULEVIEW': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&reltype=view&relation=", - urlencode($rs->f['relname']), "\">", - $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&reltype=view&relation=", + urlencode($rs->fields['relname']), "\">", + $misc->printVal($prefix), $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'FUNCTION': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&function=", - urlencode($rs->f['name']), "&function_oid=", urlencode($rs->f['oid']), "\">", - $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&function=", + urlencode($rs->fields['name']), "&function_oid=", urlencode($rs->fields['oid']), "\">", + $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'TYPE': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&type=", - urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&type=", + urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'DOMAIN': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&domain=", - urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&domain=", + urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'OPERATOR': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "&operator=", - urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "&operator=", + urlencode($rs->fields['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'CONVERSION': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), - "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), + "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'LANGUAGE': - echo "
  • href}\">", _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'AGGREGATE': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "\">", - $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "\">", + $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \n"; break; case 'OPCLASS': - echo "
  • href}&schema=", urlencode($rs->f['schemaname']), "\">", - $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "
    • \n"; + echo "
  • href}&schema=", urlencode($rs->fields['schemaname']), "\">", + $misc->printVal($prefix), _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "
    • \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 "

    {$lang['strautovacuum']} ". (($enabled->f['autovacuum'] == 'on') ? $lang['strturnedon'] : $lang['strturnedoff'] ) ."

    "; + echo "

    {$lang['strautovacuum']} ". (($enabled->fields['autovacuum'] == 'on') ? $lang['strturnedon'] : $lang['strturnedoff'] ) ."

    "; // 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 "\n"; - echo "", $misc->printVal($attrs->f['attname']), ""; + echo "", $misc->printVal($attrs->fields['attname']), ""; echo "\n"; - echo $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod'])); - echo "f['attname']), "]\" value=\"", - htmlspecialchars($attrs->f['type']), "\" />"; + echo $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])); + echo "fields['attname']), "]\" value=\"", + htmlspecialchars($attrs->fields['type']), "\" />"; $elements++; echo "\n"; - echo "fields['attname']), "]\">\n"; + echo "\n"; + echo "\n"; echo "\n\n"; $elements++; echo ""; - 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 ""; $elements++; echo "\n"; diff --git a/display.php b/display.php index ad45c20f..9d0af283 100644 --- 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 = "
    "; } } - $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 "\n"; - echo "", $misc->printVal($attrs->f['attname']), ""; + echo "", $misc->printVal($attrs->fields['attname']), ""; echo "\n"; - echo $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod'])); - echo "f['attname']), "]\" value=\"", - htmlspecialchars($attrs->f['type']), "\" />"; + echo $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])); + echo "fields['attname']), "]\" value=\"", + htmlspecialchars($attrs->fields['type']), "\" />"; $elements++; echo "\n"; - echo "fields['attname']), "]\">\n"; + echo "\n"; + echo "\n"; echo "\n\n"; $elements++; echo ""; // 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 "f['attname']}]\"", - isset($_REQUEST['nulls'][$attrs->f['attname']]) ? ' checked="checked"' : '', " />\n"; + echo "fields['attname']}]\"", + isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " />\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 ""; $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 "{$lang['stractions']}\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 "\n"; $i = 0; - reset($rs->f); + reset($rs->fields); while (!$rs->EOF) { $id = (($i % 2) == 0 ? '1' : '2'); echo "\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 .= '&'; - $key_str .= urlencode("key[{$v}]") . '=' . urlencode($rs->f[$v]); + $key_str .= urlencode("key[{$v}]") . '=' . urlencode($rs->fields[$v]); } if ($has_nulls) { echo " \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 " "; diff --git a/functions.php b/functions.php index 99c3178f..ef0b05f5 100644 --- 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 "
    \n"; echo "\n"; echo "\n"; @@ -96,7 +96,7 @@ echo "\n"; echo "\n"; @@ -105,18 +105,18 @@ echo "\n"; echo "\n"; - echo "\n"; - $fnlang = strtolower($fndata->f['prolanguage']); + $fnlang = strtolower($fndata->fields['prolanguage']); if ($fnlang == 'c') { echo "\n"; echo "\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 "

    ", $misc->printVal($funcdata->f['procomment']), "

    \n"; + if ($funcdata->fields['procomment'] !== null) + echo "

    ", $misc->printVal($funcdata->fields['procomment']), "

    \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 "
    "; - echo "f['proname']),"\" />\n"; + echo "fields['proname']),"\" />\n"; echo "_maxNameLen}\" value=\"", htmlspecialchars($_POST['formFunction']), "\" />"; echo ""; - if ($fndata->f['proretset']) echo "setof "; - echo $misc->printVal($fndata->f['proresult']), "\n"; - echo "f['proresult']), "\" />\n"; - if ($fndata->f['proretset']) + if ($fndata->fields['proretset']) echo "setof "; + echo $misc->printVal($fndata->fields['proresult']), "\n"; + echo "fields['proresult']), "\" />\n"; + if ($fndata->fields['proretset']) echo "\n"; echo "", $misc->printVal($fndata->f['prolanguage']), "\n"; - echo "f['prolanguage']), "\" />\n"; + echo "", $misc->printVal($fndata->fields['prolanguage']), "\n"; + echo "fields['prolanguage']), "\" />\n"; echo "
    {$lang['strobjectfile']}{$lang['strlinksymbol']}
    \n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + if ($funcdata->fields['proretset']) echo "setof "; + echo $misc->printVal($funcdata->fields['proresult']), "\n"; + echo "\n"; - $fnlang = strtolower($funcdata->f['prolanguage']); + $fnlang = strtolower($funcdata->fields['prolanguage']); if ($fnlang == 'c') { echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; } else if ($fnlang == 'internal') { echo "\n"; - echo "\n"; + echo "\n"; } else { include_once('./libraries/highlight.php'); echo "\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 "\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 "\n"; echo "\n"; echo ""; - echo ""; - echo ""; + echo "fields['attname']), "]\"", + isset($_REQUEST['show'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " />"; + echo ""; + echo ""; echo ""; + echo ""; echo "\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 = "
    "; } } - $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 "\n"; - echo ""; + echo ""; echo ""; + echo $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])); + echo "fields['attname']), "]\" value=\"", + htmlspecialchars($attrs->fields['type']), "\" />"; echo "\n"; echo ""; + if (!$attrs->fields['attnotnull']) { + echo "fields['attname']), "]\"", + isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " />"; } else { echo " "; } echo ""; + $_REQUEST['values'][$attrs->fields['attname']], $attrs->fields['type'],array(),$szEvents),$szDivPH ,""; echo "\n"; $i++; $attrs->moveNext(); diff --git a/views.php b/views.php index be2226dd..4890447f 100644 --- 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 "\n"; echo ""; - echo ""; - echo ""; + echo "fields['attname']), "]\"", + isset($_REQUEST['show'][$attrs->fields['attname']]) ? ' checked="checked"' : '', " />"; + echo ""; + echo ""; echo ""; + echo ""; echo "\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 "\n
    {$lang['strfunction']}{$lang['strarguments']}{$lang['strreturns']}{$lang['strproglanguage']}
    ", $misc->printVal($funcdata->f['proname']), "
    ", $misc->printVal($funcdata->fields['proname']), "", $misc->printVal($args), ""; - if ($funcdata->f['proretset']) echo "setof "; - echo $misc->printVal($funcdata->f['proresult']), "", $misc->printVal($funcdata->f['prolanguage']), "
    ", $misc->printVal($funcdata->fields['prolanguage']), "
    {$lang['strobjectfile']}{$lang['strlinksymbol']}
    ", $misc->printVal($funcdata->f['probin']), "", $misc->printVal($funcdata->f['prosrc']), "
    ", $misc->printVal($funcdata->fields['probin']), "", $misc->printVal($funcdata->fields['prosrc']), "
    {$lang['strlinksymbol']}
    ", $misc->printVal($funcdata->f['prosrc']), "
    ", $misc->printVal($funcdata->fields['prosrc']), "
    {$lang['strdefinition']}
    ", $misc->printVal($temp, $tag, array('lineno' => true, 'class' => 'data1')), "
    {$lang['strproperties']}
    \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 .= ""; + $szTypes .= ""; $types->moveNext(); } @@ -397,12 +397,12 @@ $szLanguage .= "\n"; diff --git a/tables.php b/tables.php index ef0b5ea8..ceaa0f81 100644 --- 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"' : '', ">\n"; // Display all other tablespaces while (!$tablespaces->EOF) { - $spcname = htmlspecialchars($tablespaces->f['spcname']); + $spcname = htmlspecialchars($tablespaces->fields['spcname']); echo "\t\t\t\t\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
    "; - echo "f['attname']), "]\"", - isset($_REQUEST['show'][$attrs->f['attname']]) ? ' checked="checked"' : '', " />", $misc->printVal($attrs->f['attname']), "", $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod'])), "", $misc->printVal($attrs->fields['attname']), "", $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])), ""; - echo "fields['attname']}]\">\n"; foreach (array_keys($data->selectOps) as $v) { - echo "\n"; } echo "\n"; - echo "", $data->printField("values[{$attrs->f['attname']}]", - $_REQUEST['values'][$attrs->f['attname']], $attrs->f['type']), "", $data->printField("values[{$attrs->fields['attname']}]", + $_REQUEST['values'][$attrs->fields['attname']], $attrs->fields['type']), "
    ", $misc->printVal($attrs->f['attname']), "", $misc->printVal($attrs->fields['attname']), "\n"; - echo $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod'])); - echo "f['attname']), "]\" value=\"", - htmlspecialchars($attrs->f['type']), "\" />\n"; - echo "fields['attname']), "]\">\n"; + echo "\n"; + echo "\n"; echo "\n"; // Output null box if the column allows nulls (doesn't look at CHECKs or ASSERTIONS) - if (!$attrs->f['attnotnull']) { - echo "f['attname']), "]\"", - isset($_REQUEST['nulls'][$attrs->f['attname']]) ? ' checked="checked"' : '', " />", $data->printField($szValueName, - $_REQUEST['values'][$attrs->f['attname']], $attrs->f['type'],array(),$szEvents),$szDivPH ,"
    "; - echo "f['attname']), "]\"", - isset($_REQUEST['show'][$attrs->f['attname']]) ? ' checked="checked"' : '', " />", $misc->printVal($attrs->f['attname']), "", $misc->printVal($data->formatType($attrs->f['type'], $attrs->f['atttypmod'])), "", $misc->printVal($attrs->fields['attname']), "", $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])), ""; - echo "fields['attname']}]\">\n"; foreach (array_keys($data->selectOps) as $v) { - echo "\n"; } echo "\n"; - echo "", $data->printField("values[{$attrs->f['attname']}]", - $_REQUEST['values'][$attrs->f['attname']], $attrs->f['type']), "", $data->printField("values[{$attrs->fields['attname']}]", + $_REQUEST['values'][$attrs->fields['attname']], $attrs->fields['type']), "
    \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(); } -- 2.39.5