Merge remote-tracking branch 'origin/master'

web/index.php → web/api/index.php

@@ -1,15 +1,15 @@
-<?php
-
-require_once('model/classes.php');
-
-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);
-}
+<?php
+
+require_once('model/classes.php');
+
+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.categorie.php → web/api/model/class.categorie.php

@@ -1,65 +1,70 @@
-<?php
-
-class Categorie {
-	private $bdd;
-	private $nomCat;
-	private $questsets;
-	
-	function __construct($nomCat) {
-		$this->bdd = new Connector();
-		$this->selectCat($nomCat);
-		$this->questsets = array();
-		$this->load();
-	}
-
-	private function selectCat($nomCat) {
-		$options = array(
-			"where" => array(
-				array("nom_cat", "=", $nomCat)
-			)
-		);
-
-		if(!is_null($this->bdd->Select('*', 'categorie', $options))) {
-			$this->nomCat = $nomCat;
-		} else {
-			throw new Exception('Catégorie introuvable');
-		}
-	}
-
-	private function load() {
-		$options = array(
-			"where" => array(
-				array("nom_cat", "=", $this->nomCat)
-			),
-			"order by" => array("rand()"),
-			"limit" => array("2")
-		);
-
-		$resp = $this->bdd->Select('*', 'reponses', $options);
-		foreach($resp as $questset) {
-			array_push($this->questsets, new Questset(array($questset['reponse1'], $questset['reponse2'])));
-		}
-	}
-
-	public static function randSelect() {
-		$bdd = new Connector();
-		$arrayCat = $bdd->Select("*", "categorie");
-		$return = array();
-		for($i = 0; $i < 2; $i++) {
-			$catIndex = rand(0, sizeof($arrayCat)-1);
-			array_push($return, new Categorie($arrayCat[$catIndex]['nom_cat']));
-		}
-		return $return;
-	}
-
-	public function getArray() {
-		$questsets = array();
-		foreach($this->questsets as $questset) {
-			array_push($questsets, $questset->getArray());
-		}
-		return array(
-			"nom_cat" => utf8_encode($this->nomCat),
-			"themes" => $questsets
-		);
-	}
-}
+<?php
+
+class Categorie {
+	private $bdd;
+	private $nomCat;
+	private $questsets;
+	
+	function __construct($nomCat) {
+		$this->bdd = new Connector();
+		$this->selectCat($nomCat);
+		$this->questsets = array();
+		$this->load();
+	}
+
+	private function selectCat($nomCat) {
+		$options = array(
+			"where" => array(
+				array("nom_cat", "=", $nomCat)
+			)
+		);
+
+		if(!is_null($this->bdd->Select('*', 'categorie', $options))) {
+			$this->nomCat = $nomCat;
+		} else {
+			throw new Exception('Catégorie introuvable');
+		}
+	}
+
+	private function load() {
+		$options = array(
+			"where" => array(
+				array("nom_cat", "=", $this->nomCat)
+			),
+			"order by" => array("rand()"),
+			"limit" => array("2")
+		);
+
+		$resp = $this->bdd->Select('*', 'reponses', $options);
+		foreach($resp as $questset) {
+			array_push($this->questsets, new Questset(array($questset['reponse1'], $questset['reponse2'])));
+		}
+	}
+
+	public static function randSelect() {
+		$bdd = new Connector();
+		$arrayCat = $bdd->Select("*", "categorie");
+		$return = array();
+		$catIndex = -1;
+		$previousIndex = -1;
+		for($i = 0; $i < 2; $i++) {
+			do {
+				$previousIndex = $catIndex;
+				$catIndex = rand(0, sizeof($arrayCat)-1);
+			} while($catIndex == $previousIndex);
+			array_push($return, new Categorie($arrayCat[$catIndex]['nom_cat']));
+		}
+		return $return;
+	}
+
+	public function getArray() {
+		$questsets = array();
+		foreach($this->questsets as $questset) {
+			array_push($questsets, $questset->getArray());
+		}
+		return array(
+			"nom_cat" => utf8_encode($this->nomCat),
+			"themes" => $questsets
+		);
+	}
+}

web/model/class.connector.php → web/api/model/class.connector.php

