Skip to content
Extraits de code Groupes Projets
Valider fde67f69 rédigé par Nassim YAICI's avatar Nassim YAICI
Parcourir les fichiers

Réctifications+Rapport

parent cc3cc8d2
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
README.md
+ 7
− 0
Voir le fichier @ fde67f69
...@@ -5,7 +5,14 @@ Création d'un forum d'achats et ventes entre les IIEns. ...@@ -5,7 +5,14 @@ Création d'un forum d'achats et ventes entre les IIEns.
Membres du groupe : Membres du groupe :
== ==
<<<<<<< HEAD
Nassim YAICI
Yixuan ZHANG
Yao SHEN
Ni CHEN
=======
* Nassim YAICI * Nassim YAICI
* Yixuan ZHANG * Yixuan ZHANG
* Yao SHEN * Yao SHEN
* Ni CHEN * Ni CHEN
>>>>>>> 931c6392b819403d7d7f1cb562572d00cef97500
RapportWeb.pdf 0 → 100644
+ 0
− 0
Voir le fichier @ fde67f69
Fichier ajouté
addComment.php
+ 1
− 1
Voir le fichier @ fde67f69
...@@ -6,7 +6,7 @@ $bdd = bdd(); ...@@ -6,7 +6,7 @@ $bdd = bdd();
$toppic=$_POST['id']; $toppic=$_POST['id'];
$toppicN=$_POST['name']; $toppicN=$_POST['name'];
if (isset($_POST['content'])) { if (isset($_POST['content'])) {
$content = $_POST['content']; $content = pg_escape_string($_POST['content']);
$userid= $_SESSION['id']; $userid= $_SESSION['id'];
$date= date("Y-m-d"); $date= date("Y-m-d");
......
class/edit.class.php
+ 11
− 10
Voir le fichier @ fde67f69
...@@ -69,19 +69,20 @@ class edit ...@@ -69,19 +69,20 @@ class edit
public function update() public function update()
{ {
$pseudo=$_SESSION['pseudo']; $pseudo=$_SESSION['pseudo'];
$requete=pg_query("SELECT * FROM users WHERE pseudo = '$pseudo'"); $requete=pg_query("SELECT mdp, adr_mail FROM users WHERE pseudo = '$pseudo'");
$result=pg_fetch_array($requete); $result=pg_fetch_array($requete);
if (empty($this->mdp)) {
$requete=pg_query("UPDATE users SET adr_mail='$this->mail'"); if(!empty($this->mail))
} {
else $requete=pg_query("UPDATE users SET adr_mail='$this->mail' where pseudo='$pseudo'");
{ }
if (empty($this->mail)) {
if(!empty($this->mdp))
{
$this->mdp = password_hash($this->mdp, PASSWORD_BCRYPT); $this->mdp = password_hash($this->mdp, PASSWORD_BCRYPT);
$requete=pg_query("UPDATE users SET adr_mail='$this->mail'"); $requete2=pg_query("UPDATE users SET mdp='$this->mdp' where pseudo='$pseudo'");
} }
$requete2=pg_query("UPDATE users SET mdp='$this->mdp'");
}
return 1; return 1;
} }
......
edit.php
+ 10
− 4
Voir le fichier @ fde67f69
...@@ -31,6 +31,7 @@ if (isset($_POST['mdp'], $_POST['mdpC']) OR isset($_POST['mail'])) { ...@@ -31,6 +31,7 @@ if (isset($_POST['mdp'], $_POST['mdpC']) OR isset($_POST['mail'])) {
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="./bootstrap/css/bootstrap.css"> <link rel="stylesheet" href="./bootstrap/css/bootstrap.css">
<link rel="stylesheet" href="./bootstrap/css/mystyle.css"> <link rel="stylesheet" href="./bootstrap/css/mystyle.css">
<script src="./script.js"></script>
</head> </head>
<body> <body>
<div class="container-fluid"> <div class="container-fluid">
...@@ -102,22 +103,27 @@ else ...@@ -102,22 +103,27 @@ else
</div> </div>
<div class="col-lg-8 text-left"> <div class="col-lg-8 text-left">
<form class="form-horizontal" role="form" method="post" action="./edit.php"> <form class="form-horizontal" role="form" method="post" action="./edit.php">
<br>
<div class="row edir"> <div class="row edir">
<label class="col-sm-2 text-right">Mot de passe</label> <label class="col-sm-2 text-right">Mot de passe</label>
<div class="col-xs-4"> <div class="col-xs-4">
<input class="form-control" id="focusedInput" type="password" name="mdp" placeholder ="Mot de passe..."> <input class="form-control" id="focusedInput" type="password" name="mdp" placeholder ="6 caractéres minimum..."
aria-required="true" pattern="^([- \w\d\u00c0-\u024f]+)$" spellcheck="false">
</div> </div>
</div> </div>
<div class="row edir"> <div class="row edir">
<label class="col-sm-2 text-right">Mot de passe</label> <label class="col-sm-2 text-right">Mot de passe</label>
<div class="col-xs-4"> <div class="col-xs-4">
<input class="form-control" id="focusedInput" type="password" name="mdpC" placeholder ="Confirmation mot de passe..."> <input class="form-control" id="focusedInput" type="password" name="mdpC" placeholder ="Confirmation 6 caractéres minimum..."
aria-required="true" pattern="^([- \w\d\u00c0-\u024f]+)$" spellcheck="false">
</div> </div>
</div> </div>
<div class="row edit"> <div class="row edit">
<label class="col-sm-2 text-right ">Nouveau mail</label> <label class="col-sm-2 text-right ">Nouvelle adresse mail</label>
<div class="col-xs-4"> <div class="col-xs-4">
<input type="mail" name="mail" class="form-control" placeholder="Nouvelle adresse mail..."> <input type="mail" name="mail" class="form-control" placeholder="Nouvelle adresse mail..."
aria-required="true" pattern="^(([-\w\d]+)(\.[-\w\d]+)*@([-\w\d]+)(\.[-\w\d]+)*(\.([a-zA-Z]{2,5}|[\d]{1,3})){1,2})$"
spellcheck="false" size="30">
</div> </div>
</div> </div>
<div class="row edit"> <div class="row edit">
......
newtopics.php
+ 18
− 19
Voir le fichier @ fde67f69
...@@ -6,7 +6,7 @@ $bdd=bdd(); ...@@ -6,7 +6,7 @@ $bdd=bdd();
if (isset($_POST['name'], $_POST['content'])) { if (isset($_POST['name'], $_POST['content'])) {
$name=$_POST['name']; $name=$_POST['name'];
$content = $_POST['content']; $content = pg_escape_string($_POST['content']);
$newtop = new newtopics($name, $content); $newtop = new newtopics($name, $content);
$verif = $newtop->verif(); $verif = $newtop->verif();
...@@ -106,29 +106,29 @@ else ...@@ -106,29 +106,29 @@ else
<br> <br>
<form class="form-horizontal" role="form" method="post" action="./newtopics.php"> <form class="form-horizontal" role="form" method="post" action="./newtopics.php">
<div class="row topic-create"> <div class="row topic-create">
<div class="col-sm-2 text-right">
<label class="col-sm-2 text-right">Catégorie</label> <label class="col-sm-2 text-right">Catégorie</label>
</div>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="selectpicker" name="category"> <select class="selectpicker" name="category">
<?php <?php
$dn2 = pg_query("SELECT * FROM keys ORDER BY name asc"); $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
while($reponse=pg_fetch_assoc($dn2)) while($reponse=pg_fetch_assoc($dn2))
{ {
?> ?>
<option id="cat"><?php echo $reponse['name']; ?></a></li> <option id="cat"><?php echo $reponse['name']; ?></a></li>
<?php <?php
} }
?> ?>
</select> </select>
</div> </div>
</div> </div>
<div class="row topic-create"> <div class="row topic-create">
<label class="col-sm-2 text-right">Titre</label> <label class="col-sm-2 text-right">Titre</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input class="form-control" id="focusedInput" type="text" name="name" placeholder ="Le titre ..."required <input class="form-control" id="focusedInput" type="text" name="name" placeholder ="Le titre ... 5 caractéres minimum"required
aria-required="true" pattern="^([- \w\d\u00c0-\u024f]+)$" spellcheck="false" size="40"> aria-required="true" pattern="^([- \w\d\u00c0-\u024f]+)$" spellcheck="false" size="40">
</div> </div>
</div> </div>
...@@ -136,8 +136,7 @@ else ...@@ -136,8 +136,7 @@ else
<div class="row topic-create"> <div class="row topic-create">
<label class="col-sm-2 text-right ">Déscription</label> <label class="col-sm-2 text-right ">Déscription</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea name="content" class="form-control" rows="15" placeholder="Le contenu ..."required <textarea name="content" class="form-control" rows="15" placeholder="Le contenu ... 10 caractéres minimum"required></textarea>
aria-required="true" spellcheck="false" ></textarea>
</div> </div>
</div> </div>
<br> <br>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter