From b39b9931ef31f74214b6410a3346b009b02deb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9munaire?= <nemunaire@pomail.fr>
Date: Tue, 19 Jun 2012 21:22:31 +0200
Subject: [PATCH] Fix subscription (not saved when confirm)

---
 header.html                     |  5 ++---
 subscribe.html => subscribe.php | 22 +---------------------
 subscriptionConfirmation.php    | 33 ++++++++++-----------------------
 3 files changed, 13 insertions(+), 47 deletions(-)
 rename subscribe.html => subscribe.php (69%)
diff --git a/header.html b/header.html
index 8a5d23d..7d65b4d 100644
--- a/header.html
+++ b/header.html
@@ -17,10 +17,9 @@
 
       <nav>
         <ul>
+          <li><a href="./">Accueil</a></li>
           <li><a href="./list.php">Liste des questions</a></li>
-          <li><a href="./subscribe.html">S'inscrire</a></li>
+          <li><a href="./subscribe.php">S'inscrire</a></li>
         </ul>
       </nav>
-
-
     </header>
diff --git a/subscribe.html b/subscribe.php
similarity index 69%
rename from subscribe.html
rename to subscribe.php
index 0214994..d69515d 100644
--- a/subscribe.html
+++ b/subscribe.php
@@ -1,23 +1,4 @@
-<!DOCTYPE html>
-
-<html>
-  <head>
-    <meta charset="utf8" />
-    <link rel="Stylesheet" href="style.css" />
-    <title>Every AskWeb (BETA)</title>
-
-  </head>
-
-  <body>
-    <header>
-      <div id="main_title">
-        <a href="http://www.h2g2.com" target="_blank">
-          <img src="marvin-robot_normal.png" alt="" id="banner"/>
-        </a>
-        <h1>Nemubot AskWeb (BETA)</h1>
-      </div>
-    </header>
-
+<?php include("header.html") ?>
     <section id="introduction">
       <article id="left">
       <h2>Inscription</h2>
@@ -43,6 +24,5 @@
           </form>
           </article>
     </section>
-
   </body>
 </html>
diff --git a/subscriptionConfirmation.php b/subscriptionConfirmation.php
index d08a2fb..380d4f5 100644
--- a/subscriptionConfirmation.php
+++ b/subscriptionConfirmation.php
@@ -1,38 +1,25 @@
 <?php
-
 include ("header.html");
+?>
+<section id="introduction">
+  <article>
+    <h2>
+<?php
 include("User.class.php");
 
 $users = User::getUsers();
 
 if (!array_key_exists($_GET['id'], $users))
-{
-  $message = "unknown";
-}
+  echo "Une erreur est survenue";
 else if (!$users[$_GET['id']]->isValidated())
 {
   $users[$_GET['id']]->set_validated(true);
-  $message = "ok";
+  User::setUsers($users);
+  echo "Vous êtes maintenant inscrit !";
 }
 else
-{
-  $message = "already";
-}
-?>
-
-<section id="introduction">
-  <article>
-
-<?php
-  if ($message == "ok") {
-?>
-  <h2>Vous êtes maintenant inscrit !</h2>
-<?php } else if ($message == "already") {
-?>
-  <h2>Vous êtes déjà inscrit</h2>
-   <?php } else {?>
-  <h2>Une erreur est survenue</h2>
-   <?php } ?>
+  echo "Vous êtes déjà inscrit";
+?></h2>
   </article>
 </section>
 
