Link URLs in select

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1163 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index cf3133251142b2125ce7e3f3e75ecbaafdf11c3a..53bc9e9f2c3a84c467a6686d8e36f9287dd87f97 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -501,6 +501,15 @@ function is_email($email) {
        return eregi("^$atom+(\\.$atom+)*@($domain?\\.)+$domain\$", $email);
 }
 
+/** Check whether the string is URL address
+* @param string
+* @return bool
+*/
+function is_url($string) {
+       $domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
+       return preg_match("~^https?://($domain?\\.)+$domain(:[0-9]+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string); //! restrict path, query and fragment characters
+}
+
 /** Print header for hidden fieldset (close by </div></fieldset>)
 * @param string
 * @param string

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index ceca596c2e601a6b038d8a370b987caddf9ea559..d78ac68e9c3493769d95753c3aa23c7b33038d82 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -232,6 +232,9 @@ if (!$columns) {
                                                if (!$link && is_email($val)) {
                                                        $link = "mailto:$val";
                                                }
+                                               if (!$link && is_url($val)) {
+                                                       $link = "http://www.adminer.org/redirect/?url=" . urlencode($val); // intermediate page to hide Referer
+                                               }
                                                $val = $adminer->selectVal($val, $link, $field);
                                                echo "<td>$val";
                                        }

diff --git a/changes.txt b/changes.txt
index 4eef390b33079658ecab969b25bdc4aeed66ae24..d351bc9e1990ec097652c194fd576ecd87856e71 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,8 +1,9 @@
 Adminer 2.1.1-dev:
 Display table links above table structure
+Link URLs in select
+Display number of manipulated rows in JS confirm
 Fix removed default in ALTER
 Display whitespace in texts (bug #2858042)
-Display number of manipulated rows in JS confirm
 ClickJacking protection in modern browsers
 E-mail attachments (Editor)
 Optional year in date (Editor)