nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

for Loic

Browse Source
This commit is contained in:
Marc Delisle
2002-09-23 16:02:38 +00:00
parent a4cd759845
commit a1f45b7b78
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,8 +5,8 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-09-22 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-09-23 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* libraries/sqlparser.lib.php3: coding standards * libraries/display_tbl.lib.php3, tbl_change.php3: coding standards
2002-09-23 Michal Cihar <nijel@users.sourceforge.net> 2002-09-23 Michal Cihar <nijel@users.sourceforge.net>
* libraries/sqlparser.lib.php3: fix for #613102 (ALTER TABLE:missing * libraries/sqlparser.lib.php3: fix for #613102 (ALTER TABLE:missing
@@ -14,6 +14,7 @@ $Source$
2002-09-22 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-09-22 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_relation.php3: fix fox #611519 (slash in comment) * tbl_relation.php3: fix fox #611519 (slash in comment)
* libraries/sqlparser.lib.php3: coding standards
2002-09-21 Alexander M. Turek <rabus@users.sourceforge.net> 2002-09-21 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/german-*.inc.php3: Updates. * lang/german-*.inc.php3: Updates.

28
libraries/display_tbl.lib.php3
View File

@@ -718,26 +718,26 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
function PMA_linkOrButton($url, $message, $js_conf) function PMA_linkOrButton($url, $message, $js_conf)
{ {
if (strlen($url) <= 2047) { if (strlen($url) <= 2047) {
$onclick_url = (empty($js_conf) ? '' : ' onclick="return confirmLink(this, \'' . $js_conf . '\')"'); $onclick_url = (empty($js_conf) ? '' : ' onclick="return confirmLink(this, \'' . $js_conf . '\')"');
$linkOrButton = ' <a href="' . $url . '"' . $onclick_url . '>' . "\n" $link_or_button = ' <a href="' . $url . '"' . $onclick_url . '>' . "\n"
. ' ' . $message . '</a>' . "\n"; . ' ' . $message . '</a>' . "\n";
} }
else { else {
$edit_url_parts = parse_url($url); $edit_url_parts = parse_url($url);
$query_parts = explode('&', $edit_url_parts['query']); $query_parts = explode('&', $edit_url_parts['query']);
$linkOrButton = ' <form action="' $link_or_button = ' <form action="'
. $edit_url_parts['path'] . $edit_url_parts['path']
. '" method="post">' . "\n"; . '" method="post">' . "\n";
reset ($query_parts); reset ($query_parts);
while (list(, $query_pair) = each ($query_parts)) { while (list(, $query_pair) = each($query_parts)) {
list($eachvar, $eachval) = explode('=', $query_pair); list($eachvar, $eachval) = explode('=', $query_pair);
$linkOrButton .= ' <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . urldecode($eachval) . '" />' . "\n"; $link_or_button .= ' <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . urldecode($eachval) . '" />' . "\n";
} // end while } // end while
$linkOrButton .= ' <input type="submit" value="' $link_or_button .= ' <input type="submit" value="'
. $message . '" />' . "\n" . '</form>' . "\n"; . $message . '" />' . "\n" . '</form>' . "\n";
} // end if... else... } // end if... else...
return $linkOrButton; return $link_or_button;
} // end of the 'PMA_linkOrButton()' function } // end of the 'PMA_linkOrButton()' function
@@ -1188,7 +1188,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
if (isset($edit_url)) { if (isset($edit_url)) {
$vertical_display['edit'][$row_no] .= ' <td bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['edit'][$row_no] .= ' <td bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '') . PMA_linkOrButton($edit_url, $edit_str, '')
. ' </td>' . "\n"; . ' </td>' . "\n";
} }

14
tbl_change.php3
View File

@@ -223,7 +223,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
// lem9: but do not put here the current datetime if there is a default // lem9: but do not put here the current datetime if there is a default
// value (the real default value will be set in the // value (the real default value will be set in the
// Default value logic below) // Default value logic below)
if (($row_table_def['Type'] == 'datetime') if ($row_table_def['Type'] == 'datetime'
&& (!isset($row_table_def['Default']))) { && (!isset($row_table_def['Default']))) {
// INSERT case // INSERT case
if ($insert_mode) { if ($insert_mode) {
@@ -429,16 +429,16 @@ for ($i = 0; $i < $fields_cnt; $i++) {
if (isset($disp) && $disp) { if (isset($disp) && $disp) {
?> ?>
<td bgcolor="<?php echo $bgcolor; ?>"> <td bgcolor="<?php echo $bgcolor; ?>">
<?php echo $backup_field . "\n"; ?> <?php echo $backup_field . "\n"; ?>
<input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="$foreign$" tabindex="<?php echo $i+1; ?>" /> <input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="$foreign$" tabindex="<?php echo $i+1; ?>" />
<select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo $i+1; ?>"> <select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo $i+1; ?>">
<option value=""></option> <option value=""></option>
<?php <?php
echo "\n";
while ($relrow = @PMA_mysql_fetch_array($disp)) { while ($relrow = @PMA_mysql_fetch_array($disp)) {
$key = $relrow[$foreign_field]; $key = $relrow[$foreign_field];
$value = (($foreign_display != FALSE) ? '&nbsp;-&nbsp;' . htmlspecialchars($relrow[$foreign_display]) : ''); $value = (($foreign_display != FALSE) ? '&nbsp;-&nbsp;' . htmlspecialchars($relrow[$foreign_display]) : '');
echo ' <option value="' . htmlspecialchars($key) . '"'; echo ' <option value="' . htmlspecialchars($key) . '"';
if ($key == $data) { if ($key == $data) {
echo ' selected="selected"'; echo ' selected="selected"';
} // end if } // end if