freya/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor

Browse source
This commit is contained in:
Freya Murphy 2024-09-18 14:14:53 -04:00
parent 2a88aba7a5
commit 1f9024763d
Signed by: freya
GPG key ID: 744AB800E383AE52
43 changed files with 681 additions and 712 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/assets/projects/03-brainfucked.md
View file

@ -7,4 +7,4 @@ brainfucked is a brainfuck dialect that makes you manage your memory manually!
The original interpreter gives you a tape of 30,000 cells, while i only give you
as much as a pointer takes up on your system: 4 or 8 depending if your on a 32bit or 64bit system.
You can than allocate a new tape and then use that! Also brainfucked is tuing complete proven by
this amzing [proof](/blog/writeup?name=proof.md) that my friend [trimill](https://trimill.xyz) made.
this amzing [proof](/blog/writeup/brainfucked) that my friend [trimill](https://trimill.xyz) made.

0
src/assets/writeup/proof.md → src/assets/writeup/brainfucked.md
View file

8
src/scss/legacy.scss
View file

@ -6,12 +6,12 @@
behavior: url(boxsizing.htc);
}
#main.legacy .col {
#main .col {
display: block !important;
width: 100% !important;
}
#main.legacy .left {
#main .left {
padding-right: 0 !important;
padding-bottom: $outer-gap;
}
@ -22,4 +22,8 @@
#new_comment {
width: 400px;
.input {
width: 400px;
}
}

8
src/web/_controller/_comments.php
View file

