修正
This commit is contained in:
@@ -4,9 +4,6 @@ namespace Site\Lib;
|
|||||||
class Auth {
|
class Auth {
|
||||||
private int $id;
|
private int $id;
|
||||||
|
|
||||||
/**
|
|
||||||
* 性別: -1 = 不明, 0 = 男性, 1 = 女性
|
|
||||||
*/
|
|
||||||
private \stdClass $user;
|
private \stdClass $user;
|
||||||
private \stdClass $pubUser;
|
private \stdClass $pubUser;
|
||||||
private ?string $token;
|
private ?string $token;
|
||||||
@@ -39,7 +36,7 @@ class Auth {
|
|||||||
unset($user->password);
|
unset($user->password);
|
||||||
unset($user->tokens);
|
unset($user->tokens);
|
||||||
$myself = $this->getUserData();
|
$myself = $this->getUserData();
|
||||||
if ($myself->id != $user->id && $myself->role < \Roles::STAFF) $user->email = '(秘密)';
|
if (!$myself || ($myself->id != $user->id && $myself->role < \Roles::STAFF)) $user->email = '(秘密)';
|
||||||
$user->name = namecolor($user);
|
$user->name = namecolor($user);
|
||||||
$user->regDate = date('Y年m月d日', $user->regDate);
|
$user->regDate = date('Y年m月d日', $user->regDate);
|
||||||
$user->gender = $user->gender === \Gender::MALE ? '男' : ($user->gender === \Gender::FEMALE ? '女' : '不明');
|
$user->gender = $user->gender === \Gender::MALE ? '男' : ($user->gender === \Gender::FEMALE ? '女' : '不明');
|
||||||
@@ -298,7 +295,7 @@ class Auth {
|
|||||||
return $id;
|
return $id;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getUserData(): \stdClass {
|
private function getUserData(): ?\stdClass {
|
||||||
if (!AUTH_ENABLED) return new \stdClass;
|
if (!AUTH_ENABLED) return new \stdClass;
|
||||||
$file = scandir($this->dataDir);
|
$file = scandir($this->dataDir);
|
||||||
$userFile = "";
|
$userFile = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user