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

Be valid XHTML

Browse Source
This commit is contained in:
Michal Čihař
2004-04-27 12:36:12 +00:00
parent 04229e997f
commit 928a8b33db
23 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -8,11 +8,7 @@ $Source$
2004-04-27 Michal Cihar <michal@cihar.com>
* calendar.php, libraries/tbl_change.js: Don't reset clock when moving in
calendar.
* db_details_links.php, db_details_structure.php, left.php,
querywindow.php, tbl_change.php, tbl_indexes.php,
tbl_properties_links.php, tbl_properties_structure.php,
tbl_query_box.php, tbl_select.php, css/phpmyadmin.css.php,
libraries/common.lib.php, libraries/display_tbl.lib.php: Be valid XHTML.
* Almost everyting: Be valid XHTML (probably still not completely).
2004-04-27 Garvin Hicking <pma@supergarv.de>
* libraries/display_tbl.lib.php: RFE #867284 - Click on result row

6
footer.inc.php
View File

@@ -22,8 +22,8 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<?php
if ($cfg['QueryFrameDebug']) {
?>
document.writeln("Updating query window. DB: <?php echo (isset($db) ? addslashes($db) : 'FALSE'); ?>, Table: <?php echo (isset($table) ? addslashes($table) : 'FALSE'); ?><br>");
document.writeln("Window: " + parent.frames.queryframe.querywindow.location + "<br>");
document.writeln("Updating query window. DB: <?php echo (isset($db) ? addslashes($db) : 'FALSE'); ?>, Table: <?php echo (isset($table) ? addslashes($table) : 'FALSE'); ?><br />");
document.writeln("Window: " + parent.frames.queryframe.querywindow.location + "<br />");
<?php
}
?>
@@ -41,7 +41,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
function reload_querywindow () {
if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) {
<?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'parent.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?>
<?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'parent.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br />");' : ''); ?>
<?php
if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {

2
lang/albanian-iso-8859-1.inc.php
View File

@@ -406,7 +406,7 @@ $strNumSearchResultsTotal = '<b>Gjithsej:</b> <i>%s</i> korrispondues(
$strNumTables = 'Tabela';
$strOK = 'OK';
$strOftenQuotation = 'Zakonisht nga dopjo thonjza. ME D<>SHIR<49> tregon q<> vet<65>m fushat <I>char</I> dhe <I>varchar</I> duhet t<> delimitohen nga karakteri i treguar.';
$strOftenQuotation = 'Zakonisht nga dopjo thonjza. ME D<>SHIR<49> tregon q<> vet<65>m fushat <i>char</i> dhe <i>varchar</i> duhet t<> delimitohen nga karakteri i treguar.';
$strOperations = 'Operacione';
$strOptimizeTable = 'Optimizo tabel<65>n';
$strOptionalControls = 'Me d<>shir<69>. Ky karakter kontrollon si t<> shkruash apo lexosh karakteret special<61>.';

2
lang/albanian-utf-8.inc.php
View File

@@ -407,7 +407,7 @@ $strNumSearchResultsTotal = '<b>Gjithsej:</b> <i>%s</i> korrispondues(ë)';
$strNumTables = 'Tabela';
$strOK = 'OK';
$strOftenQuotation = 'Zakonisht nga dopjo thonjza. ME DËSHIRË tregon që vetëm fushat <I>char</I> dhe <I>varchar</I> duhet të delimitohen nga karakteri i treguar.';
$strOftenQuotation = 'Zakonisht nga dopjo thonjza. ME DËSHIRË tregon që vetëm fushat <i>char</i> dhe <i>varchar</i> duhet të delimitohen nga karakteri i treguar.';
$strOperations = 'Operacione';
$strOptimizeTable = 'Optimizo tabelën';
$strOptionalControls = 'Me dëshirë. Ky karakter kontrollon si të shkruash apo lexosh karakteret specialë.';

4
lang/galician-iso-8859-1.inc.php
View File

@@ -554,7 +554,7 @@ $strSelectAll = 'Seleccionar todo';
$strSelectFields = 'Seleccione os campos (m<>nimo 1)';
$strSelectNumRows = 'a procurar';
$strSelectTables = 'Seleccionar tabelas';
$strSend = 'Enviar <I>(gravar nun ficheiro)</I><br>';
$strSend = 'Enviar <i>(gravar nun ficheiro)</i><br />';
$strSent = 'Enviado';
$strServer = 'Servidor %s';
$strServerChoice = 'Escolla de Servidor';
@@ -616,7 +616,7 @@ $strTableStructure = 'Estructura da tabela';
$strTableType = 'Tipo da tabela';
$strTables = '%s tabela(s)';
$strTblPrivileges = 'Privilexios proprios de tabela';
$strTextAreaLength = ' Por causa da sua lonxitude,<br> este campo pode non ser editable ';
$strTextAreaLength = ' Por causa da sua lonxitude,<br /> este campo pode non ser editable ';
$strThai = 'Tailand<6E>s';
$strTheContent = 'O conte<74>do do seu arquivo foi inserido';
$strTheContents = 'O conte<74>do do arquivo substitu<74>u o conte<74>do da tabela que ti<74>a a mesma chave primaria ou <20>nica';

4
lang/galician-utf-8.inc.php
View File

@@ -555,7 +555,7 @@ $strSelectAll = 'Seleccionar todo';
$strSelectFields = 'Seleccione os campos (mínimo 1)';
$strSelectNumRows = 'a procurar';
$strSelectTables = 'Seleccionar tabelas';
$strSend = 'Enviar <I>(gravar nun ficheiro)</I><br>';
$strSend = 'Enviar <i>(gravar nun ficheiro)</i><br />';
$strSent = 'Enviado';
$strServer = 'Servidor %s';
$strServerChoice = 'Escolla de Servidor';
@@ -617,7 +617,7 @@ $strTableStructure = 'Estructura da tabela';
$strTableType = 'Tipo da tabela';
$strTables = '%s tabela(s)';
$strTblPrivileges = 'Privilexios proprios de tabela';
$strTextAreaLength = ' Por causa da sua lonxitude,<br> este campo pode non ser editable ';
$strTextAreaLength = ' Por causa da sua lonxitude,<br /> este campo pode non ser editable ';
$strThai = 'Tailandés';
$strTheContent = 'O conteúdo do seu arquivo foi inserido';
$strTheContents = 'O conteúdo do arquivo substituíu o conteúdo da tabela que tiña a mesma chave primaria ou única';

2
lang/hebrew-iso-8859-8-i.inc.php
View File

@@ -89,7 +89,7 @@ $strCommand = '
$strComments = '<27><><EFBFBD><EFBFBD><EFBFBD>';
$strCompleteInserts = '<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
$strCompression = '<27><><EFBFBD><EFBFBD><EFBFBD>';
$strConfigFileError = 'phpMyAdmin <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>! <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> PHP <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>.<br> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> PHP <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.<br> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>.';
$strConfigFileError = 'phpMyAdmin <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>! <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> PHP <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>.<br /> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> PHP <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.<br> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>.';
$strConfirm = '<27><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>?';
$strConnections = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
$strCookiesRequired = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>.';

2
lang/italian-iso-8859-1.inc.php
View File

@@ -418,7 +418,7 @@ $strNumSearchResultsTotal = '<b>Totale:</b> <i>%s</i> corrispondenza/e';
$strNumTables = 'Tabelle';
$strOK = 'OK';
$strOftenQuotation = 'In genere da doppi apici (virgolette). OPZIONALE indica che solo i campi <I>char</I> e <I>varchar</I> devono essere delimitati dal carattere indicato.';
$strOftenQuotation = 'In genere da doppi apici (virgolette). OPZIONALE indica che solo i campi <i>char</i> e <i>varchar</i> devono essere delimitati dal carattere indicato.';
$strOperations = 'Operazioni';
$strOptimizeTable = 'Ottimizza tabella';
$strOptionalControls = 'Opzionale. Questo carattere controlla come scrivere o leggere i caratteri speciali.';

2
lang/italian-utf-8.inc.php
View File

@@ -419,7 +419,7 @@ $strNumSearchResultsTotal = '<b>Totale:</b> <i>%s</i> corrispondenza/e';
$strNumTables = 'Tabelle';
$strOK = 'OK';
$strOftenQuotation = 'In genere da doppi apici (virgolette). OPZIONALE indica che solo i campi <I>char</I> e <I>varchar</I> devono essere delimitati dal carattere indicato.';
$strOftenQuotation = 'In genere da doppi apici (virgolette). OPZIONALE indica che solo i campi <i>char</i> e <i>varchar</i> devono essere delimitati dal carattere indicato.';
$strOperations = 'Operazioni';
$strOptimizeTable = 'Ottimizza tabella';
$strOptionalControls = 'Opzionale. Questo carattere controlla come scrivere o leggere i caratteri speciali.';

6
lang/turkish-iso-8859-9.inc.php
View File

@@ -208,7 +208,7 @@ $strDisplay = 'G
$strDisplayFeat = '<27>zellikleri G<>ster';
$strDisplayOrder = 'G<>r<EFBFBD>n<EFBFBD>m d<>zeni:';
$strDisplayPDF = 'PDF <20>emas<61>n<EFBFBD> g<>ster';
$strDoAQuery = '<br><br>"<22>rnekle sorgu" yap. (joker:%) <br>';
$strDoAQuery = '<br /><br>"<22>rnekle sorgu" yap. (joker:%) <br>';
$strDoYouReally = 'A<>a<EFBFBD><61>daki komutu uygulamak istedi<64>inizden emin misiniz? ';
$strDocu = 'D<>k<EFBFBD>mantasyon';
$strDrop = 'Kald<6C>r';
@@ -587,14 +587,14 @@ $strSent = 'G
$strServer = '%s sunucusu';
$strServerChoice = 'Server se<73>imi';
$strServerStatus = '<27>al<61><6C>ma bilgisi';
$strServerStatusUptime = 'Bu MySQL sunucusunun <20>al<61><6C>ma s<>resi : %s <br> Ba<42>lama Zaman<61>: %s ';
$strServerStatusUptime = 'Bu MySQL sunucusunun <20>al<61><6C>ma s<>resi : %s <br /> Ba<42>lama Zaman<61>: %s ';
$strServerTabProcesslist = '<27><>lemler';
$strServerTabVariables = 'De<44>i<EFBFBD>kenler';
$strServerTrafficNotes = '<b>Sunucu Yo<59>unlu<6C>u</b>: Bu tablolar ba<62>lama zaman<61>ndan bu yana MySQL sunucusunun network yo<79>unlu<6C>unu g<>sterir.';
$strServerVars = 'Sunucu de<64>i<EFBFBD>kenleri ve ayarlar<61>';
$strServerVersion = 'Server s<>r<EFBFBD>m<EFBFBD>';
$strSessionValue = 'Oturum de<64>eri';
$strSetEnumVal = 'E<>er alan tipi "enum" veya "set" ise , l<>tfen verileri <20>u formata g<>re giriniz: \'a\',\'b\',\'c\'...<br>E<>er bu de<64>erler aras<61>na backslash ("\") veya tek t<>rnak koyman<61>z gerekirse ("\'"),bunun i<>in backslash kullan<61>n (mesela \'\\\\xyz\' veya \'a\\\'b\').';
$strSetEnumVal = 'E<>er alan tipi "enum" veya "set" ise , l<>tfen verileri <20>u formata g<>re giriniz: \'a\',\'b\',\'c\'...<br />E<>er bu de<64>erler aras<61>na backslash ("\") veya tek t<>rnak koyman<61>z gerekirse ("\'"),bunun i<>in backslash kullan<61>n (mesela \'\\\\xyz\' veya \'a\\\'b\').';
$strShow = 'G<>ster';
$strShowAll = 'T<>m<EFBFBD>n<EFBFBD> g<>ster';
$strShowColor = 'Rengi g<>ster';

6
lang/turkish-utf-8.inc.php
View File

@@ -209,7 +209,7 @@ $strDisplay = 'Görüntüle';
$strDisplayFeat = 'Özellikleri Göster';
$strDisplayOrder = 'Görünüm düzeni:';
$strDisplayPDF = 'PDF şemasını göster';
$strDoAQuery = '<br><br>"Örnekle sorgu" yap. (joker:%) <br>';
$strDoAQuery = '<br /><br>"Örnekle sorgu" yap. (joker:%) <br>';
$strDoYouReally = 'Aşağıdaki komutu uygulamak istediğinizden emin misiniz? ';
$strDocu = 'Dökümantasyon';
$strDrop = 'Kaldır';
@@ -588,14 +588,14 @@ $strSent = 'Gönderildi';
$strServer = '%s sunucusu';
$strServerChoice = 'Server seçimi';
$strServerStatus = 'Çalışma bilgisi';
$strServerStatusUptime = 'Bu MySQL sunucusunun çalışma süresi : %s <br> Başlama Zamanı: %s ';
$strServerStatusUptime = 'Bu MySQL sunucusunun çalışma süresi : %s <br /> Başlama Zamanı: %s ';
$strServerTabProcesslist = 'İşlemler';
$strServerTabVariables = 'Değişkenler';
$strServerTrafficNotes = '<b>Sunucu Yoğunluğu</b>: Bu tablolar başlama zamanından bu yana MySQL sunucusunun network yoğunluğunu gösterir.';
$strServerVars = 'Sunucu değişkenleri ve ayarları';
$strServerVersion = 'Server sürümü';
$strSessionValue = 'Oturum değeri';
$strSetEnumVal = 'Eğer alan tipi "enum" veya "set" ise , lütfen verileri şu formata göre giriniz: \'a\',\'b\',\'c\'...<br>Eğer bu değerler arasına backslash ("\") veya tek tırnak koymanız gerekirse ("\'"),bunun için backslash kullanın (mesela \'\\\\xyz\' veya \'a\\\'b\').';
$strSetEnumVal = 'Eğer alan tipi "enum" veya "set" ise , lütfen verileri şu formata göre giriniz: \'a\',\'b\',\'c\'...<br />Eğer bu değerler arasına backslash ("\") veya tek tırnak koymanız gerekirse ("\'"),bunun için backslash kullanın (mesela \'\\\\xyz\' veya \'a\\\'b\').';
$strShow = 'Göster';
$strShowAll = 'Tümünü göster';
$strShowColor = 'Rengi göster';

2
libraries/dbg/profiling.php
View File

@@ -20,7 +20,7 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG']
dbg_get_profiler_results(&$dbg_prof_results);
echo '<br><table width="1000" cellspacing="0" cellpadding="2" style="font:8pt courier">' . "\n" .
echo '<br /><table width="1000" cellspacing="0" cellpadding="2" style="font:8pt courier">' . "\n" .
'<thead>' . "\n" .
'<tr style="background:#808080; color:#FFFFFF">' . "\n" .
'<td>' . $GLOBALS['strDBGModule'] . '</td>' . "\n" .

15
libraries/display_export.lib.php
View File

@@ -92,7 +92,7 @@ if (isset($sql_query)) {
<td nowrap="nowrap" valign="top" onclick="if (typeof(window.opera) != 'undefined')setTimeout('show_checked_option()', 1); return true">
<fieldset <?php echo ((!isset($multi_values) || isset($multi_values) && $multi_values == '') ? 'style="height: 220px;"' : ''); ?>>
<legend><?php echo $strExport; ?></legend>
<br>
<br />
<?php
if (isset($multi_values) && $multi_values != '') {
echo $multi_values;
@@ -159,7 +159,7 @@ if ($export_type == 'server') {
<!-- For structure -->
<fieldset>
<legend>
<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" <?php PMA_exportCheckboxCheck('sql_structure'); ?> onclick="if(!this.checked && !getElement('checkbox_sql_data').checked) return false; else return true;" />
<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" <?php PMA_exportCheckboxCheck('sql_structure'); ?> onclick="if(!this.checked &amp;&amp; !getElement('checkbox_sql_data').checked) return false; else return true;" />
<label for="checkbox_sql_structure"><?php echo $strStructure; ?></label><br />
</legend>
@@ -207,7 +207,7 @@ if ($cfgRelation['mimework']) {
<!-- For data -->
<fieldset>
<legend>
<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" <?php PMA_exportCheckboxCheck('sql_data'); ?> onclick="if(!this.checked && (!getElement('checkbox_sql_structure') || !getElement('checkbox_sql_structure').checked)) return false; else return true;" />
<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" <?php PMA_exportCheckboxCheck('sql_data'); ?> onclick="if(!this.checked &amp;&amp; (!getElement('checkbox_sql_structure') || !getElement('checkbox_sql_structure').checked)) return false; else return true;" />
<label for="checkbox_sql_data"><?php echo $strData; ?></label><br />
</legend>
<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" <?php PMA_exportCheckboxCheck('sql_columns'); ?> />
@@ -225,7 +225,7 @@ if ($cfgRelation['mimework']) {
<label for="select_sql_type">
<?php echo $strSQLExportType; ?>:&nbsp;
</label>
<select name="sql_type" id="select_sql_type" />
<select name="sql_type" id="select_sql_type">
<option value="insert"<?php echo $cfg['Export']['sql_type'] == 'insert' ? ' selected="selected"' : ''; ?>>INSERT</option>
<option value="update"<?php echo $cfg['Export']['sql_type'] == 'update' ? ' selected="selected"' : ''; ?>>UPDATE</option>
<option value="replace"<?php echo $cfg['Export']['sql_type'] == 'replace' ? ' selected="selected"' : ''; ?>>REPLACE</option>
@@ -245,7 +245,7 @@ if ($cfgRelation['mimework']) {
<!-- For structure -->
<fieldset>
<legend>
<input type="checkbox" name="latex_structure" value="structure" id="checkbox_latex_structure" <?php PMA_exportCheckboxCheck('latex_structure'); ?> onclick="if(!this.checked && !getElement('checkbox_latex_data').checked) return false; else return true;" />
<input type="checkbox" name="latex_structure" value="structure" id="checkbox_latex_structure" <?php PMA_exportCheckboxCheck('latex_structure'); ?> onclick="if(!this.checked &amp;&amp; !getElement('checkbox_latex_data').checked) return false; else return true;" />
<label for="checkbox_latex_structure"><?php echo $strStructure; ?></label><br />
</legend>
<table border="0" cellspacing="1" cellpadding="0">
@@ -302,7 +302,7 @@ if ($cfgRelation['mimework']) {
<!-- For data -->
<fieldset>
<legend>
<input type="checkbox" name="latex_data" value="data" id="checkbox_latex_data" <?php PMA_exportCheckboxCheck('latex_data'); ?> onclick="if(!this.checked && (!getElement('checkbox_latex_structure') || !getElement('checkbox_latex_structure').checked)) return false; else return true;" />
<input type="checkbox" name="latex_data" value="data" id="checkbox_latex_data" <?php PMA_exportCheckboxCheck('latex_data'); ?> onclick="if(!this.checked &amp;&amp; (!getElement('checkbox_latex_structure') || !getElement('checkbox_latex_structure').checked)) return false; else return true;" />
<label for="checkbox_latex_data"><?php echo $strData; ?></label><br />
</legend>
<input type="checkbox" name="latex_showcolumns" value="yes" id="ch_latex_showcolumns" <?php PMA_exportCheckboxCheck('latex_columns'); ?> />
@@ -420,7 +420,7 @@ if ($cfgRelation['mimework']) {
</label>
</td>
<td>
<select name="excel_edition" id="select_excel_edition" />
<select name="excel_edition" id="select_excel_edition">
<option value="win"<?php echo $cfg['Export']['excel_edition'] == 'win' ? ' selected="selected"' : ''; ?>>Windows</option>
<option value="mac"<?php echo $cfg['Export']['excel_edition'] == 'mac' ? ' selected="selected"' : ''; ?>>Macintosh</option>
</select>
@@ -565,6 +565,7 @@ if ($is_zip || $is_gzip || $is_bzip) {
}
echo "\n";
?>
</fieldset>
</fieldset>
</td>
</tr>

12
libraries/sqlparser.lib.php
View File

@@ -575,7 +575,7 @@ if ($is_minimum_common == FALSE) {
$d_next_upper = '';
}
//DEBUG echo "[prev: <b>".$d_prev."</b> ".$t_prev."][cur: <b>".$d_cur."</b> ".$t_cur."][next: <b>".$d_next."</b> ".$t_next."]<br>";
//DEBUG echo "[prev: <b>".$d_prev."</b> ".$t_prev."][cur: <b>".$d_cur."</b> ".$t_cur."][next: <b>".$d_next."</b> ".$t_next."]<br />";
if ($t_cur == 'alpha') {
$t_suffix = '_identifier';
@@ -845,7 +845,7 @@ if ($is_minimum_common == FALSE) {
// loop #1 for each token: select_expr, table_ref for SELECT
for ($i = 0; $i < $size; $i++) {
//echo "trace <b>" . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br>";
//echo "trace <b>" . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br />";
// High speed seek for locating the end of the current query
if ($seek_queryend == TRUE) {
@@ -1183,7 +1183,7 @@ if ($is_minimum_common == FALSE) {
if (isset($current_select_expr)) {
for ($trace=0; $trace<=$current_select_expr; $trace++) {
echo "<br>";
echo "<br />";
reset ($subresult['select_expr'][$trace]);
while (list ($key, $val) = each ($subresult['select_expr'][$trace]))
echo "sel expr $trace $key => $val<br />\n";
@@ -1193,7 +1193,7 @@ if ($is_minimum_common == FALSE) {
if (isset($current_table_ref)) {
for ($trace=0; $trace<=$current_table_ref; $trace++) {
echo "<br>";
echo "<br />";
reset ($subresult['table_ref'][$trace]);
while (list ($key, $val) = each ($subresult['table_ref'][$trace]))
echo "table ref $trace $key => $val<br />\n";
@@ -1223,7 +1223,7 @@ if ($is_minimum_common == FALSE) {
$in_from = FALSE;
for ($i = 0; $i < $size; $i++) {
//DEBUG echo "trace loop2 <b>" . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br>";
//DEBUG echo "trace loop2 <b>" . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br />";
// need_confirm
//
@@ -1406,7 +1406,7 @@ if ($is_minimum_common == FALSE) {
$foreign_key_number = -1;
for ($i = 0; $i < $size; $i++) {
// DEBUG echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br>";
// DEBUG echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br />";
if ($arr[$i]['type'] == 'alpha_reservedWord') {
$upper_data = strtoupper($arr[$i]['data']);

4
querywindow.php
View File

@@ -236,7 +236,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
if (isset($sql_history) && isset($querydisplay_tab) && ($querydisplay_tab == 'history' || $querydisplay_tab == 'full') && is_array($sql_history) && count($sql_history) > 0) {
?>
<li>
<div style="margin-bottom: 10px"><?php echo $strQuerySQLHistory . ':<br><ul>' . implode('', $sql_history) . '</ul>'; ?></div>
<div style="margin-bottom: 10px"><?php echo $strQuerySQLHistory . ':<br /><ul>' . implode('', $sql_history) . '</ul>'; ?></div>
</li>
<?php
}
@@ -266,7 +266,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
/* REMOVE ME */
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && $cfg['QueryFrameDebug']) {
?>
<br>
<br />
<center>
<a href='#' onClick='return debug();'><?php echo $strQueryFrameDebug; ?></a>
</center>

5
server_privileges.php
View File

@@ -939,7 +939,7 @@ if (empty($adduser) && empty($checkprivs)) {
. ' Please run the script <tt>mysql_fix_privilege_tables</tt> that should be included in your MySQL server distribution to solve this problem!' . "\n"
. '</div><br />' . "\n";
}
echo '<form name="usersForm" action="server_privileges.php" method="post" />' . "\n"
echo '<form name="usersForm" action="server_privileges.php" method="post">' . "\n"
. PMA_generate_common_hidden_inputs('', '', 1)
. ' <table border="0">' . "\n"
. ' <tr>' . "\n"
@@ -988,7 +988,8 @@ if (empty($adduser) && empty($checkprivs)) {
. ' <ul>' . "\n"
. ' <li>' . "\n"
. ' <b><a href="server_privileges.php?' . $url_query . '&amp;adduser=1">' . $strAddUser . '</a></b><br />' . "\n"
. ' </li><br /><br />' . "\n"
. ' <br /><br />' . "\n"
. ' </li>' . "\n"
. ' <li>' . "\n"
. ' <b>' . $strRemoveSelectedUsers . '</b><br />' . "\n"
. ' <input type="radio" title="' . $strJustDelete . ' ' . $strJustDeleteDescr . '" name="mode" id="radio_mode_1" value="1" checked="checked" />' . "\n"

2
server_processlist.php
View File

@@ -78,11 +78,11 @@ foreach($serverProcesses AS $name => $value) {
<td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>" align="right">&nbsp;<?php echo $value['Time']; ?>&nbsp;</td>
<td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo (empty($value['State']) ? '---' : $value['State']); ?>&nbsp;</td>
<td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo (empty($value['Info']) ? '---' : PMA_SQP_formatHtml(PMA_SQP_parse($value['Info']))); ?>&nbsp;</td>
</tr>
<?php
$useBgcolorOne = !$useBgcolorOne;
}
?>
</tr>
<?php
?>
</table>

1
tbl_properties_operations.php
View File

@@ -348,7 +348,6 @@ if ($cfgRelation['relwork'] && $tbl_type != "INNODB") {
} // end if (!empty($cfg['Server']['relation']))
?>
<br />
</ul>
</li>