From 1ef5fe5d28aa041acc76f68339c567057c0e5a44 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Wed, 28 Jan 2004 16:54:47 +0000
Subject: [PATCH] =?utf8?q?challenge=20:=20on=20utilise=20le=20challenge=20?=
 =?utf8?q?de=20DiogenesCoreSession=20cvs=20diff=20xorg.session.inc.phppas?=
 =?utf8?q?=20besoin=20d'en=20recr=E9er=20un?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 htdocs/index.php                     | 3 +--
 templates/password_prompt.tpl        | 4 ++--
 templates/password_prompt_logged.tpl | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 41fe38e..2cd2ad1 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -1,8 +1,7 @@
 <?php
 require("auto.prepend.inc.php");
+new_skinned_page('index.tpl', AUTH_PUBLIC);
 if(logged())
     header("Location: login.php");
-new_skinned_page('index.tpl', AUTH_PUBLIC);
-
 $page->display();
 ?>
diff --git a/templates/password_prompt.tpl b/templates/password_prompt.tpl
index 6de6951..89dcb59 100644
--- a/templates/password_prompt.tpl
+++ b/templates/password_prompt.tpl
@@ -1,4 +1,4 @@
-{* $Id: password_prompt.tpl,v 1.5 2004-01-26 19:40:51 x2000habouzit Exp $ *}
+{* $Id: password_prompt.tpl,v 1.6 2004-01-28 16:54:47 x2000habouzit Exp $ *}
 <noscript>
   <span class="erreur">
     Ton navigateur n'accepte pas le javaScript !!
@@ -90,7 +90,7 @@ Probl
 
 <!-- Set up the form with the challenge value and an empty reply value //-->
 <form action="{$smarty.server.REQUEST_URI}" method=post name="loginsub">
-  <input type="hidden" name="challenge" value="{$smarty.session.challenge}" />
+  <input type="hidden" name="challenge" value="{$smarty.session.session.challenge}" />
   <input type="hidden" name="response"  value="" />
   <input type="hidden" name="username"  value="" />
 </form>
diff --git a/templates/password_prompt_logged.tpl b/templates/password_prompt_logged.tpl
index 5a75bb2..9509a6c 100644
--- a/templates/password_prompt_logged.tpl
+++ b/templates/password_prompt_logged.tpl
@@ -1,4 +1,4 @@
-{* $Id: password_prompt_logged.tpl,v 1.4 2004-01-26 19:40:51 x2000habouzit Exp $ *}
+{* $Id: password_prompt_logged.tpl,v 1.5 2004-01-28 16:54:47 x2000habouzit Exp $ *}
 
 <div style="text-align:center">
   <table width="90%" summary="Accès sécurisé">
@@ -47,8 +47,8 @@
 
 <!-- Set up the form with the challenge value and an empty reply value -->
 <form action="{$smarty.server.REQUEST_URI}" method=post name="loginsub">
-  <input type="hidden" name="challenge" value="{$smarty.session.challenge}">
-  <input type="hidden" name="username" value="{$smarty.cookies.ORGlogin}">
+  <input type="hidden" name="challenge" value="{$smarty.session.session->challenge}">
+  <input type="hidden" name="username"  value="{$smarty.cookies.ORGlogin}">
   <input type="hidden" name="response"  value="">
 </form>
 
-- 
2.1.4