Commit 06ca00ed0fbe893debfaa2237c0bc03d630ba216
Merge branch 'master' of ssh://servclubinfo.insecure.deule.net/crep
Showing
2 changed files
with
29 additions
and
2 deletions
Show diff stats
connect.php
1 | -test | 1 | +<form class="form-horizontal" role="form"> |
2 | + <div class="form-group"> | ||
3 | + <label for="entrer_Identifiant_3" class="col-sm-2 control-label">Identifiant</label> | ||
4 | + <div class="col-sm-10"> | ||
5 | + <input type="identifiant" class="form-control" id="Entrer_Identifiant_3" placeholder="Votre identifiant"> | ||
6 | + </div> | ||
7 | + </div> | ||
8 | + <div class="form-group"> | ||
9 | + <label for="entrer_mot_de_passe_3" class="col-sm-2 control-label">Mot de passe</label> | ||
10 | + <div class="col-sm-10"> | ||
11 | + <input type="mot de passe" class="form-control" id="entrer_mot_de_passe_3" placeholder="Votre mot de passe"> | ||
12 | + </div> | ||
13 | + </div> | ||
14 | + <div class="form-group"> | ||
15 | + <div class="col-sm-offset-2 col-sm-10"> | ||
16 | + <div class="checkbox"> | ||
17 | + <label> | ||
18 | + <input type="checkbox"> Rester connecter | ||
19 | + </label> | ||
20 | + </div> | ||
21 | + </div> | ||
22 | + </div> | ||
23 | + <div class="form-group"> | ||
24 | + <div class="col-sm-offset-2 col-sm-10"> | ||
25 | + <button type="submit" class="btn btn-default">Se connecter</button> | ||
26 | + </div> | ||
27 | + </div> | ||
28 | +</form> |
news.php
@@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
9 | exit; | 9 | exit; |
10 | } | 10 | } |
11 | 11 | ||
12 | - $requete = "select title content user.realname as userName from news, user where news.fk_author==user.pk;"; | 12 | + $requete = "select title, content, users.realname as userName from news, users where news.fk_author=users.pk;"; |
13 | $resultat = mysql_query($requete); | 13 | $resultat = mysql_query($requete); |
14 | 14 | ||
15 | //Pour debugger | 15 | //Pour debugger |