This commit is contained in:
Adrien 2019-03-06 15:38:35 +01:00
commit 9ecc6a9fde
9 changed files with 34 additions and 72 deletions

View File

@ -3,59 +3,23 @@
License: none (public domain) License: none (public domain)
*/ */
html, html,body,
body, div,span,
div, applet,object,
span, iframe,h1,
applet, h2,h3,h4,h5,
object, h6,p,blockquote,
iframe, pre,a,abbr,
h1, acronym,address,
h2, big,cite,code,del,
h3, dfn,em,img,
h4, ins,kbd,q,s,
h5, samp,small,
h6, strike,strong,
p, sub,sup,tt,var,b,
blockquote, u,i,center,dl,dt,
pre, dd,ol,ul,li,fieldset,
a, form,label,legend,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table, table,
caption, caption,
tbody, tbody,
@ -369,12 +333,12 @@ a[href]:hover {
.bloc-plus { .bloc-plus {
margin-top: 40px; margin-top: 40px;
float: right; float: right;
background-color: #190034;
padding: 10px 15px; padding: 10px 15px;
color: white; color: white;
-webkit-transition: 300ms; -webkit-transition: 300ms;
-o-transition: 300ms; -o-transition: 300ms;
transition: 300ms; transition: 300ms;
background-color: #190034;
} }
.bloc-plus:hover { .bloc-plus:hover {

View File

@ -7,6 +7,6 @@
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<link href="http://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.11/summernote.css" rel="stylesheet" /> <link href="https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.11/summernote.css" rel="stylesheet" />
<script src="http://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.11/summernote.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.11/summernote.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="/assets/css/style.css"/> <link rel="stylesheet" type="text/css" media="screen" href="/assets/css/style.css"/>

View File

@ -18,7 +18,7 @@
<h2 id="titre-home">Veuillez-vous connecter</h2> <h2 id="titre-home">Veuillez-vous connecter</h2>
<div class="p-home"> <div class="p-home">
<form name="login" id="name" method="POST" class="login" action="/login/"> <form name="login" id="name" method="POST" class="login" action="/login/">
<input name="username" id="username" type="text" placeholder="username" /> <input required name="username" id="username" type="text" placeholder="username" />
<input name="password" id="password" type="password" placeholder="password" /> <input name="password" id="password" type="password" placeholder="password" />
<input type="submit" class="bloc-button" value="Login"/> <input type="submit" class="bloc-button" value="Login"/>
<a href="/register" class="bloc-button">Register</a> <a href="/register" class="bloc-button">Register</a>

View File

@ -18,8 +18,8 @@
<h2 id="titre-home">Mercie de bien vous enregistrer chez nous</h2> <h2 id="titre-home">Mercie de bien vous enregistrer chez nous</h2>
<div class="p-home"> <div class="p-home">
<form name="login" id="name" method="POST" class="login" action="/register/"> <form name="login" id="name" method="POST" class="login" action="/register/">
<input name="username" id="username" type="text" placeholder="username" /> <input required name="username" id="username" type="text" placeholder="username" />
<input name="password" id="password" type="password" placeholder="password" /> <input required name="password" id="password" type="password" placeholder="password" />
<input type="submit" class="bloc-plus" value="Register"/> <input type="submit" class="bloc-plus" value="Register"/>
</form> </form>

View File

@ -18,8 +18,8 @@
<h2 id="titre-home">Créer un utilisateur</h2> <h2 id="titre-home">Créer un utilisateur</h2>
<div class="p-home"> <div class="p-home">
<form name="login" id="name" method="POST" class="login" action="/users/new/"> <form name="login" id="name" method="POST" class="login" action="/users/new/">
<input name="username" id="username" type="text" placeholder="Nom d'utilisateur" /> <input required name="username" id="username" type="text" placeholder="Nom d'utilisateur" />
<input name="password" id="password" type="password" placeholder="Mot de passe" /> <input required name="password" id="password" type="password" placeholder="Mot de passe" />
<select name="role" id="role"> <select name="role" id="role">
<option default value="ROLE_USER">Utilisateur</option> <option default value="ROLE_USER">Utilisateur</option>
<option value="ROLE_EDITOR">Editeur</option> <option value="ROLE_EDITOR">Editeur</option>

View File

@ -15,16 +15,16 @@
<h1>LE BLOG DES APPRENANTS</h1> <h1>LE BLOG DES APPRENANTS</h1>
</div> </div>
<div class="cover-text"> <div class="cover-text">
<h2 id="titre-home">Créer un utilisateur</h2> <h2 id="titre-home">Modifier un utilisateur</h2>
<div class="p-home"> <div class="p-home">
<form name="login" id="name" method="POST" class="login" action="./"> <form name="login" id="name" method="POST" class="login" action="./">
<tag type="userEditor" element="username" /> <tag type="userEditor" element="username" />
<input name="password" id="password" type="password" placeholder="Mot de passe" /> <input name="password" id="password" type="password" placeholder="Mot de passe" />
<input name="job" id="job" type="text" placeholder="apprenant" /> <tag type="userEditor" element="job" />
<select name="role"> <select name="role">
<tag type="userEditor" element="role" /> <tag type="userEditor" element="role" />
</select> </select>
<input type="submit" class="bloc-button" value="Créer"/> <input type="submit" class="bloc-button" value="Modifier"/>
<a style="border: none" class="bloc-button" href="../delete/">Supprimmer</a> <a style="border: none" class="bloc-button" href="../delete/">Supprimmer</a>
</form> </form>
</div> </div>

View File

@ -15,7 +15,7 @@ class LoginController extends Controller {
*/ */
public function login() { public function login() {
if(isset($_POST["username"]) && isset($_POST["password"])) { if(isset($_POST["username"]) && isset($_POST["password"]) && !empty($_POST["password"]) && !empty($_POST["username"])) {
$user = Author::getByUsername($_POST["username"]); $user = Author::getByUsername($_POST["username"]);
if($user->checkPassword($_POST["password"])) { if($user->checkPassword($_POST["password"])) {
$_SESSION["author"] = $user; $_SESSION["author"] = $user;
@ -40,7 +40,7 @@ class LoginController extends Controller {
* @title Register * @title Register
*/ */
public function register() { public function register() {
if(isset($_POST["password"]) && isset($_POST["username"]) && Author::getByUsername($_POST["username"]) === null) { if(isset($_POST["password"]) && isset($_POST["username"]) && Author::getByUsername($_POST["username"]) === null && !empty($_POST["password"]) && !empty($_POST["username"])) {
$user = new Author(); $user = new Author();
$user->setUsername($_POST["username"]); $user->setUsername($_POST["username"]);
$user->setPassword($_POST["password"]); $user->setPassword($_POST["password"]);

View File

@ -14,7 +14,7 @@ class UserController extends Controller {
*/ */
public function addUser() { public function addUser() {
if(isset($_POST["username"]) && isset($_POST["password"]) && isset($_POST["role"])) { if(isset($_POST["username"]) && isset($_POST["password"]) && isset($_POST["role"]) && !empty($_POST["username"]) && !empty($_POST["password"]) && !empty($_POST["role"])) {
$user = new Author(); $user = new Author();
$user->setUsername($_POST["username"]); $user->setUsername($_POST["username"]);
$user->setPassword($_POST["password"]); $user->setPassword($_POST["password"]);
@ -41,7 +41,6 @@ class UserController extends Controller {
* @title Modifier un utilisateur * @title Modifier un utilisateur
*/ */
public function editUser() { public function editUser() {
var_dump($_POST);
$_GET['edit_user'] = explode("/", $_GET["page"])[2]; $_GET['edit_user'] = explode("/", $_GET["page"])[2];
if(isset($_POST["username"]) && isset($_POST["password"]) && isset($_POST["job"]) && isset($_POST["role"])) { if(isset($_POST["username"]) && isset($_POST["password"]) && isset($_POST["job"]) && isset($_POST["role"])) {
@ -49,9 +48,9 @@ class UserController extends Controller {
$user->setUsername($_POST["username"]); $user->setUsername($_POST["username"]);
if($_POST["password"] != '') $user->setPassword($_POST["password"]); if($_POST["password"] != '') $user->setPassword($_POST["password"]);
$user->setRole($_POST["role"]); $user->setRole($_POST["role"]);
var_dump($user); $user->setJob($_POST["job"]);
Author::update($user); Author::update($user);
// header("Location: /users/"); header("Location: /users/");
} }
return file_get_contents(DIR."/html/user_edit.html"); return file_get_contents(DIR."/html/user_edit.html");
} }
@ -59,7 +58,6 @@ class UserController extends Controller {
/** /**
* @route /\/users\/[0-9]+\/delete\/$/ * @route /\/users\/[0-9]+\/delete\/$/
* @admin * @admin
* @title Modifier un utilisateur
*/ */
public function deleteUser() { public function deleteUser() {
$_GET['edit_user'] = explode("/", $_GET["page"])[2]; $_GET['edit_user'] = explode("/", $_GET["page"])[2];

View File

@ -67,7 +67,7 @@ class Loop extends Tag {
foreach ($elements as $ele) { foreach ($elements as $ele) {
if($ele->getAttribute("column") == "content") { if($ele->getAttribute("column") == "content") {
Functions::appendHTML($ele->parentNode, substr($posts[$i]->getContent(), 0, 255)); Functions::appendHTML($ele->parentNode, $posts[$i]->getContent());
} elseif($ele->getAttribute("column") == "category") { } elseif($ele->getAttribute("column") == "category") {
// var_dump($posts[$i]->getCategory()->getName()); // var_dump($posts[$i]->getCategory()->getName());
if($posts[$i]->getCategory() != null) $txt = $doc->createTextNode($posts[$i]->getCategory()->getName()); if($posts[$i]->getCategory() != null) $txt = $doc->createTextNode($posts[$i]->getCategory()->getName());