From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 9 Jul 2007 08:24:51 +0000 (+0200)
Subject: Handle URL field RFC conform
X-Git-Tag: 0.7.1~41
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=32fe4e71311225eb8a58f85c7ac00b14da9ca1d4;p=contagged

Handle URL field RFC conform

RCF 2079 specifies a value that contains a URL followed by white
space and then a human readable string.

The template now supports that.

darcs-hash:20070709082451-6e07b-571a3a7111aadf0b0b3bee7fa57c063bdc48fea9.gz
---

diff --git a/inc/smarty/plugins/modifier.http.php b/inc/smarty/plugins/modifier.http.php
index a3fffbc..ecb52e7 100644
--- a/inc/smarty/plugins/modifier.http.php
+++ b/inc/smarty/plugins/modifier.http.php
@@ -10,9 +10,7 @@
  * Smarty plugin
  *
  * Type:     modifier
- * Name:     noteparser
  * Date:     2007-06-19
- * Purpose:  Add the http:// protocol if missing
  * Example:  {$foo|http}
  * @author   Andreas Gohr <gohr@cosmocode.de>
  * @param string
@@ -21,11 +19,16 @@
 function smarty_modifier_http($string){
     if(!$string) return '';
 
-    if(!preg_match('#^\w+://#',$string)){
-        $string = 'http://'.$string;
+    list($url,$name) = explode(' ',$string,2);
+
+
+    if(!preg_match('#^\w+://#',$url)){
+        $url = 'http://'.$url;
     }
 
-    return $string;
+    if(!$name) $name = $url;
+
+    return '<a href="'.htmlspecialchars($url).'" target="_blank">'.htmlspecialchars($name).'</a>';
 }
 
 /* vim: set expandtab: */
diff --git a/templates/entry_show.tpl b/templates/entry_show.tpl
index 18cc419..25c2b61 100644
--- a/templates/entry_show.tpl
+++ b/templates/entry_show.tpl
@@ -141,7 +141,7 @@
 {if $entry.url}
           <tr>
             <th>{$lang.url}:</th>
-            <td><a href="{$entry.url|http}" target="_blank">{$entry.url|h}</a></td>
+            <td>{$entry.url|http}</td>
           </tr>
 {/if}
 {if $entry.mail}