Révision acd7c547
| controllers/mur_controller.php | ||
|---|---|---|
| 31 | 31 |
//getVar(); |
| 32 | 32 |
|
| 33 | 33 |
|
| 34 |
<<<<<<< HEAD |
|
| 35 | 34 |
|
| 36 | 35 |
|
| 37 |
======= |
|
| 38 |
>>>>>>> 1d38c428028f230e235f28a6b092e44097e71b5d |
|
| 36 |
|
|
| 39 | 37 |
/* |
| 40 | 38 |
Vérifier que le mur existe |
| 41 | 39 |
*/ |
| ... | ... | |
| 96 | 94 |
//debug("mur privé");
|
| 97 | 95 |
if (!isset($_POST["mdp_acces"])) {
|
| 98 | 96 |
//debug("pas de mot de passe saisi");
|
| 99 |
<<<<<<< HEAD |
|
| 97 |
|
|
| 100 | 98 |
afficheAuthentification($msg); |
| 101 |
======= |
|
| 102 |
afficheAuthentification("");
|
|
| 103 |
>>>>>>> 1d38c428028f230e235f28a6b092e44097e71b5d |
|
| 99 |
|
|
| 104 | 100 |
} else {
|
| 105 | 101 |
//debug("vérifier le mot de passe");
|
| 106 | 102 |
if (isPasswordIdentique($mur->getMdpAcces(), $_POST["mdp_acces"])) {
|
Formats disponibles : Unified diff