From 61afe373c759f36a883ba13b8c40abc3bdca8cce Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Wed, 24 Sep 2008 20:46:21 +0000
Subject: [PATCH] XHTML syntax errors (thanks to kozotoc)

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@491 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 create.inc.php     | 5 ++---
 design.inc.php     | 2 +-
 dump.inc.php       | 4 ++--
 editing.inc.php    | 8 ++++----
 foreign.inc.php    | 4 ++--
 indexes.inc.php    | 4 ++--
 privileges.inc.php | 1 -
 schema.inc.php     | 4 ++--
 select.inc.php     | 6 +++---
 sql.inc.php        | 4 ++--
 10 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/create.inc.php b/create.inc.php
index 1f2bad68..bde10d55 100644
--- a/create.inc.php
+++ b/create.inc.php
@@ -96,7 +96,7 @@ $collations = collations();
 <p>
 <?php echo lang('Auto Increment'); ?>: <input name="Auto_increment" size="4" value="<?php echo intval($row["Auto_increment"]); ?>" />
 <?php echo lang('Comment'); ?>: <input name="Comment" value="<?php echo htmlspecialchars($row["Comment"]); ?>" maxlength="60" />
-<script type="text/javascript">
+<script type="text/javascript">// <![CDATA[
 document.write('<label for="column_comments"><input type="checkbox" id="column_comments"<?php if ($column_comments) { ?> checked="checked"<?php } ?> onclick="column_comments_click(this.checked);" /><?php echo lang('Show column comments'); ?></label>');
 function column_comments_click(checked) {
 	var trs = document.getElementsByTagName('tr');
@@ -105,8 +105,7 @@ function column_comments_click(checked) {
 	}
 }
 <?php if (!$column_comments) { ?>column_comments_click(false);<?php } ?>
-
-</script>
+// ]]></script>
 </p>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
