anna.boudoul
/
ProjetPHP
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

merge and changes

Browse Source
action&exception
Anna BOUDOUL 2 years ago
parent 549a68e30f 561d27f4c9
commit 8d166927ae
7 changed files with 71 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
controller/FrontCtrl.php
Unescape View File

@ -13,7 +13,7 @@ class FrontCtrl
session_start(); session_start();
$this->TMessage = $TMessage; $this->TMessage = $TMessage;
$this->TabVues = $TabVues; $this->TabVues = $TabVues;
$this->usrMdl = new UserModel($con); $this->usrMdl = new UserModel($con, $this->TMessage);
$this->action_User = array('deconnecter', 'voirListePriv', 'creerListePriv', 'supprimerListePriv'); $this->action_User = array('deconnecter', 'voirListePriv', 'creerListePriv', 'supprimerListePriv');
try{ try{

2
controller/UserCtrl.php
Unescape View File

@ -13,7 +13,7 @@ class UserCtrl
$this->TabVues = $TabVues; $this->TabVues = $TabVues;
$this->TMessage = $TMessage; $this->TMessage = $TMessage;
$this->con = $con; $this->con = $con;
$this->userModel = new UserModel($this->con); $this->userModel = new UserModel($this->con, $this->TMessage);
$this->taskModel = new TaskModel($this->con); $this->taskModel = new TaskModel($this->con);
try{ try{
$action=$_REQUEST['action']; $action=$_REQUEST['action'];

20
controller/VisitorCtrl.php
Unescape View File

@ -14,7 +14,7 @@ class VisitorCtrl
$this->isUser = $isUser; $this->isUser = $isUser;
$dvueErreur = array(); $dvueErreur = array();
$this->taskModel = new TaskModel($con); $this->taskModel = new TaskModel($con);
$this->userModel = new UserModel($con); $this->userModel = new UserModel($con, $this->TMessage);
try{ try{
if(isset($_REQUEST['action'])) if(isset($_REQUEST['action']))
$action = $_REQUEST['action']; $action = $_REQUEST['action'];
@ -151,24 +151,34 @@ class VisitorCtrl
function go_task(){ function go_task(){
$user = $this->isUser; $user = $this->isUser;
if(isset($_POST['listId'])) $_SESSION['listId'] = $_POST['listId']; if(isset($_POST['listId'])) $_SESSION['listId'] = $_POST['listId'];
if(isset($_POST['isPriv'])) $_SESSION['isPriv'] = $_POST['isPriv'];
require("view/newTask.php"); require("view/newTask.php");
} }
function addTask(){ function addTask(){
//$titre,$desc,$priorite,$idList,$dateDeb="",$dateFin="",$isDone=false,$id=0
$this->taskModel->addTask($_POST['titreT'],$_POST['descT'], $this->taskModel->addTask($_POST['titreT'],$_POST['descT'],
$_POST['prioriteT'],$_SESSION['listId'],$_POST['dateDebT'],$_POST['dateFinT']); $_POST['prioriteT'],$_SESSION['listId'],$_POST['dateDebT'],$_POST['dateFinT']);
$this->loadHome();
if(isset($_SESSION['isPriv']) && $_SESSION['isPriv'])
header("Location:index.php?action=voirListePriv");
else
$this->loadHome();
} }
function eraseTask(){ function eraseTask(){
$this->taskModel->supTask($_POST['idT']); $this->taskModel->supTask($_POST['idT']);
$this->loadHome(); if(!empty($_POST['isPriv']))
header("Location:index.php?action=voirListePriv");
else
$this->loadHome();
} }
function isDone(){ function isDone(){
$this->taskModel->modifTask($_POST['idT'],'isDone',true); $this->taskModel->modifTask($_POST['idT'],'isDone',true);
$this->loadHome(); if($_POST['isPriv'])
header("Location:index.php?action=voirListePriv");
else
$this->loadHome();
} }
} }
?> ?>

2
dal/UserGateway.php
Unescape View File

@ -47,7 +47,7 @@
$query = 'SELECT mdp FROM User WHERE login = :login'; $query = 'SELECT mdp FROM User WHERE login = :login';
$this->con->executeQuery($query, array(':login'=>array($login, PDO::PARAM_STR))); $this->con->executeQuery($query, array(':login'=>array($login, PDO::PARAM_STR)));
$result = $this->con->getResults(); $result = $this->con->getResults();
if(empty($result[0][0])) return;
if(password_verify($mdp, $result[0][0])) if(password_verify($mdp, $result[0][0]))
return $login; return $login;
} }

26
model/UserModel.php
Unescape View File

@ -6,15 +6,17 @@
class UserModel{ class UserModel{
private $con; private $con;
private $gat; private $gat;
private $TMessage;
public function __construct(Connection $con) { public function __construct(Connection $con, $TMessage) {
$this->TMessage = $TMessage;
$this->con = $con; $this->con = $con;
$this->gat = new UserGateway($con); $this->gat = new UserGateway($con);
} }
function connexion($login, $mdp){ function connexion($login, $mdp){
Validation::val_form_texte($login, $TMessage); Validation::val_form_texte($login, $this->TMessage);
Validation::val_form_mdp($mdp, $TMessage); Validation::val_form_mdp($mdp, $this->TMessage);
$result = $this->gat->findUser($login, $mdp); $result = $this->gat->findUser($login, $mdp);
if(!isset($result)) echo 'not set works'; if(!isset($result)) echo 'not set works';
@ -30,7 +32,7 @@
} }
function isConnected(){ //teste rôle dans la session, retourne instance d’objet ou booleen function isConnected(){ //teste rôle dans la session, retourne instance d’objet ou booleen
Validation::val_form_texte($_SESSION['login'], $TMessage); Validation::val_form_texte($_SESSION['login'], $this->TMessage);
if(isset($_SESSION['login']) && $_SESSION['login']!="") if(isset($_SESSION['login']) && $_SESSION['login']!="")
return true; return true;
else else
@ -38,26 +40,26 @@
} }
function ajouter($login, $mdp){ function ajouter($login, $mdp){
Validation::val_form_texte($login, $TMessage); Validation::val_form_texte($login, $this->TMessage);
Validation::val_form_mdp($mdp, $TMessage); Validation::val_form_mdp($mdp, $this->TMessage);
$user = $this->findByLogin($login); $user = $this->findByLogin($login);
if (empty($user)) if (empty($user))
$this->gat->create($login, $mdp); $this->gat->create($login, $mdp);
} }
function supprimer($login){ function supprimer($login){
Validation::val_form_texte($login, $TMessage); Validation::val_form_texte($login, $this->TMessage);
$this->gat->delete($login); $this->gat->delete($login);
} }
function modifMdp($login, $mdp){ function modifMdp($login, $mdp){
Validation::val_form_texte($login, $TMessage); Validation::val_form_texte($login, $this->TMessage);
Validation::val_form_mdp($mdp, $TMessage); Validation::val_form_mdp($mdp, $this->TMessage);
$this->gat->updateMdp($login, $mdp); $this->gat->updateMdp($login, $mdp);
} }
function findByLogin($login){ function findByLogin($login){
Validation::val_form_texte($login, $TMessage); Validation::val_form_texte($login, $this->TMessage);
$user = null; $user = null;
if ($login !== " " && $login != null ) if ($login !== " " && $login != null )
{ {
@ -70,8 +72,8 @@
} }
function modifLogin($oldLogin, $newLogin){ function modifLogin($oldLogin, $newLogin){
Validation::val_form_texte($oldLogin, $TMessage); Validation::val_form_texte($oldLogin, $this->TMessage);
Validation::val_form_texte($newLogin, $TMessage); Validation::val_form_texte($newLogin, $this->TMessage);
$user = $this->findByLogin($oldLogin); $user = $this->findByLogin($oldLogin);
if (empty($user)) if (empty($user))
$this->gat->updateLogin($oldLogin, $newLogin); $this->gat->updateLogin($oldLogin, $newLogin);

9
view/js/home.js
Unescape View File

@ -24,3 +24,12 @@ window.addEventListener('DOMContentLoaded', event => {
} }
}); });
function hideShow() {
var x = document.getElementById("myDIV");
if (x.style.display === "none") {
x.style.display = "block";
} else {
x.style.display = "none";
}
}

47
view/privHome.php
Unescape View File

@ -67,15 +67,16 @@
<button type="submit" class="btn btn-primary">New task &#128221;</button> <button type="submit" class="btn btn-primary">New task &#128221;</button>
<input type="hidden" name="listId" value="'.$l->get_id().'"></input> <input type="hidden" name="listId" value="'.$l->get_id().'"></input>
<input type="hidden" name="action" value="pageTache"></input> <input type="hidden" name="action" value="pageTache"></input>
<input type="hidden" name="isPriv" value="true"></input>
</div> </div>
</form> </form>
<table class="table mb-4"> <table class="table mb-4">
<thead> <thead>
<tr> <tr>
<th scope="col">Task</th> <th scope="col">Task</th>
<th scope="col">Importance</th> <th scope="col">Importance</th>
<th scope="col">Actions</th> <th scope="col">Actions</th>
</tr> </tr>
</thead> </thead>
<tbody>'; <tbody>';
# IF NO TASKS, display NO TASKS # IF NO TASKS, display NO TASKS
@ -94,18 +95,23 @@
} }
echo ' echo '
<td> <td>
<form action="index.php" method="post" class="d-inline-block"> <div class="btn-group dropdown">
<button type="submit" class="btn btn-success ms-1">&#10004; <button type="button" onclick="myFunction()" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"/>
<input type="hidden" name="idT" value="'.$t->get_id().'"></input> </div>
<input type="hidden" name="action" value="isDone"> <form action="index.php" method="post" class="d-inline-block">
</button> <button type="submit" class="btn btn-success ms-1">&#10004;
</form> <input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<form action="index.php" method="post" class="d-inline-block"> <input type="hidden" name="action" value="isDone">
<button type="submit" class="btn btn-danger">&#10006; <input type="hidden" name="isPriv" value="true">
<input type="hidden" name="idT" value="'.$t->get_id().'"></input> </button>
<input type="hidden" name="action" value="supprimerTache"> </form>
</button> <form action="index.php" method="post" class="d-inline-block">
</form> <button type="submit" class="btn btn-danger">&#10006;
<input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<input type="hidden" name="action" value="supprimerTache">
<input type="hidden" name="isPriv" value="true">
</button>
</form>
</td> </td>
</tr>'; </tr>';
} }
@ -114,7 +120,12 @@
} }
echo ' </tbody> echo ' </tbody>
</table> </table>'
echo '
<div id="myDIV">
<p>Starting date : '.$t->get_dateDeb().'</p>
<p>'.$t->get_dateFin().'</p>
</div>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save