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

bug #2687046 [export] Structure export: Null always YES

Browse Source
This commit is contained in:
Herman van Rink
2009-04-14 13:34:20 +00:00
parent 4701cbcf17
commit 82f8082c2c
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -27,6 +27,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2740550 [interface] Using textarea CharEditing drops default values - bug #2740550 [interface] Using textarea CharEditing drops default values
- bug #2634827 [import] Using DELIMITER ends with infinite cycle - bug #2634827 [import] Using DELIMITER ends with infinite cycle
- bug #2729191 [config] CheckConfigurationPermissions = false is worthless - bug #2729191 [config] CheckConfigurationPermissions = false is worthless
- bug #2687046 [export] Structure export: Null always YES
3.1.3.1 (2009-03-24) 3.1.3.1 (2009-03-24)
- [security] HTTP Response Splitting and file inclusion vulnerabilities - [security] HTTP Response Splitting and file inclusion vulnerabilities

4
libraries/export/htmlword.php
View File

@@ -299,7 +299,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$strAttribute = 'UNSIGNED ZEROFILL'; $strAttribute = 'UNSIGNED ZEROFILL';
} }
if (!isset($row['Default'])) { if (!isset($row['Default'])) {
if ($row['Null'] != '') { if ($row['Null'] != 'NO') {
$row['Default'] = 'NULL'; $row['Default'] = 'NULL';
} }
} else { } else {
@@ -318,7 +318,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
} }
$schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($row['Field']) . $fmt_post . '</td>'; $schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($row['Field']) . $fmt_post . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>'; $schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars($row['Null'] == '' ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . '</td>'; $schema_insert .= '<td class="print">' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars(isset($row['Default']) ? $row['Default'] : '') . '</td>'; $schema_insert .= '<td class="print">' . htmlspecialchars(isset($row['Default']) ? $row['Default'] : '') . '</td>';
$field_name = $row['Field']; $field_name = $row['Field'];

6
libraries/export/latex.php
View File

@@ -416,7 +416,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$zerofill = preg_match('/ZEROFILL/i', $row['Type']); $zerofill = preg_match('/ZEROFILL/i', $row['Type']);
} }
if (!isset($row['Default'])) { if (!isset($row['Default'])) {
if ($row['Null'] != '') { if ($row['Null'] != 'NO') {
$row['Default'] = 'NULL'; $row['Default'] = 'NULL';
} }
} else { } else {
@@ -425,7 +425,9 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$field_name = $row['Field']; $field_name = $row['Field'];
$local_buffer = $field_name . "\000" . $type . "\000" . (($row['Null'] == '') ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . "\000" . (isset($row['Default']) ? $row['Default'] : ''); $local_buffer = $field_name . "\000" . $type . "\000"
. (($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes'])
. "\000" . (isset($row['Default']) ? $row['Default'] : '');
if ($do_relation && $have_rel) { if ($do_relation && $have_rel) {
$local_buffer .= "\000"; $local_buffer .= "\000";

4
libraries/export/odt.php
View File

@@ -355,7 +355,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
. '<text:p>' . htmlspecialchars($type) . '</text:p>' . '<text:p>' . htmlspecialchars($type) . '</text:p>'
. '</table:table-cell>'; . '</table:table-cell>';
if (!isset($row['Default'])) { if (!isset($row['Default'])) {
if ($row['Null'] != '') { if ($row['Null'] != 'NO') {
$row['Default'] = 'NULL'; $row['Default'] = 'NULL';
} else { } else {
$row['Default'] = ''; $row['Default'] = '';
@@ -364,7 +364,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$row['Default'] = $row['Default']; $row['Default'] = $row['Default'];
} }
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars(($row['Null'] == '') ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . '</text:p>' . '<text:p>' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . '</text:p>'
. '</table:table-cell>'; . '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($row['Default']) . '</text:p>' . '<text:p>' . htmlspecialchars($row['Default']) . '</text:p>'

4
libraries/export/texytext.php
View File

@@ -287,7 +287,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$strAttribute = 'UNSIGNED ZEROFILL'; $strAttribute = 'UNSIGNED ZEROFILL';
} }
if (!isset($row['Default'])) { if (!isset($row['Default'])) {
if ($row['Null'] != '') { if ($row['Null'] != 'NO') {
$row['Default'] = 'NULL'; $row['Default'] = 'NULL';
} }
} else { } else {
@@ -306,7 +306,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
} }
$text_output .= '|' . $fmt_pre . htmlspecialchars($row['Field']) . $fmt_post; $text_output .= '|' . $fmt_pre . htmlspecialchars($row['Field']) . $fmt_post;
$text_output .= '|' . htmlspecialchars($type); $text_output .= '|' . htmlspecialchars($type);
$text_output .= '|' . htmlspecialchars($row['Null'] == '' ? $GLOBALS['strNo'] : $GLOBALS['strYes']); $text_output .= '|' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes']);
$text_output .= '|' . htmlspecialchars(isset($row['Default']) ? $row['Default'] : ''); $text_output .= '|' . htmlspecialchars(isset($row['Default']) ? $row['Default'] : '');
$field_name = $row['Field']; $field_name = $row['Field'];