Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from RaspbianFrance/master 

Update master from RaspbianFrance/RaspiSMS
This commit is contained in:
Damien GUILLEM 2015-04-27 17:08:41 +02:00
parent 538d242f18 b5c4cfbb81
commit 38a331a4db
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/users.php
View File

@ -120,7 +120,7 @@
else else
{ {
header('Location: ' . $this->generateUrl('users', 'showAll', array( header('Location: ' . $this->generateUrl('users', 'showAll', array(
'errormessage' => 'Impossible d\'envoyer le SMS d\'inscription à l\'utilisateur. Le compte n\'a donc pas été créé.' 'errormessage' => 'Impossible d\'envoyer le mail d\'inscription à l\'utilisateur. Le compte n\'a donc pas été créé.'
))); )));
return false; return false;
} }

5
model/DataBase.php
View File

@ -272,7 +272,7 @@
'name' => $name 'name' => $name
); );
return $this->runQuery($query, $params, SELF::FETCH); return $this->runQuery($query, $params, self::FETCH);
} }
/** /**
@ -1084,9 +1084,6 @@
'admin' => $admin, 'admin' => $admin,
); );
$req = $this->bdd->prepare($query);
$req->execute($params);
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->runQuery($query, $params, self::ROWCOUNT);
} }

6
templates/profile.php
View File

@ -49,7 +49,7 @@
<h4 class="panel-title"><i class="fa fa-key fa-fw"></i> Modifier mot de passe</h4> <h4 class="panel-title"><i class="fa fa-key fa-fw"></i> Modifier mot de passe</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="<?php echo $this->generateUrl('profile', 'changePassword'); ?>" method="POST"> <form action="<?php echo $this->generateUrl('profile', 'changePassword', array('csrf' => $_SESSION['csrf'])); ?>" method="POST">
<div class="form-group"> <div class="form-group">
<label>Mot de passe :</label> <label>Mot de passe :</label>
<input name="password" type="password" class="form-control" placeholder="Nouveau mot de passe" /> <input name="password" type="password" class="form-control" placeholder="Nouveau mot de passe" />
@ -71,7 +71,7 @@
<h4 class="panel-title"><i class="fa fa-at fa-fw"></i> Modifier e-mail</h4> <h4 class="panel-title"><i class="fa fa-at fa-fw"></i> Modifier e-mail</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="<?php echo $this->generateUrl('profile', 'changeEmail'); ?>" method="POST"> <form action="<?php echo $this->generateUrl('profile', 'changeEmail', array('csrf' => $_SESSION['csrf'])); ?>" method="POST">
<div class="form-group"> <div class="form-group">
<label>Adresse e-mail :</label> <label>Adresse e-mail :</label>
<input name="mail" type="email" class="form-control" placeholder="Nouvelle adresse e-mail" /> <input name="mail" type="email" class="form-control" placeholder="Nouvelle adresse e-mail" />
@ -91,7 +91,7 @@
<h4 class="panel-title"><i class="fa fa-delete fa-fw"></i> Supprimer ce compte</h4> <h4 class="panel-title"><i class="fa fa-delete fa-fw"></i> Supprimer ce compte</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form action="<?php echo $this->generateUrl('profile', 'delete'); ?>" method="POST"> <form action="<?php echo $this->generateUrl('profile', 'delete', array('csrf' => $_SESSION['csrf'])); ?>" method="POST">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input name="delete_account" type="checkbox" value="1" /> Je suis totalement sûr de vouloir supprimer ce compte <input name="delete_account" type="checkbox" value="1" /> Je suis totalement sûr de vouloir supprimer ce compte