Skip to content

correction du controle de login utilisateur lors de la modification #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A628206 wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

correction du controle de login utilisateur lors de la modification #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions application/models/DbTable/Utilisateur.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,19 @@ public function getUsersWithInformations($group = null)
return $this->fetchAll($select)->toArray();
}

public function isRegistered($login)
public function isRegistered($id_user, $login)
{
$select = $this->select()
->setIntegrityCheck(false)
->from("utilisateur")
->where("USERNAME_UTILISATEUR = ?", $login)
->limit(1);
->where("USERNAME_UTILISATEUR = ?", $login);
if ($id_user !== null) {
$select->where("ID_UTILISATEUR <> ?", $id_user);
}
$select->limit(1);

$result = $this->fetchRow($select);

return ( $result != null ) ? true : false;
return $result != null;
}

public function getId($login)
Expand Down
2 changes: 1 addition & 1 deletion application/services/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function save($data, $avatar = null, $id_user = null)
$db->beginTransaction();

try {
if ($id_user === null && $DB_user->isRegistered($data['USERNAME_UTILISATEUR'])) {
if ($DB_user->isRegistered($id_user, $data['USERNAME_UTILISATEUR'])) {
throw new Exception("Nom d'utilisateur déjà enregistré. Veuillez en choisir un autre.");
}
$user = $id_user == null ? $DB_user->createRow() : $DB_user->find($id_user)->current();
Expand Down