@@ -1,120 +1,120 @@
-<?php
-
-class Connector {
-
-	private $bdd;
-
-	function __construct() {
-		$host = "localhost";
-		$db = "burgerquizz";
-		$user = "alain";
-		$pass = "chabat";
-
-		$this->bdd = new PDO("mysql:host=$host;dbname=$db", $user, $pass);
-		$this->bdd->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-	}
-
-	/*
-		Exemple de $options :
-
-		$options = array(
-			"where" => array(
-				array("foo", "=", "bar"),
-				array("blbl", ">", 5)
-			),
-			"order by" => array("foo", "desc"),
-			"limit" => array(0, 10) // Ou array(10)
-		);
-	*/
-	function Select($fields, $tables, $options = array()) {
-		$request = "SELECT $fields FROM $tables ";
-		$arrayVerif = array();
-		foreach($options as $name=>$value) {
-			if(($upName = strtoupper($name)) == "WHERE") {
-				$whereClause = " $upName ";
-				foreach($value as $array) {
-					if(sizeof($array) != 3) {
-						throw new Exception('Nombre de paramètres incorrect (WHERE). Les paramètres passés sont : '
-							.implode(',',$array));
-					}
-
-					$whereClause .= $array[0]." ".$array[1]." :".$array[0]." AND ";
-					$arrayVerif[":".$array[0]] = $array[2];
-				}
-				$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 : '
-						.implode(',', $value));
-				}
-
-				$request .= " ".$upName." ".implode(' ', $value);
-			} else if(($upName = strtoupper($name)) == "LIMIT") {
-				if(sizeof($value) == 1) {
-					// La colonne "limit" ne contient qu'un nombre de champs
-					$request .= " $upName ".$value[0];
-				} else if(sizeof($value) == 2) {
-					// La colonne "limit" contient un index de départ et un nombre de champs
-					$request .= " $upName ".$value[0].",".$value[1];
-				} else {
-					throw new Exception('Nombre de paramètres incorrects (LIMIT). Les paramètres passés sont : '
-						.implode(',', $value));
-				}
-			} else {
-				throw new Exception('Argument '.strtoupper($name).' inconnu');
-			}
-		}
-
-		$stmt = $this->bdd->prepare($request);
-
-		if($stmt->execute($arrayVerif)) {
-			return $stmt->fetchAll();
-		} else {
-			return null;
-		}
-	}
-
-	function Insert($table, $values) {
-		$request = "INSERT INTO $table(";
-		$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)." 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() {
-		$this->bdd->beginTransaction();
-	}
-
-	function commit() {
-		$this->bdd->commit();
-	}
-}
+<?php
+
+class Connector {
+
+	private $bdd;
+
+	function __construct() {
+		$host = "localhost";
+		$db = "burgerquizz";
+		$user = "alain";
+		$pass = "chabat";
+
+		$this->bdd = new PDO("mysql:host=$host;dbname=$db", $user, $pass);
+		$this->bdd->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+	}
+
+	/*
+		Exemple de $options :
+
+		$options = array(
+			"where" => array(
+				array("foo", "=", "bar"),
+				array("blbl", ">", 5)
+			),
+			"order by" => array("foo", "desc"),
+			"limit" => array(0, 10) // Ou array(10)
+		);
+	*/
+	function Select($fields, $tables, $options = array()) {
+		$request = "SELECT $fields FROM $tables ";
+		$arrayVerif = array();
+		foreach($options as $name=>$value) {
+			if(($upName = strtoupper($name)) == "WHERE") {
+				$whereClause = " $upName ";
+				foreach($value as $array) {
+					if(sizeof($array) != 3) {
+						throw new Exception('Nombre de paramètres incorrect (WHERE). Les paramètres passés sont : '
+							.implode(',',$array));
+					}
+
+					$whereClause .= $array[0]." ".$array[1]." :".$array[0]." AND ";
+					$arrayVerif[":".$array[0]] = $array[2];
+				}
+				$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 : '
+						.implode(',', $value));
+				}
+
+				$request .= " ".$upName." ".implode(' ', $value);
+			} else if(($upName = strtoupper($name)) == "LIMIT") {
+				if(sizeof($value) == 1) {
+					// La colonne "limit" ne contient qu'un nombre de champs
+					$request .= " $upName ".$value[0];
+				} else if(sizeof($value) == 2) {
+					// La colonne "limit" contient un index de départ et un nombre de champs
+					$request .= " $upName ".$value[0].",".$value[1];
+				} else {
+					throw new Exception('Nombre de paramètres incorrects (LIMIT). Les paramètres passés sont : '
+						.implode(',', $value));
+				}
+			} else {
+				throw new Exception('Argument '.strtoupper($name).' inconnu');
+			}
+		}
+
+		$stmt = $this->bdd->prepare($request);
+
+		if($stmt->execute($arrayVerif)) {
+			return $stmt->fetchAll();
+		} else {
+			return null;
+		}
+	}
+
+	function Insert($table, $values) {
+		$request = "INSERT INTO $table(";
+		$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)." 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() {
+		$this->bdd->beginTransaction();
+	}
+
+	function commit() {
+		$this->bdd->commit();
+	}
+}

web/model/class.question.php → web/api/model/class.question.php

