X-Git-Url: http://git.euphorik.ch/?p=cl7.git;a=blobdiff_plain;f=php%2Fcontroller.php;fp=php%2Fcontroller.php;h=b68834ec734951ded4ec9ff5b50eb51050f8c9bc;hp=5d83babaa4c9b8836453619848aae5d31a506971;hb=9c682b3ad5335bfeaff7f133bf1a2e0f0c9c0f82;hpb=6bf2995e3323a0a8572b07442c114f12d23c40bf

diff --git a/php/controller.php b/php/controller.php
index 5d83bab..b68834e 100644
--- a/php/controller.php
+++ b/php/controller.php
@@ -5,22 +5,26 @@
   */  
 class Controller
 {
-   private $participant;
    public $message_utilisateur = NULL;
+   public $nouvel_inscrit = FALSE;
 
-   function Controller($participant)
+   private $participant;
+   private $config;
+   
+   public function Controller($participant, $config)
    {
       $this->participant = $participant;
+      $this->config = $config;
    
       # inscription d'un nouveau participant
       if (isset($_POST['inscription']) && !Participant::nombre_participant_max_atteint())
       { 		
-         if ($config->get("inscription_terminees"))
+         if ($this->config->get("inscription_terminees"))
             return;
 
-         traiter_donnees_inscription();
-         if (!login_deja_pris() && # vérification des données
-            donnees_inscription_valides() &&
+         $this->traiter_donnees_inscription();
+         if (!$this->login_deja_pris() && # vérification des données
+            $this->donnees_inscription_valides() &&
             $_POST['accord'] == "on"
          )
          {
@@ -41,22 +45,22 @@ class Controller
                )"
             );
             $id = mysql_insert_id();
-            set_periodes($id);
+            $this->set_periodes($id);
             mysql_query("COMMIT");
          
             $this->participant = new participant($_POST['pseudo'], $_POST['pass1']);
-            setcookie("COOKIE_INFO_PATICIPANT", $this->participant->info->id, time() + 31104000);
-            $page = "bienvenue";
+            setcookie("COOKIE_INFO_PARTICIPANT", $this->participant->info->id, time() + 31104000);
+            $this->nouvel_inscrit = TRUE;
          }
       }
       # un participant modifie ses infos
       else if(isset($_POST['modification_participant']) && $this->participant->valide)
       {   
-         if ($config->get("inscription_terminees"))
+         if ($this->config->get("inscription_terminees"))
             return;
 
-         traiter_donnees_inscription();
-         if (!login_deja_pris() && donnees_inscription_valides())
+         $this->traiter_donnees_inscription();
+         if (!$this->login_deja_pris() && $this->donnees_inscription_valides())
          {
             mysql_query("BEGIN TRANSACTION");
             mysql_query("UPDATE participants SET pseudo = '".addslashes($_POST['pseudo'])."' WHERE id = " . $this->participant->info->id);
@@ -68,7 +72,7 @@ class Controller
             mysql_query("UPDATE participants SET age = '".addslashes($_POST['age'])."' WHERE id = " . $this->participant->info->id);
             mysql_query("UPDATE participants SET e_mail = '".addslashes($_POST['e_mail'])."' WHERE id = " . $this->participant->info->id);
             mysql_query("UPDATE participants SET remarques = '".addslashes($_POST['remarques'])."' WHERE id = " . $this->participant->info->id);
-            set_periodes($this->participant->info->id);
+            $this->set_periodes($this->participant->info->id);
             mysql_query("COMMIT");
             //header("Location: /inscrits.html");
             $this->message_utilisateur = "Les modifications ont été enregistrées";
@@ -98,7 +102,7 @@ class Controller
          mysql_query("DELETE FROM jeux_choisis WHERE participant_id = " . $this->participant->info->id);
 
          # traite les trois premiers votes
-         for ($i = 0; $i < count($votes) && $i < $config->get('nb_votes_jeux'); $i++)
+         for ($i = 0; $i < count($votes) && $i < $this->config->get('nb_votes_jeux'); $i++)
          {
             mysql_query("INSERT INTO jeux_choisis (participant_id, jeu_id) VALUES (".$this->participant->info->id.", ".(int)$votes[$i].")");
          }