lilian.breton
/
PHP_Project
generated from Templates_CodeFirst/templateHtmlCss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://codefirst.iut.uca.fr/git/lilian.breton/PHP_Project

Browse Source
main
thchazot1 3 years ago
parent 62379a1302 aad8e3a911
commit 422843a815
7 changed files with 157 additions and 104 deletions
Show Stats Download Patch File Download Diff File

2
Vues/signIn.php
Unescape View File

@ -10,7 +10,7 @@
<div class="container"> <div class="container">
<div class="screen"> <div class="screen">
<div class="screen__content"> <div class="screen__content">
<form class="login" method="POST"> <form class="login" method="POST" name="signUpForm" id="signUpForm">
<div class="login__field"> <div class="login__field">
<i class="login__icon fas fa-user"></i> <i class="login__icon fas fa-user"></i>
<input type="text" class="login__input" name="username" placeholder="Username" required> <input type="text" class="login__input" name="username" placeholder="Username" required>

2
config/config.php
Unescape View File

@ -1,8 +1,6 @@
<?php <?php
$rep = __DIR__ . '/../'; $rep = __DIR__ . '/../';
//$location = "Location : http://londres.uca.local/" Finir le chemin du public_html
$login="thchazot1"; $login="thchazot1";
$password="achanger"; $password="achanger";

2
controllers/FrontController.php
Unescape View File