@ -3,12 +3,10 @@ class _comments_controller extends Controller {
private $comments_model;
function __construct($load) {
parent::__construct($load);
$this->comments_model = $this->load->model('_comments');
function __construct() {
$this->comments_model = $this->load_model('_comments');
}
public function comments(string $page, string $ref): void {
$data = $this->comments_model->get_comments($page);
$this->view('comments', array(
@ -79,7 +77,7 @@ class _comments_controller extends Controller {
->post_comment($author, $content, $page, $vulgar);
if ($result) {
header('Location: ' . $this->main->get_url($ref) . '#comments');
header('Location: ' . $this->get_url($ref) . '#comments');
} else {
$this->error(500);
}

30
src/web/_controller/_meta.php
View file

@ -1,13 +1,10 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class _meta_controller extends Controller {
function __construct($load) {
parent::__construct($load);
}
public function robots(): void {
public function robots(): void
{
header("Content-Type: text/plain");
$sitemap = $this->main->get_url_full('sitemap.xml');
$sitemap = $this->get_url('sitemap.xml');
echo "User-agent: *\n";
echo "Disallow:\n";
@ -18,14 +15,16 @@ class _meta_controller extends Controller {
echo "Sitemap: {$sitemap}\n";
}
private function sitemap_page(string $url, string $priority): void {
private function sitemap_page(string $url, string $priority): void
{
echo "<url>\n";
echo "<loc>{$this->main->get_url_full($url)}</loc>\n";
echo "<loc>{$this->get_url($url)}</loc>\n";
echo "<priority>{$priority}</priority>\n";
echo "</url>";
}
public function sitemap(): void {
public function sitemap(): void
{
header("Content-Type: application/xml");
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
@ -35,8 +34,8 @@ class _meta_controller extends Controller {
$this->sitemap_page('projects', 0.8);
$this->sitemap_page('blog', 0.8);
$this->load->app_lang('blog');
$blog_modal = $this->load->model('blog');
$this->load_lang('blog');
$blog_modal = $this->load_model('blog');
$blog = $blog_modal->get_data()['blog'];
foreach ($blog as $name => $_) {
@ -46,20 +45,21 @@ class _meta_controller extends Controller {
echo "</urlset>\n";
}
public function manifest(): void {
public function manifest(): void
{
$json = array(
'short_name' => lang('domain'),
'name' => lang('domain'),
'icons' => [
array(
'src' => $this->main->get_url('public/icons/logo512.png'),
'src' => $this->get_url('public/icons/logo512.png'),
'type' => 'image/png',
'sizes' => '512x512',
'purpose' => 'any maskable'
)
],
'id' => $this->main->get_url('home'),
'start_url' => $this->main->get_url('home'),
'id' => $this->get_url('home'),
'start_url' => $this->get_url('home'),
'background_color' => lang('theme_color'),
'display' => 'standalone',
'scope' => lang('base_path'),

48
src/web/_controller/blog.php
View file

@ -4,29 +4,28 @@ class Blog_controller extends Controller {
public $comments_controller;
private $blog_model;
function __construct($load) {
parent::__construct($load);
$this->blog_model = $this->load->model('blog');
$this->comments_controller = $this->load->controller('_comments');
function __construct()
{
$this->blog_model = $this->load_model('blog');
$this->comments_controller = $this->load_controller('_comments');
}
public function index(): void {
public function index(): void
{
parent::index();
$data = $this->blog_model->get_data();
$this->view('header', $data);
$this->view('apps/blog', $data);
$this->view('footer', $data);
}
private function protect(string $folder): void {
if (!array_key_exists('name', $_GET)) {
$this->error(400);
}
$basepath = $GLOBALS['assetroot'] . '/' . $folder . '/';
private function protect(string $folder, string $name): void
{
$basepath = ASSET_ROOT . '/' . $folder . '/';
$realBase = realpath($basepath);
$userpath = $basepath . $_GET['name'];
$userpath = $basepath . $name . '.md';
$realUserPath = realpath($userpath);
if ($realUserPath === false || strpos($realUserPath, $realBase) !== 0) {
@ -34,35 +33,42 @@ class Blog_controller extends Controller {
}
}
public function post(): void {
$this->protect('blog');
public function post($name): void
{
$this->protect('blog', $name);
parent::index();
$data = $this->blog_model->get_post($_GET['name']);
$data = $this->blog_model->get_post($name);
if ($data === FALSE) {
$this->error(404);
}
$this->view('header', $data);
$this->view('apps/blog_post', $data);
$ref = 'blog/post?name=' . $_GET['name'];
$ref = "blog/post{$name}";
$this->comments_controller->comments($data['post']['meta']['name'], $ref);
$this->view('footer', $data);
}
public function writeup(): void {
$this->protect('writeup');
public function writeup($name): void
{
$this->protect('writeup', $name);
parent::index();
$data = $this->blog_model->get_writeup($_GET['name']);
$data = $this->blog_model->get_writeup($name);
if ($data === FALSE) {
$this->error(404);
}
$this->view('header', $data);
$this->view('apps/blog_writeup', $data);
$ref = 'blog/writeup?name=' . $_GET['name'];
$ref = "blog/writeup/{$name}";
$this->comments_controller->comments($data['post']['meta']['name'], $ref);
$this->view('footer', $data);
}
public function rss(): void {
public function rss(): void
{
$data = $this->blog_model->get_data();
header('Content-Type: application/xml');
$this->view('apps/blog_rss', $data);

9
src/web/_controller/bucket.php
View file

@ -3,12 +3,13 @@ class Bucket_controller extends Controller {
private $bucket_model;
function __construct($load) {
parent::__construct($load);
$this->bucket_model = $this->load->model('bucket');
function __construct()
{
$this->bucket_model = $this->load_model('bucket');
}
public function index(): void {
public function index(): void
{
parent::index();
$data = $this->bucket_model->get_data();
if ($data === NULL) {

17
src/web/_controller/error.php
View file

@ -3,19 +3,26 @@ class Error_controller extends Controller {
private $error_model;
function __construct($load) {
parent::__construct($load);
$this->error_model = $this->load->model('error');
function __construct()
{
$this->error_model = $this->load_model('error');
}
public function index(): void {
public function code(int $code): void
{
parent::index();
$data = $this->error_model->get_data();
$this->load_lang('error');
$data = $this->error_model->get_data($code);
$this->view('header', $data);
$this->view('apps/error', $data);
$this->view('footer', $data);
}
public function index(): void
{
$this->code(500);
}
}
?>

9
src/web/_controller/home.php
View file

@ -1,12 +1,11 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class Home_controller extends Controller {
function __construct($load) {
parent::__construct($load);
}
public function index(): void {
public function index(): void
{
parent::index();
$data = $this->main->get_data();
$data = Model::get_base_data();
$this->view('header', $data);
$this->view('apps/home', $data);
$this->view('footer', $data);

10
src/web/_controller/projects.php
View file

@ -3,13 +3,15 @@ class Projects_controller extends Controller {
private $projects_model;
function __construct($load) {
parent::__construct($load);
$this->projects_model = $this->load->model('projects');
function __construct()
{
$this->projects_model = $this->load_model('projects');
}
public function index(): void {
public function index(): void
{
parent::index();
$data = $this->projects_model->get_data();
$this->view('header', $data);
$this->view('apps/projects', $data);

33
src/web/_model/_comments.php
View file

@ -1,12 +1,9 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class _comments_model extends Model {
function __construct($load) {
parent::__construct($load);
}
private function load_profanity() {
$path = $GLOBALS['assetroot'] . '/profanity.txt';
private function load_profanity()
{
$path = ASSET_ROOT . '/profanity.txt';
$str = file_get_contents($path);
$lines = explode("\n", $str);
@ -25,14 +22,16 @@ class _comments_model extends Model {
return $regex;
}
public function is_vulgar($text) {
public function is_vulgar($text)
{
$profanity = $this->load_profanity();
return preg_match($profanity, $text);
}
public function get_comments($page) {
$ip = $this->main->info['ip'];
$query = $this->db
public function get_comments($page)
{
$ip = CONTEXT['ip'];
$query = $this->db()
->select('*')
->from('admin.comment c')
->where('c.page')
@ -46,17 +45,19 @@ class _comments_model extends Model {
return $result;
}
public function ban_user() {
$ip = $this->main->info['ip'];
$this->db
public function ban_user()
{
$ip = CONTEXT['ip'];
$this->db()
->insert_into('admin.banned', 'ip', 'reason')
->values($ip, 'vulgar language')
->execute();
}
public function post_comment($author, $content, $page, $vulgar) {
$ip = $this->main->info['ip'];
return $this->db
public function post_comment($author, $content, $page, $vulgar)
{
$ip = CONTEXT['ip'];
return $this->db()
->insert_into('admin.comment',
'author', 'content', 'page', 'ip', 'vulgar')
->values($author, $content, $page, $ip, $vulgar)

23
src/web/_model/blog.php
View file

@ -3,17 +3,18 @@ class Blog_model extends Model {
private $markdown;
function __construct($load) {
parent::__construct($load);
function __construct()
{
$this->markdown = new MarkdownParser();
}
/**
* @param mixed $data
* @return void
*/
private function load_blog(&$data): void {
private function load_blog(&$data): void
{
$blog = array();
$dir = $GLOBALS['assetroot'] . '/blog';
$dir = ASSET_ROOT . '/blog';
if ($handle = opendir($dir)) {
while (false !== ($entry = readdir($handle))) {
if (str_starts_with($entry, ".")) {
@ -29,7 +30,7 @@ class Blog_model extends Model {
}
public function get_data(): ?array {
$data = parent::get_data();
$data = parent::get_base_data('blog');
$this->load_blog($data);
$data['title'] = lang('title');
$data['desc'] = lang('blog_short_desc');
@ -40,8 +41,8 @@ class Blog_model extends Model {
* @return bool|<missing>
*/
private function load_post($name): ?array {
$dir = $GLOBALS['assetroot'] . '/blog';
$path = $dir . '/' . $name;
$dir = ASSET_ROOT . '/blog';
$path = $dir . '/' . $name . '.md';
if(!file_exists($path)) {
return NULL;
}
@ -53,7 +54,7 @@ class Blog_model extends Model {
* @return bool|null|array
*/
public function get_post($name): ?array {
$data = parent::get_data();
$data = parent::get_base_data();
$post = $this->load_post($name);
if (!$post) {
return NULL;
@ -67,8 +68,8 @@ class Blog_model extends Model {
* @param mixed $name
*/
private function load_writeup($name): ?array {
$dir = $GLOBALS['assetroot'] . '/writeup';
$path = $dir . '/' . $name;
$dir = ASSET_ROOT . '/writeup';
$path = $dir . '/' . $name . '.md';
if(!file_exists($path)) {
return NULL;
}
@ -80,7 +81,7 @@ class Blog_model extends Model {
* @return bool|null|array
*/
public function get_writeup($name): ?array {
$data = parent::get_data();
$data = parent::get_base_data();
$writeup = $this->load_writeup($name);
if (!$writeup) {
return NULL;

19
src/web/_model/bucket.php
View file

@ -1,24 +1,19 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class Bucket_model extends Model {
function __construct($load) {
parent::__construct($load);
}
public function get_data(): ?array
{
$data = parent::get_base_data();
public function get_data(): ?array {
$data = parent::get_data();
if (array_key_exists('name', $_GET)) {
if (array_key_exists('name', $_GET))
$data['name'] = $_GET['name'];
} else {
else
return NULL;
}
if (array_key_exists('lightmode', $_GET)) {
if (array_key_exists('lightmode', $_GET))
$data['lightmode'] = $_GET['lightmode'];
} else {
else
$data['lightmode'] = 'false';
}
return $data;
}

22
src/web/_model/error.php
View file

@ -1,17 +1,8 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class Error_model extends Model {
function __construct($load) {
parent::__construct($load);
}
private function get_msg(&$data) {
if (!array_key_exists('code', $_GET)) {
http_response_code(500);
$data['msg'] = ucfirst(lang('error'));
$data['title'] = '500';
} else {
$code = $_GET['code'];
private function get_msg(&$data, int $code)
{
http_response_code($code);
$data['title'] = $code;
$msg = ucfirst(lang('error_' . $code, FALSE));
@ -19,12 +10,13 @@ class Error_model extends Model {
$msg = ucfirst(lang('error'));
}
$data['msg'] = $msg;
}
}
public function get_data(): ?array {
$data = parent::get_data();
$this->get_msg($data);
public function get_data(int $code): array
{
$data = parent::get_base_data('error');
$this->get_msg($data, $code);
return $data;
}
}

110
src/web/_model/main.php
View file

@ -1,110 +0,0 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class Main_model extends Model {
// stores the current request info
public mixed $info;
// the main loader
public Loader $load;
/**
* Loads the main model
* @param Loader $load - the main loader object
*/
function __construct(Loader $load) {
parent::__construct($load, TRUE);
$GLOBALS['main_model'] = $this;
}
/**
* Gets the stamp for a asset path
* @param string $path
*/
private function asset_stamp(string $path): int {
$root = $GLOBALS['webroot'];
$path = $root . '/../public/' . $path;
return @filemtime($path);
}
/**
* Get the current IE version
* @returns the IE version if valid IE user agent, INT_MAX if not
*/
public function get_ie_version(): int {
if (preg_match('/MSIE\s(?P<v>\d+)/i', @$_SERVER['HTTP_USER_AGENT'], $B)) {
return $B['v'];
} else {
return PHP_INT_MAX;
}
}
/**
* Gets the full url including the http scheme and host part
* Needed for IE 6 & 7 need.
* @param string $path
* @param bool $timestamp
*/
public function get_url_full(string $path, bool $timestamp = FALSE): string {
$host = $_SERVER['HTTP_HOST'];
$base = lang('base_path');
$url = "http://{$host}{$base}{$path}";
if ($timestamp) {
$time = @filemtime($GLOBALS['rootroot'] . '/' . $path);
$url .= "?timestamp={$time}";
}
return $url;
}
/**
* Gets a full path url from a relative path
* @param string $path
* @param bool $timestamp
*/
public function get_url(string $path, bool $timestamp = FALSE): string {
if ($this->get_ie_version() <= 7) {
return $this->get_url_full($path, $timestamp);
}
$base = lang('base_path');
$url = "{$base}{$path}";
if ($timestamp) {
$time = @filemtime($GLOBALS['rootroot'] . '/' . $path);
$url .= "?timestamp={$time}";
}
return $url;
}
/**
* Loads a css html link
* @param string $path - the path to the css file
*/
public function link_css(string $path): string {
$stamp = $this->asset_stamp($path);
$href = $this->get_url("public/{$path}?stamp={$stamp}");
return '<link rel="stylesheet" href="'. $href .'">';
}
/**
* Loads a css html link
* @param string $path - the path to the css file
*/
public function embed_css(string $path): string {
$file = $GLOBALS['publicroot'] . '/' . $path;
if (file_exists($file)) {
$text = file_get_contents($file);
return "<style>{$text}</style>";
} else {
return "";
}
}
/**
* Formats a ISO date
* @param $iso_date the ISO date
*/
public function format_date(string $iso_date): string {
return date("Y-m-d D H:m", strtotime($iso_date));
}
}
?>

14
src/web/_model/projects.php
View file

@ -3,17 +3,18 @@ class Projects_model extends Model {
private $markdown;
function __construct($load) {
parent::__construct($load);
function __construct()
{
$this->markdown = new MarkdownParser();
}
/**
* @param array<string,mixed> $data
*/
private function load_projects(&$data): void {
private function load_projects(&$data): void
{
$projects = array();
$dir = $GLOBALS['assetroot'] . '/projects';
$dir = ASSET_ROOT . '/projects';
if ($handle = opendir($dir)) {
while (false !== ($entry = readdir($handle))) {
if (str_starts_with($entry, ".")) {
@ -28,8 +29,9 @@ class Projects_model extends Model {
$data['projects'] = $projects;
}
public function get_data(): ?array {
$data = parent::get_data();
public function get_data(): ?array
{
$data = parent::get_base_data();
$this->load_projects($data);
$data['title'] = lang('title');
$data['desc'] = lang('short_desc');

6
src/web/_views/apps/blog.php
View file

@ -1,13 +1,13 @@
<?php /* Copyright (c) 2024 Freya Murphy */ ?>
<?=aria_section('blog', lang('title'))?>
<p><?=lang('blog_desc', sub: [$this->main->get_url('rss.xml')])?></p>
<p><?=lang('blog_desc', sub: [$this->get_url('rss.xml')])?></p>
<?php
foreach($blog as $name => $post) {
$meta = $post['meta'];
$link = $this->main->get_url('blog/post?name=' . $name);
$link = $this->get_url('blog/post/' . substr($name, 0, -3));
echo '<a href="' . $link . '"><h3>' . $meta['name'] . '</h3></a>';
echo '<span>' . $meta['desc'] . '</span><br>';
echo '<span><time>' . $this->main->format_date($meta['date']) . '</time></span>';
echo '<span><time>' . $this->format_date($meta['date']) . '</time></span>';
}
?>
</div>

2
src/web/_views/apps/blog_post.php
View file

@ -1,6 +1,6 @@
<?php /* Copyright (c) 2024 Freya Murphy */ ?>
<?=aria_section('post', $post['meta']['name'])?>
<span><?=ucfirst(lang('posted'))?>: <time><?=$this->main->format_date($post['meta']['date'])?></time></span>
<span><?=ucfirst(lang('posted'))?>: <time><?=$this->format_date($post['meta']['date'])?></time></span>
<br>
<?=$post['content']?>
</div>

5
src/web/_views/apps/blog_rss.php
View file

@ -7,12 +7,13 @@
<language><?=lang('lang_short')?></language>
<?php
foreach ($blog as $name => $post) {
$name = substr($name, 0, -3);
echo '<item>';
echo '<title>' . $post['meta']['name'] . '</title>';
echo '<description>' . $post['meta']['desc'] . '</description>';
echo '<pubDate>' . $post['meta']['date'] . '</pubDate>';
echo '<link>' . lang('root_url') . 'blog/post?name=' . $name . '</link>';
echo '<guid>' . lang('root_url') . 'blog/post?name=' . $name . '</guid>';
echo '<link>' . lang('root_url') . 'blog/post/' . $name . '</link>';
echo '<guid>' . lang('root_url') . 'blog/post/' . $name . '</guid>';
echo '</item>';
}
?>

4
src/web/_views/apps/bucket.php
View file

@ -3,9 +3,9 @@
$root='https://webring.bucketfish.me/redirect.html?to=%s&name=' . $name;
$this->view('head', $data);
if ($lightmode === 'true') {
echo $this->main->link_css('css/bucket_light.css');
echo $this->link_css('css/bucket_light.css');
} else {
echo $this->main->link_css('css/bucket.css');
echo $this->link_css('css/bucket.css');
}
?>
<base target="_parent" />

2
src/web/_views/comments.php
View file

@ -3,7 +3,7 @@
<?php
if ($comments)
foreach($comments as $comment) {
$date = $this->main->format_date($comment['created']);
$date = $this->format_date($comment['created']);
echo '<div class="comment">';
echo '<h3 class="header">' . esc($comment['author']) . '</h3>';

11
src/web/_views/footer.php
View file

@ -6,8 +6,6 @@
} else {
$footer_text = '';
}
$legacy = $this->main->get_ie_version() <= 7;
?>
</div>
</div>
@ -39,13 +37,12 @@
height="40"
class="bucket"
title="<?=lang('bucket_title')?>"
src="<?=$this->main->get_url('bucket?name=freya')?>"
src="<?=$this->get_url('bucket?name=freya')?>"
></iframe>
</div>
<?php if($legacy): ?>
</center>
<?php else: ?>
</div>
<?php endif; ?>
<!--[if lt IE 8 ]>
</center>
<![endif]-->
</body>
</html>

22
src/web/_views/head.php
View file

@ -12,18 +12,18 @@
<meta property="og:description" content="<?=$desc?>">
<meta property="og:title" content="<?=$title?>">
<meta property="og:site_name" content="<?=lang('domain')?>">
<meta property="og:image" content="<?=$this->main->get_url_full('public/icons/logo640.png', TRUE)?>">
<meta property="og:image" content="<?=$this->get_url('public/icons/logo640.png', TRUE)?>">
<title><?=$title?></title>
<link rel="icon" type="image/png" sizes="16x16" href="<?=$this->main->get_url("public/icons/logo16.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="32x32" href="<?=$this->main->get_url("public/icons/logo32.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="64x64" href="<?=$this->main->get_url("public/icons/logo64.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="320x320" href="<?=$this->main->get_url("public/icons/logo320.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="512x512" href="<?=$this->main->get_url("public/icons/logo512.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="640x640" href="<?=$this->main->get_url("public/icons/logo640.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="16x16" href="<?=$this->get_url("public/icons/logo16.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="32x32" href="<?=$this->get_url("public/icons/logo32.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="64x64" href="<?=$this->get_url("public/icons/logo64.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="320x320" href="<?=$this->get_url("public/icons/logo320.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="512x512" href="<?=$this->get_url("public/icons/logo512.png", TRUE)?>">
<link rel="icon" type="image/png" sizes="640x640" href="<?=$this->get_url("public/icons/logo640.png", TRUE)?>">
<link rel="manifest" href="/manifest.json">
<?php if($this->main->get_ie_version() <= 7)
echo $this->main->link_css('css/legacy.css');
?>
<!--[if lt IE 8 ]>
<?=$this->link_css('css/legacy.css')?>
<![endif]-->
<?php foreach($css as $file)
echo $this->main->embed_css($file);
echo $this->embed_css($file);
?>

18
src/web/_views/header.php
View file

@ -1,16 +1,14 @@
<?php /* Copyright (c) 2024 Freya Murphy */ ?>
<?php
$this->view('head', $data);
echo $this->main->link_css('css/main.css');
$legacy = $this->main->get_ie_version() <= 7;
echo $this->link_css('css/main.css');
?>
</head>
<body>
<?php if($legacy): ?>
<!--[if lt IE 8 ]>
<center>
<?php else: ?>
<![endif]-->
<div class="center">
<?php endif; ?>
<div id="header" role="banner" aria-label="banner">
<?=image('img/headerLogo', 'alt_website_logo', size: '200')?>
<div class="content">
@ -20,24 +18,20 @@
<div role="navigation">
<ul id="nav">
<li><?=ilang('action_home',
href: $this->main->get_url('home'),
href: $this->get_url('home'),
container: 'h2'
)?></li>
<li><?=ilang('action_projects',
href: $this->main->get_url('projects'),
href: $this->get_url('projects'),
container: 'h2'
)?></li>
<li><?=ilang('action_blog',
href: $this->main->get_url('blog'),
href: $this->get_url('blog'),
container: 'h2'
)?></li>
</ul>
</div>
</div>
</div>
<?php if($legacy): ?>
<div id="main" class="legacy" role="main">
<?php else: ?>
<div id="main" role="main" aria-label="main">
<?php endif; ?>
<div id="container">

4
src/web/config/routes.php
View file

@ -1,11 +1,7 @@
<?php /* Copyright (c) 2024 Freya Murphy */
$routes = array();
$routes[''] = 'home';
$routes['robots.txt'] = '_meta/robots';
$routes['sitemap.xml'] = '_meta/sitemap';
$routes['manifest.json'] = '_meta/manifest';
$routes['rss.xml'] = 'blog/rss';
$serviceable = array('bucket');

2
src/web/config/style.php
View file

@ -1,7 +1,5 @@
<?php /* Copyright (c) 2024 Freya Murphy */
$style = array();
$style['home'] = 'css/home.css';
$style['blog'] = 'css/blog.css';
$style['error'] = 'css/error.css';

54
src/web/core/_controller.php
View file

@ -1,54 +0,0 @@
<?php /* Copyright (c) 2024 Freya Murphy */
abstract class Controller {
// the main model
public Main_model $main;
// the loader
public Loader $load;
/**
* Creates a constructor
* @param Loader $load - the website loaded object
*/
function __construct($load) {
$this->load = $load;
$this->main = $this->load->model('main');
$this->load->lang();
$info = $this->main->info;
$app = $info['app'];
if ($app) {
$this->load->app_lang($app);
}
}
public function index(): void {}
public function redirect(string $link): void {
header('Location: '. $link, true, 301);
die();
}
/**
* @param array<int,mixed> $data
*/
protected function view(string $__name, array $data = array()): void {
$__root = $GLOBALS['webroot'];
$__path = $__root . '/_views/' . $__name . '.php';
if (is_file($__path)) {
extract($data);
require($__path);
return;
}
}
protected function error(int $code): void {
$_GET['code'] = $code;
$this->main->info['app'] = 'error';
$error_controller = $this->load->controller('error');
$error_controller->index();
die();
}
}

51
src/web/core/_model.php
View file

@ -1,51 +0,0 @@
<?php /* Copyright (c) 2024 Freya Murphy */
abstract class Model {
// the main model
// shared by all controllers and models
public Main_model $main;
public Loader $load;
// the database
public DatabaseHelper $db;
private mixed $config;
/**
* Creates a model
* @param Loader $load - the main loader object
* @param ?Main_model $main
*/
function __construct(Loader $load, bool $main = FALSE) {
$this->load = $load;
if ($main) {
$this->main = $this;
} else {
$this->main = $this->load->model('main');
}
$this->db = $this->load->db();
}
/**
* @returns the base model data
*/
public function get_data(): ?array {
$data = array();
$info = $this->main->info;
$app = $info['app'];
$data['title'] = lang('first_name');
$data['desc'] = lang('default_short_desc');
$data['css'] = array();
$style = $GLOBALS['style'];
if (isset($style[$app])) {
$css = $style[$app];
if (!is_array($css))
$css = array($css);
$data['css'] = $css;
}
return $data;
}
}

119
src/web/core/component.php Normal file
View file

@ -0,0 +1,119 @@
<?php /* Copyright (c) 2024 Freya Murphy */
/**
* Gives access to imporant
* needed utility functions for
* accessing everything else!
*/
abstract class Component extends Core {
// keep track of what has been loaded
private static array $loaded = array();
// ============================= LOADABLE OBJECTS ==
/**
* Loads a $type of object from a $dir with a given $name
* @param string $name - the name of the object to load
* @param string $dir - the directory theese objects are stored in
* @param string $type - the type of the object
*/
private function load_type($name, $dir, $type): object|NULL
{
$path = $dir . '/' . $name . '.php';
// dont reload an ohject
if (array_key_exists($path, Component::$loaded))
return Component::$loaded[$path];
// only load a object if it exists
if (!file_exists($path))
return NULL;
$parts = explode('/', $name);
$part = end($parts);
$class = ucfirst($part) . '_' . $type;
require($path);
$ref = NULL;
try {
$ref = new ReflectionClass($class);
} catch (Exception $_e) {}
if ($ref === NULL)
return NULL;
$obj = $ref->newInstance();
Component::$loaded[$path] = $obj;
return $obj;
}
/**
* Loads a model
* @param string $name - the name of the model to load
*/
protected function load_model($name): Model|NULL
{
$dir = WEB_ROOT . '/_model';
return $this->load_type($name, $dir, 'model');
}
/**
* Loads a controller
* @param string $name - the name of the controller to load
*/
public function load_controller($name): Controller|NULL
{
$dir = WEB_ROOT . '/_controller';
return $this->load_type($name, $dir, 'controller');
}
// ========================================= LANG ==
/**
* Loads a php lang file into the lang array
*/
private static function load_lang_file(string $file): void
{
$lang = $GLOBALS['__lang'];
require($file);
$GLOBALS['__lang'] = $lang;
}
/**
* Loads each php file lang strings in a directory
*/
private static function load_lang_dir(string $dir): void
{
if ($handle = opendir($dir)) {
while (false !== ($entry = readdir($handle))) {
if ($entry === '.' || $entry === '..')
continue;
Component::load_lang_file($entry);
}
}
}
/**
* Loads the given common lang
*/
protected static function load_lang(string ...$langs): void
{
$root = WEB_ROOT . '/lang';
foreach ($langs as $lang) {
$file = "{$root}/{$lang}.php";
$dir = "{$root}/{$lang}";
if (file_exists($file))
Component::load_lang_file($file);
else if (is_dir($dir))
Component::load_lang_dir($dir);
}
}
}

43
src/web/core/controller.php Normal file
View file

@ -0,0 +1,43 @@
<?php /* Copyright (c) 2024 Freya Murphy */
abstract class Controller extends Component {
/**
* Default index for a app, empty
*/
public function index(): void {}
/**
* Redirectes to a link
*/
public function redirect(string $link): void
{
header('Location: '. $link, true, 301);
die();
}
/**
* Lodas a view
*/
protected function view(string $__name, array $data = array()): void
{
$__path = WEB_ROOT . '/_views/' . $__name . '.php';
if (is_file($__path)) {
extract($data);
require($__path);
return;
}
}
/**
* Loads a erorr page with a given
* error code
*/
protected function error(int $code): void
{
$error_controller = $this->load_controller('error');
$error_controller->code($code);
die();
}
}

85
src/web/core/core.php Normal file
View file

@ -0,0 +1,85 @@
<?php /* Copyright (c) 2024 Freya Murphy */
/**
* Core functions needed everywhere
*/
abstract class Core {
private static ?DatabaseHelper $db = NULL;
/**
* Loads the database
*/
public static function db(): DatabaseHelper
{
if (!Component::$db)
Component::$db = new DatabaseHelper();
return Component::$db;
}
/**
* Gets the stamp for a asset path
* @param string $path
*/
public static function asset_stamp(string $path): int
{
$path = PUBLIC_ROOT . '/' . $path;
return @filemtime($path);
}
/**
* Gets a full path url from a relative path
* @param string $path
* @param bool $timestamp
*/
public static function get_url(string $path, bool $timestamp = FALSE): string
{
$host = $_SERVER['HTTP_HOST'];
if (ENVIRONMENT == 'production')
$host = lang('domain');
$base = lang('base_path');
$url = "http://{$host}{$base}{$path}";
if ($timestamp) {
$time = @filemtime(PHP_ROOT . '/' . $path);
$url .= "?timestamp={$time}";
}
return $url;
}
/**
* Loads a css html link
* @param string $path - the path to the css file
*/
public static function link_css(string $path): string
{
$stamp = Core::asset_stamp($path);
$href = Core::get_url("public/{$path}?stamp={$stamp}");
return '<link rel="stylesheet" href="'. $href .'">';
}
/**
* Loads a css html link
* @param string $path - the path to the css file
*/
public static function embed_css(string $path): string
{
$file = PUBLIC_ROOT . '/' . $path;
if (file_exists($file)) {
$text = file_get_contents($file);
return "<style>{$text}</style>";
} else {
return "";
}
}
/**
* Formats a ISO date
* @param $iso_date the ISO date
*/
public static function format_date(string $iso_date): string
{
return date("Y-m-d D H:m", strtotime($iso_date));
}
}

112
src/web/core/loader.php
View file

@ -1,112 +0,0 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class Loader {
// keep track of what has been loaded
private array $loaded;
// the database
private ?DatabaseHelper $db;
function __construct() {
$this->loaded = array();
$this->db = NULL;
}
/**
* Loads a $type of object from a $dir with a given $name
* @param string $name - the name of the object to load
* @param string $dir - the directory theese objects are stored in
* @param string $type - the type of the object
*/
private function load_type($name, $dir, $type): object|NULL {
$path = $dir . '/' . $name . '.php';
if (array_key_exists($path, $this->loaded)) {
return $this->loaded[$path];
}
if (!file_exists($path)) {
return NULL;
}
$parts = explode('/', $name);
$part = end($parts);
$class = ucfirst($part) . '_' . $type;
require($path);
$ref = NULL;
try {
$ref = new ReflectionClass($class);
} catch (Exception $_e) {}
if ($ref === NULL) {
return NULL;
}
$obj = $ref->newInstance($this);
$this->loaded[$path] = $obj;
return $obj;
}
/**
* Loads a model
* @param string $name - the name of the model to load
*/
public function model($name): object|NULL {
$root = $GLOBALS['webroot'];
$dir = $root . '/_model';
return $this->load_type($name, $dir, 'model');
}
/**
* Loads a controller
* @param string $name - the name of the controller to load
*/
public function controller($name): Controller|NULL {
$root = $GLOBALS['webroot'];
$dir = $root . '/_controller';
return $this->load_type($name, $dir, 'controller');
}
/**
* Loads the given common lang
*/
public function lang(): void {
$dir = $GLOBALS['webroot'] . '/lang/';
$lang = $GLOBALS['lang'];
if ($handle = opendir($dir)) {
while (false !== ($entry = readdir($handle))) {
if ($entry === '.' || $entry === '..' || $entry === 'apps') {
continue;
}
$path = $dir . $entry;
require($path);
}
}
$GLOBALS['lang'] = $lang;
}
/**
* Loads a given app specific lang
* @param string $name - the name of the app
*/
public function app_lang($name): void {
$dir = $GLOBALS['webroot'] . '/lang/apps/';
$file = $dir . $name . '.php';
if (file_exists($file)) {
$lang = $GLOBALS['lang'];
require($dir . $name . '.php');
$GLOBALS['lang'] = $lang;
}
}
public function db(): DatabaseHelper {
if ($this->db) {
return $this->db;
} else {
$this->db = new DatabaseHelper();
return $this->db;
}
}
}

29
src/web/core/model.php Normal file
View file

@ -0,0 +1,29 @@
<?php /* Copyright (c) 2024 Freya Murphy */
abstract class Model extends Component {
public static function get_base_data(?string $app = NULL): array
{
$data = array();
$data['title'] = lang('first_name');
$data['desc'] = lang('default_short_desc');
$data['css'] = array();
$style = $GLOBALS['style'];
if (!$app)
$app = CONTEXT['app'];
if (isset($style[$app])) {
$css = $style[$app];
if (!is_array($css))
$css = array($css);
else
$css = $style['app'];
$data['css'] = $css;
}
return $data;
}
}

217
src/web/core/router.php
View file

@ -1,26 +1,20 @@
<?php /* Copyright (c) 2024 Freya Murphy */
class Router {
// the loader
private Loader $load;
// the main model
private Main_model $main;
// the database
private DatabaseHelper $db;
class Router extends Component {
private bool $db_ready;
private bool $recursed;
private array $req;
/**
* Creates a router
* @param Loader $load - the main laoder object
*/
function __construct($load) {
$this->load = $load;
$this->db = $load->db();
$this->main = $this->load->model('main');
function __construct()
{
$this->db_ready = file_exists('/status/ready');
$this->recursed = FALSE;
$this->req = $this->get_req();
}
/**
@ -28,41 +22,70 @@ class Router {
* Gets the current route
* @return array<string,mixed>
*/
private function get_req_route($path): array {
private function get_req_route($path): array
{
// trim the path
$path = trim($path);
// remove first '/'
$path = substr($path, 1);
// get modified route
foreach ($GLOBALS['routes'] as $key => $value) {
$key = "/^{$key}$/";
if (!preg_match($key, $path, $matches))
continue;
$path = $value;
for ($i = 1; $i < count($matches); $i++) {
$path = str_replace(
"\\{$i}",
$matches[$i],
$path);
}
break;
}
// get path parts
$parts = explode('/', $path);
// get the length
$len = count($parts);
// get route info
$route = array();
// e.g. /
if ($path === '') {
if ($path === '')
$route = array(
'app' => '',
'app' => 'index',
'slug' => 'index',
'args' => array(),
);
// e.g. /home /login
} else if ($len === 1) {
else if ($len === 1)
$route = array(
'app' => $parts[0],
'slug' => 'index',
'args' => array(),
);
// e.g. /home/posts
} else {
else if ($len === 2)
$route = array (
'app' => implode('/', array_slice($parts, 0, -1)),
'slug' => end($parts)
'app' => $parts[0],
'slug' => $parts[1],
'args' => array(),
);
// e.g. /home/posts/joe
else
$route = array (
'app' => $parts[0],
'slug' => $parts[1],
'args' => array_slice($parts, 2),
);
};
$routes = $GLOBALS['routes'];
if (array_key_exists($route['app'], $routes)) {
$parts = explode('/', $routes[$route['app']]);
if (isset($routes[$path])) {
$parts = explode('/', $routes[$path]);
if (count($parts) == 1) {
$route['app'] = $parts[0];
} else {
@ -77,7 +100,8 @@ class Router {
/**
* Gets the users ip
*/
private function get_ip(): string {
private function get_ip(): string
{
$ip = '';
if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP'];
@ -93,13 +117,14 @@ class Router {
* Gets the curret request info
* @return array<string,mixed>
*/
private function get_req(): array|bool {
private function get_req(): array
{
$method = $_SERVER['REQUEST_METHOD'];
$uri_str = $_SERVER['REQUEST_URI'];
$uri = parse_url($uri_str);
if (!$uri) {
return FALSE;
$uri = array('path' => '/error');
}
$path = '';
@ -121,138 +146,94 @@ class Router {
/**
* Handles a router error code
* @param int $code - the http error code
* @param bool $recursed
*/
private function handle_error(int $code, bool $recursed): void {
if ($recursed) {
private function handle_error(int $code): void
{
if ($this->recursed)
die($code . ' (recursed)');
}
$uri_str = $_SERVER['REQUEST_URI'];
$req = array();
$req['slug'] = 'index';
$req['app'] = 'error';
$req['uri_str'] = $uri_str;
$this->main->info = $req;
$_GET['code'] = $code;
$this->handle_req($req, TRUE);
$this->recursed = TRUE;
$this->req['app'] = 'error';
$this->req['slug'] = 'code';
$this->req['args'] = array($code);
$this->handle_req();
}
/**
* @param array<int,mixed> $req
*/
private function load_htc(array $req, bool $recursed): void {
private function load_htc(array $req): void
{
$parts = explode('/', $req['uri_str']);
$file = end($parts);
$path = $GLOBALS['publicroot'] . '/polyfills/' . $file;
$path = PUBLIC_ROOT . '/polyfills/' . $file;
if (file_exists($path)) {
header('Content-type: text/x-component');
include($path);
} else {
$this->handle_error(400, $recursed);
$this->handle_error(400);
}
}
/**
* @param array $req
* @param array<int,mixed> $req
* @param bool $recursed
*/
private function handle_req(array $req, bool $recursed = FALSE): void {
if ($recursed === false) {
if (
$this->db_ready === false &&
in_array($req['app'], $GLOBALS['serviceable']) === false
) {
$this->handle_error(503, $recursed);
return;
}
if ($this->check_banned($req)) {
$this->handle_error(401, $recursed);
public function handle_req(): void
{
if ($this->recursed === FALSE) {
// if we are in a recursing error handler
// we dont want to trigger a db 503 forever
// since its already active
if ($this->db_ready === FALSE) {
$this->handle_error(503);
return;
}
}
if (!$req) {
$this->handle_error(500, $recursed);
// server error if we cannot parse url
if (!$this->req) {
$this->handle_error(500);
return;
}
if (str_ends_with($req['uri_str'], '.htc')) {
$this->load_htc($req, $recursed);
// load htc if someone is requesting it (hi IE6 :3)
if (str_ends_with($this->req['uri_str'], '.htc')) {
$this->load_htc($this->req);
return;
}
$controller = $this->load->controller($req['app']);
// load the controller
$controller = $this->load_controller($this->req['app']);
if ($controller === NULL) {
$this->handle_error(404, $recursed);
$this->handle_error(404);
return;
}
$ref = NULL;
try {
$ref = new ReflectionMethod($controller, $req['slug']);
$cls = new ReflectionClass($controller);
$mds = $cls->getMethods(ReflectionMethod::IS_PUBLIC);
foreach ($mds as $md) {
if ($md->name !== $this->req['slug'])
continue;
if (count($md->getParameters()) !=
count($this->req['args']))
continue;
$ref = $md;
break;
}
} catch (Exception $_e) {}
if ($ref === NULL || !$ref->isPublic()) {
$this->handle_error(404, $recursed);
return;
}
$ref->invoke($controller);
}
/**
* @param array<int,mixed> $req
*/
private function log_request(array $req): void {
if (
$req === FALSE ||
$this->db_ready === FALSE ||
in_array($req['app'], $GLOBALS['serviceable'])
) {
if ($ref === NULL) {
$this->handle_error(404);
return;
}
$query = $this->db
->insert_into('admin.request_log',
'ip', 'method', 'uri')
->values(
$req['ip'], $req['method'], $req['uri_str']);
$query->execute();
}
/**
* @param array<int,mixed> $req
*/
private function check_banned(array $req): bool {
$ip = FALSE;
if ($req) {
$ip = $req['ip'];
} else {
$ip = $this->get_ip();
}
$query = $this->db
->select('TRUE')
->from('admin.banned')
->where('ip')->eq($ip);
return !!($query->row());
}
/**
* Handels the incomming reuqest
*/
public function handle_request(): void {
$req = $this->get_req();
$this->log_request($req);
$this->main->info = $req;
$this->handle_req($req);
define('CONTEXT', $this->req);
Component::load_lang('common', $this->req['app']);
$ref->invokeArgs($controller, $this->req['args']);
}
}

3
src/web/helpers/aria.php
View file

@ -1,6 +1,7 @@
<?php /* Copyright (c) 2024 Freya Murphy */
function aria_section(string $id, ?string $title = NULL): string {
function aria_section(string $id, ?string $title = NULL): string
{
$out = '';
if ($title) {
$idh = $id . '_heading';

81
src/web/helpers/database.php
View file

@ -1,6 +1,7 @@
<?php /* Copyright (c) 2024 Freya Murphy */
function __nullify(mixed $val): mixed {
function __nullify(mixed $val): mixed
{
if (!$val) {
return NULL;
} else {
@ -18,7 +19,8 @@ class DatabaseQuery {
private array $param;
function __construct(\PDO $conn) {
function __construct(\PDO $conn)
{
$this->conn = $conn;
$this->query = '';
@ -31,7 +33,8 @@ class DatabaseQuery {
/// ARBITRARY QUERY
///
public function query(string $query): DatabaseQuery {
public function query(string $query): DatabaseQuery
{
$this->query .= $query;
return $this;
}
@ -40,12 +43,14 @@ class DatabaseQuery {
/// SELECT
///
public function select(string $select): DatabaseQuery {
public function select(string $select): DatabaseQuery
{
$this->query .= "SELECT $select\n";
return $this;
}
public function from(string $from): DatabaseQuery {
public function from(string $from): DatabaseQuery
{
$this->query .= "FROM $from\n";
return $this;
}
@ -54,7 +59,8 @@ class DatabaseQuery {
/// INSERT
///
public function insert_into(string $insert, string ...$columns): DatabaseQuery {
public function insert_into(string $insert, string ...$columns): DatabaseQuery
{
$this->query .= "INSERT INTO $insert\n (";
foreach ($columns as $idx => $column) {
if ($idx !== 0) {
@ -66,7 +72,8 @@ class DatabaseQuery {
return $this;
}
public function values(mixed ...$values): DatabaseQuery {
public function values(mixed ...$values): DatabaseQuery
{
$this->query .= "VALUES (";
foreach ($values as $idx => $value) {
if ($idx !== 0) {
@ -83,7 +90,8 @@ class DatabaseQuery {
/// WHERE
///
public function where(string $cond): DatabaseQuery {
public function where(string $cond): DatabaseQuery
{
if (!$this->where) {
$this->where = TRUE;
$this->query .= "WHERE ";
@ -97,7 +105,8 @@ class DatabaseQuery {
/**
* @param array<mixed> $array
*/
public function where_in(string $column, array $array): DatabaseQuery {
public function where_in(string $column, array $array): DatabaseQuery
{
if (!$this->where) {
$this->where = TRUE;
$this->query .= "WHERE ";
@ -116,7 +125,8 @@ class DatabaseQuery {
/**
* @param array<mixed> $array
*/
private function in(array $array): DatabaseQuery {
private function in(array $array): DatabaseQuery
{
$in = 'IN (';
foreach ($array as $idx => $item) {
if ($idx != 0) {
@ -133,31 +143,36 @@ class DatabaseQuery {
/// OPERATORS
///
public function like(mixed $item): DatabaseQuery {
public function like(mixed $item): DatabaseQuery
{
$this->query .= "LIKE ?\n";
array_push($this->param, $item);
return $this;
}
public function eq(mixed $item): DatabaseQuery {
public function eq(mixed $item): DatabaseQuery
{
$this->query .= "= ?\n";
array_push($this->param, $item);
return $this;
}
public function ne(mixed $item): DatabaseQuery {
public function ne(mixed $item): DatabaseQuery
{
$this->query .= "<> ?\n";
array_push($this->param, $item);
return $this;
}
public function lt(mixed $item): DatabaseQuery {
public function lt(mixed $item): DatabaseQuery
{
$this->query .= "< ?\n";
array_push($this->param, $item);
return $this;
}
public function le(mixed $item): DatabaseQuery {
public function le(mixed $item): DatabaseQuery
{
$this->query .= "<= ?\n";
array_push($this->param, $item);
return $this;
@ -167,7 +182,8 @@ class DatabaseQuery {
/// JOINS
///
public function join(string $table, string $on, string $type = 'LEFT'): DatabaseQuery {
public function join(string $table, string $on, string $type = 'LEFT'): DatabaseQuery
{
$this->query .= "$type JOIN $table ON $on\n";
return $this;
}
@ -176,19 +192,22 @@ class DatabaseQuery {
/// LIMIT, OFFSET, ORDER
///
public function limit(int $limit): DatabaseQuery {
public function limit(int $limit): DatabaseQuery
{
$this->query .= "LIMIT ?\n";
array_push($this->param, $limit);
return $this;
}
public function offset(int $offset): DatabaseQuery {
public function offset(int $offset): DatabaseQuery
{
$this->query .= "OFFSET ?\n";
array_push($this->param, $offset);
return $this;
}
public function order_by(string $column, string $order = 'ASC'): DatabaseQuery {
public function order_by(string $column, string $order = 'ASC'): DatabaseQuery
{
$this->query .= "ORDER BY " . $column . ' ' . $order . ' ';
return $this;
}
@ -197,7 +216,8 @@ class DatabaseQuery {
/// COLLECT
///
public function rows(mixed ...$params): ?array {
public function rows(mixed ...$params): ?array
{
$args = $this->param;
foreach ($params as $param) {
array_push($args, $param);
@ -213,7 +233,8 @@ class DatabaseQuery {
return __nullify($stmt->fetchAll(PDO::FETCH_ASSOC));
}
public function row(mixed ...$params): ?array {
public function row(mixed ...$params): ?array
{
$args = $this->param;
foreach ($params as $param) {
array_push($args, $param);
@ -223,7 +244,8 @@ class DatabaseQuery {
return __nullify($stmt->fetch(PDO::FETCH_ASSOC));
}
public function execute(mixed ...$params): bool {
public function execute(mixed ...$params): bool
{
$args = $this->param;
foreach ($params as $param) {
array_push($args, $param);
@ -250,11 +272,13 @@ class DatabaseHelper {
private ?\PDO $conn;
function __construct() {
function __construct()
{
$this->conn = NULL;
}
private function connect(): \PDO {
private function connect(): \PDO
{
if ($this->conn === NULL) {
$user = getenv("POSTGRES_USER");
$pass = getenv("POSTGRES_PASSWORD");
@ -275,19 +299,22 @@ class DatabaseHelper {
return $this->conn;
}
public function select(string $select): DatabaseQuery {
public function select(string $select): DatabaseQuery
{
$conn = $this->connect();
$query = new DatabaseQuery($conn);
return $query->select($select);
}
public function insert_into(string $insert, string ...$columns): DatabaseQuery {
public function insert_into(string $insert, string ...$columns): DatabaseQuery
{
$conn = $this->connect();
$query = new DatabaseQuery($conn);
return $query->insert_into($insert, ...$columns);
}
public function query(string $query_str): DatabaseQuery {
public function query(string $query_str): DatabaseQuery
{
$conn = $this->connect();
$query = new DatabaseQuery($conn);
return $query->query($query_str);

17
src/web/helpers/image.php
View file

@ -1,6 +1,7 @@
<?php /* Copyright (c) 2024 Freya Murphy */
function __get_mime($type) {
function __get_mime($type)
{
switch ($type) {
case 'mp4':
return 'video/mp4';
@ -22,15 +23,14 @@ function __get_mime($type) {
function __make_source(
$name,
$format,
$media
) {
$media)
{
if ($media) {
$media = "media=\"$media\"";
} else {
$media = '';
}
$main = $GLOBALS['main_model'];
$path = $main->get_url('public/' . $name . '.' . $format, TRUE);
$path = Core::get_url('public/' . $name . '.' . $format, TRUE);
$mime = __get_mime($format);
return sprintf('<source type="%s" srcset="%s" %s>',
$mime, $path, $media);
@ -45,8 +45,8 @@ function image(
$height = NULL,
$width = NULL,
$size = NULL,
) :string {
$size = NULL) :string
{
if ($animated === TRUE) {
$animated = array('gif');
@ -68,8 +68,7 @@ function image(
}
$format = end($formats);
$main = $GLOBALS['main_model'];
$path = $main->get_url('public/' . $name . '.' . $format, TRUE);
$path = Core::get_url('public/' . $name . '.' . $format, TRUE);
$out .= "<img src=\"$path\"";
if ($alt) {
$alt = lang($alt);

4
src/web/helpers/lang.php
View file

@ -1,5 +1,5 @@
<?php /* Copyright (c) 2024 Freya Murphy */
$lang = array();
$__lang = array();
/**
* @param ?array<string,mixed> $sub
@ -8,7 +8,7 @@ function lang(
string $key,
?string $default = NULL,
?array $sub = NULL) {
$lang = $GLOBALS['lang'];
$lang = $GLOBALS['__lang'];
if(array_key_exists($key, $lang)) {
if ($sub) {
return sprintf($lang[$key], ...$sub);

64
src/web/index.php
View file

@ -1,39 +1,57 @@
<?php /* Copyright (c) 2024 Freya Murphy */
// ========================= ENVIRONMENT ==
ini_set('html_errors', '1');
$webroot = dirname(__FILE__);
$assetroot = realpath(dirname(__FILE__) . '/../assets');
$publicroot = realpath(dirname(__FILE__) . '/../public');
$rootroot = realpath(dirname(__FILE__) . '/..');
$main_model = NULL;
// ENVIRONMENT
//
// devlopment - do not cache any assets
// - allways reload
//
// production - use generated timestamps
// - for eachfile
//
define('ENVIRONMENT', 'devlopment');
// loadd all third party
require($webroot . '/third_party/parsedown.php');
require($webroot . '/third_party/parsedown_extra.php');
// FOLDER_ROOT
//
// define folder directiroy paths based on this file
define('PHP_ROOT', dirname(__FILE__) . '/..');
define('WEB_ROOT', PHP_ROOT . '/web');
define('ASSET_ROOT', PHP_ROOT . '/assets');
define('PUBLIC_ROOT', PHP_ROOT . '/public');
// ========================== BOOTSTRAP ==
// load all third party
require(WEB_ROOT . '/third_party/parsedown.php');
require(WEB_ROOT . '/third_party/parsedown_extra.php');
// load all the config files
require($webroot . '/config/routes.php');
require($webroot . '/config/style.php');
require(WEB_ROOT . '/config/routes.php');
require(WEB_ROOT . '/config/style.php');
// load all the helpers
require($webroot . '/helpers/lang.php');
require($webroot . '/helpers/aria.php');
require($webroot . '/helpers/image.php');
require($webroot . '/helpers/markdown.php');
require($webroot . '/helpers/database.php');
require($webroot . '/helpers/sanitize.php');
require(WEB_ROOT . '/helpers/lang.php');
require(WEB_ROOT . '/helpers/aria.php');
require(WEB_ROOT . '/helpers/image.php');
require(WEB_ROOT . '/helpers/markdown.php');
require(WEB_ROOT . '/helpers/database.php');
require(WEB_ROOT . '/helpers/sanitize.php');
// load all core files
require($webroot . '/core/_controller.php');
require($webroot . '/core/_model.php');
require($webroot . '/core/loader.php');
require($webroot . '/core/router.php');
require(WEB_ROOT . '/core/core.php');
require(WEB_ROOT . '/core/component.php');
require(WEB_ROOT . '/core/controller.php');
require(WEB_ROOT . '/core/model.php');
require(WEB_ROOT . '/core/router.php');
// ============================== START ==
function __init() {
$load = new Loader();
$router = new Router($load);
$router->handle_request();
$router = new Router();
$router->handle_req();
};
__init();

0
src/web/lang/apps/blog.php → src/web/lang/blog.php
View file

0
src/web/lang/apps/error.php → src/web/lang/error.php
View file

0
src/web/lang/apps/home.php → src/web/lang/home.php
View file

0
src/web/lang/apps/projects.php → src/web/lang/projects.php
View file