refactor

1 files changed, 35 insertions, 34 deletions

diff --git a/src/web/_model/blog.php b/src/web/_model/blog.php
index 0df3959..6dc1316 100644
--- a/src/web/_model/blog.php
+++ b/src/web/_model/blog.php
@@ -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 {
+	/**
+	 * @param mixed $data
+	 * @return 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,31 +30,31 @@ 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');
 		return $data;
 	}
-    /**
-     * @param mixed $name
-     * @return bool|<missing>
-     */
-    private function load_post($name): ?array {
-		$dir = $GLOBALS['assetroot'] . '/blog';
-		$path = $dir . '/' . $name;
+	/**
+	 * @param mixed $name
+	 * @return bool|<missing>
+	 */
+	private function load_post($name): ?array {
+		$dir = ASSET_ROOT . '/blog';
+		$path = $dir . '/' . $name . '.md';
 		if(!file_exists($path)) {
 			return NULL;
 		}
 		$md = $this->markdown->parse($path);
 		return $md;
 	}
-    /**
-     * @param mixed $name
-     * @return bool|null|array
-     */
-    public function get_post($name): ?array {
-		$data = parent::get_data();
+	/**
+	 * @param mixed $name
+	 * @return bool|null|array
+	 */
+	public function get_post($name): ?array {
+		$data = parent::get_base_data();
 		$post = $this->load_post($name);
 		if (!$post) {
 			return NULL;
@@ -63,24 +64,24 @@ class Blog_model extends Model {
 		$data['post'] = $post;
 		return $data;
 	}
-    /**
-     * @param mixed $name
-     */
-    private function load_writeup($name): ?array {
-		$dir = $GLOBALS['assetroot'] . '/writeup';
-		$path = $dir . '/' . $name;
+	/**
+	 * @param mixed $name
+	 */
+	private function load_writeup($name): ?array {
+		$dir = ASSET_ROOT . '/writeup';
+		$path = $dir . '/' . $name . '.md';
 		if(!file_exists($path)) {
 			return NULL;
 		}
 		$md = $this->markdown->parse($path);
 		return $md;
 	}
-    /**
-     * @param mixed $name
-     * @return bool|null|array
-     */
-    public function get_writeup($name): ?array {
-		$data = parent::get_data();
+	/**
+	 * @param mixed $name
+	 * @return bool|null|array
+	 */
+	public function get_writeup($name): ?array {
+		$data = parent::get_base_data();
 		$writeup = $this->load_writeup($name);
 		if (!$writeup) {
 			return NULL;