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

queries retained and displayed into the textearea when stripslashed one time more than required

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-08-04 10:59:46 +00:00
parent db5b847af1
commit e0005ba190
1 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
db_details.php3
View File

@@ -129,17 +129,19 @@ else if (MYSQL_MAJOR_VERSION >= 3.23 && isset($tbl_cache)) {
</td> </td>
<?php <?php
echo "\n"; echo "\n";
$mergetable=false; $mergetable = FALSE;
$nonisam=false; $nonisam = FALSE;
if (isset($sts_data['Type'])) { if (isset($sts_data['Type'])) {
if ($sts_data['Type']=="MRG_MyISAM") $mergetable=true; if ($sts_data['Type'] == 'MRG_MyISAM') {
else if (!eregi("ISAM|HEAP", $sts_data['Type'])) $nonisam=true; $mergetable = TRUE;
} else if (!eregi('ISAM|HEAP', $sts_data['Type'])) {
$nonisam = TRUE;
}
} }
if (isset($sts_data['Rows'])) if (isset($sts_data['Rows'])) {
{ if ($mergetable == FALSE) {
if ($mergetable == false){ if ($nonisam == FALSE) {
if ($nonisam == false){
$tblsize = $sts_data['Data_length'] + $sts_data['Index_length']; $tblsize = $sts_data['Data_length'] + $sts_data['Index_length'];
$sum_size += $tblsize; $sum_size += $tblsize;
if ($tblsize > 0) { if ($tblsize > 0) {
@@ -147,23 +149,22 @@ else if (MYSQL_MAJOR_VERSION >= 3.23 && isset($tbl_cache)) {
} else { } else {
list($formated_size, $unit) = format_byte_down($tblsize, 3, 0); list($formated_size, $unit) = format_byte_down($tblsize, 3, 0);
} }
} else {
$formated_size = '&nbsp;-&nbsp;';
$unit = '';
} }
else { if (isset($sts_data['Rows'])) {
$formated_size="&nbsp;-&nbsp;"; $sum_entries += $sts_data['Rows'];
$unit="";
} }
if (isset($sts_data['Rows'])) $sum_entries += $sts_data['Rows'];
} }
// MyISAM MERGE Table // MyISAM MERGE Table
else if ($mergetable == true) else if ($mergetable == TRUE) {
{ $formated_size = '&nbsp;-&nbsp;';
$formated_size="&nbsp;-&nbsp;"; $unit = '';
$unit="";
} }
else else {
{ $formated_size = 'unknown';
$formated_size="unknown"; $unit = '';
$unit="";
} }
?> ?>
<td align="right"> <td align="right">
@@ -288,9 +289,10 @@ $url_query = 'lang=' . $lang
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&goto=db_details.php3'; . '&goto=db_details.php3';
if (isset($show_query)) { if (isset($show_query)) {
if (get_magic_quotes_gpc()) { // loic1: Not required since already done in db_readdump.php3 (see lines 72 & 117)
$sql_query = stripslashes($sql_query); // if (get_magic_quotes_gpc()) {
} // $sql_query = stripslashes($sql_query);
// }
$query_to_display = (($show_query == 'y') ? $sql_query : ''); $query_to_display = (($show_query == 'y') ? $sql_query : '');
} }
?> ?>