Home / Browse / Adminer / Mail / Archive

Donate

Adminer

Email Archive: adminer-svn (read-only)

[Adminer-svn] SF.net SVN: adminer:[980] trunk/adminer

From: <jakubvrana@us...> - 2009-08-19 14:12

Revision: 980
          http://adminer.svn.sourceforge.net/adminer/?rev=980&view=rev
Author:   jakubvrana
Date:     2009-08-19 14:11:58 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Separate <h1> and version

Modified Paths:
--------------
    trunk/adminer/default.css
    trunk/adminer/include/design.inc.php

Modified: trunk/adminer/default.css
===================================================================
--- trunk/adminer/default.css	2009-08-19 12:07:37 UTC (rev 979)
+++ trunk/adminer/default.css	2009-08-19 14:11:58 UTC (rev 980)
@@ -2,8 +2,8 @@
 a { color: blue; }
 a:visited { color: navy; }
 a:hover { color: red; }
-h1 { font-size: 100%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
-h1 .h1 { font-size: 150%; color: #777; text-decoration: none; font-style: italic; }
+h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
+h1 a, h1 a:visited { color: #777; text-decoration: none; font-style: italic; }
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; }
 h3 { font-weight: normal; font-size: 130%; margin: .8em 0; }
 table { margin: 0 20px .8em 0; border: 0; border-top: 1px solid #999; border-left: 1px solid #999; font-size: 90%; }
@@ -14,6 +14,7 @@
 p { margin: 0 20px 1em 0; }
 img { vertical-align: middle; border: 0; }
 code { background: #eee; }
+.version { float: right; color: #777; margin: 1.5em 1em; text-align: right; }
 .js .hidden { display: none; }
 .nowrap { white-space: nowrap; }
 .wrap { white-space: normal; }

Modified: trunk/adminer/include/design.inc.php
===================================================================
--- trunk/adminer/include/design.inc.php	2009-08-19 12:07:37 UTC (rev 979)
+++ trunk/adminer/include/design.inc.php	2009-08-19 14:11:58 UTC (rev 980)
@@ -62,9 +62,8 @@
 
 <?php switch_lang(); ?>
 <div id="menu">
-<h1><a href="http://www.adminer.org/" class="h1"><?php echo $adminer->name(); ?></a> &nbsp; <?php echo $VERSION; ?> &nbsp;
-<a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
-</h1>
+<div class="version"><?php echo $VERSION; ?> &nbsp; <a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a></div>
+<h1><a href="http://www.adminer.org/"><?php echo $adminer->name(); ?></a></h1>
 <?php $adminer->navigation($missing); ?>
 </div>
 <?php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Adminer-svn] SF.net SVN: adminer:[975] trunk/adminer	<jakubvrana@us...>

[Adminer-svn] SF.net SVN: adminer:[976] trunk/adminer

From: <jakubvrana@us...> - 2009-08-18 09:20

Revision: 976
          http://adminer.svn.sourceforge.net/adminer/?rev=976&view=rev
Author:   jakubvrana
Date:     2009-08-18 09:19:54 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
Move apply_sql_function

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-18 09:16:04 UTC (rev 975)
+++ trunk/adminer/include/functions.inc.php	2009-08-18 09:19:54 UTC (rev 976)
@@ -359,6 +359,10 @@
 	echo implode(",", $row) . "\n";
 }
 
+function apply_sql_function($function, $column) {
+	return ($function ? ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)" : $column);
+}
+
 function is_email($email) {
 	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
 	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-08-18 09:16:04 UTC (rev 975)
+++ trunk/adminer/select.inc.php	2009-08-18 09:19:54 UTC (rev 976)
@@ -16,13 +16,6 @@
 	$rights += $field["privileges"];
 }
 
-function apply_sql_function($function, $column) {
-	return ($function
-		? ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)"
-		: $column
-	);
-}
-
 list($select, $group) = $adminer->selectColumnsProcess($columns, $indexes);
 $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Adminer-svn] SF.net SVN: adminer:[980] trunk/adminer

From: <jakubvrana@us...> - 2009-08-19 14:12

Revision: 980
          http://adminer.svn.sourceforge.net/adminer/?rev=980&view=rev
Author:   jakubvrana
Date:     2009-08-19 14:11:58 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Separate <h1> and version

Modified Paths:
--------------
    trunk/adminer/default.css
    trunk/adminer/include/design.inc.php

Modified: trunk/adminer/default.css
===================================================================
--- trunk/adminer/default.css	2009-08-19 12:07:37 UTC (rev 979)
+++ trunk/adminer/default.css	2009-08-19 14:11:58 UTC (rev 980)
@@ -2,8 +2,8 @@
 a { color: blue; }
 a:visited { color: navy; }
 a:hover { color: red; }
-h1 { font-size: 100%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
-h1 .h1 { font-size: 150%; color: #777; text-decoration: none; font-style: italic; }
+h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
+h1 a, h1 a:visited { color: #777; text-decoration: none; font-style: italic; }
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; }
 h3 { font-weight: normal; font-size: 130%; margin: .8em 0; }
 table { margin: 0 20px .8em 0; border: 0; border-top: 1px solid #999; border-left: 1px solid #999; font-size: 90%; }
@@ -14,6 +14,7 @@
 p { margin: 0 20px 1em 0; }
 img { vertical-align: middle; border: 0; }
 code { background: #eee; }
+.version { float: right; color: #777; margin: 1.5em 1em; text-align: right; }
 .js .hidden { display: none; }
 .nowrap { white-space: nowrap; }
 .wrap { white-space: normal; }

Modified: trunk/adminer/include/design.inc.php
===================================================================
--- trunk/adminer/include/design.inc.php	2009-08-19 12:07:37 UTC (rev 979)
+++ trunk/adminer/include/design.inc.php	2009-08-19 14:11:58 UTC (rev 980)
@@ -62,9 +62,8 @@
 
 <?php switch_lang(); ?>
 <div id="menu">
-<h1><a href="http://www.adminer.org/" class="h1"><?php echo $adminer->name(); ?></a> &nbsp; <?php echo $VERSION; ?> &nbsp;
-<a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
-</h1>
+<div class="version"><?php echo $VERSION; ?> &nbsp; <a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a></div>
+<h1><a href="http://www.adminer.org/"><?php echo $adminer->name(); ?></a></h1>
 <?php $adminer->navigation($missing); ?>
 </div>
 <?php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[994] trunk/adminer

From: <jakubvrana@us...> - 2009-08-21 16:58

Revision: 994
          http://adminer.svn.sourceforge.net/adminer/?rev=994&view=rev
Author:   jakubvrana
Date:     2009-08-21 16:58:20 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Use shorthand property

Modified Paths:
--------------
    trunk/adminer/default.css
    trunk/adminer/include/version.inc.php

Modified: trunk/adminer/default.css
===================================================================
--- trunk/adminer/default.css	2009-08-21 16:54:10 UTC (rev 993)
+++ trunk/adminer/default.css	2009-08-21 16:58:20 UTC (rev 994)
@@ -1,4 +1,4 @@
-body { color: #000; background: #fff; line-height: 1.25em; font-family: Verdana, Arial, Helvetica, sans-serif; margin: 0; font-size: 90%; }
+body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; }
 a { color: blue; }
 a:visited { color: navy; }
 a:hover { color: red; }

Modified: trunk/adminer/include/version.inc.php
===================================================================
--- trunk/adminer/include/version.inc.php	2009-08-21 16:54:10 UTC (rev 993)
+++ trunk/adminer/include/version.inc.php	2009-08-21 16:58:20 UTC (rev 994)
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "2.0.1-dev";
+$VERSION = "2.1.0-dev";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[997] trunk/adminer

From: <jakubvrana@us...> - 2009-08-22 13:08

Revision: 997
          http://adminer.svn.sourceforge.net/adminer/?rev=997&view=rev
Author:   jakubvrana
Date:     2009-08-22 13:08:26 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
Print version after title

Modified Paths:
--------------
    trunk/adminer/default.css
    trunk/adminer/include/design.inc.php

Modified: trunk/adminer/default.css
===================================================================
--- trunk/adminer/default.css	2009-08-21 17:08:10 UTC (rev 996)
+++ trunk/adminer/default.css	2009-08-22 13:08:26 UTC (rev 997)
@@ -3,7 +3,6 @@
 a:visited { color: navy; }
 a:hover { color: red; }
 h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
-h1 a, h1 a:visited { color: #777; text-decoration: none; font-style: italic; }
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; }
 h3 { font-weight: normal; font-size: 130%; margin: .8em 0; }
 table { margin: 0 20px .8em 0; border: 0; border-top: 1px solid #999; border-left: 1px solid #999; font-size: 90%; }
@@ -17,7 +16,7 @@
 code { background: #eee; }
 tr:hover td { background: #ddf; }
 thead tr:hover td { background: #F5F5F5; }
-.version { float: right; color: #777; margin: 1.5em 1em; text-align: right; }
+.version { color: #777; font-size: 67%; }
 .js .hidden { display: none; }
 .nowrap { white-space: nowrap; }
 .wrap { white-space: normal; }
@@ -37,7 +36,8 @@
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }
 #lang { position: absolute; top: 0; left: 0; line-height: 1.8em; padding: .3em 1em; }
 #breadcrumb { white-space: nowrap; position: absolute; top: 0; left: 21em; background: #eee; height: 2em; line-height: 1.8em; padding: 0 1em; margin: 0 0 0 -18px; }
-#version { color: red; }
+#h1 { color: #777; text-decoration: none; font-style: italic; }
+#version { font-size: 67%; color: red; }
 #schema { margin-left: 60px; position: relative; }
 #schema .table { border: 1px solid Silver; padding: 0 2px; cursor: move; position: absolute; }
 #schema .references { position: absolute; }

Modified: trunk/adminer/include/design.inc.php
===================================================================
--- trunk/adminer/include/design.inc.php	2009-08-21 17:08:10 UTC (rev 996)
+++ trunk/adminer/include/design.inc.php	2009-08-22 13:08:26 UTC (rev 997)
@@ -62,8 +62,11 @@
 
 <?php switch_lang(); ?>
 <div id="menu">
-<div class="version"><?php echo $VERSION; ?> &nbsp; <a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a></div>
-<h1><a href="http://www.adminer.org/"><?php echo $adminer->name(); ?></a></h1>
+<h1>
+<a href="http://www.adminer.org/" id="h1"><?php echo $adminer->name(); ?></a>
+<span class="version"><?php echo $VERSION; ?></span>
+<a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+</h1>
 <?php $adminer->navigation($missing); ?>
 </div>
 <?php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1004] trunk/adminer

From: <jakubvrana@us...> - 2009-08-25 10:26

Revision: 1004
          http://adminer.svn.sourceforge.net/adminer/?rev=1004&view=rev
Author:   jakubvrana
Date:     2009-08-25 10:26:47 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Function nbsp

Modified Paths:
--------------
    trunk/adminer/db.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/processlist.inc.php
    trunk/adminer/table.inc.php
    trunk/adminer/variables.inc.php

Modified: trunk/adminer/db.inc.php
===================================================================
--- trunk/adminer/db.inc.php	2009-08-25 10:25:56 UTC (rev 1003)
+++ trunk/adminer/db.inc.php	2009-08-25 10:26:47 UTC (rev 1004)
@@ -60,7 +60,7 @@
 				$val = number_format($row[$key], 0, '.', lang(','));
 				echo '<td align="right">' . (strlen($row[$key]) ? '<a href="' . h(ME . "$link=") . urlencode($name) . '">' . str_replace(" ", "&nbsp;", ($key == "Rows" && $row["Engine"] == "InnoDB" && $val ? lang('~ %s', $val) : $val)) . '</a>' : '&nbsp;');
 			}
-			echo "<td>" . (strlen(trim($row["Comment"])) ? h($row["Comment"]) : "&nbsp;");
+			echo "<td>" . nbsp($row["Comment"]);
 		} else {
 			echo '<td colspan="8"><a href="' . h(ME) . "select=" . urlencode($name) . '">' . lang('View') . '</a>';
 		}

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-25 10:25:56 UTC (rev 1003)
+++ trunk/adminer/include/functions.inc.php	2009-08-25 10:26:47 UTC (rev 1004)
@@ -23,6 +23,10 @@
 	return htmlspecialchars($string, ENT_QUOTES);
 }
 
+function nbsp($string) {
+	return (strlen(trim($string)) ? h($string) : "&nbsp;");
+}
+
 function optionlist($options, $selected = null, $use_keys = false) {
 	$return = "";
 	foreach ($options as $k => $v) {
@@ -301,7 +305,7 @@
 		$functions = (isset($_GET["select"]) ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
 		$first = array_search("", $functions) + (isset($_GET["select"]) ? 1 : 0);
 		$onchange = ($first ? " onchange=\"var f = this.form['function[" . addcslashes($name, "\r\n'\\") . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\"" : "");
-		echo (count($functions) > 1 ? "<select name='function[$name]'>" . optionlist($functions, $function) . "</select>" : (strlen($functions[0]) ? h($functions[0]) : "&nbsp;")) . '<td>';
+		echo (count($functions) > 1 ? "<select name='function[$name]'>" . optionlist($functions, $function) . "</select>" : nbsp($functions[0])) . '<td>';
 		$input = $adminer->editInput($_GET["edit"], $field, " name='fields[$name]'$onchange", $value); // usage in call is without a table
 		if (strlen($input)) {
 			echo $input;

Modified: trunk/adminer/processlist.inc.php
===================================================================
--- trunk/adminer/processlist.inc.php	2009-08-25 10:25:56 UTC (rev 1003)
+++ trunk/adminer/processlist.inc.php	2009-08-25 10:26:47 UTC (rev 1004)
@@ -20,7 +20,7 @@
 	if (!$i) {
 		echo "<thead><tr lang='en'><th>&nbsp;<th>" . implode("<th>", array_keys($row)) . "</thead>\n";
 	}
-	echo "<tr" . odd() . "><td><input type='checkbox' name='kill[]' value='$row[Id]'><td>" . implode("<td>", $row) . "\n";
+	echo "<tr" . odd() . "><td><input type='checkbox' name='kill[]' value='$row[Id]'><td>" . implode("<td>", array_map('nbsp', $row)) . "\n";
 }
 $result->free();
 ?>

Modified: trunk/adminer/table.inc.php
===================================================================
--- trunk/adminer/table.inc.php	2009-08-25 10:25:56 UTC (rev 1003)
+++ trunk/adminer/table.inc.php	2009-08-25 10:26:47 UTC (rev 1004)
@@ -14,7 +14,7 @@
 	while ($row = $result->fetch_assoc()) {
 		echo "<tr><th>" . h($row["Field"]);
 		echo "<td>" . h($row["Type"]) . ($row["Null"] == "YES" ? " <i>NULL</i>" : "");
-		echo "<td>" . (strlen(trim($row["Comment"])) ? h($row["Comment"]) : "&nbsp;");
+		echo "<td>" . nbsp($row["Comment"]);
 		echo "\n";
 	}
 	echo "</table>\n";

Modified: trunk/adminer/variables.inc.php
===================================================================
--- trunk/adminer/variables.inc.php	2009-08-25 10:25:56 UTC (rev 1003)
+++ trunk/adminer/variables.inc.php	2009-08-25 10:26:47 UTC (rev 1004)
@@ -6,7 +6,7 @@
 while ($row = $result->fetch_assoc()) {
 	echo "<tr>";
 	echo "<th><code class='jush-sqlset'>" . h($row["Variable_name"]) . "</code>";
-	echo "<td>" . (strlen(trim($row["Value"])) ? h($row["Value"]) : "&nbsp;");
+	echo "<td>" . nbsp($row["Value"]);
 }
 $result->free();
 echo "</table>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1006] trunk/adminer

From: <jakubvrana@us...> - 2009-08-25 12:11

Revision: 1006
          http://adminer.svn.sourceforge.net/adminer/?rev=1006&view=rev
Author:   jakubvrana
Date:     2009-08-25 12:11:12 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Always set time limit (fixes #2844071)

Modified Paths:
--------------
    trunk/adminer/include/bootstrap.inc.php
    trunk/adminer/sql.inc.php

Modified: trunk/adminer/include/bootstrap.inc.php
===================================================================
--- trunk/adminer/include/bootstrap.inc.php	2009-08-25 10:27:27 UTC (rev 1005)
+++ trunk/adminer/include/bootstrap.inc.php	2009-08-25 12:11:12 UTC (rev 1006)
@@ -67,6 +67,7 @@
     unset($process);
 }
 set_magic_quotes_runtime(false);
+@set_time_limit(0); // @ - can be disabled
 
 define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen($_GET["db"]) ? 'db=' . urlencode($_GET["db"]) . '&' : ''));
 $on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); // used in foreign_keys()

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-08-25 10:27:27 UTC (rev 1005)
+++ trunk/adminer/sql.inc.php	2009-08-25 12:11:12 UTC (rev 1006)
@@ -10,7 +10,6 @@
 if (!$error && $_POST) {
 	$query = (isset($_POST["file"]) ? get_file("sql_file") : $_POST["query"]);
 	if (is_string($query)) { // get_file() returns error as number
-		@set_time_limit(0); // set_time_limit() can be disabled
 		$query = str_replace("\r", "", $query); // parser looks for \n
 		$query = rtrim($query);
 		if (strlen($query) && (!$history || end($history) != $query)) { // don't add repeated 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1014] trunk/adminer

From: <jakubvrana@us...> - 2009-08-25 15:42

Revision: 1014
          http://adminer.svn.sourceforge.net/adminer/?rev=1014&view=rev
Author:   jakubvrana
Date:     2009-08-25 15:42:43 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Remove useless translations

Modified Paths:
--------------
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/export.inc.php
    trunk/adminer/lang/cs.inc.php
    trunk/adminer/lang/de.inc.php
    trunk/adminer/lang/es.inc.php
    trunk/adminer/lang/et.inc.php
    trunk/adminer/lang/fr.inc.php
    trunk/adminer/lang/it.inc.php
    trunk/adminer/lang/nl.inc.php
    trunk/adminer/lang/ru.inc.php
    trunk/adminer/lang/sk.inc.php
    trunk/adminer/lang/zh-tw.inc.php
    trunk/adminer/lang/zh.inc.php
    trunk/adminer/schema.inc.php

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/include/adminer.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -8,7 +8,7 @@
 	* @return string
 	*/
 	function name() {
-		return lang('Adminer');
+		return "Adminer";
 	}
 	
 	/** Connection parameters
@@ -163,7 +163,7 @@
 			if ($index["type"] == "FULLTEXT") {
 				echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
 				echo " <input name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
-				echo "<label><input type='checkbox' name='boolean[$i]' value='1'" . (isset($_GET["boolean"][$i]) ? " checked" : "") . ">" . lang('BOOL') . "</label>";
+				echo "<label><input type='checkbox' name='boolean[$i]' value='1'" . (isset($_GET["boolean"][$i]) ? " checked" : "") . ">BOOL</label>";
 				echo "<br>\n";
 			}
 		}

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/include/editing.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -65,13 +65,13 @@
 	}
 	?>
 <thead><tr>
-<?php if ($type == "PROCEDURE") { ?><td><?php echo lang('IN-OUT'); ?><?php } ?>
+<?php if ($type == "PROCEDURE") { ?><td>&nbsp;<?php } ?>
 <th><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
 <td><?php echo lang('Type'); ?>
 <td><?php echo lang('Length'); ?>
 <td><?php echo lang('Options'); ?>
 <?php if ($type == "TABLE") { ?>
-<td><?php echo lang('NULL'); ?>
+<td>NULL
 <td><input type="radio" name="auto_increment_col" value=""><?php echo lang('Auto Increment'); ?>
 <td class="hidden"><?php echo lang('Default values'); ?>
 <td<?php echo ($column_comments ? "" : " class='hidden'"); ?>><?php echo lang('Comment'); ?>

Modified: trunk/adminer/include/export.inc.php
===================================================================
--- trunk/adminer/include/export.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/include/export.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -158,5 +158,6 @@
 }
 
 $dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>"
-	. " <select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>";
+	. " <select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>"
+;
 $max_packet = 1048576; // default, minimum is 1024

Modified: trunk/adminer/lang/cs.inc.php
===================================================================
--- trunk/adminer/lang/cs.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/cs.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Přihlásit se',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
 	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
 	'Server' => 'Server',
@@ -20,7 +19,6 @@
 	'Column name' => 'Název sloupce',
 	'Type' => 'Typ',
 	'Length' => 'Délka',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Volby',
 	'Save' => 'Uložit',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odešlete formulář znovu.',
 	'Comment' => 'Komentář',
 	'Default values' => 'Výchozí hodnoty',
-	'BOOL' => 'BOOL',
 	'Show column comments' => 'Zobrazit komentáře sloupců',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
 	'No commands to execute.' => 'Žádné příkazy k vykonání.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Seznam procesů',
 	'%d process(es) have been killed.' => array('Byl ukončen %d proces.', 'Byly ukončeny %d procesy.', 'Bylo ukončeno %d procesů.'),
 	'Kill' => 'Ukončit',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Název parametru',
 	'Database schema' => 'Schéma databáze',
 	'Create procedure' => 'Vytvořit proceduru',

Modified: trunk/adminer/lang/de.inc.php
===================================================================
--- trunk/adminer/lang/de.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/de.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Login',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
 	'Invalid credentials.' => 'Ungültige Anmelde-Informationen.',
 	'Server' => 'Server',
@@ -20,7 +19,6 @@
 	'Column name' => 'Spaltenname',
 	'Type' => 'Typ',
 	'Length' => 'Länge',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Auto-Inkrement',
 	'Options' => 'Optionen',
 	'Save' => 'Speichern',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'CSRF Token ungültig. Bitte die Formulardaten erneut abschicken.',
 	'Comment' => 'Kommentar',
 	'Default values' => 'Vorgabewerte festlegen',
-	'BOOL' => 'BOOL',
 	'Show column comments' => 'Spaltenkommentare zeigen',
 	'%d byte(s)' => array('%d Byte', '%d Bytes'),
 	'No commands to execute.' => 'Kein Kommando vorhanden.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Prozessliste',
 	'%d process(es) have been killed.' => array('%d Prozess gestoppt.', '%d Prozesse gestoppt.'),
 	'Kill' => 'Anhalten',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Name des Parameters',
 	'Database schema' => 'Datenbankschema',
 	'Create procedure' => 'Neue Prozedur',

Modified: trunk/adminer/lang/es.inc.php
===================================================================
--- trunk/adminer/lang/es.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/es.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Login',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Salida exitosa.',
 	'Invalid credentials.' => 'Autenticación fallada.',
 	'Server' => 'Servidor',
@@ -20,7 +19,6 @@
 	'Column name' => 'Nombre de columna',
 	'Type' => 'Tipo',
 	'Length' => 'Longitud',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Auto increment',
 	'Options' => 'Opciones',
 	'Save' => 'Guardar',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Vuelva a enviar los datos del formulario.',
 	'Comment' => 'Comentario',
 	'Default values' => 'Valores predeterminados',
-	'BOOL' => 'BOOL',
 	'Show column comments' => 'Mostrar comentario de columnas',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'No hay comando para ejecutar.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Lista de procesos',
 	'%d process(es) have been killed.' => array('%d proceso detenido.', '%d procesos detenidos.'),
 	'Kill' => 'Detener',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Nombre de Parametro',
 	'Database schema' => 'Esquema de base de datos',
 	'Create procedure' => 'Crear procedimiento',

Modified: trunk/adminer/lang/et.inc.php
===================================================================
--- trunk/adminer/lang/et.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/et.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Logi sisse',
-	'Adminer' => 'Andmebaasi haldaja',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
 	'Invalid credentials.' => 'Ebakorrektsed andmed.',
 	'Server' => 'Server',
@@ -20,7 +19,6 @@
 	'Column name' => 'Veeru nimi',
 	'Type' => 'Tüüp',
 	'Length' => 'Pikkus',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Automaatselt suurenev',
 	'Options' => 'Valikud',
 	'Save' => 'Salvesta',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Sobimatu CSRF, palun postitage vorm uuesti.',
 	'Comment' => 'Kommentaar',
 	'Default values' => 'Vaikimisi väärtused',
-	'BOOL' => 'Jah/Ei (BOOL)',
 	'Show column comments' => 'Kuva veeru kommentaarid',
 	'%d byte(s)' => array('%d bait', '%d baiti'),
 	'No commands to execute.' => 'Käsk puudub.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Protsesside nimekiri',
 	'%d process(es) have been killed.' => array('Protsess on edukalt peatatud (%d).', 'Valitud protsessid (%d) on edukalt peatatud.'),
 	'Kill' => 'Peata',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Parameetri nimi',
 	'Database schema' => 'Andmebaasi skeem',
 	'Create procedure' => 'Loo uus protseduur',

Modified: trunk/adminer/lang/fr.inc.php
===================================================================
--- trunk/adminer/lang/fr.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/fr.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Authentification',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Aurevoir!',
 	'Invalid credentials.' => 'Authentification échouée',
 	'Server' => 'Serveur',
@@ -20,7 +19,6 @@
 	'Column name' => 'Nom de la colonne',
 	'Type' => 'Type',
 	'Length' => 'Longeur',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Auto increment',
 	'Options' => 'Options',
 	'Save' => 'Sauvegarder',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF invalide. Veuillez réenvoyer le formulaire.',
 	'Comment' => 'Commentaire',
 	'Default values' => 'Valeurs par défaut',
-	'BOOL' => 'BOOL',
 	'Show column comments' => 'Voir les commentaires sur les colonnes',
 	'%d byte(s)' => array('%d octet', '%d octets'),
 	'No commands to execute.' => 'Aucune commande à exécuter.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Liste de processus',
 	'%d process(es) have been killed.' => array('%d processus arrêté.', '%d processus arrêtés.'),
 	'Kill' => 'Arrêter',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Nom du Paramêtre',
 	'Database schema' => 'Schéma de la base de données',
 	'Create procedure' => 'Créer une procédure',

Modified: trunk/adminer/lang/it.inc.php
===================================================================
--- trunk/adminer/lang/it.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/it.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Autenticazione',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Uscita effettuata con successo.',
 	'Invalid credentials.' => 'Credenziali non valide.',
 	'Server' => 'Server',
@@ -20,7 +19,6 @@
 	'Column name' => 'Nome colonna',
 	'Type' => 'Tipo',
 	'Length' => 'Lunghezza',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Auto incremento',
 	'Options' => 'Opzioni',
 	'Save' => 'Salva',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF non valido. Reinvia la richiesta.',
 	'Comment' => 'Commento',
 	'Default values' => 'Valori predefiniti',
-	'BOOL' => 'BOOL',
 	'Show column comments' => 'Mostra i commenti delle colonne',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Nessun commando da eseguire.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Elenco processi',
 	'%d process(es) have been killed.' => array('%d processo interrotto.', '%d processi interrotti.'),
 	'Kill' => 'Interrompi',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Nome parametro',
 	'Database schema' => 'Schema database',
 	'Create procedure' => 'Crea procedura',

Modified: trunk/adminer/lang/nl.inc.php
===================================================================
--- trunk/adminer/lang/nl.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/nl.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Inloggen',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Uitloggen geslaagd.',
 	'Invalid credentials.' => 'Ongeldige logingegevens.',
 	'Server' => 'Server',
@@ -20,7 +19,6 @@
 	'Column name' => 'Kolomnaam',
 	'Type' => 'Type',
 	'Length' => 'Lengte',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Auto nummering',
 	'Options' => 'Opties',
 	'Save' => 'Opslaan',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Ongeldig CSRF token. Verstuur het formulier opnieuw.',
 	'Comment' => 'Commentaar',
 	'Default values' => 'Standaard waarden',
-	'BOOL' => 'BOOL',
 	'Show column comments' => 'Kolomcommentaar weergeven',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Geen opdrachten uit te voeren.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Proceslijst',
 	'%d process(es) have been killed.' => array('%d proces gestopt.', '%d processen gestopt.'),
 	'Kill' => 'Stoppen',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Parameternaam',
 	'Database schema' => 'Database schema',
 	'Create procedure' => 'Procedure aanmaken',

Modified: trunk/adminer/lang/ru.inc.php
===================================================================
--- trunk/adminer/lang/ru.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/ru.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Войти',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Вы успешно покинули систему.',
 	'Invalid credentials.' => 'Неправильное имя пользователя или пароль.',
 	'Server' => 'Сервер',
@@ -20,7 +19,6 @@
 	'Column name' => 'Название поля',
 	'Type' => 'Тип',
 	'Length' => 'Длина',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Автоматическое приращение',
 	'Options' => 'Действие',
 	'Save' => 'Сохранить',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Недействительный CSRF токен. Отправите форму ещё раз.',
 	'Comment' => 'Комментарий',
 	'Default values' => 'Значения по умолчанию',
-	'BOOL' => 'Булев тип',
 	'Show column comments' => 'Показать комментарии к колонке',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтов'),
 	'No commands to execute.' => 'Нет команд для выполнения.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Список процессов',
 	'%d process(es) have been killed.' => array('Был завершен %d процесс.', 'Было завершено %d процесса.', 'Было завершёно %d процессов.'),
 	'Kill' => 'Завершить',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Название параметра',
 	'Database schema' => 'Схема базы данных',
 	'Create procedure' => 'Создать процедуру',

Modified: trunk/adminer/lang/sk.inc.php
===================================================================
--- trunk/adminer/lang/sk.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/sk.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => 'Prihlásiť sa',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => 'Odhlásenie prebehlo v poriadku.',
 	'Invalid credentials.' => 'Neplatné prihlasovacie údaje.',
 	'Server' => 'Server',
@@ -20,7 +19,6 @@
 	'Column name' => 'Názov stĺpca',
 	'Type' => 'Typ',
 	'Length' => 'Dĺžka',
-	'NULL' => 'NULL',
 	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Voľby',
 	'Save' => 'Uložiť',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odošlite formulár znova.',
 	'Comment' => 'Komentár',
 	'Default values' => 'Východzie hodnoty',
-	'BOOL' => 'BOOL',
 	'Show column comments' => 'Zobraziť komentáre stĺpcov',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtov'),
 	'No commands to execute.' => 'Žiadne príkazy na vykonanie.',
@@ -111,7 +108,6 @@
 	'Process list' => 'Zoznam procesov',
 	'%d process(es) have been killed.' => array('Bol ukončený %d proces.', 'Boli ukončené %d procesy.', 'Bolo ukončených %d procesov.'),
 	'Kill' => 'Ukončiť',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Názov parametra',
 	'Database schema' => 'Schéma databázy',
 	'Create procedure' => 'Vytvoriť procedúru',

Modified: trunk/adminer/lang/zh-tw.inc.php
===================================================================
--- trunk/adminer/lang/zh-tw.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/zh-tw.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => '登入',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => '登出成功。',
 	'Invalid credentials.' => '無效的憑證。',
 	'Server' => '伺服器',
@@ -20,7 +19,6 @@
 	'Column name' => '列名',
 	'Type' => '類型',
 	'Length' => '長度',
-	'NULL' => 'NULL',
 	'Auto Increment' => '自動增加',
 	'Options' => '選項',
 	'Save' => '儲存',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => '無效的 CSRF token。請重新發送表單。',
 	'Comment' => '註解',
 	'Default values' => '預設值',
-	'BOOL' => 'BOOL',
 	'Show column comments' => '顯示列註解',
 	'%d byte(s)' => '%d byte(s)',
 	'No commands to execute.' => '沒有命令可執行。',
@@ -111,7 +108,6 @@
 	'Process list' => '進程列表',
 	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
 	'Kill' => '終止',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => '參數名稱',
 	'Database schema' => '資料庫架構',
 	'Create procedure' => '建立預存程序',

Modified: trunk/adminer/lang/zh.inc.php
===================================================================
--- trunk/adminer/lang/zh.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/lang/zh.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	'Login' => '登录',
-	'Adminer' => 'Adminer',
 	'Logout successful.' => '注销成功。',
 	'Invalid credentials.' => '无效凭据。',
 	'Server' => '服务器',
@@ -20,7 +19,6 @@
 	'Column name' => '列名',
 	'Type' => '类型',
 	'Length' => '长度',
-	'NULL' => 'NULL',
 	'Auto Increment' => '自动增量',
 	'Options' => '选项',
 	'Save' => '保存',
@@ -73,7 +71,6 @@
 	'Invalid CSRF token. Send the form again.' => '无效 CSRF 令牌。重新发送表单。',
 	'Comment' => '注释',
 	'Default values' => '默认值',
-	'BOOL' => 'BOOL',
 	'Show column comments' => '显示列注释',
 	'%d byte(s)' => '%d 字节',
 	'No commands to execute.' => '没有命令执行。',
@@ -111,7 +108,6 @@
 	'Process list' => '进程列表',
 	'%d process(es) have been killed.' => '%d 个进程被终止',
 	'Kill' => '终止',
-	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => '参数名',
 	'Database schema' => '数据库概要',
 	'Create procedure' => '创建过程',

Modified: trunk/adminer/schema.inc.php
===================================================================
--- trunk/adminer/schema.inc.php	2009-08-25 15:23:44 UTC (rev 1013)
+++ trunk/adminer/schema.inc.php	2009-08-25 15:42:43 UTC (rev 1014)
@@ -62,7 +62,7 @@
 	echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;' onmousedown='schema_mousedown(this, event);'>";
 	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><strong>' . h($name) . "</strong></a><br>\n";
 	foreach ($table["fields"] as $field) {
-		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " " . lang('NULL') : '')) . '">' . h($field["field"]) . '</span>';
+		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " NULL" : '')) . '">' . h($field["field"]) . '</span>';
 		echo ($field["primary"] ? "<em>$val</em>" : $val) . "<br>\n";
 	}
 	foreach ((array) $table["references"] as $target_name => $refs) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1033] trunk/adminer

From: <jakubvrana@us...> - 2009-08-28 13:17

Revision: 1033
          http://adminer.svn.sourceforge.net/adminer/?rev=1033&view=rev
Author:   jakubvrana
Date:     2009-08-28 13:16:54 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
Optimize export speed

Modified Paths:
--------------
    trunk/adminer/dump.inc.php
    trunk/adminer/include/export.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/dump.inc.php
===================================================================
--- trunk/adminer/dump.inc.php	2009-08-28 11:49:57 UTC (rev 1032)
+++ trunk/adminer/dump.inc.php	2009-08-28 13:16:54 UTC (rev 1033)
@@ -146,7 +146,6 @@
 			}
 		}
 	}
-	dump();
 	exit;
 }
 

Modified: trunk/adminer/include/export.inc.php
===================================================================
--- trunk/adminer/include/export.inc.php	2009-08-28 11:49:57 UTC (rev 1032)
+++ trunk/adminer/include/export.inc.php	2009-08-28 13:16:54 UTC (rev 1033)
@@ -1,5 +1,5 @@
 <?php
-//! memory consumption, speed
+//! memory consumption
 
 function dump_table($table, $style, $is_view = false) {
 	global $dbh;
@@ -103,12 +103,15 @@
 		$result = $dbh->query(($select ? $select : "SELECT * FROM " . idf_escape($table))); //! enum and set as numbers, microtime
 		if ($result) {
 			$fields = fields($table);
-			$length = 0;
+			$insert = "";
+			$buffer = "";
 			while ($row = $result->fetch_assoc()) {
 				if ($_POST["format"] == "csv") {
 					dump_csv($row);
 				} else {
-					$insert = "INSERT INTO " . idf_escape($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
+					if (!$insert) {
+						$insert = "INSERT INTO " . idf_escape($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
+					}
 					$row2 = array();
 					foreach ($row as $key => $val) {
 						$row2[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$key]["type"]) ? $val : $dbh->quote($val)) : "NULL"); //! columns looking like functions
@@ -122,23 +125,21 @@
 						dump("$insert ($s) ON DUPLICATE KEY UPDATE " . implode(", ", $set) . ";\n");
 					} else {
 						$s = "\n($s)";
-						if (!$length) {
-							dump($insert . $s);
-							$length = strlen($insert) + strlen($s);
+						if (!$buffer) {
+							$buffer = $insert . $s;
 						} else {
-							$length += 1 + strlen($s); // 1 - separator length
-							if ($length < $max_packet) {
-								dump(",$s");
+							if (strlen($buffer) + 1 + strlen($s) < $max_packet) { // 1 - separator length
+								$buffer .= ",$s";
 							} else {
-								dump(";\n$insert$s");
-								$length = strlen($insert) + strlen($s);
+								dump("$buffer;\n");
+								$buffer = $insert . $s;
 							}
 						}
 					}
 				}
 			}
-			if ($_POST["format"] != "csv" && $style != "INSERT+UPDATE" && $result->num_rows) {
-				dump(";\n");
+			if ($_POST["format"] != "csv" && $style != "INSERT+UPDATE" && $buffer) {
+				dump("$buffer;\n");
 			}
 		}
 	}
@@ -151,8 +152,6 @@
 	if ($_POST["output"] == "file" || $_POST["compress"]) {
 		header("Content-Disposition: attachment; filename=$filename.$ext" . ($_POST["compress"] == "gz" ? ".gz" : ""));
 	}
-	ob_flush();
-	flush();
 	return $ext;
 }
 

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-28 11:49:57 UTC (rev 1032)
+++ trunk/adminer/include/functions.inc.php	2009-08-28 13:16:54 UTC (rev 1033)
@@ -360,14 +360,9 @@
 	}
 }
 
-function dump($string = null) { // null $string forces sending of buffer
-	static $buffer = "";
+function dump($string) {
 	if ($_POST["compress"] == "gz") {
-		$buffer .= $string;
-		if (!isset($string) || strlen($buffer) > 1e6) {
-			echo gzencode($buffer);
-			$buffer = "";
-		}
+		echo gzencode($string);
 	} else {
 		echo $string;
 	}

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-08-28 11:49:57 UTC (rev 1032)
+++ trunk/adminer/select.inc.php	2009-08-28 13:16:54 UTC (rev 1033)
@@ -48,7 +48,6 @@
 			}
 			dump_data($_GET["select"], "INSERT", implode(" UNION ALL ", $union));
 		}
-		dump();
 		exit;
 	}
 	if (!$adminer->selectEmailProcess($where)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1036] trunk/adminer

From: <jakubvrana@us...> - 2009-08-28 14:44

Revision: 1036
          http://adminer.svn.sourceforge.net/adminer/?rev=1036&view=rev
Author:   jakubvrana
Date:     2009-08-28 14:44:43 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
Bzip2 compression

Modified Paths:
--------------
    trunk/adminer/dump.inc.php
    trunk/adminer/include/export.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/dump.inc.php
===================================================================
--- trunk/adminer/dump.inc.php	2009-08-28 14:16:44 UTC (rev 1035)
+++ trunk/adminer/dump.inc.php	2009-08-28 14:44:43 UTC (rev 1036)
@@ -146,6 +146,7 @@
 			}
 		}
 	}
+	dump();
 	exit;
 }
 
@@ -164,7 +165,7 @@
 }
 echo "<tr><th>" . lang('Output') . "<td><input type='hidden' name='token' value='$token'>$dump_output\n"; // token is not needed but checked in bootstrap for all POST data
 echo "<tr><th>" . lang('Format') . "<td>$dump_format\n";
-echo "<tr><th>" . lang('Compression') . "<td>" . ($dump_compress ? $dump_compress : lang('None of the supported PHP extensions (%s) are available.', 'zlib')) . "\n";
+echo "<tr><th>" . lang('Compression') . "<td>" . ($dump_compress ? $dump_compress : lang('None of the supported PHP extensions (%s) are available.', 'zlib, bz2')) . "\n";
 echo "<tr><th>" . lang('Database') . "<td><select name='db_style'>" . optionlist($db_style, (strlen($_GET["db"]) ? '' : 'CREATE')) . "</select>\n";
 echo "<tr><th>" . lang('Tables') . "<td><select name='table_style'>" . optionlist($table_style, 'DROP+CREATE') . "</select>\n";
 echo "<tr><th>" . lang('Data') . "<td><select name='data_style'>" . optionlist($data_style, 'INSERT') . "</select>\n";

Modified: trunk/adminer/include/export.inc.php
===================================================================
--- trunk/adminer/include/export.inc.php	2009-08-28 14:16:44 UTC (rev 1035)
+++ trunk/adminer/include/export.inc.php	2009-08-28 14:44:43 UTC (rev 1036)
@@ -127,39 +127,47 @@
 						$s = "\n($s)";
 						if (!$buffer) {
 							$buffer = $insert . $s;
+						} elseif (strlen($buffer) + 1 + strlen($s) < $max_packet) { // 1 - separator length
+							$buffer .= ",$s";
 						} else {
-							if (strlen($buffer) + 1 + strlen($s) < $max_packet) { // 1 - separator length
-								$buffer .= ",$s";
-							} else {
-								dump("$buffer;\n");
-								$buffer = $insert . $s;
-							}
+							$buffer .= ";\n";
+							dump($buffer);
+							$buffer = $insert . $s;
 						}
 					}
 				}
 			}
 			if ($_POST["format"] != "csv" && $style != "INSERT+UPDATE" && $buffer) {
-				dump("$buffer;\n");
+				$buffer .= ";\n";
+				dump($buffer);
 			}
 		}
 	}
 }
 
 function dump_headers($identifier, $multi_table = false) {
+	$compress = $_POST["compress"];
 	$filename = (strlen($identifier) ? friendly_url($identifier) : "dump");
 	$ext = ($_POST["format"] == "sql" ? "sql" : ($multi_table ? "tar" : "csv")); // multiple CSV packed to TAR
-	header("Content-Type: " . ($_POST["compress"] == "gz" ? "application/x-gzip" : ($ext == "tar" ? "application/x-tar" : ($ext == "sql" || $_POST["output"] != "file" ? "text/plain" : "text/csv")) . "; charset=utf-8"));
-	if ($_POST["output"] == "file" || $_POST["compress"]) {
-		header("Content-Disposition: attachment; filename=$filename.$ext" . ($_POST["compress"] == "gz" ? ".gz" : ""));
+	header("Content-Type: " .
+		($compress == "bz2" ? "application/x-bzip" :
+		($compress == "gz" ? "application/x-gzip" :
+		($ext == "tar" ? "application/x-tar" :
+		($ext == "sql" || $_POST["output"] != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
+	))));
+	if ($_POST["output"] == "file" || $compress) {
+		header("Content-Disposition: attachment; filename=$filename.$ext" . (ereg('[0-9a-z]', $compress) ? ".$compress" : ""));
 	}
 	return $ext;
 }
 
 $compress = array();
 if (function_exists('gzencode')) {
-	$compress['gz'] = 'GZIP';
+	$compress['gz'] = 'gzip';
 }
-// bzcompress can't be called repetitively, bzopen requires temporary file
+if (function_exists('bzcompress')) {
+	$compress['bz2'] = 'bzip2';
+}
 // ZipArchive requires temporary file, ZIP can be created by gzcompress - see PEAR File_Archive
 $dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>";
 $dump_format = "<select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>";

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-28 14:16:44 UTC (rev 1035)
+++ trunk/adminer/include/functions.inc.php	2009-08-28 14:44:43 UTC (rev 1036)
@@ -360,9 +360,18 @@
 	}
 }
 
-function dump($string) {
-	if ($_POST["compress"] == "gz") {
-		echo gzencode($string);
+function dump($string = null) { // null $string forces sending of buffer
+	static $buffer = ""; // used to improve compression and to allow GZ archives unpackable in Total Commander
+	if ($_POST["compress"]) {
+		$buffer .= $string;
+		if (!isset($string) || strlen($buffer) > 1e6) {
+			if ($_POST["compress"] == "bz2") {
+				echo bzcompress($buffer); // should not be called repeatedly but it would require whole buffer in memory or temporary file
+			} else {
+				echo gzencode($buffer);
+			}
+			$buffer = "";
+		}
 	} else {
 		echo $string;
 	}

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-08-28 14:16:44 UTC (rev 1035)
+++ trunk/adminer/select.inc.php	2009-08-28 14:44:43 UTC (rev 1036)
@@ -48,6 +48,7 @@
 			}
 			dump_data($_GET["select"], "INSERT", implode(" UNION ALL ", $union));
 		}
+		dump();
 		exit;
 	}
 	if (!$adminer->selectEmailProcess($where)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1041] trunk/adminer

From: <jakubvrana@us...> - 2009-08-29 13:50

Revision: 1041
          http://adminer.svn.sourceforge.net/adminer/?rev=1041&view=rev
Author:   jakubvrana
Date:     2009-08-29 13:50:28 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
Bzip2 import

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/sql.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-28 16:28:39 UTC (rev 1040)
+++ trunk/adminer/include/functions.inc.php	2009-08-29 13:50:28 UTC (rev 1041)
@@ -166,7 +166,10 @@
 	if (!$file || $file["error"]) {
 		return $file["error"];
 	}
-	return file_get_contents($decompress && ereg('\\.gz$', $file["name"]) ? "compress.zlib://$file[tmp_name]" : $file["tmp_name"]); //! may not be reachable because of open_basedir
+	return file_get_contents($decompress && ereg('\\.gz$', $file["name"]) ? "compress.zlib://$file[tmp_name]"
+		: ($decompress && ereg('\\.bz2$', $file["name"]) ? "compress.bzip2://$file[tmp_name]"
+		: $file["tmp_name"]
+	)); //! may not be reachable because of open_basedir
 }
 
 function upload_error($error) {

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-08-28 16:28:39 UTC (rev 1040)
+++ trunk/adminer/sql.inc.php	2009-08-29 13:50:28 UTC (rev 1041)
@@ -10,7 +10,10 @@
 if (!$error && $_POST) {
 	$query = $_POST["query"];
 	if ($_POST["webfile"]) {
-		$query = @file_get_contents(file_exists("adminer.sql") ? "adminer.sql" : "compress.zlib://adminer.sql.gz");
+		$query = @file_get_contents(file_exists("adminer.sql") ? "adminer.sql"
+			: (file_exists("adminer.sql.gz") ? "compress.zlib://adminer.sql.gz"
+			: "compress.bzip2://adminer.sql.bz2"
+		));
 	} elseif ($_POST["file"]) {
 		$query = get_file("sql_file", true);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1050] trunk/adminer

From: <jakubvrana@us...> - 2009-08-30 22:21

Revision: 1050
          http://adminer.svn.sourceforge.net/adminer/?rev=1050&view=rev
Author:   jakubvrana
Date:     2009-08-30 22:21:36 +0000 (Sun, 30 Aug 2009)

Log Message:
-----------
Disable session.use_trans_sid to preserve export result
Do not depend on session.use_trans_sid without cookies

Modified Paths:
--------------
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/include/auth.inc.php
    trunk/adminer/include/bootstrap.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/privileges.inc.php

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-08-30 21:22:05 UTC (rev 1049)
+++ trunk/adminer/include/adminer.inc.php	2009-08-30 22:21:36 UTC (rev 1050)
@@ -425,7 +425,9 @@
 </p>
 </form>
 <form action="">
-<p><?php if (strlen($_GET["server"])) { ?><input type="hidden" name="server" value="<?php echo h($_GET["server"]); ?>"><?php } ?>
+<p>
+<?php if (SID) { ?><input type="hidden" name="<?php echo session_name(); ?>" value="<?php echo h(session_id()); ?>"><?php } ?>
+<?php if (strlen($_GET["server"])) { ?><input type="hidden" name="server" value="<?php echo h($_GET["server"]); ?>"><?php } ?>
 <?php if ($databases) { ?>
 <select name="db" onchange="this.form.submit();"><option value="">(<?php echo lang('database'); ?>)<?php echo optionlist($databases, DB); ?></select>
 <?php } else { ?>

Modified: trunk/adminer/include/auth.inc.php
===================================================================
--- trunk/adminer/include/auth.inc.php	2009-08-30 21:22:05 UTC (rev 1049)
+++ trunk/adminer/include/auth.inc.php	2009-08-30 22:21:36 UTC (rev 1050)
@@ -1,27 +1,22 @@
 <?php
 $ignore = array("server", "username", "password");
 $session_name = session_name();
-if (ini_get("session.use_trans_sid") && isset($_POST[$session_name])) {
-	$ignore[] = $session_name;
-}
 if (isset($_POST["server"])) {
-	if (isset($_COOKIE[$session_name]) || isset($_POST[$session_name])) {
-		session_regenerate_id(); // defense against session fixation
-		$_SESSION["usernames"][$_POST["server"]] = $_POST["username"];
-		$_SESSION["passwords"][$_POST["server"]] = $_POST["password"];
-		$_SESSION["tokens"][$_POST["server"]] = rand(1, 1e6); // defense against cross-site request forgery
-		if (count($_POST) == count($ignore)) {
-			$location = ((string) $_GET["server"] === $_POST["server"] ? remove_from_uri() : preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . (strlen($_POST["server"]) ? '?server=' . urlencode($_POST["server"]) : ''));
-			if (!isset($_COOKIE[$session_name])) {
-				$location .= (strpos($location, "?") === false ? "?" : "&") . SID;
-			}
-			header("Location: " . (strlen($location) ? $location : "."));
-			exit;
+	session_regenerate_id(); // defense against session fixation
+	$_SESSION["usernames"][$_POST["server"]] = $_POST["username"];
+	$_SESSION["passwords"][$_POST["server"]] = $_POST["password"];
+	$_SESSION["tokens"][$_POST["server"]] = rand(1, 1e6); // defense against cross-site request forgery
+	if (count($_POST) == count($ignore)) {
+		$location = ((string) $_GET["server"] === $_POST["server"] ? remove_from_uri() : preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . (strlen($_POST["server"]) ? '?server=' . urlencode($_POST["server"]) : ''));
+		if (!isset($_COOKIE[$session_name])) {
+			$location .= (strpos($location, "?") === false ? "?" : "&") . SID;
 		}
-		if ($_POST["token"]) {
-			$_POST["token"] = $_SESSION["tokens"][$_POST["server"]];
-		}
+		header("Location: " . (strlen($location) ? $location : "."));
+		exit;
 	}
+	if ($_POST["token"]) {
+		$_POST["token"] = $_SESSION["tokens"][$_POST["server"]];
+	}
 	$_GET["server"] = $_POST["server"];
 } elseif (isset($_POST["logout"])) {
 	if ($_POST["token"] != $_SESSION["tokens"][$_GET["server"]]) {

Modified: trunk/adminer/include/bootstrap.inc.php
===================================================================
--- trunk/adminer/include/bootstrap.inc.php	2009-08-30 21:22:05 UTC (rev 1049)
+++ trunk/adminer/include/bootstrap.inc.php	2009-08-30 22:21:36 UTC (rev 1050)
@@ -45,6 +45,7 @@
 
 if (!ini_get("session.auto_start")) {
 	// use specific session name to get own namespace
+	@ini_set("session.use_trans_sid", false); // @ - may be disabled
 	session_name("adminer_sid");
 	session_set_cookie_params(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"])); //! use HttpOnly in PHP 5
 	session_start();
@@ -70,7 +71,7 @@
 @set_time_limit(0); // @ - can be disabled
 
 define("DB", $_GET["db"]); // for the sake of speed and size
-define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen(DB) ? 'db=' . urlencode(DB) . '&' : ''));
+define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (SID ? SID . '&' : '') . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen(DB) ? 'db=' . urlencode(DB) . '&' : ''));
 $on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); // used in foreign_keys()
 
 include "../adminer/include/version.inc.php";

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-30 21:22:05 UTC (rev 1049)
+++ trunk/adminer/include/functions.inc.php	2009-08-30 22:21:36 UTC (rev 1050)
@@ -104,10 +104,6 @@
 	if (isset($message)) {
 		$_SESSION["messages"][] = $message;
 	}
-	if (strlen(SID)) {
-		// append SID if session cookies are disabled
-		$location .= (strpos($location, "?") === false ? "?" : "&") . SID;
-	}
 	header("Location: " . (strlen($location) ? $location : "."));
 	exit;
 }

Modified: trunk/adminer/privileges.inc.php
===================================================================
--- trunk/adminer/privileges.inc.php	2009-08-30 21:22:05 UTC (rev 1049)
+++ trunk/adminer/privileges.inc.php	2009-08-30 22:21:36 UTC (rev 1050)
@@ -6,6 +6,7 @@
 if (!$result) {
 	?>
 	<form action=""><p>
+	<?php if (SID) { ?><input type="hidden" name="<?php echo session_name(); ?>" value="<?php echo h(session_id()); ?>"><?php } ?>
 	<?php if (strlen($_GET["server"])) { ?><input type="hidden" name="server" value="<?php echo h($_GET["server"]); ?>"><?php } ?>
 	<?php echo lang('Username'); ?>: <input name="user">
 	<?php echo lang('Server'); ?>: <input name="host" value="localhost">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1052] trunk/adminer

From: <jakubvrana@us...> - 2009-08-31 10:12

Revision: 1052
          http://adminer.svn.sourceforge.net/adminer/?rev=1052&view=rev
Author:   jakubvrana
Date:     2009-08-31 10:11:52 +0000 (Mon, 31 Aug 2009)

Log Message:
-----------
Comments

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/include/mysql.inc.php
    trunk/adminer/sql.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-31 07:58:03 UTC (rev 1051)
+++ trunk/adminer/include/functions.inc.php	2009-08-31 10:11:52 UTC (rev 1052)
@@ -1,32 +1,62 @@
 <?php
+/** Get database connection
+* @return Min_DB
+*/
 function get_dbh() {
 	// can be used in customization, $dbh is minified
 	global $dbh;
 	return $dbh;
 }
 
+/** Escape database identifier
+* @param string
+* @return string
+*/
 function idf_escape($idf) {
 	return "`" . str_replace("`", "``", $idf) . "`";
 }
 
+/** Unescape database identifier
+* @param string text inside ``
+* @return string
+*/
 function idf_unescape($idf) {
 	return str_replace("``", "`", $idf);
 }
 
+/** Escape or unescape string to use inside form []
+* @param string
+* @param bool
+* @return string
+*/
 function bracket_escape($idf, $back = false) {
 	// escape brackets inside name="x[]"
 	static $trans = array(':' => ':1', ']' => ':2', '[' => ':3');
 	return strtr($idf, ($back ? array_flip($trans) : $trans));
 }
 
+/** Escape for HTML
+* @param string
+* @return string
+*/
 function h($string) {
 	return htmlspecialchars($string, ENT_QUOTES);
 }
 
+/** Escape for TD
+* @param string
+* @return string
+*/
 function nbsp($string) {
 	return (strlen(trim($string)) ? h($string) : "&nbsp;");
 }
 
+/** Generate list of HTML options
+* @param array array of strings or arrays (creates optgroup)
+* @param mixed
+* @param bool always use array keys for value="", otherwise only string keys are used
+* @return string
+*/
 function optionlist($options, $selected = null, $use_keys = false) {
 	$return = "";
 	foreach ($options as $k => $v) {
@@ -43,6 +73,11 @@
 	return $return;
 }
 
+/** Get list of values from database
+* @param string
+* @param mixed
+* @return array
+*/
 function get_vals($query, $column = 0) {
 	global $dbh;
 	$return = array();
@@ -55,6 +90,11 @@
 	return $return;
 }
 
+/** Find unique identifier of a row
+* @param array
+* @param array result of indexes()
+* @return string query string
+*/
 function unique_idf($row, $indexes) {
 	foreach ($indexes as $index) {
 		if ($index["type"] == "PRIMARY" || $index["type"] == "UNIQUE") {
@@ -77,6 +117,10 @@
 	return $return;
 }
 
+/** Create SQL condition from parsed query string
+* @param array parsed query string
+* @return string
+*/
 function where($where) {
 	global $dbh;
 	$return = array();
@@ -91,15 +135,30 @@
 	return implode(" AND ", $return);
 }
 
+/** Create SQL condition from query string
+* @param string
+* @return string
+*/
 function where_check($val) {
 	parse_str($val, $check);
 	return where($check);
 }
 
+/** Create query string where condition from value
+* @param int condition order
+* @param string column identifier
+* @param string
+* @return string
+*/
 function where_link($i, $column, $value) {
 	return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=%3D&where%5B$i%5D%5Bval%5D=" . urlencode($value);
 }
 
+/** Send Location header and exit
+* @param string
+* @param string
+* @return null
+*/
 function redirect($location, $message = null) {
 	if (isset($message)) {
 		$_SESSION["messages"][] = $message;
@@ -108,6 +167,15 @@
 	exit;
 }
 
+/** Execute query and redirect if successful
+* @param string
+* @param string
+* @param string
+* @param bool
+* @param bool
+* @param bool
+* @return bool
+*/
 function query_redirect($query, $location, $message, $redirect = true, $execute = true, $failed = false) {
 	global $dbh, $error, $adminer;
 	$sql = "";
@@ -127,6 +195,10 @@
 	return true;
 }
 
+/** Execute and remember query
+* @param string null to return remembered queries
+* @return Min_Result
+*/
 function queries($query = null) {
 	global $dbh;
 	static $queries = array();
@@ -138,15 +210,28 @@
 	return $dbh->query($query);
 }
 
+/** Remove parameter from query string
+* @param string
+* @return string
+*/
 function remove_from_uri($param = "") {
 	$param = "($param|" . session_name() . ")";
 	return preg_replace("~\\?$param=[^&]*&~", '?', preg_replace("~\\?$param=[^&]*\$|&$param=[^&]*~", '', $_SERVER["REQUEST_URI"]));
 }
 
+/** Generate page number for pagination
+* @param int
+* @return string
+*/
 function pagination($page) {
 	return " " . ($page == $_GET["page"] ? $page + 1 : '<a href="' . h(remove_from_uri("page") . ($page ? "&page=$page" : "")) . '">' . ($page + 1) . "</a>");
 }
 
+/** Get file contents from $_FILES or $_POST["files"]
+* @param string
+* @param bool
+* @return string
+*/
 function get_file($key, $decompress = false) {
 	// returns int for error, string otherwise
 	$file = $_POST["files"][$key];
@@ -168,19 +253,32 @@
 	)); //! may not be reachable because of open_basedir
 }
 
+/** Determine upload error
+* @param int
+* @return string
+*/
 function upload_error($error) {
 	$max_size = ($error == UPLOAD_ERR_INI_SIZE ? ini_get("upload_max_filesize") : null); // post_max_size is checked in index.php
 	return ($error ? lang('Unable to upload a file.') . ($max_size ? " " . lang('Maximum allowed file size is %sB.', $max_size) : "") : lang('File does not exist.'));
 }
 
-function odd($s = ' class="odd"') {
+/** Generate class for odd rows
+* @param string return this for odd rows, empty to reset counter
+* @return string
+*/
+function odd($return = ' class="odd"') {
 	static $i = 0;
-	if (!$s) { // reset counter
+	if (!$return) { // reset counter
 		$i = -1;
 	}
-	return ($i++ % 2 ? $s : '');
+	return ($i++ % 2 ? $return : '');
 }
 
+/** Print select result
+* @param Min_Result
+* @param Min_DB connection to examine indexes
+* @return null
+*/
 function select($result, $dbh2 = null) {
 	if (!$result->num_rows) {
 		echo "<p class='message'>" . lang('No rows.') . "\n";
@@ -253,11 +351,21 @@
 	}
 }
 
+/** Check whether the string is in UTF-8
+* @param string
+* @return bool
+*/
 function is_utf8($val) {
 	// don't print control chars except \t\r\n
 	return (preg_match('~~u', $val) && !preg_match('~[\\0-\\x8\\xB\\xC\\xE-\\x1F]~', $val));
 }
 
+/** Shorten UTF-8 string
+* @param string
+* @param int
+* @param string
+* @return string escaped string with appended ...
+*/
 function shorten_utf8($string, $length = 80, $suffix = "") {
 	if (!preg_match("~^((?:.|\n){0,$length})(.|\n)?~u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions
 		preg_match("(^([\t\r\n -~]{0,$length})(.?))s", $string, $match);
@@ -265,11 +373,20 @@
 	return h($match[1]) . $suffix . ($match[2] ? "<em>...</em>" : "");
 }
 
+/** Generate friendly URL
+* @param string
+* @return string
+*/
 function friendly_url($val) {
 	// used for blobs and export
 	return preg_replace('~[^a-z0-9_]~i', '-', $val);
 }
 
+/** Print hidden fields
+* @param array
+* @param array
+* @return null
+*/
 function hidden_fields($process, $ignore = array()) {
 	while (list($key, $val) = each($process)) {
 		if (is_array($val)) {
@@ -282,6 +399,10 @@
 	}
 }
 
+/** Find out foreign keys for each column
+* @param string
+* @return array array($col => array())
+*/
 function column_foreign_keys($table) {
 	$return = array();
 	foreach (foreign_keys($table) as $foreign_key) {
@@ -292,6 +413,12 @@
 	return $return;
 }
 
+/** Print edit input field
+* @param array one field from fields()
+* @param mixed
+* @param string
+* @return null
+*/
 function input($field, $value, $function) {
 	global $types, $adminer;
 	$name = h(bracket_escape($field["field"]));
@@ -335,6 +462,10 @@
 	}
 }
 
+/** Process edit input field
+* @param one field from fields()
+* @return string
+*/
 function process_input($field) {
 	global $dbh, $adminer;
 	$idf = bracket_escape($field["field"]);
@@ -359,6 +490,10 @@
 	}
 }
 
+/** Print data with optional compression
+* @param string null to force output
+* @return null
+*/
 function dump($string = null) { // null $string forces sending of buffer
 	static $buffer = ""; // used to improve compression and to allow GZ archives unpackable in Total Commander
 	if ($_POST["compress"]) {
@@ -376,6 +511,10 @@
 	}
 }
 
+/** Print CSV row
+* @param array
+* @return null
+*/
 function dump_csv($row) {
 	foreach ($row as $key => $val) {
 		if (preg_match("~[\"\n,]~", $val) || (isset($val) && !strlen($val))) {
@@ -385,10 +524,19 @@
 	dump(implode(",", $row) . "\n");
 }
 
+/** Apply SQL function
+* @param string
+* @param string escaped column identifier
+* @return string
+*/
 function apply_sql_function($function, $column) {
 	return ($function ? ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)" : $column);
 }
 
+/** Check whether the string is e-mail address
+* @param string
+* @return bool
+*/
 function is_email($email) {
 	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
 	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component

Modified: trunk/adminer/include/mysql.inc.php
===================================================================
--- trunk/adminer/include/mysql.inc.php	2009-08-31 07:58:03 UTC (rev 1051)
+++ trunk/adminer/include/mysql.inc.php	2009-08-31 10:11:52 UTC (rev 1052)
@@ -140,6 +140,9 @@
 	exit;
 }
 
+/** Connect to the database
+* @return mixed Min_DB or string for error
+*/
 function connect() {
 	global $adminer;
 	$dbh = new Min_DB;
@@ -152,6 +155,10 @@
 	return $dbh->error;
 }
 
+/** Get cached list of databases
+* @param bool
+* @return array
+*/
 function get_databases($flush = true) {
 	// SHOW DATABASES can take a very long time so it is cached
 	$return = &$_SESSION["databases"][$_GET["server"]];
@@ -165,6 +172,10 @@
 	return $return;
 }
 
+/** Get table status
+* @param string
+* @return array
+*/
 function table_status($name = "") {
 	global $dbh;
 	$return = array();
@@ -179,6 +190,9 @@
 	return (strlen($name) ? $return[$name] : $return);
 }
 
+/** Get status of referencable tables
+* @return array
+*/
 function table_status_referencable() {
 	$return = array();
 	foreach (table_status() as $name => $row) {
@@ -189,6 +203,10 @@
 	return $return;
 }
 
+/** Get information about fields
+* @param string
+* @return array array($name => array("field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => ))
+*/
 function fields($table) {
 	global $dbh;
 	$return = array();
@@ -216,6 +234,11 @@
 	return $return;
 }
 
+/** Get table indexes
+* @param string
+* @param string Min_DB to use
+* @return array array($key_name => array("type" => , "columns" => array(), "lengths" => array()))
+*/
 function indexes($table, $dbh2 = null) {
 	global $dbh;
 	if (!is_object($dbh2)) { // use the main connection if the separate connection is unavailable
@@ -233,6 +256,10 @@
 	return $return;
 }
 
+/** Get foreign keys in table
+* @param string
+* @return array array($name => array("db" => , "table" => , "source" => array(), "target" => array(), "on_delete" => , "on_update" => ))
+*/
 function foreign_keys($table) {
 	global $dbh, $on_actions;
 	static $pattern = '(?:[^`]|``)+';
@@ -257,11 +284,18 @@
 	return $return;
 }
 
+/** Get view SELECT
+* @param string
+* @return array array("select" => )
+*/
 function view($name) {
 	global $dbh;
 	return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)* AS ~U', '', $dbh->result($dbh->query("SHOW CREATE VIEW " . idf_escape($name)), 1)));
 }
 
+/** Get sorted grouped list of collations
+* @return array
+*/
 function collations() {
 	global $dbh;
 	$return = array();
@@ -276,11 +310,19 @@
 	return $return;
 }
 
+/** Escape string to use inside ''
+* @param string
+* @return string
+*/
 function escape_string($val) {
 	global $dbh;
 	return substr($dbh->quote($val), 1, -1);
 }
 
+/** Find out if database is information_schema
+* @param string
+* @return bool
+*/
 function information_schema($db) {
 	global $dbh;
 	return ($dbh->server_info >= 5 && $db == "information_schema");

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-08-31 07:58:03 UTC (rev 1051)
+++ trunk/adminer/sql.inc.php	2009-08-31 10:11:52 UTC (rev 1052)
@@ -85,7 +85,7 @@
 						$offset = strlen($query);
 					}
 				} else { // find matching quote
-					while (preg_match("~$found|\\\\.|\$~s", $query, $match, PREG_OFFSET_CAPTURE, $offset)) {
+					while (preg_match("~$found|\\\\.|\$~s", $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
 						$s = $match[0][0];
 						$offset = $match[0][1] + strlen($s);
 						if (!$s || $s == $found) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1060] trunk/adminer

From: <jakubvrana@us...> - 2009-09-02 13:58

Revision: 1060
          http://adminer.svn.sourceforge.net/adminer/?rev=1060&view=rev
Author:   jakubvrana
Date:     2009-09-02 13:58:45 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
Separate "post_max_size" from translations

Modified Paths:
--------------
    trunk/adminer/include/bootstrap.inc.php
    trunk/adminer/lang/cs.inc.php
    trunk/adminer/lang/de.inc.php
    trunk/adminer/lang/es.inc.php
    trunk/adminer/lang/et.inc.php
    trunk/adminer/lang/fr.inc.php
    trunk/adminer/lang/it.inc.php
    trunk/adminer/lang/nl.inc.php
    trunk/adminer/lang/ru.inc.php
    trunk/adminer/lang/sk.inc.php
    trunk/adminer/lang/zh-tw.inc.php
    trunk/adminer/lang/zh.inc.php

Modified: trunk/adminer/include/bootstrap.inc.php
===================================================================
--- trunk/adminer/include/bootstrap.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/include/bootstrap.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -95,5 +95,5 @@
 $token = $_SESSION["tokens"][$_GET["server"]];
 $error = ($_POST
 	? ($_POST["token"] == $token ? "" : lang('Invalid CSRF token. Send the form again.'))
-	: ($_SERVER["REQUEST_METHOD"] != "POST" ? "" : lang('Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.')) // posted form with no data means that post_max_size exceeded because Adminer always sends token at least
+	: ($_SERVER["REQUEST_METHOD"] != "POST" ? "" : lang('Too big POST data. Reduce the data or increase the %s configuration directive.', '"post_max_size"')) // posted form with no data means that post_max_size exceeded because Adminer always sends token at least
 );

Modified: trunk/adminer/lang/cs.inc.php
===================================================================
--- trunk/adminer/lang/cs.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/cs.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -141,7 +141,7 @@
 	'Routine' => 'Procedura',
 	'Grant' => 'Povolit',
 	'Revoke' => 'Zakázat',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'Příliš velká POST data. Zmenšete data nebo zvyšte hodnotu konfigurační direktivy "post_max_size".',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Příliš velká POST data. Zmenšete data nebo zvyšte hodnotu konfigurační direktivy %s.',
 	'Logged as: %s' => 'Přihlášen jako: %s',
 	'Move up' => 'Přesunout nahoru',
 	'Move down' => 'Přesunout dolů',

Modified: trunk/adminer/lang/de.inc.php
===================================================================
--- trunk/adminer/lang/de.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/de.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -141,7 +141,7 @@
 	'Routine' => 'Rutine',
 	'Grant' => 'Erlauben',
 	'Revoke' => 'Verbieten',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'POST data zu gross. Reduzieren Sie die Grösse oder vergrössern Sie den Wert "post_max_size" in der Konfiguration.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST data zu gross. Reduzieren Sie die Grösse oder vergrössern Sie den Wert %s in der Konfiguration.',
 	'Logged as: %s' => 'Angemeldet als: %s',
 	'Move up' => 'Nach oben',
 	'Move down' => 'Nach unten',

Modified: trunk/adminer/lang/es.inc.php
===================================================================
--- trunk/adminer/lang/es.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/es.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -141,7 +141,7 @@
 	'Routine' => 'Rutina',
 	'Grant' => 'Conceder',
 	'Revoke' => 'Impedir',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'POST data demasiado grande. Reduzca el tamaño o aumente la directiva de configuración "post_max_size".',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST data demasiado grande. Reduzca el tamaño o aumente la directiva de configuración %s.',
 	'Logged as: %s' => 'Logeado como: %s',
 	'Move up' => 'Mover arriba',
 	'Move down' => 'Mover abajo',

Modified: trunk/adminer/lang/et.inc.php
===================================================================
--- trunk/adminer/lang/et.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/et.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -142,7 +142,7 @@
 	'Revoke' => 'Eemalda',
 	'MySQL version: %s through PHP extension %s' => 'MySQL versioon: %s, kasutatud PHP moodul: %s',
 	'Logged as: %s' => 'Sisse logitud: %s',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'POST-andmete maht on liialt suur. Palun vähendage andmeid või suurendage "post_max_size" php-seadet.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST-andmete maht on liialt suur. Palun vähendage andmeid või suurendage %s php-seadet.',
 	'Move up' => 'Liiguta ülespoole',
 	'Move down' => 'Liiguta allapoole',
 	'Export' => 'Ekspordi',

Modified: trunk/adminer/lang/fr.inc.php
===================================================================
--- trunk/adminer/lang/fr.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/fr.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -142,7 +142,7 @@
 	'Revoke' => 'Revoke',
 	'MySQL version: %s through PHP extension %s' => 'Version de MySQL: %s utilisant l\'extension %s',
 	'Logged as: %s' => 'Authentifié en tant que %s',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'Donnée POST trop grande . Réduire la taille des données ou modifier le "post_max_size" dans la configuration de PHP.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Donnée POST trop grande . Réduire la taille des données ou modifier le %s dans la configuration de PHP.',
 	'Move up' => 'Déplacer vers le haut',
 	'Move down' => 'Déplacer vers le bas',
 	'Export' => 'Exporter',

Modified: trunk/adminer/lang/it.inc.php
===================================================================
--- trunk/adminer/lang/it.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/it.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -141,7 +141,7 @@
 	'Routine' => 'Routine',
 	'Grant' => 'Permetti',
 	'Revoke' => 'Revoca',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'Troppi dati via POST. Ridurre i dati o aumentare la direttiva di configurazione "post_max_size".',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Troppi dati via POST. Ridurre i dati o aumentare la direttiva di configurazione %s.',
 	'Logged as: %s' => 'Autenticato come: %s',
 	'Move up' => 'Sposta su',
 	'Move down' => 'Sposta giu',

Modified: trunk/adminer/lang/nl.inc.php
===================================================================
--- trunk/adminer/lang/nl.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/nl.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -142,7 +142,7 @@
 	'Grant' => 'Toekennen',
 	'Revoke' => 'Intrekken',
 	'Logged as: %s' => 'Aangemeld als: %s',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'POST-data is te groot. Verklein de hoeveelheid data of verhoog de "post_max_size" configuratie.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST-data is te groot. Verklein de hoeveelheid data of verhoog de %s configuratie.',
 	'Move up' => 'Omhoog',
 	'Move down' => 'Omlaag',
 	'Export' => 'Exporteren',

Modified: trunk/adminer/lang/ru.inc.php
===================================================================
--- trunk/adminer/lang/ru.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/ru.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -141,7 +141,7 @@
 	'Routine' => 'Процедура',
 	'Grant' => 'Позволить',
 	'Revoke' => 'Запретить',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'Слишком большой объем POST-данных. Пошлите меньший объем данных или увеличьте параметр конфигурационной директивы "post_max_size".',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Слишком большой объем POST-данных. Пошлите меньший объем данных или увеличьте параметр конфигурационной директивы %s.',
 	'Logged as: %s' => 'Вы вошли как: %s',
 	'Move up' => 'Переместить вверх',
 	'Move down' => 'Переместить вниз',

Modified: trunk/adminer/lang/sk.inc.php
===================================================================
--- trunk/adminer/lang/sk.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/sk.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -141,7 +141,7 @@
 	'Routine' => 'Procedúra',
 	'Grant' => 'Povoliť',
 	'Revoke' => 'Zakázať',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'Príliš veľké POST dáta. Zmenšite dáta alebo zvýšte hodnotu konfiguračej direktívy "post_max_size".',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Príliš veľké POST dáta. Zmenšite dáta alebo zvýšte hodnotu konfiguračej direktívy %s.',
 	'Logged as: %s' => 'Prihlásený ako: %s',
 	'Move up' => 'Presunúť hore',
 	'Move down' => 'Presunúť dolu',

Modified: trunk/adminer/lang/zh-tw.inc.php
===================================================================
--- trunk/adminer/lang/zh-tw.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/zh-tw.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -142,7 +142,7 @@
 	'Grant' => '授權',
 	'Revoke' => '廢除',
 	'Logged as: %s' => '登錄為：%s',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => 'POST 資料太大。減少資料或者增加 “post_max_size” 的設定值。',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 資料太大。減少資料或者增加 %s 的設定值。',
 	'Move up' => '上移',
 	'Move down' => '下移',
 	'Export' => '匯出',

Modified: trunk/adminer/lang/zh.inc.php
===================================================================
--- trunk/adminer/lang/zh.inc.php	2009-09-02 13:54:20 UTC (rev 1059)
+++ trunk/adminer/lang/zh.inc.php	2009-09-02 13:58:45 UTC (rev 1060)
@@ -142,7 +142,7 @@
 	'Grant' => '授权',
 	'Revoke' => '废除',
 	'Logged as: %s' => '登录为：%s',
-	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => '太大的 POST 数据。减少数据或者增加 “post_max_size” 配置命令。',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => '太大的 POST 数据。减少数据或者增加 %s 配置命令。',
 	'Move up' => '上移',
 	'Move down' => '下移',
 	'Export' => '导出',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1092] trunk/adminer

From: <jakubvrana@us...> - 2009-09-11 17:08

Revision: 1092
          http://adminer.svn.sourceforge.net/adminer/?rev=1092&view=rev
Author:   jakubvrana
Date:     2009-09-11 17:08:18 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
IE fixes

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/dump.inc.php
    trunk/adminer/editing.js
    trunk/adminer/foreign.inc.php
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/sql.inc.php
    trunk/adminer/trigger.inc.php
    trunk/adminer/user.inc.php

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/create.inc.php	2009-09-11 17:08:18 UTC (rev 1092)
@@ -146,6 +146,7 @@
 <select name="Engine"><option value="">(<?php echo lang('engine'); ?>)<?php echo optionlist($engines, $row["Engine"]); ?></select>
 <select name="Collation"><option value="">(<?php echo lang('collation'); ?>)<?php echo optionlist($collations, $row["Collation"]); ?></select>
 <input type="submit" value="<?php echo lang('Save'); ?>">
+</p>
 <table cellspacing="0" id="edit-fields">
 <?php $column_comments = edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys); ?>
 </table>

Modified: trunk/adminer/dump.inc.php
===================================================================
--- trunk/adminer/dump.inc.php	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/dump.inc.php	2009-09-11 17:08:18 UTC (rev 1092)
@@ -149,7 +149,7 @@
 echo "<tr><th>" . lang('Data') . "<td><select name='data_style'>" . optionlist($data_style, 'INSERT') . "</select>\n";
 ?>
 </table>
-<p><input type="submit" value="<?php echo lang('Export'); ?>">
+<p><input type="submit" value="<?php echo lang('Export'); ?>"></p>
 
 <table cellspacing="0">
 <?php

Modified: trunk/adminer/editing.js
===================================================================
--- trunk/adminer/editing.js	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/editing.js	2009-09-11 17:08:18 UTC (rev 1092)
@@ -19,6 +19,27 @@
 
 
 
+function select_value(select) {
+	return select.options[select.selectedIndex].text;
+}
+
+function form_field(form, name) {
+	for (var i=0; i < form.length; i++) {
+		if (form[i].name == name) {
+			return form[i];
+		}
+	}
+}
+
+function type_password(el, disable) {
+	try {
+		el.type = (disable ? 'text' : 'password');
+	} catch (e) {
+	}
+}
+
+
+
 var added = '.', row_count;
 
 function re_escape(s) {
@@ -31,7 +52,7 @@
 
 function editing_name_change(field) {
 	var name = field.name.substr(0, field.name.length - 7);
-	var type = field.form[name + '[type]'];
+	var type = form_field(field.form, name + '[type]');
 	var opts = type.options;
 	var table = re_escape(field.value);
 	var column = '';
@@ -63,7 +84,7 @@
 		}
 	}
 	if (candidate) {
-		opts.selectedIndex = candidate;
+		type.selectedIndex = candidate;
 		type.onchange();
 	}
 }
@@ -108,7 +129,7 @@
 }
 
 function editing_remove_row(button) {
-	var field = button.form[button.name.replace(/drop_col(.+)/, 'fields$1[field]')];
+	var field = form_field(button.form, button.name.replace(/drop_col(.+)/, 'fields$1[field]'));
 	field.parentNode.removeChild(field);
 	button.parentNode.parentNode.style.display = 'none';
 	return true;
@@ -116,7 +137,7 @@
 
 function editing_type_change(type) {
 	var name = type.name.substr(0, type.name.length - 6);
-	var text = type.options[type.selectedIndex].text;
+	var text = select_value(type);
 	for (var i=0; i < type.form.elements.length; i++) {
 		var el = type.form.elements[i];
 		if (el.name == name + '[collation]') {
@@ -136,7 +157,7 @@
 }
 
 function partition_by_change(el) {
-	var partition_table = /RANGE|LIST/.test(el.options[el.selectedIndex].text);
+	var partition_table = /RANGE|LIST/.test(select_value(el));
 	el.form['partitions'].className = (partition_table || !el.selectedIndex ? 'hidden' : '');
 	document.getElementById('partition-table').className = (partition_table ? '' : 'hidden');
 }
@@ -166,7 +187,9 @@
 function indexes_add_row(field) {
 	var row = field.parentNode.parentNode.cloneNode(true);
 	var spans = row.getElementsByTagName('span');
-	row.getElementsByTagName('td')[1].innerHTML = '<span>' + spans[spans.length - 1].innerHTML + '</span>';
+	for (var i=0; i < spans.length - 1; i++) {
+		row.removeChild(spans[i]);
+	}
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/indexes\[[0-9]+/, '$&1');

Modified: trunk/adminer/foreign.inc.php
===================================================================
--- trunk/adminer/foreign.inc.php	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/foreign.inc.php	2009-09-11 17:08:18 UTC (rev 1092)
@@ -46,6 +46,7 @@
 <?php echo lang('Target table'); ?>:
 <select name="table" onchange="this.form['change-js'].value = '1'; this.form.submit();"><?php echo optionlist(array_keys(table_status_referencable()), $row["table"]); ?></select>
 <input type="hidden" name="change-js" value="">
+</p>
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
 <table cellspacing="0">
 <thead><tr><th><?php echo lang('Source'); ?><th><?php echo lang('Target'); ?></thead>

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/include/adminer.inc.php	2009-09-11 17:08:18 UTC (rev 1092)
@@ -87,7 +87,6 @@
 	* @return string
 	*/
 	function selectQuery($query) {
-		// it would be nice if $query can be passed by reference and printed value would be returned but call_user() doesn't allow reference parameters
 		return "<p><code class='jush-sql'>" . h($query) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a></p>\n";
 	}
 	

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/sql.inc.php	2009-09-11 17:08:18 UTC (rev 1092)
@@ -69,7 +69,7 @@
 							do {
 								$result = $dbh->store_result();
 								if (!$i) {
-									echo "<p class='time'>" . (is_object($result) ? lang('%d row(s)', $result->num_rows) . ", ": "") . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . "</p>\n"; // </p> required by IE
+									echo "<p class='time'>" . (is_object($result) ? lang('%d row(s)', $result->num_rows) . ", ": "") . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . "</p>\n";
 									$i++;
 								}
 								if (is_object($result)) {

Modified: trunk/adminer/trigger.inc.php
===================================================================
--- trunk/adminer/trigger.inc.php	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/trigger.inc.php	2009-09-11 17:08:18 UTC (rev 1092)
@@ -28,7 +28,7 @@
 
 <form action="" method="post" id="form">
 <table cellspacing="0">
-<tr><th><?php echo lang('Time'); ?><td><select name="Timing" onchange="if (/^<?php echo h(preg_quote($TABLE, "/")); ?>_[ba][iud]$/.test(this.form['Trigger'].value)) this.form['Trigger'].value = '<?php echo h(addcslashes($TABLE, "\r\n'\\")); ?>_' + this.value.charAt(0).toLowerCase() + this.form['Event'].value.charAt(0).toLowerCase();"><?php echo optionlist($trigger_time, $row["Timing"]); ?></select>
+<tr><th><?php echo lang('Time'); ?><td><select name="Timing" onchange="if (/^<?php echo h(preg_quote($TABLE, "/")); ?>_[ba][iud]$/.test(this.form['Trigger'].value)) this.form['Trigger'].value = '<?php echo h(addcslashes($TABLE, "\r\n'\\")); ?>_' + select_value(this).charAt(0).toLowerCase() + select_value(this.form['Event']).charAt(0).toLowerCase();"><?php echo optionlist($trigger_time, $row["Timing"]); ?></select>
 <tr><th><?php echo lang('Event'); ?><td><select name="Event" onchange="this.form['Timing'].onchange();"><?php echo optionlist($trigger_event, $row["Event"]); ?></select>
 <tr><th><?php echo lang('Name'); ?><td><input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64">
 </table>

Modified: trunk/adminer/user.inc.php
===================================================================
--- trunk/adminer/user.inc.php	2009-09-11 17:06:45 UTC (rev 1091)
+++ trunk/adminer/user.inc.php	2009-09-11 17:08:18 UTC (rev 1092)
@@ -118,7 +118,7 @@
 <table cellspacing="0">
 <tr><th><?php echo lang('Username'); ?><td><input name="user" maxlength="16" value="<?php echo h($row["user"]); ?>">
 <tr><th><?php echo lang('Server'); ?><td><input name="host" maxlength="60" value="<?php echo h($row["host"]); ?>">
-<tr><th><?php echo lang('Password'); ?><td><input id="pass" name="pass" value="<?php echo h($row["pass"]); ?>"><?php if (!$row["hashed"]) { ?><script type="text/javascript">document.getElementById('pass').type = 'password';</script><?php } ?> <label><input type="checkbox" name="hashed" value="1"<?php if ($row["hashed"]) { ?> checked<?php } ?> onclick="this.form['pass'].type = (this.checked ? 'text' : 'password');"><?php echo lang('Hashed'); ?></label>
+<tr><th><?php echo lang('Password'); ?><td><input id="pass" name="pass" value="<?php echo h($row["pass"]); ?>"><?php if (!$row["hashed"]) { ?><script type="text/javascript">type_password(document.getElementById('pass'));</script><?php } ?> <label><input type="checkbox" name="hashed" value="1"<?php if ($row["hashed"]) { ?> checked<?php } ?> onclick="type_password(this.form['pass'], this.checked);"><?php echo lang('Hashed'); ?></label>
 </table>
 
 <?php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1096] trunk/adminer

From: <jakubvrana@us...> - 2009-09-11 19:26

Revision: 1096
          http://adminer.svn.sourceforge.net/adminer/?rev=1096&view=rev
Author:   jakubvrana
Date:     2009-09-11 19:26:27 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
Hide select export and import

Modified Paths:
--------------
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-09-11 19:12:33 UTC (rev 1095)
+++ trunk/adminer/include/adminer.inc.php	2009-09-11 19:26:27 UTC (rev 1096)
@@ -136,7 +136,7 @@
 	* @return null
 	*/
 	function selectColumnsPrint($select, $columns) {
-		echo '<fieldset><legend><a href="#fieldset-select" onclick="return !toggle(\'fieldset-select\');">' . lang('Select') . "</a></legend><div id='fieldset-select'" . ($select ? "" : " class='hidden'") . ">\n";
+		print_fieldset("select", lang('Select'), $select);
 		$i = 0;
 		$fun_group = array(lang('Functions') => $this->functions, lang('Aggregation') => $this->grouping);
 		foreach ($select as $key => $val) {
@@ -157,7 +157,7 @@
 	* @return null
 	*/
 	function selectSearchPrint($where, $columns, $indexes) {
-		echo '<fieldset><legend><a href="#fieldset-search" onclick="return !toggle(\'fieldset-search\');">' . lang('Search') . "</a></legend><div id='fieldset-search'" . ($where ? "" : " class='hidden'") . ">\n";
+		print_fieldset("search", lang('Search'), $where);
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT") {
 				echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
@@ -188,7 +188,7 @@
 	* @return null
 	*/
 	function selectOrderPrint($order, $columns, $indexes) {
-		echo '<fieldset><legend><a href="#fieldset-sort" onclick="return !toggle(\'fieldset-sort\');">' . lang('Sort') . "</a></legend><div id='fieldset-sort'" . ($order ? "" : " class='hidden'") . ">\n";
+		print_fieldset("sort", lang('Sort'), $order);
 		$i = 0;
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if (isset($columns[$val])) {

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-09-11 19:12:33 UTC (rev 1095)
+++ trunk/adminer/include/functions.inc.php	2009-09-11 19:26:27 UTC (rev 1096)
@@ -557,3 +557,13 @@
 	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
 	return eregi("^$atom+(\\.$atom+)*@($domain?\\.)+$domain\$", $email);
 }
+
+/** Print header for hidden fieldset (close by </div></fieldset>)
+* @param string
+* @param string
+* @param bool
+* @return null
+*/
+function print_fieldset($id, $legend, $visible = false) {
+	echo "<fieldset><legend><a href='#fieldset-$id' onclick=\"return !toggle('fieldset-$id');\">$legend</a></legend><div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
+}

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-09-11 19:12:33 UTC (rev 1095)
+++ trunk/adminer/select.inc.php	2009-09-11 19:26:27 UTC (rev 1096)
@@ -282,9 +282,13 @@
 			echo " (" . lang('%d row(s)', $found_rows) . ') <label><input type="checkbox" name="all" value="1">' . lang('whole result') . "</label>\n";
 			
 			echo (information_schema(DB) ? "" : "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' name='edit' value='" . lang('Edit') . "'> <input type='submit' name='clone' value='" . lang('Clone') . "'> <input type='submit' name='delete' value='" . lang('Delete') . "'$confirm></div></fieldset>\n");
-			echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_output $dump_format $dump_compress <input type='submit' name='export' value='" . lang('Export') . "'></div></fieldset>\n";
+			print_fieldset("export", lang('Export'));
+			echo "$dump_output $dump_format $dump_compress <input type='submit' name='export' value='" . lang('Export') . "'>\n";
+			echo "</div></fieldset>\n";
 		}
-		echo "<fieldset><legend>" . lang('CSV Import') . "</legend><div><input type='hidden' name='token' value='$token'><input type='file' name='csv_file'> <input type='submit' name='import' value='" . lang('Import') . "'></div></fieldset>\n";
+		print_fieldset("import", lang('CSV Import'), !$result->num_rows);
+		echo "<input type='hidden' name='token' value='$token'><input type='file' name='csv_file'> <input type='submit' name='import' value='" . lang('Import') . "'>\n";
+		echo "</div></fieldset>\n";
 		
 		$adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1109] trunk/adminer

From: <jakubvrana@us...> - 2009-09-14 16:07

Revision: 1109
          http://adminer.svn.sourceforge.net/adminer/?rev=1109&view=rev
Author:   jakubvrana
Date:     2009-09-14 16:07:35 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
Detect removed default (thanks to cvicebni ubor)

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/include/editing.inc.php

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2009-09-14 15:12:51 UTC (rev 1108)
+++ trunk/adminer/create.inc.php	2009-09-14 16:07:35 UTC (rev 1109)
@@ -37,6 +37,9 @@
 		$type_field = (isset($types[$field["type"]]) ? $field : $referencable_primary[$foreign_keys[$field["type"]]]);
 		if (strlen($field["field"])) {
 			if ($type_field) {
+				if (!$field["has_default"]) {
+					$field["default"] = null;
+				}
 				$process_field = process_field($field, $type_field);
 				$auto_increment = ($key == $_POST["auto_increment_col"]);
 				if ($process_field != process_field($orig_field, $orig_field) || $orig_field["auto_increment"] != $auto_increment) {

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-09-14 15:12:51 UTC (rev 1108)
+++ trunk/adminer/include/editing.inc.php	2009-09-14 16:07:35 UTC (rev 1109)
@@ -124,7 +124,7 @@
 	global $dbh;
 	return idf_escape($field["field"]) . process_type($type_field)
 		. ($field["null"] ? " NULL" : " NOT NULL") // NULL for timestamp
-		. (!$field["has_default"] || $field["auto_increment"] || ereg('text|blob', $field["type"]) ? "" : " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP( on update CURRENT_TIMESTAMP)?$", $field["default"]) ? $field["default"] : $dbh->quote($field["default"])))
+		. (!isset($field["default"]) || $field["auto_increment"] || ereg('text|blob', $field["type"]) ? "" : " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP( on update CURRENT_TIMESTAMP)?$", $field["default"]) ? $field["default"] : $dbh->quote($field["default"])))
 		. " COMMENT " . $dbh->quote($field["comment"])
 	;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1110] trunk/adminer

From: <jakubvrana@us...> - 2009-09-14 19:39

Revision: 1110
          http://adminer.svn.sourceforge.net/adminer/?rev=1110&view=rev
Author:   jakubvrana
Date:     2009-09-14 19:39:37 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
Display whitespace in texts (bug #2858042)

Modified Paths:
--------------
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-09-14 16:07:35 UTC (rev 1109)
+++ trunk/adminer/include/editing.inc.php	2009-09-14 19:39:37 UTC (rev 1110)
@@ -53,10 +53,10 @@
 				} else {
 					if ($blobs[$key] && !is_utf8($val)) {
 						$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
-					} elseif (!strlen(trim($val, " \t"))) {
+					} elseif (!strlen($val)) {
 						$val = "&nbsp;"; // some content to print a border
 					} else {
-						$val = nl2br(h($val));
+						$val = whitespace(h($val));
 						if ($types[$key] == 254) {
 							$val = "<code>$val</code>";
 						}
@@ -124,7 +124,7 @@
 	global $dbh;
 	return idf_escape($field["field"]) . process_type($type_field)
 		. ($field["null"] ? " NULL" : " NOT NULL") // NULL for timestamp
-		. (!isset($field["default"]) || $field["auto_increment"] || ereg('text|blob', $field["type"]) ? "" : " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP( on update CURRENT_TIMESTAMP)?$", $field["default"]) ? $field["default"] : $dbh->quote($field["default"])))
+		. (!$field["has_default"] || $field["auto_increment"] || ereg('text|blob', $field["type"]) ? "" : " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP( on update CURRENT_TIMESTAMP)?$", $field["default"]) ? $field["default"] : $dbh->quote($field["default"])))
 		. " COMMENT " . $dbh->quote($field["comment"])
 	;
 }

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-09-14 16:07:35 UTC (rev 1109)
+++ trunk/adminer/include/functions.inc.php	2009-09-14 19:39:37 UTC (rev 1110)
@@ -43,6 +43,14 @@
 	return htmlspecialchars($string, ENT_QUOTES);
 }
 
+/** Convert text whitespace to HTML
+* @param string
+* @return string
+*/
+function whitespace($string) {
+	return nl2br(preg_replace('~(^| ) ~m', '\\1&nbsp;', str_replace("\t", "    ", $string)));
+}
+
 /** Escape for TD
 * @param string
 * @return string

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-09-14 16:07:35 UTC (rev 1109)
+++ trunk/adminer/select.inc.php	2009-09-14 19:39:37 UTC (rev 1110)
@@ -219,12 +219,12 @@
 							if (ereg('blob|binary', $fields[$key]["type"]) && strlen($val)) {
 								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . '&') . $unique_idf;
 							}
-							if (!strlen(trim($val, " \t"))) {
+							if (!strlen($val)) {
 								$val = "&nbsp;";
 							} elseif (strlen($text_length) && ereg('blob|text', $fields[$key]["type"]) && is_utf8($val)) {
-								$val = nl2br(shorten_utf8($val, max(0, intval($text_length)))); // usage of LEFT() would reduce traffic but complicate query
+								$val = whitespace(shorten_utf8($val, max(0, intval($text_length)))); // usage of LEFT() would reduce traffic but complicate query
 							} else {
-								$val = nl2br(h($val));
+								$val = whitespace(h($val));
 							}
 							
 							if (!$link) { // link related items


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1116] trunk/adminer

From: <jakubvrana@us...> - 2009-09-19 19:48

Revision: 1116
          http://adminer.svn.sourceforge.net/adminer/?rev=1116&view=rev
Author:   jakubvrana
Date:     2009-09-19 19:48:40 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Maximum width of type with foreign keys

Modified Paths:
--------------
    trunk/adminer/default.css
    trunk/adminer/include/editing.inc.php

Modified: trunk/adminer/default.css
===================================================================
--- trunk/adminer/default.css	2009-09-19 19:37:39 UTC (rev 1115)
+++ trunk/adminer/default.css	2009-09-19 19:48:40 UTC (rev 1116)
@@ -30,6 +30,7 @@
 .odd td { background: #F5F5F5; }
 .time { color: Silver; font-size: 70%; float: right; margin-top: -3em; }
 .function { text-align: right; }
+.type { width: 15ex; width: auto\9; }
 #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; overflow: auto; overflow-y: hidden; white-space: nowrap; }
 #menu p { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-09-19 19:37:39 UTC (rev 1115)
+++ trunk/adminer/include/editing.inc.php	2009-09-19 19:48:40 UTC (rev 1116)
@@ -97,7 +97,7 @@
 function edit_type($key, $field, $collations, $foreign_keys = array()) {
 	global $structured_types, $unsigned, $inout;
 	?>
-<td><select name="<?php echo $key; ?>[type]" onchange="editing_type_change(this);"><?php echo optionlist($structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); // foreign keys can be wide but style="width: 15ex;" narrows expanded optionlist in IE too ?></select>
+<td><select name="<?php echo $key; ?>[type]" class="type" onchange="editing_type_change(this);"><?php echo optionlist($structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); // foreign keys can be wide but style="width: 15ex;" narrows expanded optionlist in IE too ?></select>
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3">
 <td><?php
 echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1145] trunk/adminer

From: <jakubvrana@us...> - 2009-09-25 09:52

Revision: 1145
          http://adminer.svn.sourceforge.net/adminer/?rev=1145&view=rev
Author:   jakubvrana
Date:     2009-09-25 09:52:24 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Don't remove onchange after click on add

Modified Paths:
--------------
    trunk/adminer/include/editing.inc.php
    trunk/adminer/static/editing.js

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-09-25 09:01:28 UTC (rev 1144)
+++ trunk/adminer/include/editing.inc.php	2009-09-25 09:52:24 UTC (rev 1145)
@@ -182,7 +182,7 @@
 <td<?php echo ($column_comments ? "" : " class='hidden'"); ?>><input name="fields[<?php echo $i; ?>][comment]" value="<?php echo h($field["comment"]); ?>" maxlength="255">
 <?php } ?>
 <?php
-		echo "<td class='nowrap'><input type='image' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='var x = editing_add_row(this, $allowed); if (x) { x.focus(); x.onchange = function () { }; } return !x;'>";
+		echo "<td class='nowrap'><input type='image' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editing_add_row(this, $allowed, 1);'>";
 		echo "&nbsp;<input type='image' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editing_remove_row(this);'>";
 		echo "&nbsp;<input type='image' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>";
 		echo "&nbsp;<input type='image' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>";

Modified: trunk/adminer/static/editing.js
===================================================================
--- trunk/adminer/static/editing.js	2009-09-25 09:01:28 UTC (rev 1144)
+++ trunk/adminer/static/editing.js	2009-09-25 09:52:24 UTC (rev 1145)
@@ -91,7 +91,7 @@
 	}
 }
 
-function editing_add_row(button, allowed) {
+function editing_add_row(button, allowed, focus) {
 	if (allowed && row_count >= allowed) {
 		return false;
 	}
@@ -107,7 +107,7 @@
 	}
 	tags = row.getElementsByTagName('input');
 	tags2 = row2.getElementsByTagName('input');
-	var ret = tags2[0]; // IE loose tags2 after insertBefore()
+	var input = tags2[0]; // IE loose tags2 after insertBefore()
 	for (var i=0; i < tags.length; i++) {
 		if (tags[i].name == 'auto_increment_col') {
 			tags2[i].value = x;
@@ -125,9 +125,15 @@
 		editing_name_change(tags[0]);
 	};
 	row.parentNode.insertBefore(row2, row.nextSibling);
+	if (focus) {
+		input.onchange = function () {
+			editing_name_change(input);
+		};
+		input.focus();
+	}
 	added += '0';
 	row_count++;
-	return ret;
+	return true;
 }
 
 function editing_remove_row(button) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1147] trunk/adminer

From: <jakubvrana@us...> - 2009-09-25 12:03

Revision: 1147
          http://adminer.svn.sourceforge.net/adminer/?rev=1147&view=rev
Author:   jakubvrana
Date:     2009-09-25 12:03:30 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Separate checkbox

Modified Paths:
--------------
    trunk/adminer/db.inc.php
    trunk/adminer/dump.inc.php
    trunk/adminer/event.inc.php
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/processlist.inc.php
    trunk/adminer/select.inc.php
    trunk/adminer/sql.inc.php
    trunk/adminer/user.inc.php

Modified: trunk/adminer/db.inc.php
===================================================================
--- trunk/adminer/db.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/db.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -50,7 +50,7 @@
 	echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="form_check(this, /^(tables|views)\[/);"><th>' . lang('Table') . '<td>' . lang('Engine') . '<td>' . lang('Collation') . '<td>' . lang('Data Length') . '<td>' . lang('Index Length') . '<td>' . lang('Data Free') . '<td>' . lang('Auto Increment') . '<td>' . lang('Rows') . '<td>' . lang('Comment') . "</thead>\n";
 	foreach ($table_status as $row) {
 		$name = $row["Name"];
-		echo '<tr' . odd() . '><td><input type="checkbox" name="' . (isset($row["Rows"]) ? 'tables' : 'views') . '[]" value="' . h($name) . '"' . (in_array($name, $tables_views, true) ? ' checked' : '') . ' onclick="form_uncheck(\'check-all\');">';
+		echo '<tr' . odd() . '><td>' . checkbox((isset($row["Rows"]) ? "tables[]" : "views[]"), $name, in_array($name, $tables_views, true), "", "form_uncheck('check-all');");
 		echo '<th><a href="' . h(ME) . 'table=' . urlencode($name) . '">' . h($name) . '</a>';
 		if (isset($row["Rows"])) {
 			echo "<td>$row[Engine]<td>$row[Collation]";

Modified: trunk/adminer/dump.inc.php
===================================================================
--- trunk/adminer/dump.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/dump.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -148,13 +148,11 @@
 echo "<tr><th>" . lang('Compression') . "<td>" . ($dump_compress ? $dump_compress : lang('None of the supported PHP extensions (%s) are available.', 'zlib, bz2')) . "\n";
 echo "<tr><th>" . lang('Database') . "<td><select name='db_style'>" . optionlist($db_style, (strlen(DB) ? '' : 'CREATE')) . "</select>\n";
 if ($connection->server_info >= 5) {
-	$objects = array('routines' => lang('Routines'));
+	$checked = strlen($_GET["dump"]);
+	checkbox("routines", 1, $checked, lang('Routines'));
 	if ($connection->server_info >= 5.1) {
-		$objects['events'] = lang('Events');
+		checkbox("events", 1, $checked, lang('Events'));
 	}
-	foreach ($objects as $key => $val) {
-		echo " <label><input type='checkbox' name='$key' value='1'" . (strlen($_GET["dump"]) ? "" : " checked") . ">$val</label>";
-	}
 }
 echo "<tr><th>" . lang('Tables') . "<td><select name='table_style'>" . optionlist($table_style, 'DROP+CREATE') . "</select>\n";
 echo "<tr><th>" . lang('Data') . "<td><select name='data_style'>" . optionlist($data_style, 'INSERT') . "</select>\n";
@@ -172,12 +170,12 @@
 	echo "</thead>\n";
 	$views = "";
 	foreach (table_status() as $row) {
-		$checked = (strlen($TABLE) && $row["Name"] != $TABLE ? '' : " checked");
-		$print = "<tr><td><label><input type='checkbox' name='tables[]' value='" . h($row["Name"]) . "'$checked onclick=\"form_uncheck('check-tables');\">" . h($row["Name"]) . "</label>";
+		$checked = (strlen($TABLE) && $row["Name"] != $TABLE);
+		$print = "<tr><td>" . checkbox("tables[]", $row["Name"], $checked, $row["Name"], "form_uncheck('check-tables');");
 		if (!$row["Engine"]) {
 			$views .= "$print\n";
 		} else {
-			echo "$print<td align='right'><label>" . ($row["Engine"] == "InnoDB" && $row["Rows"] ? lang('~ %s', $row["Rows"]) : $row["Rows"]) . "<input type='checkbox' name='data[]' value='" . h($row["Name"]) . "'$checked onclick=\"form_uncheck('check-data');\"></label>\n";
+			echo "$print<td align='right'><label>" . ($row["Engine"] == "InnoDB" && $row["Rows"] ? lang('~ %s', $row["Rows"]) : $row["Rows"]) . checkbox("data[]", $row["Name"], $checked, "", "form_uncheck('check-data');") . "</label>\n";
 		}
 	}
 	echo $views;
@@ -185,7 +183,7 @@
 	echo "<thead><tr><th style='text-align: left;'><label><input type='checkbox' id='check-databases' checked onclick='form_check(this, /^databases\\[/);'>" . lang('Database') . "</label></thead>\n";
 	foreach (get_databases() as $db) {
 		if (!information_schema($db)) {
-			echo '<tr><td><label><input type="checkbox" name="databases[]" value="' . h($db) . '" checked onclick="form_uncheck(\'check-databases\');">' . h($db) . "</label>\n";
+			echo "<tr><td>" . checkbox("databases[]", $db, 1, $db, "form_uncheck('check-databases');") . "</label>\n";
 		}
 	}
 }

Modified: trunk/adminer/event.inc.php
===================================================================
--- trunk/adminer/event.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/event.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -43,7 +43,7 @@
 <tr><th><?php echo lang('Every'); ?><td><input name="INTERVAL_VALUE" value="<?php echo h($row["INTERVAL_VALUE"]); ?>" size="6"> <select name="INTERVAL_FIELD"><?php echo optionlist($intervals, $row["INTERVAL_FIELD"]); ?></select>
 <tr><th><?php echo lang('Status'); ?><td><select name="STATUS"><?php echo optionlist($statuses, $row["STATUS"]); ?></select>
 <tr><th><?php echo lang('Comment'); ?><td><input name="EVENT_COMMENT" value="<?php echo h($row["EVENT_COMMENT"]); ?>" maxlength="64">
-<tr><th>&nbsp;<td><label><input type="checkbox" name="ON_COMPLETION" value="PRESERVE"<?php echo ($row["ON_COMPLETION"] == "PRESERVE" ? " checked" : ""); ?>><?php echo lang('On completion preserve'); ?></label>
+<tr><th>&nbsp;<td><?php echo checkbox("ON_COMPLETION", "PRESERVE", $row["ON_COMPLETION"] == "PRESERVE", lang('On completion preserve')); ?>
 </table>
 <p><textarea name="EVENT_DEFINITION" rows="10" cols="80" style="width: 98%;"><?php echo h($row["EVENT_DEFINITION"]); ?></textarea>
 <p>

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/include/adminer.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -183,7 +183,7 @@
 			if ($index["type"] == "FULLTEXT") {
 				echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
 				echo " <input name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
-				echo "<label><input type='checkbox' name='boolean[$i]' value='1'" . (isset($_GET["boolean"][$i]) ? " checked" : "") . ">BOOL</label>";
+				echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
 				echo "<br>\n";
 			}
 		}
@@ -214,12 +214,12 @@
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if (isset($columns[$val])) {
 				echo "<div><select name='order[$i]'><option>" . optionlist($columns, $val, true) . "</select>";
-				echo "<label><input type='checkbox' name='desc[$i]' value='1'" . (isset($_GET["desc"][$key]) ? " checked" : "") . ">" . lang('descending') . "</label></div>\n";
+				echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
 				$i++;
 			}
 		}
 		echo "<div><select name='order[$i]' onchange='select_add_row(this);'><option>" . optionlist($columns, null, true) . "</select>";
-		echo "<label><input type='checkbox' name='desc[$i]' value='1'>" . lang('descending') . "</label></div>\n";
+		echo checkbox("desc[$i]", 1, 0, lang('descending')) . "</div>\n";
 		echo "</div></fieldset>\n";
 	}
 	

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/include/editing.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -176,9 +176,9 @@
 <th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" onchange="<?php echo (strlen($field["field"]) || count($fields) > 1 ? "" : "editing_add_row(this, $allowed); "); ?>editing_name_change(this);" maxlength="64"><?php } ?><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($field[($_POST ? "orig" : "field")]); ?>">
 <?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
 <?php if ($type == "TABLE") { ?>
-<td><input type="checkbox" name="fields[<?php echo $i; ?>][null]" value="1"<?php if ($field["null"]) { ?> checked<?php } ?>>
+<td><?php echo checkbox("fields[$i][null]", 1, $field["null"]); ?>
 <td><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?>>
-<td class="nowrap hidden"><input type="checkbox" name="fields[<?php echo $i; ?>][has_default]" value="1"<?php echo ($field["has_default"] ? " checked" : ""); ?>><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onchange="this.previousSibling.checked = true;">
+<td class="nowrap hidden"><?php echo checkbox("fields[$i][has_default]", 1, $field["has_default"]); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onchange="this.previousSibling.checked = true;">
 <td<?php echo ($column_comments ? "" : " class='hidden'"); ?>><input name="fields[<?php echo $i; ?>][comment]" value="<?php echo h($field["comment"]); ?>" maxlength="255">
 <?php } ?>
 <?php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/include/functions.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -59,6 +59,19 @@
 	return (strlen(trim($string)) ? h($string) : "&nbsp;");
 }
 
+/** Generate HTML checkbox
+* @param string
+* @param string
+* @param bool
+* @param string
+* @param string
+* @return string
+*/
+function checkbox($name, $value, $checked, $label = "", $onclick = "") {
+	$return = "<input type='checkbox' name='$name' value='" . h($value) . "'" . ($checked ? " checked" : "") . ($onclick ? " onclick=\"$onclick\"" : "") . ">";
+	return (strlen($label) ? "<label>$return" . h($label) . "</label>" : $return);
+}
+
 /** Generate list of HTML options
 * @param array array of strings or arrays (creates optgroup)
 * @param mixed

Modified: trunk/adminer/processlist.inc.php
===================================================================
--- trunk/adminer/processlist.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/processlist.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -20,7 +20,7 @@
 	if (!$i) {
 		echo "<thead><tr lang='en'><th>&nbsp;<th>" . implode("<th>", array_keys($row)) . "</thead>\n";
 	}
-	echo "<tr" . odd() . "><td><input type='checkbox' name='kill[]' value='$row[Id]'><td>" . implode("<td>", array_map('nbsp', $row)) . "\n";
+	echo "<tr" . odd() . "><td>" . checkbox("kill[]", $row["Id"], 0) . "<td>" . implode("<td>", array_map('nbsp', $row)) . "\n";
 }
 ?>
 </table>

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/select.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -194,8 +194,8 @@
 			}
 			echo ($backward_keys ? "<th>" . lang('Relations') : "") . "</thead>\n";
 			foreach ($adminer->rowDescriptions($rows, $foreign_keys) as $n => $row) {
-				$unique_idf = implode('&amp;', unique_idf($rows[$n], $indexes));
-				echo "<tr" . odd() . "><td><input type='checkbox' name='check[]' value='$unique_idf'" . (in_array(str_replace("&amp;", "&", $unique_idf), (array) $_POST["check"]) ? " checked" : "") . " onclick=\"this.form['all'].checked = false; form_uncheck('all-page');\">" . (count($select) != count($group) || information_schema(DB) ? '' : " <a href='" . h(ME) . "edit=" . urlencode($TABLE) . "&amp;$unique_idf'>" . lang('edit') . "</a>");
+				$unique_idf = implode('&', unique_idf($rows[$n], $indexes));
+				echo "<tr" . odd() . "><td>" . checkbox("check[]", $unique_idf, in_array($unique_idf, (array) $_POST["check"]), "", "this.form['all'].checked = false; form_uncheck('all-page');") . (count($select) != count($group) || information_schema(DB) ? '' : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . "&$unique_idf") . "'>" . lang('edit') . "</a>");
 				foreach ($row as $key => $val) {
 					if (isset($names[$key])) {
 						if (strlen($val) && (!isset($email_fields[$key]) || strlen($email_fields[$key]))) {
@@ -207,7 +207,7 @@
 							$val = "<i>NULL</i>";
 						} else {
 							if (ereg('blob|binary', $fields[$key]["type"]) && strlen($val)) {
-								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . '&') . $unique_idf;
+								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . "&$unique_idf");
 							}
 							if (!strlen($val)) {
 								$val = "&nbsp;";
@@ -257,7 +257,7 @@
 				}
 				echo ($_GET["page"] + 3 < $max_page ? " ..." : "") . pagination($max_page);
 			}
-			echo " (" . lang('%d row(s)', $found_rows) . ') <label><input type="checkbox" name="all" value="1">' . lang('whole result') . "</label>\n";
+			echo " (" . lang('%d row(s)', $found_rows) . ") " . checkbox("all", 1, 0, lang('whole result')) . "\n";
 			
 			echo (information_schema(DB) ? "" : "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' name='edit' value='" . lang('Edit') . "'> <input type='submit' name='clone' value='" . lang('Clone') . "'> <input type='submit' name='delete' value='" . lang('Delete') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + (this.form['all'].checked ? $found_rows : form_checked(this, /check/)) + ')');\"></div></fieldset>\n");
 			print_fieldset("export", lang('Export'));

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/sql.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -129,7 +129,7 @@
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Execute'); ?>">
-<label><input type="checkbox" name="error_stops" value="1"<?php echo ($_POST["error_stops"] ? " checked" : ""); ?>><?php echo lang('Stop on error'); ?></label>
+<?php echo checkbox("error_stops", 1, $_POST["error_stops"], lang('Stop on error')); ?>
 
 <p>
 <?php

Modified: trunk/adminer/user.inc.php
===================================================================
--- trunk/adminer/user.inc.php	2009-09-25 11:29:46 UTC (rev 1146)
+++ trunk/adminer/user.inc.php	2009-09-25 12:03:30 UTC (rev 1147)
@@ -118,7 +118,9 @@
 <table cellspacing="0">
 <tr><th><?php echo lang('Username'); ?><td><input name="user" maxlength="16" value="<?php echo h($row["user"]); ?>">
 <tr><th><?php echo lang('Server'); ?><td><input name="host" maxlength="60" value="<?php echo h($row["host"]); ?>">
-<tr><th><?php echo lang('Password'); ?><td><input id="pass" name="pass" value="<?php echo h($row["pass"]); ?>"><?php if (!$row["hashed"]) { ?><script type="text/javascript">type_password(document.getElementById('pass'));</script><?php } ?> <label><input type="checkbox" name="hashed" value="1"<?php if ($row["hashed"]) { ?> checked<?php } ?> onclick="type_password(this.form['pass'], this.checked);"><?php echo lang('Hashed'); ?></label>
+<tr><th><?php echo lang('Password'); ?><td><input id="pass" name="pass" value="<?php echo h($row["pass"]); ?>">
+<?php if (!$row["hashed"]) { ?><script type="text/javascript">type_password(document.getElementById('pass'));</script><?php } ?>
+<?php echo checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "type_password(this.form['pass'], this.checked);"); ?>
 </table>
 
 <?php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1169] trunk/adminer

From: <jakubvrana@us...> - 2009-10-06 10:40

Revision: 1169
          http://adminer.svn.sourceforge.net/adminer/?rev=1169&view=rev
Author:   jakubvrana
Date:     2009-10-06 10:40:52 +0000 (Tue, 06 Oct 2009)

Log Message:
-----------
Work with default values

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/mysql.inc.php
    trunk/adminer/procedure.inc.php

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2009-10-06 10:00:23 UTC (rev 1168)
+++ trunk/adminer/create.inc.php	2009-10-06 10:40:52 UTC (rev 1169)
@@ -37,6 +37,11 @@
 		$type_field = (isset($types[$field["type"]]) ? $field : $referencable_primary[$foreign_keys[$field["type"]]]);
 		if (strlen($field["field"])) {
 			if ($type_field) {
+				$default = eregi_replace(" *on update CURRENT_TIMESTAMP", "", $field["default"]);
+				if ($default != $field["default"]) { // preg_replace $count is available since PHP 5.1.0
+					$field["on_update"] = "CURRENT_TIMESTAMP";
+					$field["default"] = $default;
+				}
 				if (!$field["has_default"]) {
 					$field["default"] = null;
 				}

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-10-06 10:00:23 UTC (rev 1168)
+++ trunk/adminer/include/editing.inc.php	2009-10-06 10:40:52 UTC (rev 1169)
@@ -100,10 +100,8 @@
 <td><select name="<?php echo $key; ?>[type]" class="type" onchange="editing_type_change(this);"><?php echo optionlist($structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3">
 <td><?php
-echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
-echo ($unsigned ? " <select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
-?>
-<?php
+	echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
+	echo ($unsigned ? " <select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
 }
 
 function process_length($length) {
@@ -112,7 +110,7 @@
 }
 
 function process_type($field, $collate = "COLLATE") {
-	global $connection, $enum_length, $unsigned;
+	global $connection, $unsigned;
 	return " $field[type]"
 		. (strlen($field["length"]) && !ereg('^date|time$', $field["type"]) ? "(" . process_length($field["length"]) . ")" : "")
 		. (ereg('int|float|double|decimal', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
@@ -122,10 +120,10 @@
 
 function process_field($field, $type_field) {
 	global $connection;
-	$default = $field["default"] . ($field["on_update"] ? " ON UPDATE $field[on_update]" : "");
 	return idf_escape($field["field"]) . process_type($type_field)
 		. ($field["null"] ? " NULL" : " NOT NULL") // NULL for timestamp
-		. (!isset($field["default"]) || $field["auto_increment"] || ereg('text|blob', $field["type"]) ? "" : " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP( on update CURRENT_TIMESTAMP)?$", $default) ? $default : $connection->quote($default)))
+		. (!isset($field["default"]) ? "" : " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP$", $field["default"]) ? $field["default"] : $connection->quote($field["default"])))
+		. ($field["on_update"] ? " ON UPDATE $field[on_update]" : "")
 		. " COMMENT " . $connection->quote($field["comment"])
 	;
 }

Modified: trunk/adminer/include/mysql.inc.php
===================================================================
--- trunk/adminer/include/mysql.inc.php	2009-10-06 10:00:23 UTC (rev 1168)
+++ trunk/adminer/include/mysql.inc.php	2009-10-06 10:40:52 UTC (rev 1169)
@@ -223,7 +223,7 @@
 				"default" => (strlen($row["Default"]) || ereg("char", $match[1]) ? $row["Default"] : null),
 				"null" => ($row["Null"] == "YES"),
 				"auto_increment" => ($row["Extra"] == "auto_increment"),
-				"on_update" => (preg_match('~^on update (.+)~', $row["Extra"], $match) ? $match[1] : ""),
+				"on_update" => (eregi('^on update (.+)', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
 				"collation" => $row["Collation"],
 				"privileges" => array_flip(explode(",", $row["Privileges"])),
 				"comment" => $row["Comment"],

Modified: trunk/adminer/procedure.inc.php
===================================================================
--- trunk/adminer/procedure.inc.php	2009-10-06 10:00:23 UTC (rev 1168)
+++ trunk/adminer/procedure.inc.php	2009-10-06 10:40:52 UTC (rev 1169)
@@ -42,7 +42,7 @@
 <form action="" method="post" id="form">
 <table cellspacing="0">
 <?php edit_fields($row["fields"], $collations, $routine); ?>
-<?php if (isset($_GET["function"])) { ?><tr><td><?php echo lang('Return type'); ?><?php echo edit_type("returns", $row["returns"], $collations); ?><?php } ?>
+<?php if (isset($_GET["function"])) { ?><tr><td><?php echo lang('Return type') . edit_type("returns", $row["returns"], $collations); ?><?php } ?>
 </table>
 <p><textarea name="definition" rows="10" cols="80" style="width: 98%;"><?php echo h($row["definition"]); ?></textarea>
 <p>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1178] trunk/adminer

From: <jakubvrana@us...> - 2009-10-07 15:52

Revision: 1178
          http://adminer.svn.sourceforge.net/adminer/?rev=1178&view=rev
Author:   jakubvrana
Date:     2009-10-07 15:52:34 +0000 (Wed, 07 Oct 2009)

Log Message:
-----------
Remove intval

Modified Paths:
--------------
    trunk/adminer/processlist.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/processlist.inc.php
===================================================================
--- trunk/adminer/processlist.inc.php	2009-10-07 11:12:16 UTC (rev 1177)
+++ trunk/adminer/processlist.inc.php	2009-10-07 15:52:34 UTC (rev 1178)
@@ -2,7 +2,7 @@
 if ($_POST && !$error) {
 	$killed = 0;
 	foreach ((array) $_POST["kill"] as $val) {
-		if (queries("KILL " . intval($val))) {
+		if (queries("KILL " . ereg_replace("[^0-9]+", "", $val))) {
 			$killed++;
 		}
 	}

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-10-07 11:12:16 UTC (rev 1177)
+++ trunk/adminer/select.inc.php	2009-10-07 15:52:34 UTC (rev 1178)
@@ -151,7 +151,7 @@
 	$adminer->selectActionPrint($text_length);
 	echo "</form>\n";
 	
-	$query = "SELECT " . (intval($limit) && $group && count($group) < count($select) ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by . (strlen($limit) ? " LIMIT " . intval($limit) . (intval($_GET["page"]) ? " OFFSET " . ($limit * $_GET["page"]) : "") : "");
+	$query = "SELECT " . (intval($limit) && $group && count($group) < count($select) ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by . (strlen($limit) ? " LIMIT " . intval($limit) . ($_GET["page"] ? " OFFSET " . ($limit * $_GET["page"]) : "") : "");
 	echo $adminer->selectQuery($query);
 	
 	$result = $connection->query($query);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1179] trunk/adminer

From: <jakubvrana@us...> - 2009-10-07 15:55

Revision: 1179
          http://adminer.svn.sourceforge.net/adminer/?rev=1179&view=rev
Author:   jakubvrana
Date:     2009-10-07 15:55:47 +0000 (Wed, 07 Oct 2009)

Log Message:
-----------
Save bytes

Modified Paths:
--------------
    trunk/adminer/call.inc.php
    trunk/adminer/create.inc.php
    trunk/adminer/edit.inc.php
    trunk/adminer/include/functions.inc.php

Modified: trunk/adminer/call.inc.php
===================================================================
--- trunk/adminer/call.inc.php	2009-10-07 15:52:34 UTC (rev 1178)
+++ trunk/adminer/call.inc.php	2009-10-07 15:55:47 UTC (rev 1179)
@@ -55,7 +55,7 @@
 		$field = $routine["fields"][$key];
 		echo "<tr><th>" . h($field["field"]);
 		$value = $_POST["fields"][$key];
-		if (strlen($value) && ($field["type"] == "enum" || $field["type"] == "set")) {
+		if (strlen($value) && ereg("enum|set", $field["type"])) {
 			$value = intval($value);
 		}
 		input($field, $value, (string) $_POST["function"][$name]); // param name can be empty

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2009-10-07 15:52:34 UTC (rev 1178)
+++ trunk/adminer/create.inc.php	2009-10-07 15:55:47 UTC (rev 1179)
@@ -101,7 +101,7 @@
 $engines = array();
 $result = $connection->query("SHOW ENGINES");
 while ($row = $result->fetch_assoc()) {
-	if ($row["Support"] == "YES" || $row["Support"] == "DEFAULT") {
+	if (ereg("YES|DEFAULT", $row["Support"])) {
 		$engines[] = $row["Engine"];
 	}
 }

Modified: trunk/adminer/edit.inc.php
===================================================================
--- trunk/adminer/edit.inc.php	2009-10-07 15:52:34 UTC (rev 1178)
+++ trunk/adminer/edit.inc.php	2009-10-07 15:55:47 UTC (rev 1179)
@@ -51,7 +51,7 @@
 	$select = array();
 	foreach ($fields as $name => $field) {
 		if (isset($field["privileges"]["select"])) {
-			$select[] = ($_POST["clone"] && $field["auto_increment"] ? "'' AS " : ($field["type"] == "enum" || $field["type"] == "set" ? "1*" . idf_escape($name) . " AS " : "")) . idf_escape($name);
+			$select[] = ($_POST["clone"] && $field["auto_increment"] ? "'' AS " : (ereg("enum|set", $field["type"]) ? "1*" . idf_escape($name) . " AS " : "")) . idf_escape($name);
 		}
 	}
 	$row = array();
@@ -71,7 +71,7 @@
 		echo "<tr><th>" . $adminer->fieldName($field);
 		$default = $_GET["set"][bracket_escape($name)];
 		$value = (isset($row)
-			? (strlen($row[$name]) && ($field["type"] == "enum" || $field["type"] == "set") ? intval($row[$name]) : $row[$name])
+			? (strlen($row[$name]) && ereg("enum|set", $field["type"]) ? intval($row[$name]) : $row[$name])
 			: ($_POST["clone"] && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : (isset($default) ? $default : $field["default"])))
 		);
 		if (!$_POST["save"] && is_string($value)) {

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-10-07 15:52:34 UTC (rev 1178)
+++ trunk/adminer/include/functions.inc.php	2009-10-07 15:55:47 UTC (rev 1179)
@@ -138,7 +138,7 @@
 */
 function unique_idf($row, $indexes) {
 	foreach ($indexes as $index) {
-		if ($index["type"] == "PRIMARY" || $index["type"] == "UNIQUE") {
+		if (ereg("PRIMARY|UNIQUE", $index["type"])) {
 			$return = array();
 			foreach ($index["columns"] as $key) {
 				if (!isset($row[$key])) { // NULL is ambiguous


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1188] trunk/adminer

From: <jakubvrana@us...> - 2009-10-13 19:33

Revision: 1188
          http://adminer.svn.sourceforge.net/adminer/?rev=1188&view=rev
Author:   jakubvrana
Date:     2009-10-13 19:33:50 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Inform about dropped routine, trigger and view

Modified Paths:
--------------
    trunk/adminer/include/editing.inc.php
    trunk/adminer/procedure.inc.php
    trunk/adminer/trigger.inc.php
    trunk/adminer/view.inc.php

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-10-13 19:32:49 UTC (rev 1187)
+++ trunk/adminer/include/editing.inc.php	2009-10-13 19:33:50 UTC (rev 1188)
@@ -275,3 +275,15 @@
 	}
 	return queries("$grant " . preg_replace('~(GRANT OPTION)\\([^)]*\\)~', '\\1', implode("$columns, ", $privileges) . $columns) . $on);
 }
+
+function drop_create($drop, $create, $location, $message_drop, $message_alter, $message_create, $name) {
+	if ($_POST["drop"]) {
+		return query_redirect($drop, $location, $message_drop, true, !$_POST["dropped"]);
+	}
+	$dropped = strlen($name) && ($_POST["dropped"] || queries($drop));
+	$created = queries($create);
+	if (!query_redirect(queries(), $location, (strlen($name) ? $message_alter : $message_create), $created, false, !$created) && $dropped) {
+		$_SESSION["messages"][] = $message_drop;
+	}
+	return $dropped;
+}

Modified: trunk/adminer/procedure.inc.php
===================================================================
--- trunk/adminer/procedure.inc.php	2009-10-13 19:32:49 UTC (rev 1187)
+++ trunk/adminer/procedure.inc.php	2009-10-13 19:33:50 UTC (rev 1188)
@@ -4,24 +4,23 @@
 
 $dropped = false;
 if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"] && !$_POST["down"]) {
-	if (strlen($PROCEDURE)) {
-		$dropped = query_redirect("DROP $routine " . idf_escape($PROCEDURE), substr(ME, 0, -1), lang('Routine has been dropped.'), $_POST["drop"], !$_POST["dropped"]);
-	}
-	if (!$_POST["drop"]) {
-		$set = array();
-		$fields = (array) $_POST["fields"];
-		ksort($fields); // enforce fields order
-		foreach ($fields as $field) {
-			if (strlen($field["field"])) {
-				$set[] = (in_array($field["inout"], $inout) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
-			}
+	$set = array();
+	$fields = (array) $_POST["fields"];
+	ksort($fields); // enforce fields order
+	foreach ($fields as $field) {
+		if (strlen($field["field"])) {
+			$set[] = (in_array($field["inout"], $inout) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
 		}
-		query_redirect("CREATE $routine " . idf_escape($_POST["name"])
-			. " (" . implode(", ", $set) . ")"
-			. (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "")
-			. "\n$_POST[definition]"
-		, substr(ME, 0, -1), (strlen($PROCEDURE) ? lang('Routine has been altered.') : lang('Routine has been created.')));
 	}
+	$dropped = drop_create(
+		"DROP $routine " . idf_escape($PROCEDURE),
+		"CREATE $routine " . idf_escape($_POST["name"]) . " (" . implode(", ", $set) . ")" . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "") . "\n$_POST[definition]",
+		substr(ME, 0, -1),
+		lang('Routine has been dropped.'),
+		lang('Routine has been altered.'),
+		lang('Routine has been created.'),
+		$PROCEDURE
+	);
 }
 
 page_header((strlen($PROCEDURE) ? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . h($PROCEDURE) : (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))), $error);
@@ -42,7 +41,7 @@
 <form action="" method="post" id="form">
 <table cellspacing="0">
 <?php edit_fields($row["fields"], $collations, $routine); ?>
-<?php if (isset($_GET["function"])) { ?><tr><td><?php echo lang('Return type') . edit_type("returns", $row["returns"], $collations); ?><?php } ?>
+<?php if (isset($_GET["function"])) { ?><tr><td><?php echo lang('Return type'); edit_type("returns", $row["returns"], $collations); ?><?php } ?>
 </table>
 <p><textarea name="definition" rows="10" cols="80" style="width: 98%;"><?php echo h($row["definition"]); ?></textarea>
 <p>

Modified: trunk/adminer/trigger.inc.php
===================================================================
--- trunk/adminer/trigger.inc.php	2009-10-13 19:32:49 UTC (rev 1187)
+++ trunk/adminer/trigger.inc.php	2009-10-13 19:33:50 UTC (rev 1188)
@@ -4,15 +4,16 @@
 $trigger_event = array("INSERT", "UPDATE", "DELETE");
 
 $dropped = false;
-if ($_POST && !$error) {
-	if (strlen($_GET["name"])) {
-		$dropped = query_redirect("DROP TRIGGER " . idf_escape($_GET["name"]), ME . "table=" . urlencode($TABLE), lang('Trigger has been dropped.'), $_POST["drop"], !$_POST["dropped"]);
-	}
-	if (!$_POST["drop"]) {
-		if (in_array($_POST["Timing"], $trigger_time) && in_array($_POST["Event"], $trigger_event)) {
-			query_redirect("CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . " $_POST[Timing] $_POST[Event] ON " . idf_escape($TABLE) . " FOR EACH ROW\n$_POST[Statement]", ME . "table=" . urlencode($TABLE), (strlen($_GET["name"]) ? lang('Trigger has been altered.') : lang('Trigger has been created.')));
-		}
-	}
+if ($_POST && !$error && in_array($_POST["Timing"], $trigger_time) && in_array($_POST["Event"], $trigger_event)) {
+	$dropped = drop_create(
+		"DROP TRIGGER " . idf_escape($_GET["name"]),
+		"CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . " $_POST[Timing] $_POST[Event] ON " . idf_escape($TABLE) . " FOR EACH ROW\n$_POST[Statement]",
+		ME . "table=" . urlencode($TABLE),
+		lang('Trigger has been dropped.'),
+		lang('Trigger has been altered.'),
+		lang('Trigger has been created.'),
+		$_GET["name"]
+	);
 }
 
 page_header((strlen($_GET["name"]) ? lang('Alter trigger') . ": " . h($_GET["name"]) : lang('Create trigger')), $error, array("table" => $TABLE));

Modified: trunk/adminer/view.inc.php
===================================================================
--- trunk/adminer/view.inc.php	2009-10-13 19:32:49 UTC (rev 1187)
+++ trunk/adminer/view.inc.php	2009-10-13 19:33:50 UTC (rev 1188)
@@ -2,10 +2,15 @@
 $TABLE = $_GET["view"];
 $dropped = false;
 if ($_POST && !$error) {
-	if (strlen($TABLE)) {
-		$dropped = query_redirect("DROP VIEW " . idf_escape($TABLE), substr(ME, 0, -1), lang('View has been dropped.'), false, !$_POST["dropped"]);
-	}
-	query_redirect("CREATE VIEW " . idf_escape($_POST["name"]) . " AS\n$_POST[select]", ME . "table=" . urlencode($_POST["name"]), (strlen($TABLE) ? lang('View has been altered.') : lang('View has been created.')));
+	$dropped = drop_create(
+		"DROP VIEW " . idf_escape($TABLE),
+		"CREATE VIEW " . idf_escape($_POST["name"]) . " AS\n$_POST[select]",
+		substr(ME, 0, -1),
+		lang('View has been dropped.'),
+		lang('View has been altered.'),
+		lang('View has been created.'),
+		$TABLE
+	);
 }
 
 page_header((strlen($TABLE) ? lang('Alter view') : lang('Create view')), $error, array("table" => $TABLE), $TABLE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1189] trunk/adminer

From: <jakubvrana@us...> - 2009-10-13 19:43

Revision: 1189
          http://adminer.svn.sourceforge.net/adminer/?rev=1189&view=rev
Author:   jakubvrana
Date:     2009-10-13 19:43:33 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Move whitespace to CSS

Modified Paths:
--------------
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php
    trunk/adminer/static/default.css

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-10-13 19:33:50 UTC (rev 1188)
+++ trunk/adminer/include/editing.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
@@ -56,7 +56,7 @@
 					} elseif (!strlen($val)) {
 						$val = "&nbsp;"; // some content to print a border
 					} else {
-						$val = whitespace(h($val));
+						$val = h($val);
 						if ($types[$key] == 254) {
 							$val = "<code>$val</code>";
 						}
@@ -188,7 +188,7 @@
 		echo "&nbsp;<input type='image' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editing_remove_row(this);'>";
 		echo "&nbsp;<input type='image' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>";
 		echo "&nbsp;<input type='image' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>";
-		echo "\n\n";
+		echo "\n";
 	}
 	return $column_comments;
 }

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-10-13 19:33:50 UTC (rev 1188)
+++ trunk/adminer/include/functions.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
@@ -43,14 +43,6 @@
 	return htmlspecialchars($string, ENT_QUOTES);
 }
 
-/** Convert text whitespace to HTML
-* @param string
-* @return string
-*/
-function whitespace($string) {
-	return nl2br(preg_replace('~(^| ) ~m', '\\1&nbsp;', str_replace("\t", "    ", $string)));
-}
-
 /** Escape for TD
 * @param string
 * @return string

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-10-13 19:33:50 UTC (rev 1188)
+++ trunk/adminer/select.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
@@ -212,9 +212,9 @@
 							if (!strlen($val)) {
 								$val = "&nbsp;";
 							} elseif (strlen($text_length) && ereg('text|blob', $field["type"]) && is_utf8($val)) {
-								$val = whitespace(shorten_utf8($val, max(0, intval($text_length)))); // usage of LEFT() would reduce traffic but complicate query
+								$val = shorten_utf8($val, max(0, intval($text_length))); // usage of LEFT() would reduce traffic but complicate query
 							} else {
-								$val = whitespace(h($val));
+								$val = h($val);
 							}
 							
 							if (!$link) { // link related items

Modified: trunk/adminer/static/default.css
===================================================================
--- trunk/adminer/static/default.css	2009-10-13 19:33:50 UTC (rev 1188)
+++ trunk/adminer/static/default.css	2009-10-13 19:43:33 UTC (rev 1189)
@@ -18,7 +18,7 @@
 tr:hover td, tr:hover th { background: #ddf; }
 .version { color: #777; font-size: 67%; }
 .js .hidden { display: none; }
-.nowrap { white-space: nowrap; }
+.nowrap { white-space: pre; }
 .wrap { white-space: normal; }
 .error { color: red; background: #fee; }
 .message { color: green; background: #efe; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1190] trunk/adminer

From: <jakubvrana@us...> - 2009-10-13 20:02

Revision: 1190
          http://adminer.svn.sourceforge.net/adminer/?rev=1190&view=rev
Author:   jakubvrana
Date:     2009-10-13 20:01:52 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Introduce queries_redirect function

Modified Paths:
--------------
    trunk/adminer/database.inc.php
    trunk/adminer/db.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/processlist.inc.php
    trunk/adminer/select.inc.php
    trunk/adminer/user.inc.php

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
+++ trunk/adminer/database.inc.php	2009-10-13 20:01:52 UTC (rev 1190)
@@ -27,7 +27,7 @@
 			if (!$row) {
 				queries("DROP DATABASE " . idf_escape(DB));
 			}
-			query_redirect(queries(), preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), !$row, false, $row);
+			queries_redirect(preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), !$row);
 		}
 	} else {
 		// alter database

Modified: trunk/adminer/db.inc.php
===================================================================
--- trunk/adminer/db.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
+++ trunk/adminer/db.inc.php	2009-10-13 20:01:52 UTC (rev 1190)
@@ -33,7 +33,7 @@
 			}
 		}
 	}
-	query_redirect(queries(), substr(ME, 0, -1), $message, $result, false, !$result);
+	queries_redirect(substr(ME, 0, -1), $message, $result);
 }
 
 page_header(lang('Database') . ": " . h(DB), $error, false);

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
+++ trunk/adminer/include/editing.inc.php	2009-10-13 20:01:52 UTC (rev 1190)
@@ -282,7 +282,7 @@
 	}
 	$dropped = strlen($name) && ($_POST["dropped"] || queries($drop));
 	$created = queries($create);
-	if (!query_redirect(queries(), $location, (strlen($name) ? $message_alter : $message_create), $created, false, !$created) && $dropped) {
+	if (!queries_redirect($location, (strlen($name) ? $message_alter : $message_create), $created) && $dropped) {
 		$_SESSION["messages"][] = $message_drop;
 	}
 	return $dropped;

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
+++ trunk/adminer/include/functions.inc.php	2009-10-13 20:01:52 UTC (rev 1190)
@@ -252,6 +252,15 @@
 	return $connection->query($query);
 }
 
+/** Redirect by remembered queries
+* @param string
+* @param string
+* @param bool
+*/
+function queries_redirect($location, $message, $redirect) {
+	return query_redirect(queries(), $location, $message, $redirect, false, !$redirect);
+}
+
 /** Remove parameter from query string
 * @param string
 * @return string

Modified: trunk/adminer/processlist.inc.php
===================================================================
--- trunk/adminer/processlist.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
+++ trunk/adminer/processlist.inc.php	2009-10-13 20:01:52 UTC (rev 1190)
@@ -6,7 +6,7 @@
 			$killed++;
 		}
 	}
-	query_redirect(queries(), ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"], false, !$killed && $_POST["kill"]);
+	queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 }
 
 page_header(lang('Process list'), $error);

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
+++ trunk/adminer/select.inc.php	2009-10-13 20:01:52 UTC (rev 1190)
@@ -85,7 +85,7 @@
 					}
 				}
 			}
-			query_redirect(queries(), remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result, false, !$result);
+			queries_redirect(remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result);
 			//! display edit page in case of an error
 		} elseif (is_string($file = get_file("csv_file", true))) {
 			$file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set
@@ -111,7 +111,7 @@
 					}
 				}
 			}
-			query_redirect(queries(), remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result, false, !$result);
+			queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
 		} else {
 			$error = upload_error($file);
 		}

Modified: trunk/adminer/user.inc.php
===================================================================
--- trunk/adminer/user.inc.php	2009-10-13 19:43:33 UTC (rev 1189)
+++ trunk/adminer/user.inc.php	2009-10-13 20:01:52 UTC (rev 1190)
@@ -91,7 +91,7 @@
 				}
 			}
 		}
-		query_redirect(queries(), ME . "privileges=", (isset($_GET["host"]) ? lang('User has been altered.') : lang('User has been created.')), !$error, false, $error);
+		queries_redirect(ME . "privileges=", (isset($_GET["host"]) ? lang('User has been altered.') : lang('User has been created.')), !$error);
 		if ($old_user != $new_user) {
 			// delete new user in case of an error
 			$connection->query("DROP USER $new_user");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1219] trunk/adminer

From: <jakubvrana@us...> - 2009-10-28 13:43

Revision: 1219
          http://adminer.svn.sourceforge.net/adminer/?rev=1219&view=rev
Author:   jakubvrana
Date:     2009-10-28 13:42:51 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Spaces

Modified Paths:
--------------
    trunk/adminer/database.inc.php
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/include/lang.inc.php

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2009-10-28 12:21:21 UTC (rev 1218)
+++ trunk/adminer/database.inc.php	2009-10-28 13:42:51 UTC (rev 1219)
@@ -65,7 +65,7 @@
 ) . "\n"; ?>
 <?php echo html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate); ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
-<input type="submit" value="<?php echo lang('Save'); ?>">
+ <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (!$_POST["add_x"]) {
 	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-10-28 12:21:21 UTC (rev 1218)
+++ trunk/adminer/include/adminer.inc.php	2009-10-28 13:42:51 UTC (rev 1219)
@@ -486,7 +486,7 @@
 <?php if (isset($_GET["sql"])) { ?><input type="hidden" name="sql" value=""><?php } ?>
 <?php if (isset($_GET["schema"])) { ?><input type="hidden" name="schema" value=""><?php } ?>
 <?php if (isset($_GET["dump"])) { ?><input type="hidden" name="dump" value=""><?php } ?>
-<input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?>>
+ <input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?>>
 </p>
 </form>
 <?php

Modified: trunk/adminer/include/lang.inc.php
===================================================================
--- trunk/adminer/include/lang.inc.php	2009-10-28 12:21:21 UTC (rev 1218)
+++ trunk/adminer/include/lang.inc.php	2009-10-28 13:42:51 UTC (rev 1219)
@@ -33,7 +33,7 @@
 	echo "<form action=''>\n<div id='lang'>";
 	hidden_fields($_GET, array('lang'));
 	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
-	echo "<noscript><div style='display: inline;'><input type='submit' value='" . lang('Use') . "'></div></noscript>\n";
+	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
 	echo "</div>\n</form>\n";
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1222] trunk/adminer

From: <jakubvrana@us...> - 2009-10-30 16:48

Revision: 1222
          http://adminer.svn.sourceforge.net/adminer/?rev=1222&view=rev
Author:   jakubvrana
Date:     2009-10-30 16:48:18 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Remove number of tables (slow)

Modified Paths:
--------------
    trunk/adminer/database.inc.php
    trunk/adminer/include/connect.inc.php

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2009-10-30 16:25:36 UTC (rev 1221)
+++ trunk/adminer/database.inc.php	2009-10-30 16:48:18 UTC (rev 1222)
@@ -23,6 +23,7 @@
 			}
 			if (!$row) {
 				queries("DROP DATABASE " . idf_escape(DB));
+				//! saved to history of removed database
 			}
 			queries_redirect(preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), !$row);
 		}

Modified: trunk/adminer/include/connect.inc.php
===================================================================
--- trunk/adminer/include/connect.inc.php	2009-10-30 16:25:36 UTC (rev 1221)
+++ trunk/adminer/include/connect.inc.php	2009-10-30 16:48:18 UTC (rev 1222)
@@ -31,14 +31,12 @@
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
 			echo "<table cellspacing='0' onclick='table_click(event);'>\n";
-			echo "<thead><tr><td><input type='hidden' name='token' value='$token'>&nbsp;<th>" . lang('Database') . "<td>" . lang('Collation') . "<td>" . lang('Tables') . "</thead>\n";
+			echo "<thead><tr><td><input type='hidden' name='token' value='$token'>&nbsp;<th>" . lang('Database') . "<td>" . lang('Collation') . "</thead>\n";
 			foreach ($databases as $db) {
 				$root = h(ME) . "db=" . urlencode($db);
 				echo "<tr" . odd() . "><td>" . checkbox("db[]", $db, false);
 				echo "<th><a href='$root'>" . h($db) . "</a>";
 				echo "<td><a href='$root&amp;database='>" . nbsp(db_collation($db, $collations)) . "</a>";
-				$result = $connection->query("SHOW TABLES FROM " . idf_escape($db));
-				echo "<td align='right'><a href='$root&amp;schema='>$result->num_rows</a>";
 				echo "\n";
 			}
 			echo "</table>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1227] trunk/adminer

From: <jakubvrana@us...> - 2009-11-03 10:56

Revision: 1227
          http://adminer.svn.sourceforge.net/adminer/?rev=1227&view=rev
Author:   jakubvrana
Date:     2009-11-03 10:55:57 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
Improve session restarting

Modified Paths:
--------------
    trunk/adminer/database.inc.php
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/include/bootstrap.inc.php
    trunk/adminer/include/design.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/sql.inc.php

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2009-11-02 23:14:37 UTC (rev 1226)
+++ trunk/adminer/database.inc.php	2009-11-03 10:55:57 UTC (rev 1227)
@@ -2,6 +2,7 @@
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
 	if (DB !== $_POST["name"]) {
 		// create or rename database
+		restart_session();
 		unset($_SESSION["databases"][$_GET["server"]]); // clear cache
 		$dbs = explode("\n", str_replace("\r", "", $_POST["name"]));
 		$failed = false;
@@ -15,6 +16,7 @@
 			}
 		}
 		if (query_redirect(queries(), ME . "db=" . urlencode($last), lang('Database has been created.'), !strlen(DB), false, $failed)) {
+			//! move triggers
 			$result = $connection->query("SHOW TABLES");
 			while ($row = $result->fetch_row()) {
 				if (!queries("RENAME TABLE " . idf_escape($row[0]) . " TO " . idf_escape($_POST["name"]) . "." . idf_escape($row[0]))) {

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-11-02 23:14:37 UTC (rev 1226)
+++ trunk/adminer/include/adminer.inc.php	2009-11-03 10:55:57 UTC (rev 1227)
@@ -358,7 +358,7 @@
 	* @return string
 	*/
 	function messageQuery($query) {
-		session_start();
+		restart_session();
 		$id = "sql-" . count($_SESSION["messages"]);
 		$_SESSION["history"][$_GET["server"]][DB][] = $query;
 		return " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre class='jush-sql'>" . shorten_utf8($query, 1000) . '</pre><a href="' . h(ME . 'sql=&history=' . (count($_SESSION["history"][$_GET["server"]][DB]) - 1)) . '">' . lang('Edit') . '</a></div>';

Modified: trunk/adminer/include/bootstrap.inc.php
===================================================================
--- trunk/adminer/include/bootstrap.inc.php	2009-11-02 23:14:37 UTC (rev 1226)
+++ trunk/adminer/include/bootstrap.inc.php	2009-11-03 10:55:57 UTC (rev 1227)
@@ -92,8 +92,8 @@
 include "./include/export.inc.php";
 
 session_cache_limiter(""); // to allow restarting session
-if (@ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
-	session_write_close(); // improves concurrency, may be restarted later
+if (!ini_get("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
+	session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
 }
 
 $confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\"";

Modified: trunk/adminer/include/design.inc.php
===================================================================
--- trunk/adminer/include/design.inc.php	2009-11-02 23:14:37 UTC (rev 1226)
+++ trunk/adminer/include/design.inc.php	2009-11-03 10:55:57 UTC (rev 1227)
@@ -52,10 +52,6 @@
 	if (strlen(DB) && $databases && !in_array(DB, $databases, true)) {
 		$databases = null;
 	}
-	if ((isset($databases) && !isset($_GET["sql"])) || !ini_get("session.use_cookies")) {
-		// improves concurrency if a user opens several pages at once
-		session_write_close();
-	}
 	if ($error) {
 		echo "<div class='error'>$error</div>\n";
 	}

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2009-11-02 23:14:37 UTC (rev 1226)
+++ trunk/adminer/include/editing.inc.php	2009-11-03 10:55:57 UTC (rev 1227)
@@ -351,7 +351,7 @@
 	$dropped = strlen($name) && ($_POST["dropped"] || queries($drop));
 	$created = queries($create);
 	if (!queries_redirect($location, (strlen($name) ? $message_alter : $message_create), $created) && $dropped) {
-		session_start();
+		restart_session();
 		$_SESSION["messages"][] = $message_drop;
 	}
 	return $dropped;

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-11-02 23:14:37 UTC (rev 1226)
+++ trunk/adminer/include/functions.inc.php	2009-11-03 10:55:57 UTC (rev 1227)
@@ -220,7 +220,7 @@
 */
 function redirect($location, $message = null) {
 	if (isset($message)) {
-		session_start();
+		restart_session();
 		$_SESSION["messages"][] = $message;
 	}
 	header("Location: " . (strlen($location) ? $location : "."));

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-11-02 23:14:37 UTC (rev 1226)
+++ trunk/adminer/sql.inc.php	2009-11-03 10:55:57 UTC (rev 1227)
@@ -1,4 +1,5 @@
 <?php
+restart_session();
 $history = &$_SESSION["history"][$_GET["server"]][DB];
 if (!$error && $_POST["clear"]) {
 	$history = array();
@@ -27,7 +28,7 @@
 		$space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)";
 		$alter_database = "(CREATE|DROP)$space+(DATABASE|SCHEMA)\\b~isU";
 		$databases = &$_SESSION["databases"][$_GET["server"]];
-		if ((isset($databases) && !preg_match("~\\b$alter_database", $query)) || !ini_get("session.use_cookies")) { // quick check - may be inside string
+		if (!ini_get("session.use_cookies") || (isset($databases) && !preg_match("~\\b$alter_database", $query))) { // quick check - may be inside string
 			//! false positive with $fp and disabled ini_set() and enabled session.use_cookies
 			session_write_close();
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1246] trunk/adminer

From: <jakubvrana@us...> - 2009-11-19 20:05

Revision: 1246
          http://adminer.svn.sourceforge.net/adminer/?rev=1246&view=rev
Author:   jakubvrana
Date:     2009-11-19 20:04:55 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
Allow dropping remote foreign key

Modified Paths:
--------------
    trunk/adminer/foreign.inc.php
    trunk/adminer/table.inc.php

Modified: trunk/adminer/foreign.inc.php
===================================================================
--- trunk/adminer/foreign.inc.php	2009-11-19 09:29:06 UTC (rev 1245)
+++ trunk/adminer/foreign.inc.php	2009-11-19 20:04:55 UTC (rev 1246)
@@ -43,6 +43,7 @@
 
 <form action="" method="post">
 <p>
+<?php if (!strlen($row["db"])) { ?>
 <?php echo lang('Target table'); ?>:
 <?php echo html_select("table", array_keys(table_status_referencable()), $row["table"], "this.form['change-js'].value = '1'; this.form.submit();"); ?>
 <input type="hidden" name="change-js" value="">
@@ -64,8 +65,9 @@
 <?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + $on_actions, $row["on_delete"]); ?>
  <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + $on_actions, $row["on_update"]); ?>
 <p>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
+<noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
+<?php } ?>
 <?php if (strlen($_GET["name"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
-<noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
+<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

Modified: trunk/adminer/table.inc.php
===================================================================
--- trunk/adminer/table.inc.php	2009-11-19 09:29:06 UTC (rev 1245)
+++ trunk/adminer/table.inc.php	2009-11-19 20:04:55 UTC (rev 1246)
@@ -49,7 +49,7 @@
 					echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
 					echo "<td><a href='" . h(strlen($foreign_key["db"]) ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ME) . "table=" . urlencode($foreign_key["table"]) . "'>$link</a>";
 					echo "(<em>" . implode("</em>, <em>", array_map('h', $foreign_key["target"])) . "</em>)";
-					echo "<td>" . (!strlen($foreign_key["db"]) ? '<a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>' : '&nbsp;');
+					echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
 				}
 				echo "</table>\n";
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1251] trunk/adminer

From: <jakubvrana@us...> - 2009-11-24 09:44

Revision: 1251
          http://adminer.svn.sourceforge.net/adminer/?rev=1251&view=rev
Author:   jakubvrana
Date:     2009-11-24 09:44:28 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
Highlight current link

Modified Paths:
--------------
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/table.inc.php

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-11-21 09:08:52 UTC (rev 1250)
+++ trunk/adminer/include/adminer.inc.php	2009-11-24 09:44:28 UTC (rev 1251)
@@ -68,21 +68,23 @@
 	
 	/** Print links after select heading
 	* @param array result of SHOW TABLE STATUS
-	* @param strin new item options, NULL for no new item
+	* @param string new item options, NULL for no new item
 	* @return null
 	*/
 	function selectLinks($tableStatus, $set = "") {
-		$TABLE = $tableStatus["Name"];
-		echo '<p class="tabs"><a href="' . h(ME) . 'select=' . urlencode($TABLE) . '">' . lang('Select table') . '</a>';
-		echo ' <a href="' . h(ME) . 'table=' . urlencode($TABLE) . '">' . lang('Table structure') . '</a>';
+		echo '<p class="tabs">';
+		$links = array("select" => lang('Select table'), "table" => lang('Table structure'));
 		if (isset($tableStatus["Rows"])) {
-			echo ' <a href="' . h(ME) . 'create=' . urlencode($TABLE) . '">' . lang('Alter table') . '</a>';
+			$links["create"] = lang('Alter table');
 		} else {
-			echo ' <a href="' . h(ME) . 'view=' . urlencode($TABLE) . '">' . lang('Alter view') . '</a>';
+			$links["view"] = lang('Alter view');
 		}
 		if (isset($set)) {
-			echo ' <a href="' . h(ME . 'edit=' . urlencode($TABLE) . $set) . '">' . lang('New item') . '</a>';
+			$links["edit"] = lang('New item');
 		}
+		foreach ($links as $key => $val) {
+			echo " <a href='" . h(ME) . "$key=" . urlencode($tableStatus["Name"]) . ($key == "edit" ? $set : "") . "'>" . (isset($_GET[$key]) ? "<b>$val</b>" : $val) . "</a>";
+		}
 		echo "\n";
 	}
 	

Modified: trunk/adminer/table.inc.php
===================================================================
--- trunk/adminer/table.inc.php	2009-11-21 09:08:52 UTC (rev 1250)
+++ trunk/adminer/table.inc.php	2009-11-24 09:44:28 UTC (rev 1251)
@@ -5,10 +5,9 @@
 	$error = h($connection->error);
 }
 $table_status = ($fields ? table_status($TABLE) : array());
-$is_view = !isset($table_status["Rows"]);
 
-page_header(($fields && $is_view ? lang('View') : lang('Table')) . ": " . h($TABLE), $error);
-$adminer->selectLinks($table_status, $is_view ? null : "");
+page_header(($fields && !isset($table_status["Rows"]) ? lang('View') : lang('Table')) . ": " . h($TABLE), $error);
+$adminer->selectLinks($table_status);
 
 if ($fields) {
 	echo "<table cellspacing='0'>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1257] trunk/adminer

From: <jakubvrana@us...> - 2009-11-27 13:44

Revision: 1257
          http://adminer.svn.sourceforge.net/adminer/?rev=1257&view=rev
Author:   jakubvrana
Date:     2009-11-27 13:44:44 +0000 (Fri, 27 Nov 2009)

Log Message:
-----------
Change table operations descriptions

Modified Paths:
--------------
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/lang/cs.inc.php
    trunk/adminer/lang/de.inc.php
    trunk/adminer/lang/es.inc.php
    trunk/adminer/lang/et.inc.php
    trunk/adminer/lang/fr.inc.php
    trunk/adminer/lang/it.inc.php
    trunk/adminer/lang/nl.inc.php
    trunk/adminer/lang/ru.inc.php
    trunk/adminer/lang/sk.inc.php
    trunk/adminer/lang/zh-tw.inc.php
    trunk/adminer/lang/zh.inc.php

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/include/adminer.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -73,7 +73,7 @@
 	*/
 	function selectLinks($tableStatus, $set = "") {
 		echo '<p class="tabs">';
-		$links = array("select" => lang('Select table'), "table" => lang('Table structure'));
+		$links = array("select" => lang('Select data'), "table" => lang('Show structure'));
 		if (isset($tableStatus["Rows"])) {
 			$links["create"] = lang('Alter table');
 		} else {

Modified: trunk/adminer/lang/cs.inc.php
===================================================================
--- trunk/adminer/lang/cs.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/cs.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -197,8 +197,8 @@
 	'%d row(s) have been imported.' => array('Byl importován %d záznam.', 'Byly importovány %d záznamy.', 'Bylo importováno %d záznamů.'),
 	'CSV Import' => 'Import CSV',
 	'Import' => 'Import',
-	'Table structure' => 'Struktura tabulky',
-	'Select table' => 'Vypsat tabulku',
+	'Show structure' => 'Zobrazit strukturu',
+	'Select data' => 'Vypsat data',
 	'Stop on error' => 'Zastavit při chybě',
 	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s a %s.',
 	'(anywhere)' => '(kdekoliv)',

Modified: trunk/adminer/lang/de.inc.php
===================================================================
--- trunk/adminer/lang/de.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/de.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => 'Name der Partition',
 	'Values' => 'Werte',
 	'%d row(s) have been imported.' => array('%d Datensatz importiert.', '%d Datensätze wurden importiert.'),
-	'Table structure' => 'Tabellenstruktur',
+	'Show structure' => 'Tabellenstruktur',
 	'(anywhere)' => '(beliebig)',
 	'CSV Import' => 'Importiere CSV',
 	'Import' => 'Importieren',
 	'Stop on error' => 'Bei Fehler anhaltan',
-	'Select table' => 'Tabelle auswählen',
+	'Select data' => 'Tabelle auswählen',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$6.$4.$1',
 	'[yyyy]-mm-dd' => 't.m.[jjjj]',

Modified: trunk/adminer/lang/es.inc.php
===================================================================
--- trunk/adminer/lang/es.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/es.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => 'Nombre de Partición',
 	'Values' => 'Valores',
 	'%d row(s) have been imported.' => array('%d registro importado.', '%d registros importados.'),
-	'Table structure' => 'Información de la Tabla',
+	'Show structure' => 'Información de la Tabla',
 	'(anywhere)' => '(donde sea)',
 	'CSV Import' => 'Importar CSV',
 	'Import' => 'Importar',
 	'Stop on error' => 'Parar en caso de error',
-	'Select table' => 'Mostrar datos',
+	'Select data' => 'Mostrar datos',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
 	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',

Modified: trunk/adminer/lang/et.inc.php
===================================================================
--- trunk/adminer/lang/et.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/et.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => 'Partitsiooni nimi',
 	'Values' => 'Väärtused',
 	'%d row(s) have been imported.' => array('Imporditi %d rida.', 'Imporditi %d rida.'),
-	'Table structure' => 'Tabeli struktuur',
+	'Show structure' => 'Tabeli struktuur',
 	'(anywhere)' => '(vahet pole)',
 	'CSV Import' => 'Impordi CSV',
 	'Import' => 'Impordi',
 	'Stop on error' => 'Peatuda vea esinemisel',
-	'Select table' => 'Vali tabel',
+	'Select data' => 'Vali tabel',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$6.$4.$1',
 	'[yyyy]-mm-dd' => 'd.m.[yyyy]',

Modified: trunk/adminer/lang/fr.inc.php
===================================================================
--- trunk/adminer/lang/fr.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/fr.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => 'Nom de la partition',
 	'Values' => 'Valeurs',
 	'%d row(s) have been imported.' => array('%d ligne a été importé','%d lignes ont été importé'),
-	'Table structure' => 'Structure de la table',
+	'Show structure' => 'Structure de la table',
 	'(anywhere)' => '(n\'importe où)',
 	'CSV Import' => 'Importation CVS',
 	'Import' => 'Importer',
 	'Stop on error' => 'Arrêt sur erreur',
-	'Select table' => 'Selectionner la table',
+	'Select data' => 'Selectionner la table',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
 	'[yyyy]-mm-dd' => 'jj/mm/[aaaa]',

Modified: trunk/adminer/lang/it.inc.php
===================================================================
--- trunk/adminer/lang/it.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/it.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => 'Nome partizione',
 	'Values' => 'Valori',
 	'%d row(s) have been imported.' => array('%d riga importata.','%d righe importate.'),
-	'Table structure' => 'Struttura tabella',
+	'Show structure' => 'Struttura tabella',
 	'(anywhere)' => '(ovunque)',
 	'CSV Import' => 'Importa da CSV',
 	'Import' => 'Importa',
 	'Stop on error' => 'Stop su errore',
-	'Select table' => 'Scegli tabella',
+	'Select data' => 'Scegli tabella',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
 	'[yyyy]-mm-dd' => 'dd/mm/[yyyy]',

Modified: trunk/adminer/lang/nl.inc.php
===================================================================
--- trunk/adminer/lang/nl.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/nl.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => 'Partitie naam',
 	'Values' => 'Waarden',
 	'%d row(s) have been imported.' => array('%d rij werd geïmporteerd.', '%d rijen werden geïmporteerd.'),
-	'Table structure' => 'Tabelstructuur',
+	'Show structure' => 'Tabelstructuur',
 	'(anywhere)' => '(overal)',
 	'CSV Import' => 'CSV Import',
 	'Import' => 'Importeren',
 	'Stop on error' => 'Stoppen bij fout',
-	'Select table' => 'Selecteer tabel',
+	'Select data' => 'Selecteer tabel',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5-$3-$1',
 	'[yyyy]-mm-dd' => 'dd-mm-[jjjj]',

Modified: trunk/adminer/lang/ru.inc.php
===================================================================
--- trunk/adminer/lang/ru.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/ru.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -197,8 +197,8 @@
 	'%d row(s) have been imported.' => array('Импортирована %d строка.', 'Импортировано %d строки.', 'Импортировано %d строк.'),
 	'CSV Import' => 'Импорт CSV',
 	'Import' => 'Импорт',
-	'Table structure' => 'Структура таблицы',
-	'Select table' => 'Выбрать данные из таблицы',
+	'Show structure' => 'Структура таблицы',
+	'Select data' => 'Выбрать данные из таблицы',
 	'Stop on error' => 'Остановить при ошибке',
 	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Достигнуто максимальное значение количества доступных полей. Увеличьте %s и %s.',
 	'(anywhere)' => '(в любом месте)',

Modified: trunk/adminer/lang/sk.inc.php
===================================================================
--- trunk/adminer/lang/sk.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/sk.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -197,8 +197,8 @@
 	'%d row(s) have been imported.' => array('Bol importovaný %d záznam.', 'Boli importované %d záznamy.', 'Bolo importovaných %d záznamov.'),
 	'CSV Import' => 'Import CSV',
 	'Import' => 'Import',
-	'Table structure' => 'Štruktúra tabuľky',
-	'Select table' => 'Vypísať tabuľku',
+	'Show structure' => 'Štruktúra tabuľky',
+	'Select data' => 'Vypísať tabuľku',
 	'Stop on error' => 'Zastaviť pri chybe',
 	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Bol prekročený maximálny počet povolených polí. Zvýšte prosím %s a %s.',
 	'(anywhere)' => '(kdekoľvek)',

Modified: trunk/adminer/lang/zh-tw.inc.php
===================================================================
--- trunk/adminer/lang/zh-tw.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/zh-tw.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => '分區名',
 	'Values' => '值',
 	'%d row(s) have been imported.' => '%d行已導入。',
-	'Table structure' => '資料表結構',
+	'Show structure' => '資料表結構',
 	'(anywhere)' => '（任意位置）',
 	'CSV Import' => '匯入 CSV',
 	'Import' => '匯入',
 	'Stop on error' => '出錯時停止',
-	'Select table' => '選擇資料表',
+	'Select data' => '選擇資料表',
 	'%.3f s' => '%.3f秒',
 	'$1-$3-$5' => '$1.$3.$5',
 	'[yyyy]-mm-dd' => '[yyyy].mm.dd',

Modified: trunk/adminer/lang/zh.inc.php
===================================================================
--- trunk/adminer/lang/zh.inc.php	2009-11-26 15:57:21 UTC (rev 1256)
+++ trunk/adminer/lang/zh.inc.php	2009-11-27 13:44:44 UTC (rev 1257)
@@ -196,12 +196,12 @@
 	'Partition name' => '分区名',
 	'Values' => '值',
 	'%d row(s) have been imported.' => '%d 行已导入。',
-	'Table structure' => '表结构',
+	'Show structure' => '表结构',
 	'(anywhere)' => '（任意位置）',
 	'CSV Import' => 'CSV 导入',
 	'Import' => '导入',
 	'Stop on error' => '出错时停止',
-	'Select table' => '选择表',
+	'Select data' => '选择表',
 	'%.3f s' => '%.3f 秒',
 	'$1-$3-$5' => '$1.$3.$5',
 	'[yyyy]-mm-dd' => '[yyyy].mm.dd',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1266] trunk/adminer

From: <jakubvrana@us...> - 2009-12-14 13:18

Revision: 1266
          http://adminer.svn.sourceforge.net/adminer/?rev=1266&view=rev
Author:   jakubvrana
Date:     2009-12-14 13:17:54 +0000 (Mon, 14 Dec 2009)

Log Message:
-----------
EXPLAIN for UNIONs

Modified Paths:
--------------
    trunk/adminer/lang/zh-tw.inc.php
    trunk/adminer/sql.inc.php

Modified: trunk/adminer/lang/zh-tw.inc.php
===================================================================
--- trunk/adminer/lang/zh-tw.inc.php	2009-12-14 11:37:59 UTC (rev 1265)
+++ trunk/adminer/lang/zh-tw.inc.php	2009-12-14 13:17:54 UTC (rev 1266)
@@ -225,4 +225,5 @@
 	'%d e-mail(s) have been sent.' => '已發送 %d 封郵件。',
 	'Webserver file %s' => '網頁伺服器檔案 %s',
 	'File does not exist.' => '檔案不存在',
+	'Item has been deleted.' => '該項目已被刪除',
 );

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-12-14 11:37:59 UTC (rev 1265)
+++ trunk/adminer/sql.inc.php	2009-12-14 13:17:54 UTC (rev 1266)
@@ -74,12 +74,12 @@
 								$result = $connection->store_result();
 								if (is_object($result)) {
 									select($result, $connection2);
-									if ($connection2 && preg_match("~^$space*SELECT$space+~isU", $q)) {
+									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q)) {
 										$id = "explain-$explain";
 										echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) . ", " : "");
 										echo "<a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
 										echo "<div id='$id' class='hidden'>\n";
-										select($connection2->query("EXPLAIN $q"), $connection2);
+										select($connection2->query("EXPLAIN $q"));
 										echo "</div>\n";
 										$explain++;
 									}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1275] trunk/adminer

From: <jakubvrana@us...> - 2009-12-17 14:53

Revision: 1275
          http://adminer.svn.sourceforge.net/adminer/?rev=1275&view=rev
Author:   jakubvrana
Date:     2009-12-17 14:53:26 +0000 (Thu, 17 Dec 2009)

Log Message:
-----------
JavaScript comments

Modified Paths:
--------------
    trunk/adminer/schema.inc.php
    trunk/adminer/static/editing.js
    trunk/adminer/static/functions.js

Modified: trunk/adminer/schema.inc.php
===================================================================
--- trunk/adminer/schema.inc.php	2009-12-17 13:30:23 UTC (rev 1274)
+++ trunk/adminer/schema.inc.php	2009-12-17 14:53:26 UTC (rev 1275)
@@ -52,7 +52,7 @@
 ?>
 <div id="schema" style="height: <?php echo $top; ?>em;">
 <script type="text/javascript">
-table_pos = {<?php echo implode(",", $table_pos_js) . "\n"; ?>};
+tablePos = {<?php echo implode(",", $table_pos_js) . "\n"; ?>};
 em = document.getElementById('schema').offsetHeight / <?php echo $top; ?>;
 document.onmousemove = schemaMousemove;
 document.onmouseup = schemaMouseup;

Modified: trunk/adminer/static/editing.js
===================================================================
--- trunk/adminer/static/editing.js	2009-12-17 13:30:23 UTC (rev 1274)
+++ trunk/adminer/static/editing.js	2009-12-17 14:53:26 UTC (rev 1275)
@@ -1,5 +1,8 @@
 // Adminer specific functions
 
+/** Load syntax highlighting
+* @param string first three characters of MySQL version
+*/
 function bodyLoad(version) {
 	var jushRoot = '../externals/jush/';
 	var script = document.createElement('script');
@@ -24,10 +27,19 @@
 
 
 
+/** Get value of select
+* @param HTMLSelectElement
+* @return string
+*/
 function selectValue(select) {
 	return select.value || select.options[select.selectedIndex].text;
 }
 
+/** Get value of dynamically created form field
+* @param HTMLFormElement
+* @param string
+* @return HTMLElement
+*/
 function formField(form, name) {
 	for (var i=0; i < form.length; i++) {
 		if (form[i].name == name) {
@@ -36,6 +48,10 @@
 	}
 }
 
+/** Try to change input type to password or to text
+* @param HTMLInputElement
+* @param boolean
+*/
 function typePassword(el, disable) {
 	try {
 		el.type = (disable ? 'text' : 'password');
@@ -47,14 +63,25 @@
 
 var added = '.', rowCount;
 
+/** Escape string to use in regular expression
+* @param string
+* @return string
+*/
 function reEscape(s) {
 	return s.replace(/[\[\]\\^$*+?.(){|}]/, '\\$&');
 }
 
+/** Escape string to use as identifier
+* @param string
+* @return string
+*/
 function idfEscape(s) {
 	return '`' + s.replace(/`/, '``') + '`';
 }
 
+/** Detect foreign key
+* @param HTMLInputElement
+*/
 function editingNameChange(field) {
 	var name = field.name.substr(0, field.name.length - 7);
 	var type = formField(field.form, name + '[type]');
@@ -94,6 +121,12 @@
 	}
 }
 
+/** Add table row for next field
+* @param HTMLInputElement
+* @param boolean
+* @param boolean
+* @return boolean
+*/
 function editingAddRow(button, allowed, focus) {
 	if (allowed && rowCount >= allowed) {
 		return false;
@@ -139,6 +172,10 @@
 	return true;
 }
 
+/** Remove table row for field
+* @param HTMLInputElement
+* @return boolean
+*/
 function editingRemoveRow(button) {
 	var field = formField(button.form, button.name.replace(/drop_col(.+)/, 'fields$1[field]'));
 	field.parentNode.removeChild(field);
@@ -147,6 +184,10 @@
 }
 
 var lastType = '';
+
+/** Clear length and hide collation or unsigned
+* @param HTMLSelectElement
+*/
 function editingTypeChange(type) {
 	var name = type.name.substr(0, type.name.length - 6);
 	var text = selectValue(type);
@@ -167,6 +208,9 @@
 	}
 }
 
+/** Edit enum or set
+* @param HTMLInputElement
+*/
 function editingLengthFocus(field) {
 	var td = field.parentNode;
 	if (/(enum|set)$/.test(selectValue(td.previousSibling.firstChild))) {
@@ -180,6 +224,9 @@
 	}
 }
 
+/** Finish editing of enum or set
+* @param HTMLTextAreaElement
+*/
 function editingLengthBlur(edit) {
 	var field = edit.parentNode.firstChild;
 	var val = edit.value;
@@ -188,6 +235,10 @@
 	edit.style.display = 'none';
 }
 
+/** Show or hide selected table column
+* @param boolean
+* @param number
+*/
 function columnShow(checked, column) {
 	var trs = document.getElementById('edit-fields').getElementsByTagName('tr');
 	for (var i=0; i < trs.length; i++) {
@@ -195,12 +246,18 @@
 	}
 }
 
+/** Display partition options
+* @param HTMLSelectElement
+*/
 function partitionByChange(el) {
 	var partitionTable = /RANGE|LIST/.test(selectValue(el));
 	el.form['partitions'].className = (partitionTable || !el.selectedIndex ? 'hidden' : '');
 	document.getElementById('partition-table').className = (partitionTable ? '' : 'hidden');
 }
 
+/** Add next partition row
+* @param HTMLInputElement
+*/
 function partitionNameChange(el) {
 	var row = el.parentNode.parentNode.cloneNode(true);
 	row.firstChild.firstChild.value = '';
@@ -210,6 +267,9 @@
 
 
 
+/** Add row for foreign key
+* @param HTMLSelectElement
+*/
 function foreignAddRow(field) {
 	var row = field.parentNode.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');
@@ -223,6 +283,9 @@
 
 
 
+/** Add row for indexes
+* @param HTMLSelectElement
+*/
 function indexesAddRow(field) {
 	var row = field.parentNode.parentNode.cloneNode(true);
 	var spans = row.getElementsByTagName('span');
@@ -241,6 +304,9 @@
 	field.onchange = function () { };
 }
 
+/** Add column for index
+* @param HTMLSelectElement
+*/
 function indexesAddColumn(field) {
 	var column = field.parentNode.cloneNode(true);
 	var select = column.getElementsByTagName('select')[0];
@@ -257,12 +323,19 @@
 
 var that, x, y, em, tablePos;
 
+/** Get mouse position
+* @param HTMLElement
+* @param MouseEvent
+*/
 function schemaMousedown(el, event) {
 	that = el;
 	x = event.clientX - el.offsetLeft;
 	y = event.clientY - el.offsetTop;
 }
 
+/** Move object
+* @param MouseEvent
+*/
 function schemaMousemove(ev) {
 	if (that !== undefined) {
 		ev = ev || event;
@@ -306,6 +379,9 @@
 	}
 }
 
+/** Finish move
+* @param MouseEvent
+*/
 function schemaMouseup(ev) {
 	if (that !== undefined) {
 		ev = ev || event;

Modified: trunk/adminer/static/functions.js
===================================================================
--- trunk/adminer/static/functions.js	2009-12-17 13:30:23 UTC (rev 1274)
+++ trunk/adminer/static/functions.js	2009-12-17 14:53:26 UTC (rev 1275)
@@ -1,11 +1,18 @@
+// to hide elements displayed by JavaScript
 document.body.className = 'js';
 
+/** Toggle visibility
+* @param string
+* @return boolean
+*/
 function toggle(id) {
 	var el = document.getElementById(id);
 	el.className = (el.className == 'hidden' ? '' : 'hidden');
 	return true;
 }
 
+/** Verify current Adminer version
+*/
 function verifyVersion() {
 	document.cookie = 'adminer_version=0';
 	var script = document.createElement('script');
@@ -13,6 +20,10 @@
 	document.body.appendChild(script);
 }
 
+/** Check all elements matching given name
+* @param HTMLInputElement
+* @param RegExp
+*/
 function formCheck(el, name) {
 	var elems = el.form.elements;
 	for (var i=0; i < elems.length; i++) {
@@ -22,10 +33,18 @@
 	}
 }
 
+/** Uncheck single element
+* @param string
+*/
 function formUncheck(id) {
 	document.getElementById(id).checked = false;
 }
 
+/** Get number of checked elements matching given name
+* @param HTMLInputElement
+* @param RegExp
+* @return number
+*/
 function formChecked(el, name) {
 	var checked = 0;
 	var elems = el.form.elements;
@@ -37,6 +56,9 @@
 	return checked;
 }
 
+/** Select clicked row
+* @param MouseEvent
+*/
 function tableClick(event) {
 	var el = event.target || event.srcElement;
 	while (!/^tr$/i.test(el.tagName)) {
@@ -52,6 +74,9 @@
 
 
 
+/** Add row in select fieldset
+* @param HTMLSelectElement
+*/
 function selectAddRow(field) {
 	var row = field.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1276] trunk/adminer

From: <jakubvrana@us...> - 2009-12-17 15:31

Revision: 1276
          http://adminer.svn.sourceforge.net/adminer/?rev=1276&view=rev
Author:   jakubvrana
Date:     2009-12-17 15:31:24 +0000 (Thu, 17 Dec 2009)

Log Message:
-----------
Simplify SQL syntax errors everywhere

Modified Paths:
--------------
    trunk/adminer/call.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/include/mysql.inc.php
    trunk/adminer/select.inc.php
    trunk/adminer/sql.inc.php
    trunk/adminer/table.inc.php

Modified: trunk/adminer/call.inc.php
===================================================================
--- trunk/adminer/call.inc.php	2009-12-17 14:53:26 UTC (rev 1275)
+++ trunk/adminer/call.inc.php	2009-12-17 15:31:24 UTC (rev 1276)
@@ -30,7 +30,7 @@
 	}
 	$result = $connection->multi_query((isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . idf_escape($PROCEDURE) . "(" . implode(", ", $call) . ")");
 	if (!$result) {
-		echo "<p class='error'>" . h($connection->error) . "\n";
+		echo "<p class='error'>" . error() . "\n";
 	} else {
 		do {
 			$result = $connection->store_result();

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-12-17 14:53:26 UTC (rev 1275)
+++ trunk/adminer/include/functions.inc.php	2009-12-17 15:31:24 UTC (rev 1276)
@@ -246,7 +246,7 @@
 		$sql = $adminer->messageQuery($query);
 	}
 	if ($failed) {
-		$error = h($connection->error) . $sql;
+		$error = error() . $sql;
 		return false;
 	}
 	if ($redirect) {

Modified: trunk/adminer/include/mysql.inc.php
===================================================================
--- trunk/adminer/include/mysql.inc.php	2009-12-17 14:53:26 UTC (rev 1275)
+++ trunk/adminer/include/mysql.inc.php	2009-12-17 15:31:24 UTC (rev 1276)
@@ -372,6 +372,14 @@
 	return ($connection->server_info >= 5 && $db == "information_schema");
 }
 
+/** Get escaped error message
+* @return string
+*/
+function error() {
+	global $connection;
+	return h(preg_replace('~^You have an error.*syntax to use~U', "Syntax error", $connection->error));
+}
+
 /** Return expression for binary comparison
 * @param string
 * @return string

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2009-12-17 14:53:26 UTC (rev 1275)
+++ trunk/adminer/select.inc.php	2009-12-17 15:31:24 UTC (rev 1276)
@@ -144,7 +144,7 @@
 $adminer->selectLinks($table_status, $set);
 
 if (!$columns) {
-	echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "" : ": " . h($connection->error)) . ".\n";
+	echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "" : ": " . error()) . ".\n";
 } else {
 	echo "<form action='' id='form'>\n";
 	echo "<div style='display: none;'>";
@@ -165,7 +165,7 @@
 	
 	$result = $connection->query($query);
 	if (!$result) {
-		echo "<p class='error'>" . h($connection->error) . "\n";
+		echo "<p class='error'>" . error() . "\n";
 	} else {
 		$email_fields = array();
 		echo "<form action='' method='post' enctype='multipart/form-data'>\n";

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-12-17 14:53:26 UTC (rev 1275)
+++ trunk/adminer/sql.inc.php	2009-12-17 15:31:24 UTC (rev 1276)
@@ -63,7 +63,7 @@
 						$start = explode(" ", microtime()); // microtime(true) is available since PHP 5
 						//! don't allow changing of character_set_results, convert encoding of displayed query
 						if (!$connection->multi_query($q)) {
-							echo "<p class='error'>" . lang('Error in query') . ": " . h(preg_replace('~^You have an error.*syntax to use~U', "Syntax error", $connection->error)) . "\n";
+							echo "<p class='error'>" . lang('Error in query') . ": " . error() . "\n";
 							if ($_POST["error_stops"]) {
 								break;
 							}

Modified: trunk/adminer/table.inc.php
===================================================================
--- trunk/adminer/table.inc.php	2009-12-17 14:53:26 UTC (rev 1275)
+++ trunk/adminer/table.inc.php	2009-12-17 15:31:24 UTC (rev 1276)
@@ -2,7 +2,7 @@
 $TABLE = $_GET["table"];
 $fields = fields($TABLE);
 if (!$fields) {
-	$error = h($connection->error);
+	$error = error();
 }
 $table_status = ($fields ? table_status($TABLE) : array());
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1285] trunk/adminer

From: <jakubvrana@us...> - 2010-01-08 10:07

Revision: 1285
          http://adminer.svn.sourceforge.net/adminer/?rev=1285&view=rev
Author:   jakubvrana
Date:     2010-01-08 10:07:08 +0000 (Fri, 08 Jan 2010)

Log Message:
-----------
Show status

Modified Paths:
--------------
    trunk/adminer/include/connect.inc.php
    trunk/adminer/static/editing.js
    trunk/adminer/variables.inc.php

Modified: trunk/adminer/include/connect.inc.php
===================================================================
--- trunk/adminer/include/connect.inc.php	2009-12-29 11:27:33 UTC (rev 1284)
+++ trunk/adminer/include/connect.inc.php	2010-01-08 10:07:08 UTC (rev 1285)
@@ -21,6 +21,7 @@
 			'privileges' => lang('Privileges'),
 			'processlist' => lang('Process list'),
 			'variables' => lang('Variables'),
+			'status' => lang('Status'),
 		) as $key => $val) {
 			echo "<a href='" . h(ME) . "$key='>$val</a>\n";
 		}
@@ -47,6 +48,9 @@
 	page_footer("db");
 }
 
+if (isset($_GET["status"])) {
+	$_GET["variables"] = $_GET["status"];
+}
 if (!(strlen(DB) ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]))) {
 	if (strlen(DB)) {
 		unset($_SESSION["databases"][$_GET["server"]]);

Modified: trunk/adminer/static/editing.js
===================================================================
--- trunk/adminer/static/editing.js	2009-12-29 11:27:33 UTC (rev 1284)
+++ trunk/adminer/static/editing.js	2010-01-08 10:07:08 UTC (rev 1285)
@@ -11,7 +11,8 @@
 		if (window.jush) { // IE runs in case of an error too
 			jush.create_links = ' target="_blank"';
 			jush.urls.sql[0] = 'http://dev.mysql.com/doc/refman/' + version + '/en/$key';
-			jush.urls.sql[0] = jush.urls.sql[0];
+			jush.urls.sqlset[0] = jush.urls.sql[0];
+			jush.urls.sqlstatus[0] = jush.urls.sql[0];
 			jush.style(jushRoot + 'jush.css');
 			jush.highlight_tag('pre', 0);
 			jush.highlight_tag('code');

Modified: trunk/adminer/variables.inc.php
===================================================================
--- trunk/adminer/variables.inc.php	2009-12-29 11:27:33 UTC (rev 1284)
+++ trunk/adminer/variables.inc.php	2010-01-08 10:07:08 UTC (rev 1285)
@@ -1,11 +1,12 @@
 <?php
-page_header(lang('Variables'));
+$status = isset($_GET["status"]);
+page_header($status ? lang('Status') : lang('Variables'));
 
+$result = $connection->query($status ? "SHOW STATUS" : "SHOW VARIABLES");
 echo "<table cellspacing='0'>\n";
-$result = $connection->query("SHOW VARIABLES");
 while ($row = $result->fetch_assoc()) {
 	echo "<tr>";
-	echo "<th><code class='jush-sqlset'>" . h($row["Variable_name"]) . "</code>";
+	echo "<th><code class='jush-" . ($status ? "sqlstatus" : "sqlset") . "'>" . h($row["Variable_name"]) . "</code>";
 	echo "<td>" . nbsp($row["Value"]);
 }
 echo "</table>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1300] trunk/adminer

From: <jakubvrana@us...> - 2010-01-28 15:17

Revision: 1300
          http://adminer.svn.sourceforge.net/adminer/?rev=1300&view=rev
Author:   jakubvrana
Date:     2010-01-28 15:17:20 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Centralize nowrap

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/procedure.inc.php
    trunk/adminer/static/editing.js

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2010-01-28 14:29:10 UTC (rev 1299)
+++ trunk/adminer/create.inc.php	2010-01-28 15:17:20 UTC (rev 1300)
@@ -158,7 +158,7 @@
  <?php echo html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 </p>
-<table cellspacing="0" id="edit-fields">
+<table cellspacing="0" id="edit-fields" class="nowrap">
 <?php $column_comments = edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys); ?>
 </table>
 <p>

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2010-01-28 14:29:10 UTC (rev 1299)
+++ trunk/adminer/include/editing.inc.php	2010-01-28 15:17:20 UTC (rev 1300)
@@ -188,7 +188,7 @@
 		}
 	}
 	?>
-<thead><tr>
+<thead><tr class="wrap">
 <?php if ($type == "PROCEDURE") { ?><td>&nbsp;<?php } ?>
 <th><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
 <td><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="10" style="display: none;" onblur="editingLengthBlur(this);"></textarea>
@@ -218,11 +218,11 @@
 <?php if ($type == "TABLE") { ?>
 <td><?php echo checkbox("fields[$i][null]", 1, $field["null"]); ?>
 <td><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?>>
-<td class="nowrap hidden"><?php echo checkbox("fields[$i][has_default]", 1, $field["has_default"]); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onchange="this.previousSibling.checked = true;">
+<td class="hidden"><?php echo checkbox("fields[$i][has_default]", 1, $field["has_default"]); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onchange="this.previousSibling.checked = true;">
 <td<?php echo ($column_comments ? "" : " class='hidden'"); ?>><input name="fields[<?php echo $i; ?>][comment]" value="<?php echo h($field["comment"]); ?>" maxlength="255">
 <?php } ?>
 <?php
-		echo "<td class='nowrap'><input type='image' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, $allowed, 1);'>";
+		echo "<td><input type='image' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, $allowed, 1);'>";
 		echo "&nbsp;<input type='image' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editingRemoveRow(this);'>";
 		echo "&nbsp;<input type='image' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>";
 		echo "&nbsp;<input type='image' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>";

Modified: trunk/adminer/procedure.inc.php
===================================================================
--- trunk/adminer/procedure.inc.php	2010-01-28 14:29:10 UTC (rev 1299)
+++ trunk/adminer/procedure.inc.php	2010-01-28 15:17:20 UTC (rev 1300)
@@ -39,9 +39,14 @@
 ?>
 
 <form action="" method="post" id="form">
-<table cellspacing="0">
-<?php edit_fields($row["fields"], $collations, $routine); ?>
-<?php if (isset($_GET["function"])) { ?><tr><td><?php echo lang('Return type'); edit_type("returns", $row["returns"], $collations); ?><?php } ?>
+<table cellspacing="0" class="nowrap">
+<?php
+edit_fields($row["fields"], $collations, $routine);
+if (isset($_GET["function"])) {
+	echo "<tr><td>" . lang('Return type');
+	edit_type("returns", $row["returns"], $collations);
+}
+?>
 </table>
 <p><textarea name="definition" rows="10" cols="80" style="width: 98%;"><?php echo h($row["definition"]); ?></textarea>
 <p>

Modified: trunk/adminer/static/editing.js
===================================================================
--- trunk/adminer/static/editing.js	2010-01-28 14:29:10 UTC (rev 1299)
+++ trunk/adminer/static/editing.js	2010-01-28 15:17:20 UTC (rev 1300)
@@ -243,7 +243,7 @@
 function columnShow(checked, column) {
 	var trs = document.getElementById('edit-fields').getElementsByTagName('tr');
 	for (var i=0; i < trs.length; i++) {
-		trs[i].getElementsByTagName('td')[column].className = (checked ? 'nowrap' : 'hidden');
+		trs[i].getElementsByTagName('td')[column].className = (checked ? '' : 'hidden');
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1304] trunk/adminer

From: <jakubvrana@us...> - 2010-02-09 12:11

Revision: 1304
          http://adminer.svn.sourceforge.net/adminer/?rev=1304&view=rev
Author:   jakubvrana
Date:     2010-02-09 12:11:35 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
Schema in Chrome (bug #2947938)

Modified Paths:
--------------
    trunk/adminer/schema.inc.php
    trunk/adminer/static/editing.js

Modified: trunk/adminer/schema.inc.php
===================================================================
--- trunk/adminer/schema.inc.php	2010-02-09 09:16:15 UTC (rev 1303)
+++ trunk/adminer/schema.inc.php	2010-02-09 12:11:35 UTC (rev 1304)
@@ -31,8 +31,8 @@
 		foreach (foreign_keys($row["Name"]) as $val) {
 			if (!$val["db"]) {
 				$left = $base_left;
-				if ($table_pos[$row["Name"]][1] || $table_pos[$row["Name"]][1]) {
-					$left = min($table_pos[$row["Name"]][1], $table_pos[$val["table"]][1]) - 1;
+				if ($table_pos[$row["Name"]][1] || $table_pos[$val["table"]][1]) {
+					$left = min(floatval($table_pos[$row["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1;
 				} else {
 					$base_left -= .1;
 				}

Modified: trunk/adminer/static/editing.js
===================================================================
--- trunk/adminer/static/editing.js	2010-02-09 09:16:15 UTC (rev 1303)
+++ trunk/adminer/static/editing.js	2010-02-09 12:11:35 UTC (rev 1304)
@@ -394,6 +394,6 @@
 		for (var key in tablePos) {
 			s += '_' + key + ':' + Math.round(tablePos[key][0] * 10000) / 10000 + 'x' + Math.round(tablePos[key][1] * 10000) / 10000;
 		}
-		document.cookie = 'adminer_schema=' + encodeURIComponent(s.substr(1)) + '; expires=' + date + '; path=' + location.pathname + location.search;
+		document.cookie = 'adminer_schema=' + encodeURIComponent(s.substr(1)) + '; expires=' + date + '; path="' + location.pathname + location.search + '"';
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1306] trunk/adminer

From: <jakubvrana@us...> - 2010-02-09 16:48

Revision: 1306
          http://adminer.svn.sourceforge.net/adminer/?rev=1306&view=rev
Author:   jakubvrana
Date:     2010-02-09 16:48:40 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
Allow editing of auto_increment value

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/db.inc.php

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2010-02-09 16:28:34 UTC (rev 1305)
+++ trunk/adminer/create.inc.php	2010-02-09 16:48:40 UTC (rev 1306)
@@ -70,7 +70,7 @@
 	$status = "COMMENT=" . $connection->quote($_POST["Comment"])
 		. ($_POST["Engine"] && $_POST["Engine"] != $orig_status["Engine"] ? " ENGINE=" . $connection->quote($_POST["Engine"]) : "")
 		. ($_POST["Collation"] && $_POST["Collation"] != $orig_status["Collation"] ? " COLLATE " . $connection->quote($_POST["Collation"]) : "")
-		. ($_POST["auto_increment"] != "" ? " AUTO_INCREMENT=" . preg_replace('~[^0-9]+~', '', $_POST["auto_increment"]) : "")
+		. ($_POST["Auto_increment"] != "" ? " AUTO_INCREMENT=" . preg_replace('~[^0-9]+~', '', $_POST["Auto_increment"]) : "")
 	;
 	if (in_array($_POST["partition_by"], $partition_by)) {
 		$partitions = array();
@@ -113,6 +113,9 @@
 	$row = $orig_status;
 	$row["name"] = $TABLE;
 	$row["fields"] = array();
+	if (!$_GET["auto_increment"]) { // don't prefill by original Auto_increment for the sake of performance and not reusing deleted ids
+		$row["Auto_increment"] = "";
+	}
 	foreach ($orig_fields as $field) {
 		$field["has_default"] = isset($field["default"]);
 		if ($field["on_update"]) {
@@ -162,7 +165,7 @@
 <?php $column_comments = edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys); ?>
 </table>
 <p>
-<?php echo lang('Auto Increment'); ?>: <input name="auto_increment" size="6" value="<?php echo h($row["auto_increment"]); // don't prefill by original Auto_increment for the sake of performance and not reusing deleted ids ?>">
+<?php echo lang('Auto Increment'); ?>: <input name="Auto_increment" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
 <?php echo lang('Comment'); ?>: <input name="Comment" value="<?php echo h($row["Comment"]); ?>" maxlength="60">
 <script type="text/javascript">
 document.write('<label><input type="checkbox" onclick="columnShow(this.checked, 5);"><?php echo lang('Default values'); ?><\/label>');

Modified: trunk/adminer/db.inc.php
===================================================================
--- trunk/adminer/db.inc.php	2010-02-09 16:28:34 UTC (rev 1305)
+++ trunk/adminer/db.inc.php	2010-02-09 16:48:40 UTC (rev 1306)
@@ -56,7 +56,7 @@
 		echo '<th><a href="' . h(ME) . 'table=' . urlencode($name) . '">' . h($name) . '</a>';
 		if (isset($row["Rows"])) {
 			echo "<td>$row[Engine]<td>$row[Collation]";
-			foreach (array("Data_length" => "create", "Index_length" => "indexes", "Data_free" => "edit", "Auto_increment" => "create", "Rows" => "select") as $key => $link) {
+			foreach (array("Data_length" => "create", "Index_length" => "indexes", "Data_free" => "edit", "Auto_increment" => "auto_increment=1&create", "Rows" => "select") as $key => $link) {
 				$val = number_format($row[$key], 0, '.', lang(','));
 				echo '<td align="right">' . ($row[$key] != "" ? '<a href="' . h(ME . "$link=") . urlencode($name) . '">' . str_replace(" ", "&nbsp;", ($key == "Rows" && $row["Engine"] == "InnoDB" && $val ? lang('~ %s', $val) : $val)) . '</a>' : '&nbsp;');
 				$sums[$link] += ($row["Engine"] != "InnoDB" || $link != "edit" ? $row[$key] : 0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1316] trunk/adminer

From: <jakubvrana@us...> - 2010-02-17 16:47

Revision: 1316
          http://adminer.svn.sourceforge.net/adminer/?rev=1316&view=rev
Author:   jakubvrana
Date:     2010-02-17 16:47:50 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/export.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/include/lang.inc.php
    trunk/adminer/lang/de.inc.php
    trunk/adminer/lang/es.inc.php
    trunk/adminer/lang/et.inc.php
    trunk/adminer/lang/nl.inc.php
    trunk/adminer/lang/ru.inc.php
    trunk/adminer/lang/sk.inc.php
    trunk/adminer/lang/zh-tw.inc.php

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/include/editing.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -112,7 +112,7 @@
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);">
 <td><?php
 	echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
-	echo ($unsigned ? " <select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
+	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
 }
 
 /** Filter length value including enums

Modified: trunk/adminer/include/export.inc.php
===================================================================
--- trunk/adminer/include/export.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/include/export.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -167,7 +167,7 @@
 }
 
 function dump_headers($identifier, $multi_table = false) {
-	$filename = ($identifier != "" ? friendly_url($identifier) : "dump");
+	$filename = ($identifier != "" ? friendly_url($identifier) : "adminer");
 	$output = $_POST["output"];
 	$ext = ($_POST["format"] == "sql" ? "sql" : ($multi_table ? "tar" : "csv")); // multiple CSV packed to TAR
 	header("Content-Type: " .

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/include/functions.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -490,7 +490,7 @@
 	foreach (table_status() as $table => $table_status) {
 		$name = $adminer->tableName($table_status);
 		if (isset($table_status["Engine"]) && $name != "" && (!$_POST["tables"] || in_array($table, $_POST["tables"]))) {
-			$result = $connection->query($q = "SELECT 1 FROM " . idf_escape($table) . " WHERE " . implode(" AND ", $adminer->selectSearchProcess(fields($table), array())) . " LIMIT 1");
+			$result = $connection->query("SELECT 1 FROM " . idf_escape($table) . " WHERE " . implode(" AND ", $adminer->selectSearchProcess(fields($table), array())) . " LIMIT 1");
 			if ($result->num_rows) {
 				if (!$found) {
 					echo "<ul>\n";

Modified: trunk/adminer/include/lang.inc.php
===================================================================
--- trunk/adminer/include/lang.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/include/lang.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -4,7 +4,7 @@
 $langs = array(
 	'en' => 'English', // Jakub Vrána - http://php.vrana.cz
 	'cs' => 'Čeština', // Jakub Vrána - http://php.vrana.cz
-	'sk' => 'Slovenčina', // Ivan Suchy - http://www.ivansuchy.com
+	'sk' => 'Slovenčina', // Ivan Suchy - http://www.ivansuchy.com, Juraj Krivda - http://www.jstudio.cz
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
 	'es' => 'Español', // Klemens Häckel - http://clickdimension.wordpress.com
 	'de' => 'Deutsch', // Klemens Häckel - http://clickdimension.wordpress.com

Modified: trunk/adminer/lang/de.inc.php
===================================================================
--- trunk/adminer/lang/de.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/lang/de.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => array('%d e-mail abgeschickt.', '%d e-mails abgeschickt.'),
 	'Webserver file %s' => 'Webserver Datei %s',
 	'File does not exist.' => 'Datei existiert nicht.',
+	'%d in total' => '%d insgesamt',
+	'Permanent login' => 'Passwort speichern',
 );

Modified: trunk/adminer/lang/es.inc.php
===================================================================
--- trunk/adminer/lang/es.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/lang/es.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
 	'Webserver file %s' => 'Archivo de servidor web %s',
 	'File does not exist.' => 'Archivo no existe.',
+	'%d in total' => '%d en total',
+	'Permanent login' => 'Guardar contraseña',
 );

Modified: trunk/adminer/lang/et.inc.php
===================================================================
--- trunk/adminer/lang/et.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/lang/et.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => array('Saadetud kirju: %d.', 'Saadetud kirju: %d.'),
 	'Webserver file %s' => 'Fail serveris: %s',
 	'File does not exist.' => 'Faili ei leitud.',
+	'%d in total' => 'Kokku: %d',
+	'Permanent login' => 'Jäta mind meelde',
 );

Modified: trunk/adminer/lang/nl.inc.php
===================================================================
--- trunk/adminer/lang/nl.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/lang/nl.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => array('%d e-mail verzonden.', '%d e-mails verzonden.'),
 	'Webserver file %s' => 'Webserver bestand %s',
 	'File does not exist.' => 'Bestand niet gevonden.',
+	'%d in total' => '%d in totaal',
+	'Permanent login' => 'Blijf aangemeld',
 );

Modified: trunk/adminer/lang/ru.inc.php
===================================================================
--- trunk/adminer/lang/ru.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/lang/ru.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => array('Было отправлено %d письмо.', 'Было отправлено %d письма.', 'Было отправлено %d писем.'),
 	'Webserver file %s' => 'Файл %s на вебсервере',
 	'File does not exist.' => 'Такого файла не существует.',
+	'%d in total' => 'Всего %d',
+	'Permanent login' => 'Оставаться в системе',
 );

Modified: trunk/adminer/lang/sk.inc.php
===================================================================
--- trunk/adminer/lang/sk.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/lang/sk.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -226,4 +226,6 @@
 	'Editor' => 'Editor',
 	'Webserver file %s' => 'Súbor %s na webovom serveri',
 	'File does not exist.' => 'Súbor neexistuje.',
+	'Permanent login' => 'Trvalé prihlásenie',
+	'%d in total' => '%d celkom',
 );

Modified: trunk/adminer/lang/zh-tw.inc.php
===================================================================
--- trunk/adminer/lang/zh-tw.inc.php	2010-02-17 16:24:44 UTC (rev 1315)
+++ trunk/adminer/lang/zh-tw.inc.php	2010-02-17 16:47:50 UTC (rev 1316)
@@ -226,4 +226,6 @@
 	'Webserver file %s' => '網頁伺服器檔案 %s',
 	'File does not exist.' => '檔案不存在',
 	'Item has been deleted.' => '該項目已被刪除',
+	'%d in total' => '總共 %d 個',
+	'Permanent login' => '永久登入',
 );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1333] trunk/adminer

From: <jakubvrana@us...> - 2010-02-26 14:59

Revision: 1333
          http://adminer.svn.sourceforge.net/adminer/?rev=1333&view=rev
Author:   jakubvrana
Date:     2010-02-26 14:58:58 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/adminer/database.inc.php
    trunk/adminer/lang/fr.inc.php
    trunk/adminer/lang/it.inc.php
    trunk/adminer/lang/zh.inc.php

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2010-02-26 14:01:17 UTC (rev 1332)
+++ trunk/adminer/database.inc.php	2010-02-26 14:58:58 UTC (rev 1333)
@@ -68,7 +68,7 @@
 ) . "\n"; ?>
 <?php echo html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate); ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
- <input type="submit" value="<?php echo lang('Save'); ?>">
+<input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (!$_POST["add_x"] && $_GET["db"] == "") {
 	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";

Modified: trunk/adminer/lang/fr.inc.php
===================================================================
--- trunk/adminer/lang/fr.inc.php	2010-02-26 14:01:17 UTC (rev 1332)
+++ trunk/adminer/lang/fr.inc.php	2010-02-26 14:58:58 UTC (rev 1333)
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => array('%d message a été envoyé.', '%d messages ont été envoyés.'),
 	'Webserver file %s' => '%s fichier du serveur Web',
 	'File does not exist.' => 'Le fichier est introuvable.',
+	'%d in total' => '%d au total',
+	'Permanent login' => 'Authentification permanente',
 );

Modified: trunk/adminer/lang/it.inc.php
===================================================================
--- trunk/adminer/lang/it.inc.php	2010-02-26 14:01:17 UTC (rev 1332)
+++ trunk/adminer/lang/it.inc.php	2010-02-26 14:58:58 UTC (rev 1333)
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => array('%d e-mail inviata.','%d e-mail inviate.'),
 	'Webserver file %s' => 'Webserver file %s',
 	'File does not exist.' => 'Il file non esiste.',
+	'%d in total' => '%d in totale',
+	'Permanent login' => 'Login permanente',
 );

Modified: trunk/adminer/lang/zh.inc.php
===================================================================
--- trunk/adminer/lang/zh.inc.php	2010-02-26 14:01:17 UTC (rev 1332)
+++ trunk/adminer/lang/zh.inc.php	2010-02-26 14:58:58 UTC (rev 1333)
@@ -30,7 +30,7 @@
 	'Alter database' => '更改数据库',
 	'Create database' => '创建数据库',
 	'SQL command' => 'SQL命令',
-	'Dump' => '导入/导出',
+	'Dump' => '导出',
 	'Logout' => '注销',
 	'database' => '数据库',
 	'Use' => '使用',
@@ -226,4 +226,6 @@
 	'%d e-mail(s) have been sent.' => '%d 封邮件已发送。',
 	'Webserver file %s' => 'Web服务器文件 %s',
 	'File does not exist.' => '文件不存在',
+	'%d in total' => '共计 %d',
+	'Permanent login' => '保持登录',
 );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1336] trunk/adminer

From: <jakubvrana@us...> - 2010-03-01 22:59

Revision: 1336
          http://adminer.svn.sourceforge.net/adminer/?rev=1336&view=rev
Author:   jakubvrana
Date:     2010-03-01 22:59:08 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Revert drop removal (r887, r1195)

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/database.inc.php
    trunk/adminer/lang/cs.inc.php
    trunk/adminer/lang/de.inc.php
    trunk/adminer/lang/es.inc.php
    trunk/adminer/lang/et.inc.php
    trunk/adminer/lang/fr.inc.php
    trunk/adminer/lang/it.inc.php
    trunk/adminer/lang/nl.inc.php
    trunk/adminer/lang/ru.inc.php
    trunk/adminer/lang/sk.inc.php
    trunk/adminer/lang/zh.inc.php

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/create.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -16,84 +16,88 @@
 }
 
 if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"] && !$_POST["down"]) {
-	$auto_increment_index = " PRIMARY KEY";
-	// don't overwrite primary key by auto_increment
-	if ($TABLE != "" && $_POST["auto_increment_col"]) {
-		foreach (indexes($TABLE) as $index) {
-			if (in_array($_POST["fields"][$_POST["auto_increment_col"]]["orig"], $index["columns"], true)) {
-				$auto_increment_index = "";
-				break;
+	if ($_POST["drop"]) {
+		query_redirect("DROP TABLE " . idf_escape($_GET["create"]), substr(ME, 0, -1), lang('Table has been dropped.'));
+	} else {
+		$auto_increment_index = " PRIMARY KEY";
+		// don't overwrite primary key by auto_increment
+		if ($TABLE != "" && $_POST["auto_increment_col"]) {
+			foreach (indexes($TABLE) as $index) {
+				if (in_array($_POST["fields"][$_POST["auto_increment_col"]]["orig"], $index["columns"], true)) {
+					$auto_increment_index = "";
+					break;
+				}
+				if ($index["type"] == "PRIMARY") {
+					$auto_increment_index = " UNIQUE";
+				}
 			}
-			if ($index["type"] == "PRIMARY") {
-				$auto_increment_index = " UNIQUE";
+		}
+		$fields = "";
+		ksort($_POST["fields"]);
+		$orig_field = reset($orig_fields);
+		$after = "FIRST";
+		foreach ($_POST["fields"] as $key => $field) {
+			$type_field = (isset($types[$field["type"]]) ? $field : $referencable_primary[$foreign_keys[$field["type"]]]);
+			if ($field["field"] != "") {
+				if ($type_field) {
+					$default = eregi_replace(" *on update CURRENT_TIMESTAMP", "", $field["default"]);
+					if ($default != $field["default"]) { // preg_replace $count is available since PHP 5.1.0
+						$field["on_update"] = "CURRENT_TIMESTAMP";
+						$field["default"] = $default;
+					}
+					if (!$field["has_default"]) {
+						$field["default"] = null;
+					}
+					$process_field = process_field($field, $type_field);
+					$auto_increment = ($key == $_POST["auto_increment_col"]);
+					if ($process_field != process_field($orig_field, $orig_field) || $orig_field["auto_increment"] != $auto_increment) {
+						$fields .= "\n" . ($TABLE != "" ? ($field["orig"] != "" ? "CHANGE " . idf_escape($field["orig"]) : "ADD") : " ")
+							. " $process_field"
+							. ($auto_increment ? " AUTO_INCREMENT$auto_increment_index" : "")
+							. ($TABLE != "" ? " $after" : "") . ","
+						;
+					}
+					if (!isset($types[$field["type"]])) {
+						$fields .= ($TABLE != "" ? "\nADD" : "") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . idf_escape($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . "),";
+					}
+				}
+				$after = "AFTER " . idf_escape($field["field"]);
+				//! drop and create foreign keys with renamed columns
+			} elseif ($field["orig"] != "") {
+				$fields .= "\nDROP " . idf_escape($field["orig"]) . ",";
 			}
+			if ($field["orig"] != "") {
+				$orig_field = next($orig_fields);
+			}
 		}
-	}
-	$fields = "";
-	ksort($_POST["fields"]);
-	$orig_field = reset($orig_fields);
-	$after = "FIRST";
-	foreach ($_POST["fields"] as $key => $field) {
-		$type_field = (isset($types[$field["type"]]) ? $field : $referencable_primary[$foreign_keys[$field["type"]]]);
-		if ($field["field"] != "") {
-			if ($type_field) {
-				$default = eregi_replace(" *on update CURRENT_TIMESTAMP", "", $field["default"]);
-				if ($default != $field["default"]) { // preg_replace $count is available since PHP 5.1.0
-					$field["on_update"] = "CURRENT_TIMESTAMP";
-					$field["default"] = $default;
+		$status = "COMMENT=" . $connection->quote($_POST["Comment"])
+			. ($_POST["Engine"] && $_POST["Engine"] != $orig_status["Engine"] ? " ENGINE=" . $connection->quote($_POST["Engine"]) : "")
+			. ($_POST["Collation"] && $_POST["Collation"] != $orig_status["Collation"] ? " COLLATE " . $connection->quote($_POST["Collation"]) : "")
+			. ($_POST["Auto_increment"] != "" ? " AUTO_INCREMENT=" . preg_replace('~[^0-9]+~', '', $_POST["Auto_increment"]) : "")
+		;
+		if (in_array($_POST["partition_by"], $partition_by)) {
+			$partitions = array();
+			if ($_POST["partition_by"] == 'RANGE' || $_POST["partition_by"] == 'LIST') {
+				foreach (array_filter($_POST["partition_names"]) as $key => $val) {
+					$value = $_POST["partition_values"][$key];
+					$partitions[] = "\nPARTITION " . idf_escape($val) . " VALUES " . ($_POST["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
 				}
-				if (!$field["has_default"]) {
-					$field["default"] = null;
-				}
-				$process_field = process_field($field, $type_field);
-				$auto_increment = ($key == $_POST["auto_increment_col"]);
-				if ($process_field != process_field($orig_field, $orig_field) || $orig_field["auto_increment"] != $auto_increment) {
-					$fields .= "\n" . ($TABLE != "" ? ($field["orig"] != "" ? "CHANGE " . idf_escape($field["orig"]) : "ADD") : " ")
-						. " $process_field"
-						. ($auto_increment ? " AUTO_INCREMENT$auto_increment_index" : "")
-						. ($TABLE != "" ? " $after" : "") . ","
-					;
-				}
-				if (!isset($types[$field["type"]])) {
-					$fields .= ($TABLE != "" ? "\nADD" : "") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . idf_escape($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . "),";
-				}
 			}
-			$after = "AFTER " . idf_escape($field["field"]);
-			//! drop and create foreign keys with renamed columns
-		} elseif ($field["orig"] != "") {
-			$fields .= "\nDROP " . idf_escape($field["orig"]) . ",";
+			$status .= "\nPARTITION BY $_POST[partition_by]($_POST[partition])" . ($partitions // $_POST["partition"] can be expression, not only column
+				? " (" . implode(",", $partitions) . "\n)"
+				: ($_POST["partitions"] ? " PARTITIONS " . intval($_POST["partitions"]) : "")
+			);
+		} elseif ($connection->server_info >= 5.1 && $TABLE != "") {
+			$status .= "\nREMOVE PARTITIONING";
 		}
-		if ($field["orig"] != "") {
-			$orig_field = next($orig_fields);
+		$location = ME . "table=" . urlencode($_POST["name"]);
+		if ($TABLE != "") {
+			query_redirect("ALTER TABLE " . idf_escape($TABLE) . "$fields\nRENAME TO " . idf_escape($_POST["name"]) . ",\n$status", $location, lang('Table has been altered.'));
+		} else {
+			cookie("adminer_engine", $_POST["Engine"]);
+			query_redirect("CREATE TABLE " . idf_escape($_POST["name"]) . " (" . substr($fields, 0, -1) . "\n) $status", $location, lang('Table has been created.'));
 		}
 	}
-	$status = "COMMENT=" . $connection->quote($_POST["Comment"])
-		. ($_POST["Engine"] && $_POST["Engine"] != $orig_status["Engine"] ? " ENGINE=" . $connection->quote($_POST["Engine"]) : "")
-		. ($_POST["Collation"] && $_POST["Collation"] != $orig_status["Collation"] ? " COLLATE " . $connection->quote($_POST["Collation"]) : "")
-		. ($_POST["Auto_increment"] != "" ? " AUTO_INCREMENT=" . preg_replace('~[^0-9]+~', '', $_POST["Auto_increment"]) : "")
-	;
-	if (in_array($_POST["partition_by"], $partition_by)) {
-		$partitions = array();
-		if ($_POST["partition_by"] == 'RANGE' || $_POST["partition_by"] == 'LIST') {
-			foreach (array_filter($_POST["partition_names"]) as $key => $val) {
-				$value = $_POST["partition_values"][$key];
-				$partitions[] = "\nPARTITION " . idf_escape($val) . " VALUES " . ($_POST["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
-			}
-		}
-		$status .= "\nPARTITION BY $_POST[partition_by]($_POST[partition])" . ($partitions // $_POST["partition"] can be expression, not only column
-			? " (" . implode(",", $partitions) . "\n)"
-			: ($_POST["partitions"] ? " PARTITIONS " . intval($_POST["partitions"]) : "")
-		);
-	} elseif ($connection->server_info >= 5.1 && $TABLE != "") {
-		$status .= "\nREMOVE PARTITIONING";
-	}
-	$location = ME . "table=" . urlencode($_POST["name"]);
-	if ($TABLE != "") {
-		query_redirect("ALTER TABLE " . idf_escape($TABLE) . "$fields\nRENAME TO " . idf_escape($_POST["name"]) . ",\n$status", $location, lang('Table has been altered.'));
-	} else {
-		cookie("adminer_engine", $_POST["Engine"]);
-		query_redirect("CREATE TABLE " . idf_escape($_POST["name"]) . " (" . substr($fields, 0, -1) . "\n) $status", $location, lang('Table has been created.'));
-	}
 }
 
 page_header(($TABLE != "" ? lang('Alter table') : lang('Create table')), $error, array("table" => $TABLE), $TABLE);
@@ -174,6 +178,7 @@
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
+<?php if (strlen($_GET["create"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 <?php
 if ($connection->server_info >= 5.1) {
 	$partition_table = ereg('RANGE|LIST', $row["partition_by"]);

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/database.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -1,8 +1,11 @@
 <?php
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
-	if (DB !== $_POST["name"]) {
+	restart_session();
+	if ($_POST["drop"]) {
+		unset($_SESSION["databases"][$_GET["server"]]);
+		query_redirect("DROP DATABASE " . idf_escape(DB), remove_from_uri("db|database"), lang('Database has been dropped.'));
+	} elseif (DB !== $_POST["name"]) {
 		// create or rename database
-		restart_session();
 		unset($_SESSION["databases"][$_GET["server"]]); // clear cache
 		$dbs = explode("\n", str_replace("\r", "", $_POST["name"]));
 		$failed = false;
@@ -70,7 +73,9 @@
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
-if (!$_POST["add_x"] && $_GET["db"] == "") {
+if (strlen(DB)) {
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
+} elseif (!$_POST["add_x"] && $_GET["db"] == "") {
 	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }
 ?>

Modified: trunk/adminer/lang/cs.inc.php
===================================================================
--- trunk/adminer/lang/cs.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/cs.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Vybrat databázi',
 	'Invalid database.' => 'Nesprávná databáze.',
 	'Create new database' => 'Vytvořit novou databázi',
+	'Table has been dropped.' => 'Tabulka byla odstraněna.',
 	'Table has been altered.' => 'Tabulka byla změněna.',
 	'Table has been created.' => 'Tabulka byla vytvořena.',
 	'Alter table' => 'Pozměnit tabulku',

Modified: trunk/adminer/lang/de.inc.php
===================================================================
--- trunk/adminer/lang/de.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/de.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Datenbank auswählen',
 	'Invalid database.' => 'Datenbank ungültig.',
 	'Create new database' => 'Neue Datenbank',
+	'Table has been dropped.' => 'Tabelle entfernt.',
 	'Table has been altered.' => 'Tabelle geändert.',
 	'Table has been created.' => 'Tabelle erstellt.',
 	'Alter table' => 'Tabelle ändern',

Modified: trunk/adminer/lang/es.inc.php
===================================================================
--- trunk/adminer/lang/es.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/es.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Seleccionar Base de datos',
 	'Invalid database.' => 'Base de datos inválida.',
 	'Create new database' => 'Nueva Base de datos',
+	'Table has been dropped.' => 'Tabla eliminada.',
 	'Table has been altered.' => 'Tabla modificada.',
 	'Table has been created.' => 'Tabla creada.',
 	'Alter table' => 'Modificar Estructura',

Modified: trunk/adminer/lang/et.inc.php
===================================================================
--- trunk/adminer/lang/et.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/et.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Vali andmebaas',
 	'Invalid database.' => 'Tundmatu andmebaas.',
 	'Create new database' => 'Loo uus andmebaas',
+	'Table has been dropped.' => 'Tabel on edukalt kustutatud.',
 	'Table has been altered.' => 'Tabeli andmed on edukalt muudetud.',
 	'Table has been created.' => 'Tabel on edukalt loodud.',
 	'Alter table' => 'Muuda tabeli struktuuri',

Modified: trunk/adminer/lang/fr.inc.php
===================================================================
--- trunk/adminer/lang/fr.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/fr.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -2,14 +2,15 @@
 $translations = array(
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Aurevoir!',
-	'Invalid credentials.' => 'Authentification échouée',
+	'Invalid credentials.' => 'Authentification échouée.',
 	'Server' => 'Serveur',
 	'Username' => 'Utilisateur',
 	'Password' => 'Mot de passe',
 	'Select database' => 'Selectionner la base de donnée',
-	'Invalid database.' => 'Base de donnée invalide',
+	'Invalid database.' => 'Base de donnée invalide.',
 	'Create new database' => 'Créer une base de donnée',
-	'Table has been altered.' => 'Table modifiée',
+	'Table has been dropped.' => 'Table effacée.',
+	'Table has been altered.' => 'Table modifiée.',
 	'Table has been created.' => 'Table créée.',
 	'Alter table' => 'Modifier la table',
 	'Create table' => 'Créer une table',
@@ -57,7 +58,7 @@
 	'Sort' => 'Ordonner',
 	'descending' => 'décroissant',
 	'Limit' => 'Limit',
-	'No rows.' => 'Aucun résultat',
+	'No rows.' => 'Aucun résultat.',
 	'Action' => 'Action',
 	'edit' => 'modifier',
 	'Page' => 'Page',
@@ -170,9 +171,9 @@
 	'At given time' => 'À un moment précis',
 	'Save and continue edit' => 'Sauvegarder et continuer l\'édition',
 	'original' => 'original',
-	'Tables have been truncated.' => 'Les tables ont été tronquées',
-	'Tables have been moved.' => 'Les tables ont été déplacées',
-	'Tables have been dropped.' => 'Les tables ont été effacées',
+	'Tables have been truncated.' => 'Les tables ont été tronquées.',
+	'Tables have been moved.' => 'Les tables ont été déplacées.',
+	'Tables have been dropped.' => 'Les tables ont été effacées.',
 	'Tables and views' => 'Tables et vues',
 	'Engine' => 'Moteur',
 	'Collation' => 'Collation',
@@ -191,12 +192,12 @@
 	'%d item(s) have been affected.' => array('%d élément ont été modifié.', '%d éléments ont été modifié.'),
 	'whole result' => 'résultat entier',
 	'Clone' => 'Cloner',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Le nombre de champs maximum est dépassé. Veuillez augmenter %s et %s',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Le nombre de champs maximum est dépassé. Veuillez augmenter %s et %s.',
 	'Partition by' => 'Partitionné par',
 	'Partitions' => 'Partitions',
 	'Partition name' => 'Nom de la partition',
 	'Values' => 'Valeurs',
-	'%d row(s) have been imported.' => array('%d ligne a été importé','%d lignes ont été importé'),
+	'%d row(s) have been imported.' => array('%d ligne a été importé.','%d lignes ont été importé.'),
 	'Show structure' => 'Structure de la table',
 	'(anywhere)' => '(n\'importe où)',
 	'CSV Import' => 'Importation CVS',

Modified: trunk/adminer/lang/it.inc.php
===================================================================
--- trunk/adminer/lang/it.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/it.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Seleziona database',
 	'Invalid database.' => 'Database non valido.',
 	'Create new database' => 'Crea nuovo database',
+	'Table has been dropped.' => 'Tabella eliminata.',
 	'Table has been altered.' => 'Tabella modificata.',
 	'Table has been created.' => 'Tabella creata.',
 	'Alter table' => 'Modifica tabella',

Modified: trunk/adminer/lang/nl.inc.php
===================================================================
--- trunk/adminer/lang/nl.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/nl.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Database selecteren',
 	'Invalid database.' => 'Ongeldige database.',
 	'Create new database' => 'Nieuwe database',
+	'Table has been dropped.' => 'Tabel verwijderd.',
 	'Table has been altered.' => 'Tabel aangepast.',
 	'Table has been created.' => 'Tabel aangemaakt.',
 	'Alter table' => 'Tabel aanpassen',

Modified: trunk/adminer/lang/ru.inc.php
===================================================================
--- trunk/adminer/lang/ru.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/ru.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Выбрать базу данных',
 	'Invalid database.' => 'Плохая база данных.',
 	'Create new database' => 'Создать новую базу данных',
+	'Table has been dropped.' => 'Таблица была удалена.',
 	'Table has been altered.' => 'Таблица была изменена.',
 	'Table has been created.' => 'Таблица была создана.',
 	'Alter table' => 'Изменить таблицу',

Modified: trunk/adminer/lang/sk.inc.php
===================================================================
--- trunk/adminer/lang/sk.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/sk.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => 'Vybrať databázu',
 	'Invalid database.' => 'Nesprávna databáza.',
 	'Create new database' => 'Vytvoriť novú databázu',
+	'Table has been dropped.' => 'Tabuľka bola odstránená.',
 	'Table has been altered.' => 'Tabuľka bola zmenená.',
 	'Table has been created.' => 'Tabuľka bola vytvorená.',
 	'Alter table' => 'Zmeniť tabuľku',

Modified: trunk/adminer/lang/zh.inc.php
===================================================================
--- trunk/adminer/lang/zh.inc.php	2010-02-26 15:58:29 UTC (rev 1335)
+++ trunk/adminer/lang/zh.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
@@ -9,6 +9,7 @@
 	'Select database' => '选择数据库',
 	'Invalid database.' => '无效数据库。',
 	'Create new database' => '创建新数据库',
+	'Table has been dropped.' => '已丢弃表。',
 	'Table has been altered.' => '已更改表。',
 	'Table has been created.' => '已创建表。',
 	'Alter table' => '更改表',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1337] trunk/adminer

From: <jakubvrana@us...> - 2010-03-02 16:34

Revision: 1337
          http://adminer.svn.sourceforge.net/adminer/?rev=1337&view=rev
Author:   jakubvrana
Date:     2010-03-02 16:33:28 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
IE8 spaces

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/dump.inc.php
    trunk/adminer/foreign.inc.php
    trunk/adminer/include/adminer.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/static/default.css

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
+++ trunk/adminer/create.inc.php	2010-03-02 16:33:28 UTC (rev 1337)
@@ -164,7 +164,6 @@
 <?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) : ""); ?>
  <?php echo html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
-</p>
 <table cellspacing="0" id="edit-fields" class="nowrap">
 <?php $column_comments = edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys); ?>
 </table>

Modified: trunk/adminer/dump.inc.php
===================================================================
--- trunk/adminer/dump.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
+++ trunk/adminer/dump.inc.php	2010-03-02 16:33:28 UTC (rev 1337)
@@ -161,7 +161,7 @@
 echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style, 'INSERT');
 ?>
 </table>
-<p><input type="submit" value="<?php echo lang('Export'); ?>"></p>
+<p><input type="submit" value="<?php echo lang('Export'); ?>">
 
 <table cellspacing="0">
 <?php

Modified: trunk/adminer/foreign.inc.php
===================================================================
--- trunk/adminer/foreign.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
+++ trunk/adminer/foreign.inc.php	2010-03-02 16:33:28 UTC (rev 1337)
@@ -47,7 +47,6 @@
 <?php echo lang('Target table'); ?>:
 <?php echo html_select("table", array_keys(table_status_referencable()), $row["table"], "this.form['change-js'].value = '1'; this.form.submit();"); ?>
 <input type="hidden" name="change-js" value="">
-</p>
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
 <table cellspacing="0">
 <thead><tr><th><?php echo lang('Source'); ?><th><?php echo lang('Target'); ?></thead>

Modified: trunk/adminer/include/adminer.inc.php
===================================================================
--- trunk/adminer/include/adminer.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
+++ trunk/adminer/include/adminer.inc.php	2010-03-02 16:33:28 UTC (rev 1337)
@@ -126,7 +126,7 @@
 	* @return string
 	*/
 	function selectQuery($query) {
-		return "<p><code class='jush-sql'>" . h($query) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a></p>\n";
+		return "<p><code class='jush-sql'>" . h($query) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
 	}
 	
 	/** Description of a row in a table

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2010-03-01 22:59:08 UTC (rev 1336)
+++ trunk/adminer/include/editing.inc.php	2010-03-02 16:33:28 UTC (rev 1337)
@@ -111,7 +111,7 @@
 <td><select name="<?php echo $key; ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"><?php echo optionlist($structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"><td><?php
 	echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
-	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
+	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select> ' : ' '); // space for IE
 }
 
 /** Filter length value including enums

Modified: trunk/adminer/static/default.css
===================================================================
--- trunk/adminer/static/default.css	2010-03-01 22:59:08 UTC (rev 1336)
+++ trunk/adminer/static/default.css	2010-03-02 16:33:28 UTC (rev 1337)
@@ -6,7 +6,7 @@
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; }
 h3 { font-weight: normal; font-size: 130%; margin: .8em 0; }
 form { margin: 0; }
-table { margin: 0 20px .8em 0; border: 0; border-top: 1px solid #999; border-left: 1px solid #999; font-size: 90%; }
+table { margin: 1em 20px .8em 0; border: 0; border-top: 1px solid #999; border-left: 1px solid #999; font-size: 90%; }
 td, th { margin-bottom: 1em; border: 0; border-right: 1px solid #999; border-bottom: 1px solid #999; padding: .2em .3em; }
 th { background: #eee; text-align: left; }
 thead th { text-align: center; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1358] trunk/adminer

From: <jakubvrana@us...> - 2010-04-02 12:14

Revision: 1358
          http://adminer.svn.sourceforge.net/adminer/?rev=1358&view=rev
Author:   jakubvrana
Date:     2010-04-02 12:13:56 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
Link COUNT(*) result to listing

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-01 19:45:43 UTC (rev 1357)
+++ trunk/adminer/include/functions.inc.php	2010-04-02 12:13:56 UTC (rev 1358)
@@ -135,9 +135,9 @@
 /** Find unique identifier of a row
 * @param array
 * @param array result of indexes()
-* @return string query string
+* @return array
 */
-function unique_idf($row, $indexes) {
+function unique_array($row, $indexes) {
 	foreach ($indexes as $index) {
 		if (ereg("PRIMARY|UNIQUE", $index["type"])) {
 			$return = array();
@@ -145,7 +145,7 @@
 				if (!isset($row[$key])) { // NULL is ambiguous
 					continue 2;
 				}
-				$return[] = urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($row[$key]);
+				$return[$key] = $row[$key];
 			}
 			return $return;
 		}
@@ -153,7 +153,7 @@
 	$return = array();
 	foreach ($row as $key => $val) {
 		if (!preg_match('~^(COUNT\\((\\*|(DISTINCT )?`(?:[^`]|``)+`)\\)|(AVG|GROUP_CONCAT|MAX|MIN|SUM)\\(`(?:[^`]|``)+`\\))$~', $key)) { //! columns looking like functions
-			$return[] = (isset($val) ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
+			$return[$key] = $val;
 		}
 	}
 	return $return;

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-01 19:45:43 UTC (rev 1357)
+++ trunk/adminer/select.inc.php	2010-04-02 12:13:56 UTC (rev 1358)
@@ -205,8 +205,12 @@
 			}
 			echo ($backward_keys ? "<th>" . lang('Relations') : "") . "</thead>\n";
 			foreach ($adminer->rowDescriptions($rows, $foreign_keys) as $n => $row) {
-				$unique_idf = implode('&', unique_idf($rows[$n], $indexes));
-				echo "<tr" . odd() . "><td>" . checkbox("check[]", $unique_idf, in_array($unique_idf, (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . (count($select) != count($group) || information_schema(DB) ? '' : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . "&$unique_idf") . "'>" . lang('edit') . "</a>");
+				$unique_array = unique_array($row, $indexes);
+				$unique_idf = "";
+				foreach ($unique_array as $key => $val) {
+					$unique_idf .= "&" . (isset($val) ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
+				}
+				echo "<tr" . odd() . "><td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . (count($select) != count($group) || information_schema(DB) ? '' : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>");
 				foreach ($row as $key => $val) {
 					if (isset($names[$key])) {
 						$field = $fields[$key];
@@ -219,7 +223,7 @@
 							$val = "<i>NULL</i>";
 						} else {
 							if (ereg('blob|binary', $field["type"]) && $val != "") {
-								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . "&$unique_idf");
+								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . $unique_idf);
 							}
 							if ($val == "") {
 								$val = "&nbsp;";
@@ -240,6 +244,14 @@
 									}
 								}
 							}
+							if ($key == "COUNT(*)") { //! columns looking like functions
+								$link = h(ME . "select=" . urlencode($TABLE));
+								$i = 0;
+								foreach ($unique_array as $k => $v) {
+									$link .= h("&where[$i][col]=" . urlencode($k) . "&where[$i][op]=" . (isset($v) ? "%3D&where[$i][val]=" . urlencode($v) : "IS+NULL"));
+									$i++;
+								}
+							}
 						}
 						if (!$link && is_email($val)) {
 							$link = "mailto:$val";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1361] trunk/adminer

From: <jakubvrana@us...> - 2010-04-02 13:44

Revision: 1361
          http://adminer.svn.sourceforge.net/adminer/?rev=1361&view=rev
Author:   jakubvrana
Date:     2010-04-02 13:44:23 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
Disable default value when changing from timestamp (bug #2935496)

Modified Paths:
--------------
    trunk/adminer/create.inc.php
    trunk/adminer/static/editing.js

Modified: trunk/adminer/create.inc.php
===================================================================
--- trunk/adminer/create.inc.php	2010-04-02 13:25:49 UTC (rev 1360)
+++ trunk/adminer/create.inc.php	2010-04-02 13:44:23 UTC (rev 1361)
@@ -40,14 +40,14 @@
 			$type_field = (isset($types[$field["type"]]) ? $field : $referencable_primary[$foreign_keys[$field["type"]]]);
 			if ($field["field"] != "") {
 				if ($type_field) {
+					if (!$field["has_default"]) {
+						$field["default"] = null;
+					}
 					$default = eregi_replace(" *on update CURRENT_TIMESTAMP", "", $field["default"]);
 					if ($default != $field["default"]) { // preg_replace $count is available since PHP 5.1.0
 						$field["on_update"] = "CURRENT_TIMESTAMP";
 						$field["default"] = $default;
 					}
-					if (!$field["has_default"]) {
-						$field["default"] = null;
-					}
 					$process_field = process_field($field, $type_field);
 					$auto_increment = ($key == $_POST["auto_increment_col"]);
 					if ($process_field != process_field($orig_field, $orig_field) || $orig_field["auto_increment"] != $auto_increment) {

Modified: trunk/adminer/static/editing.js
===================================================================
--- trunk/adminer/static/editing.js	2010-04-02 13:25:49 UTC (rev 1360)
+++ trunk/adminer/static/editing.js	2010-04-02 13:44:23 UTC (rev 1361)
@@ -200,6 +200,9 @@
 		)) {
 			el.value = '';
 		}
+		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
+			el.checked = false;
+		}
 		if (el.name == name + '[collation]') {
 			el.className = (/(char|text|enum|set)$/.test(text) ? '' : 'hidden');
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1363] trunk/adminer

From: <jakubvrana@us...> - 2010-04-02 15:27

Revision: 1363
          http://adminer.svn.sourceforge.net/adminer/?rev=1363&view=rev
Author:   jakubvrana
Date:     2010-04-02 15:27:37 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
Move time information

Modified Paths:
--------------
    trunk/adminer/sql.inc.php
    trunk/adminer/static/default.css

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2010-04-02 15:09:15 UTC (rev 1362)
+++ trunk/adminer/sql.inc.php	2010-04-02 15:27:37 UTC (rev 1363)
@@ -71,16 +71,16 @@
 								break;
 							}
 						} else {
-							$end = explode(" ", microtime());
-							echo "<p class='time'>" . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . "</p>\n";
 							do {
 								$result = $connection->store_result();
+								$end = explode(" ", microtime());
+								$time = " <span class='time'>(" . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . ")</span>";
 								if (is_object($result)) {
 									select($result, $connection2);
+									echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) : "") . $time;
 									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q)) {
 										$id = "explain-$queries";
-										echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) . ", " : "");
-										echo "<a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
+										echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
 										echo "<div id='$id' class='hidden'>\n";
 										select($connection2->query("EXPLAIN $q"));
 										echo "</div>\n";
@@ -91,9 +91,10 @@
 										$_SESSION["databases"][$_GET["server"]] = null; // clear cache
 										session_write_close();
 									}
-									echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "\n";
+									echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
 								}
 								unset($result); // free resultset
+								$start = $end;
 							} while ($connection->next_result());
 						}
 						$query = substr($query, $offset);

Modified: trunk/adminer/static/default.css
===================================================================
--- trunk/adminer/static/default.css	2010-04-02 15:09:15 UTC (rev 1362)
+++ trunk/adminer/static/default.css	2010-04-02 15:27:37 UTC (rev 1363)
@@ -29,7 +29,7 @@
 .enum { color: #007F7F; }
 .binary { color: red; }
 .odd td { background: #F5F5F5; }
-.time { color: silver; font-size: 70%; float: right; margin-top: -3em; }
+.time { color: silver; font-size: 70%; }
 .function { text-align: right; }
 .number { text-align: right; }
 .datetime { text-align: right; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1441] trunk/adminer

From: <jakubvrana@us...> - 2010-04-15 12:42

Revision: 1441
          http://adminer.svn.sourceforge.net/adminer/?rev=1441&view=rev
Author:   jakubvrana
Date:     2010-04-15 12:42:31 +0000 (Thu, 15 Apr 2010)

Log Message:
-----------
Respect where in COUNT(*) link

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-15 11:04:58 UTC (rev 1440)
+++ trunk/adminer/include/functions.inc.php	2010-04-15 12:42:31 UTC (rev 1441)
@@ -159,33 +159,18 @@
 	return $return;
 }
 
-/** Get query string for unique identifier of a row
-* @param array
-* @param array result of indexes()
-* @return string
-*/
-function unique_idf($row, $indexes) {
-	$return = "";
-	foreach (unique_array($row, $indexes) as $key => $val) {
-		$return .= "&" . (isset($val) ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
-	}
-	return $return;
-}
-
 /** Create SQL condition from parsed query string
 * @param array parsed query string
 * @return string
 */
 function where($where) {
 	$return = array();
-	foreach ((array) $where["where"] as $key => $val) {
-		$key = bracket_escape($key, "back");
-		$return[] = (preg_match('~^[A-Z0-9_]+\\(`(?:[^`]|``)+`\\)$~', $key) ? $key : idf_escape($key)) . (ereg('\\.', $val) ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val)); // LIKE because of floats, but slow with ints //! enum and set, columns looking like functions
+	foreach (array("where", "null") as $type) {
+		foreach ((array) $where[$type] as $key => $val) {
+			$key = bracket_escape($key, "back");
+			$return[] = (preg_match('~^[A-Z0-9_]+\\(`(?:[^`]|``)+`\\)$~', $key) ? $key : idf_escape($key)) . ($type == "null" ? " IS NULL" : (ereg('\\.', $val) ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val))); // LIKE because of floats, but slow with ints //! enum and set, columns looking like functions
+		}
 	}
-	foreach ((array) $where["null"] as $key) {
-		$key = bracket_escape($key, "back");
-		$return[] = (preg_match('~^[A-Z0-9_]+\\(`(?:[^`]|``)+`\\)$~', $key) ? $key : idf_escape($key)) . " IS NULL";
-	}
 	return implode(" AND ", $return);
 }
 

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-15 11:04:58 UTC (rev 1440)
+++ trunk/adminer/select.inc.php	2010-04-15 12:42:31 UTC (rev 1441)
@@ -205,7 +205,11 @@
 			}
 			echo ($backward_keys ? "<th>" . lang('Relations') : "") . "</thead>\n";
 			foreach ($adminer->rowDescriptions($rows, $foreign_keys) as $n => $row) {
-				$unique_idf = unique_idf($row, $indexes);
+				$unique_array = unique_array($row, $indexes);
+				$unique_idf = "";
+				foreach ($unique_array as $key => $val) {
+					$unique_idf .= "&" . (isset($val) ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
+				}
 				echo "<tr" . odd() . "><td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . (count($select) != count($group) || information_schema(DB) ? '' : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>");
 				foreach ($row as $key => $val) {
 					if (isset($names[$key])) {
@@ -243,7 +247,13 @@
 							if ($key == "COUNT(*)") { //! columns looking like functions
 								$link = h(ME . "select=" . urlencode($TABLE));
 								$i = 0;
-								foreach (unique_array($row, $indexes) as $k => $v) {
+								foreach ((array) $_GET["where"] as $v) {
+									if (!array_key_exists($v["col"], $unique_array)) {
+										$link .= h("&where[$i][col]=" . urlencode($v["col"]) . "&where[$i][op]=" . urlencode($v["op"]) . "&where[$i][val]=" . urlencode($v["val"]));
+										$i++;
+									}
+								}
+								foreach ($unique_array as $k => $v) {
 									$link .= h("&where[$i][col]=" . urlencode($k) . "&where[$i][op]=" . (isset($v) ? "%3D&where[$i][val]=" . urlencode($v) : "IS+NULL"));
 									$i++;
 								}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1442] trunk/adminer

From: <jakubvrana@us...> - 2010-04-15 14:43

Revision: 1442
          http://adminer.svn.sourceforge.net/adminer/?rev=1442&view=rev
Author:   jakubvrana
Date:     2010-04-15 14:43:44 +0000 (Thu, 15 Apr 2010)

Log Message:
-----------
Utilize where_link function

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-15 12:42:31 UTC (rev 1441)
+++ trunk/adminer/include/functions.inc.php	2010-04-15 14:43:44 UTC (rev 1442)
@@ -188,9 +188,10 @@
 * @param string column identifier
 * @param string
 * @return string
+* @return string
 */
-function where_link($i, $column, $value) {
-	return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=%3D&where%5B$i%5D%5Bval%5D=" . urlencode($value);
+function where_link($i, $column, $value, $operator = "=") {
+	return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=" . urlencode($operator) . "&where%5B$i%5D%5Bval%5D=" . urlencode($value);
 }
 
 /** Set cookie valid for 1 month

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-15 12:42:31 UTC (rev 1441)
+++ trunk/adminer/select.inc.php	2010-04-15 14:43:44 UTC (rev 1442)
@@ -249,13 +249,11 @@
 								$i = 0;
 								foreach ((array) $_GET["where"] as $v) {
 									if (!array_key_exists($v["col"], $unique_array)) {
-										$link .= h("&where[$i][col]=" . urlencode($v["col"]) . "&where[$i][op]=" . urlencode($v["op"]) . "&where[$i][val]=" . urlencode($v["val"]));
-										$i++;
+										$link .= h(where_link($i++, $v["col"], $v["val"], urlencode($v["op"])));
 									}
 								}
 								foreach ($unique_array as $k => $v) {
-									$link .= h("&where[$i][col]=" . urlencode($k) . "&where[$i][op]=" . (isset($v) ? "%3D&where[$i][val]=" . urlencode($v) : "IS+NULL"));
-									$i++;
+									$link .= h(where_link($i++, $k, $v, (isset($v) ? "=" : "IS NULL")));
 								}
 							}
 						}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1443] trunk/adminer

From: <jakubvrana@us...> - 2010-04-15 14:59

Revision: 1443
          http://adminer.svn.sourceforge.net/adminer/?rev=1443&view=rev
Author:   jakubvrana
Date:     2010-04-15 14:59:40 +0000 (Thu, 15 Apr 2010)

Log Message:
-----------
Fix Save and continue edit

Modified Paths:
--------------
    trunk/adminer/edit.inc.php
    trunk/adminer/include/functions.inc.php

Modified: trunk/adminer/edit.inc.php
===================================================================
--- trunk/adminer/edit.inc.php	2010-04-15 14:43:44 UTC (rev 1442)
+++ trunk/adminer/edit.inc.php	2010-04-15 14:59:40 UTC (rev 1443)
@@ -11,7 +11,7 @@
 if ($_POST && !$error && !isset($_GET["select"])) {
 	$location = $_POST["referer"];
 	if ($_POST["insert"]) { // continue edit or insert
-		$location = ($update ? ME . "&edit=" . urlencode($TABLE) . unique_idf($_POST["fields"] + $_GET["where"], indexes($TABLE)) : $_SERVER["REQUEST_URI"]); //! doesn't work with functions
+		$location = ($update ? null : $_SERVER["REQUEST_URI"]);
 	} elseif (!ereg('^.+&select=.+$', $location)) {
 		$location = ME . "select=" . urlencode($TABLE);
 		$i = 0; // append &set converted to &where

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-15 14:43:44 UTC (rev 1442)
+++ trunk/adminer/include/functions.inc.php	2010-04-15 14:59:40 UTC (rev 1443)
@@ -217,8 +217,8 @@
 }
 
 /** Send Location header and exit
+* @param string null to only set a message
 * @param string
-* @param string
 * @return null
 */
 function redirect($location, $message = null) {
@@ -226,8 +226,10 @@
 		restart_session();
 		$_SESSION["messages"][] = $message;
 	}
-	header("Location: " . ($location != "" ? $location : "."));
-	exit;
+	if (isset($location)) {
+		header("Location: " . ($location != "" ? $location : "."));
+		exit;
+	}
 }
 
 /** Execute query and redirect if successful


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1467] trunk/adminer

From: <jakubvrana@us...> - 2010-04-21 15:09

Revision: 1467
          http://adminer.svn.sourceforge.net/adminer/?rev=1467&view=rev
Author:   jakubvrana
Date:     2010-04-21 15:09:52 +0000 (Wed, 21 Apr 2010)

Log Message:
-----------
SQLite variables

Modified Paths:
--------------
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/variables.inc.php

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-21 12:01:32 UTC (rev 1466)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-21 15:09:52 UTC (rev 1467)
@@ -666,6 +666,14 @@
 		return $connection->result("SHOW CREATE TABLE " . idf_escape($table), 1);
 	}
 	
+	function show_variables() {
+		return get_key_vals("SHOW VARIABLES");
+	}
+	
+	function show_status() {
+		return get_key_vals("SHOW STATUS");
+	}
+	
 	/** Check whether a feature is supported
 	* @param string
 	* @return bool

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-21 12:01:32 UTC (rev 1466)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-21 15:09:52 UTC (rev 1467)
@@ -44,7 +44,7 @@
 				
 				function result($query, $field = 0) {
 					$result = $this->query($query);
-					if (!$result) {
+					if (!is_object($result)) {
 						return false;
 					}
 					$row = $result->_result->fetch();
@@ -89,37 +89,38 @@
 			
 		} else {
 			
-			class Min_SQLite extends SQLite3 {
-				var $extension = "SQLite3", $server_info, $affected_rows, $error;
+			class Min_SQLite {
+				var $extension = "SQLite3", $server_info, $affected_rows, $error, $_connection;
 				
 				function __construct() {
-					$version = $this->version();
+					$this->_connection = new SQLite3(":memory:"); // required to display variables
+					$version = $this->_connection->version();
 					$this->server_info = $version["versionString"];
 				}
 				
 				function open($filename) {
-					parent::__construct($filename);
+					$this->_connection->open($filename);
 				}
 				
 				function query($query) {
-					$result = @parent::query($query);
+					$result = @$this->_connection->query($query);
 					if (!$result) {
-						$this->error = $this->lastErrorMsg();
+						$this->error = $this->_connection->lastErrorMsg();
 						return false;
 					} elseif ($result->numColumns()) {
 						return new Min_Result($result);
 					}
-					$this->affected_rows = $this->changes();
+					$this->affected_rows = $this->_connection->changes();
 					return true;
 				}
 				
 				function quote($string) {
-					return "'" . $this->escapeString($string) . "'";
+					return "'" . $this->_connection->escapeString($string) . "'";
 				}
 				
 				function result($query, $field = 0) {
 					$result = $this->query($query);
-					if (!$result) {
+					if (!is_object($result)) {
 						return false;
 					}
 					$row = $result->_result->fetchArray();
@@ -254,6 +255,7 @@
 		$return = array();
 		$result = $connection->query("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view')" . ($name != "" ? " AND name = " . $connection->quote($name) : ""));
 		while ($row = $result->fetch_assoc()) {
+			$row["Auto_increment"] = "";
 			$return[$row["Name"]] = $row;
 		}
 		$result = $connection->query("SELECT * FROM sqlite_sequence");
@@ -456,8 +458,21 @@
 		return $connection->result("SELECT sql FROM sqlite_master WHERE name = " . $connection->quote($table));
 	}
 	
+	function show_variables() {
+		global $connection;
+		$return = array();
+		foreach (array("auto_vacuum", "cache_size", "count_changes", "default_cache_size", "empty_result_callbacks", "encoding", "foreign_keys", "full_column_names", "fullfsync", "journal_mode", "journal_size_limit", "legacy_file_format", "locking_mode", "page_size", "max_page_count", "read_uncommitted", "recursive_triggers", "reverse_unordered_selects", "secure_delete", "short_column_names", "synchronous", "temp_store", "temp_store_directory", "schema_version", "compile_options", "integrity_check", "quick_check") as $key) {
+			$return[$key] = $connection->result("PRAGMA $key");
+		}
+		return $return;
+	}
+	
+	function show_status() {
+		// not supported
+	}
+	
 	function support($feature) {
-		return ereg('^(view|trigger)$', $feature);
+		return ereg('^(view|trigger|variables)$', $feature);
 	}
 	
 	$driver = "sqlite";

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2010-04-21 12:01:32 UTC (rev 1466)
+++ trunk/adminer/include/editing.inc.php	2010-04-21 15:09:52 UTC (rev 1467)
@@ -55,7 +55,7 @@
 				} else {
 					if ($blobs[$key] && !is_utf8($val)) {
 						$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
-					} elseif ($val == "") {
+					} elseif (!strlen($val)) { // strlen - SQLite can return int
 						$val = "&nbsp;"; // some content to print a border
 					} else {
 						$val = h($val);

Modified: trunk/adminer/variables.inc.php
===================================================================
--- trunk/adminer/variables.inc.php	2010-04-21 12:01:32 UTC (rev 1466)
+++ trunk/adminer/variables.inc.php	2010-04-21 15:09:52 UTC (rev 1467)
@@ -2,11 +2,10 @@
 $status = isset($_GET["status"]);
 page_header($status ? lang('Status') : lang('Variables'));
 
-$result = $connection->query($status ? "SHOW STATUS" : "SHOW VARIABLES");
 echo "<table cellspacing='0'>\n";
-while ($row = $result->fetch_assoc()) {
+foreach (($status ? show_status() : show_variables()) as $key => $val) {
 	echo "<tr>";
-	echo "<th><code class='jush-" . ($status ? "sqlstatus" : "sqlset") . "'>" . h($row["Variable_name"]) . "</code>";
-	echo "<td>" . nbsp($row["Value"]);
+	echo "<th><code class='jush-" . $driver . ($status ? "status" : "set") . "'>" . h($key) . "</code>";
+	echo "<td>" . nbsp($val);
 }
 echo "</table>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1470] trunk/adminer

From: <jakubvrana@us...> - 2010-04-21 22:22

Revision: 1470
          http://adminer.svn.sourceforge.net/adminer/?rev=1470&view=rev
Author:   jakubvrana
Date:     2010-04-21 22:22:23 +0000 (Wed, 21 Apr 2010)

Log Message:
-----------
Improve drivers

Modified Paths:
--------------
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/include/editing.inc.php
    trunk/adminer/include/functions.inc.php

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-04-21 22:21:47 UTC (rev 1469)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
@@ -105,11 +105,13 @@
 			function fetch_field() {
 				$column = $this->_offset++;
 				$row = new stdClass;
-				$row->orgtable = pg_field_table($this->_result, $column);
+				if (function_exists('pg_field_table')) {
+					$row->orgtable = pg_field_table($this->_result, $column);
+				}
 				$row->name = pg_field_name($this->_result, $column);
 				$row->orgname = $row->name;
 				$row->type = pg_field_type($this->_result, $column);
-				$row->charsetnr = ($row->type == "bytea" ? 63 : 0);
+				$row->charsetnr = ($row->type == "bytea" ? 63 : 0); // 63 - binary
 				return $row;
 			}
 			
@@ -178,7 +180,7 @@
 	
 	function tables_list() {
 		global $connection;
-		return get_key_vals("SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = 'public' ORDER BY table_name");
+		return get_key_vals("SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema() ORDER BY table_name");
 	}
 	
 	function count_tables($databases) {
@@ -188,7 +190,12 @@
 	function table_status($name = "") {
 		global $connection;
 		$return = array();
-		$result = $connection->query("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN '' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_catalog.obj_description(oid, 'pg_class') AS \"Comment\" FROM pg_catalog.pg_class WHERE relkind IN ('r','v') AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')" . ($name != "" ? " AND relname = " . $connection->quote($name) : "")); //! Index_length, Auto_increment
+		$result = $connection->query("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN '' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_catalog.obj_description(oid, 'pg_class') AS \"Comment\"
+FROM pg_catalog.pg_class
+WHERE relkind IN ('r','v')
+AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())"
+			. ($name != "" ? " AND relname = " . $connection->quote($name) : "")
+		); //! Index_length, Auto_increment
 		while ($row = $result->fetch_assoc()) {
 			$return[$row["Name"]] = $row;
 		}

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-21 22:21:47 UTC (rev 1469)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
@@ -19,6 +19,7 @@
 				
 				function __construct() {
 					$this->server_info = sqlite_libversion();
+					$this->_connection = new SQLiteDatabase(":memory:");
 				}
 				
 				function open($filename) {
@@ -79,9 +80,16 @@
 				}
 				
 				function fetch_field() {
+					$name = $this->_result->fieldName($this->_offset++);
+					$pattern = '(\\[.*]|"(?:[^"]|"")*"|(.+))';
+					if (preg_match("~^($pattern\\.)?$pattern\$~", $name, $match)) {
+						$table = ($match[3] != "" ? $match[3] : idf_unescape($match[2]));
+						$name = ($match[5] != "" ? $match[5] : idf_unescape($match[4]));
+					}
 					return (object) array(
-						"name" => $this->_result->fieldName($this->_offset++),
-						//! type, orgtable, charsetnr
+						"name" => $name,
+						"orgname" => $name,
+						"orgtable" => $table,
 					);
 				}
 				
@@ -99,7 +107,7 @@
 				}
 				
 				function open($filename) {
-					$this->_connection->open($filename);
+					$this->_connection = new SQLite3($filename);
 				}
 				
 				function query($query) {
@@ -146,10 +154,11 @@
 				
 				function fetch_field() {
 					$column = $this->_offset++;
+					$type = $this->_result->columnType($column);
 					return (object) array(
 						"name" => $this->_result->columnName($column),
-						"type" => $this->_result->columnType($column),
-						//! orgtable, charsetnr
+						"type" => $type,
+						"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
 					);
 				}
 				
@@ -163,13 +172,8 @@
 		class Min_DB extends Min_SQLite {
 			
 			function select_db($filename) {
-				static $connected = false;
-				if ($connected) {
-					return true;
-				}
 				set_exception_handler('connect_error'); // try/catch is not compatible with PHP 4
 				$this->open($filename);
-				$connected = true;
 				restore_exception_handler();
 				return true;
 			}

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2010-04-21 22:21:47 UTC (rev 1469)
+++ trunk/adminer/include/editing.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
@@ -40,7 +40,7 @@
 							$links[$j] = $orgtable;
 						}
 					}
-					if ($field->charsetnr == 63) {
+					if ($field->charsetnr == 63) { // 63 - binary
 						$blobs[$j] = true;
 					}
 					$types[$j] = $field->type;
@@ -59,7 +59,7 @@
 						$val = "&nbsp;"; // some content to print a border
 					} else {
 						$val = h($val);
-						if ($types[$key] == 254) {
+						if ($types[$key] == 254) { // 254 - char
 							$val = "<code>$val</code>";
 						}
 					}

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-21 22:21:47 UTC (rev 1469)
+++ trunk/adminer/include/functions.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
@@ -13,7 +13,8 @@
 * @return string
 */
 function idf_unescape($idf) {
-	return str_replace($idf[0] . $idf[0], $idf[0], substr($idf, 1, -1));
+	$last = substr($idf, -1);
+	return str_replace($last . $last, $last, substr($idf, 1, -1));
 }
 
 /** Escape string to use inside ''


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1471] trunk/adminer

From: <jakubvrana@us...> - 2010-04-21 22:37

Revision: 1471
          http://adminer.svn.sourceforge.net/adminer/?rev=1471&view=rev
Author:   jakubvrana
Date:     2010-04-21 22:37:16 +0000 (Wed, 21 Apr 2010)

Log Message:
-----------
Driver specific USE

Modified Paths:
--------------
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/dump.inc.php

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-21 22:37:16 UTC (rev 1471)
@@ -666,10 +666,24 @@
 		return $connection->result("SHOW CREATE TABLE " . idf_escape($table), 1);
 	}
 	
+	/** Get SQL command to change database
+	* @param string
+	* @return string
+	*/
+	function use_sql($database) {
+		return "USE " . idf_escape($database);
+	}
+	
+	/** Get server variables
+	* @return array ($name => $value)
+	*/
 	function show_variables() {
 		return get_key_vals("SHOW VARIABLES");
 	}
 	
+	/** Get status variables
+	* @return array ($name => $value)
+	*/
 	function show_status() {
 		return get_key_vals("SHOW STATUS");
 	}

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-04-21 22:37:16 UTC (rev 1471)
@@ -415,6 +415,10 @@
 		return $connection->query("EXPLAIN $query");
 	}
 	
+	function use_sql($database) {
+		return "\connect " . idf_escape($database);
+	}
+	
 	function support($feature) {
 		return ereg('^(comment|view|routine|trigger)$', $feature);
 	}

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-21 22:37:16 UTC (rev 1471)
@@ -462,6 +462,11 @@
 		return $connection->result("SELECT sql FROM sqlite_master WHERE name = " . $connection->quote($table));
 	}
 	
+	function use_sql($database) {
+		global $connection;
+		return "ATTACH " . $connection->quote($database) . " AS " . idf_escape($database);
+	}
+	
 	function show_variables() {
 		global $connection;
 		$return = array();

Modified: trunk/adminer/dump.inc.php
===================================================================
--- trunk/adminer/dump.inc.php	2010-04-21 22:22:23 UTC (rev 1470)
+++ trunk/adminer/dump.inc.php	2010-04-21 22:37:16 UTC (rev 1471)
@@ -37,7 +37,7 @@
 			}
 			if ($_POST["format"] == "sql") {
 				if ($style) {
-					echo "USE " . idf_escape($db) . ";\n\n";
+					echo use_sql($db) . ";\n\n";
 				}
 				if (in_array("CREATE+ALTER", array($style, $_POST["table_style"]))) {
 					echo "SET @adminer_alter = '';\n\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1472] trunk/adminer

From: <jakubvrana@us...> - 2010-04-21 23:06

Revision: 1472
          http://adminer.svn.sourceforge.net/adminer/?rev=1472&view=rev
Author:   jakubvrana
Date:     2010-04-21 23:06:32 +0000 (Wed, 21 Apr 2010)

Log Message:
-----------
Display SQLite compile options

Modified Paths:
--------------
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/variables.inc.php

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-21 22:37:16 UTC (rev 1471)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-21 23:06:32 UTC (rev 1472)
@@ -470,18 +470,23 @@
 	function show_variables() {
 		global $connection;
 		$return = array();
-		foreach (array("auto_vacuum", "cache_size", "count_changes", "default_cache_size", "empty_result_callbacks", "encoding", "foreign_keys", "full_column_names", "fullfsync", "journal_mode", "journal_size_limit", "legacy_file_format", "locking_mode", "page_size", "max_page_count", "read_uncommitted", "recursive_triggers", "reverse_unordered_selects", "secure_delete", "short_column_names", "synchronous", "temp_store", "temp_store_directory", "schema_version", "compile_options", "integrity_check", "quick_check") as $key) {
+		foreach (array("auto_vacuum", "cache_size", "count_changes", "default_cache_size", "empty_result_callbacks", "encoding", "foreign_keys", "full_column_names", "fullfsync", "journal_mode", "journal_size_limit", "legacy_file_format", "locking_mode", "page_size", "max_page_count", "read_uncommitted", "recursive_triggers", "reverse_unordered_selects", "secure_delete", "short_column_names", "synchronous", "temp_store", "temp_store_directory", "schema_version", "integrity_check", "quick_check") as $key) {
 			$return[$key] = $connection->result("PRAGMA $key");
 		}
 		return $return;
 	}
 	
 	function show_status() {
-		// not supported
+		$return = array();
+		foreach (get_vals("PRAGMA compile_options") as $option) {
+			list($key, $val) = explode("=", $option, 2);
+			$return[$key] = $val;
+		}
+		return $return;
 	}
 	
 	function support($feature) {
-		return ereg('^(view|trigger|variables)$', $feature);
+		return ereg('^(view|trigger|variables|status)$', $feature);
 	}
 	
 	$driver = "sqlite";

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-21 22:37:16 UTC (rev 1471)
+++ trunk/adminer/include/functions.inc.php	2010-04-21 23:06:32 UTC (rev 1472)
@@ -134,7 +134,7 @@
 	global $connection;
 	$return = array();
 	$result = $connection->query($query);
-	if ($result) {
+	if (is_object($result)) {
 		while ($row = $result->fetch_row()) {
 			$return[] = $row[$column];
 		}

Modified: trunk/adminer/variables.inc.php
===================================================================
--- trunk/adminer/variables.inc.php	2010-04-21 22:37:16 UTC (rev 1471)
+++ trunk/adminer/variables.inc.php	2010-04-21 23:06:32 UTC (rev 1472)
@@ -2,10 +2,15 @@
 $status = isset($_GET["status"]);
 page_header($status ? lang('Status') : lang('Variables'));
 
-echo "<table cellspacing='0'>\n";
-foreach (($status ? show_status() : show_variables()) as $key => $val) {
-	echo "<tr>";
-	echo "<th><code class='jush-" . $driver . ($status ? "status" : "set") . "'>" . h($key) . "</code>";
-	echo "<td>" . nbsp($val);
+$variables = ($status ? show_status() : show_variables());
+if (!$variables) {
+	echo "<p class='message'>" . lang('No rows.') . "\n";
+} else {
+	echo "<table cellspacing='0'>\n";
+	foreach ($variables as $key => $val) {
+		echo "<tr>";
+		echo "<th><code class='jush-" . $driver . ($status ? "status" : "set") . "'>" . h($key) . "</code>";
+		echo "<td>" . nbsp($val);
+	}
+	echo "</table>\n";
 }
-echo "</table>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1476] trunk/adminer

From: <jakubvrana@us...> - 2010-04-22 12:38

Revision: 1476
          http://adminer.svn.sourceforge.net/adminer/?rev=1476&view=rev
Author:   jakubvrana
Date:     2010-04-22 12:37:56 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
Don't redirect from last page

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-22 12:19:22 UTC (rev 1475)
+++ trunk/adminer/include/functions.inc.php	2010-04-22 12:37:56 UTC (rev 1476)
@@ -348,8 +348,8 @@
 * @param int
 * @return string
 */
-function pagination($page) {
-	return " " . ($page == $_GET["page"] ? $page + 1 : '<a href="' . h(remove_from_uri("page") . ($page ? "&page=$page" : "")) . '">' . ($page + 1) . "</a>");
+function pagination($page, $current) {
+	return " " . ($page == $current ? $page + 1 : '<a href="' . h(remove_from_uri("page") . ($page ? "&page=$page" : "")) . '">' . ($page + 1) . "</a>");
 }
 
 /** Get file contents from $_FILES

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-22 12:19:22 UTC (rev 1475)
+++ trunk/adminer/select.inc.php	2010-04-22 12:37:56 UTC (rev 1476)
@@ -26,12 +26,6 @@
 $from = ($select ? implode(", ", $select) : "*") . "\nFROM " . idf_escape($TABLE) . ($where ? "\nWHERE " . implode(" AND ", $where) : "");
 $group_by = ($group && count($group) < count($select) ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
 
-if ($_GET["page"] == "last") {
-	session_write_close();
-	$found_rows = $connection->result("SELECT COUNT(*) FROM " . idf_escape($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : ""));
-	redirect(remove_from_uri("page") . ($found_rows > $limit ? "&page=" . floor(($found_rows - 1) / $limit) : ""));
-}
-
 if ($_POST && !$error) {
 	$where_check = "(" . implode(") OR (", array_map('where_check', (array) $_POST["check"])) . ")";
 	$primary = ($indexes["PRIMARY"] ? ($select ? array_flip($indexes["PRIMARY"]["columns"]) : array()) : null); // empty array means that all primary fields are selected
@@ -181,7 +175,14 @@
 	$adminer->selectActionPrint($text_length);
 	echo "</form>\n";
 	
-	$query = "SELECT" . limit((intval($limit) && $group && count($group) < count($select) && $driver == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by, ($limit != "" ? intval($limit) : null), ($_GET["page"] ? $limit * $_GET["page"] : 0));
+	$page = $_GET["page"];
+	if ($page == "last") {
+		session_write_close();
+		$found_rows = $connection->result("SELECT COUNT(*) FROM " . idf_escape($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : ""));
+		$page = floor(($found_rows - 1) / $limit);
+	}
+
+	$query = "SELECT" . limit((intval($limit) && $group && count($group) < count($select) && $driver == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by, ($limit != "" ? intval($limit) : null), ($page ? $limit * $page : 0));
 	echo $adminer->selectQuery($query);
 	
 	$result = $connection->query($query);
@@ -293,11 +294,11 @@
 		
 		parse_str($_COOKIE["adminer_export"], $adminer_export);
 		
-		if ($rows || $_GET["page"]) {
+		if ($rows || $page) {
 			$exact_count = true;
-			if (intval($limit) && count($group) >= count($select) && ($found_rows >= $limit || $_GET["page"])) {
+			if (intval($limit) && count($group) >= count($select) && ($found_rows >= $limit || $page)) {
 				$found_rows = $table_status["Rows"];
-				if (!isset($found_rows) || $where || $_GET["page"] * $limit * 2 > $found_rows || ($table_status["Engine"] == "InnoDB" && $found_rows < 1e5)) {
+				if (!isset($found_rows) || $where || 2 * $page * $limit > $found_rows || ($table_status["Engine"] == "InnoDB" && $found_rows < 1e4)) {
 					// slow with big tables
 					ob_flush();
 					flush();
@@ -308,13 +309,13 @@
 			}
 			echo "<p class='pages'>";
 			if (intval($limit) && $found_rows > $limit) {
-				// display first, previous 5, next 5 and last page
+				// display first, previous 4, next 4 and last page
 				$max_page = floor(($found_rows - 1) / $limit);
-				echo lang('Page') . ":" . pagination(0) . ($_GET["page"] > 5 ? " ..." : "");
-				for ($i = max(1, $_GET["page"] - 2); $i < min($max_page, $_GET["page"] + 5); $i++) {
-					echo pagination($i);
+				echo lang('Page') . ":" . pagination(0, $page) . ($page > 5 ? " ..." : "");
+				for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {
+					echo pagination($i, $page);
 				}
-				echo ($_GET["page"] + 5 < $max_page ? " ..." : "") . ($exact_count ? pagination($max_page) : ' <a href="' . h(remove_from_uri() . "&page=last") . '">' . lang('last') . "</a>");
+				echo ($page + 5 < $max_page ? " ..." : "") . ($exact_count ? pagination($max_page, $page) : ' <a href="' . h(remove_from_uri() . "&page=last") . '">' . lang('last') . "</a>");
 			}
 			echo " (" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " . checkbox("all", 1, 0, lang('whole result')) . "\n";
 			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1475] trunk/adminer

From: <jakubvrana@us...> - 2010-04-22 13:21

Revision: 1475
          http://adminer.svn.sourceforge.net/adminer/?rev=1475&view=rev
Author:   jakubvrana
Date:     2010-04-22 12:19:22 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
Init with null

Modified Paths:
--------------
    trunk/adminer/edit.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/edit.inc.php
===================================================================
--- trunk/adminer/edit.inc.php	2010-04-22 09:22:19 UTC (rev 1474)
+++ trunk/adminer/edit.inc.php	2010-04-22 12:19:22 UTC (rev 1475)
@@ -44,7 +44,7 @@
 	$table_name
 );
 
-unset($row);
+$row = null;
 if ($_POST["save"]) {
 	$row = (array) $_POST["fields"];
 } elseif ($where) {
@@ -59,7 +59,7 @@
 		$result = $connection->query("SELECT" . limit(implode(", ", $select) . " FROM " . idf_escape($TABLE) . " WHERE $where", (isset($_GET["select"]) ? 2 : 1)));
 		$row = $result->fetch_assoc();
 		if (isset($_GET["select"]) && $result->fetch_assoc()) {
-			$row = false;
+			$row = null;
 		}
 	}
 }
@@ -68,7 +68,6 @@
 <form action="" method="post" enctype="multipart/form-data">
 <?php
 if ($fields) {
-	unset($create);
 	echo "<table cellspacing='0'>\n";
 	foreach ($fields as $name => $field) {
 		echo "<tr><th>" . $adminer->fieldName($field);

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-22 09:22:19 UTC (rev 1474)
+++ trunk/adminer/select.inc.php	2010-04-22 12:19:22 UTC (rev 1475)
@@ -7,7 +7,7 @@
 
 $rights = array(); // privilege => 0
 $columns = array(); // selectable columns
-unset($text_length);
+$text_length = null;
 foreach ($fields as $key => $field) {
 	$name = $adminer->fieldName($field);
 	if (isset($field["privileges"]["select"]) && $name != "") {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1478] trunk/adminer

From: <jakubvrana@us...> - 2010-04-22 15:53

Revision: 1478
          http://adminer.svn.sourceforge.net/adminer/?rev=1478&view=rev
Author:   jakubvrana
Date:     2010-04-22 15:53:42 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
Driver specific trigger options

Modified Paths:
--------------
    trunk/adminer/drivers/mssql.inc.php
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/trigger.inc.php

Modified: trunk/adminer/drivers/mssql.inc.php
===================================================================
--- trunk/adminer/drivers/mssql.inc.php	2010-04-22 14:38:05 UTC (rev 1477)
+++ trunk/adminer/drivers/mssql.inc.php	2010-04-22 15:53:42 UTC (rev 1478)
@@ -412,12 +412,14 @@
 		$result = $connection->query("SELECT s.name [Trigger],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsertTrigger') = 1 THEN 'INSERT' WHEN OBJECTPROPERTY(s.id, 'ExecIsUpdateTrigger') = 1 THEN 'UPDATE' WHEN OBJECTPROPERTY(s.id, 'ExecIsDeleteTrigger') = 1 THEN 'DELETE' END [Event],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsteadOfTrigger') = 1 THEN 'INSTEAD OF' ELSE 'AFTER' END [Timing],
-c.text [Statement]
+c.text
 FROM sysobjects s
 JOIN syscomments c ON s.id = c.id
 WHERE s.xtype = 'TR' AND s.name = " . $connection->quote($name)
 		);
-		return $result->fetch_assoc();
+		$row = $result->fetch_assoc();
+		$row["Statement"] = preg_replace('~^.+\\s+AS\\s+~isU', '', $row["text"]); //! identifiers, comments
+		return $row;
 	}
 	
 	function triggers($table) {
@@ -436,6 +438,13 @@
 		return $return;
 	}
 	
+	function trigger_options() {
+		return array(
+			"Timing" => array("AFTER", "INSTEAD OF"),
+			"Type" => array("AS"),
+		);
+	}
+	
 	function support($feature) {
 		return ereg('^(view|routine|trigger)$', $feature);
 	}

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-22 14:38:05 UTC (rev 1477)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-22 15:53:42 UTC (rev 1478)
@@ -454,7 +454,7 @@
 	*/
 	function view($name) {
 		global $connection;
-		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)* AS ~U', '', $connection->result("SHOW CREATE VIEW " . idf_escape($name), 1)));
+		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)*\\s+AS\\s+~isU', '', $connection->result("SHOW CREATE VIEW " . idf_escape($name), 1)));
 	}
 
 	/** Get sorted grouped list of collations
@@ -648,6 +648,14 @@
 		return $return;
 	}
 	
+	function trigger_options() {
+		return array(
+			"Timing" => array("BEFORE", "AFTER"),
+			// Event is always INSERT, UPDATE, DELETE
+			"Type" => array("FOR EACH ROW"),
+		);
+	}
+	
 	/** Explain select
 	* @param Min_DB
 	* @param string

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-04-22 14:38:05 UTC (rev 1477)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-04-22 15:53:42 UTC (rev 1478)
@@ -397,7 +397,7 @@
 	
 	function trigger($name) {
 		global $connection;
-		$result = $connection->query('SELECT trigger_name AS "Trigger", condition_timing AS "Timing", event_manipulation AS "Event", action_statement AS "Statement" FROM information_schema.triggers WHERE event_object_table = ' . $connection->quote($_GET["trigger"]) . ' AND trigger_name = ' . $connection->quote($name));
+		$result = $connection->query('SELECT trigger_name AS "Trigger", condition_timing AS "Timing", event_manipulation AS "Event", action_statement AS "Statement" FROM information_schema.triggers WHERE event_object_table = ' . $connection->quote($_GET["trigger"]) . ' AND trigger_name = ' . $connection->quote($name)); //! detect Type
 		return $result->fetch_assoc();
 	}
 	
@@ -411,6 +411,13 @@
 		return $return;
 	}
 	
+	function trigger_options() {
+		return array(
+			"Timing" => array("BEFORE", "AFTER"),
+			"Type" => array("FOR EACH STATEMENT", "FOR EACH ROW"),
+		);
+	}
+	
 	function explain($connection, $query) {
 		return $connection->query("EXPLAIN $query");
 	}

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-22 14:38:05 UTC (rev 1477)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-22 15:53:42 UTC (rev 1478)
@@ -453,6 +453,13 @@
 		return $return;
 	}
 	
+	function trigger_options() {
+		return array(
+			"Timing" => array("BEFORE", "AFTER", "INSTEAD OF"),
+			"Type" => array("FOR EACH ROW"),
+		);
+	}
+	
 	function explain($connection, $query) {
 		return $connection->query("EXPLAIN $query");
 	}

Modified: trunk/adminer/trigger.inc.php
===================================================================
--- trunk/adminer/trigger.inc.php	2010-04-22 14:38:05 UTC (rev 1477)
+++ trunk/adminer/trigger.inc.php	2010-04-22 15:53:42 UTC (rev 1478)
@@ -1,13 +1,15 @@
 <?php
 $TABLE = $_GET["trigger"];
-$trigger_time = array("BEFORE", "AFTER");
+$trigger_options = trigger_options();
 $trigger_event = array("INSERT", "UPDATE", "DELETE");
 
 $dropped = false;
-if ($_POST && !$error && in_array($_POST["Timing"], $trigger_time) && in_array($_POST["Event"], $trigger_event)) {
+if ($_POST && !$error && in_array($_POST["Timing"], $trigger_options["Timing"]) && in_array($_POST["Event"], $trigger_event) && in_array($_POST["Type"], $trigger_options["Type"])) {
+	$timing_event = " $_POST[Timing] $_POST[Event]";
+	$on = " ON " . idf_escape($TABLE);
 	$dropped = drop_create(
 		"DROP TRIGGER " . idf_escape($_GET["name"]) . ($driver == "pgsql" ? " ON " . idf_escape($TABLE) : ""),
-		"CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . " $_POST[Timing] $_POST[Event] ON " . idf_escape($TABLE) . " FOR EACH ROW\n$_POST[Statement]", //! FOR EACH STATEMENT
+		"CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . ($driver == "mssql" ? $on . $timing_event : $timing_event . $on) . " $_POST[Type]\n$_POST[Statement]",
 		ME . "table=" . urlencode($TABLE),
 		lang('Trigger has been dropped.'),
 		lang('Trigger has been altered.'),
@@ -28,14 +30,15 @@
 
 <form action="" method="post" id="form">
 <table cellspacing="0">
-<tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_time, $row["Timing"], "if (/^" . h(preg_quote($TABLE, "/")) . "_[ba][iud]$/.test(this.form['Trigger'].value)) this.form['Trigger'].value = '" . h(addcslashes($TABLE, "\r\n'\\")) . "_' + selectValue(this).charAt(0).toLowerCase() + selectValue(this.form['Event']).charAt(0).toLowerCase();"); ?>
+<tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_options["Timing"], $row["Timing"], "if (/^" . h(preg_quote($TABLE, "/")) . "_[ba][iud]$/.test(this.form['Trigger'].value)) this.form['Trigger'].value = '" . h(addcslashes($TABLE, "\r\n'\\")) . "_' + selectValue(this).charAt(0).toLowerCase() + selectValue(this.form['Event']).charAt(0).toLowerCase();"); ?>
 <tr><th><?php echo lang('Event'); ?><td><?php echo html_select("Event", $trigger_event, $row["Event"], "this.form['Timing'].onchange();"); ?>
-<tr><th><?php echo lang('Name'); ?><td><input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64">
+<tr><th><?php echo lang('Type'); ?><td><?php echo html_select("Type", $trigger_options["Type"], $row["Type"]); ?>
 </table>
 <p><textarea name="Statement" rows="10" cols="80" style="width: 98%;"><?php echo h($row["Statement"]); ?></textarea>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php if ($dropped) { ?><input type="hidden" name="dropped" value="1"><?php } ?>
+<?php echo lang('Name'); ?>: <input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64">
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 </form>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1480] trunk/adminer

From: <jakubvrana@us...> - 2010-04-22 23:02

Revision: 1480
          http://adminer.svn.sourceforge.net/adminer/?rev=1480&view=rev
Author:   jakubvrana
Date:     2010-04-22 23:02:28 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
Driver specific create and drop database

Modified Paths:
--------------
    trunk/adminer/database.inc.php
    trunk/adminer/drivers/mssql.inc.php
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/include/connect.inc.php

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2010-04-22 19:43:36 UTC (rev 1479)
+++ trunk/adminer/database.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
@@ -3,7 +3,7 @@
 	restart_session();
 	if ($_POST["drop"]) {
 		set_session("databases", null);
-		query_redirect("DROP DATABASE " . idf_escape(DB), remove_from_uri("db|database"), lang('Database has been dropped.'));
+		queries_redirect(remove_from_uri("db|database"), lang('Database has been dropped.'), drop_databases(array(DB)));
 	} elseif (DB !== $_POST["name"]) {
 		// create or rename database
 		set_session("databases", null); // clear cache
@@ -15,7 +15,7 @@
 			$last = "";
 			foreach ($dbs as $db) {
 				if (count($dbs) == 1 || $db != "") { // ignore empty lines but always try to create single database
-					if (!queries("CREATE DATABASE " . idf_escape($db) . ($_POST["collation"] ? " COLLATE " . $connection->quote($_POST["collation"]) : ""))) {
+					if (!create_database($db, $_POST["collation"])) {
 						$success = false;
 					}
 					$last = $db;
@@ -55,11 +55,15 @@
 
 <form action="" method="post">
 <p>
-<?php echo ($_POST["add_x"] || strpos($name, "\n")
+<?php
+echo ($_POST["add_x"] || strpos($name, "\n")
 	? '<textarea name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
 	: '<input name="name" value="' . h($name) . '" maxlength="64">'
-) . "\n"; ?>
-<?php echo html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate); ?>
+) . "\n";
+if ($collations) {
+	html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate);
+}
+?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php

Modified: trunk/adminer/drivers/mssql.inc.php
===================================================================
--- trunk/adminer/drivers/mssql.inc.php	2010-04-22 19:43:36 UTC (rev 1479)
+++ trunk/adminer/drivers/mssql.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
@@ -359,6 +359,14 @@
 		return $connection->quote($val);
 	}
 
+	function create_database($db, $collation) {
+		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . idf_escape($collation) : ""));
+	}
+	
+	function drop_databases($databases) {
+		return queries("DROP DATABASE " . implode(", ", array_map('idf_escape', $databases)));
+	}
+	
 	function rename_database($name, $collation) {
 		if ($collation) {
 			queries("ALTER DATABASE " . idf_escape(DB) . " COLLATE " . idf_escape($collation));

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-22 19:43:36 UTC (rev 1479)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
@@ -500,6 +500,27 @@
 		return "BINARY " . $connection->quote($val);
 	}
 
+	/** Create database
+	* @param string
+	* @return string
+	*/
+	function create_database($db, $collation) {
+		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . $connection->quote($collation) : ""));
+	}
+	
+	/** Drop databases
+	* @param array
+	* @return bool
+	*/
+	function drop_databases($databases) {
+		foreach ($databases as $db) {
+			if (!queries("DROP DATABASE " . idf_escape($db))) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
 	/** Rename database from DB
 	* @param string new name
 	* @return string
@@ -508,7 +529,7 @@
 	function rename_database($name, $collation) {
 		global $connection;
 		$return = false;
-		if (queries("CREATE DATABASE " . idf_escape($name) . ($collation ? " COLLATE " . $connection->quote($collation) : ""))) {
+		if (create_database($name, $collation)) {
 			//! move triggers
 			$return = true; // table list may by empty
 			foreach (tables_list() as $table) {
@@ -648,6 +669,9 @@
 		return $return;
 	}
 	
+	/** Get trigger options
+	* @return array ("Timing" => array(), "Type" => array())
+	*/
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER"),

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-04-22 19:43:36 UTC (rev 1479)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
@@ -52,6 +52,10 @@
 				return $link;
 			}
 			
+			function close() {
+				$this->_link = @pg_connect($this->_string);
+			}
+			
 			function query($query, $unbuffered = false) {
 				$result = @pg_query($this->_link, $query);
 				if (!$result) {
@@ -134,6 +138,9 @@
 			function select_db($database) {
 				return (DB == $database);
 			}
+			
+			function close() {
+			}
 		}
 		
 	}
@@ -301,6 +308,21 @@
 		return $connection->quote($val);
 	}
 	
+	function create_database($db, $collation) {
+		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " ENCODING " . idf_escape($collation) : ""));
+	}
+	
+	function drop_databases($databases) {
+		global $connection;
+		$connection->close();
+		foreach ($databases as $db) {
+			if (!queries("DROP DATABASE " . idf_escape($db))) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
 	function rename_database($name, $collation) {
 		//! current database cannot be renamed
 		return queries("ALTER DATABASE " . idf_escape(DB) . " RENAME TO " . idf_escape($name));

Modified: trunk/adminer/include/connect.inc.php
===================================================================
--- trunk/adminer/include/connect.inc.php	2010-04-22 19:43:36 UTC (rev 1479)
+++ trunk/adminer/include/connect.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
@@ -7,12 +7,7 @@
 	} else {
 		if ($_POST["db"] && !$error) {
 			set_session("databases", null);
-			foreach ($_POST["db"] as $db) {
-				if (!queries("DROP DATABASE " . idf_escape($db))) {
-					break;
-				}
-			}
-			queries_redirect(substr(ME, 0, -1), lang('Database has been dropped.'), !$connection->error);
+			queries_redirect(substr(ME, 0, -1), lang('Database has been dropped.'), drop_databases($_POST["db"]));
 		}
 		
 		page_header(lang('Select database'), $error, false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1481] trunk/adminer

From: <jakubvrana@us...> - 2010-04-22 23:04

Revision: 1481
          http://adminer.svn.sourceforge.net/adminer/?rev=1481&view=rev
Author:   jakubvrana
Date:     2010-04-22 23:03:54 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
Improve CSV; export

Modified Paths:
--------------
    trunk/adminer/dump.inc.php
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/dump.inc.php
===================================================================
--- trunk/adminer/dump.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
+++ trunk/adminer/dump.inc.php	2010-04-22 23:03:54 UTC (rev 1481)
@@ -156,7 +156,7 @@
 $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
 $table_style = array('', 'DROP+CREATE', 'CREATE');
 $data_style = array('', 'TRUNCATE+INSERT', 'INSERT', 'INSERT+UPDATE');
-if (support("routine")) {
+if ($driver == "sql") {
 	$db_style[] = 'CREATE+ALTER';
 	$table_style[] = 'CREATE+ALTER';
 }

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
+++ trunk/adminer/include/functions.inc.php	2010-04-22 23:03:54 UTC (rev 1481)
@@ -598,7 +598,7 @@
 			$row[$key] = '"' . str_replace('"', '""', $val) . '"';
 		}
 	}
-	echo implode(($_POST["format"] == "csv;" ? ";" : ","), $row) . "\n";
+	echo implode(($_POST["format"] == "csv" ? "," : ";"), $row) . "\n";
 }
 
 /** Apply SQL function

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-22 23:02:28 UTC (rev 1480)
+++ trunk/adminer/select.inc.php	2010-04-22 23:03:54 UTC (rev 1481)
@@ -112,7 +112,7 @@
 			preg_match_all('~(?>"[^"]*"|[^"\\r\\n]+)+~', $file, $matches);
 			$affected = count($matches[0]);
 			queries("START TRANSACTION");
-			$separator = ($_POST["separator"] == ";" ? ";" : ",");
+			$separator = ($_POST["separator"] == "csv" ? "," : ";");
 			foreach ($matches[0] as $key => $val) {
 				preg_match_all("~((\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
 				if (!$key && !array_diff($matches2[1], $cols)) { //! doesn't work with column names containing ",\n
@@ -132,7 +132,7 @@
 				}
 			}
 			if ($result) {
-			queries("COMMIT");
+				queries("COMMIT");
 			}
 			queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
 			queries("ROLLBACK");
@@ -327,7 +327,7 @@
 		}
 		print_fieldset("import", lang('CSV Import'), !$result->num_rows);
 		echo "<input type='hidden' name='token' value='$token'><input type='file' name='csv_file'> ";
-		echo html_select("separator", array(",", ";"), ($adminer_export["format"] == "csv;" ? ";" : ","), 1); // 1 - select
+		echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;"), $adminer_export["format"], 1); // 1 - select
 		echo " <input type='submit' name='import' value='" . lang('Import') . "'>\n";
 		echo "</div></fieldset>\n";
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1484] trunk/adminer

From: <jakubvrana@us...> - 2010-04-23 09:03

Revision: 1484
          http://adminer.svn.sourceforge.net/adminer/?rev=1484&view=rev
Author:   jakubvrana
Date:     2010-04-23 09:03:27 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
Driver specific INSERT INTO

Modified Paths:
--------------
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/edit.inc.php
    trunk/adminer/include/functions.inc.php

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-23 00:26:34 UTC (rev 1483)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-23 09:03:27 UTC (rev 1484)
@@ -680,6 +680,15 @@
 		);
 	}
 	
+	/** Insert data into table
+	* @param string
+	* @param array
+	* @return bool
+	*/
+	function insert_into($table, $set) {
+		return queries("INSERT INTO " . idf_escape($table) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")");
+	}
+	
 	/** Explain select
 	* @param Min_DB
 	* @param string

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-04-23 00:26:34 UTC (rev 1483)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-04-23 09:03:27 UTC (rev 1484)
@@ -440,6 +440,10 @@
 		);
 	}
 	
+	function insert_into($table, $set) {
+		return queries("INSERT INTO " . idf_escape($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
+	}
+	
 	function explain($connection, $query) {
 		return $connection->query("EXPLAIN $query");
 	}

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-23 00:26:34 UTC (rev 1483)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-23 09:03:27 UTC (rev 1484)
@@ -474,6 +474,10 @@
 		);
 	}
 	
+	function insert_into($table, $set) {
+		return queries("INSERT INTO " . idf_escape($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
+	}
+	
 	function explain($connection, $query) {
 		return $connection->query("EXPLAIN $query");
 	}

Modified: trunk/adminer/edit.inc.php
===================================================================
--- trunk/adminer/edit.inc.php	2010-04-23 00:26:34 UTC (rev 1483)
+++ trunk/adminer/edit.inc.php	2010-04-23 09:03:27 UTC (rev 1484)
@@ -31,7 +31,7 @@
 			}
 			query_redirect("UPDATE" . limit1(idf_escape($TABLE) . " SET" . implode(",", $set) . "\nWHERE $where"), $location, lang('Item has been updated.'));
 		} else {
-			query_redirect("INSERT INTO " . idf_escape($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")", $location, lang('Item has been inserted.'));
+			queries_redirect($location, lang('Item has been inserted.'), insert_into($TABLE, $set));
 		}
 	}
 }

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-23 00:26:34 UTC (rev 1483)
+++ trunk/adminer/include/functions.inc.php	2010-04-23 09:03:27 UTC (rev 1484)
@@ -193,12 +193,12 @@
 */
 function where($where) {
 	$return = array();
-	foreach (array("where", "null") as $type) {
-		foreach ((array) $where[$type] as $key => $val) {
-			$key = bracket_escape($key, "back");
-			$return[] = (preg_match('~^[A-Z0-9_]+\\(`(?:[^`]|``)+`\\)$~', $key) ? $key : idf_escape($key)) . ($type == "null" ? " IS NULL" : (ereg('\\.', $val) ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val))); // LIKE because of floats, but slow with ints //! enum and set, columns looking like functions
-		}
+	foreach ((array) $where["where"] as $key => $val) {
+		$return[] = idf_escape($key) . (ereg('\\.', $val) ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val)); // LIKE because of floats, but slow with ints //! enum and set
 	}
+	foreach ((array) $where["null"] as $key) {
+		$return[] = idf_escape($key) . " IS NULL";
+	}
 	return implode(" AND ", $return);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1485] trunk/adminer

From: <jakubvrana@us...> - 2010-04-23 09:04

Revision: 1485
          http://adminer.svn.sourceforge.net/adminer/?rev=1485&view=rev
Author:   jakubvrana
Date:     2010-04-23 09:04:05 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
MS SQL pagination

Modified Paths:
--------------
    trunk/adminer/drivers/mssql.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/drivers/mssql.inc.php
===================================================================
--- trunk/adminer/drivers/mssql.inc.php	2010-04-23 09:03:27 UTC (rev 1484)
+++ trunk/adminer/drivers/mssql.inc.php	2010-04-23 09:04:05 UTC (rev 1485)
@@ -125,6 +125,12 @@
 				$return->type = ($field["Type"] == 1 ? 254 : 0);
 				return $return;
 			}
+			
+			function seek($offset) {
+				for ($i=0; $i < $offset; $i++) {
+					sqlsrv_fetch($this->_result); // SQLSRV_SCROLL_ABSOLUTE added in sqlsrv 1.1
+				}
+			}
 
 			function __destruct() {
 				sqlsrv_free_stmt($this->_result);
@@ -216,6 +222,10 @@
 				return $return;
 			}
 
+			function seek($offset) {
+				mssql_data_seek($this->_result, $offset);
+			}
+			
 			function __destruct() {
 				mssql_free_result($this->_result);
 			}
@@ -242,10 +252,10 @@
 	}
 
 	function limit($query, $limit, $offset = 0) {
-		return (isset($limit) ? " TOP ($limit)" : "") . " $query"; //! offset
+		return (isset($limit) ? " TOP (" . ($limit + $offset) . ")" : "") . " $query"; // seek later
 	}
 
-	function limit1($query, $limit, $offset = 0) {
+	function limit1($query) {
 		return limit($query, 1);
 	}
 
@@ -297,7 +307,11 @@
 	function fields($table) {
 		global $connection;
 		$return = array();
-		$result = $connection->query("SELECT * FROM information_schema.COLUMNS WHERE TABLE_NAME = " . $connection->quote($table));
+		$result = $connection->query("SELECT i.*, c.is_identity
+FROM information_schema.COLUMNS i
+JOIN sys.columns c ON OBJECT_NAME(c.object_id) = i.TABLE_NAME AND c.name = i.COLUMN_NAME
+WHERE i.TABLE_NAME = " . $connection->quote($table)
+		);
 		while ($row = $result->fetch_assoc()) {
 			$return[$row["COLUMN_NAME"]] = array(
 				"field" => $row["COLUMN_NAME"],
@@ -306,9 +320,10 @@
 				"length" => $row["CHARACTER_MAXIMUM_LENGTH"], //! NUMERIC_, DATETIME_?
 				"default" => $row["COLUMN_DEFAULT"],
 				"null" => ($row["IS_NULLABLE"] == "YES"),
+				"auto_increment" => $row["is_identity"],
 				"collation" => $row["COLLATION_NAME"],
 				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
-				//! primary - is_identity in sys.columns
+				"primary" => $row["is_identity"], //! or indexes.is_primary_key
 			);
 		}
 		return $return;
@@ -371,13 +386,18 @@
 		if ($collation) {
 			queries("ALTER DATABASE " . idf_escape(DB) . " COLLATE " . idf_escape($collation));
 		}
-		return queries("ALTER DATABASE " . idf_escape(DB) . " MODIFY NAME = " . idf_escape($name)); //! false negative "The database name 'test2' has been set."
+		queries("ALTER DATABASE " . idf_escape(DB) . " MODIFY NAME = " . idf_escape($name));
+		return true; //! false negative "The database name 'test2' has been set."
 	}
 
 	function auto_increment() {
 		return " IDENTITY";
 	}
 	
+	function insert_into($table, $set) {
+		return queries("INSERT INTO " . idf_escape($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
+	}
+	
 	function explain($connection, $query) {
 		$connection->query("SET SHOWPLAN_ALL ON");
 		$return = $connection->query($query);

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-23 09:03:27 UTC (rev 1484)
+++ trunk/adminer/select.inc.php	2010-04-23 09:04:05 UTC (rev 1485)
@@ -189,6 +189,9 @@
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
+		if ($driver == "mssql") {
+			$result->seek($limit * $page);
+		}
 		$email_fields = array();
 		echo "<form action='' method='post' enctype='multipart/form-data'>\n";
 		$rows = array();
@@ -196,10 +199,12 @@
 			$rows[] = $row;
 		}
 		// use count($rows) without LIMIT, COUNT(*) without grouping, FOUND_ROWS otherwise (slowest)
-		$found_rows = (intval($limit) && $group && count($group) < count($select)
-			? ($driver == "sql" ? $connection->result(" SELECT FOUND_ROWS()") : $connection->result("SELECT COUNT(*) FROM ($query) x")) // space to allow mysql.trace_mode
-			: count($rows)
-		);
+		if ($_GET["page"] != "last") {
+			$found_rows = (intval($limit) && $group && count($group) < count($select)
+				? ($driver == "sql" ? $connection->result(" SELECT FOUND_ROWS()") : $connection->result("SELECT COUNT(*) FROM ($query) x")) // space to allow mysql.trace_mode
+				: count($rows)
+			);
+		}
 		
 		if (!$rows) {
 			echo "<p class='message'>" . lang('No rows.') . "\n";
@@ -296,7 +301,7 @@
 		
 		if ($rows || $page) {
 			$exact_count = true;
-			if (intval($limit) && count($group) >= count($select) && ($found_rows >= $limit || $page)) {
+			if ($_GET["page"] != "last" && intval($limit) && count($group) >= count($select) && ($found_rows >= $limit || $page)) {
 				$found_rows = $table_status["Rows"];
 				if (!isset($found_rows) || $where || 2 * $page * $limit > $found_rows || ($table_status["Engine"] == "InnoDB" && $found_rows < 1e4)) {
 					// slow with big tables


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1489] trunk/adminer

From: <jakubvrana@us...> - 2010-04-23 20:18

Revision: 1489
          http://adminer.svn.sourceforge.net/adminer/?rev=1489&view=rev
Author:   jakubvrana
Date:     2010-04-23 20:18:00 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
Separate static file handling

Modified Paths:
--------------
    trunk/adminer/include/bootstrap.inc.php

Added Paths:
-----------
    trunk/adminer/file.inc.php

Added: trunk/adminer/file.inc.php
===================================================================
--- trunk/adminer/file.inc.php	                        (rev 0)
+++ trunk/adminer/file.inc.php	2010-04-23 20:18:00 UTC (rev 1489)
@@ -0,0 +1,22 @@
+<?php
+header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
+if ($_GET["file"] == "favicon.ico") {
+	header("Content-Type: image/x-icon");
+	echo base64_decode("compile_file('../adminer/static/favicon.ico', 'base64_encode');");
+} elseif ($_GET["file"] == "default.css") {
+	header("Content-Type: text/css");
+	?>compile_file('../adminer/static/default.css', 'minify_css');<?php
+} elseif ($_GET["file"] == "functions.js") {
+	header("Content-Type: text/javascript");
+	?>compile_file('../adminer/static/functions.js', 'JSMin::minify');compile_file('static/editing.js', 'JSMin::minify');<?php
+} else {
+	header("Content-Type: image/gif");
+	switch ($_GET["file"]) {
+		case "plus.gif": echo base64_decode("compile_file('../adminer/static/plus.gif', 'base64_encode');"); break;
+		case "cross.gif": echo base64_decode("compile_file('../adminer/static/cross.gif', 'base64_encode');"); break;
+		case "up.gif": echo base64_decode("compile_file('../adminer/static/up.gif', 'base64_encode');"); break;
+		case "down.gif": echo base64_decode("compile_file('../adminer/static/down.gif', 'base64_encode');"); break;
+		case "arrow.gif": echo base64_decode("compile_file('../adminer/static/arrow.gif', 'base64_encode');"); break;
+	}
+}
+exit;

Modified: trunk/adminer/include/bootstrap.inc.php
===================================================================
--- trunk/adminer/include/bootstrap.inc.php	2010-04-23 15:27:27 UTC (rev 1488)
+++ trunk/adminer/include/bootstrap.inc.php	2010-04-23 20:18:00 UTC (rev 1489)
@@ -16,27 +16,7 @@
 
 // used only in compiled file
 if (isset($_GET["file"])) {
-	header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
-	if ($_GET["file"] == "favicon.ico") {
-		header("Content-Type: image/x-icon");
-		echo base64_decode("compile_file('../adminer/static/favicon.ico', 'base64_encode');");
-	} elseif ($_GET["file"] == "default.css") {
-		header("Content-Type: text/css");
-		?>compile_file('../adminer/static/default.css', 'minify_css');<?php
-	} elseif ($_GET["file"] == "functions.js") {
-		header("Content-Type: text/javascript");
-		?>compile_file('../adminer/static/functions.js', 'JSMin::minify');compile_file('static/editing.js', 'JSMin::minify');<?php
-	} else {
-		header("Content-Type: image/gif");
-		switch ($_GET["file"]) {
-			case "plus.gif": echo base64_decode("compile_file('../adminer/static/plus.gif', 'base64_encode');"); break;
-			case "cross.gif": echo base64_decode("compile_file('../adminer/static/cross.gif', 'base64_encode');"); break;
-			case "up.gif": echo base64_decode("compile_file('../adminer/static/up.gif', 'base64_encode');"); break;
-			case "down.gif": echo base64_decode("compile_file('../adminer/static/down.gif', 'base64_encode');"); break;
-			case "arrow.gif": echo base64_decode("compile_file('../adminer/static/arrow.gif', 'base64_encode');"); break;
-		}
-	}
-	exit;
+	include "../adminer/file.inc.php";
 }
 
 include "../adminer/include/functions.inc.php";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1490] trunk/adminer

From: <jakubvrana@us...> - 2010-04-23 23:49

Revision: 1490
          http://adminer.svn.sourceforge.net/adminer/?rev=1490&view=rev
Author:   jakubvrana
Date:     2010-04-23 23:49:21 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
Driver specific BEGIN

Modified Paths:
--------------
    trunk/adminer/drivers/mssql.inc.php
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/drivers/mssql.inc.php
===================================================================
--- trunk/adminer/drivers/mssql.inc.php	2010-04-23 20:18:00 UTC (rev 1489)
+++ trunk/adminer/drivers/mssql.inc.php	2010-04-23 23:49:21 UTC (rev 1490)
@@ -394,6 +394,10 @@
 		return " IDENTITY";
 	}
 	
+	function begin() {
+		return queries("BEGIN TRANSACTION");
+	}
+	
 	function insert_into($table, $set) {
 		return queries("INSERT INTO " . idf_escape($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
 	}

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-23 20:18:00 UTC (rev 1489)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-23 23:49:21 UTC (rev 1490)
@@ -680,6 +680,13 @@
 		);
 	}
 	
+	/** Begin transaction
+	* @return bool
+	*/
+	function begin() {
+		return queries("BEGIN");
+	}
+	
 	/** Insert data into table
 	* @param string
 	* @param array

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-04-23 20:18:00 UTC (rev 1489)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-04-23 23:49:21 UTC (rev 1490)
@@ -440,6 +440,10 @@
 		);
 	}
 	
+	function begin() {
+		return queries("BEGIN");
+	}
+	
 	function insert_into($table, $set) {
 		return queries("INSERT INTO " . idf_escape($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
 	}

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-23 20:18:00 UTC (rev 1489)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-23 23:49:21 UTC (rev 1490)
@@ -474,6 +474,10 @@
 		);
 	}
 	
+	function begin() {
+		return queries("BEGIN");
+	}
+	
 	function insert_into($table, $set) {
 		return queries("INSERT INTO " . idf_escape($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
 	}

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-23 20:18:00 UTC (rev 1489)
+++ trunk/adminer/select.inc.php	2010-04-23 23:49:21 UTC (rev 1490)
@@ -126,7 +126,7 @@
 			$cols = array_keys($fields);
 			preg_match_all('~(?>"[^"]*"|[^"\\r\\n]+)+~', $file, $matches);
 			$affected = count($matches[0]);
-			queries("START TRANSACTION");
+			begin();
 			$separator = ($_POST["separator"] == "csv" ? "," : ";");
 			foreach ($matches[0] as $key => $val) {
 				preg_match_all("~((\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
@@ -313,7 +313,7 @@
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
 						$h_value = h(isset($value) ? $value : $row[$key]);
-						$editable = is_utf8($val) && !strpos($val, "<em>...</em>");
+						$editable = is_utf8($val) && !strpos($val, "<em>...</em>"); //! function results, not unique key
 						$text = ereg('text|blob', $field["type"]);
 						echo (($_GET["modify"] && $editable) || isset($value)
 							? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1499] trunk/adminer

From: <jakubvrana@us...> - 2010-04-26 16:35

Revision: 1499
          http://adminer.svn.sourceforge.net/adminer/?rev=1499&view=rev
Author:   jakubvrana
Date:     2010-04-26 16:22:58 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
Use bracket_escape function

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-26 16:22:24 UTC (rev 1498)
+++ trunk/adminer/include/functions.inc.php	2010-04-26 16:22:58 UTC (rev 1499)
@@ -209,7 +209,9 @@
 function where($where) {
 	$return = array();
 	foreach ((array) $where["where"] as $key => $val) {
-		$return[] = idf_escape($key) . (ereg('\\.', $val) ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val)); // LIKE because of floats, but slow with ints //! enum and set
+		$return[] = idf_escape(bracket_escape($key, 1)) // 1 - back
+			. (ereg('\\.', $val) ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val)) // LIKE because of floats, but slow with ints
+		; //! enum and set
 	}
 	foreach ((array) $where["null"] as $key) {
 		$return[] = idf_escape($key) . " IS NULL";

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-26 16:22:24 UTC (rev 1498)
+++ trunk/adminer/select.inc.php	2010-04-26 16:22:58 UTC (rev 1499)
@@ -111,8 +111,8 @@
 			foreach ($_POST["val"] as $unique_idf => $row) {
 				$set = array();
 				foreach ($row as $key => $val) {
-					$key = bracket_escape($key, 1);
-					$set[] = idf_escape($key) . " = " . $connection->quote($adminer->editVal($val, $fields[$key])); // 1 - back
+					$key = bracket_escape($key, 1); // 1 - back
+					$set[] = idf_escape($key) . " = " . $connection->quote($adminer->editVal($val, $fields[$key]));
 				}
 				$result = queries("UPDATE" . limit1(idf_escape($TABLE) . " SET " . implode(", ", $set) . " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : ""))); // can change row on a different page without unique key
 				if (!$result) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1496] trunk/adminer

From: <jakubvrana@us...> - 2010-04-26 16:35

Revision: 1496
          http://adminer.svn.sourceforge.net/adminer/?rev=1496&view=rev
Author:   jakubvrana
Date:     2010-04-26 16:20:39 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
Always handle double click

Modified Paths:
--------------
    trunk/adminer/lang/cs.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/lang/cs.inc.php
===================================================================
--- trunk/adminer/lang/cs.inc.php	2010-04-26 16:19:59 UTC (rev 1495)
+++ trunk/adminer/lang/cs.inc.php	2010-04-26 16:20:39 UTC (rev 1496)
@@ -232,7 +232,9 @@
 	'last' => 'poslední',
 	'Network' => 'Síť',
 	'Geometry' => 'Geometrie',
-	'Double click on a field to edit it.' => 'Dvojklikněte na políčko, které chcete editovat.',
 	'Databases have been dropped.' => 'Databáze byly odstraněny.',
 	'File exists.' => 'Soubor existuje.',
+	'Double click on a value to modify it.' => 'Dvojklikněte na políčko, které chcete změnit.',
+	'Increase text length to modify this value.' => 'Ke změně této hodnoty zvyšte délku textů.',
+	'Use edit link to modify this value.' => 'Ke změně této hodnoty použijte odkaz upravit.',
 );

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-26 16:19:59 UTC (rev 1495)
+++ trunk/adminer/select.inc.php	2010-04-26 16:20:39 UTC (rev 1496)
@@ -111,9 +111,10 @@
 			foreach ($_POST["val"] as $unique_idf => $row) {
 				$set = array();
 				foreach ($row as $key => $val) {
-					$set[] = idf_escape(bracket_escape($key, 1)) . " = " . $connection->quote($val); // 1 - back //! $adminer->editVal($val)
+					$key = bracket_escape($key, 1);
+					$set[] = idf_escape($key) . " = " . $connection->quote($adminer->editVal($val, $fields[$key])); // 1 - back
 				}
-				$result = queries("UPDATE " . idf_escape($TABLE) . " SET " . implode(", ", $set) . " WHERE " . where_check($unique_idf));
+				$result = queries("UPDATE" . limit1(idf_escape($TABLE) . " SET " . implode(", ", $set) . " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : ""))); // can change row on a different page without unique key
 				if (!$result) {
 					break;
 				}
@@ -229,6 +230,7 @@
 			echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);'>\n";
 			echo "<thead><tr><td><input type='checkbox' id='all-page' onclick='formCheck(this, /check/);'> <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('edit') . "</a>";
 			$names = array();
+			$functions = array();
 			reset($select);
 			$order = 1;
 			foreach ($rows[0] as $key => $val) {
@@ -240,6 +242,7 @@
 					$names[$key] = $name;
 					echo '<th><a href="' . h(remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key) . ($_GET["order"][0] == $key && !$_GET["desc"][0] ? '&desc%5B0%5D=1' : '')) . '">' . apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
 				}
+				$functions[$key] = $val["fun"];
 				next($select);
 			}
 			$lengths = array();
@@ -313,11 +316,12 @@
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
 						$h_value = h(isset($value) ? $value : $row[$key]);
-						$editable = is_utf8($val) && !strpos($val, "<em>...</em>"); //! function results, not unique key
+						$long = strpos($val, "<em>...</em>");
+						$editable = is_utf8($val) && !$long && $rows[$n][$key] == $row[$key] && !$functions[$key];
 						$text = ereg('text|blob', $field["type"]);
 						echo (($_GET["modify"] && $editable) || isset($value)
 							? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
-							: "<td id='$id'" . ($editable ? " ondblclick='selectDblClick(this, event" . ($text ? ", 1" : "") . ");'" : "") . ">" . $adminer->selectVal($val, $link, $field)
+							: "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($text ? ", 1" : "") . ")" : "alert('" . ($long ? lang('Increase text length to modify this value.') : lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
 						);
 					}
 				}
@@ -357,7 +361,7 @@
 			if (!information_schema(DB)) {
 				?>
 <fieldset><legend><?php echo lang('Edit'); ?></legend><div>
-<input type="submit" value="<?php echo lang('Save'); ?>"<?php if (!$_GET["modify"] && !$_POST["val"]) { ?> onclick="if (!selectDblClicked) { alert('<?php echo lang('Double click on a field to edit it.'); ?>'); return false; };"<?php } ?>>
+<input type="submit" value="<?php echo lang('Save'); ?>"<?php if (!$_GET["modify"] && !$_POST["val"]) { ?> onclick="if (!selectDblClicked) { alert('<?php echo lang('Double click on a value to modify it.'); ?>'); return false; };"<?php } ?>>
 <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
 <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
 <input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? <?php echo $found_rows; ?> : formChecked(this, /check/)) + ')');">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1494] trunk/adminer

From: <jakubvrana@us...> - 2010-04-26 16:35

Revision: 1494
          http://adminer.svn.sourceforge.net/adminer/?rev=1494&view=rev
Author:   jakubvrana
Date:     2010-04-26 16:19:26 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
LIMIT separator

Modified Paths:
--------------
    trunk/adminer/drivers/mssql.inc.php
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/drivers/mssql.inc.php
===================================================================
--- trunk/adminer/drivers/mssql.inc.php	2010-04-25 07:25:55 UTC (rev 1493)
+++ trunk/adminer/drivers/mssql.inc.php	2010-04-26 16:19:26 UTC (rev 1494)
@@ -251,7 +251,7 @@
 		return get_vals("EXEC sp_databases");
 	}
 
-	function limit($query, $limit, $offset = 0) {
+	function limit($query, $limit, $offset = 0, $separator = " ") {
 		return (isset($limit) ? " TOP (" . ($limit + $offset) . ")" : "") . " $query"; // seek later
 	}
 

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-25 07:25:55 UTC (rev 1493)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-26 16:19:26 UTC (rev 1494)
@@ -260,10 +260,11 @@
 	* @param string everything after SELECT
 	* @param int
 	* @param int
+	* @param string
 	* @return string
 	*/
-	function limit($query, $limit, $offset = 0) {
-		return " $query" . (isset($limit) ? "\nLIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+	function limit($query, $limit, $offset = 0, $separator = " ") {
+		return " $query" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
 	/** Formulate SQL modification query with limit 1

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-04-25 07:25:55 UTC (rev 1493)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-04-26 16:19:26 UTC (rev 1494)
@@ -163,8 +163,8 @@
 		return get_vals("SELECT datname FROM pg_database");
 	}
 	
-	function limit($query, $limit, $offset = 0) {
-		return " $query" . (isset($limit) ? "\nLIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+	function limit($query, $limit, $offset = 0, $separator = " ") {
+		return " $query" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
 	function limit1($query) {

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-25 07:25:55 UTC (rev 1493)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-26 16:19:26 UTC (rev 1494)
@@ -211,8 +211,8 @@
 		return array();
 	}
 
-	function limit($query, $limit, $offset = 0) {
-		return " $query" . (isset($limit) ? "\nLIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+	function limit($query, $limit, $offset = 0, $separator = " ") {
+		return " $query" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
 	function limit1($query) {

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-25 07:25:55 UTC (rev 1493)
+++ trunk/adminer/select.inc.php	2010-04-26 16:19:26 UTC (rev 1494)
@@ -197,7 +197,7 @@
 		$page = floor(($found_rows - 1) / $limit);
 	}
 
-	$query = "SELECT" . limit((intval($limit) && $group && count($group) < count($select) && $driver == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by, ($limit != "" ? intval($limit) : null), ($page ? $limit * $page : 0));
+	$query = "SELECT" . limit((intval($limit) && $group && count($group) < count($select) && $driver == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by, ($limit != "" ? intval($limit) : null), ($page ? $limit * $page : 0), "\n");
 	echo $adminer->selectQuery($query);
 	
 	$result = $connection->query($query);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1507] trunk/adminer

From: <jakubvrana@us...> - 2010-04-28 00:10

Revision: 1507
          http://adminer.svn.sourceforge.net/adminer/?rev=1507&view=rev
Author:   jakubvrana
Date:     2010-04-28 00:10:30 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
Display routine parameter type in title (thanks to paranoiq)

Modified Paths:
--------------
    trunk/adminer/call.inc.php
    trunk/adminer/include/editing.inc.php

Modified: trunk/adminer/call.inc.php
===================================================================
--- trunk/adminer/call.inc.php	2010-04-27 15:57:15 UTC (rev 1506)
+++ trunk/adminer/call.inc.php	2010-04-28 00:10:30 UTC (rev 1507)
@@ -55,7 +55,7 @@
 	foreach ($in as $key) {
 		$field = $routine["fields"][$key];
 		$name = $field["field"];
-		echo "<tr><th>" . h($name);
+		echo "<tr><th>" . $adminer->fieldName($field);
 		$value = $_POST["fields"][$name];
 		if ($value != "" && ereg("enum|set", $field["type"])) {
 			$value = intval($value);

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2010-04-27 15:57:15 UTC (rev 1506)
+++ trunk/adminer/include/editing.inc.php	2010-04-28 00:10:30 UTC (rev 1507)
@@ -288,7 +288,7 @@
 function routine($name, $type) {
 	global $connection, $enum_length, $inout, $types;
 	$aliases = array("bit" => "tinyint", "bool" => "tinyint", "boolean" => "tinyint", "integer" => "int", "double precision" => "float", "real" => "float", "dec" => "decimal", "numeric" => "decimal", "fixed" => "decimal", "national char" => "char", "national varchar" => "varchar");
-	$type_pattern = "(" . implode("|", array_keys($types + $aliases)) . ")(?:\\s*\\(((?:[^'\")]*|$enum_length)+)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
+	$type_pattern = "((" . implode("|", array_keys($types + $aliases)) . ")(?:\\s*\\(((?:[^'\")]*|$enum_length)+)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
 	$pattern = "\\s*(" . ($type == "FUNCTION" ? "" : implode("|", $inout)) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
 	$create = $connection->result("SHOW CREATE $type " . idf_escape($name), 2);
 	preg_match("~\\(((?:$pattern\\s*,?)*)\\)" . ($type == "FUNCTION" ? "\\s*RETURNS\\s+$type_pattern" : "") . "\\s*(.*)~is", $create, $match);
@@ -296,21 +296,25 @@
 	preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
 	foreach ($matches as $param) {
 		$name = str_replace("``", "`", $param[2]) . $param[3];
-		$data_type = strtolower($param[4]);
+		$data_type = strtolower($param[5]);
 		$fields[] = array(
 			"field" => $name,
 			"type" => (isset($aliases[$data_type]) ? $aliases[$data_type] : $data_type),
-			"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[5]),
-			"unsigned" => strtolower(preg_replace('~\\s+~', ' ', trim("$param[7] $param[6]"))),
+			"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
+			"unsigned" => strtolower(preg_replace('~\\s+~', ' ', trim("$param[8] $param[7]"))),
+			"full_type" => $param[4],
 			"inout" => strtoupper($param[1]),
-			"collation" => strtolower($param[8]),
+			"collation" => strtolower($param[9]),
 		);
 	}
 	if ($type != "FUNCTION") {
-		return array("fields" => $fields, "definition" => $match[10]);
+		return array("fields" => $fields, "definition" => $match[11]);
 	}
-	$returns = array("type" => $match[10], "length" => $match[11], "unsigned" => $match[13], "collation" => $match[14]);
-	return array("fields" => $fields, "returns" => $returns, "definition" => $match[15]);
+	return array(
+		"fields" => $fields,
+		"returns" => array("type" => $match[12], "length" => $match[13], "unsigned" => $match[15], "collation" => $match[16]),
+		"definition" => $match[17],
+	);
 }
 
 /** Issue grant or revoke commands


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1508] trunk/adminer

From: <jakubvrana@us...> - 2010-04-28 00:11

Revision: 1508
          http://adminer.svn.sourceforge.net/adminer/?rev=1508&view=rev
Author:   jakubvrana
Date:     2010-04-28 00:11:39 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
Driver specific routines

Modified Paths:
--------------
    trunk/adminer/db.inc.php
    trunk/adminer/drivers/mysql.inc.php
    trunk/adminer/drivers/sqlite.inc.php
    trunk/adminer/include/editing.inc.php

Modified: trunk/adminer/db.inc.php
===================================================================
--- trunk/adminer/db.inc.php	2010-04-28 00:10:30 UTC (rev 1507)
+++ trunk/adminer/db.inc.php	2010-04-28 00:11:39 UTC (rev 1508)
@@ -94,12 +94,12 @@
 }
 if (support("routine")) {
 	echo "<h3>" . lang('Routines') . "</h3>\n";
-	$result = $connection->query("SELECT * FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . $connection->quote(DB));
-	if ($result->num_rows) {
-		odd('');
+	$routines = routines();
+	if ($routines) {
 		echo "<table cellspacing='0'>\n";
 		echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td>&nbsp;</thead>\n";
-		while ($row = $result->fetch_assoc()) {
+		odd('');
+		foreach ($routines as $row) {
 			echo '<tr' . odd() . '>';
 			echo '<th><a href="' . h(ME) . ($row["ROUTINE_TYPE"] == "FUNCTION" ? 'callf=' : 'call=') . urlencode($row["ROUTINE_NAME"]) . '">' . h($row["ROUTINE_NAME"]) . '</a>';
 			echo '<td>' . h($row["ROUTINE_TYPE"]);

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-04-28 00:10:30 UTC (rev 1507)
+++ trunk/adminer/drivers/mysql.inc.php	2010-04-28 00:11:39 UTC (rev 1508)
@@ -681,6 +681,53 @@
 		);
 	}
 	
+	/** Get information about stored routine
+	* @param string
+	* @param string FUNCTION or PROCEDURE
+	* @return array ("fields" => array("field" => , "type" => , "length" => , "unsigned" => , "inout" => , "collation" => ), "returns" => , "definition" => )
+	*/
+	function routine($name, $type) {
+		global $connection, $enum_length, $inout, $types;
+		$aliases = array("bit" => "tinyint", "bool" => "tinyint", "boolean" => "tinyint", "integer" => "int", "double precision" => "float", "real" => "float", "dec" => "decimal", "numeric" => "decimal", "fixed" => "decimal", "national char" => "char", "national varchar" => "varchar");
+		$type_pattern = "((" . implode("|", array_keys($types + $aliases)) . ")(?:\\s*\\(((?:[^'\")]*|$enum_length)+)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
+		$pattern = "\\s*(" . ($type == "FUNCTION" ? "" : implode("|", $inout)) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
+		$create = $connection->result("SHOW CREATE $type " . idf_escape($name), 2);
+		preg_match("~\\(((?:$pattern\\s*,?)*)\\)" . ($type == "FUNCTION" ? "\\s*RETURNS\\s+$type_pattern" : "") . "\\s*(.*)~is", $create, $match);
+		$fields = array();
+		preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
+		foreach ($matches as $param) {
+			$name = str_replace("``", "`", $param[2]) . $param[3];
+			$data_type = strtolower($param[5]);
+			$fields[] = array(
+				"field" => $name,
+				"type" => (isset($aliases[$data_type]) ? $aliases[$data_type] : $data_type),
+				"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
+				"unsigned" => strtolower(preg_replace('~\\s+~', ' ', trim("$param[8] $param[7]"))),
+				"full_type" => $param[4],
+				"inout" => strtoupper($param[1]),
+				"collation" => strtolower($param[9]),
+			);
+		}
+		if ($type != "FUNCTION") {
+			return array("fields" => $fields, "definition" => $match[11]);
+		}
+		return array(
+			"fields" => $fields,
+			"returns" => array("type" => $match[12], "length" => $match[13], "unsigned" => $match[15], "collation" => $match[16]),
+			"definition" => $match[17],
+		);
+	}
+	
+	function routines() {
+		global $connection;
+		$return = array();
+		$result = $connection->query("SELECT * FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . $connection->quote(DB));
+		while ($row = $result->fetch_assoc()) {
+			$return[] = $row;
+		}
+		return $return;
+	}
+	
 	/** Begin transaction
 	* @return bool
 	*/

Modified: trunk/adminer/drivers/sqlite.inc.php
===================================================================
--- trunk/adminer/drivers/sqlite.inc.php	2010-04-28 00:10:30 UTC (rev 1507)
+++ trunk/adminer/drivers/sqlite.inc.php	2010-04-28 00:11:39 UTC (rev 1508)
@@ -474,6 +474,14 @@
 		);
 	}
 	
+	function routine($name, $type) {
+		// not supported by SQLite
+	}
+	
+	function routines() {
+		// not supported by SQLite
+	}
+	
 	function begin() {
 		return queries("BEGIN");
 	}

Modified: trunk/adminer/include/editing.inc.php
===================================================================
--- trunk/adminer/include/editing.inc.php	2010-04-28 00:10:30 UTC (rev 1507)
+++ trunk/adminer/include/editing.inc.php	2010-04-28 00:11:39 UTC (rev 1508)
@@ -280,43 +280,6 @@
 	return "'" . str_replace("'", "''", addcslashes(stripcslashes(str_replace($match[0][0] . $match[0][0], $match[0][0], substr($match[0], 1, -1))), '\\')) . "'";
 }
 
-/** Get information about stored routine
-* @param string
-* @param string FUNCTION or PROCEDURE
-* @return array ("fields" => array("field" => , "type" => , "length" => , "unsigned" => , "inout" => , "collation" => ), "returns" => , "definition" => )
-*/
-function routine($name, $type) {
-	global $connection, $enum_length, $inout, $types;
-	$aliases = array("bit" => "tinyint", "bool" => "tinyint", "boolean" => "tinyint", "integer" => "int", "double precision" => "float", "real" => "float", "dec" => "decimal", "numeric" => "decimal", "fixed" => "decimal", "national char" => "char", "national varchar" => "varchar");
-	$type_pattern = "((" . implode("|", array_keys($types + $aliases)) . ")(?:\\s*\\(((?:[^'\")]*|$enum_length)+)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
-	$pattern = "\\s*(" . ($type == "FUNCTION" ? "" : implode("|", $inout)) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
-	$create = $connection->result("SHOW CREATE $type " . idf_escape($name), 2);
-	preg_match("~\\(((?:$pattern\\s*,?)*)\\)" . ($type == "FUNCTION" ? "\\s*RETURNS\\s+$type_pattern" : "") . "\\s*(.*)~is", $create, $match);
-	$fields = array();
-	preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
-	foreach ($matches as $param) {
-		$name = str_replace("``", "`", $param[2]) . $param[3];
-		$data_type = strtolower($param[5]);
-		$fields[] = array(
-			"field" => $name,
-			"type" => (isset($aliases[$data_type]) ? $aliases[$data_type] : $data_type),
-			"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
-			"unsigned" => strtolower(preg_replace('~\\s+~', ' ', trim("$param[8] $param[7]"))),
-			"full_type" => $param[4],
-			"inout" => strtoupper($param[1]),
-			"collation" => strtolower($param[9]),
-		);
-	}
-	if ($type != "FUNCTION") {
-		return array("fields" => $fields, "definition" => $match[11]);
-	}
-	return array(
-		"fields" => $fields,
-		"returns" => array("type" => $match[12], "length" => $match[13], "unsigned" => $match[15], "collation" => $match[16]),
-		"definition" => $match[17],
-	);
-}
-
 /** Issue grant or revoke commands
 * @param string GRANT or REVOKE
 * @param array


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1520] trunk/adminer

From: <jakubvrana@us...> - 2010-05-05 16:29

Revision: 1520
          http://adminer.svn.sourceforge.net/adminer/?rev=1520&view=rev
Author:   jakubvrana
Date:     2010-05-05 16:29:17 +0000 (Wed, 05 May 2010)

Log Message:
-----------
Clear cache only for MySQL

Modified Paths:
--------------
    trunk/adminer/database.inc.php
    trunk/adminer/drivers/mysql.inc.php

Modified: trunk/adminer/database.inc.php
===================================================================
--- trunk/adminer/database.inc.php	2010-05-05 16:28:37 UTC (rev 1519)
+++ trunk/adminer/database.inc.php	2010-05-05 16:29:17 UTC (rev 1520)
@@ -2,11 +2,9 @@
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
 	restart_session();
 	if ($_POST["drop"]) {
-		set_session("databases", null);
 		queries_redirect(remove_from_uri("db|database"), lang('Database has been dropped.'), drop_databases(array(DB)));
 	} elseif (DB !== $_POST["name"]) {
 		// create or rename database
-		set_session("databases", null); // clear cache
 		if (DB != "") {
 			queries_redirect(preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), rename_database($_POST["name"], $_POST["collation"]));
 		} else {

Modified: trunk/adminer/drivers/mysql.inc.php
===================================================================
--- trunk/adminer/drivers/mysql.inc.php	2010-05-05 16:28:37 UTC (rev 1519)
+++ trunk/adminer/drivers/mysql.inc.php	2010-05-05 16:29:17 UTC (rev 1520)
@@ -506,6 +506,7 @@
 	* @return string
 	*/
 	function create_database($db, $collation) {
+		set_session("databases", null);
 		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . $connection->quote($collation) : ""));
 	}
 	
@@ -514,6 +515,7 @@
 	* @return bool
 	*/
 	function drop_databases($databases) {
+		set_session("databases", null);
 		foreach ($databases as $db) {
 			if (!queries("DROP DATABASE " . idf_escape($db))) {
 				return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[adminer-svn] SF.net SVN: adminer:[1522] trunk/adminer

From: <jakubvrana@us...> - 2010-05-05 16:31

Revision: 1522
          http://adminer.svn.sourceforge.net/adminer/?rev=1522&view=rev
Author:   jakubvrana
Date:     2010-05-05 16:31:39 +0000 (Wed, 05 May 2010)

Log Message:
-----------
PostgreSQL variables

Modified Paths:
--------------
    trunk/adminer/drivers/pgsql.inc.php
    trunk/adminer/static/editing.js

Modified: trunk/adminer/drivers/pgsql.inc.php
===================================================================
--- trunk/adminer/drivers/pgsql.inc.php	2010-05-05 16:30:55 UTC (rev 1521)
+++ trunk/adminer/drivers/pgsql.inc.php	2010-05-05 16:31:39 UTC (rev 1522)
@@ -470,8 +470,12 @@
 		return "\connect " . idf_escape($database);
 	}
 	
+	function show_variables() {
+		return get_key_vals("SHOW ALL");
+	}
+	
 	function support($feature) {
-		return ereg('^(comment|view|scheme|trigger|drop_col)$', $feature); //! routine|sequence|
+		return ereg('^(comment|view|scheme|trigger|variables|drop_col)$', $feature); //! routine|sequence|
 	}
 	
 	$driver = "pgsql";

Modified: trunk/adminer/static/editing.js
===================================================================
--- trunk/adminer/static/editing.js	2010-05-05 16:30:55 UTC (rev 1521)
+++ trunk/adminer/static/editing.js	2010-05-05 16:31:39 UTC (rev 1522)
@@ -10,10 +10,13 @@
 	script.onload = function () {
 		if (window.jush) { // IE runs in case of an error too
 			jush.create_links = ' target="_blank"';
-			jush.urls.pgsql[0] = 'http://www.postgresql.org/docs/' + version + '/static/$key';
 			jush.urls.sql[0] = 'http://dev.mysql.com/doc/refman/' + version + '/en/$key';
+			jush.urls.sql_sqlset = jush.urls.sql[0];
 			jush.urls.sqlset[0] = jush.urls.sql[0];
 			jush.urls.sqlstatus[0] = jush.urls.sql[0];
+			jush.urls.pgsql[0] = 'http://www.postgresql.org/docs/' + version + '/static/$key';
+			jush.urls.pgsql_pgsqlset = jush.urls.pgsql[0];
+			jush.urls.pgsqlset[0] = 'http://www.postgresql.org/docs/' + version + '/static/runtime-config-$key.html#GUC-$1';
 			jush.style(jushRoot + 'jush.css');
 			if (window.jushLinks) {
 				jush.custom_links = jushLinks;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.