Permalink
Browse files

Function process_length used only in Adminer

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@916 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information...
jakubvrana
jakubvrana committed Jul 27, 2009
1 parent d24ad78 commit f93c84e4d877ffb57b341d1269ee3149c5463752
@@ -82,7 +82,6 @@
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.'))
@@ -29,6 +29,11 @@ function edit_type($key, $field, $collations, $foreign_keys = array()) {
<?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]"
@@ -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;
View
@@ -8,6 +8,7 @@
include "./include/bootstrap.inc.php";
+$enum_length = '\'(?:\'\'|[^\'\\\\]+|\\\\.)*\'|"(?:""|[^"\\\\]+|\\\\.)*"';
$inout = array("IN", "OUT", "INOUT");
if (isset($_GET["download"])) {

0 comments on commit f93c84e

Please sign in to comment.