- {{class1name}} + {env('class_1_name')}
- Fast level-ups
- High hit points @@ -76,7 +74,7 @@ function main()
- 3 +defense spells
- 0 +attack spells
- Medium level-ups
- Medium hit points @@ -89,7 +87,7 @@ function main()
- 3 +defense spells
- 3 +attack spells
- Slow level-ups
- Medium hit points @@ -246,13 +244,11 @@ function main() [ Top ] HTML; - return display_help(parse($page, $controlrow)); + return display_help($page); } function items() { - global $controlrow; - $page = <<
You should receive an Account Verification email shortly. You will need the verification code contained in that email before you are allowed to log in. Once you have received the email, please visit the Verification Page to enter your code and start playing."; } else { $page = "Your account was created successfully.
However, there was a problem sending your verification email. Please check with the game administrator to help resolve this problem."; } } else { - $page = "Your account was created succesfully.
You may now continue to the Login Page and continue playing ".$controlrow["gamename"]."!"; + $page = "Your account was created succesfully.
You may now continue to the Login Page and continue playing ".env('game_name')."!"; } } } else { - if ($controlrow["verifyemail"] == true) { - $controlrow["verifytext"] = "
A verification code will be sent to the address above, and you will not be able to log in without first entering the code. Please be sure to enter your correct email address."; + if (env('verify_email')) { + $verify_text = "
A verification code will be sent to the address above, and you will not be able to log in without first entering the code. Please be sure to enter your correct email address."; } else { - $controlrow["verifytext"] = ""; + $verify_text = ""; } - $page = render('register', ['controlrow' => $controlrow]); + $page = render('register', ['verify_text' => $verify_text]); } page_title('Register'); @@ -198,11 +196,8 @@ function settings() function sendpassemail($emailaddress, $password) { - global $controlrow; - extract($controlrow); - $email = <<verify !== 'g2g' && !in_array($uri[0], ['verify', 'logout'])) { + if (env('verify_email') && user()->verify !== 'g2g' && !in_array($uri[0], ['verify', 'logout'])) { redirect('/verify'); } diff --git a/src/lib.php b/src/lib.php index 5eb9fa9..baf8800 100644 --- a/src/lib.php +++ b/src/lib.php @@ -37,7 +37,7 @@ function render(string $path_to_base_view, array $data = []): string|false { ob_start(); extract($data); - require "../templates/$name.php"; + require "../templates/$path_to_base_view.php"; return ob_get_clean(); } @@ -100,16 +100,6 @@ function game_skin(): int return user() !== false ? user()->game_skin : 0; } -/** - * Get the current control row from the database. - */ -function get_control_row(): array|false -{ - $query = db()->query('SELECT * FROM control WHERE id = 1 LIMIT 1;'); - if ($query === false) return false; - return $query->fetchArray(SQLITE3_ASSOC); -} - /** * Get a town's data by it's coordinates. */ @@ -518,7 +508,6 @@ function is_post(): bool */ function page_title(string $new_title = ''): string { - global $controlrow; if ($new_title) return $GLOBALS['state']['new-page-title'] = $new_title; - return $GLOBALS['state']['new-page-title'] ?? $controlrow['gamename']; + return $GLOBALS['state']['new-page-title'] ?? env('game_name'); } diff --git a/src/mail.php b/src/mail.php index 10814ba..b955aa0 100644 --- a/src/mail.php +++ b/src/mail.php @@ -11,13 +11,9 @@ */ function send_email(string $to, string $subject, string $message, array $options = []): bool { - global $controlrow; - - $from_addr = empty($controlrow['adminemail']) ? 'noreply@'.$_SERVER['SERVER_NAME'] : $controlrow['adminemail']; - - // Default configuration + // Default configuration $config = array_merge([ - 'from' => $from_addr, + 'from' => env('admin_email', 'noreply@'.$_SERVER['SERVER_NAME']), 'log_path' => '../logs/email.log', 'method' => 'smtp', // 'smtp' or 'log' 'smtp_host' => env('smtp_host', 'localhost'), diff --git a/src/render.php b/src/render.php index d301af6..3814394 100644 --- a/src/render.php +++ b/src/render.php @@ -14,13 +14,7 @@ namespace Render; function content(string $content): string { if (is_htmx()) return $content; - - global $controlrow; - - return render('layouts/primary', [ - "dkgamename" => $controlrow["gamename"], - "content" => $content - ]); + return render('layouts/primary', ['content' => $content]); } function debug_db_info(): string { diff --git a/templates/layouts/help.php b/templates/layouts/help.php index 285c75e..b140eca 100644 --- a/templates/layouts/help.php +++ b/templates/layouts/help.php @@ -3,12 +3,12 @@ -
Help
+Help
[ Back to Help ][ Return to Game ] diff --git a/templates/layouts/primary.php b/templates/layouts/primary.php index a6e2649..5e26e90 100644 --- a/templates/layouts/primary.php +++ b/templates/layouts/primary.php @@ -23,7 +23,7 @@
+