diff --git a/accueil.php b/accueil.php
index 7dcb6b409013ed050646056301d4159246c53b9c..e225c3b60c4a777cc799ed5e9221d581e37676c0 100644
--- a/accueil.php
+++ b/accueil.php
@@ -42,22 +42,19 @@ $bdd=bdd();
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</nav>
</div>
@@ -92,7 +89,7 @@ $bdd=bdd();
<th class="lead">Sujet</th>
<th class="lead">Date</th>
<?php
- $sql=pg_query("SELECT * FROM toppics NATURAL JOIN keys ORDER BY date");
+ $sql=pg_query("SELECT name, namet, date FROM toppics JOIN keys ON(id_key=keys.id) ORDER BY (date,name)");
?>
</tr>
</thead>
diff --git a/addComment.php b/addComment.php
new file mode 100644
index 0000000000000000000000000000000000000000..7a94945ad989d754903d07fef7b3f82e1b75cb35
--- /dev/null
+++ b/addComment.php
@@ -0,0 +1,141 @@
+<?php
+session_start();
+require_once"fonction.php";
+require_once"./class/addComment.class.php";
+$bdd=bdd();
+
+if (isset($_POST['content'])) {
+ $content=$_POST['content'];
+ $comment = new addComment($content, $_POST['namet']);
+ $verif = $comment->verify();
+
+ if ($verif =="ok") {
+ $add = $comment->insert($content, $comment->sujet);
+ header("Location: topiclist.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">
+ <script type="text/javascript" src="./script.js"></script>
+</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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
+ </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']=='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">
+ <br>
+ <form class="form-horizontal" role="form" method="post" action="./addComment.php">
+ <?php
+ if (isset($_GET['toppic'])) {
+ $top = htmlspecialchars($_GET['toppic']);
+ $requete=pg_fetch_array(pg_query("SELECT namet FROM toppics WHERE id=$top"));
+ ?>
+ <div class="row comment-create">
+ <label class="col-sm-2 text-right ">Topic </label>
+ <label class="col-sm-6 text-right"><?php echo $requete['namet'];?></label>
+ </div>
+ <?php
+
+ }
+ ?>
+
+ <div class="row comment-create">
+ <label class="col-sm-2 text-right ">Commentaire</label>
+ <div class="col-sm-10">
+ <textarea name="content" class="form-control" rows="10" placeholder="Votre commentaire..."required
+ aria-required="true" spellcheck="false"></textarea>
+ </div>
+ </div>
+ <br>
+ <input type="hidden" name="namet" value="<?php echo $requete['namet'];?>">
+ <button id="submit" class="btn btn-primary topic-create center-block">Ajouter</button>
+ <?php
+ if (isset($erreur)) {
+ echo $erreur;
+ }
+ ?>
+ </form>
+ </div>
+
+
+ </div>
+</div>
+ <div class="footer"></div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/adminEdit.php b/adminEdit.php
index 84ca5858113731615fb5cbbd8bcecc280c618ca1..fd2ee88f3e71d15c5c3ac1adbb6cbd945c0a7d54 100644
--- a/adminEdit.php
+++ b/adminEdit.php
@@ -44,22 +44,19 @@ else
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</nav>
</div>
diff --git a/adminEditTopics.php b/adminEditTopics.php
index 8983abe5d9169ee556949d6b33d43f49b3afa483..8aa19efc3bc006ad16e2eddda3aaf1bcbd925f5b 100644
--- a/adminEditTopics.php
+++ b/adminEditTopics.php
@@ -44,22 +44,19 @@ else
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</nav>
</div>
@@ -69,23 +66,22 @@ else
<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>
+ 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>
+ <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">
<?php
$sql=pg_query("SELECT * FROM toppics NATURAL JOIN keys ORDER BY (date, name)");
- $reponse1=pg_fetch_array($sql);
- var_dump($reponse1);
?>
<div class="col-lg-8 lg-8 text-left">
<table class="table">
diff --git a/affichetoppic.php b/affichetoppic.php
index 9d2f3fd06a5b54b30b2a841a1ae0b69da06643ea..fb72ff259b56667a56cf7dd1d254ce66d60c7747 100644
--- a/affichetoppic.php
+++ b/affichetoppic.php
@@ -47,33 +47,42 @@ else
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</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']=='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['toppic'])){
$name=htmlspecialchars($_GET['toppic']);
- $sql=pg_query("SELECT * FROM toppics JOIN users ON (users_id=users.id) WHERE namet='$name' ORDER BY date");
+ $sql=pg_query("SELECT pseudo, content, date, toppics.id FROM toppics JOIN users ON (users_id=users.id) WHERE namet='$name' ORDER BY date");
}
?>
@@ -94,6 +103,7 @@ if(isset($_GET['toppic'])){
while($reponse=pg_fetch_assoc($sql))
{
+ $idTop=$reponse['id'];
?>
<tr>
<td><?php echo $reponse['pseudo'];?></td>
@@ -104,10 +114,44 @@ if(isset($_GET['toppic'])){
}
?>
+ <tr>
+ <table class="table">
+ <col width="20%">
+ <col width="60%">
+ <col width="20%">
+ <thead>
+ <tr>
+ <th class="lead">Pseudo</th>
+ <th class="lead">Commentaire</th>
+ <th class="lead">Date</th>
+ </tr>
+ </thead>
+ <?php
+ $sql1=pg_query("SELECT pseudo, comments.date, comments.content FROM (comments JOIN toppics ON(toppics.id=toppics_id)) JOIN users ON (comments.users_id=users.id) WHERE namet='$name' ORDER BY date");
+ while($reponse1=pg_fetch_assoc($sql1))
+ {
+ ?>
+ <tr>
+ <td><?php echo $reponse1['pseudo'];?></td>
+ <td><?php echo $reponse1['content'];?></td>
+ <td><?php echo $reponse1['date'];?></td>
+ </tr>
+ <?php
+
+ }
+ ?>
+ </table>
+
+ </tr>
</table>
</div>
+ <div>
+<button type="button" class="btn btn-success btn-right" onclick="location.href='./addComment.php?toppic=<?php echo $idTop; ?>'">Commenter</button>
+
+ </div>
</div>
- <div class="message">Cette catégorie ne contient aucun sujet.</div>
+
+
</div>
</div>
diff --git a/class/addComment.class.php b/class/addComment.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..313bdfed1bc3dac942eb999061b3e72b72e3d41e
--- /dev/null
+++ b/class/addComment.class.php
@@ -0,0 +1,39 @@
+<?php
+require_once("/../fonction.php");
+
+class addComment
+{
+ private $content;
+ private $idTop;
+ private $bdd;
+
+ public function __construct($content, $sujet)
+ {
+ $this->content=pg_escape_string(htmlspecialchars($content));
+ $this->sujet=pg_escape_string(htmlspecialchars($sujet));
+ $this->bdd = bdd();
+ }
+
+ public function verify()
+ {
+ if (empty($this->content)) {
+ return "Veuillez remplir le contenu du commentaire !!!";
+ }
+ else
+ {
+ return "ok";
+ }
+ }
+
+
+ public function insert($content, $sujet)
+ {
+ $idUser=$_SESSION['id'];
+ $date=date("Y-m-d");
+ $requete = pg_fetch_array(pg_query("SELECT id FROM toppics where namet='$sujet'"));
+ $idTop=$requete['id'];
+ $requete=pg_query("INSERT INTO comments(content, date, users_id, toppics_id) values('$this->content', '$date', $idUser, $idTop)");
+ return 1;
+ }
+}
+?>
\ No newline at end of file
diff --git a/class/newtopics.class.php b/class/newtopics.class.php
index 9906d8236d39dfb45fd5b2165fae99f16fcf2916..e89d62d30ad36f237d2394427bdb27c31708af74 100644
--- a/class/newtopics.class.php
+++ b/class/newtopics.class.php
@@ -37,7 +37,10 @@ class newtopics
{
$idusers = $_SESSION['id'];
$date = date("Y-m-d");
- $requete = pg_query("INSERT INTO toppics(namet, content, date, users_id) values('$this->name', '$this->content', '$date', $idusers)");
+ $category=$_POST['category'];
+ $sql2=pg_fetch_array(pg_query("SELECT id from keys where name='$category'"));
+ $idCat=$sql2['id'];
+ $requete = pg_query("INSERT INTO toppics(namet, content, date, users_id, id_key) values('$this->name', '$this->content', '$date', $idusers, $idCat)");
return 1;
}
diff --git a/edit.php b/edit.php
index bc600e4d1c44094a086c5ad33a491a39fa7b2c94..40ce5ff82127b5292b23ad202a905bb96d1f5825 100644
--- a/edit.php
+++ b/edit.php
@@ -62,22 +62,19 @@ else
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</nav>
</div>
@@ -86,7 +83,7 @@ else
<div class="col-sm-2 sidenav">
<?php
if(isset($_SESSION['su'])){
- if ($_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>
@@ -100,7 +97,6 @@ else
?>
</div>
<div class="col-lg-8 text-left">
- <h1>Modify profil</h1>
<form class="form-horizontal" role="form" method="post" action="./edit.php">
<div class="row edir">
<label class="col-sm-2 text-right">Mot de passe</label>
diff --git a/login.php b/login.php
index 0d33cda960b072935710b439045c7fc4829f5ef1..d04a2c7e4a8c1a2266fb04f40afd34ade80ce466 100644
--- a/login.php
+++ b/login.php
@@ -53,21 +53,19 @@ if (isset($_POST['pseudo']) AND isset($_POST['mdp']))
<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))
- {
+ <?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>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
<?php
}
- ?>
- </ul>
- </li>
- </ul>
+ ?>
</nav>
</div>
diff --git a/newtopics.php b/newtopics.php
index a80a3a5e55367bfb901ac826a99195fc862448b4..1599e5ea8d378523ff4a999f3aa18b9b573c671a 100644
--- a/newtopics.php
+++ b/newtopics.php
@@ -63,22 +63,19 @@ else
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</nav>
</div>
@@ -102,7 +99,7 @@ else
?>
</div>
<div class="col-lg-8 text-left">
- <h1>Create Topic</h1>
+ <br>
<form class="form-horizontal" role="form" method="post" action="./newtopics.php">
<div class="row topic-create">
<div class="col-sm-2 text-right">
@@ -131,13 +128,15 @@ else
aria-required="true" pattern="^([- \w\d\u00c0-\u024f]+)$" spellcheck="false" size="40">
</div>
</div>
+ <br>
<div class="row topic-create">
<label class="col-sm-2 text-right ">Déscription</label>
<div class="col-sm-10">
- <textarea name="content" class="form-control" rows="5" placeholder="Le contenu ..."required
- aria-required="true" spellcheck="false"></textarea>
+ <textarea name="content" class="form-control" rows="15" placeholder="Le contenu ..."required
+ aria-required="true" spellcheck="false" pattern="^([- \w\d\u00c0-\u024f]+)$"></textarea>
</div>
</div>
+ <br>
<button id="submit" class="btn btn-primary topic-create center-block">Ajouter</button>
<?php
if (isset($erreur)) {
diff --git a/register.php b/register.php
index 607acbbbb052d5e8443859cc81266b9d06aacc25..e2aaec311fcfcbecb0954a70f76ed827ba6733c7 100644
--- a/register.php
+++ b/register.php
@@ -47,21 +47,19 @@ if (isset($_POST['pseudo'], $_POST['mdp'], $_POST['mdpC'], $_POST['mail']))
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</nav>
</div>
diff --git a/topiclist.php b/topiclist.php
index fe2c0ddef082b858c1a4f8e5bd1df4a28f8ef1dc..38006ba1ec55b3029b76d597c6268b168f081fb5 100644
--- a/topiclist.php
+++ b/topiclist.php
@@ -47,22 +47,19 @@ else
<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>
+ <?php
+ $dn2 = pg_query("SELECT * FROM keys ORDER BY name asc");
+ while($reponse=pg_fetch_assoc($dn2))
+ {
+ ?>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav">
+ <li class="dropdown active"><a href="./topiclist.php?category=<?php echo $reponse['name']; ?>"><?php echo $reponse['name']; ?></a></li>
+ </ul>
+ </div>
+ <?php
+ }
+ ?>
</nav>
</div>
<div class="container-fluid text-center">
@@ -86,11 +83,11 @@ else
<?php
if(isset($_GET['category'])){
$name=htmlspecialchars($_GET['category']);
- $sql=pg_query("SELECT * FROM toppics NATURAL JOIN keys WHERE name='$name' ORDER BY date");
+ $sql=pg_query("SELECT name, namet, date FROM toppics JOIN keys ON(id_key=keys.id) WHERE name='$name' ORDER BY (date,name)");
}
else
{
- $sql=pg_query("SELECT * FROM toppics NATURAL JOIN keys ORDER BY (date, name)");
+ $sql=pg_query("SELECT name, namet, date FROM toppics JOIN keys ON(id_key=keys.id) ORDER BY (date,name)");
}
?>
<div class="col-lg-8 lg-8 text-left">
@@ -105,7 +102,6 @@ else
<th class="lead">Date</th>
</tr>
</thead>
-
<?php
while($reponse=pg_fetch_assoc($sql))