From 37ad81fb1638e7ec0114a2b8428a9de03581ddd7 Mon Sep 17 00:00:00 2001 From: Anonymous Contributor Date: Sat, 9 Sep 2023 06:26:34 +0200 Subject: [PATCH] Rename own tables to be consistent and distinct --- app/MigrationManager.php | 5 +---- app/OpenSim.php | 4 ++-- app/page/ForgotPassword.php | 6 +++--- app/page/Identities.php | 12 ++++++------ app/page/ManageUsers.php | 6 +++--- app/page/Regions.php | 10 +++++----- app/page/Register.php | 4 ++-- app/page/ResetPassword.php | 4 ++-- 8 files changed, 24 insertions(+), 27 deletions(-) diff --git a/app/MigrationManager.php b/app/MigrationManager.php index 4891300..a01d563 100644 --- a/app/MigrationManager.php +++ b/app/MigrationManager.php @@ -25,10 +25,7 @@ class MigrationManager 'ALTER TABLE mcp_regions_info MODIFY COLUMN regionID CHAR(36), MODIFY COLUMN ProcMem INT(11) UNSIGNED NOT NULL, MODIFY COLUMN Prims INT(11) UNSIGNED NOT NULL, MODIFY COLUMN SimFPS FLOAT NOT NULL, MODIFY COLUMN PhyFPS FLOAT NOT NULL, MODIFY COLUMN OfflineTimer BIGINT UNSIGNED NOT NULL DEFAULT 0', 'CREATE TRIGGER IF NOT EXISTS del_id_trig AFTER DELETE ON UserAccounts FOR EACH ROW DELETE FROM mcp_user_identities WHERE mcp_user_identities.PrincipalID = OLD.PrincipalID OR mcp_user_identities.IdentityID = OLD.PrincipalID', 'CREATE TRIGGER IF NOT EXISTS del_pwres_trig AFTER DELETE ON UserAccounts FOR EACH ROW DELETE FROM mcp_password_reset WHERE mcp_password_reset.PrincipalID = OLD.PrincipalID' - ]/*, - 2 => [ - 'ALTER TRIGGER del_id_trig' - ]*/ + ] ]; private const MIGRATE_VERSION_CURRENT = 2; diff --git a/app/OpenSim.php b/app/OpenSim.php index c2178b6..532b056 100644 --- a/app/OpenSim.php +++ b/app/OpenSim.php @@ -179,7 +179,7 @@ class OpenSim $statementHgTraveling = $this->pdo->prepare('DELETE FROM hg_traveling_data WHERE UserID = ?'); $statementHgTraveling->execute([$uuid]); - $statementUserIdentitys = $this->pdo->prepare('DELETE FROM UserIdentitys WHERE PrincipalID = ?'); + $statementUserIdentitys = $this->pdo->prepare('DELETE FROM mcp_user_identities WHERE PrincipalID = ?'); $statementUserIdentitys->execute([$uuid]); $statementFriends = $this->pdo->prepare('DELETE FROM Friends WHERE PrincipalID = ? OR Friend = ?'); @@ -233,7 +233,7 @@ class OpenSim public function deleteIdentity($uuid, $identId): bool { - $statementValidate = $this->pdo->prepare('SELECT 1 FROM UserIdentitys WHERE PrincipalID = ? AND IdentityID = ?'); + $statementValidate = $this->pdo->prepare('SELECT 1 FROM mcp_user_identities WHERE PrincipalID = ? AND IdentityID = ?'); $statementValidate->execute([$uuid, $identId]); if($statementValidate->fetch()) { diff --git a/app/page/ForgotPassword.php b/app/page/ForgotPassword.php index 47e5ddc..2d72ee4 100644 --- a/app/page/ForgotPassword.php +++ b/app/page/ForgotPassword.php @@ -67,14 +67,14 @@ class ForgotPassword extends \Mcp\RequestHandler fastcgi_finish_request(); if ($validRequest) { - $getReqTime = $this->app->db()->prepare('SELECT RequestTime FROM PasswordResetTokens WHERE PrincipalID=?'); + $getReqTime = $this->app->db()->prepare('SELECT RequestTime FROM mcp_password_reset WHERE PrincipalID=?'); $getReqTime->execute([$uuid]); if (($res = $getReqTime->fetch()) && time() - $res['RequestTime'] < 900) { return; } $token = Util::generateToken(32); - $setToken = $this->app->db()->prepare('REPLACE INTO PasswordResetTokens(PrincipalID,Token,RequestTime) VALUES(?,?,?)'); + $setToken = $this->app->db()->prepare('REPLACE INTO mcp_password_reset(PrincipalID,Token,RequestTime) VALUES(?,?,?)'); $setToken->execute([$uuid, $token, time()]); $smtp = $this->app->config('smtp'); @@ -82,7 +82,7 @@ class ForgotPassword extends \Mcp\RequestHandler 'title' => 'Dein Passwort zurücksetzen', 'preheader' => 'So kannst du ein neues Passwort für deinen 4Creative-Account festlegen' ])->unsafeVar('message', str_replace('%%NAME%%', $name, str_replace('%%RESET_LINK%%', 'https://'.$this->app->config('domain').'/index.php?page=reset-password&token='.$token, $this::MESSAGE))); - (new SmtpClient($smtp['host'], $smtp['port'], $smtp['address'], $smtp['password']))->sendHtml($smtp['address'], $smtp['name'], $email, 'Zurücksetzung des Passworts für '.$name, $tplMail); + (new SmtpClient($smtp['host'], intval($smtp['port']), $smtp['address'], $smtp['password']))->sendHtml($smtp['address'], $smtp['name'], $email, 'Zurücksetzung des Passworts für '.$name, $tplMail); } } } diff --git a/app/page/Identities.php b/app/page/Identities.php index d30c7eb..3f436a3 100644 --- a/app/page/Identities.php +++ b/app/page/Identities.php @@ -16,16 +16,16 @@ class Identities extends \Mcp\RequestHandler public function get(): void { - $statementCheckForEntry = $this->app->db()->prepare("SELECT 1 FROM UserIdentitys WHERE PrincipalID = ? LIMIT 1"); + $statementCheckForEntry = $this->app->db()->prepare("SELECT 1 FROM mcp_user_identities WHERE PrincipalID = ? LIMIT 1"); $statementCheckForEntry->execute(array($_SESSION['UUID'])); if ($statementCheckForEntry->rowCount() == 0) { - $statement = $this->app->db()->prepare('INSERT INTO `UserIdentitys` (PrincipalID, IdentityID) VALUES (:PrincipalID, :IdentityID)'); + $statement = $this->app->db()->prepare('INSERT INTO `mcp_user_identities` (PrincipalID, IdentityID) VALUES (:PrincipalID, :IdentityID)'); $statement->execute(['PrincipalID' => $_SESSION['UUID'], 'IdentityID' => $_SESSION['UUID']]); } $table = ''; - $statement = $this->app->db()->prepare("SELECT IdentityID FROM UserIdentitys WHERE PrincipalID = ? ORDER BY IdentityID ASC"); + $statement = $this->app->db()->prepare("SELECT IdentityID FROM mcp_user_identities WHERE PrincipalID = ? ORDER BY IdentityID ASC"); $statement->execute(array($_SESSION['UUID'])); $opensim = new OpenSim($this->app->db()); @@ -62,7 +62,7 @@ class Identities extends \Mcp\RequestHandler )); if ($validator->isValid($_POST)) { - $statement = $this->app->db()->prepare("SELECT 1 FROM UserIdentitys WHERE PrincipalID = :PrincipalID AND IdentityID = :IdentityID LIMIT 1"); + $statement = $this->app->db()->prepare("SELECT 1 FROM mcp_user_identities WHERE PrincipalID = :PrincipalID AND IdentityID = :IdentityID LIMIT 1"); $statement->execute(['PrincipalID' => $_SESSION['UUID'], 'IdentityID' => $_POST['uuid']]); $statementPresence = $this->app->db()->prepare("SELECT 1 FROM Presence WHERE UserID = :PrincipalID LIMIT 1"); @@ -73,7 +73,7 @@ class Identities extends \Mcp\RequestHandler $statementAuth = $this->app->db()->prepare('UPDATE auth SET UUID = :IdentityID WHERE UUID = :PrincipalID'); $statementAuth->execute(['IdentityID' => $_POST['uuid'], 'PrincipalID' => $_SESSION['UUID']]); - $statementUserIdentitys = $this->app->db()->prepare('UPDATE UserIdentitys SET PrincipalID = :IdentityID WHERE PrincipalID = :PrincipalID'); + $statementUserIdentitys = $this->app->db()->prepare('UPDATE mcp_user_identities SET PrincipalID = :IdentityID WHERE PrincipalID = :PrincipalID'); $statementUserIdentitys->execute(['IdentityID' => $_POST['uuid'], 'PrincipalID' => $_SESSION['UUID']]); $statementFriends = $this->app->db()->prepare('UPDATE Friends SET PrincipalID = :IdentityID WHERE PrincipalID = :PrincipalID'); @@ -122,7 +122,7 @@ class Identities extends \Mcp\RequestHandler $statementAccounts = $this->app->db()->prepare('INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created, UserLevel, UserFlags, UserTitle, active) VALUES (:PrincipalID, :ScopeID, :FirstName, :LastName, :Email, :ServiceURLs, :Created, :UserLevel, :UserFlags, :UserTitle, :active )'); $statementAccounts->execute(['PrincipalID' => $avatarUUID, 'ScopeID' => "00000000-0000-0000-0000-000000000000", 'FirstName' => $avatarNameParts[0], 'LastName' => $avatarNameParts[1], 'Email' => $_SESSION['EMAIL'], 'ServiceURLs' => "HomeURI= GatekeeperURI= InventoryServerURI= AssetServerURI= ", 'Created' => time(), 'UserLevel' => 0, 'UserFlags' => 0, 'UserTitle' => "", 'active' => 1]); - $statementUserIdentitys = $this->app->db()->prepare('INSERT INTO UserIdentitys (PrincipalID, IdentityID) VALUES (:PrincipalID, :IdentityID)'); + $statementUserIdentitys = $this->app->db()->prepare('INSERT INTO mcp_user_identities (PrincipalID, IdentityID) VALUES (:PrincipalID, :IdentityID)'); $statementUserIdentitys->execute(['PrincipalID' => $_SESSION['UUID'], 'IdentityID' => $avatarUUID]); } else { $_SESSION['identities_err'] = 'Dieser Name ist schon in Benutzung.'; diff --git a/app/page/ManageUsers.php b/app/page/ManageUsers.php index b516fb7..07f1300 100644 --- a/app/page/ManageUsers.php +++ b/app/page/ManageUsers.php @@ -24,7 +24,7 @@ class ManageUsers extends RequestHandler $statement = $this->app->db()->prepare("SELECT FirstName,LastName,UserLevel,PrincipalID FROM UserAccounts JOIN auth ON auth.UUID = UserAccounts.PrincipalID ORDER BY Created ASC"); $statement->execute(); - $statementIdent = $this->app->db()->prepare("SELECT FirstName,LastName,UserLevel,IdentityID FROM UserIdentitys JOIN UserAccounts ON UserAccounts.PrincipalID = UserIdentitys.IdentityID WHERE UserIdentitys.PrincipalID = ? AND UserIdentitys.PrincipalID != UserIdentitys.IdentityID"); + $statementIdent = $this->app->db()->prepare("SELECT FirstName,LastName,UserLevel,IdentityID FROM mcp_user_identities JOIN UserAccounts ON UserAccounts.PrincipalID = mcp_user_identities.IdentityID WHERE mcp_user_identities.PrincipalID = ? AND mcp_user_identities.PrincipalID != mcp_user_identities.IdentityID"); $csrf = $this->app->csrfField(); while ($row = $statement->fetch()) { $entry = ''; @@ -62,7 +62,7 @@ class ManageUsers extends RequestHandler if ($validator->isValid($_POST)) { $inviteID = bin2hex(random_bytes(16)); - $statement = $this->app->db()->prepare('INSERT INTO `InviteCodes` (`InviteCode`) VALUES (:InviteCode)'); + $statement = $this->app->db()->prepare('INSERT INTO `mcp_invites` (`InviteCode`) VALUES (:InviteCode)'); $statement->execute(['InviteCode' => $inviteID]); $_SESSION['invite-id'] = $inviteID; @@ -92,7 +92,7 @@ class ManageUsers extends RequestHandler $opensim = new OpenSim($this->app->db()); if (isset($_POST['genpw'])) { $token = Util::generateToken(32); - $setToken = $this->app->db()->prepare('REPLACE INTO PasswordResetTokens(PrincipalID,Token,RequestTime) VALUES(?,?,?)'); + $setToken = $this->app->db()->prepare('REPLACE INTO mcp_password_reset(PrincipalID,Token,RequestTime) VALUES(?,?,?)'); $setToken->execute([$_POST['userid'], $token, time()]); $resetLink = "https://".$this->app->config('domain').'/index.php?page=reset-password&token='.$token; diff --git a/app/page/Regions.php b/app/page/Regions.php index 25447c1..8050d8e 100644 --- a/app/page/Regions.php +++ b/app/page/Regions.php @@ -74,15 +74,15 @@ class Regions extends \Mcp\RequestHandler private function getRegionStatsData($regionID) { - $statement = $this->app->db()->prepare("SELECT Prims,SimFPS,PhyFPS,ProcMem,RegionVersion FROM regions_info WHERE regionID = ?"); + $statement = $this->app->db()->prepare("SELECT Prims,SimFPS,PhyFPS,ProcMem,RegionVersion FROM mcp_regions_info WHERE regionID = ?"); $statement->execute([$regionID]); if ($row = $statement->fetch()) { $return = array(); - $return['Prims'] = $row['Prims']; - $return['SimFPS'] = $row['SimFPS']; - $return['PhyFPS'] = $row['PhyFPS']; - $return['ProcMem'] = $this->cleanSize(str_replace(".", "", str_replace(",", ".", $row['ProcMem']))."000"); + $return['Prims'] = strval($row['Prims']); + $return['SimFPS'] = strval($row['SimFPS']); + $return['PhyFPS'] = strval($row['PhyFPS']); + $return['ProcMem'] = $this->cleanSize($row['ProcMem']); $return['RegionVersion'] = trim($row['RegionVersion']); return $return; diff --git a/app/page/Register.php b/app/page/Register.php index a70df4a..da46760 100644 --- a/app/page/Register.php +++ b/app/page/Register.php @@ -79,7 +79,7 @@ class Register extends RequestHandler $salt = bin2hex(random_bytes(16)); $passwordHash = md5(md5($pass).':'.$salt); - $statementInviteDeleter = $this->app->db()->prepare('DELETE FROM InviteCodes WHERE InviteCode = :code'); + $statementInviteDeleter = $this->app->db()->prepare('DELETE FROM mcp_invites WHERE InviteCode = :code'); $statementInviteDeleter->execute(['code' => $_REQUEST['code']]); if ($statementInviteDeleter->rowCount() == 0) { $this->displayError("Der angegebene Einladungscode ist nicht mehr gültig."); @@ -167,7 +167,7 @@ class Register extends RequestHandler } elseif (strlen($_REQUEST['code']) != 32 || !preg_match('/^[a-f0-9]+$/', $_REQUEST['code'])) { $this->displayError("Der angegebene Einladungscode ist nicht gültig. Nutze genau den Link, der dir zugeschickt wurde."); } else { - $statementInviteCode = $this->app->db()->prepare("SELECT 1 FROM InviteCodes WHERE InviteCode = ? LIMIT 1"); + $statementInviteCode = $this->app->db()->prepare("SELECT 1 FROM mcp_invites WHERE InviteCode = ? LIMIT 1"); $statementInviteCode->execute([$_REQUEST['code']]); if ($statementInviteCode->rowCount() == 0) { diff --git a/app/page/ResetPassword.php b/app/page/ResetPassword.php index e2a026c..fff32cf 100644 --- a/app/page/ResetPassword.php +++ b/app/page/ResetPassword.php @@ -44,7 +44,7 @@ class ResetPassword extends \Mcp\RequestHandler return; } - $getReq = $this->app->db()->prepare('SELECT UserAccounts.PrincipalID AS UUID,FirstName,LastName,Email,Token,RequestTime FROM PasswordResetTokens JOIN UserAccounts ON UserAccounts.PrincipalID = PasswordResetTokens.PrincipalID WHERE Token = ?'); + $getReq = $this->app->db()->prepare('SELECT UserAccounts.PrincipalID AS UUID,FirstName,LastName,Email,Token,RequestTime FROM mcp_password_reset JOIN UserAccounts ON UserAccounts.PrincipalID = mcp_password_reset.PrincipalID WHERE Token = ?'); $getReq->execute([$_POST['resetToken']]); $res = $getReq->fetch(); @@ -55,7 +55,7 @@ class ResetPassword extends \Mcp\RequestHandler $uuid = $res['UUID']; $name = $res['FirstName'].' '.$res['LastName']; - $getToken = $this->app->db()->prepare('DELETE FROM PasswordResetTokens WHERE PrincipalID = ? AND Token = ?'); + $getToken = $this->app->db()->prepare('DELETE FROM mcp_password_reset WHERE PrincipalID = ? AND Token = ?'); $getToken->execute([$uuid, $_POST['resetToken']]); if ($getToken->rowCount() == 0) { $this->displayTokenError($this::TOKEN_INVALID);
NameAktionen
'.htmlspecialchars($row['FirstName']).''.htmlspecialchars($row['LastName']).''.htmlspecialchars(strval($row['UserLevel'])).'
'.$csrf.'