closes wish #517, url catcher

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@996 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/modules/events.php b/modules/events.php
index e6fe25f..7e90996 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -169,8 +169,12 @@ class EventsModule extends PLModule
         $valid_mesg = Post::v('valid_mesg');
         $action     = Post::v('action');
 
+       require_once('url_catcher.inc.php');
+               $texte_catch_url = url_catcher($texte);
+               
         $page->assign('titre', $titre);
         $page->assign('texte', $texte);
+        $page->assign('texte_html', $texte_catch_url);
         $page->assign('promo_min', $promo_min);
         $page->assign('promo_max', $promo_max);
         $page->assign('peremption', $peremption);
@@ -178,10 +182,7 @@ class EventsModule extends PLModule
         $page->assign('action', strtolower($action));
 
         if ($action == 'Confirmer') {
-            $texte = preg_replace('/((?:https?|ftp):\/\/(?:\.*,*[a-z@0-9~%$£µ&i#\-+=_\/\?])*)/i',
-                                  '<a href="\\0">\\0</a>', $texte);
-            $texte = preg_replace('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i',
-                                  '<a href="mailto:\\0">\\0</a>', $texte);
+               $texte = $texte_catch_url;
             require_once 'validations.inc.php';
             $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
                                  $peremption, $valid_mesg, S::v('uid'));

diff --git a/templates/evenements.tpl b/templates/evenements.tpl
index 3eab79f..0f6f1c2 100644 (file)
--- a/templates/evenements.tpl
+++ b/templates/evenements.tpl
@@ -30,7 +30,7 @@ Voici ton annonce :
 
 <table class="bicol">
   <tr><th>{$titre|nl2br}</th></tr>
-  <tr><td>{$texte|nl2br}</td></tr>
+  <tr><td>{$texte_html|nl2br|smarty:nodefaults}</td></tr>
 </table>
 
 <p>