-
-
-
-
+ 
')
+ h.querySelector('a.close').addEventListener('click', () => {
this.windows[id].remove()
delete this.windows[id]
})
@@ -60,6 +58,7 @@ class WindowManager
this.makeWindowDraggable(w, this.container)
this.windows[id] = w
this.container.appendChild(w)
+ return w
}
makeWindowDraggable(w, c)
diff --git a/public/index.php b/public/index.php
index e2dfebd..56cc1ca 100644
--- a/public/index.php
+++ b/public/index.php
@@ -11,73 +11,370 @@ $r = new Router;
/*
Home
*/
-$r->get('/', function () {
- if (user()) must_have_character();
- $GLOBALS['active_nav_tab'] = 'home';
- echo render('layouts/basic', ['view' => 'pages/home']);
+$r->get('/', function() {
+ if (!user()) redirect('/login');
+ redirect('/world');
});
/*
Auth
*/
-$r->get('/auth/register', 'auth_controller_register_get');
-$r->post('/auth/register', 'auth_controller_register_post');
-$r->get('/auth/login', 'auth_controller_login_get');
-$r->post('/auth/login', 'auth_controller_login_post');
-$r->post('/auth/logout', 'auth_controller_logout_post');
+$r->get('/register', function() {
+ guest_only();
+ echo render('layouts/basic', ['view' => 'pages/auth/register']);
+});
+
+$r->post('/register', function() {
+ guest_only();
+ csrf_ensure();
+
+ $errors = [];
+
+ $u = trim($_POST['u'] ?? '');
+ $e = trim($_POST['e'] ?? '');
+ $p = $_POST['p'] ?? '';
+
+ /*
+ A username is required.
+ A username must be at least 3 characters long and at most 18 characters long.
+ A username must contain only alphanumeric characters and spaces.
+ */
+ if (empty($u) || strlen($u) < 3 || strlen($u) > 18 || !ctype_alnum(str_replace(' ', '', $u))) {
+ $errors['u'][] = 'Username is required and must be between 3 and 18 characters long and contain only
+ alphanumeric characters and spaces.';
+ }
+
+ /*
+ An email is required.
+ An email must be at most 255 characters long.
+ An email must be a valid email address.
+ */
+ if (empty($e) || strlen($e) > 255 || !filter_var($e, FILTER_VALIDATE_EMAIL)) {
+ $errors['e'][] = 'Email is required must be a valid email address.';
+ }
+
+ /*
+ A password is required.
+ A password must be at least 6 characters long.
+ */
+ if (empty($p) || strlen($p) < 6) {
+ $errors['p'][] = 'Password is required and must be at least 6 characters long.';
+ }
+
+ /*
+ A username must be unique.
+ */
+ if (User::username_exists($u)) {
+ $errors['u'][] = 'Username is already taken.';
+ }
+
+ /*
+ An email must be unique.
+ */
+ if (User::email_exists($e)) {
+ $errors['e'][] = 'Email is already taken.';
+ }
+
+ // If there are errors at this point, send them to the page with errors flashed.
+ if (!empty($errors)) {
+ $GLOBALS['form-errors'] = $errors;
+ echo page('auth/register');
+ exit;
+ }
+
+ if (User::create($u, $e, $p) === false) error_response(400);
+
+ $_SESSION['user'] = serialize(User::find($u));
+ Wallet::create(user()->id);
+ redirect('/character/create-first');
+});
+
+$r->get('/login', function() {
+ guest_only();
+ echo render('layouts/basic', ['view' => 'pages/auth/login']);
+});
+
+$r->post('/login', function() {
+ guest_only();
+ csrf_ensure();
+
+ $errors = [];
+
+ $u = trim($_POST['u'] ?? '');
+ $p = $_POST['p'] ?? '';
+
+ if (empty($u)) $errors['u'][] = 'Username is required.';
+ if (empty($p)) $errors['p'][] = 'Password is required.';
+
+ // If there are errors at this point, send them to the page with errors flashed.
+ if (!empty($errors)) {
+ $GLOBALS['form-errors'] = $errors;
+ echo render('layouts/basic', ['view' => 'pages/auth/login']);
+ exit;
+ }
+
+ $user = User::find($u);
+ if ($user === false || !$user->check_password($p)) {
+ $errors['x'][] = 'Invalid username or password.';
+ $GLOBALS['form-errors'] = $errors;
+ echo render('layouts/basic', ['view' => 'pages/auth/login']);
+ exit;
+ }
+
+ $_SESSION['user'] = serialize($user);
+
+ if ($_POST['remember'] ?? false) {
+ $token = token();
+ $expires = strtotime('+30 days');
+ $result = db_query(
+ db_auth(),
+ "INSERT INTO sessions (token, user_id, expires) VALUES (:t, :u, :e)",
+ [':t' => $token, ':u' => user()->id, ':e' => $expires]
+ );
+ if (!$result) error_response(400);
+ set_cookie('remember_me', $token, $expires);
+ }
+
+ if (user()->char_count() === 0) {
+ redirect('/character/create-first');
+ } elseif (!change_user_character(user()->char_id)) {
+ echo "failed to change user character (aclp)";
+ error_response(999);
+ }
+
+ redirect('/');
+});
+
+$r->post('/logout', function() {
+ csrf_ensure();
+ session_delete(user()->id);
+ unset($_SESSION['user']);
+ set_cookie('remember_me', '', 1);
+ redirect('/');
+});
+
+$r->get('/debug/logout', function() {
+ session_delete(user()->id);
+ unset($_SESSION['user']);
+ set_cookie('remember_me', '', 1);
+ redirect('/');
+});
/*
Characters
*/
-$r->get('/characters', 'char_controller_list_get');
-$r->post('/characters', 'char_controller_list_post');
-$r->get('/character/create-first', 'char_controller_create_first_get');
-$r->post('/character/create', 'char_controller_create_post');
-$r->post('/character/delete', 'char_controller_delete_post');
+$r->get('/characters', function() {
+ auth_only_and_must_have_character();
+
+ $GLOBALS['active_nav_tab'] = 'chars';
+ echo page('chars/list', ['chars' => user()->char_list()]);
+});
+
+$r->post('/characters', function() {
+ auth_only_and_must_have_character();
+ csrf_ensure();
+
+ $GLOBALS['active_nav_tab'] = 'chars';
+
+ $char_id = (int) ($_POST['char_id'] ?? 0);
+ $action = $_POST['action'] ?? '';
+
+ // If the character ID is not a number, or the action is not a string, return a 400.
+ if (!is_numeric($char_id) || !is_string($action)) error_response(400);
+
+ // If the character ID is 0, return to the list.
+ if ($char_id === 0) {
+ flash('alert_character_list_1', ['', 'No character selected.']);
+ redirect('/characters');
+ }
+
+ // If the action is not one of the allowed actions, return a 400.
+ if (!in_array($action, ['select', 'delete'])) error_response(400);
+
+ // If the action is to select a character, change the user's selected character.
+ if ($action === 'select') {
+ // If the character ID is the current character, do nothing.
+ if ($char_id === user()->char_id || $char_id === 0) {
+ flash('alert_character_list_1', ['info', 'You are already using ' . char()->name . '.']);
+ redirect('/characters');
+ }
+
+ if (!Character::belongs_to($char_id, user()->id)) error_response(999);
+
+ change_user_character($char_id);
+
+ flash('alert_character_list_1', ['success', 'Switched to ' . char()->name . '!']);
+ }
+
+ // If the action is to delete a character, move to the confirmation page.
+ if ($action === 'delete') {
+ if (!Character::belongs_to($char_id, user()->id)) error_response(999);
+
+ echo page('chars/delete', ['char' => Character::find($char_id)]);
+ exit;
+ }
+
+ redirect('/characters');
+});
+
+$r->get('/character/create-first', function() {
+ auth_only();
+
+ $GLOBALS['active_nav_tab'] = 'chars';
+
+ // If the user already has a character, redirect them to the main page.
+ if (user()->char_count() > 0) redirect('/');
+
+ echo page('chars/first');
+});
+
+$r->post('/character/create', function() {
+ auth_only(); csrf_ensure();
+
+ $GLOBALS['active_nav_tab'] = 'chars';
+
+ $errors = [];
+
+ $name = trim($_POST['n'] ?? '');
+
+ /*
+ A name is required.
+ A name must be between 3 and 18 characters.
+ A name must contain only alphanumeric characters and spaces.
+ */
+ if (empty($name) || strlen($name) < 3 || strlen($name) > 18 || !ctype_alnum(str_replace(' ', '', $name))) {
+ $errors['n'][] = 'Name is required and must be between 3 and 18 characters long and contain only alphanumeric characters and spaces.';
+ }
+
+ /*
+ A character's name must be unique.
+ */
+ if (Character::name_exists($name)) $errors['n'][] = 'Name is already taken.';
+
+ // If there are errors at this point, send them to the page with errors flashed.
+ if (!empty($errors)) {
+ $GLOBALS['form-errors-create-character'] = $errors;
+
+ if (isset($_POST['first']) && $_POST['first'] === 'true') {
+ // If this is the first character, return to the first character creation page.
+ echo page('chars/first');
+ exit;
+ } else {
+ // If this is not the first character, return to the character list page.
+ echo page('chars/list', ['chars' => user()->char_list()]);
+ exit;
+ }
+ }
+
+ if (($char = Character::create(user()->id, $name)) === false) error_response(400);
+
+ // Create the auxiliary tables
+ $char->create_location();
+ $char->create_gear();
+
+ // Award the Adventurer title.
+ $char->award_title(1);
+
+ // Set the character as the user's selected character
+ change_user_character($char->id);
+
+ flash('alert_character_list_1', ['success', 'Character ' . $name . ' created!']);
+ redirect('/characters');
+});
+
+$r->post('/character/delete', function() {
+ auth_only_and_must_have_character();
+ csrf_ensure();
+
+ $char_id = (int) ($_POST['char_id'] ?? 0);
+
+ // If the character ID is not a number, return a 400.
+ if (!is_numeric($char_id)) error_response(400);
+
+ // Ensure the character ID is valid and belongs to the user.
+ if (!Character::belongs_to($char_id, user()->id)) error_response(999);
+
+ $char = Character::find($char_id);
+
+ // Confirm the name matches the name of the character. CASE SENSITIVE.
+ if ($char['name'] !== trim($_POST['n'] ?? '')) {
+ flash('alert_character_list_1', ['danger', 'Failed to delete ' . $char['name'] . '. Name confirmation did not match.']);
+ redirect('/characters');
+ }
+
+ // Delete the character
+ Character::delete($char_id);
+
+ // If the character being deleted is the currently selected character, select the first character.
+ if (user()->char_id === $char_id) {
+ $chars = user()->char_list();
+ if (count($chars) > 0) change_user_character($chars[0]['id']);
+ }
+
+ flash('alert_character_list_1', ['danger', 'Character ' . $char['name'] . ' deleted.']);
+ redirect('/characters');
+});
/*
World
*/
-$r->get('/world', 'world_controller_get');
-$r->post('/move', 'world_controller_move_post');
+$r->get('/world', function() {
+ auth_only_and_must_have_character();
+ echo render('layouts/game');
+});
-/*
- Profile
-*/
-$r->get('/profile', 'profile_controller_get');
-$r->get('/profile/:id', 'profile_controller_show_get');
+$r->post('/move', function() {
+ /*
+ This endpoint is used to move the character around the world. The client sends a POST request with the direction
+ they want to move the character. The server will update the character's position in the database and return the
+ new position to the client.
-/*
- Settings
-*/
-$r->get('/settings', 'settings_controller_get');
+ We should only be using this endpoint as an AJAX request from the world page. Since we don't need all the character's
+ data to move them, we can just get and update their lcoation using the user's currently selected character ID.
+ */
-/*
- Auctions
-*/
-$r->get('/auctions', 'auctions_controller_get');
+ ajax_only(); auth_only(); csrf_ensure();
+
+ define('directions', [
+ [0, -1], // Up
+ [0, 1], // Down
+ [-1, 0], // Left
+ [1, 0] // Right
+ ]);
+
+ // direction must exist
+ $d = (int) $_POST['direction'] ?? -1;
+
+ // Update the character's position
+ // 0 = up, 1 = down, 2 = left, 3 = right
+ $x = location('x');
+ $y = location('y');
+
+ if (isset(directions[$d])) {
+ $x += directions[$d][0];
+ $y += directions[$d][1];
+ } else {
+ error_response(999);
+ }
+
+ $r = db_query(db_live(), 'UPDATE char_locations SET x = :x, y = :y WHERE char_id = :c', [
+ ':x' => $x,
+ ':y' => $y,
+ ':c' => user()->char_id
+ ]);
+
+ if ($r === false) throw new Exception('Failed to move character. (wcmp)');
+
+ json_response(['x' => $x, 'y' => $y]);
+});
/*
UI
*/
-router_post($r, '/ui/stats', 'ui_contoller_stats_post');
-
-/*
- Testing
-*/
-if (env('debug')) {
- $r->get('/give_silver/:x', function (int $amt) {
- auth_only_and_must_have_character();
- wallet()->give(Currency::Silver, $amt);
- redirect('/');
- });
-
- $r->get('/take_silver/:x', function (int $amt) {
- auth_only_and_must_have_character();
- wallet()->take(Currency::Silver, $amt);
- redirect('/');
- });
-}
+$r->post('/ui/stats', function() {
+ ui_guard();
+ echo c_profile_stats(char());
+});
/*
Router
diff --git a/src/bootstrap.php b/src/bootstrap.php
index 93a8816..70bd483 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -10,8 +10,10 @@ define('CLASS_MAP', [
'Wallet' => '/models/wallet.php'
]);
-// Source libraries
require_once SRC . '/helpers.php';
+
+stopwatch_start('bootstrap'); // Start the bootstrap stopwatch
+
require_once SRC . '/util/env.php';
require_once SRC . '/util/database.php';
require_once SRC . '/util/auth.php';
@@ -20,19 +22,9 @@ require_once SRC . '/util/components.php';
require_once SRC . '/util/render.php';
require_once SRC . '/util/enums.php';
-// Database models
require_once SRC . '/models/session.php';
require_once SRC . '/models/token.php';
-// Controllers
-require_once SRC . '/controller/char.php';
-require_once SRC . '/controller/auth.php';
-require_once SRC . '/controller/world.php';
-require_once SRC . '/controller/settings.php';
-require_once SRC . '/controller/auctions.php';
-require_once SRC . '/controller/profile.php';
-require_once SRC . '/controller/ui.php';
-
spl_autoload_register(function (string $class) {
if (array_key_exists($class, CLASS_MAP)) require_once SRC . CLASS_MAP[$class];
});
@@ -51,8 +43,6 @@ if (env('debug') === 'true') {
error_reporting(E_ALL);
}
-stopwatch_start('bootstrap'); // Start the bootstrap stopwatch
-
// Generate a new CSRF token. (if one doesn't exist, that is)
csrf();
@@ -60,9 +50,6 @@ csrf();
$GLOBALS['queries'] = 0;
$GLOBALS['query_time'] = 0;
-// Set the default page layout
-page_layout('basic');
-
// Run auth_check to see if we're logged in, since it populates the user data in SESSION
auth_check();
diff --git a/src/controllers/auctions.php b/src/controllers/auctions.php
deleted file mode 100644
index 5194519..0000000
--- a/src/controllers/auctions.php
+++ /dev/null
@@ -1,9 +0,0 @@
- 'pages/auctions/index']);
-}
diff --git a/src/controllers/auth.php b/src/controllers/auth.php
deleted file mode 100644
index 4e445ce..0000000
--- a/src/controllers/auth.php
+++ /dev/null
@@ -1,155 +0,0 @@
- 'pages/auth/register']);
-}
-
-/**
- * Handles the registration form submission.
- */
-function auth_controller_register_post()
-{
- guest_only();
- csrf_ensure();
-
- $errors = [];
-
- $u = trim($_POST['u'] ?? '');
- $e = trim($_POST['e'] ?? '');
- $p = $_POST['p'] ?? '';
-
- /*
- A username is required.
- A username must be at least 3 characters long and at most 18 characters long.
- A username must contain only alphanumeric characters and spaces.
- */
- if (empty($u) || strlen($u) < 3 || strlen($u) > 18 || !ctype_alnum(str_replace(' ', '', $u))) {
- $errors['u'][] = 'Username is required and must be between 3 and 18 characters long and contain only
- alphanumeric characters and spaces.';
- }
-
- /*
- An email is required.
- An email must be at most 255 characters long.
- An email must be a valid email address.
- */
- if (empty($e) || strlen($e) > 255 || !filter_var($e, FILTER_VALIDATE_EMAIL)) {
- $errors['e'][] = 'Email is required must be a valid email address.';
- }
-
- /*
- A password is required.
- A password must be at least 6 characters long.
- */
- if (empty($p) || strlen($p) < 6) {
- $errors['p'][] = 'Password is required and must be at least 6 characters long.';
- }
-
- /*
- A username must be unique.
- */
- if (User::username_exists($u)) {
- $errors['u'][] = 'Username is already taken.';
- }
-
- /*
- An email must be unique.
- */
- if (User::email_exists($e)) {
- $errors['e'][] = 'Email is already taken.';
- }
-
- // If there are errors at this point, send them to the page with errors flashed.
- if (!empty($errors)) {
- $GLOBALS['form-errors'] = $errors;
- echo page('auth/register');
- exit;
- }
-
- if (User::create($u, $e, $p) === false) error_response(400);
-
- $_SESSION['user'] = serialize(User::find($u));
- Wallet::create(user()->id);
- redirect('/character/create-first');
-}
-
-/**
- * Displays the login page.
- */
-function auth_controller_login_get()
-{
- guest_only();
- echo render('layouts/basic', ['view' => 'pages/auth/login']);
-}
-
-/**
- * Handles the login form submission.
- */
-function auth_controller_login_post()
-{
- guest_only();
- csrf_ensure();
-
- $errors = [];
-
- $u = trim($_POST['u'] ?? '');
- $p = $_POST['p'] ?? '';
-
- if (empty($u)) $errors['u'][] = 'Username is required.';
- if (empty($p)) $errors['p'][] = 'Password is required.';
-
- // If there are errors at this point, send them to the page with errors flashed.
- if (!empty($errors)) {
- $GLOBALS['form-errors'] = $errors;
- echo render('layouts/basic', ['view' => 'pages/auth/login']);
- exit;
- }
-
- $user = User::find($u);
- if ($user === false || !$user->check_password($p)) {
- $errors['x'][] = 'Invalid username or password.';
- $GLOBALS['form-errors'] = $errors;
- echo render('layouts/basic', ['view' => 'pages/auth/login']);
- exit;
- }
-
- $_SESSION['user'] = serialize($user);
-
- if ($_POST['remember'] ?? false) {
- $token = token();
- $expires = strtotime('+30 days');
- $result = db_query(
- db_auth(),
- "INSERT INTO sessions (token, user_id, expires) VALUES (:t, :u, :e)",
- [':t' => $token, ':u' => user()->id, ':e' => $expires]
- );
- if (!$result) error_response(400);
- set_cookie('remember_me', $token, $expires);
- }
-
- if (user()->char_count() === 0) {
- redirect('/character/create-first');
- } elseif (!change_user_character(user()->char_id)) {
- echo "failed to change user character (aclp)";
- error_response(999);
- }
-
- redirect('/');
-}
-
-/**
- * Logs the user out.
- */
-function auth_controller_logout_post()
-{
- csrf_ensure();
- session_delete(user()->id);
- unset($_SESSION['user']);
- set_cookie('remember_me', '', 1);
- redirect('/');
-}
diff --git a/src/controllers/char.php b/src/controllers/char.php
deleted file mode 100644
index 1c77a3a..0000000
--- a/src/controllers/char.php
+++ /dev/null
@@ -1,172 +0,0 @@
- user()->char_list()]);
-}
-
-/**
- * Handle an action from the character list page.
- */
-function char_controller_list_post()
-{
- auth_only_and_must_have_character(); csrf_ensure();
-
- $GLOBALS['active_nav_tab'] = 'chars';
-
- $char_id = (int) ($_POST['char_id'] ?? 0);
- $action = $_POST['action'] ?? '';
-
- // If the character ID is not a number, or the action is not a string, return a 400.
- if (!is_numeric($char_id) || !is_string($action)) error_response(400);
-
- // If the character ID is 0, return to the list.
- if ($char_id === 0) {
- flash('alert_character_list_1', ['', 'No character selected.']);
- redirect('/characters');
- }
-
- // If the action is not one of the allowed actions, return a 400.
- if (!in_array($action, ['select', 'delete'])) error_response(400);
-
- // If the action is to select a character, change the user's selected character.
- if ($action === 'select') {
- // If the character ID is the current character, do nothing.
- if ($char_id === user()->char_id || $char_id === 0) {
- flash('alert_character_list_1', ['info', 'You are already using ' . char()->name . '.']);
- redirect('/characters');
- }
-
- if (!Character::belongs_to($char_id, user()->id)) error_response(999);
-
- change_user_character($char_id);
-
- flash('alert_character_list_1', ['success', 'Switched to ' . char()->name . '!']);
- }
-
- // If the action is to delete a character, move to the confirmation page.
- if ($action === 'delete') {
- if (!Character::belongs_to($char_id, user()->id)) error_response(999);
-
- echo page('chars/delete', ['char' => Character::find($char_id)]);
- exit;
- }
-
- redirect('/characters');
-}
-
-/**
- * Delete a character for the currently logged in user.
- */
-function char_controller_delete_post()
-{
- auth_only_and_must_have_character(); csrf_ensure();
-
- $char_id = (int) ($_POST['char_id'] ?? 0);
-
- // If the character ID is not a number, return a 400.
- if (!is_numeric($char_id)) error_response(400);
-
- // Ensure the character ID is valid and belongs to the user.
- if (!Character::belongs_to($char_id, user()->id)) error_response(999);
-
- $char = Character::find($char_id);
-
- // Confirm the name matches the name of the character. CASE SENSITIVE.
- if ($char['name'] !== trim($_POST['n'] ?? '')) {
- flash('alert_character_list_1', ['danger', 'Failed to delete ' . $char['name'] . '. Name confirmation did not match.']);
- redirect('/characters');
- }
-
- // Delete the character
- Character::delete($char_id);
-
- // If the character being deleted is the currently selected character, select the first character.
- if (user()->char_id === $char_id) {
- $chars = user()->char_list();
- if (count($chars) > 0) change_user_character($chars[0]['id']);
- }
-
- flash('alert_character_list_1', ['danger', 'Character ' . $char['name'] . ' deleted.']);
- redirect('/characters');
-}
-
-/**
- * Form to create your first character.
- */
-function char_controller_create_first_get()
-{
- auth_only();
-
- $GLOBALS['active_nav_tab'] = 'chars';
-
- // If the user already has a character, redirect them to the main page.
- if (user()->char_count() > 0) redirect('/');
-
- echo page('chars/first');
-}
-
-/**
- * Create a character for the currently logged in user.
- */
-function char_controller_create_post()
-{
- auth_only(); csrf_ensure();
-
- $GLOBALS['active_nav_tab'] = 'chars';
-
- $errors = [];
-
- $name = trim($_POST['n'] ?? '');
-
- /*
- A name is required.
- A name must be between 3 and 18 characters.
- A name must contain only alphanumeric characters and spaces.
- */
- if (empty($name) || strlen($name) < 3 || strlen($name) > 18 || !ctype_alnum(str_replace(' ', '', $name))) {
- $errors['n'][] = 'Name is required and must be between 3 and 18 characters long and contain only alphanumeric characters and spaces.';
- }
-
- /*
- A character's name must be unique.
- */
- if (Character::name_exists($name)) $errors['n'][] = 'Name is already taken.';
-
- // If there are errors at this point, send them to the page with errors flashed.
- if (!empty($errors)) {
- $GLOBALS['form-errors-create-character'] = $errors;
-
- if (isset($_POST['first']) && $_POST['first'] === 'true') {
- // If this is the first character, return to the first character creation page.
- echo page('chars/first');
- exit;
- } else {
- // If this is not the first character, return to the character list page.
- echo page('chars/list', ['chars' => user()->char_list()]);
- exit;
- }
- }
-
- if (($char = Character::create(user()->id, $name)) === false) error_response(400);
-
- // Create the auxiliary tables
- $char->create_location();
- $char->create_gear();
-
- // Award the Adventurer title.
- $char->award_title(1);
-
- // Set the character as the user's selected character
- change_user_character($char->id);
-
- flash('alert_character_list_1', ['success', 'Character ' . $name . ' created!']);
- redirect('/characters');
-}
-
diff --git a/src/controllers/profile.php b/src/controllers/profile.php
deleted file mode 100644
index 3497d13..0000000
--- a/src/controllers/profile.php
+++ /dev/null
@@ -1,24 +0,0 @@
-char_id == $id) redirect('/profile');
- echo page('profile/show', ['c' => $char]);
-}
diff --git a/src/controllers/settings.php b/src/controllers/settings.php
deleted file mode 100644
index b2521ff..0000000
--- a/src/controllers/settings.php
+++ /dev/null
@@ -1,9 +0,0 @@
- 'pages/settings/index']);
-}
diff --git a/src/controllers/ui.php b/src/controllers/ui.php
deleted file mode 100644
index 3c3174b..0000000
--- a/src/controllers/ui.php
+++ /dev/null
@@ -1,7 +0,0 @@
- $x,
- ':y' => $y,
- ':c' => user()->char_id
- ]);
-
- if ($r === false) throw new Exception('Failed to move character. (wcmp)');
-
- json_response(['x' => $x, 'y' => $y]);
-}
diff --git a/src/helpers.php b/src/helpers.php
index 44119c1..1be12eb 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -3,7 +3,7 @@
/**
* Generate a pretty dope token.
*/
-function token($length = 32)
+function token($length = 32): string
{
return bin2hex(random_bytes($length));
}
@@ -11,7 +11,7 @@ function token($length = 32)
/**
* Redirect to a new location.
*/
-function redirect($location)
+function redirect($location): void
{
header("Location: $location");
exit;
@@ -353,3 +353,14 @@ function parse_bbcode(string $text): array
'char_count' => $charCount
];
}
+
+/**
+ * Shorthand to verify auth, a character is selected, CSRF is correct, and it is an AJAX request. Used for
+ * front-end API routes.
+ */
+function ui_guard()
+{
+ auth_only_and_must_have_character();
+ ajax_only();
+ csrf_ensure();
+}
diff --git a/src/util/components.php b/src/util/components.php
index 9b2cccc..8a97716 100644
--- a/src/util/components.php
+++ b/src/util/components.php
@@ -117,3 +117,12 @@ function c_equipped_gear(Character $char): string
{
return render('components/equipped_gear', ['char' => $char]);
}
+
+/**
+ * Render a front-end UI window with the given title and content. The WindowManager on the front end will handle
+ * the rest.
+ */
+function c_ui_window(string $title = '', string $content = ''): string
+{
+ return render('components/ui_window', ['title' => $title, 'content' => $content]);
+}
diff --git a/src/util/render.php b/src/util/render.php
index 8954697..9072796 100644
--- a/src/util/render.php
+++ b/src/util/render.php
@@ -18,20 +18,3 @@ function render($pathToBaseView, $data = [])
require template($pathToBaseView);
return ob_get_clean();
}
-
-/**
- * Set/retrieve the current page layout in/from GLOBALS.
- */
-function page_layout($layout = '')
-{
- if ($layout !== '') $GLOBALS['page-layout'] = $layout;
- return $GLOBALS['page-layout'] ?? 'basic';
-}
-
-/**
- * Shorthand to render a page with the current layout.
- */
-function page($view, $data = [])
-{
- return render("layouts/" . page_layout(), ['view' => "pages/$view"] + $data);
-}
diff --git a/src/util/router.php b/src/util/router.php
index 34e24cb..d77bea7 100644
--- a/src/util/router.php
+++ b/src/util/router.php
@@ -1,5 +1,9 @@
405, 'handler' => null, 'params' => []];
}
+ /**
+ * Shorthand to register a GET route.
+ */
public function get(string $route, callable $handler): Router
{
return $this->add('GET', $route, $handler);
}
+ /**
+ * Shorthand to register a POST route.
+ */
public function post(string $route, callable $handler): Router
{
return $this->add('POST', $route, $handler);
diff --git a/templates/components/debug_query_log.php b/templates/components/debug_query_log.php
deleted file mode 100644
index a533452..0000000
--- a/templates/components/debug_query_log.php
+++ /dev/null
@@ -1,11 +0,0 @@
-queries were executed.
- ({$time}s) {$query[0]}"; - } - ?> -Page execution took seconds.
-Bootstrap: seconds
-Router: seconds
-Handler: seconds
-