lindeas
/
jilo-web
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Login/registration fixes

main
Yasen Pramatarov 2024-07-01 12:45:07 +03:00
parent 7f5ca64e56
commit 306cf55cc9
13 changed files with 176 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
jilo-web.conf
View File

9
jilo-web.conf.php 100644
View File

@ -0,0 +1,9 @@
<?php
$config = [
'domain' => 'localhost',
'folder' => '/jilo-web/',
'database' => '/home/yasen/work/code/git/lindeas-code/jilo-web/jilo-web.db',
];
?>

109
public_html/index.php
View File

@ -1,30 +1,18 @@
<?php
unset($error);
if (isset($_GET['page'])) {
$page = $_GET['page'];
} elseif (isset($_POST['page'])) {
$page = $_POST['page'];
} else {
$page = 'front';
}
session_start();
if ( !isset($_SESSION['user_id']) && ($page !== 'login' && $page !== 'register') ) {
header('Location: index.php?page=login');
exit();
}
if ( isset($_SESSION['username']) ) {
$user = htmlspecialchars($_SESSION['username']);
}
if (isset($error)) {
echo "<div class=\"error\">Error: $error</div>";
}
/**
* Jilo web logs observer
*
* Description: A web interface to Jilo (JItsi Logs Observer), written in PHP
* Author: Yasen Pramatarov
* License: GPLv2
* Project URL: https://lindeas.com/jilo
* Year: 2024
* Version: 0.1
*/
// list of available pages
// edit accordingly, add 'pages/PAGE.php'
$allowed_urls = [
'front',
'login',
@ -34,14 +22,77 @@ $allowed_urls = [
'config',
];
include 'templates/header.php';
if (in_array($page, $allowed_urls)) {
include "pages/{$page}.php";
// cnfig file
$config_file = '/home/yasen/work/code/git/lindeas-code/jilo-web/jilo-web.conf.php';
if (file_exists($config_file)) {
require_once $config_file;
} else {
include 'pages/front.php';
die('Config file not found');
}
session_start();
if (isset($_GET['page'])) {
$page = $_GET['page'];
} elseif (isset($_POST['page'])) {
$page = $_POST['page'];
} else {
$page = 'front';
}
// logged in username
if ( isset($_SESSION['username']) ) {
$user = htmlspecialchars($_SESSION['username']);
}
// redirect to login
if ( !isset($_SESSION['user_id']) && ($page !== 'login' && $page !== 'register') ) {
header('Location: index.php?page=login');
exit();
}
// we use 'notice' for all non-critical messages and 'error' for errors
if (isset($_SESSION['notice'])) {
$notice = $_SESSION['notice'];
}
if (isset($_SESSION['error'])) {
$error = $_SESSION['error'];
}
// page building
if (in_array($page, $allowed_urls)) {
// logout is a special case, as we can't use session vars for notices
if ($page == 'logout') {
// clean up session
session_unset();
session_destroy();
$notice = "You were logged out.<br />You can log in again.";
include 'templates/header.php';
include 'templates/menu.php';
include 'templates/message.php';
include 'pages/login.php';
// all other normal pages
} else {
include 'templates/header.php';
include 'templates/menu.php';
include 'templates/message.php';
include "pages/{$page}.php";
}
// the page is not in allowed urls, loading front page
} else {
include 'templates/header.php';
include 'templates/menu.php';
include 'templates/message.php';
include 'pages/front.php';
}
include 'templates/footer.php';
// clear errors and notices before next page just in case
unset($_SESSION['error']);
unset($_SESSION['notice']);
?>

13
public_html/pages/login.php
View File

@ -2,10 +2,12 @@
require_once 'classes/database.php';
require 'classes/user.php';
// clear the global error var before login
unset($error);
try {
$db = new Database('./jilo-web.db');
$db = new Database($config['database']);
$user = new User($db);
if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
@ -34,16 +36,19 @@ try {
'samesite' => 'Strict',
'httponly' => true,
'secure' => isset($_SERVER['HTTPS']),
'domain' => $domain,
'path' => '/jilo-web/'
'domain' => $config['domain'],
'path' => $config['folder']
]);
// redirect to index
$_SESSION['notice'] = "Login successful";
header('Location: index.php');
exit();
// login failed
} else {
$error = "Login failed.";
$_SESSION['error'] = "Login failed.";
header('Location: index.php');
exit();
}
}
} catch (Exception $e) {

10
public_html/pages/logout.php
View File

@ -1,10 +0,0 @@
<?php
session_start();
session_unset();
session_destroy();
unset($error);
echo "You logged out.";
?>

12
public_html/pages/register.php
View File

@ -5,17 +5,23 @@ require 'classes/user.php';
unset($error);
try {
$db = new Database('./jilo-web.db');
$db = new Database($config['database']);
$user = new User($db);
if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
$username = $_POST['username'];
$password = $_POST['password'];
// redirect to login
if ( $user->register($username, $password) ) {
echo "Registration successful.";
$_SESSION['notice'] = "Registration successful.<br />You can log in now.";
header('Location: index.php');
exit();
// registration fail, redirect to login
} else {
echo "Registration failed.";
$_SESSION['error'] = "Registration failed.";
header('Location: index.php');
exit();
}
}
} catch (Exception $e) {

23
public_html/static/all.css
View File

@ -44,6 +44,7 @@
background-color: #eee;
border: 1px solid #333;
font-weight: bold;
font-size: 0.85em;
}
.notice {
@ -53,4 +54,26 @@
background-color: #eee;
border: 1px solid #333;
font-weight: bold;
font-size: 0.85em;
}
#main {
width: 100%;
}
#footer {
position: absolute;
left: 0px;
bottom: 0px;
height: 30px;
width: 100%;
background-color: #777;
color: white;
text-align: center;
font-size: 0.85em;
line-height: 30px;
}
#footer a {
color: white;
}

