Merge remote-tracking branch 'origin/master'

web/model/class.categorie.php

@@ -30,7 +30,9 @@ class Categorie {
 		$options = array(
 			"where" => array(
 				array("nom_cat", "=", $this->nomCat)
-			)
+			),
+			"order by" => array("rand()"),
+			"limit" => array("2")
 		);
 
 		$resp = $this->bdd->Select('*', 'reponses', $options);
@@ -51,10 +53,13 @@ class Categorie {
 	}
 
 	public function getArray() {
-		$return = array();
+		$questsets = array();
 		foreach($this->questsets as $questset) {
-			array_push($return, $questset->getArray());
+			array_push($questsets, $questset->getArray());
 		}
-		return $return;
+		return array(
+			"nom_cat" => utf8_encode($this->nomCat),
+			"themes" => $questsets
+		);
 	}
 }

web/model/class.connector.php

@@ -47,7 +47,7 @@ class Connector {
 					throw new Exception('Problème lors de la création du substring');
 				}
 			} else if(($upName = strtoupper($name)) == "ORDER BY") {
-				if(sizeof($value) != 2) {
+				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));
 				}

web/model/class.question.php

@@ -42,4 +42,11 @@ class Question {
 	function getBonneReponse() {
 		return $this->bonneReponse;
 	}
+
+	function getArray() {
+		return array(
+			"intitule" => utf8_encode($this->intitule),
+			"bonneReponse" => utf8_encode($this->bonneReponse)
+		);
+	}
 }

web/model/class.questset.php

@@ -43,10 +43,15 @@ class Questset {
 	}
 
 	function getArray() {
-		$return = array();
+		$questions = array();
 		foreach($this->questions as $question) {
-			array_push($return, $question->getArray())
+			array_push($questions, $question->getArray());
 		}
-		return $return;
+
+		return array(
+			"reponse1" => utf8_encode($this->reponse1),
+			"reponse2" => utf8_encode($this->reponse2),
+			"questions" => $questions
+		);
 	}
 }

web/questions.php

@@ -0,0 +1,17 @@
+<?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());
+	}
+	echo json_encode($categories);
+}catch(Exception $e) {
+	echo("<strong>Erreur : </strong>".$e->getMessage());
+}

web/test.php

@@ -1,12 +0,0 @@
-<?php
-
-// Fichier de tests du modèle
-
-require_once('model/classes.php');
-
-try{
-	$categories = Categorie::randSelect();
-	var_dump($categories);
-}catch(Exception $e) {
-	echo("<strong>Erreur : </strong>".$e->getMessage());
-}