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

Routing Fix + E-Mail Confirm frontend

Browse Source
This commit is contained in:
Roman Hergenreder
2020-07-01 23:07:00 +02:00
parent 86f9e12b87
commit db63b55a70
6 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/Api/Stats.class.php
View File

@@ -2,7 +2,6 @@
namespace Api;
use Driver\SQL\Condition\Compare;
use Driver\SQL\Condition\CondBool;
class Stats extends Request {

24
core/Api/UserAPI.class.php
View File

@@ -544,17 +544,21 @@ namespace Api\User {
$this->success = $req->execute(array("token" => $token));
$this->lastError = $req->getLastError();
$result = $req->getResult();
if (strcasecmp($result["token"]["type"], "invite") !== 0) {
return $this->createError("Invalid token type");
} else if($result["user"]["confirmed"]) {
return $this->createError("Your email address is already confirmed.");
} else if (!$this->updateUser($result["user"]["uid"])) {
return false;
} else {
$this->invalidateToken($token);
return true;
if ($this->success) {
$result = $req->getResult();
if (strcasecmp($result["token"]["type"], "email_confirm") !== 0) {
return $this->createError("Invalid token type");
} else if($result["user"]["confirmed"]) {
return $this->createError("Your email address is already confirmed.");
} else if (!$this->updateUser($result["user"]["uid"])) {
return false;
} else {
$this->invalidateToken($token);
return true;
}
}
return $this->success;
}
}