From 5d240b1dd872956ca29d920cffac352bf83ae115 Mon Sep 17 00:00:00 2001 From: Yasen Pramatarov Date: Thu, 1 Aug 2024 11:12:54 +0300 Subject: [PATCH] Adds login and registration messages and configs --- jilo-web.conf.php | 12 ++++--- public_html/pages/login.php | 5 +++ public_html/pages/register.php | 57 ++++++++++++++++++++-------------- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/jilo-web.conf.php b/jilo-web.conf.php index d9ec97f..ebe503d 100644 --- a/jilo-web.conf.php +++ b/jilo-web.conf.php @@ -1,11 +1,13 @@ 'localhost', - 'folder' => '/jilo-web/', - 'database' => '/home/yasen/work/code/git/lindeas-code/jilo-web/jilo-web.db', - 'jilo_database' => '/home/yasen/work/code/git/lindeas-code/jilo/jilo.db', - 'version' => '0.1.1', + 'domain' => 'localhost', + 'folder' => '/jilo-web/', + 'database' => '/home/yasen/work/code/git/lindeas-code/jilo-web/jilo-web.db', + 'jilo_database' => '/home/yasen/work/code/git/lindeas-code/jilo/jilo.db', + 'registration_enabled' => true, + 'login_message' => '', + 'version' => '0.1.1', ]; ?> diff --git a/public_html/pages/login.php b/public_html/pages/login.php index 3f651cb..3ab3ee5 100644 --- a/public_html/pages/login.php +++ b/public_html/pages/login.php @@ -68,6 +68,11 @@ try { $error = $e->getMessage(); } +if (!empty($config['login_message'])) { + $notice = $config['login_message']; + include 'templates/block-message.php'; +} + include 'templates/form-login.php'; ?> diff --git a/public_html/pages/register.php b/public_html/pages/register.php index 5ae47c7..b356805 100644 --- a/public_html/pages/register.php +++ b/public_html/pages/register.php @@ -1,34 +1,43 @@ register($username, $password) ) { - $_SESSION['notice'] = "Registration successful.
You can log in now."; - header('Location: index.php'); - exit(); - // registration fail, redirect to login - } else { - $_SESSION['error'] = "Registration failed."; - header('Location: index.php'); - exit(); + if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) { + $username = $_POST['username']; + $password = $_POST['password']; + + // redirect to login + if ( $user->register($username, $password) ) { + $_SESSION['notice'] = "Registration successful.
You can log in now."; + header('Location: index.php'); + exit(); + // registration fail, redirect to login + } else { + $_SESSION['error'] = "Registration failed."; + header('Location: index.php'); + exit(); + } } + } catch (Exception $e) { + $error = $e->getMessage(); } -} catch (Exception $e) { - $error = $e->getMessage(); + + include 'templates/block-message.php'; + include 'templates/form-register.php'; + +// registration disabled +} else { + $notice = 'Registration is disabled'; + include 'templates/block-message.php'; } -include 'templates/block-message.php'; -include 'templates/form-register.php'; - ?>