From f30fdcdc0518d0db92f419271b708447a7d3a8b6 Mon Sep 17 00:00:00 2001
From: Nassim YAICI <nassim.yaici@ensiie.fr>
Date: Thu, 12 May 2016 19:02:07 +0200
Subject: [PATCH] master
---
accueil.php | 37 ++++++++++--
adminEdit.php | 113 +++++++++++++++++++++++++++++++++++++
adminEditTopics.php | 113 +++++++++++++++++++++++++++++++++++++
affichetoppic.php | 115 ++++++++++++++++++++++++++++++++++++++
class/newtopics.class.php | 5 +-
edit.php | 17 +++++-
login.php | 4 +-
newtopics.php | 45 +++++++++------
topiclist.php | 45 +++++++++++----
9 files changed, 454 insertions(+), 40 deletions(-)
create mode 100644 adminEdit.php
create mode 100644 adminEditTopics.php
create mode 100644 affichetoppic.php
diff --git a/accueil.php b/accueil.php
index 230b758..7dcb6b4 100644
--- a/accueil.php
+++ b/accueil.php
@@ -17,8 +17,6 @@ $bdd=bdd();
<div class="container-fluid">
<div class="jumbotron">
<h1><span style="color: white">Com-Ensiie</span></h1>
-
-
</div>
<?php
if (isset($_SESSION['pseudo'])) {
@@ -38,7 +36,7 @@ $bdd=bdd();
<?php
}
?>
- </div>
+ </div>
<div>
<nav class="navbar navbar-inverse">
<div class="navbar-header">
@@ -68,7 +66,19 @@ $bdd=bdd();
<div class="container-fluid text-center">
<div class="row content">
<div class="col-sm-2 sidenav">
-
+ <?php
+ if(isset($_SESSION['su'])){
+ if ($_SESSION['su']=='t') {
+ ?>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEdit.php'" >Edit users</button><br><br>
+ </div>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEditTopics.php'" >Edit toppics</button>
+ </div>
+ <?php
+ }}
+ ?>
</div>
<div class="col-lg-8 lg-8 text-left">
@@ -81,9 +91,26 @@ $bdd=bdd();
<th class="lead">Catégorie</th>
<th class="lead">Sujet</th>
<th class="lead">Date</th>
-
+ <?php
+ $sql=pg_query("SELECT * FROM toppics NATURAL JOIN keys ORDER BY date");
+ ?>
</tr>
</thead>
+
+ <?php
+
+ while($reponse=pg_fetch_assoc($sql))
+ {
+ ?>
+ <tr>
+ <td><a href="topiclist.php?category=<?php echo $reponse['name'];?>"><?php echo $reponse['name'];?></a></td>
+ <td><a href="affichetoppic.php?toppic=<?php echo $reponse['namet'];?>"><?php echo $reponse['namet'];?></td>
+ <td><?php echo $reponse['date'];?></td>
+ </tr>
+ <?php
+
+ }
+ ?>
</table>
</div>
diff --git a/adminEdit.php b/adminEdit.php
new file mode 100644
index 0000000..4da7862
--- /dev/null
+++ b/adminEdit.php
@@ -0,0 +1,113 @@
+<?php
+session_start();
+require_once"fonction.php";
+require_once"./class/edit.class.php";
+$bdd=bdd();
+
+if (isset($_POST['mdp'], $_POST['mdpC']) OR isset($_POST['mail'])) {
+ $mdp=$_POST['mdp'];
+ $mdpC=$_POST['mdpC'];
+ $mail = $_POST['mail'];
+ $edit = new edit($mdp, $mdpC, $mail);
+ $verif = $edit->verify();
+
+ if ($verif =="ok") {
+ $insert = $edit->update();
+ header("Location: ./login.php");
+ }
+ else
+ {
+ $erreur = $verif;
+ }
+}
+
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>Com-Ensiie</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" href="./bootstrap/css/bootstrap.css">
+ <link rel="stylesheet" href="./bootstrap/css/mystyle.css">
+</head>
+<body>
+ <div class="container-fluid">
+ <div class="jumbotron">
+ <h1><span style="color: white">Com-Ensiie</span></h1>
+<?php
+if(isset($_SESSION['pseudo'])){
+ $pseudo=$_SESSION['pseudo'];
+?>
+ </div>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./deconnexion.php'" >Deconnexion</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./edit.php'" >Edit</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./newtopics.php'" >Nouveau sujet</button>
+ <label for="hello"><?php echo "Vous êtes connectés entant que : $pseudo";?></label>
+ </div>
+<?php
+}
+else
+{
+?>
+ </div>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./login.php'" >Log In</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./register.php'">Register</button>
+ </div>
+<?php
+}
+?>
+ <nav class="navbar navbar-inverse">
+ <div class="navbar-header">
+ <a class="navbar-brand" href="./accueil.php">Com-Ensiie</a>
+ </div>
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Commercial <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <li><a id="cat" href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+
+ <?php
+ }
+ ?>
+ </ul>
+ </li>
+ </ul>
+ </nav>
+</div>
+
+
+
+<div class="container-fluid text-center">
+ <div class="row content">
+ <div class="col-sm-2 sidenav">
+ <?php
+ if ($_SESSION['su']==TRUE) {
+ ?>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEdit.php'" >Edit users</button><br><br>
+ </div>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEditTopics.php'" >Edit toppics</button>
+ </div>
+ <?php
+ }
+ ?>
+ </div>
+ <div class="col-lg-8 text-left">
+ <h1>Modify users</h1>
+
+ </div>
+
+
+ </div>
+</div>
+ <div class="footer"></div>
+</div>
+</body>
+</html>
diff --git a/adminEditTopics.php b/adminEditTopics.php
new file mode 100644
index 0000000..1ddfd6a
--- /dev/null
+++ b/adminEditTopics.php
@@ -0,0 +1,113 @@
+<?php
+session_start();
+require_once"fonction.php";
+require_once"./class/adminEditToppic.class.php";
+$bdd=bdd();
+
+if (isset($_POST['mdp'], $_POST['mdpC']) OR isset($_POST['mail'])) {
+ $mdp=$_POST['mdp'];
+ $mdpC=$_POST['mdpC'];
+ $mail = $_POST['mail'];
+ $edit = new adminEditToppic($mdp, $mdpC, $mail);
+ $verif = $edit->verify();
+
+ if ($verif =="ok") {
+ $insert = $edit->update();
+ header("Location: ./login.php");
+ }
+ else
+ {
+ $erreur = $verif;
+ }
+}
+
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>Com-Ensiie</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" href="./bootstrap/css/bootstrap.css">
+ <link rel="stylesheet" href="./bootstrap/css/mystyle.css">
+</head>
+<body>
+ <div class="container-fluid">
+ <div class="jumbotron">
+ <h1><span style="color: white">Com-Ensiie</span></h1>
+<?php
+if(isset($_SESSION['pseudo'])){
+ $pseudo=$_SESSION['pseudo'];
+?>
+ </div>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./deconnexion.php'" >Deconnexion</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./edit.php'" >Edit</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./newtopics.php'" >Nouveau sujet</button>
+ <label for="hello"><?php echo "Vous êtes connectés entant que : $pseudo";?></label>
+ </div>
+<?php
+}
+else
+{
+?>
+ </div>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./login.php'" >Log In</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./register.php'">Register</button>
+ </div>
+<?php
+}
+?>
+ <nav class="navbar navbar-inverse">
+ <div class="navbar-header">
+ <a class="navbar-brand" href="./accueil.php">Com-Ensiie</a>
+ </div>
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Commercial <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <li><a id="cat" href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+
+ <?php
+ }
+ ?>
+ </ul>
+ </li>
+ </ul>
+ </nav>
+</div>
+
+
+
+<div class="container-fluid text-center">
+ <div class="row content">
+ <div class="col-sm-2 sidenav">
+ <?php
+ if ($_SESSION['su']==TRUE) {
+ ?>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEdit.php'" >Edit users</button><br><br>
+ </div>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEditTopics.php'" >Edit toppics</button>
+ </div>
+ <?php
+ }
+ ?>
+ </div>
+ <div class="col-lg-8 text-left">
+ <h1>Modify toppics</h1>
+
+ </div>
+
+
+ </div>
+</div>
+ <div class="footer"></div>
+</div>
+</body>
+</html>
diff --git a/affichetoppic.php b/affichetoppic.php
new file mode 100644
index 0000000..9d2f3fd
--- /dev/null
+++ b/affichetoppic.php
@@ -0,0 +1,115 @@
+<?php
+session_start();
+ require_once"fonction.php";
+ $bdd = bdd();
+
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>Com-Ensiie</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" href="./bootstrap/css/bootstrap.css">
+ <link rel="stylesheet" href="./bootstrap/css/mystyle.css">
+ <script src="./script.js"></script>
+</head>
+<body>
+
+<div class="container-fluid">
+ <div class="jumbotron">
+ <h1><span style="color: white">Com-Ensiie</span></h1>
+ </div>
+<?php
+if(isset($_SESSION['pseudo'])){
+ $pseudo=$_SESSION['pseudo'];
+?>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./deconnexion.php'" >Deconnexion</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./edit.php'" >Edit</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./newtopics.php'" >Nouveau sujet</button>
+ <label for="hello"><?php echo "Vous êtes connectés entant que : $pseudo";?></label>
+
+<?php
+}
+else
+{
+?>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./login.php'" >Se connecter</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./register.php'">S'enregistrer</button>
+
+<?php
+}
+?>
+</div>
+<div>
+<nav class="navbar navbar-inverse">
+ <div class="navbar-header">
+ <a class="navbar-brand" href="accueil.php">Com-Ensiie</a>
+ </div>
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a class="dropdown-toggle" data-toggle="dropdown" href="./topiclist.php">Commercial <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <?php
+
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <li><a id="cat" href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ <?php
+ }
+ ?>
+ </ul>
+ </li>
+ </ul>
+ </nav>
+ </div>
+ <div class="container-fluid text-center">
+ <div class="row content">
+ <div class="col-sm-2 sidenav">
+
+ </div>
+<?php
+if(isset($_GET['toppic'])){
+ $name=htmlspecialchars($_GET['toppic']);
+ $sql=pg_query("SELECT * FROM toppics JOIN users ON (users_id=users.id) WHERE namet='$name' ORDER BY date");
+}
+
+?>
+<div class="col-lg-8 lg-8 text-left">
+ <table class="table">
+ <col width="20%">
+ <col width="60%">
+ <col width="20%">
+ <thead>
+ <tr>
+ <th class="lead">Auteur</th>
+ <th class="lead">Contenu</th>
+ <th class="lead">Date</th>
+ </tr>
+ </thead>
+
+ <?php
+
+ while($reponse=pg_fetch_assoc($sql))
+ {
+ ?>
+ <tr>
+ <td><?php echo $reponse['pseudo'];?></td>
+ <td><?php echo $reponse['content'];?></td>
+ <td><?php echo $reponse['date'];?></td>
+ </tr>
+ <?php
+
+ }
+ ?>
+ </table>
+ </div>
+</div>
+ <div class="message">Cette catégorie ne contient aucun sujet.</div>
+</div>
+</div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/class/newtopics.class.php b/class/newtopics.class.php
index f0a1c7a..51523e7 100644
--- a/class/newtopics.class.php
+++ b/class/newtopics.class.php
@@ -35,8 +35,9 @@ class newtopics
public function insert()
{
- $id = $_SESSION['id'];
- $requete = "INSERT INTO toppics values('$this->name', '$this->content', '$id')";
+ $idusers = $_SESSION['id'];
+ $date = date("Y-m-d");
+ $requete = "INSERT INTO toppics(namet, content, date, users_id) values('$this->name', '$this->content', '$date', $idusers)";
$sql = pg_query($requete);
return 1;
diff --git a/edit.php b/edit.php
index 37652d1..bc600e4 100644
--- a/edit.php
+++ b/edit.php
@@ -80,13 +80,24 @@ else
</ul>
</nav>
</div>
-
-
<div class="container-fluid text-center">
<div class="row content">
<div class="col-sm-2 sidenav">
-
+ <?php
+ if(isset($_SESSION['su'])){
+ if ($_SESSION['su']) {
+ ?>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEdit.php'" >Edit users</button><br><br>
+ </div>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEditTopics.php'" >Edit toppics</button>
+ </div>
+ <?php
+ }
+ }
+ ?>
</div>
<div class="col-lg-8 text-left">
<h1>Modify profil</h1>
diff --git a/login.php b/login.php
index 90ff96e..0d33cda 100644
--- a/login.php
+++ b/login.php
@@ -76,9 +76,7 @@ if (isset($_POST['pseudo']) AND isset($_POST['mdp']))
<div class="container-fluid text-center">
<div class="row content">
<div class="col-sm-2 sidenav">
- <p><a href="#">Link</a></p>
- <p><a href="#">Link</a></p>
- <p><a href="#">Link</a></p>
+
</div>
<div class="col-lg-8 text-left">
diff --git a/newtopics.php b/newtopics.php
index 68d3607..a80a3a5 100644
--- a/newtopics.php
+++ b/newtopics.php
@@ -11,7 +11,9 @@ if (isset($_POST['name'], $_POST['content'])) {
$verif = $newtop->verif();
if ($verif =="ok") {
- $insert = $newtop->insert();
+ if($newtop->insert()){
+ header("Location: accueil.php");
+ }
}
else
{
@@ -62,21 +64,21 @@ else
<a class="navbar-brand" href="./accueil.php">Com-Ensiie</a>
</div>
<ul class="nav navbar-nav">
- <li class="dropdown active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Commercial <span class="caret"></span></a>
+ <li class="dropdown active"><a class="dropdown-toggle" data-toggle="dropdown" href="./topiclist.php">Commercial <span class="caret"></span></a>
<ul class="dropdown-menu">
- <?php
- $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
- while($reponse=pg_fetch_assoc($dn2))
- {
- ?>
- <li><a id="cat" href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
-
- <?php
- }
- ?>
+ <?php
+
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <li><a id="cat" href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ <?php
+ }
+ ?>
</ul>
- </li>
- </ul>
+ </li>
+ </ul>
</nav>
</div>
@@ -85,7 +87,19 @@ else
<div class="container-fluid text-center">
<div class="row content">
<div class="col-sm-2 sidenav">
-
+ <?php
+ if(isset($_SESSION['su'])){
+ if ($_SESSION['su']=='t') {
+ ?>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEdit.php'" >Edit users</button><br><br>
+ </div>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEditTopics.php'" >Edit toppics</button>
+ </div>
+ <?php
+ }}
+ ?>
</div>
<div class="col-lg-8 text-left">
<h1>Create Topic</h1>
@@ -133,7 +147,6 @@ else
</form>
</div>
-
</div>
</div>
<div class="footer"></div>
diff --git a/topiclist.php b/topiclist.php
index 0b36546..43f53ac 100644
--- a/topiclist.php
+++ b/topiclist.php
@@ -35,8 +35,8 @@ if(isset($_SESSION['pseudo'])){
else
{
?>
- <button type="button" class="btn btn-success btn-right" onclick="location.href='./login.php'" >Log In</button>
- <button type="button" class="btn btn-success btn-right" onclick="location.href='./register.php'">Register</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./login.php'" >Se connecter</button>
+ <button type="button" class="btn btn-success btn-right" onclick="location.href='./register.php'">S'enregistrer</button>
<?php
}
@@ -68,16 +68,29 @@ else
<div class="container-fluid text-center">
<div class="row content">
<div class="col-sm-2 sidenav">
-
+ <?php
+ if(isset($_SESSION['su'])){
+ if ($_SESSION['su']=='t') {
+ ?>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEdit.php'" >Edit users</button><br><br>
+ </div>
+ <div>
+ <button type="button" class="btn btn-info btn-right" onclick="location.href='./adminEditTopics.php'" >Edit toppics</button>
+ </div>
+ <?php
+ }}
+ ?>
+
</div>
<?php
-if(isset($_GET['name'])){
- $name=htmlspecialchars($_GET['name']);
- $sql=pg_query("SELECT * FROM toppics WHERE name='$name' ORDER BY date");
+if(isset($_GET['category'])){
+ $name=htmlspecialchars($_GET['category']);
+ $sql=pg_query("SELECT * FROM toppics NATURAL JOIN keys WHERE name='$name' ORDER BY date");
}
else
{
- $sql=pg_query("SELECT * FROM toppics ORDER BY date");
+ $sql=pg_query("SELECT * FROM toppics NATURAL JOIN keys ORDER BY (date, name)");
}
?>
<div class="col-lg-8 lg-8 text-left">
@@ -87,18 +100,28 @@ else
<col width="20%">
<thead>
<tr>
- <th class="lead">Category</th>
+ <th class="lead">Catégorie</th>
<th class="lead">Sujet</th>
<th class="lead">Date</th>
+ </tr>
+ </thead>
+
<?php
+
while($reponse=pg_fetch_assoc($sql))
{
+ ?>
+ <tr>
+ <td><a href="topiclist.php?category=<?php echo $reponse['name'];?>"><?php echo $reponse['name'];?></a></td>
+ <td><a href="affichetoppic.php?toppic=<?php echo $reponse['namet'];?>"><?php echo $reponse['namet'];?></td>
+ <td><?php echo $reponse['date'];?></td>
+ </tr>
+ <?php
}
?>
- </tr>
- </thead>
- </table>
+ </table>
+ </div>
</div>
<div class="message">Cette catégorie ne contient aucun sujet.</div>
</div>
--
GitLab