@@ -1,52 +1,52 @@
-<?php
-
-class Question {
-	private $reponse1;
-	private $reponse2;
-	private $intitule;
-	private $bonneReponse;
-
-	function __construct($intitule) {
-		try{
-			$this->intitule = $intitule;
-
-			$bdd = new Connector();
-
-			$options = array(
-				"where" => array(
-					array("intitule", "=", $intitule)
-				)
-			);
-			$question = $bdd->Select('*', 'questions', $options);
-
-			$this->reponse1 = $question[0]['reponse1'];
-			$this->reponse2 = $question[0]['reponse2'];
-			
-			$this->bonneReponse = $question[0]['num_reponse'];
-		} catch(Exception $e) {
-			throw $e;
-		}
-	}
-
-	function getIntitule() {
-		return $this->intitule;
-	}
-
-	function getReponses() {
-		return array(
-			"reponse1" => $this->reponse1,
-			"reponse2" => $this->reponse2
-		);
-	}
-
-	function getBonneReponse() {
-		return $this->bonneReponse;
-	}
-
-	function getArray() {
-		return array(
-			"intitule" => utf8_encode($this->intitule),
-			"bonneReponse" => utf8_encode($this->bonneReponse)
-		);
-	}
-}
+<?php
+
+class Question {
+	private $reponse1;
+	private $reponse2;
+	private $intitule;
+	private $bonneReponse;
+
+	function __construct($intitule) {
+		try{
+			$this->intitule = $intitule;
+
+			$bdd = new Connector();
+
+			$options = array(
+				"where" => array(
+					array("intitule", "=", $intitule)
+				)
+			);
+			$question = $bdd->Select('*', 'questions', $options);
+
+			$this->reponse1 = $question[0]['reponse1'];
+			$this->reponse2 = $question[0]['reponse2'];
+			
+			$this->bonneReponse = $question[0]['num_reponse'];
+		} catch(Exception $e) {
+			throw $e;
+		}
+	}
+
+	function getIntitule() {
+		return $this->intitule;
+	}
+
+	function getReponses() {
+		return array(
+			"reponse1" => $this->reponse1,
+			"reponse2" => $this->reponse2
+		);
+	}
+
+	function getBonneReponse() {
+		return $this->bonneReponse;
+	}
+
+	function getArray() {
+		return array(
+			"intitule" => utf8_encode($this->intitule),
+			"bonneReponse" => utf8_encode($this->bonneReponse)
+		);
+	}
+}

web/model/class.questset.php → web/api/model/class.questset.php

@@ -1,57 +1,57 @@
-<?php
-
-class Questset {
-	private $reponse1;
-	private $reponse2;
-	private $questions;
-
-	function __construct($reponses) {
-		if(is_array($reponses)) {
-			$this->questions = array();
-			$this->reponse1 = $reponses[0];
-			$this->reponse2 = $reponses[1];
-			try {
-				$bdd = new Connector();
-
-				$options = array(
-					"where" => array(
-						array("reponse1", "=", $this->reponse1),
-						array("reponse2", "=", $this->reponse2)
-					)
-				);
-
-				$questions = $bdd->Select('*', 'questions', $options);
-
-				foreach($questions as $question) {
-					array_push($this->questions, new Question($question['intitule']));
-				}
-
-			} catch(Exception $e) {
-				throw $e;
-			}
-		} else {
-			throw new Exception('Un tableau de réponses est attendu dans le constructeur.');
-		}
-	}
-
-	function getQuestions() {
-		return $this->questions;
-	}
-
-	function getLength() {
-		return sizeof($this->questions);
-	}
-
-	function getArray() {
-		$questions = array();
-		foreach($this->questions as $question) {
-			array_push($questions, $question->getArray());
-		}
-
-		return array(
-			"reponse1" => utf8_encode($this->reponse1),
-			"reponse2" => utf8_encode($this->reponse2),
-			"questions" => $questions
-		);
-	}
-}
+<?php
+
+class Questset {
+	private $reponse1;
+	private $reponse2;
+	private $questions;
+
+	function __construct($reponses) {
+		if(is_array($reponses)) {
+			$this->questions = array();
+			$this->reponse1 = $reponses[0];
+			$this->reponse2 = $reponses[1];
+			try {
+				$bdd = new Connector();
+
+				$options = array(
+					"where" => array(
+						array("reponse1", "=", $this->reponse1),
+						array("reponse2", "=", $this->reponse2)
+					)
+				);
+
+				$questions = $bdd->Select('*', 'questions', $options);
+
+				foreach($questions as $question) {
+					array_push($this->questions, new Question($question['intitule']));
+				}
+
+			} catch(Exception $e) {
+				throw $e;
+			}
+		} else {
+			throw new Exception('Un tableau de réponses est attendu dans le constructeur.');
+		}
+	}
+
+	function getQuestions() {
+		return $this->questions;
+	}
+
+	function getLength() {
+		return sizeof($this->questions);
+	}
+
+	function getArray() {
+		$questions = array();
+		foreach($this->questions as $question) {
+			array_push($questions, $question->getArray());
+		}
+
+		return array(
+			"reponse1" => utf8_encode($this->reponse1),
+			"reponse2" => utf8_encode($this->reponse2),
+			"questions" => $questions
+		);
+	}
+}

