From f93c84e4d877ffb57b341d1269ee3149c5463752 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Mon, 27 Jul 2009 15:31:11 +0000
Subject: [PATCH] Function process_length used only in Adminer

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@916 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/include/bootstrap.inc.php | 1 -
 adminer/include/editing.inc.php   | 5 +++++
 adminer/include/functions.inc.php | 5 -----
 adminer/index.php                 | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 15f212c2..5aa4a932 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -82,7 +82,6 @@ include "./include/editing.inc.php";
 include "./include/export.inc.php";
 
 $confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\"";
-$enum_length = '\'(?:\'\'|[^\'\\\\]+|\\\\.)*\'|"(?:""|[^"\\\\]+|\\\\.)*"';
 $token = $_SESSION["tokens"][$_GET["server"]];
 $error = ($_POST
 	? ($_POST["token"] == $token ? "" : lang('Invalid CSRF token. Send the form again.'))
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 948461e2..9202a43e 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -29,6 +29,11 @@ echo ($unsigned ? " <select name=\"$key" . '[unsigned]"' . (!$field["type"] || e
 <?php
 }
 
+function process_length($length) {
+	global $enum_length;
+	return (preg_match("~^\\s*(?:$enum_length)(?:\\s*,\\s*(?:$enum_length))*\\s*\$~", $length) && preg_match_all("~$enum_length~", $length, $matches) ? implode(",", $matches[0]) : preg_replace('~[^0-9,+-]~', '', $length));
+}
+
 function process_type($field, $collate = "COLLATE") {
 	global $dbh, $enum_length, $unsigned;
 	return " $field[type]"
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 3228b63f..674f4ce5 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -97,11 +97,6 @@ function where_link($i, $column, $value) {
 	return "&amp;where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&amp;where%5B$i%5D%5Bop%5D=%3D&amp;where%5B$i%5D%5Bval%5D=" . urlencode($value);
 }
 
-function process_length($length) {
-	global $enum_length;
-	return (preg_match("~^\\s*(?:$enum_length)(?:\\s*,\\s*(?:$enum_length))*\\s*\$~", $length) && preg_match_all("~$enum_length~", $length, $matches) ? implode(",", $matches[0]) : preg_replace('~[^0-9,+-]~', '', $length));
-}
-
 function redirect($location, $message = null) {
 	if (isset($message)) {
 		$_SESSION["messages"][] = $message;
diff --git a/adminer/index.php b/adminer/index.php
index 73a96b23..3e445478 100644
--- a/adminer/index.php
+++ b/adminer/index.php
@@ -8,6 +8,7 @@
 
 include "./include/bootstrap.inc.php";
 
+$enum_length = '\'(?:\'\'|[^\'\\\\]+|\\\\.)*\'|"(?:""|[^"\\\\]+|\\\\.)*"';
 $inout = array("IN", "OUT", "INOUT");
 
 if (isset($_GET["download"])) {