6 files changed, 45 insertions, 17 deletions

diff --git a/src/web/_model/_comments.php b/src/web/_model/_comments.php
index 3518508..765fda8 100644
--- a/src/web/_model/_comments.php
+++ b/src/web/_model/_comments.php
@@ -36,10 +36,10 @@ class _comments_model extends Model {
 
 	public function get_comments($page)
 	{
-		$ip = CONTEXT['ip'];
+		$ip = $this->get_ip();
 		$query = $this->db()
 			->select('*')
-			->from('admin.comment c')
+			->from('website.comment c')
 			->where('c.page')
 			->eq($page)
 			->query('AND (
@@ -53,12 +53,30 @@ class _comments_model extends Model {
 
 	public function post_comment($author, $content, $page, $vulgar)
 	{
-		$ip = CONTEXT['ip'];
+		$ip = $this->get_ip();
 		return $this->db()
-			->insert_into('admin.comment',
+			->insert_into('website.comment',
 				'author', 'content', 'page', 'ip', 'vulgar')
 			->values($author, $content, $page, $ip, $vulgar)
 			->execute();
 	}
 
+	public function get_ip(): ?string
+	{
+		$headers = array (
+				'HTTP_CLIENT_IP',
+				'HTTP_X_FORWARDED_FOR',
+				'HTTP_X_FORWARDED',
+				'HTTP_FORWARDED_FOR',
+				'HTTP_FORWARDED',
+				'HTTP_X_REAL_IP',
+				'REMOTE_ADDR'
+		);
+		foreach ($headers as $header) {
+				if (isset($_SERVER[$header]))
+						return $_SERVER[$header];
+		}
+		return NULL;
+	}
+
 }
diff --git a/src/web/_model/blog.php b/src/web/_model/blog.php
index 94ca049..6446564 100644
--- a/src/web/_model/blog.php
+++ b/src/web/_model/blog.php
@@ -30,7 +30,7 @@ class Blog_model extends Model {
 	}
 
 	public function get_data(): array {
-		$data = parent::get_base_data('blog');
+		$data = parent::get_data();
 		$this->load_blog($data);
 		$data['title'] = lang('title');
 		$data['desc'] = lang('blog_short_desc');
@@ -68,7 +68,7 @@ class Blog_model extends Model {
 	 * @return bool|null|array
 	 */
 	public function get_post($name): ?array {
-		$data = parent::get_base_data();
+		$data = parent::get_data();
 		$post = $this->render_post($name);
 		if (!$post) {
 			return NULL;
@@ -97,7 +97,7 @@ class Blog_model extends Model {
 	 * @return bool|null|array
 	 */
 	public function get_writeup($name): ?array {
-		$data = parent::get_base_data();
+		$data = parent::get_data();
 		$writeup = $this->render_writeup($name);
 		if (!$writeup) {
 			return NULL;
@@ -108,4 +108,3 @@ class Blog_model extends Model {
 		return $data;
 	}
 }
-?>
diff --git a/src/web/_model/bucket.php b/src/web/_model/bucket.php
index 374836e..7c426b7 100644
--- a/src/web/_model/bucket.php
+++ b/src/web/_model/bucket.php
@@ -3,7 +3,9 @@ class Bucket_model extends Model {
 
 	public function get_data(): ?array
 	{
-		$data = parent::get_base_data();
+		$data = parent::get_data();
+		$data['title'] = lang('first_name');
+		$data['desc'] = lang('default_short_desc');
 
 		if (array_key_exists('name', $_GET))
 			$data['name'] = $_GET['name'];
@@ -18,4 +20,3 @@ class Bucket_model extends Model {
 		return $data;
 	}
 }
-?>
diff --git a/src/web/_model/error.php b/src/web/_model/error.php
index 08046f3..74bbd20 100644
--- a/src/web/_model/error.php
+++ b/src/web/_model/error.php
@@ -5,21 +5,22 @@ class Error_model extends Model {
 	{
 		http_response_code($code);
 		$data['title'] = $code;
-		$msg = ucfirst(lang('error_' . $code, FALSE));
+		$msg = status_code_msg($code);
+		if (!$msg && $code == 0)
+			$msg = lang('error_0');
 		if (!$msg) {
 			$error_text = lang('error', NULL);
 			$msg = $error_text[array_rand($error_text)];
 			$msg = sprintf($msg, $code);
 		}
 		$data['msg'] = $msg;
-
+		$data['desc'] = $msg;
 	}
 
-	public function get_data(int $code): array
+	public function get_error_data(int $code): array
 	{
-		$data = parent::get_base_data('error');
+		$data = parent::get_data();
 		$this->get_msg($data, $code);
 		return $data;
 	}
 }
-?>
diff --git a/src/web/_model/home.php b/src/web/_model/home.php
new file mode 100644
index 0000000..d1041db
--- /dev/null
+++ b/src/web/_model/home.php
@@ -0,0 +1,10 @@
+<?php /* Copyright (c) 2024 Freya Murphy */
+class Home_model extends Model {
+
+	public function get_data(): ?array {
+		$data = parent::get_data();
+		$data['title'] = lang('first_name');
+		$data['desc'] = lang('default_short_desc');
+		return $data;
+	}
+}
diff --git a/src/web/_model/projects.php b/src/web/_model/projects.php
index 537bce5..fbf37c8 100644
--- a/src/web/_model/projects.php
+++ b/src/web/_model/projects.php
@@ -31,11 +31,10 @@ class Projects_model extends Model {
 
 	public function get_data(): ?array
 	{
-		$data = parent::get_base_data();
+		$data = parent::get_data();
 		$this->load_projects($data);
 		$data['title'] = lang('title');
 		$data['desc'] = lang('short_desc');
 		return $data;
 	}
 }
-?>