From: x2000habouzit <x2000habouzit>
Date: Sat, 9 Oct 2004 14:44:05 +0000 (+0000)
Subject: broken carva
X-Git-Tag: xorg/old~1360
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=49724854471523ab5ef91d9d6c753cbf39602a33;p=platal.git

broken carva
---

diff --git a/htdocs/carva_redirect.php b/htdocs/carva_redirect.php
index 0d20822..4ab9b6a 100644
--- a/htdocs/carva_redirect.php
+++ b/htdocs/carva_redirect.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: carva_redirect.php,v 1.4 2004-08-31 10:03:28 x2000habouzit Exp $
+        $Id: carva_redirect.php,v 1.5 2004-10-09 14:44:05 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -47,11 +47,10 @@ if (isset($_REQUEST['submit']) and ($_REQUEST['submit'] == "Valider" or $_REQUES
     }
 }
 
-$result = $globals->db->query("select alias, redirecturl from auth_user_md5 where user_id={$_SESSION['uid']}");
-list($alias, $carva) = mysql_fetch_row($result);
+$result = $globals->db->query("select redirecturl from auth_user_md5 where user_id={$_SESSION['uid']}");
+list($carva) = mysql_fetch_row($result);
 mysql_free_result($result);
 $page->assign('carva', $carva);
-$page->assign('alias', $alias);
 
 $page->run();
 ?>
diff --git a/templates/carva_redirect.tpl b/templates/carva_redirect.tpl
index defe5a4..ccc37fb 100644
--- a/templates/carva_redirect.tpl
+++ b/templates/carva_redirect.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: carva_redirect.tpl,v 1.7 2004-09-02 23:56:54 x2000habouzit Exp $
+        $Id: carva_redirect.tpl,v 1.8 2004-10-09 14:44:05 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -38,14 +38,9 @@
 <p>
   Dans la lignée du service de redirection d'emails de <strong>Polytechnique.org</strong>,
   il est possible de faire pointer
-{dynamic}
-{if $alias}
-  les adresses <strong>http://www.carva.org/{$smarty.session.forlife}</strong>
-  et <strong>http://www.carva.org/{$alias}</strong>
-{else}
+  {dynamic}
   l'adresse <strong>http://www.carva.org/{$smarty.session.forlife}</strong>
-{/if}
-{/dynamic}
+  {/dynamic}
   vers la page WEB de ton choix. Pour de plus amples détails, consulte
   <a href="{"docs/doc_carva.php"|url}">cette page</a>
 </p>