Menu
▾
▴
[ppa-cvs] CVS: webdb BUGS,1.50,1.51 database.php,1.29,1.30 dbexport.php,1.4,1.5 domains.php,1.7,1.8 functions.php,1.25,1.26 privileges.php,1.21,1.22 sequences.php,1.16,1.17 types.php,1.14,1.15
|
From: Christopher Kings-L. <ch...@us...> - 2003-12-30 03:09:33
|
Update of /cvsroot/phppgadmin/webdb
In directory sc8-pr-cvs1:/tmp/cvs-serv9757
Modified Files:
BUGS database.php dbexport.php domains.php functions.php
privileges.php sequences.php types.php
Log Message:
xhtml compliance. style consistency, fix viewing type properties by using base type name, list all types when creating a type, tweak to not show schema screen of db when no schema support. allow GZIP compressed DB downloads. make sequences reset to their specified min value, NOT zero. A few of bryan's view wizard things have crept in, but I will be working on that later. Drop/cancel buttons instead of yes/no buttons
Index: BUGS
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/BUGS,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** BUGS 24 Dec 2003 11:12:20 -0000 1.50
--- BUGS 30 Dec 2003 03:09:28 -0000 1.51
***************
*** 20,22 ****
* 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
--- 20,25 ----
* Variables and processes views for < 7.3
* Add aggregates and opclasses to Find feature
! * 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
!
Index: database.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/database.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** database.php 17 Dec 2003 09:11:32 -0000 1.29
--- database.php 30 Dec 2003 03:09:28 -0000 1.30
***************
*** 225,228 ****
--- 225,230 ----
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";
***************
*** 546,550 ****
break;
default:
! doDefault();
break;
}
--- 548,555 ----
break;
default:
! if ($data->hasSchemas())
! doDefault();
! else
! doSQL();
break;
}
Index: dbexport.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/dbexport.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dbexport.php 21 Dec 2003 10:44:52 -0000 1.4
--- dbexport.php 30 Dec 2003 03:09:29 -0000 1.5
***************
*** 17,21 ****
if (isset($_REQUEST['download'])) {
header('Content-Type: application/download');
! header('Content-Disposition: attachment; filename=dbdump.sql');
}
else {
--- 17,24 ----
if (isset($_REQUEST['download'])) {
header('Content-Type: application/download');
! if (isset($_REQUEST['compress']))
! header('Content-Disposition: attachment; filename=dump.sql.gz');
! else
! header('Content-Disposition: attachment; filename=dump.sql');
}
else {
***************
*** 44,47 ****
--- 47,55 ----
if (isset($_REQUEST['table'])) {
$cmd .= " -t " . escapeshellarg($_REQUEST['table']);
+ }
+
+ // Check for GZIP compression specified
+ if (isset($_REQUEST['compress'])) {
+ $cmd .= " -Z 9";
}
Index: domains.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/domains.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** domains.php 17 Dec 2003 09:11:32 -0000 1.7
--- domains.php 30 Dec 2003 03:09:29 -0000 1.8
***************
*** 55,68 ****
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
! echo "<tr><th class=\"data\" 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 "<td class=\"data1\">", $misc->printVal($domaindata->f['domtype']), "</td></tr>\n";
! echo "<tr><th class=\"data\">{$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 "<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 "<td class=\"data1\"><select name=\"domowner\">";
while (!$users->EOF) {
--- 55,68 ----
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
! echo "<tr><th class=\"data left required\" width=\"70\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domname']), "</td></tr>\n";
! echo "<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 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 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 left required\">{$lang['strowner']}</th>\n";
echo "<td class=\"data1\"><select name=\"domowner\">";
while (!$users->EOF) {
***************
*** 102,106 ****
echo "<table>\n";
echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
! echo "<th class=\"data\">{$lang['strdefinition']}</th></tr>\n";
echo "<tr><td class=\"data1\"><input name=\"name\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"",
--- 102,106 ----
echo "<table>\n";
echo "<tr><th class=\"data\">{$lang['strname']}</th>\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=\"",
***************
*** 114,118 ****
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 "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
echo "</form>\n";
--- 114,118 ----
echo "<input type=\"hidden\" name=\"domain\" value=\"", htmlspecialchars($_REQUEST['domain']), "\" />\n";
echo $misc->form;
! 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";
***************
*** 156,161 ****
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 "</form>\n";
}
--- 156,161 ----
echo "<p><input type=\"checkbox\" name=\"cascade\" /> {$lang['strcascade']}</p>\n";
}
! echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
! echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
echo "</form>\n";
}
***************
*** 186,198 ****
$domaindata->f['domnotnull'] = $data->phpBool($domaindata->f['domnotnull']);
echo "<table>\n";
! echo "<tr><th class=\"data\" 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 "<td class=\"data1\">", $misc->printVal($domaindata->f['domtype']), "</td></tr>\n";
! echo "<tr><th class=\"data\">{$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 "<td class=\"data1\">", $misc->printVal($domaindata->f['domdef']), "</td></tr>\n";
! echo "<tr><th class=\"data\">{$lang['strowner']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domowner']), "</td></tr>\n";
echo "</table>\n";
--- 186,198 ----
$domaindata->f['domnotnull'] = $data->phpBool($domaindata->f['domnotnull']);
echo "<table>\n";
! echo "<tr><th class=\"data left\" width=\"70\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domname']), "</td></tr>\n";
! echo "<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 left\">{$lang['strnotnull']}</th>\n";
echo "<td class=\"data1\">", ($domaindata->f['domnotnull'] ? 'NOT NULL' : ''), "</td></tr>\n";
! echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domdef']), "</td></tr>\n";
! echo "<tr><th class=\"data left\">{$lang['strowner']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domowner']), "</td></tr>\n";
echo "</table>\n";
***************
*** 214,219 ****
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";
$domaincons->moveNext();
--- 214,219 ----
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";
$domaincons->moveNext();
***************
*** 229,235 ****
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']),
"\">{$lang['straddcheck']}</a>\n";
! echo "| <a class=\"navlink\" href=\"$PHP_SELF?action=alter&{$misc->href}&domain=",
urlencode($_REQUEST['domain']), "\">{$lang['stralter']}</a>\n";
}
--- 229,235 ----
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']),
"\">{$lang['straddcheck']}</a>\n";
! echo "| <a class=\"navlink\" href=\"$PHP_SELF?action=alter&{$misc->href}&domain=",
urlencode($_REQUEST['domain']), "\">{$lang['stralter']}</a>\n";
}
***************
*** 289,296 ****
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
! echo "<tr><th class=\"data\" 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 "<td class=\"data1\">\n";
// Output return type list
--- 289,296 ----
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
! echo "<tr><th class=\"data left required\" width=\"70\">{$lang['strname']}</th>\n";
echo "<td class=\"data1\"><input name=\"domname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['domname']), "\" /></td></tr>\n";
! echo "<tr><th class=\"data left required\">{$lang['strtype']}</th>\n";
echo "<td class=\"data1\">\n";
// Output return type list
***************
*** 304,315 ****
echo "</select>\n";
echo "</td></tr>\n";
! echo "<tr><th class=\"data\">{$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 "<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 "<td class=\"data1\">CHECK (<input name=\"domcheck\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
htmlspecialchars($_POST['domcheck']), "\" />)</td></tr>\n";
--- 304,315 ----
echo "</select>\n";
echo "</td></tr>\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 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 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";
***************
*** 368,373 ****
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 "</tr>\n";
$domains->moveNext();
--- 368,373 ----
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 "</tr>\n";
$domains->moveNext();
***************
*** 380,384 ****
}
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatedomain']}</a></p>\n";
}
--- 380,384 ----
}
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatedomain']}</a></p>\n";
}
***************
*** 396,400 ****
break;
case 'drop_con':
! if (isset($_POST['yes'])) doDropConstraint(false);
else doProperties();
break;
--- 396,400 ----
break;
case 'drop_con':
! if (isset($_POST['drop'])) doDropConstraint(false);
else doProperties();
break;
Index: functions.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/functions.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** functions.php 21 Dec 2003 02:03:15 -0000 1.25
--- functions.php 30 Dec 2003 03:09:29 -0000 1.26
***************
*** 52,59 ****
echo "<table width=\"90%\">\n";
echo "<tr>\n";
! echo "<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>\n";
echo "</tr>\n";
--- 52,59 ----
echo "<table width=\"90%\">\n";
echo "<tr>\n";
! echo "<th class=\"data required\">{$lang['strfunction']}</th>\n";
echo "<th class=\"data\">{$lang['strarguments']}</th>\n";
! echo "<th class=\"data required\">{$lang['strreturns']}</th>\n";
! echo "<th class=\"data required\">{$lang['strproglanguage']}</th>\n";
echo "</tr>\n";
***************
*** 80,84 ****
echo "</td>\n";
! echo "<tr><th class=\"data\" 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";
--- 80,84 ----
echo "</td>\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";
***************
*** 154,162 ****
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";
}
--- 154,162 ----
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";
}
***************
*** 219,226 ****
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['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\"><input name=\"formFunction\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"",
--- 219,226 ----
echo "<form action=\"$PHP_SELF\" method=post>\n";
echo "<table>\n";
! echo "<tr><th class=\"data required\">{$lang['strname']}</th>\n";
echo "<th class=\"data\">{$lang['strarguments']}</th>\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=\"",
***************
*** 261,265 ****
echo "</td></tr>\n";
! echo "<tr><th class=\"data\" 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";
--- 261,265 ----
echo "</td></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";
***************
*** 338,351 ****
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";
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";
}
else echo "<td></td>";
--- 338,351 ----
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";
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";
}
else echo "<td></td>";
***************
*** 361,365 ****
}
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatefunction']}</a></p>\n";
}
--- 361,365 ----
}
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatefunction']}</a></p>\n";
}
Index: privileges.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/privileges.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** privileges.php 17 Dec 2003 09:11:32 -0000 1.21
--- privileges.php 30 Dec 2003 03:09:29 -0000 1.22
***************
*** 49,53 ****
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
! echo "<tr><th class=\"data\">{$lang['strusers']}</th>\n";
echo "<td class=\"data1\"><select name=\"username[]\" multiple=\"multiple\" size=\"", min(6, $users->recordCount()), "\">\n";
while (!$users->EOF) {
--- 49,53 ----
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\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) {
***************
*** 58,62 ****
}
echo "</select></td></tr>\n";
! echo "<tr><th class=\"data\">{$lang['strgroups']}</th>\n";
echo "<td class=\"data1\">\n";
echo "<input type=\"checkbox\" name=\"public\"", (isset($_REQUEST['public']) ? ' selected="selected"' : ''), " />PUBLIC\n";
--- 58,62 ----
}
echo "</select></td></tr>\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";
***************
*** 73,77 ****
}
echo "</td></tr>\n";
! echo "<tr><th class=\"data\">{$lang['strprivileges']}</th>\n";
echo "<td class=\"data1\">\n";
foreach ($data->privlist[$_REQUEST['type']] as $v) {
--- 73,77 ----
}
echo "</td></tr>\n";
! echo "<tr><th class=\"data left required\">{$lang['strprivileges']}</th>\n";
echo "<td class=\"data1\">\n";
foreach ($data->privlist[$_REQUEST['type']] as $v) {
***************
*** 83,87 ****
// Grant option
if ($data->hasGrantOption()) {
! echo "<tr><th class=\"data\">{$lang['stroptions']}</th>\n";
echo "<td class=\"data1\">\n";
echo "<input type=\"checkbox\" name=\"grantoption\"",
--- 83,87 ----
// Grant option
if ($data->hasGrantOption()) {
! echo "<tr><th class=\"data left\">{$lang['stroptions']}</th>\n";
echo "<td class=\"data1\">\n";
echo "<input type=\"checkbox\" name=\"grantoption\"",
***************
*** 200,227 ****
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";
break;
case 'view':
! 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=",
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=",
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 "| <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=",
urlencode($_REQUEST['object']), "\">{$lang['stralterprivs']}</a>\n";
echo "| <a class=\"navlink\" href=\"database.php?database=", urlencode($_REQUEST['database']),
--- 200,227 ----
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";
break;
case 'view':
! 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=",
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=",
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 "| <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=",
urlencode($_REQUEST['object']), "\">{$lang['stralterprivs']}</a>\n";
echo "| <a class=\"navlink\" href=\"database.php?database=", urlencode($_REQUEST['database']),
Index: sequences.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/sequences.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** sequences.php 17 Dec 2003 09:11:32 -0000 1.16
--- sequences.php 30 Dec 2003 03:09:29 -0000 1.17
***************
*** 29,34 ****
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";
$i = 0;
--- 29,34 ----
if (is_object($sequences) && $sequences->recordCount() > 0) {
echo "<table>\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;
***************
*** 38,49 ****
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=",
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=",
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";
$sequences->movenext();
--- 38,49 ----
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=",
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=",
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";
$sequences->movenext();
***************
*** 56,60 ****
echo "<p>{$lang['strnosequences']}</p>\n";
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatesequence']}</a></p>\n";
}
--- 56,60 ----
echo "<p>{$lang['strnosequences']}</p>\n";
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatesequence']}</a></p>\n";
}
***************
*** 73,76 ****
--- 73,78 ----
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>";
***************
*** 93,102 ****
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 "</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 "<a class=\"navlink\" href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
}
--- 95,104 ----
echo "<td class=\"data1\">", $misc->printVal($sequence->f[$data->sqFields['logcount']]), "</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 "<a class=\"navlink\" href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
}
***************
*** 125,130 ****
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 "</form>\n";
}
--- 127,132 ----
echo "<p><input type=\"checkbox\" name=\"cascade\" /> {$lang['strcascade']}</p>\n";
}
! echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
! echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
echo "</form>\n";
}
***************
*** 157,177 ****
echo "<table>\n";
! echo "<tr><th class=\"data\">{$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 "<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 "<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 "<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 "<td class=\"data1\"><input name=\"formMaxValue\" size=\"5\" value=\"",
htmlspecialchars($_POST['formMaxValue']), "\" /></td></tr>\n";
--- 159,179 ----
echo "<table>\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 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 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 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 left\">{$lang['strmaxvalue']}</th>\n";
echo "<td class=\"data1\"><input name=\"formMaxValue\" size=\"5\" value=\"",
htmlspecialchars($_POST['formMaxValue']), "\" /></td></tr>\n";
***************
*** 181,189 ****
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 "</form>\n";
-
- echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}&sequence=", urlencode($_REQUEST['sequence']), "\">{$lang['strshowallsequences']}</a></p>\n";
}
--- 183,189 ----
echo $misc->form;
echo "<input type=\"hidden\" name=\"sequence\" value=\"", htmlspecialchars($_REQUEST['sequence']), "\" />\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";
}
***************
*** 231,235 ****
break;
case 'save_create_sequence':
! doSaveCreateSequence();
break;
case 'properties':
--- 231,236 ----
break;
case 'save_create_sequence':
! if (isset($_POST['create'])) doSaveCreateSequence();
! else doDefault();
break;
case 'properties':
***************
*** 237,241 ****
break;
case 'drop':
! if (isset($_POST['yes'])) doDrop(false);
else doDefault();
break;
--- 238,242 ----
break;
case 'drop':
! if (isset($_POST['drop'])) doDrop(false);
else doDefault();
break;
Index: types.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/types.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** types.php 21 Dec 2003 02:03:15 -0000 1.14
--- types.php 30 Dec 2003 03:09:29 -0000 1.15
***************
*** 21,43 ****
global $PHP_SELF, $lang;
! echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtypes']}: ", $misc->printVal($_REQUEST['type']), ": {$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 "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typname']]), "</td></tr>\n";
! echo "<tr><th class=\"data\">{$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 "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typout']]), "</td></tr>\n";
! echo "<tr><th class=\"data\">{$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 "<td class=\"data1\">", ($byval) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
! echo "<tr><th class=\"data\">{$lang['stralignment']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typalign']]), "</td></tr>\n";
echo "</table>\n";
--- 21,46 ----
global $PHP_SELF, $lang;
! // 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);
if ($typedata->recordCount() > 0) {
$byval = $data->phpBool($typedata->f[$data->typFields['typbyval']]);
echo "<table>\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 left\">{$lang['strinputfn']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typin']]), "</td></tr>\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 left\">{$lang['strlength']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typlen']]), "</td></tr>\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 left\">{$lang['stralignment']}</th>\n";
echo "<td class=\"data1\">", $misc->printVal($typedata->f[$data->typFields['typalign']]), "</td></tr>\n";
echo "</table>\n";
***************
*** 101,105 ****
// Retrieve all functions and types in the database
$funcs = &$data->getFunctions(true);
! $types = &$data->getTypes();
echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtypes']}: {$lang['strcreatetype']}</h2>\n";
--- 104,108 ----
// Retrieve all functions and types in the database
$funcs = &$data->getFunctions(true);
! $types = &$data->getTypes(true);
echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtypes']}: {$lang['strcreatetype']}</h2>\n";
***************
*** 108,115 ****
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=\"",
htmlspecialchars($_POST['typname']), "\" /></td></tr>\n";
! echo "<tr><th class=\"data\"><b>{$lang['strinputfn']}</b></th>\n";
echo "<td class=\"data1\"><select name=\"typin\">";
while (!$funcs->EOF) {
--- 111,118 ----
echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
echo "<table>\n";
! 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 left\">{$lang['strinputfn']}</th>\n";
echo "<td class=\"data1\"><select name=\"typin\">";
while (!$funcs->EOF) {
***************
*** 120,124 ****
}
echo "</select></td></tr>\n";
! echo "<tr><th class=\"data\"><b>{$lang['stroutputfn']}</b></th>\n";
echo "<td class=\"data1\"><select name=\"typout\">";
$funcs->moveFirst();
--- 123,127 ----
}
echo "</select></td></tr>\n";
! echo "<tr><th class=\"data left\">{$lang['stroutputfn']}</th>\n";
echo "<td class=\"data1\"><select name=\"typout\">";
$funcs->moveFirst();
***************
*** 130,140 ****
}
echo "</select></td></tr>\n";
! echo "<tr><th class=\"data\"><b>{$lang['strlength']}</b></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 "<td class=\"data1\"><input name=\"typdef\" size=\"8\" value=\"",
htmlspecialchars($_POST['typdef']), "\" /></td></tr>";
! echo "<tr><th class=\"data\">{$lang['strelement']}</th>\n";
echo "<td class=\"data1\"><select name=\"typelem\">";
echo "<option value=\"\"></option>\n";
--- 133,143 ----
}
echo "</select></td></tr>\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 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 left\">{$lang['strelement']}</th>\n";
echo "<td class=\"data1\"><select name=\"typelem\">";
echo "<option value=\"\"></option>\n";
***************
*** 146,156 ****
}
echo "</select></td></tr>\n";
! echo "<tr><th class=\"data\">{$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 "<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 "<td class=\"data1\"><select name=\"typalign\">";
foreach ($data->typAligns as $v) {
--- 149,159 ----
}
echo "</select></td></tr>\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 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 left\">{$lang['stralignment']}</th>\n";
echo "<td class=\"data1\"><select name=\"typalign\">";
foreach ($data->typAligns as $v) {
***************
*** 159,163 ****
}
echo "</select></td></tr>\n";
! echo "<tr><th class=\"data\">{$lang['strstorage']}</th>\n";
echo "<td class=\"data1\"><select name=\"typstorage\">";
foreach ($data->typStorages as $v) {
--- 162,166 ----
}
echo "</select></td></tr>\n";
! echo "<tr><th class=\"data left\">{$lang['strstorage']}</th>\n";
echo "<td class=\"data1\"><select name=\"typstorage\">";
foreach ($data->typStorages as $v) {
***************
*** 220,224 ****
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";
$i = 0;
while (!$types->EOF) {
--- 223,228 ----
if ($types->recordCount() > 0) {
echo "<table>\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) {
***************
*** 226,231 ****
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 "</tr>\n";
$types->moveNext();
--- 230,237 ----
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['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();
***************
*** 238,242 ****
}
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatetype']}</a></p>\n";
}
--- 244,248 ----
}
! echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreatetype']}</a></p>\n";
}
|