Fixes 'n bugs (in that order)

web/index.php

@@ -2,7 +2,14 @@
 
 require_once('model/classes.php');
 
-header("Content-Type:application/json");
-
-echo json_encode(array("Message" => "Hello world;"));
-
+//header("Content-Type:application/json");
+
+if(!empty($_GET['page'])) {
+  if($_GET['page'] == "palmares") {
+    include("view/palmares.php");
+    echo json_encode($scArray);
+  }
+} else {
+  include("view/questions.php");
+	echo json_encode($categories);
+}

web/model/class.connector.php

@@ -41,11 +41,7 @@ class Connector {
 					$whereClause .= $array[0]." ".$array[1]." :".$array[0]." AND ";
 					$arrayVerif[":".$array[0]] = $array[2];
 				}
-				if($substring = substr($whereClause, 0, -5)) {
-					$request .= $substring;
-				} else {
-					throw new Exception('Problème lors de la création du substring');
-				}
+				$request .= substr($whereClause, 0, -5);
 			} else if(($upName = strtoupper($name)) == "ORDER BY") {
 				if(sizeof($value) != 2 && substr($value[0], -2) != "()") {
 					throw new Exception('Nombre de paramètres incorrects (ORDER BY). Les paramètres passés sont : '
@@ -80,14 +76,38 @@ class Connector {
 
 	function Insert($table, $values) {
 		$request = "INSERT INTO $table(";
-		$values = "VALUES(";
-		$params = array();
-		foreach($values as $name=>$values) {
-			$request += $name.",";
-			$values += ":".$name.",";
+		$valeurs = "VALUES(";
+		$arrayVerif = array();
+		foreach($values as $name=>$value) {
+			$request .= $name.",";
+			$valeurs .= "?,";
+				array_push($arrayVerif, $value);
+		}
+
+		$request = substr($request, 0, -1).") ".substr($valeurs, 0, -1).")";
+
+		$stmt = $this->bdd->prepare($request);
+
+		$stmt->execute($arrayVerif);
+	}
+
+	function Update($table, $update) {
+		$request = "UPDATE $table SET ";
+		$arrayVerif = array();
+		foreach($update['set'] as $name=>$value) {
+			$request .= $name."=?,";
+			array_push($arrayVerif, $value);
 		}
-		$request = substr($request, 0, -1).") ".substr($values, 0, -1).")";
-		echo $request;
+		$request = substr($request, 0, -1)." WHERE ";
+		var_dump($request);
+		foreach($update['where'] as $value) {
+			$request .= $value[0].$value[1]."? AND ";
+			array_push($arrayVerif, $value[2]);			
+		}
+		$request = substr($request, 0, -5);
+
+		$stmt = $this->bdd->prepare($request);
+		$stmt->execute($arrayVerif);
 	}
 
 	function beginTransaction() {

web/model/class.score.php

@@ -10,13 +10,13 @@ class Score {
 
     $options = array(
       "where" => array(
-        array("login", "=", $login);
+        array("login", "=", $login)
       )
     );
 
-    $data = $bdd->Select("*", "scores", $options);
-    $this->login = $data['login'];
-    $this->score = $data['score'];
+    $data = $this->bdd->Select("*", "scores", $options);
+    $this->login = $data[0]['login'];
+    $this->score = $data[0]['score'];
   }
 
   function getLogin() {
@@ -47,11 +47,29 @@ class Score {
   public static function add($login, $score) {
     $bdd = new Connector();
 
-    $values = array(
-      "login" => $login,
-      "score" => $score
+    $options = array(
+      "where" => array(
+        array("login", "=", $login)
+      )
     );
 
-    $bdd->Insert("score", $values);
+    if(!$scores = $bdd->Select("*", "scores", $options)) {
+      $values = array(
+        "login" => $login,
+        "score" => $score
+      );
+
+      $bdd->Insert("scores", $values);
+    } else {
+      if($score > $scores[0]['score']) {
+        $update = array(
+          "where" => array(
+            array("login", "=", $login)
+          ),
+          "set" => array("score" => $score)
+        );
+        $bdd->Update("scores", $update);
+      }
+    }
   }
 }

web/model/classes.php

@@ -5,3 +5,4 @@ require_once('model/class.connector.php');
 require_once('model/class.question.php');
 require_once('model/class.questset.php');
 require_once('model/class.categorie.php');
+require_once('model/class.score.php');

web/tests.php

@@ -0,0 +1,9 @@
+<?php
+
+require_once('model/classes.php');
+
+try {
+	Score::add("Yolo", 200);
+}catch(Exception $e) {
+	echo("Erreur : ".$e->getMessage());
+}

web/view/palmares.php

@@ -1,18 +1,15 @@
 <?php
 
-require_once('../model/classes.php');
-
-$bdd = new Connector();
-
-$options = array(
-	"order by" => array("score", "desc"),
-	"limit" => array(10)
-);
-
 try {
-	$res = $bdd->Select("*", "scores", $options);
-} catch(Exception $e) {
-	echo("Erreur : ".$e->getMessage());
+	$scores = Score::getScores(10);
+	$scArray = array();
+	for($i = 0; $i < sizeof($scores); $i++) {
+		array_push($scArray, array(
+			"login" => $scores[$i]->getLogin(),
+			"score" => $scores[$i]->getScore()
+		));
+		echo json_encode($scArray);
+	}
+}catch(Exception $e) {
+	echo json_encode(array("erreur" => $e->getMessage()));
 }
-
-// $res contient les résultats

web/questions.php → web/view/questions.php

@@ -11,7 +11,6 @@ try{
 	foreach($categoriesObj as $categorie) {
 		array_push($categories, $categorie->getArray());
 	}
-	echo json_encode($categories);
 }catch(Exception $e) {
-	echo("<strong>Erreur : </strong>".$e->getMessage());
+	echo json_encode(array("erreur" => $e->getMessage()));
 }