Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create User fixed

Browse Source
This commit is contained in:
Roman Hergenreder 2020-06-17 20:26:47 +02:00
parent 373808879a
commit 00daf9876e
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/Api/User/Create.class.php
View File

@ -34,7 +34,7 @@ class Create extends Request {
$password = $this->getParam('password'); $password = $this->getParam('password');
$confirmPassword = $this->getParam('confirmPassword'); $confirmPassword = $this->getParam('confirmPassword');
if ($password !== $confirmPassword) { if ($password !== $confirmPassword) {
return false; return $this->createError("The given passwords do not match.");
} }
$this->success = $this->createUser($username, $email, $password); $this->success = $this->createUser($username, $email, $password);
@ -51,14 +51,12 @@ class Create extends Request {
$this->success = ($res !== FALSE); $this->success = ($res !== FALSE);
$this->lastError = $sql->getLastError(); $this->lastError = $sql->getLastError();
if (!empty($res)) { if ($this->success && !empty($res)) {
$row = $res[0]; $row = $res[0];
if (strcasecmp($username, $row['name']) === 0) { if (strcasecmp($username, $row['name']) === 0) {
$this->lastError = "This username is already in use."; return $this->createError("This username is already taken.");
$this->success = false;
} else if (strcasecmp($username, $row['email']) === 0) { } else if (strcasecmp($username, $row['email']) === 0) {
$this->lastError = "This email address is already taken"; return $this->createError("This email address is already in use.");
$this->success = false;
} }
} }
@ -69,13 +67,12 @@ class Create extends Request {
$sql = $this->user->getSQL(); $sql = $this->user->getSQL();
$salt = generateRandomString(16); $salt = generateRandomString(16);
$hash = hash('sha256', $password . $salt); $hash = hash('sha256', $password . $salt);
$res = $sql->insert("User", array( $res = $sql->insert("User", array("name", "password", "salt", "email"))
'username' => $username, ->addRow($username, $hash, $salt, $email)
'password' => $hash, ->execute();
'salt' => $salt,
'email' => $email
))->execute();
$this->lastError = $sql->getLastError(); $this->lastError = $sql->getLastError();
return $res === TRUE; $this->success = ($res !== FALSE);
return $this->success;
} }
} }