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

remove some warnings in higher errorlevel

Browse Source
This commit is contained in:
Steve Alberty
2001-08-03 11:13:32 +00:00
parent 08c1bc655e
commit a2c3b25977
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-08-02 Steve Alberty <alberty@neptunlabs.de>
* tbl_properties.php3, db_details.php3: fixed problem with table
size display and MERGE tables
* tbl_qbe.php3: remove some warnings in higher errorlevel
2001-08-03 Olivier M<>ller <om@omnis.ch> 2001-08-03 Olivier M<>ller <om@omnis.ch>
* Generated Documentation.txt based on Documentation.html * Generated Documentation.txt based on Documentation.html
(not everybody is having a webbrowser on their servers... :) (not everybody is having a webbrowser on their servers... :)

36
tbl_qbe.php3
View File

@@ -326,10 +326,12 @@ for ($x = 0; $x < $col; $x++) {
if (isset($DelCol[$x]) && $DelCol[$x] == 'on') { if (isset($DelCol[$x]) && $DelCol[$x] == 'on') {
continue; continue;
} }
if (get_magic_quotes_gpc()) { if (isset($Criteria[$x])){
$stripped_Criteria = stripslashes($Criteria[$x]); if (get_magic_quotes_gpc()) {
} else { $stripped_Criteria = stripslashes($Criteria[$x]);
$stripped_Criteria = $Criteria[$x]; } else {
$stripped_Criteria = $Criteria[$x];
}
} }
if (!isset($prev_Criteria[$x]) if (!isset($prev_Criteria[$x])
|| urldecode($prev_Criteria[$x]) != htmlspecialchars($stripped_Criteria)) { || urldecode($prev_Criteria[$x]) != htmlspecialchars($stripped_Criteria)) {
@@ -356,7 +358,7 @@ for ($x = 0; $x < $col; $x++) {
$w = 0; $w = 0;
for ($y = 0; $y <= $row; $y++) { for ($y = 0; $y <= $row; $y++) {
$bgcolor = ($y % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; $bgcolor = ($y % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo;
if ($InsRow[$y] == 'on') { if (isset ($InsRow[$y]) && $InsRow[$y] == 'on') {
$chk['or'] = ' checked="checked"'; $chk['or'] = ' checked="checked"';
$chk['and'] = ''; $chk['and'] = '';
?> ?>
@@ -425,12 +427,13 @@ for ($y = 0; $y <= $row; $y++) {
<?php <?php
} // end if } // end if
if ($DelRow[$y] == 'on') { if (isset($DelRow[$y]) && $DelRow[$y] == 'on') {
continue; continue;
} }
$curAndOrRow[$w] = $AndOrRow[$y];
if($AndOrRow[$y] == 'and') { if (isset($AndOrRow[$y])) $curAndOrRow[$w] = $AndOrRow[$y];
if (isset($AndOrRow[$y]) && $AndOrRow[$y] == 'and') {
$chk['and'] = ' checked="checked"'; $chk['and'] = ' checked="checked"';
$chk['or'] = ''; $chk['or'] = '';
} else { } else {
@@ -491,17 +494,20 @@ for ($y = 0; $y <= $row; $y++) {
if (!isset(${$or})) { if (!isset(${$or})) {
${$or} = ''; ${$or} = '';
} }
if (get_magic_quotes_gpc()) { if (isset(${$or}[$x])){
$stripped_or = stripslashes(${$or}[$x]); if (get_magic_quotes_gpc()) {
} else { $stripped_or = stripslashes(${$or}[$x]);
$stripped_or = ${$or}[$x]; } else {
} $stripped_or = ${$or}[$x];
}
}
else $stripped_or="";
?> ?>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center" bgcolor="<?php echo $bgcolor; ?>">
<textarea cols="20" rows="2" style="width: <?php echo $widem; ?>" name="Or<?php echo $w . '[' . $z . ']'; ?>"><?php echo htmlspecialchars($stripped_or); ?></textarea> <textarea cols="20" rows="2" style="width: <?php echo $widem; ?>" name="Or<?php echo $w . '[' . $z . ']'; ?>"><?php echo htmlspecialchars($stripped_or); ?></textarea>
</td> </td>
<?php <?php
${'cur' . $or}[$z] = ${$or}[$x]; if (isset(${$or}[$x])) ${'cur' . $or}[$z] = ${$or}[$x];
$z++; $z++;
} // end for } // end for
$w++; $w++;
@@ -551,7 +557,7 @@ for ($x = 0; $x < $col; $x++) {
continue; continue;
} }
$curAndOrCol[$z] = $AndOrCol[$y]; if (isset($AndOrCol[$y])) $curAndOrCol[$z] = $AndOrCol[$y];
if (isset($AndOrCol[$z]) && $AndOrCol[$z] == 'or') { if (isset($AndOrCol[$z]) && $AndOrCol[$z] == 'or') {
$chk['or'] = ' checked="checked"'; $chk['or'] = ' checked="checked"';
$chk['and'] = ''; $chk['and'] = '';