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

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>

2
libraries/dom-drag.js
View File

@@ -118,4 +118,4 @@ var Drag = {
if (typeof e.layerY == 'undefined') e.layerY = e.offsetY;
return e;
}
};
};

2
libraries/fpdf/fpdf.php
View File

@@ -2488,4 +2488,4 @@ if ($HTTP_USER_AGENT == 'contype') {
header('Content-Type: application/pdf');
exit();
}
?>
?>

2
libraries/header_http.inc.php
View File

@@ -20,4 +20,4 @@ if ($ctype == 'css') {
header('Content-Type: text/' . $ctype . '; charset=' . $GLOBALS['charset']);
}
}
?>
?>

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']);

2
libraries/zip.lib.php
View File

@@ -183,4 +183,4 @@ class zipfile
} // end of the 'file()' method
} // end of the 'zipfile' class
?>
?>