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

sorry, wrong version checked in

Browse Source
This commit is contained in:
Sebastian Mendel
2005-11-20 11:52:17 +00:00
parent 55662d7c88
commit 29ddb36e9a
1 changed files with 31 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
libraries/common.lib.php
View File

@@ -730,88 +730,33 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
// 2005-01-17 modified by mkkeck bugfix // 2005-01-17 modified by mkkeck bugfix
if (substr($error_message, 1, 4) == '1062') { if (substr($error_message, 1, 4) == '1062') {
// get the duplicate entry // get the duplicate entry
$no_duplicate_view = false;
// get table name // get table name
if ( preg_match( '<27>(ALTER|UPDATE|INSERT|CREATE)[^\`]*\s\`([^\`]+)\`<60>iu', $the_query, $error_table = array() ) ) { preg_match( '<27>ALTER\sTABLE\s\`([^\`]+)\`<60>iu', $the_query, $error_table = array() );
$error_statement = $error_table[1]; $error_table = $error_table[1];
$error_table = $error_table[2];
// get fields
// duplicate value preg_match( '<27>\(([^\)]+)\)<29>i', $the_query, $error_fields = array() );
preg_match( '<27>\'([^\']+)\'<27>i', $tmp_mysql_error, $duplicate_value = array() ); $error_fields = explode( ',', $error_fields[1] );
$duplicate_value = $duplicate_value[1];
// duplicate value
// get fields from statement preg_match( '<27>\'([^\']+)\'<27>i', $tmp_mysql_error, $duplicate_value = array() );
if ( $error_statement === 'UPDATE' ) { $duplicate_value = $duplicate_value[1];
preg_match_all( '<27>(?:SET|,)\s*(?:\`)?([^\`]*)(?:\`)?\s*=\s*(\'|\"|\`)?([^\\2]*\\2|[^\s]+)<29>i', $the_query, $founds = array() );
print_r( $founds ); $sql = '
$error_fields = $founds[1]; SELECT *
foreach ( $founds[2] as $value ) { FROM ' . PMA_backquote( $error_table ) . '
if ( substr( $value, 0, 1 ) !== "'" WHERE CONCAT_WS( "-", ' . implode( ', ', $error_fields ) . ' )
&& substr( $value, 0, 1 ) !== '"' = "' . PMA_sqlAddslashes( $duplicate_value ) . '"
&& ! is_numeric( $value ) ) ORDER BY ' . implode( ', ', $error_fields );
{ unset( $error_table, $error_fields, $duplicate_value );
// value is a field name or function
// TODO hanlde fieldname or function here echo ' <form method="post" action="import.php" style="padding: 0; margin: 0">' ."\n"
$no_duplicate_view = true; .' <input type="hidden" name="sql_query" value="' . htmlentities( $sql ) . '" />' . "\n"
} else { .' ' . PMA_generate_common_hidden_inputs($db, $table) . "\n"
$duplicate_value = trim( $value ) . '-'; .' <input type="submit" name="submit" value="' . $GLOBALS['strBrowse'] . '" />' . "\n"
} .' </form>' . "\n";
} unset( $sql );
unset( $founds );
}
if ( $error_statement !== 'ALTER' ) {
// no alter statement
// we need the fields in the affected index
// and the statement
$index_fields = array();
// get fields from index
require_once './libraries/tbl_indexes.lib.php';
// get affected index number
preg_match( '<27>\s([0-9]+)(?:\s|$)<29>', $error_message, $index_number = array() );
$index_number = $index_number[1];
// get indexes
if (!defined('PMA_IDX_INCLUDED')) {
$ret_keys = PMA_get_indexes( $error_table, 'db_details.php?' . PMA_generate_common_url( $db ) );
}
PMA_extract_indexes( $ret_keys, $indexes = array(),
$indexes_info = array(), $indexes_data = array() );
$array_keys = array_keys($indexes_data);
foreach ( $indexes_data[$array_keys[$index_number]] as $index_part ) {
foreach ( $index_part as $col_name ) {
$index_fields[] = '`' . $col_name . '`';
}
}
$error_fields = array_intersect( $error_fields, $index_fields );
unset( $array_keys, $index_number, $indexes_data,
$indexes_info, $indexes, $ret_keys, $index_fields );
}
$sql = '
SELECT *
FROM ' . PMA_backquote( $error_table ) . '
WHERE CONCAT_WS( \'-\', ' . implode( ', ', $error_fields ) . ' )
= \'' . PMA_sqlAddslashes( $duplicate_value ) . '\'
ORDER BY ' . implode( ', ', $error_fields );
unset( $error_table, $error_fields, $duplicate_value );
echo ' <form method="post" action="import.php" style="padding: 0; margin: 0">' ."\n"
.' <input type="hidden" name="sql_query" value="' . htmlentities( $sql ) . '" />' . "\n"
.' ' . PMA_generate_common_hidden_inputs($db, $table) . "\n"
.' <input type="submit" name="submit" value="' . $GLOBALS['strBrowse'] . '" />' . "\n"
.' </form>' . "\n";
unset( $sql );
}
} // end of show duplicate entry } // end of show duplicate entry
echo '</div>'; echo '</div>';
@@ -1979,7 +1924,8 @@ if (typeof(window.parent) != 'undefined'
$tooltip .= '(' . PMA_formatNumber( $tbl_status['Rows'], 0 ) . ' ' . $GLOBALS['strRows'] . ')'; $tooltip .= '(' . PMA_formatNumber( $tbl_status['Rows'], 0 ) . ' ' . $GLOBALS['strRows'] . ')';
PMA_DBI_free_result($result); PMA_DBI_free_result($result);
$uni_tbl = PMA_jsFormat( $GLOBALS['db'] . '.' . $GLOBALS['table'], false ); $uni_tbl = PMA_jsFormat( $GLOBALS['db'] . '.' . $GLOBALS['table'], false );
?> echo "\n";
?>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFormat($tooltip, false); ?>' ); window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFormat($tooltip, false); ?>' );
@@ -1987,7 +1933,7 @@ window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFor
</script> </script>
<?php <?php
} // end if } // end if
} // end if } // end if... else if
// Checks if the table needs to be repaired after a TRUNCATE query. // Checks if the table needs to be repaired after a TRUNCATE query.
if (isset($GLOBALS['table']) && isset($GLOBALS['sql_query']) if (isset($GLOBALS['table']) && isset($GLOBALS['sql_query'])
@@ -2229,18 +2175,6 @@ window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFor
if (!empty($GLOBALS['show_as_php'])) { if (!empty($GLOBALS['show_as_php'])) {
echo '\';'; echo '\';';
} }
$warnings = PMA_DBI_get_warnings();
if ( count( $warnings ) > 0 ) {
echo ' <strong>' . $GLOBALS['strMySQLSaid'] . '</strong>'
.PMA_showMySQLDocu('Error-returns', 'Error-returns');
foreach ( $warnings as $warning ) {
echo '<div class="' . $warning['Level'] . '">'
.'#' . $warning['Code'] . ' - ' . $warning['Message']
.'</div>';
}
}
echo '</fieldset>' . "\n"; echo '</fieldset>' . "\n";
if ( ! empty( $edit_target ) ) { if ( ! empty( $edit_target ) ) {
@@ -2642,8 +2576,8 @@ window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFor
. ' value="' . htmlspecialchars($message) . '" />'; . ' value="' . htmlspecialchars($message) . '" />';
} else { } else {
$ret .= '<input type="image"' . $submit_name . ' ' . implode( ' ', $tag_params_strings ) $ret .= '<input type="image"' . $submit_name . ' ' . implode( ' ', $tag_params_strings )
. ' src="' . preg_replace('<27>^.*\ssrc="([^"]*)".*$<24>si', '\1', $message) . '"' . ' src="' . preg_replace('<27>^.*\ssrc="([^"]*)".*$<24>si', '\1', $message) . '"'
. ' value="' . htmlspecialchars(preg_replace('<27>^.*\salt="([^"]*)".*$<24>si', '\1', $message)) . '" />'; . ' value="' . htmlspecialchars(preg_replace('<27>^.*\salt="([^"]*)".*$<24>si', '\1', $message)) . '" />';
} }
} else { } else {
$message = trim( strip_tags( $message ) ); $message = trim( strip_tags( $message ) );