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

from Loic

Browse Source
This commit is contained in:
Marc Delisle
2002-08-05 20:06:09 +00:00
parent 266adfda81
commit 3513a3fe2f
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-08-05 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_indexes.php3, ldi_check.php3, libraries/sqlparser.lib.php3:
coding standard
2002-08-05 Alexander M. Turek <rabus@users.sourceforge.net> 2002-08-05 Alexander M. Turek <rabus@users.sourceforge.net>
* translators.html: Added a small note in order to avoid annoying emails. * translators.html: Added a small note in order to avoid annoying emails.
* lang/slovenian-*.inc.php3: Updates, thanks again to Kositer Uros (urosh). * lang/slovenian-*.inc.php3: Updates, thanks again to Kositer Uros (urosh).

10
ldi_check.php3
View File

@@ -29,8 +29,9 @@ if (isset($btnLDI) && ($textfile != 'none')) {
$replace = ''; $replace = '';
} }
error_reporting(E_ALL); error_reporting(E_ALL);
chmod($textfile, 0644); chmod($textfile, 0644);
// Kanji encoding convert appended by Y.Kawada // Kanji encoding convert appended by Y.Kawada
if (function_exists('PMA_kanji_file_conv')) { if (function_exists('PMA_kanji_file_conv')) {
$textfile = PMA_kanji_file_conv($textfile, $knjenc, isset($xkana) ? $xkana : ''); $textfile = PMA_kanji_file_conv($textfile, $knjenc, isset($xkana) ? $xkana : '');
@@ -93,13 +94,14 @@ chmod($textfile, 0644);
} else { } else {
$sql_query = $query; $sql_query = $query;
} }
// Set an empty sub_part to avoid an undefined variable.
// Set an empty sub_part to avoid an undefined variable.
// We could also rename the ldi* scripts // We could also rename the ldi* scripts
// to tbl_properties_ldi* to improve consistency with the other sub-pages. // to tbl_properties_ldi* to improve consistency with the other sub-pages.
// //
// The $goto in ldi_table.php3 is set to tbl_properties.php3 but maybe // The $goto in ldi_table.php3 is set to tbl_properties.php3 but maybe
// if would be better to Browse the latest inserted data. // if would be better to Browse the latest inserted data.
$sub_part=''; $sub_part = '';
include('./sql.php3'); include('./sql.php3');
} }

4
libraries/sqlparser.lib.php3
View File

@@ -180,10 +180,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// Checks for MySQL escaping using a \ // Checks for MySQL escaping using a \
// And checks for ANSI escaping using the $quotetype character // And checks for ANSI escaping using the $quotetype character
if ( ($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) { if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) {
$pos ++; $pos ++;
continue; continue;
} else if ( ($pos+1 < $len) && ($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) { } else if (($pos + 1 < $len) && ($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) {
$pos = $pos + 2; $pos = $pos + 2;
continue; continue;
} else { } else {

9
tbl_indexes.php3
View File

@@ -1,6 +1,7 @@
<?php <?php
/* $Id$ */ /* $Id$ */
/** /**
* Gets some core libraries * Gets some core libraries
*/ */
@@ -180,9 +181,9 @@ if (!defined('PMA_IDX_INCLUDED')
PMA_mysqlDie($strCantRenameIdxToPrimary, '', FALSE, $err_url); PMA_mysqlDie($strCantRenameIdxToPrimary, '', FALSE, $err_url);
} }
// $sql_query is the one displayed in the query box, don't use it when
// you need to generate a query in this script
// $sql_query is the one displayed in the query box, don't use it when you
// need to generate a query in this script
$local_query = 'ALTER TABLE ' . PMA_backquote($table); $local_query = 'ALTER TABLE ' . PMA_backquote($table);
// Drops the old index // Drops the old index
@@ -190,7 +191,7 @@ if (!defined('PMA_IDX_INCLUDED')
if ($old_index == 'PRIMARY') { if ($old_index == 'PRIMARY') {
$local_query .= ' DROP PRIMARY KEY,'; $local_query .= ' DROP PRIMARY KEY,';
} else { } else {
$local_query .= ' DROP INDEX ' . PMA_backquote($old_index) .','; $local_query .= ' DROP INDEX ' . PMA_backquote($old_index) .',';
} }
} // end if } // end if
@@ -223,7 +224,7 @@ if (!defined('PMA_IDX_INCLUDED')
$local_query .= $index_fields . ')'; $local_query .= $index_fields . ')';
} }
$result = PMA_mysql_query($local_query) or PMA_mysqlDie('', '', FALSE, $err_url); $result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, $err_url);
$message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered; $message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered;
include('./tbl_properties.php3'); include('./tbl_properties.php3');