diff --git a/design.inc.php b/design.inc.php
index 53bf947e..6fcd1ada 100644
--- a/design.inc.php
+++ b/design.inc.php
@@ -31,7 +31,7 @@ function toggle(id) {
 		echo '<p id="breadcrumb"><a href="' . (strlen($link) ? htmlspecialchars($link) : ".") . '">' . (isset($_GET["server"]) ? htmlspecialchars($_GET["server"]) : lang('Server')) . '</a> &raquo; ';
 		if (is_array($breadcrumb)) {
 			if (strlen($_GET["db"])) {
-				echo '<a href="' . substr($SELF, 0, -1) . '">' . htmlspecialchars($_GET["db"]) . '</a> &raquo; ';
+				echo '<a href="' . htmlspecialchars(substr($SELF, 0, -1)) . '">' . htmlspecialchars($_GET["db"]) . '</a> &raquo; ';
 			}
 			foreach ($breadcrumb as $key => $val) {
 				if (strlen($val)) {
diff --git a/dump.inc.php b/dump.inc.php
index d0a91375..ff4e4e00 100644
--- a/dump.inc.php
+++ b/dump.inc.php
@@ -134,7 +134,7 @@ page_header(lang('Export'), "", (strlen($_GET["export"]) ? array("table" => $_GE
 <script type="text/javascript">
 function check(td, name, value) {
 	var inputs = td.parentNode.parentNode.parentNode.getElementsByTagName('input');
-	for (var i=0; i < inputs.length; i++) {
+	for (var i=0; inputs.length > i; i++) {
 		if (name.test(inputs[i].name)) {
 			inputs[i].checked = (inputs[i].value == value);
 		}
@@ -191,5 +191,5 @@ while ($row = $result->fetch_assoc()) {
 }
 echo "$views</table>\n";
 ?>
-<input type="submit" value="<?php echo lang('Export'); ?>" />
+<p><input type="submit" value="<?php echo lang('Export'); ?>" /></p>
 </form>
diff --git a/editing.inc.php b/editing.inc.php
index 0dce0d20..34693169 100644
--- a/editing.inc.php
+++ b/editing.inc.php
@@ -83,7 +83,7 @@ function process_type($field, $collate = "COLLATE") {
 function edit_fields($fields, $collations, $type = "TABLE") {
 	global $inout;
 	?>
-<thead><tr>
+<tr>
 <?php if ($type == "PROCEDURE") { ?><td><?php echo lang('IN-OUT'); ?></td><?php } ?>
 <th><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?></th>
 <td><?php echo lang('Type'); ?></td>
@@ -95,7 +95,7 @@ function edit_fields($fields, $collations, $type = "TABLE") {
 <td><?php echo lang('Comment'); ?></td>
 <?php } ?>
 <td><input type="image" name="add[0]" src="plus.gif" title="<?php echo lang('Add next'); ?>" /></td>
-</tr></thead>
+</tr>
 <?php
 	$column_comments = false;
 	foreach ($fields as $i => $field) {
@@ -174,12 +174,12 @@ function add_row(button) {
 	var row2 = row.cloneNode(true);
 	var tags = row.getElementsByTagName('select');
 	var tags2 = row2.getElementsByTagName('select');
-	for (var i=0; i < tags.length; i++) {
+	for (var i=0; tags.length > i; i++) {
 		tags[i].name = tags[i].name.replace(/([0-9.]+)/, x);
 		tags2[i].selectedIndex = tags[i].selectedIndex;
 	}
 	tags = row.getElementsByTagName('input');
-	for (var i=0; i < tags.length; i++) {
+	for (var i=0; tags.length > i; i++) {
 		if (tags[i].name == 'auto_increment_col') {
 			tags[i].value = x;
 			tags[i].checked = false;
diff --git a/foreign.inc.php b/foreign.inc.php
index 2904bc14..c187c73d 100644
--- a/foreign.inc.php
+++ b/foreign.inc.php
@@ -48,7 +48,7 @@ $source = get_vals("SHOW COLUMNS FROM " . idf_escape($_GET["foreign"])); //! no
 $target = ($_GET["foreign"] === $row["table"] ? $source : get_vals("SHOW COLUMNS FROM " . idf_escape($row["table"])));
 ?>
 
-<script type="text/javascript">
+<script type="text/javascript">// <![CDATA[
 function add_row(field) {
 	var row = field.parentNode.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');
@@ -59,7 +59,7 @@ function add_row(field) {
 	field.parentNode.parentNode.parentNode.appendChild(row);
 	field.onchange = function () { };
 }
-</script>
+// ]]></script>
 
 <form action="" method="post">
 <p>
diff --git a/indexes.inc.php b/indexes.inc.php
index 47952c68..6fbbdc1c 100644
--- a/indexes.inc.php
+++ b/indexes.inc.php
@@ -63,7 +63,7 @@ if ($_POST) {
 }
 ?>
 
-<script type="text/javascript">
+<script type="text/javascript">// <![CDATA[
 function add_row(field) {
 	var row = field.parentNode.parentNode.cloneNode(true);
 	var spans = row.getElementsByTagName('span');
@@ -91,7 +91,7 @@ function add_column(field) {
 	field.parentNode.parentNode.appendChild(column);
 	field.onchange = function () { };
 }
-</script>
+// ]]></script>
 
 <form action="" method="post">
 <table border="0" cellspacing="0" cellpadding="2">
diff --git a/privileges.inc.php b/privileges.inc.php
index eb8a3774..6365dd54 100644
--- a/privileges.inc.php
+++ b/privileges.inc.php
@@ -14,7 +14,6 @@ if (!$result) {
 <?php
 	$result = $mysql->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1) AS User, SUBSTRING_INDEX(CURRENT_USER, '@', -1) AS Host");
 }
-echo "</p>\n";
 echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
 echo "<thead><tr><th>&nbsp;</th><th>" . lang('Username') . "</th><th>" . lang('Server') . "</th></tr></thead>\n";
 while ($row = $result->fetch_assoc()) {
diff --git a/schema.inc.php b/schema.inc.php
index d9db282d..6c087bba 100644
--- a/schema.inc.php
+++ b/schema.inc.php
@@ -67,7 +67,7 @@ document.onmousemove = function (ev) {
 		var top = (ev.clientY - y) / em;
 		var divs = that.getElementsByTagName('div');
 		var line_set = { };
-		for (var i=0; i < divs.length; i++) {
+		for (var i=0; divs.length > i; i++) {
 			if (divs[i].className == 'references') {
 				var div2 = document.getElementById((divs[i].id.substr(0, 4) == 'refs' ? 'refd' : 'refs') + divs[i].id.substr(4));
 				var ref = (table_pos[divs[i].title] ? table_pos[divs[i].title] : [ div2.parentNode.offsetTop / em, 0 ]);
@@ -81,7 +81,7 @@ document.onmousemove = function (ev) {
 					var left2 = Math.min(0, left - ref[1]) - 1;
 					div2.style.left = left2 + 'em';
 					div2.getElementsByTagName('div')[0].style.width = -left2 + 'em';
-					is_top = (divs[i].offsetTop + top * em < div2.offsetTop + ref[0] * em);
+					is_top = (div2.offsetTop + ref[0] * em > divs[i].offsetTop + top * em);
 				}
 				if (!line_set[id]) {
 					var line = document.getElementById(divs[i].id.replace(/^....(.+)-[0-9]+$/, 'refl$1'));
diff --git a/select.inc.php b/select.inc.php
index 98691b52..bfa41304 100644
--- a/select.inc.php
+++ b/select.inc.php
@@ -114,7 +114,7 @@ if (!$columns) {
 } else {
 	echo "<form action='' id='form'>\n";
 	?>
-<script type="text/javascript">
+<script type="text/javascript">// <![CDATA[
 function add_row(field) {
 	var row = field.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');
@@ -130,7 +130,7 @@ function add_row(field) {
 	field.parentNode.parentNode.appendChild(row);
 	field.onchange = function () { };
 }
-</script>
+// ]]></script>
 <?php
 	echo "<fieldset><legend>" . lang('Select') . "</legend>\n";
 	if (strlen($_GET["server"])) {
@@ -229,7 +229,7 @@ for (var i=0; <?php echo $i; ?> > i; i++) {
 			echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
 			for ($j=0; $row = $result->fetch_assoc(); $j++) {
 				if (!$j) {
-					echo '<thead><tr>' . (count($select) == count($group) ? '<td><label><input type="checkbox" name="delete_selected" value="1" onclick="var elems = this.form.elements; for (var i=0; i < elems.length; i++) if (elems[i].name == \'delete[]\') elems[i].checked = this.checked;" />' . lang('all') . '</label></td>' : '');
+					echo '<thead><tr>' . (count($select) == count($group) ? '<td><label><input type="checkbox" name="delete_selected" value="1" onclick="var elems = this.form.elements; for (var i=0; elems.length > i; i++) if (elems[i].name == \'delete[]\') elems[i].checked = this.checked;" />' . lang('all') . '</label></td>' : '');
 					foreach ($row as $key => $val) {
 						echo '<th><a href="' . htmlspecialchars(remove_from_uri('(order|desc)[^=]*')) . '&amp;order%5B0%5D=' . htmlspecialchars($key) . ($_GET["order"][0] === $key && !$_GET["desc"][0] ? '&amp;desc%5B0%5D=1' : '') . '">' . htmlspecialchars($key) . "</a></th>";
 					}
diff --git a/sql.inc.php b/sql.inc.php
index 3d841c31..e75c8983 100644
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -55,9 +55,9 @@ if (!$error && $_POST && is_string($query = (isset($_POST["query"]) ? $_POST["qu
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Execute'); ?>" />
-<script type="text/javascript">
+<script type="text/javascript">// <![CDATA[
 document.write('<label for="highlight"><input type="checkbox" name="highlight" id="highlight" value="jush"<?php echo ($_COOKIE["highlight"] == "jush" ? ' checked="checked"' : ''); ?> /><?php echo addcslashes(lang('Syntax highlighting'), "\r\n'\\"); ?></label>');
-</script>
+// ]]></script>
 </p>
 </form>