4
public_html/templates/footer.php
View File

@ -1,5 +1,7 @@
<div id="footer">Jilo Web</div>
<div id="footer">Jilo Web 0.1 &copy;2024 - web interface for <a href="https://lindeas.com/jilo">Jilo</a></div>
</div>
</body>

6
public_html/templates/form-login.php
View File

@ -1,12 +1,6 @@
<h2>Login</h2>
<?php if (isset($error)) { ?>
<div class="error">
<?php echo $error; ?>
</div>
<?php } ?>
<div class="login-form">
<form method="POST" action="?page=login">
<input type="text" name="username" placeholder="Username" required />

16
public_html/templates/form-register.php
View File

@ -1,6 +1,12 @@
<form method="POST" action="?page=register">
<input type="text" name="username" placeholder="Username" required />
<input type="password" name="password" placeholder="Password" required />
<button type="submit">Register</button>
</form>
<h2>Register</h2>
<div class="register-form">
<form method="POST" action="?page=register">
<input type="text" name="username" placeholder="Username" required />
<br />
<input type="password" name="password" placeholder="Password" required />
<br />
<input type="submit" value="Register" />
</form>
</div>

19
public_html/templates/header.php
View File

@ -8,21 +8,4 @@
<body>
<div class="menu-container">
<ul class="menu-left">
<li><a href="index.php">home</a></li>
<?php if ( isset($_SESSION['user_id']) ) { ?>
<li><a href="?page=config">config</a></li>
<?php } ?>
</ul>
<ul class="menu-right">
<?php if ( isset($_SESSION['user_id']) ) { ?>
<li><a href="?page=profile"><?= $user ?></a></li>
<li><a href="?page=logout">logout</a></li>
<?php } else { ?>
<li><a href="?page=login">login</a></li>
<li><a href="?page=register">register</a></li>
<?php } ?>
</ul>
</div>
<div id="main">

19
public_html/templates/menu.php 100644
View File

@ -0,0 +1,19 @@
<div class="menu-container">
<ul class="menu-left">
<li><a href="index.php">home</a></li>
<?php if ( isset($_SESSION['user_id']) ) { ?>
<li><a href="?page=config">config</a></li>
<?php } ?>
</ul>
<ul class="menu-right">
<?php if ( isset($_SESSION['user_id']) ) { ?>
<li><a href="?page=profile"><?= $user ?></a></li>
<li><a href="?page=logout">logout</a></li>
<?php } else { ?>
<li><a href="?page=login">login</a></li>
<li><a href="?page=register">register</a></li>
<?php } ?>
</ul>
</div>

12
public_html/templates/message.php 100644
View File

@ -0,0 +1,12 @@
<?php if (isset($error)) { ?>
<div class="error">
<?php echo $error; ?>
</div>
<?php } ?>
<?php if (isset($notice)) { ?>
<div class="notice">
<?php echo $notice; ?>
</div>
<?php } ?>