web/model/class.score.php → web/api/model/class.score.php

@@ -1,75 +1,75 @@
-<?php
-
-class Score {
-  private $login;
-  private $score;
-  private $bdd;
-
-  function __construct($login) {
-    $this->bdd = new Connector();
-
-    $options = array(
-      "where" => array(
-        array("login", "=", $login)
-      )
-    );
-
-    $data = $this->bdd->Select("*", "scores", $options);
-    $this->login = $data[0]['login'];
-    $this->score = $data[0]['score'];
-  }
-
-  function getLogin() {
-    return $this->login;
-  }
-
-  function getScore() {
-    return $this->score;
-  }
-
-  public static function getScores($nRows, $direction = "desc") {
-    $bdd = new Connector();
-
-    $options = array(
-      "order by" => array("score", $direction),
-      "limit" => array($nRows)
-    );
-
-    $array = $bdd->Select("*", "scores", $options);
-    $scores = array();
-    foreach($array as $score) {
-      array_push($scores, new Score($score['login']));
-    }
-
-    return $scores;
-  }
-
-  public static function add($login, $score) {
-    $bdd = new Connector();
-
-    $options = array(
-      "where" => array(
-        array("login", "=", $login)
-      )
-    );
-
-    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);
-      }
-    }
-  }
-}
+<?php
+
+class Score {
+  private $login;
+  private $score;
+  private $bdd;
+
+  function __construct($login) {
+    $this->bdd = new Connector();
+
+    $options = array(
+      "where" => array(
+        array("login", "=", $login)
+      )
+    );
+
+    $data = $this->bdd->Select("*", "scores", $options);
+    $this->login = $data[0]['login'];
+    $this->score = $data[0]['score'];
+  }
+
+  function getLogin() {
+    return $this->login;
+  }
+
+  function getScore() {
+    return $this->score;
+  }
+
+  public static function getScores($nRows, $direction = "desc") {
+    $bdd = new Connector();
+
+    $options = array(
+      "order by" => array("score", $direction),
+      "limit" => array($nRows)
+    );
+
+    $array = $bdd->Select("*", "scores", $options);
+    $scores = array();
+    foreach($array as $score) {
+      array_push($scores, new Score($score['login']));
+    }
+
+    return $scores;
+  }
+
+  public static function add($login, $score) {
+    $bdd = new Connector();
+
+    $options = array(
+      "where" => array(
+        array("login", "=", $login)
+      )
+    );
+
+    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 → web/api/model/classes.php

@@ -1,8 +1,8 @@
-<?php
-
-// Call this file from the root folder
-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');
+<?php
+
+// Call this file from the root folder
+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 → web/api/tests.php

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

web/view/palmares.php → web/api/view/palmares.php

@@ -1,14 +1,14 @@
-<?php
-
-try {
-	$scores = Score::getScores(10);
-	$scArray = array();
-	for($i = 0; $i < sizeof($scores); $i++) {
-		array_push($scArray, array(
-			"login" => utf8_encode($scores[$i]->getLogin()),
-			"score" => $scores[$i]->getScore()
-		));
-	}
-}catch(Exception $e) {
-	echo json_encode(array("erreur" => $e->getMessage()));
-}
+<?php
+
+try {
+	$scores = Score::getScores(10);
+	$scArray = array();
+	for($i = 0; $i < sizeof($scores); $i++) {
+		array_push($scArray, array(
+			"login" => utf8_encode($scores[$i]->getLogin()),
+			"score" => $scores[$i]->getScore()
+		));
+	}
+}catch(Exception $e) {
+	echo json_encode(array("erreur" => $e->getMessage()));
+}

web/api/view/questions.php

@@ -0,0 +1,7 @@
+<?php
+
+$categoriesObj = Categorie::randSelect();
+$categories = array();
+foreach($categoriesObj as $categorie) {
+	array_push($categories, $categorie->getArray());
+}

web/view/questions.php

@@ -1,16 +0,0 @@
-<?php
-
-// Fichier de tests du modèle
-
-require_once('model/classes.php');
-header("Content-Type:application/json");
-
-try{
-	$categoriesObj = Categorie::randSelect();
-	$categories = array();
-	foreach($categoriesObj as $categorie) {
-		array_push($categories, $categorie->getArray());
-	}
-}catch(Exception $e) {
-	echo json_encode(array("erreur" => $e->getMessage()));
-}