Skip to content

Commit

Permalink
bug #644526
Browse files Browse the repository at this point in the history
  • Loading branch information
derrabus committed Nov 28, 2002
1 parent b2656d8 commit 84a657d
Show file tree
Hide file tree
Showing 97 changed files with 327 additions and 138 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Expand Up @@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$
$Source$

2002-11-28 Alexander M. Turek <rabus@users.sourceforge.net>
* db_datadict.php3, db_details_structure.php3, db_printview.php3,
db_stats.php3, tbl_printview.php3, tbl_properties_structure.php3,
lang/*.inc.php3: Fixed bug #644526 (ucfirst php function causes trouble).
* lang/german-*.inc.php3: Clarification.

2002-11-27 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php3: bug 644030 part 1: syntax error
on a REVOKE
Expand Down
16 changes: 8 additions & 8 deletions db_datadict.php3
Expand Up @@ -165,19 +165,19 @@ while ($row = mysql_fetch_array($rowset)) {
<!-- TABLE INFORMATIONS -->
<table width="100%" bordercolorlight="black" border="border" style="border-collapse: collapse;background-color: white">
<tr>
<th width="50"><?php echo ucfirst($strField); ?></th>
<th width="50"><?php echo ucfirst($strType); ?></th>
<!--<th width="50"><?php echo ucfirst($strAttr); ?></th>-->
<th width="50"><?php echo ucfirst($strNull); ?></th>
<th width="50"><?php echo ucfirst($strDefault); ?></th>
<!--<th width="50"><?php echo ucfirst($strExtra); ?></th>-->
<th width="50"><?php echo $strField; ?></th>
<th width="50"><?php echo $strType; ?></th>
<!--<th width="50"><?php echo $strAttr; ?></th>-->
<th width="50"><?php echo $strNull; ?></th>
<th width="50"><?php echo $strDefault; ?></th>
<!--<th width="50"><?php echo $strExtra; ?></th>-->
<?php
echo "\n";
if ($have_rel) {
echo ' <th width="50">' . ucfirst($strLinksTo) . '</th>' . "\n";
echo ' <th width="50">' . $strLinksTo . '</th>' . "\n";
}
if ($cfgRelation['commwork']) {
echo ' <th width="400">' . ucfirst($strComments) . '</th>' . "\n";
echo ' <th width="400">' . $strComments . '</th>' . "\n";
}
?>
</tr>
Expand Down
16 changes: 8 additions & 8 deletions db_details_structure.php3
Expand Up @@ -58,13 +58,13 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
<table border="<?php echo $cfg['Border']; ?>">
<tr>
<td></td>
<th>&nbsp;<?php echo ucfirst($strTable); ?>&nbsp;</th>
<th colspan="6"><?php echo ucfirst($strAction); ?></th>
<th><?php echo ucfirst($strRecords); ?></th>
<th><?php echo ucfirst($strType); ?></th>
<th>&nbsp;<?php echo $strTable; ?>&nbsp;</th>
<th colspan="6"><?php echo $strAction; ?></th>
<th><?php echo $strRecords; ?></th>
<th><?php echo $strType; ?></th>
<?php
if ($cfg['ShowStats']) {
echo '<th>' . ucfirst($strSize) . '</th>';
echo '<th>' . $strSize . '</th>';
}
echo "\n";
?>
Expand Down Expand Up @@ -334,9 +334,9 @@ else {
<table border="<?php echo $cfg['Border']; ?>">
<tr>
<td></td>
<th>&nbsp;<?php echo ucfirst($strTable); ?>&nbsp;</th>
<th colspan="6"><?php echo ucfirst($strAction); ?></th>
<th><?php echo ucfirst($strRecords); ?></th>
<th>&nbsp;<?php echo $strTable; ?>&nbsp;</th>
<th colspan="6"><?php echo $strAction; ?></th>
<th><?php echo $strRecords; ?></th>
</tr>
<?php
$checked = (!empty($checkall) ? ' checked="checked"' : '');
Expand Down
12 changes: 6 additions & 6 deletions db_printview.php3
Expand Up @@ -97,12 +97,12 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
<!-- The tables list -->
<table border="<?php echo $cfg['Border']; ?>">
<tr>
<th>&nbsp;<?php echo ucfirst($strTable); ?>&nbsp;</th>
<th><?php echo ucfirst($strRecords); ?></th>
<th><?php echo ucfirst($strType); ?></th>
<th>&nbsp;<?php echo $strTable; ?>&nbsp;</th>
<th><?php echo $strRecords; ?></th>
<th><?php echo $strType; ?></th>
<?php
if ($cfg['ShowStats']) {
echo '<th>' . ucfirst($strSize) . '</th>';
echo '<th>' . $strSize . '</th>';
}
echo "\n";
?>
Expand Down Expand Up @@ -232,8 +232,8 @@ else {
<!-- The tables list -->
<table border="<?php echo $cfg['Border']; ?>">
<tr>
<th>&nbsp;<?php echo ucfirst($strTable); ?>&nbsp;</th>
<th><?php echo ucfirst($strRecords); ?></th>
<th>&nbsp;<?php echo $strTable; ?>&nbsp;</th>
<th><?php echo $strRecords; ?></th>
</tr>
<?php
while ($i < $num_tables) {
Expand Down
12 changes: 6 additions & 6 deletions db_stats.php3
Expand Up @@ -123,7 +123,7 @@ if ($server > 0) {
*/
?>
<h1 align="center">
<?php echo ucfirst($strDatabasesStats); ?>
<?php echo $strDatabasesStats; ?>
</h1>
<table align="center" border="<?php echo $cfg['Border']; ?>" cellpadding="5">
<tr>
Expand Down Expand Up @@ -195,27 +195,27 @@ if ($num_dbs > 0) {
<th>
&nbsp;
<a href="<?php echo $common_url . '&amp;sort_by=db_name&amp;sort_order=' . $url_sort[0]['order']; ?>">
<?php echo ucfirst($strDatabase) . $url_sort[0]['img_tag']; ?></a>&nbsp;
<?php echo $strDatabase . $url_sort[0]['img_tag']; ?></a>&nbsp;
</th>
<th>
&nbsp;
<a href="<?php echo $common_url . '&amp;sort_by=tbl_cnt&amp;sort_order=' . $url_sort[1]['order']; ?>">
<?php echo ucfirst(trim(sprintf($strTables, ''))) . $url_sort[1]['img_tag']; ?></a>&nbsp;
<?php echo $strNumTables . $url_sort[1]['img_tag']; ?></a>&nbsp;
</th>
<th>
&nbsp;
<a href="<?php echo $common_url . '&amp;sort_by=data_sz&amp;sort_order=' . $url_sort[2]['order']; ?>">
<?php echo ucfirst($strData) . $url_sort[2]['img_tag']; ?></a>&nbsp;
<?php echo $strData . $url_sort[2]['img_tag']; ?></a>&nbsp;
</th>
<th>
&nbsp;
<a href="<?php echo $common_url . '&amp;sort_by=idx_sz&amp;sort_order=' . $url_sort[3]['order']; ?>">
<?php echo ucfirst($strIndexes) . $url_sort[3]['img_tag']; ?></a>&nbsp;
<?php echo $strIndexes . $url_sort[3]['img_tag']; ?></a>&nbsp;
</th>
<th>
&nbsp;
<a href="<?php echo $common_url . '&amp;sort_by=tot_sz&amp;sort_order=' . $url_sort[4]['order']; ?>">
<?php echo ucfirst($strTotal) . $url_sort[4]['img_tag']; ?></a>&nbsp;
<?php echo $strTotalUC . $url_sort[4]['img_tag']; ?></a>&nbsp;
</th>
</tr>
<?php
Expand Down
4 changes: 3 additions & 1 deletion lang/afrikaans-iso-8859-1.inc.php3
Expand Up @@ -384,7 +384,7 @@ $strSubmit = 'Stuur';
$strSuccess = 'Jou SQL-navraag is suksesvol uitgevoer';
$strSum = 'Som';

$strTable = 'tabel ';
$strTable = 'Tabel';
$strTableComments = 'Tabel kommentaar';
$strTableEmpty = 'Die tabel naam is leeg!';
$strTableHasBeenDropped = 'Tabel %s is verwyder';
Expand Down Expand Up @@ -440,4 +440,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/afrikaans-utf-8.inc.php3
Expand Up @@ -385,7 +385,7 @@ $strSubmit = 'Stuur';
$strSuccess = 'Jou SQL-navraag is suksesvol uitgevoer';
$strSum = 'Som';

$strTable = 'tabel ';
$strTable = 'Tabel';
$strTableComments = 'Tabel kommentaar';
$strTableEmpty = 'Die tabel naam is leeg!';
$strTableHasBeenDropped = 'Tabel %s is verwyder';
Expand Down Expand Up @@ -441,4 +441,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/albanian-iso-8859-1.inc.php3
Expand Up @@ -392,7 +392,7 @@ $strSubmit = 'D
$strSuccess = 'Query u zbatua me sukses';
$strSum = 'Gjithsej';

$strTable = 'tabela ';
$strTable = 'Tabela';
$strTableComments = 'Komente mbi tabelën';
$strTableEmpty = 'Emri i tabelës është bosh!';
$strTableHasBeenDropped = 'Tabela %s u eleminua';
Expand Down Expand Up @@ -442,4 +442,6 @@ $strZip = '"kompresuar me zip"';

// To translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/albanian-utf-8.inc.php3
Expand Up @@ -393,7 +393,7 @@ $strSubmit = 'Dërgoje';
$strSuccess = 'Query u zbatua me sukses';
$strSum = 'Gjithsej';

$strTable = 'tabela ';
$strTable = 'Tabela';
$strTableComments = 'Komente mbi tabelën';
$strTableEmpty = 'Emri i tabelës është bosh!';
$strTableHasBeenDropped = 'Tabela %s u eleminua';
Expand Down Expand Up @@ -443,4 +443,6 @@ $strZip = '"kompresuar me zip"';

// To translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/arabic-utf-8.inc.php3
Expand Up @@ -455,4 +455,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/arabic-windows-1256.inc.php3
Expand Up @@ -454,4 +454,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/brazilian_portuguese-iso-8859-1.inc.php3
Expand Up @@ -303,7 +303,7 @@ $strSubmit = 'Submete';
$strSuccess = 'Seu comando SQL foi executado com sucesso';
$strSum = 'Soma';

$strTable = 'tabela ';
$strTable = 'Tabela';
$strTableComments = 'Comentários da tabela';
$strTableEmpty = 'O Nome da Tabela está vazio!';
$strTableHasBeenDropped = 'Tabela %s foi deletada';
Expand Down Expand Up @@ -454,4 +454,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/brazilian_portuguese-utf-8.inc.php3
Expand Up @@ -304,7 +304,7 @@ $strSubmit = 'Submete';
$strSuccess = 'Seu comando SQL foi executado com sucesso';
$strSum = 'Soma';

$strTable = 'tabela ';
$strTable = 'Tabela';
$strTableComments = 'Comentários da tabela';
$strTableEmpty = 'O Nome da Tabela está vazio!';
$strTableHasBeenDropped = 'Tabela %s foi deletada';
Expand Down Expand Up @@ -455,4 +455,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/bulgarian-koi8-r.inc.php3
Expand Up @@ -454,4 +454,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/bulgarian-utf-8.inc.php3
Expand Up @@ -455,4 +455,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/bulgarian-windows-1251.inc.php3
Expand Up @@ -454,4 +454,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/catalan-iso-8859-1.inc.php3
Expand Up @@ -385,7 +385,7 @@ $strSubmit = 'Enviar';
$strSuccess = 'La vostra comanda SQL ha estat executada amb èxit';
$strSum = 'Suma';

$strTable = 'taula ';
$strTable = 'Taula';
$strTableComments = 'Comentaris de la taula';
$strTableEmpty = 'El nom de la taula és buit!';
$strTableHasBeenDropped = 'S\'ha esborrat la taula %s';
Expand Down Expand Up @@ -434,4 +434,6 @@ $strYes = 'Si';
$strZip = '"comprimit amb zip"';

// To translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/catalan-utf-8.inc.php3
Expand Up @@ -386,7 +386,7 @@ $strSubmit = 'Enviar';
$strSuccess = 'La vostra comanda SQL ha estat executada amb èxit';
$strSum = 'Suma';

$strTable = 'taula ';
$strTable = 'Taula';
$strTableComments = 'Comentaris de la taula';
$strTableEmpty = 'El nom de la taula és buit!';
$strTableHasBeenDropped = 'S\'ha esborrat la taula %s';
Expand Down Expand Up @@ -435,4 +435,6 @@ $strYes = 'Si';
$strZip = '"comprimit amb zip"';

// To translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/chinese_big5-utf-8.inc.php3
Expand Up @@ -440,4 +440,6 @@ $strZip = '"zipped"';

// To translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/chinese_big5.inc.php3
Expand Up @@ -439,4 +439,6 @@ $strZip = '"zipped"';

// To translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/chinese_gb-utf-8.inc.php3
Expand Up @@ -438,4 +438,6 @@ $strZip = '"zipped"';

// To translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
2 changes: 2 additions & 0 deletions lang/chinese_gb.inc.php3
Expand Up @@ -437,4 +437,6 @@ $strZip = '"zipped"';

// To translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/croatian-iso-8859-2.inc.php3
Expand Up @@ -306,7 +306,7 @@ $strSubmit = 'Pokreni';
$strSuccess = 'Vaš SQL upit je uspješno izvršen';
$strSum = 'Ukupno';

$strTable = 'tablica ';
$strTable = 'Tablica';
$strTableComments = 'Komentar tablice';
$strTableEmpty = 'Ime tablice je prazno!';
$strTableHasBeenDropped = 'Tablica %s je izbrisana';
Expand Down Expand Up @@ -453,4 +453,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/croatian-utf-8.inc.php3
Expand Up @@ -307,7 +307,7 @@ $strSubmit = 'Pokreni';
$strSuccess = 'Vaš SQL upit je uspješno izvršen';
$strSum = 'Ukupno';

$strTable = 'tablica ';
$strTable = 'Tablica';
$strTableComments = 'Komentar tablice';
$strTableEmpty = 'Ime tablice je prazno!';
$strTableHasBeenDropped = 'Tablica %s je izbrisana';
Expand Down Expand Up @@ -454,4 +454,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>
4 changes: 3 additions & 1 deletion lang/croatian-windows-1250.inc.php3
Expand Up @@ -306,7 +306,7 @@ $strSubmit = 'Pokreni';
$strSuccess = 'Vaš SQL upit je uspješno izvršen';
$strSum = 'Ukupno';

$strTable = 'tablica ';
$strTable = 'Tablica';
$strTableComments = 'Komentar tablice';
$strTableEmpty = 'Ime tablice je prazno!';
$strTableHasBeenDropped = 'Tablica %s je izbrisana';
Expand Down Expand Up @@ -453,4 +453,6 @@ $strDataDict = 'Data Dictionary'; //to translate
$strPrint = 'Print'; //to translate
$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; //to translate
$strCompression = 'Compression'; //to translate
$strNumTables = 'Tables'; //to translate
$strTotalUC = 'Total'; //to translate
?>

0 comments on commit 84a657d

Please sign in to comment.