Need to fix:
* Variables and processes views for < 7.3
* Add aggregates and opclasses to Find feature
-* Aggregate and opclass support for < 7.3
\ No newline at end of file
+* Aggregate and opclass support for < 7.3
+* The getType function needs to be ported to 7.2 and 7.3 classes to add
+ pretty type name and schema support
+
/**
* Class to hold various commonly used functions
*
- * $Id: Misc.php,v 1.55 2003/12/17 09:11:32 chriskl Exp $
+ * $Id: Misc.php,v 1.56 2003/12/30 03:09:29 chriskl Exp $
*/
class Misc {
if ($data->hasSchemas()) {
echo "<td width=\"12%\"><a href=\"database.php?{$vars}\">{$lang['strschemas']}</a></td>\n";
}
- // Only show database privs if available
- if (isset($data->privlist['database'])) {
- echo "<td width=\"13%\"><a href=\"privileges.php?{$vars}&type=database&object=", urlencode($_REQUEST['database']), "\">{$lang['strprivileges']}</a></td>\n";
- }
echo "<td width=\"12%\"><a href=\"database.php?{$vars}&action=sql\">{$lang['strsql']}</a></td>\n";
echo "<td width=\"13%\"><a href=\"database.php?{$vars}&action=find\">{$lang['strfind']}</a></td>\n";
echo "<td width=\"12%\"><a href=\"database.php?{$vars}&action=variables\">{$lang['strvariables']}</a></td>\n";
echo "<td width=\"13%\"><a href=\"database.php?{$vars}&action=processes\">{$lang['strprocesses']}</a></td>\n";
echo "<td width=\"12%\"><a href=\"database.php?{$vars}&action=admin\">{$lang['stradmin']}</a></td>\n";
+ // Only show database privs if available
+ if (isset($data->privlist['database'])) {
+ echo "<td width=\"13%\"><a href=\"privileges.php?{$vars}&type=database&object=", urlencode($_REQUEST['database']), "\">{$lang['strprivileges']}</a></td>\n";
+ }
// Check that database dumps are enabled.
if ($conf['pg_dump_path'] !== null && $conf['pg_dump_path'] != '') {
echo "<td width=\"13%\"><a href=\"database.php?{$vars}&action=export\">{$lang['strexport']}</a></td>\n";
* A class that implements the DB interface for Postgres
* Note: This class uses ADODB and returns RecordSets.
*
- * $Id: Postgres.php,v 1.169 2003/12/24 11:12:20 chriskl Exp $
+ * $Id: Postgres.php,v 1.170 2003/12/30 03:09:29 chriskl Exp $
*/
// @@@ THOUGHT: What about inherits? ie. use of ONLY???
}
/**
- * Resets a given sequence to 2 (lowest possible in 7.0)
+ * Resets a given sequence to min value of sequence
* @param $sequence Sequence name
* @return 0 success
+ * @return -1 sequence not found
*/
function &resetSequence($sequence) {
+ // Get the minimum value of the sequence
+ $seq = &$this->getSequence($sequence);
+ if ($seq->recordCount() != 1) return -1;
+ $minvalue = $seq->f[$this->sqFields['minvalue']];
+
/* This double-cleaning is deliberate */
$this->fieldClean($sequence);
$this->clean($sequence);
- $sql = "SELECT SETVAL('\"{$sequence}\"', 1)";
+ $sql = "SELECT SETVAL('\"{$sequence}\"', {$minvalue})";
return $this->execute($sql);
}
*/
function createSequence($sequence, $increment, $minvalue, $maxvalue, $startvalue) {
$this->fieldClean($sequence);
+ $this->clean($increment);
+ $this->clean($minvalue);
+ $this->clean($maxvalue);
+ $this->clean($startvalue);
$sql = "CREATE SEQUENCE \"{$sequence}\"";
if ($increment != '') $sql .= " INCREMENT {$increment}";
$where = "AND pt.oid > '{$this->_lastSystemOID}'::oid";
$sql = "SELECT
+ pt.typname AS basename,
pt.typname,
pu.usename AS typowner
FROM
* A class that implements the DB interface for Postgres
* Note: This class uses ADODB and returns RecordSets.
*
- * $Id: Postgres71.php,v 1.49 2003/12/17 09:11:32 chriskl Exp $
+ * $Id: Postgres71.php,v 1.50 2003/12/30 03:09:29 chriskl Exp $
*/
// @@@ THOUGHT: What about inherits? ie. use of ONLY???
// Sequence functions
/**
- * Resets a given sequence to 1
+ * Resets a given sequence to min value of sequence
* @param $sequence Sequence name
* @return 0 success
+ * @return -1 sequence not found
*/
function &resetSequence($sequence) {
+ // Get the minimum value of the sequence
+ $seq = &$this->getSequence($sequence);
+ if ($seq->recordCount() != 1) return -1;
+ $minvalue = $seq->f[$this->sqFields['minvalue']];
+
/* This double-cleaning is deliberate */
$this->fieldClean($sequence);
$this->clean($sequence);
- $sql = "SELECT SETVAL('\"{$sequence}\"', 1, FALSE)";
+ $sql = "SELECT SETVAL('\"{$sequence}\"', {$minvalue}, FALSE)";
return $this->execute($sql);
}
* A class that implements the DB interface for Postgres
* Note: This class uses ADODB and returns RecordSets.
*
- * $Id: Postgres72.php,v 1.54 2003/12/17 09:11:32 chriskl Exp $
+ * $Id: Postgres72.php,v 1.55 2003/12/30 03:09:29 chriskl Exp $
*/
$where = "AND pt.oid > '{$this->_lastSystemOID}'::oid";
$sql = "SELECT
+ pt.typname AS basename,
format_type(pt.oid, NULL) AS typname,
pu.usename AS typowner
FROM
{$where}
UNION
SELECT
+ pt.typname AS basename,
pt.typname,
pu.usename AS typowner
FROM
* A class that implements the DB interface for Postgres
* Note: This class uses ADODB and returns RecordSets.
*
- * $Id: Postgres73.php,v 1.84 2003/12/24 11:12:20 chriskl Exp $
+ * $Id: Postgres73.php,v 1.85 2003/12/30 03:09:29 chriskl Exp $
*/
// @@@ THOUGHT: What about inherits? ie. use of ONLY???
$where = "n.nspname = '{$this->_schema}'";
$sql = "SELECT
+ t.typname AS basename,
pg_catalog.format_type(t.oid, NULL) AS typname,
pu.usename AS typowner
FROM (pg_catalog.pg_type t
/**
* Manage schemas within a database
*
- * $Id: database.php,v 1.29 2003/12/17 09:11:32 chriskl Exp $
+ * $Id: database.php,v 1.30 2003/12/30 03:09:28 chriskl Exp $
*/
// Include application functions
echo "<table>\n";
echo "<tr>\n<th class=\"data left\">{$lang['strdownload']}</th>\n";
echo "<td><input type=\"checkbox\" name=\"download\" /></td>\n</tr>\n";
+ echo "<tr>\n<th class=\"data left\">{$lang['strgzip']}</th>\n";
+ echo "<td><input type=\"checkbox\" name=\"compress\" /></td>\n</tr>\n";
echo "</table>\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"export\" />\n";
doExport();
break;
default:
- doDefault();
+ if ($data->hasSchemas())
+ doDefault();
+ else
+ doSQL();
break;
}
* Does an export of a database to the screen or as a download.
* Can also dump a specific table of a database.
*
- * $Id: dbexport.php,v 1.4 2003/12/21 10:44:52 chriskl Exp $
+ * $Id: dbexport.php,v 1.5 2003/12/30 03:09:29 chriskl Exp $
*/
// Include application functions
// Make it do a download, if necessary
if (isset($_REQUEST['download'])) {
header('Content-Type: application/download');
- header('Content-Disposition: attachment; filename=dbdump.sql');
+ if (isset($_REQUEST['compress']))
+ header('Content-Disposition: attachment; filename=dump.sql.gz');
+ else
+ header('Content-Disposition: attachment; filename=dump.sql');
}
else {
header('Content-Type: text/plain');
if (isset($_REQUEST['table'])) {
$cmd .= " -t " . escapeshellarg($_REQUEST['table']);
}
+
+ // Check for GZIP compression specified
+ if (isset($_REQUEST['compress'])) {
+ $cmd .= " -Z 9";
+ }
switch ($_REQUEST['what']) {
case 'dataonly':
/**
* Manage domains in a database
*
- * $Id: domains.php,v 1.7 2003/12/17 09:11:32 chriskl Exp $
+ * $Id: domains.php,v 1.8 2003/12/30 03:09:29 chriskl Exp $
*/
// Include application functions
// Display domain info
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
- echo "<tr><th class=\"data\" width=\"70\">{$lang['strname']}</th>\n";
+ echo "<tr><th class=\"data left required\" width=\"70\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domname']), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strtype']}</th>\n";
+ echo "<tr><th class=\"data left required\">{$lang['strtype']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domtype']), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strnotnull']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strnotnull']}</th>\n";
echo "<td class=\"data1\"><input type=\"checkbox\" name=\"domnotnull\"", (isset($_POST['domnotnull']) ? ' checked="checked"' : ''), " /></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strdefault']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";
echo "<td class=\"data1\"><input name=\"domdefault\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['domdefault']), "\" /></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strowner']}</th>\n";
+ echo "<tr><th class=\"data left required\">{$lang['strowner']}</th>\n";
echo "<td class=\"data1\"><select name=\"domowner\">";
while (!$users->EOF) {
$uname = $users->f[$data->uFields['uname']];
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
- echo "<th class=\"data\">{$lang['strdefinition']}</th></tr>\n";
+ echo "<th class=\"data required\">{$lang['strdefinition']}</th></tr>\n";
echo "<tr><td class=\"data1\"><input name=\"name\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['name']), "\" /></td>\n";
echo "<input type=\"hidden\" name=\"action\" value=\"save_add_check\" />\n";
echo "<input type=\"hidden\" name=\"domain\" value=\"", htmlspecialchars($_REQUEST['domain']), "\" />\n";
echo $misc->form;
- echo "<p><input type=\"submit\" name=\"ok\" value=\"{$lang['strok']}\" />\n";
+ echo "<p><input type=\"submit\" name=\"add\" value=\"{$lang['stradd']}\" />\n";
echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
echo "</form>\n";
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" name=\"cascade\" /> {$lang['strcascade']}</p>\n";
}
- echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" />\n";
- echo "<input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\" />\n";
+ echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
+ echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
echo "</form>\n";
}
else {
// Display domain info
$domaindata->f['domnotnull'] = $data->phpBool($domaindata->f['domnotnull']);
echo "<table>\n";
- echo "<tr><th class=\"data\" width=\"70\">{$lang['strname']}</th>\n";
+ echo "<tr><th class=\"data left\" width=\"70\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domname']), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strtype']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strtype']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domtype']), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strnotnull']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strnotnull']}</th>\n";
echo "<td class=\"data1\">", ($domaindata->f['domnotnull'] ? 'NOT NULL' : ''), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strdefault']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domdef']), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strowner']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strowner']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domowner']), "</td></tr>\n";
echo "</table>\n";
echo $misc->printVal($domaincons->f[$data->cnFields['consrc']]);
echo "</td>";
echo "<td class=\"opbutton{$id}\">";
- echo "<a href=\"$PHP_SELF?action=confirm_drop_con&{$misc->href}&constraint=", urlencode($domaincons->f[$data->cnFields['conname']]),
- "&domain=", urlencode($_REQUEST['domain']), "&type=", urlencode($domaincons->f['contype']), "\">{$lang['strdrop']}</td></tr>\n";
+ echo "<a href=\"$PHP_SELF?action=confirm_drop_con&{$misc->href}&constraint=", urlencode($domaincons->f[$data->cnFields['conname']]),
+ "&domain=", urlencode($_REQUEST['domain']), "&type=", urlencode($domaincons->f['contype']), "\">{$lang['strdrop']}</td></tr>\n";
$domaincons->moveNext();
$i++;
echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowalldomains']}</a>\n";
if ($data->hasDomainConstraints()) {
- echo "| <a class=\"navlink\" href=\"{$PHP_SELF}?action=add_check&{$misc->href}&domain=", urlencode($_REQUEST['domain']),
+ echo "| <a class=\"navlink\" href=\"{$PHP_SELF}?action=add_check&{$misc->href}&domain=", urlencode($_REQUEST['domain']),
"\">{$lang['straddcheck']}</a>\n";
- echo "| <a class=\"navlink\" href=\"$PHP_SELF?action=alter&{$misc->href}&domain=",
+ echo "| <a class=\"navlink\" href=\"$PHP_SELF?action=alter&{$misc->href}&domain=",
urlencode($_REQUEST['domain']), "\">{$lang['stralter']}</a>\n";
}
echo "</p>\n";
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
- echo "<tr><th class=\"data\" width=\"70\">{$lang['strname']}</th>\n";
+ echo "<tr><th class=\"data left required\" width=\"70\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\"><input name=\"domname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['domname']), "\" /></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strtype']}</th>\n";
+ echo "<tr><th class=\"data left required\">{$lang['strtype']}</th>\n";
echo "<td class=\"data1\">\n";
// Output return type list
echo "<select name=\"domtype\">\n";
}
echo "</select>\n";
echo "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strnotnull']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strnotnull']}</th>\n";
echo "<td class=\"data1\"><input type=\"checkbox\" name=\"domnotnull\"",
(isset($_POST['domnotnull']) ? ' checked="checked"' : ''), " /></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strdefault']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";
echo "<td class=\"data1\"><input name=\"domdefault\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['domdefault']), "\" /></td></tr>\n";
if ($data->hasDomainConstraints()) {
- echo "<tr><th class=\"data\">{$lang['strconstraints']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strconstraints']}</th>\n";
echo "<td class=\"data1\">CHECK (<input name=\"domcheck\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['domcheck']), "\" />)</td></tr>\n";
}
echo "<td class=\"data{$id}\">", ($domains->f['domnotnull'] ? 'NOT NULL' : ''), "</td>\n";
echo "<td class=\"data{$id}\">", $misc->printVal($domains->f['domdef']), "</td>\n";
echo "<td class=\"data{$id}\">", $misc->printVal($domains->f['domowner']), "</td>\n";
- echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&{$misc->href}&domain=", urlencode($domains->f['domname']), "\">{$lang['strproperties']}</a></td>\n";
- echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&domain=", urlencode($domains->f['domname']), "\">{$lang['strdrop']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&{$misc->href}&domain=", urlencode($domains->f['domname']), "\">{$lang['strproperties']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&domain=", urlencode($domains->f['domname']), "\">{$lang['strdrop']}</a></td>\n";
echo "</tr>\n";
$domains->moveNext();
$i++;
echo "<p>{$lang['strnodomains']}</p>\n";
}
- echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatedomain']}</a></p>\n";
+ echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatedomain']}</a></p>\n";
}
else addCheck(false);
break;
case 'drop_con':
- if (isset($_POST['yes'])) doDropConstraint(false);
+ if (isset($_POST['drop'])) doDropConstraint(false);
else doProperties();
break;
case 'confirm_drop_con':
/**
* Manage functions in a database
*
- * $Id: functions.php,v 1.25 2003/12/21 02:03:15 chriskl Exp $
+ * $Id: functions.php,v 1.26 2003/12/30 03:09:29 chriskl Exp $
*/
// Include application functions
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table width=\"90%\">\n";
echo "<tr>\n";
- echo "<th class=\"data\">{$lang['strfunction']}</th>\n";
+ echo "<th class=\"data required\">{$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>\n";
+ echo "<th class=\"data required\">{$lang['strreturns']}</th>\n";
+ echo "<th class=\"data required\">{$lang['strproglanguage']}</th>\n";
echo "</tr>\n";
echo "<input type=\"hidden\" name=\"original_lang\" value=\"", htmlspecialchars($fndata->f[$data->fnFields['fnlang']]), "\" />\n";
echo "</td>\n";
- echo "<tr><th class=\"data\" colspan=\"8\">{$lang['strdefinition']}</th></tr>\n";
+ echo "<tr><th class=\"data required\" colspan=\"8\">{$lang['strdefinition']}</th></tr>\n";
echo "<tr><td class=\"data1\" colspan=\"8\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">",
htmlspecialchars($_POST['formDefinition']), "</textarea></td></tr>\n";
// Display function properies
}
else echo "<p>{$lang['strnodata']}</p>\n";
- echo "<p><a class=navlink href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallfunctions']}</a> |\n";
- echo "<a class=navlink href=\"$PHP_SELF?action=edit&{$misc->href}&function=",
- urlencode($_REQUEST['function']), "&function_oid=", urlencode($_REQUEST['function_oid']), "\">{$lang['stralter']}</a> |\n";
- echo "<a class=navlink href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&function=",
- urlencode($func_full), "&function_oid=", $_REQUEST['function_oid'], "\">{$lang['strdrop']}</a></td>\n";
+ echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallfunctions']}</a> |\n";
+ echo "<a class=\"navlink\" href=\"$PHP_SELF?action=edit&{$misc->href}&function=",
+ urlencode($_REQUEST['function']), "&function_oid=", urlencode($_REQUEST['function_oid']), "\">{$lang['stralter']}</a> |\n";
+ echo "<a class=\"navlink\" href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&function=",
+ urlencode($func_full), "&function_oid=", $_REQUEST['function_oid'], "\">{$lang['strdrop']}</a></td>\n";
}
/**
echo "<form action=\"$PHP_SELF\" method=post>\n";
echo "<table>\n";
- echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
+ echo "<tr><th class=\"data required\">{$lang['strname']}</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 "<th class=\"data required\">{$lang['strreturns']}</th>\n";
+ echo "<th class=\"data required\">{$lang['strproglanguage']}</th></tr>\n";
echo "<tr><td class=\"data1\"><input name=\"formFunction\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['formFunction']), "\" /></td>\n";
echo "</select>\n";
echo "</td></tr>\n";
- echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
+ echo "<tr><th class=\"data required\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">",
htmlspecialchars($_POST['formDefinition']), "</textarea></td></tr>\n";
// Display function properies
if ($funcs->f[$data->fnFields['setof']]) echo "setof ";
echo $misc->printVal($funcs->f[$data->fnFields['fnreturns']]), "</td>\n";
echo "<td class=\"data{$id}\">", $misc->printVal($funcs->f[$data->fnFields['fnarguments']]), "</td>\n";
- echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&{$misc->href}&function=",
- urlencode($func_full), "&function_oid=", $funcs->f[$data->fnFields['fnoid']], "\">{$lang['strproperties']}</a></td>\n";
- echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=edit&{$misc->href}&function=",
- urlencode($func_full), "&function_oid=", $funcs->f[$data->fnFields['fnoid']], "\">{$lang['stralter']}</a></td>\n";
- echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&function=",
- urlencode($func_full), "&function_oid=", $funcs->f[$data->fnFields['fnoid']], "\">{$lang['strdrop']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&{$misc->href}&function=",
+ urlencode($func_full), "&function_oid=", $funcs->f[$data->fnFields['fnoid']], "\">{$lang['strproperties']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=edit&{$misc->href}&function=",
+ urlencode($func_full), "&function_oid=", $funcs->f[$data->fnFields['fnoid']], "\">{$lang['stralter']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&function=",
+ urlencode($func_full), "&function_oid=", $funcs->f[$data->fnFields['fnoid']], "\">{$lang['strdrop']}</a></td>\n";
if (isset($data->privlist['function'])) {
- echo "<td class=\"opbutton{$id}\"><a href=\"privileges.php?{$misc->href}&function=",
- urlencode($func_full), "&object=",
- $funcs->f[$data->fnFields['fnoid']], "&type=function\">{$lang['strprivileges']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"privileges.php?{$misc->href}&function=",
+ urlencode($func_full), "&object=",
+ $funcs->f[$data->fnFields['fnoid']], "&type=function\">{$lang['strprivileges']}</a></td>\n";
}
else echo "<td></td>";
echo "</tr>\n";
echo "<p>{$lang['strnofunctions']}</p>\n";
}
- echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatefunction']}</a></p>\n";
+ echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatefunction']}</a></p>\n";
}
* English language file for phpPgAdmin. Use this as a basis
* for new translations.
*
- * $Id: english.php,v 1.124 2003/12/24 11:12:20 chriskl Exp $
+ * $Id: english.php,v 1.125 2003/12/30 03:09:29 chriskl Exp $
*/
// Language and character set
$lang['strprocesses'] = 'Processes';
$lang['strsetting'] = 'Setting';
$lang['strparameters'] = 'Parameters';
+ $lang['strgzip'] = 'GZIP Compression';
// Error handling
$lang['strnoframes'] = 'You need a frames-enabled browser to use this application.';
$lang['strviewdroppedbad'] = 'View drop failed.';
$lang['strviewupdated'] = 'View updated.';
$lang['strviewupdatedbad'] = 'View update failed.';
+ $lang['strviewlink'] = 'Linking Keys';
+ $lang['strviewconditions'] = 'Additional Conditions';
// Sequences
$lang['strsequence'] = 'Sequence';
* English language file for phpPgAdmin. Use this as a basis
* for new translations.
*
- * $Id: english.php,v 1.76 2003/12/24 11:12:21 chriskl Exp $
+ * $Id: english.php,v 1.77 2003/12/30 03:09:29 chriskl Exp $
*/
// Language and character set
$lang['strprocess'] = 'Process';
$lang['strprocesses'] = 'Processes';
$lang['strsetting'] = 'Setting';
- $lang['strparameters'] = 'Parameters';
+ $lang['strgzip'] = 'GZIP compression';
// Error handling
$lang['strnoframes'] = 'You need a frames-enabled browser to use this application.';
$lang['strviewdroppedbad'] = 'View drop failed.';
$lang['strviewupdated'] = 'View updated.';
$lang['strviewupdatedbad'] = 'View update failed.';
+ $lang['strviewlink'] = 'Linking Keys';
+ $lang['strviewconditions'] = 'Additional Conditions';
// Sequences
$lang['strsequence'] = 'Sequence';
/**
* Manage privileges in a database
*
- * $Id: privileges.php,v 1.21 2003/12/17 09:11:32 chriskl Exp $
+ * $Id: privileges.php,v 1.22 2003/12/30 03:09:29 chriskl Exp $
*/
// Include application functions
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
- echo "<tr><th class=\"data\">{$lang['strusers']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strusers']}</th>\n";
echo "<td class=\"data1\"><select name=\"username[]\" multiple=\"multiple\" size=\"", min(6, $users->recordCount()), "\">\n";
while (!$users->EOF) {
$uname = htmlspecialchars($users->f[$data->uFields['uname']]);
$users->moveNext();
}
echo "</select></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strgroups']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strgroups']}</th>\n";
echo "<td class=\"data1\">\n";
echo "<input type=\"checkbox\" name=\"public\"", (isset($_REQUEST['public']) ? ' selected="selected"' : ''), " />PUBLIC\n";
// Only show groups if there are groups!
echo "</select>\n";
}
echo "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strprivileges']}</th>\n";
+ echo "<tr><th class=\"data left required\">{$lang['strprivileges']}</th>\n";
echo "<td class=\"data1\">\n";
foreach ($data->privlist[$_REQUEST['type']] as $v) {
$v = htmlspecialchars($v);
echo "</td></tr>\n";
// Grant option
if ($data->hasGrantOption()) {
- echo "<tr><th class=\"data\">{$lang['stroptions']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['stroptions']}</th>\n";
echo "<td class=\"data1\">\n";
echo "<input type=\"checkbox\" name=\"grantoption\"",
isset($_REQUEST['grantoption']) ? ' selected="selected"' : '', " />GRANT OPTION<br />\n";
// Links for granting to a user or group
switch ($_REQUEST['type']) {
case 'table':
- echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
- urlencode($_REQUEST['object']), "&table=", urlencode($_REQUEST['table']), "\">{$lang['stralterprivs']}</a></p>\n";
+ echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
+ urlencode($_REQUEST['object']), "&table=", urlencode($_REQUEST['table']), "\">{$lang['stralterprivs']}</a></p>\n";
break;
case 'view':
- echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
+ echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
urlencode($_REQUEST['object']), "\">{$lang['stralterprivs']}</a>\n";
echo "| <a class=\"navlink\" href=\"views.php?{$misc->href}\">{$lang['strshowallviews']}</a></p>\n";
break;
case 'sequence':
- echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
+ echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
urlencode($_REQUEST['object']), "\">{$lang['stralterprivs']}</a>\n";
echo "| <a class=\"navlink\" href=\"sequences.php?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
break;
case 'database':
- echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
+ echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
urlencode($_REQUEST['object']), "\">{$lang['stralterprivs']}</a></p>\n";
break;
case 'function':
- echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
- urlencode($_REQUEST['object']), "&function=", urlencode($_REQUEST['function']), "\">{$lang['stralterprivs']}</a>\n";
+ echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
+ urlencode($_REQUEST['object']), "&function=", urlencode($_REQUEST['function']), "\">{$lang['stralterprivs']}</a>\n";
echo "| <a class=\"navlink\" href=\"functions.php?{$misc->href}\">{$lang['strshowallfunctions']}</a></p>\n";
break;
case 'schema':
- echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
+ echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=alter&{$misc->href}&type={$_REQUEST['type']}&object=",
urlencode($_REQUEST['object']), "\">{$lang['stralterprivs']}</a>\n";
echo "| <a class=\"navlink\" href=\"database.php?database=", urlencode($_REQUEST['database']),
"\">{$lang['strshowallschemas']}</a></p>\n";
/**
* Manage sequences in a database
*
- * $Id: sequences.php,v 1.16 2003/12/17 09:11:32 chriskl Exp $
+ * $Id: sequences.php,v 1.17 2003/12/30 03:09:29 chriskl Exp $
*/
// Include application functions
if (is_object($sequences) && $sequences->recordCount() > 0) {
echo "<table>\n";
- echo "<tr><th class=\"data\">{$lang['strsequences']}</th><th class=\"data\">{$lang['strowner']}</th>";
- echo "<th colspan=\"3\" class=\"data\">{$lang['stractions']}</th>\n";
+ echo "<tr><th class=\"data\">{$lang['strname']}</th><th class=\"data\">{$lang['strowner']}</th>";
+ echo "<th colspan=\"3\" class=\"data\">{$lang['stractions']}</th></tr>\n";
$i = 0;
while (!$sequences->EOF) {
echo "<tr><td class=\"data{$id}\">", $misc->printVal($sequences->f[$data->sqFields['seqname']]), "</td>";
echo "<td class=\"data{$id}\">", $misc->printVal($sequences->f[$data->sqFields['seqowner']]), "</td>";
echo "<td class=\"opbutton{$id}\">";
- echo "<a href=\"$PHP_SELF?action=properties&{$misc->href}&sequence=",
+ echo "<a href=\"$PHP_SELF?action=properties&{$misc->href}&sequence=",
urlencode($sequences->f[$data->sqFields['seqname']]), "\">{$lang['strproperties']}</a></td>\n";
echo "<td class=\"opbutton{$id}\">";
- echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&sequence=",
+ echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&sequence=",
urlencode($sequences->f[$data->sqFields['seqname']]), "\">{$lang['strdrop']}</td>\n";
echo "<td class=\"opbutton{$id}\">";
- echo "<a href=\"privileges.php?{$misc->href}&object=", urlencode($sequences->f[$data->sqFields['seqname']]),
- "&type=sequence\">{$lang['strprivileges']}</td></tr>\n";
+ echo "<a href=\"privileges.php?{$misc->href}&object=", urlencode($sequences->f[$data->sqFields['seqname']]),
+ "&type=sequence\">{$lang['strprivileges']}</td></tr>\n";
$sequences->movenext();
$i++;
else
echo "<p>{$lang['strnosequences']}</p>\n";
- echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatesequence']}</a></p>\n";
+ echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatesequence']}</a></p>\n";
}
/**
$sequence = &$data->getSequence($_REQUEST['sequence']);
if (is_object($sequence) && $sequence->recordCount() > 0) {
+ $sequence->f[$data->sqFields['iscycled']] = $data->phpBool($sequence->f[$data->sqFields['iscycled']]);
+ $sequence->f[$data->sqFields['iscalled']] = $data->phpBool($sequence->f[$data->sqFields['iscalled']]);
echo "<table border=\"0\">";
echo "<tr><th class=\"data\">{$lang['strname']}</th><th class=\"data\">{$lang['strlastvalue']}</th>";
echo "<th class=\"data\">{$lang['strincrementby']}</th><th class=\"data\">{$lang['strmaxvalue']}</th>";
if (isset($sequence->f[$data->sqFields['logcount']])) {
echo "<td class=\"data1\">", $misc->printVal($sequence->f[$data->sqFields['logcount']]), "</td>";
}
- echo "<td class=\"data1\">", $misc->printVal($sequence->f[$data->sqFields['iscycled']]), "</td>";
- echo "<td class=\"data1\">", $misc->printVal($sequence->f[$data->sqFields['iscalled']]), "</td>";
+ echo "<td class=\"data1\">", (($sequence->f[$data->sqFields['iscycled']]) ? $lang['stryes'] : $lang['strno']), "</td>";
+ echo "<td class=\"data1\">", (($sequence->f[$data->sqFields['iscalled']]) ? $lang['stryes'] : $lang['strno']), "</td>";
echo "</tr>";
echo "</table>";
- echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=reset&{$misc->href}&sequence=", urlencode($sequence->f[$data->sqFields['seqname']]), "\">{$lang['strreset']}</a> |\n";
+ echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=reset&{$misc->href}&sequence=", urlencode($sequence->f[$data->sqFields['seqname']]), "\">{$lang['strreset']}</a> |\n";
echo "<a class=\"navlink\" href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
}
else echo "<p>{$lang['strnodata']}.</p>\n";
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" name=\"cascade\" /> {$lang['strcascade']}</p>\n";
}
- echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" />\n";
- echo "<input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\" />\n";
+ echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
+ echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
echo "</form>\n";
}
else {
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
- echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
+ echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\"><input name=\"formSequenceName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['formSequenceName']), "\" /></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strincrementby']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strincrementby']}</th>\n";
echo "<td class=\"data1\"><input name=\"formIncrement\" size=\"5\" value=\"",
htmlspecialchars($_POST['formIncrement']), "\" /> </td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strstartvalue']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strstartvalue']}</th>\n";
echo "<td class=\"data1\"><input name=\"formStartValue\" size=\"5\" value=\"",
htmlspecialchars($_POST['formStartValue']), "\" /></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strminvalue']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strminvalue']}</th>\n";
echo "<td class=\"data1\"><input name=\"formMinValue\" size=\"5\" value=\"",
htmlspecialchars($_POST['formMinValue']), "\" /></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strmaxvalue']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strmaxvalue']}</th>\n";
echo "<td class=\"data1\"><input name=\"formMaxValue\" size=\"5\" value=\"",
htmlspecialchars($_POST['formMaxValue']), "\" /></td></tr>\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create_sequence\" />\n";
echo $misc->form;
echo "<input type=\"hidden\" name=\"sequence\" value=\"", htmlspecialchars($_REQUEST['sequence']), "\" />\n";
- echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
- echo "<input type=\"reset\" value=\"{$lang['strreset']}\" /></p>\n";
+ echo "<input type=\"submit\" name=\"create\" value=\"{$lang['strcreate']}\" />\n";
+ echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
echo "</form>\n";
-
- echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}&sequence=", urlencode($_REQUEST['sequence']), "\">{$lang['strshowallsequences']}</a></p>\n";
}
/**
doCreateSequence();
break;
case 'save_create_sequence':
- doSaveCreateSequence();
+ if (isset($_POST['create'])) doSaveCreateSequence();
+ else doDefault();
break;
case 'properties':
doProperties();
break;
case 'drop':
- if (isset($_POST['yes'])) doDrop(false);
+ if (isset($_POST['drop'])) doDrop(false);
else doDefault();
break;
case 'confirm_drop':
/**
* Manage types in a database
*
- * $Id: types.php,v 1.14 2003/12/21 02:03:15 chriskl Exp $
+ * $Id: types.php,v 1.15 2003/12/30 03:09:29 chriskl Exp $
*/
// Include application functions
global $data, $misc;
global $PHP_SELF, $lang;
- echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtypes']}: ", $misc->printVal($_REQUEST['type']), ": {$lang['strproperties']}</h2>\n";
+ // Get type (using base name)
+ $typedata = &$data->getType($_REQUEST['type']);
+
+ echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtypes']}: ",
+ $misc->printVal($typedata->f['typname']), ": {$lang['strproperties']}</h2>\n";
$misc->printMsg($msg);
- $typedata = &$data->getType($_REQUEST['type']);
if ($typedata->recordCount() > 0) {
$byval = $data->phpBool($typedata->f[$data->typFields['typbyval']]);
echo "<table>\n";
- echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typname']]), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strinputfn']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strinputfn']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typin']]), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['stroutputfn']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['stroutputfn']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typout']]), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strlength']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strlength']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typlen']]), "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strpassbyval']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strpassbyval']}</th>\n";
echo "<td class=\"data1\">", ($byval) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['stralignment']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['stralignment']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typalign']]), "</td></tr>\n";
echo "</table>\n";
// Retrieve all functions and types in the database
$funcs = &$data->getFunctions(true);
- $types = &$data->getTypes();
+ $types = &$data->getTypes(true);
echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtypes']}: {$lang['strcreatetype']}</h2>\n";
$misc->printMsg($msg);
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
- echo "<tr><th class=\"data\"><b>{$lang['strname']}</b></th>\n";
- echo "<td class=\"data1\"><input name=\"typname\" size=\"{$data->_maxNameLen}\" maxlength=\"{$data->_maxNameLen}\" value=\"",
+ echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
+ echo "<td class=\"data1\"><input name=\"typname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['typname']), "\" /></td></tr>\n";
- echo "<tr><th class=\"data\"><b>{$lang['strinputfn']}</b></th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strinputfn']}</th>\n";
echo "<td class=\"data1\"><select name=\"typin\">";
while (!$funcs->EOF) {
$proname = htmlspecialchars($funcs->f[$data->fnFields['fnname']]);
$funcs->moveNext();
}
echo "</select></td></tr>\n";
- echo "<tr><th class=\"data\"><b>{$lang['stroutputfn']}</b></th>\n";
+ echo "<tr><th class=\"data left\">{$lang['stroutputfn']}</th>\n";
echo "<td class=\"data1\"><select name=\"typout\">";
$funcs->moveFirst();
while (!$funcs->EOF) {
$funcs->moveNext();
}
echo "</select></td></tr>\n";
- echo "<tr><th class=\"data\"><b>{$lang['strlength']}</b></th>\n";
+ echo "<tr><th class=\"data left required\">{$lang['strlength']}</th>\n";
echo "<td class=\"data1\"><input name=\"typlen\" size=\"8\" value=\"",
htmlspecialchars($_POST['typlen']), "\" /></td></tr>";
- echo "<tr><th class=\"data\">{$lang['strdefault']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";
echo "<td class=\"data1\"><input name=\"typdef\" size=\"8\" value=\"",
htmlspecialchars($_POST['typdef']), "\" /></td></tr>";
- echo "<tr><th class=\"data\">{$lang['strelement']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strelement']}</th>\n";
echo "<td class=\"data1\"><select name=\"typelem\">";
echo "<option value=\"\"></option>\n";
while (!$types->EOF) {
$types->moveNext();
}
echo "</select></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strdelimiter']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strdelimiter']}</th>\n";
echo "<td class=\"data1\"><input name=\"typdelim\" size=\"1\" maxlength=\"1\" value=\"",
htmlspecialchars($_POST['typdelim']), "\" /></td></tr>";
- echo "<tr><th class=\"data\">{$lang['strpassbyval']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strpassbyval']}</th>\n";
echo "<td class=\"data1\"><input type=\"checkbox\" name=\"typbyval\"",
isset($_POST['typbyval']) ? ' checked="checked"' : '', " /></td></tr>";
- echo "<tr><th class=\"data\">{$lang['stralignment']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['stralignment']}</th>\n";
echo "<td class=\"data1\"><select name=\"typalign\">";
foreach ($data->typAligns as $v) {
echo "<option value=\"{$v}\"",
($v == $_POST['typalign']) ? ' selected="selected"' : '', ">{$v}</option>\n";
}
echo "</select></td></tr>\n";
- echo "<tr><th class=\"data\">{$lang['strstorage']}</th>\n";
+ echo "<tr><th class=\"data left\">{$lang['strstorage']}</th>\n";
echo "<td class=\"data1\"><select name=\"typstorage\">";
foreach ($data->typStorages as $v) {
echo "<option value=\"{$v}\"",
if ($types->recordCount() > 0) {
echo "<table>\n";
- echo "<tr><th class=\"data\">{$lang['strtype']}</th><th class=\"data\">{$lang['strowner']}</th><th colspan=\"2\" class=\"data\">{$lang['stractions']}</th>\n";
+ echo "<tr><th class=\"data\">{$lang['strtype']}</th><th class=\"data\">{$lang['strowner']}</th>";
+ echo "<th colspan=\"2\" class=\"data\">{$lang['stractions']}</th></tr>\n";
$i = 0;
while (!$types->EOF) {
$id = (($i % 2) == 0 ? '1' : '2');
echo "<tr><td class=\"data{$id}\">", $misc->printVal($types->f[$data->typFields['typname']]), "</td>\n";
echo "<td class=\"data{$id}\">", $misc->printVal($types->f[$data->typFields['typowner']]), "</td>\n";
- echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&{$misc->href}&type=", urlencode($types->f[$data->typFields['typname']]), "\">{$lang['strproperties']}</a></td>\n";
- echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&type=", urlencode($types->f[$data->typFields['typname']]), "\">{$lang['strdrop']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&{$misc->href}&type=",
+ urlencode($types->f['basename']), "\">{$lang['strproperties']}</a></td>\n";
+ echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&type=",
+ urlencode($types->f['basename']), "\">{$lang['strdrop']}</a></td>\n";
echo "</tr>\n";
$types->moveNext();
$i++;
echo "<p>{$lang['strnotypes']}</p>\n";
}
- echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatetype']}</a></p>\n";
+ echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatetype']}</a></p>\n";
}
projects / phppgadmin.git / commitdiff