X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=71204b7a7a0368d1fcd26fc00235f962783224f0;hb=d655dba1a05100bdd309200eb20409e848abf98c;hp=cd4bc6bbd09a82e2e1260cef59e6322334ed515d;hpb=9bb8bf21cfc5b5f47805cd54d64cfeae75ce1de3;p=platal.git

diff --git a/modules/profile.php b/modules/profile.php
index cd4bc6b..71204b7 100644
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -186,13 +186,25 @@ class ProfileModule extends PLModule
         }
 
         if (empty($login)) {
+            if (preg_match('/([-a-z]+)\.([-a-z]+)\.([0-9]{4})/i', $x, $matches)) {
+                $matches = str_replace('-', '_', $matches);
+                $res = XDB::query("SELECT user_id
+                                     FROM auth_user_md5
+                                    WHERE prenom LIKE {?} AND nom LIKE {?} AND promo = {?}
+                                          AND perms = 'pending'",
+                                  $matches[1], $matches[2], $matches[3]);
+                if ($res->numRows() == 1) {
+                    $uid = $res->fetchOneCell();
+                    pl_redirect('marketing/public/' . $uid);
+                }
+            }
             return PL_NOT_FOUND;
         }
 
         $new   = Env::v('modif') == 'new';
         $user  = get_user_details($login, S::v('uid'), $view);
-        $user['freetext'] = preg_replace('/((?:https?|ftp):\/\/(?:&|\.*,*[a-z@0-9~%$£µ&i#\-+=_\/\?])*)/i',
-                                         '<a href="\\0">\\0</a>', $user['freetext']);
+        require_once('url_catcher.inc.php');
+        $user['freetext'] = url_catcher($user['freetext'], false);
         $title = $user['prenom'] . ' ' . empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'];
         $page->assign('xorg_title', $title);
 
@@ -348,7 +360,7 @@ class ProfileModule extends PLModule
             // mise a jour des champs relatifs au tab ouvert
             require_once "profil/update_{$opened_tab}.inc.php";
 
-            $log =& S::v('log');
+            $log =& $_SESSION['log'];
             $log->log('profil', $opened_tab);
             $page->assign('etat_update', 'ok');
         }
@@ -635,8 +647,6 @@ class ProfileModule extends PLModule
 
     function handler_trombi(&$page, $promo = null)
     {
-        require_once 'trombi.inc.php';
-
         $page->changeTpl('trombipromo.tpl');
         $page->assign('xorg_title', 'Polytechnique.org - Trombi Promo');