@ -4,7 +4,7 @@ class FrontController {
public function __construct(){ public function __construct(){
$liste_actions_utilisateur = array('accessPrivateLists','crerListePv'); $liste_actions_utilisateur = array('accessPrivateLists','crerListePv');
$liste_actions_visiteur = array('goHome','changeCompletedTache','accessCreationTachePage','addTache','delTache','modifyList','accessCreationListePage','accessInscription','accessSignIn','creerListe','delListe','signIn','signUp','deconnection'); $liste_actions_visiteur = array('goHome','accessInscription','accessSignIn','signIn','signUp');
global $rep,$vues,$bd,$dataView,$styles,$assets; global $rep,$vues,$bd,$dataView,$styles,$assets;
session_start(); session_start();
try{ try{

108
controllers/UserController.php
Unescape View File

@ -14,10 +14,6 @@ class UserController {
try { try {
$action = $_REQUEST['action']; $action = $_REQUEST['action'];
switch($action) { switch($action) {
case NULL:
$this->Reinit();
break;
case "delete": case "delete":
$this->Delete(); $this->Delete();
break; break;
@ -26,28 +22,12 @@ class UserController {
$this->Update(); $this->Update();
break; break;
case "ajouterListeU": case "deconnection":
$this->AddList(); $this->deconnection($dVueEreur);
break;
case "supprimerListeU":
$this->DelList();
break;
case "modifierListeU":
$this->UpdateList();
break; break;
case "ajouterTacheU": case "ajouterListePrivee":
$this->AddTask(); $this->AddListPrivate();
break;
case "supprimerTacheU":
$this->DelTask();
break;
case "modifierTacheU":
$this->UpdateTask();
break; break;
case "viewPrivateList": case "viewPrivateList":
@ -72,31 +52,6 @@ class UserController {
exit(0); exit(0);
} }
function Reinit() {
global $rep,$vues;
$dVue = array (
'username' => "",
'password' => "",
);
require ($rep.$vues['accueil']);
}
function ValidationFormulaire(array $dVueEreur){
global $rep, $vues;
$username = $_POST['username'];
$mdp = $_POST['password'];
Validation::val_form($username, $mdp, $dVueEreur);
$dVue = array (
'username' => $username,
'password' => $mdp,
);
require ($rep.$vues['accueil']);
}
function Delete() { function Delete() {
if(isset($_SESSION['username'])) { if(isset($_SESSION['username'])) {
$results = $this->$mdlUsr->delete(); //A compléter avec bons arguments $results = $this->$mdlUsr->delete(); //A compléter avec bons arguments
@ -113,46 +68,37 @@ class UserController {
} }
} }
function AddList() { function AddListPrivate($dVueEreur) {
if(isset($_SESSION['username'])){ global $rep, $vues, $dataView;
$results = $this->$mdlUsr->addList($user); //changer arguments
require ($rep.$vues['addTask']);
}
}
function DelList() { $name=$_POST['name'];
if(isset($_SESSION['username'])){ $private=$_POST['private'];
$results = $this->$mdlUsr->delList($user); //aa
require ($rep.$vues['accueil']);
}
}
function UpdateList() { Validation::val_creation_Liste_PV($nomListe, $arrayErrorViews);
if(isset($_SESSION['username'])){
$results = $this->$mdlUsr->updateList($user); //changer arguments
require ($rep.$vues['...']); // Appel vue à changer
}
}
function AddTask() { try {
if(isset($_SESSION['username'])){ MdlListe::insert($name, $private, $_SESSION['login']);
$results = $this->$mdlUsr->addList($user); //changer arguments
require ($rep.$vues['...']); // Appel vue à changer
} }
catch (PDOException $e) {
$dataView[]="Erreur inatendue";
require($rep.$vues['erreur']);
}
} }
function DelTask() { function PrivateList($dVueEreur){
if(isset($_SESSION['username'])){ global $rep, $vues, $dataView;
$results = $this->$mdlUsr->delTask($user); //aa $model = new MdlListe();
require ($rep.$vues['...']); // apegffo, $dataView = $model->pullListesPrivees($_SESSION['login']);
} require($rep.$vues['accueilPrivate']);
} }
function UpdateTask() { function deconnection($dVueEreur){
if(isset($_SESSION['username'])){ global $rep, $vues;
$results = $this->$mdlUsr->updateTask($user); //aa $model = new MdlUser();
require ($rep.$vues['.']); // apegffo, $retour = $model->deconnection();
} $_REQUEST['action']=null;
$control= new VisitorController();
$dVueEreur = array();
} }
} }

128
controllers/VisitorController.php
Unescape View File

@ -3,8 +3,8 @@ class VisitorController {
function __construct() function __construct()
{ {
global $rep,$vues; global $rep,$vues;
$mdlUsr = new MdlUser();
//session_start(); //session_start();
$dVueEreur = array (); $dVueEreur = array ();
@ -29,6 +29,26 @@ class VisitorController {
require($rep.$vues['signIn']); require($rep.$vues['signIn']);
break; break;
case "supprimerListe":
$this->DelList();
break;
case "modifierListe":
$this->UpdateList();
break;
case "ajouterTache":
$this->AddTask();
break;
case "supprimerTache":
$this->DelTask();
break;
case "modifierTache":
$this->UpdateTask();
break;
default: default:
$dVueEreur[] = "Erreur d'appel php"; $dVueEreur[] = "Erreur d'appel php";
require ($rep.$vues['accueil']); require ($rep.$vues['accueil']);
@ -44,24 +64,24 @@ class VisitorController {
$model = new MdlListe(); $model = new MdlListe();
$dataView = $model->getPublicList(); $dataView = $model->getPublicList();
require($rep.$vues['accueil']); require($rep.$vues['accueil']);
$vues_erreur= array(); $dVueEreur= array();
} }
public function Inscription(array $vues_erreur){ public function Inscription(array $dVueEreur){
global $rep,$vues,$dataView; global $rep,$vues,$dataView;
$username=$_POST['username']; $username=$_POST['username'];
$password=$_POST['password']; $password=$_POST['password'];
$confirm=$_POST['passwordconf']; $confirm=$_POST['passwordconf'];
$model = new MdlUser(); $model = new MdlUser();
$vues_erreur=Validation::val_inscription($username,$password,$confirm,$vues_erreur); $dVueEreur=Validation::val_inscription($username,$password,$confirm,$dVueEreur);
if($model->existUser($username)){ if($model->existUser($username)){
$vues_erreur[]="Username already taken"; $dVueEreur[]="Username already taken";
} }
if(empty($vues_erreur)){ if(empty($dVueEreur)){
$hash= password_hash($password,PASSWORD_DEFAULT); $hash= password_hash($password,PASSWORD_DEFAULT);
$model->singUp($username,$hash); $model->singUp($username,$hash);
$vues_erreur= array(); $dVueEreur= array();
} }
else{ else{
require($rep.$vues['signUp']); require($rep.$vues['signUp']);
@ -70,16 +90,17 @@ class VisitorController {
$this->reinit(); $this->reinit();
} }
public function Connexion(array $dVueEreur){
public function Connection(array $vues_erreur){
global $rep,$vues,$dataView; global $rep,$vues,$dataView;
$username=$_POST['username']; $username=$_POST['login'];
$password=$_POST['password']; $password=$_POST['mdp'];
$vues_erreur=Validation::val_connexion($username,$password,$vues_erreur); $dVueEreur=Validation::val_connexion($username,$password,$dVueEreur);
if(!empty($vues_erreur)){ if(!empty($dVueEreur)){
require($rep.$vues['signIn']); require($rep.$vues['signIn']);
} }
$model= new MdlUser(); $model= new MdlUser();
$model->insert("wesh", "wesh");
if($model->existUser($username)){ if($model->existUser($username)){
echo $model->getPasswordHash($username); echo $model->getPasswordHash($username);
if(password_verify($password,$model->getPasswordHash($username))){ if(password_verify($password,$model->getPasswordHash($username))){
@ -87,17 +108,92 @@ class VisitorController {
$model->connexion($username); $model->connexion($username);
$_REQUEST['action']=null; $_REQUEST['action']=null;
$this->reinit(); $this->reinit();
$vues_erreur= array(); $dVueEreur= array();
} }
else{ else{
$vues_erreur =array('username'=>$username,'password'=>$password); $dVueEreur =array('username'=>$username,'password'=>$password);
require($rep.$vues['signIn']); require($rep.$vues['signIn']);
} }
} }
else{ else{
$vues_erreur =array('username'=>$usrname,'password'=>$pwd); $dVueEreur =array('username'=>$usrname,'password'=>$pwd);
require($rep.$vues['signIn']); require($rep.$vues['signIn']);
} }
} }
function DelList($dVueEreur) {
global $rep, $vues;
$idListe=$_POST['liste'];
$name=$_POST['name'];
$private=$_POST['private'];
$model = new MdlListe();
$model->delete($idListe, $name, $private);
$_REQUEST['action']=null;
$this->reinit();
$dVueEreur= array();
}
function UpdateList($dVueEreur) {
global $rep, $vues;
$idListe=$_POST['liste'];
$name=$_POST['name'];
$private=$_POST['private'];
$model = new MdlListe();
$model->update($idListe, $name, $private);
$_REQUEST['action']=null;
$this->reinit();
$dVueEreur= array();
}
function AddTask($dVueEreur) {
global $rep,$vues,$dataView;
$nom=$_POST['name'];
$idListe=$_POST['liste'];
$content=$_POST['content'];
$completed=$_POST['completed'];
$dVueEreur = Validation::val_intitule($nom, $dVueEreur);
if(!empty($dVueEreur)){
require($rep.$vues['addTask']);
}
else{
$model = new MdlTache();
$model->insert($nom, $content, $completed, $idListe);
$_REQUEST['action']="accessListInfos";
$this->accessListInfos($dVueEreur);
$dVueEreur= array();
}
}
function accessListInfos($dVueEreur){
global $rep,$vues,$dataView;
$idListe=$_POST['liste'];
$model = new MdlListe();
$dataView = $model->findById($idListe);
require($rep.$vues['seeList']);
$dVueEreur= array();
}
function DelTask($dVueEreur) {
global $rep,$vues,$dataView;
$idTache=$_POST['tache'];
$model= new MdlTache();
$model->delete($idTache);
$_REQUEST['action']="accessListInfos";
$this->accessListInfos($dVueEreur);
$dVueEreur= array();
}
function UpdateTask($dVueEreur) {
global $rep,$vues,$dataView;
$idTache=$_POST['tache'];
$name=$_POST['name'];
$content=$_POST['content'];
$completed=$_POST['completed'];
$model = new MdlTache();
$model->update($idTache, $name, $content, $completed);
$_REQUEST['action']="accessListInfos";
$this->accessListInfos($dVueEreur);
$dVueEreur= array();
}
} }
?> ?>

12
gateway/ListeGateway.php
Unescape View File

@ -92,6 +92,18 @@ class ListeGateway
} }
$listes[] = new Liste($row['id'], $row['name'],false, null, $taches); $listes[] = new Liste($row['id'], $row['name'],false, null, $taches);
$taches = array(); $taches = array();
<<<<<<< HEAD
/*$queryBug = "SELECT count(*) FROM Liste WHERE idCreator IS NULL";
$this->con->executeQuery($queryBug, array(':idListe' => array($idListe, PDO::PARAM_INT)));
$resultsBug = $this->con->getResults();
echo "$resultsBug[0][0]";
if (sizeof($listes)===$resultsBug[0][0]){
break;
}
*/
=======
>>>>>>> cd1b36dfd8a0767bdf2fe5ed8a1c4626e0921507
} }
} }

7
gateway/UserGateway.php
Unescape View File

@ -11,7 +11,7 @@ class UserGateway
public function insert(User $u){ public function insert(User $u){
try{ try{
$query = "INSERT INTO Utilisateur VALUES (null, :username, :password)"; $query = "INSERT INTO Utilisateur VALUES (null, :username, PASSWORD(:password))";
$this->con->executeQuery($query, array(':username' => array($u->getUsername(), PDO::PARAM_STR), ':password' => array($u->getPassword(), PDO::PARAM_STR))); $this->con->executeQuery($query, array(':username' => array($u->getUsername(), PDO::PARAM_STR), ':password' => array($u->getPassword(), PDO::PARAM_STR)));
} }
catch(PDOException $Exception){ catch(PDOException $Exception){
@ -50,9 +50,10 @@ class UserGateway
function getHashedPassword(string $usrname):?string{ function getHashedPassword(string $usrname):?string{
$truePasswd=null; $truePasswd=null;
$query="SELECT password FROM Utilisateur WHERE username=:username";
$query="SELECT PASSWORD(`password`) FROM Utilisateur WHERE username=:username";
$this->con->executeQuery($query,array('username'=>array($usrname,PDO::PARAM_STR))); $this->con->executeQuery($query,array('username'=>array($usrname,PDO::PARAM_STR)));
$results=$this->con->getResults(); $results=$co->getResults();
foreach($results as $row){ foreach($results as $row){
$truePasswd=$row['password']; $truePasswd=$row['password'];
} }

Write Preview
Loading…
Cancel
Save