From 987a0a3c1253d59ae0e4790983b4965f135301bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer=20=28Macbook=29?=
 <pubgit@mikescher.com>
Date: Thu, 16 Jan 2020 10:50:18 +0100
Subject: [PATCH] Blogview

---
 .idea/watcherTasks.xml              |  2 +-
 www/fragments/blogview_markdown.php | 21 ++++---
 www/fragments/blogview_plain.php    | 17 ++++-
 www/frames/default_frame.php        |  2 +-
 www/frames/error_frame.php          |  2 +-
 www/internals/fragments.php         | 42 +++++++++++++
 www/internals/modules/blog.php      |  8 ++-
 www/internals/pageframeoptions.php  |  6 ++
 www/internals/parsedowncustom.php   |  3 +-
 www/internals/website.php           | 13 +++-
 www/pages/blog_view.php             | 97 ++++++++++++-----------------
 www/pages/error_notfound.php        | 44 +++++--------
 www/pages/error_servererror.php     |  2 +-
 13 files changed, 156 insertions(+), 103 deletions(-)
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index f8a509b..5ef69a0 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -34,7 +34,7 @@
         <array />
       </option>
       <option name="outputFromStdout" value="false" />
-      <option name="program" value="python" />
+      <option name="program" value="python3" />
       <option name="runOnExternalChanges" value="true" />
       <option name="scopeName" value="Project Files" />
       <option name="trackOnlyRoot" value="true" />
diff --git a/www/fragments/blogview_markdown.php b/www/fragments/blogview_markdown.php
index 75520a2..8bfb621 100644
--- a/www/fragments/blogview_markdown.php
+++ b/www/fragments/blogview_markdown.php
@@ -1,7 +1,17 @@
 <?php
-require_once (__DIR__ . '/../internals/base.php');
-require_once (__DIR__ . '/../internals/blog.php');
-require_once (__DIR__ . '/../internals/ParsedownCustom.php');
+require_once (__DIR__ . '/../internals/website.php');
+
+/** @var PageFrameOptions $FRAME_OPTIONS */ global $FRAME_OPTIONS;
+/** @var URLRoute $ROUTE */ global $ROUTE;
+/** @var Website $SITE */ global $SITE;
+
+global $FRAGMENT_PARAM;
+/** @var array $parameter */
+$parameter = $FRAGMENT_PARAM;
+?>
+
+<?php
+$post = $parameter['blogpost'];
 ?>
 
 <div class="boxedcontent blogcontent_markdown base_markdown">
@@ -11,10 +21,7 @@ require_once (__DIR__ . '/../internals/ParsedownCustom.php');
 	</div>
 
 	<div class="bc_data">
-		<?php
-		    $pd = new ParsedownCustom();
-		    echo $pd->text(Blog::getPostFragment($post));
-        ?>
+		<?php echo $SITE->renderMarkdown($SITE->modules->Blog()->getPostFragment($post)); ?>
 	</div>
 
 </div>
\ No newline at end of file
diff --git a/www/fragments/blogview_plain.php b/www/fragments/blogview_plain.php
index 765ecfe..92d8ecb 100644
--- a/www/fragments/blogview_plain.php
+++ b/www/fragments/blogview_plain.php
@@ -1,6 +1,17 @@
 <?php
-require_once (__DIR__ . '/../internals/base.php');
-require_once (__DIR__ . '/../internals/blog.php');
+require_once (__DIR__ . '/../internals/website.php');
+
+/** @var PageFrameOptions $FRAME_OPTIONS */ global $FRAME_OPTIONS;
+/** @var URLRoute $ROUTE */ global $ROUTE;
+/** @var Website $SITE */ global $SITE;
+
+global $FRAGMENT_PARAM;
+/** @var array $parameter */
+$parameter = $FRAGMENT_PARAM;
+?>
+
+<?php
+$post = $parameter['blogpost'];
 ?>
 
 <div class="boxedcontent blogcontent_plain">
@@ -10,7 +21,7 @@ require_once (__DIR__ . '/../internals/blog.php');
 	</div>
 
 	<div class="bc_data">
-		<?php echo nl2br(htmlspecialchars(Blog::getPostFragment($post))); ?>
+		<?php echo nl2br(htmlspecialchars($SITE->modules->Blog()->getPostFragment($post))); ?>
 	</div>
 
 </div>
\ No newline at end of file
diff --git a/www/frames/default_frame.php b/www/frames/default_frame.php
index 73167ac..46247fc 100644
--- a/www/frames/default_frame.php
+++ b/www/frames/default_frame.php
@@ -12,7 +12,7 @@ require_once (__DIR__ . '/../internals/website.php');
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title><?php echo $FRAME_OPTIONS->title; ?></title>
+	<title><?php echo htmlspecialchars($FRAME_OPTIONS->title); ?></title>
 	<meta name="google-site-verification" content="pZOhmjeJcQbRMNa8xRLam4dwJ2oYwMwISY1lRKreSSs"/>
 	<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
 	<?php
diff --git a/www/frames/error_frame.php b/www/frames/error_frame.php
index fc390a3..a95ff13 100644
--- a/www/frames/error_frame.php
+++ b/www/frames/error_frame.php
@@ -12,7 +12,7 @@ require_once (__DIR__ . '/../internals/website.php');
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title><?php echo $FRAME_OPTIONS->title; ?></title>
+	<title><?php echo htmlspecialchars($FRAME_OPTIONS->title); ?></title>
 	<meta name="google-site-verification" content="pZOhmjeJcQbRMNa8xRLam4dwJ2oYwMwISY1lRKreSSs"/>
 	<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
     <link rel="stylesheet" href="/data/css/styles.css" />
diff --git a/www/internals/fragments.php b/www/internals/fragments.php
index 20d7059..e73a840 100644
--- a/www/internals/fragments.php
+++ b/www/internals/fragments.php
@@ -45,4 +45,46 @@ class Fragments
 		$FRAGMENT_PARAM = [ 'year' => $year, 'nav'=>$shownav, 'linkheader'=>$linkheader, 'ajax'=>$ajax, 'frame'=>$frame, 'frameid'=>$frameid ];
 		include (__DIR__ . '/../fragments/panel_aoc_calendar.php');
 	}
+
+	public function BlogviewPlain(array $blogpost)
+	{
+		global $FRAGMENT_PARAM;
+		$FRAGMENT_PARAM = [ 'blogpost' => $blogpost ];
+		include (__DIR__ . '/../fragments/blogview_plain.php');
+	}
+
+	public function BlogviewMarkdown(array $blogpost)
+	{
+		global $FRAGMENT_PARAM;
+		$FRAGMENT_PARAM = [ 'blogpost' => $blogpost ];
+		include (__DIR__ . '/../fragments/blogview_markdown.php');
+	}
+
+	public function BlogviewEulerList(array $blogpost)
+	{
+		global $FRAGMENT_PARAM;
+		$FRAGMENT_PARAM = [ 'blogpost' => $blogpost ];
+		include (__DIR__ . '/../fragments/blogview_euler_list.php');
+	}
+
+	public function BlogviewEulerSingle(array $blogpost, string $subview)
+	{
+		global $FRAGMENT_PARAM;
+		$FRAGMENT_PARAM = [ 'blogpost' => $blogpost, 'subview' => $subview ];
+		include (__DIR__ . '/../fragments/blogview_euler_single.php');
+	}
+
+	public function BlogviewAdventOfCodeList(array $blogpost)
+	{
+		global $FRAGMENT_PARAM;
+		$FRAGMENT_PARAM = [ 'blogpost' => $blogpost ];
+		include (__DIR__ . '/../fragments/blogview_aoc_list.php');
+	}
+
+	public function BlogviewAdventOfCodeSingle(array $blogpost, string $subview)
+	{
+		global $FRAGMENT_PARAM;
+		$FRAGMENT_PARAM = [ 'blogpost' => $blogpost, 'subview' => $subview ];
+		include (__DIR__ . '/../fragments/blogview_aoc_single.php');
+	}
 }
\ No newline at end of file
diff --git a/www/internals/modules/blog.php b/www/internals/modules/blog.php
index 9d589c2..095c2c7 100644
--- a/www/internals/modules/blog.php
+++ b/www/internals/modules/blog.php
@@ -26,7 +26,7 @@ class Blog
 
 		$d['canonical'] = "https://www.mikescher.com" . $d['url'];
 
-		$d['file_fragment'] = __DIR__ . '/../statics/blog/' . $d['fragment'];
+		$d['file_fragment'] = __DIR__ . '/../../statics/blog/' . $d['fragment'];
 
 		if (!array_key_exists('extras', $d)) $d['extras'] = [];
 
@@ -53,6 +53,12 @@ class Blog
 		return null;
 	}
 
+	/**
+	 * @param string $id
+	 * @param string $subview
+	 * @param string $error
+	 * @return array|null
+	 */
 	public function getFullBlogpost($id, $subview, &$error)
 	{
 		$post = $this->getBlogpost($id);
diff --git a/www/internals/pageframeoptions.php b/www/internals/pageframeoptions.php
index 726d00e..a8534d4 100644
--- a/www/internals/pageframeoptions.php
+++ b/www/internals/pageframeoptions.php
@@ -58,4 +58,10 @@ class PageFrameOptions
 
 		$this->scripts []= [ $url, $defer ];
 	}
+
+	public function setForced404(string $err)
+	{
+		$this->force_404 = true;
+		$this->force_404_message = $err;
+	}
 }
\ No newline at end of file
diff --git a/www/internals/parsedowncustom.php b/www/internals/parsedowncustom.php
index e6304d7..6ef1164 100644
--- a/www/internals/parsedowncustom.php
+++ b/www/internals/parsedowncustom.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once (__DIR__ . '/../internals/base.php');
 require_once (__DIR__ . '/../extern/Parsedown.php');
 require_once (__DIR__ . '/../extern/ParsedownExtra.php');
 
@@ -71,7 +70,7 @@ class ParsedownCustom extends ParsedownExtra
 		global $PARAM_CODE_LEFT;
 		global $PARAM_CODE_RIGHT;
 
-		$split = preg_split("/\-{16,}/", $Element['text']);
+		$split = preg_split("/-{16,}/", $Element['text']);
 
 		$PARAM_CODE_LEFT  = trim($split[0]);
 		$PARAM_CODE_RIGHT = trim($split[1]);
diff --git a/www/internals/website.php b/www/internals/website.php
index cee7047..5751c78 100644
--- a/www/internals/website.php
+++ b/www/internals/website.php
@@ -67,7 +67,7 @@ class Website
 
 			if ($result->force_404)
 			{
-				$this->serveCustom404($route->full_url, $result);
+				$this->serveCustom404($route->full_url, $result, $result->force_404_message);
 				exit();
 			}
 
@@ -79,7 +79,7 @@ class Website
 		}
 	}
 
-	private function serveCustom404(string $uri, PageFrameOptions $frameOpt)
+	private function serveCustom404(string $uri, PageFrameOptions $frameOpt, string $message)
 	{
 		try
 		{
@@ -88,6 +88,8 @@ class Website
 
 			$route = URLRoute::getNotFoundRoute($uri);
 
+			$route->parameter['message'] = $message;
+
 			$result = $route->getDirect($this, $frameOpt);
 
 			$this->output($result, $route);
@@ -184,6 +186,13 @@ class Website
 		setcookie("mikescher_auth", "", time()+30);
 	}
 
+	public function renderMarkdown(string $txt)
+	{
+		require_once 'parsedowncustom.php';
+		$pd = new ParsedownCustom();
+		return $pd->text($txt);
+	}
+
 }
 
 /**
diff --git a/www/pages/blog_view.php b/www/pages/blog_view.php
index 72e9a7b..5d676fa 100644
--- a/www/pages/blog_view.php
+++ b/www/pages/blog_view.php
@@ -1,72 +1,55 @@
-<!DOCTYPE html>
-<html lang="en">
 <?php
-require_once (__DIR__ . '/../internals/base.php');
-require_once (__DIR__ . '/../internals/blog.php');
+require_once (__DIR__ . '/../internals/website.php');
 
-
-$id = $OPTIONS['id'];
-$subview = $OPTIONS['subview'];
-
-$post = Blog::getFullBlogpost($id, $subview, $err);
-if ($post === null) httpError(404, $err);
-
-?>
-<head>
-	<meta charset="utf-8">
-	<title>Mikescher.com - <?php echo htmlspecialchars($post['title']); ?></title>
-	<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
-	<?php printHeaderCSS(); ?>
-	<?php echo '<link rel="canonical" href="' . $post['canonical'] . '"/>'; ?>
-</head>
-<body>
-<div id="mastercontainer">
-
-<?php
-if      ($post['type'] == 'euler')                       $HEADER_ACTIVE = 'euler';
-else if ($post['type'] == 'euler' && $post['issubview']) $HEADER_ACTIVE = 'aoc';
-else                                                     $HEADER_ACTIVE = 'blog';
-
-include (__DIR__ . '/../fragments/header.php');
+/** @var PageFrameOptions $FRAME_OPTIONS */ global $FRAME_OPTIONS;
+/** @var URLRoute $ROUTE */ global $ROUTE;
+/** @var Website $SITE */ global $SITE;
 ?>
 
-<div id="content" class="content-responsive">
+<?php
+$id      = $ROUTE->parameter['id'];
+$subview = $ROUTE->parameter['subview'];
 
-	<div class="blockcontent">
+$post = $SITE->modules->Blog()->getFullBlogpost($id, $subview, $err);
+if ($post === null) { $FRAME_OPTIONS->setForced404($err); return; }
 
-		<div class="contentheader"><h1><?php echo htmlspecialchars($post['title']); ?></h1><hr/></div>
+$FRAME_OPTIONS->title = 'Mikescher.com - ' . $post['title'];
+$FRAME_OPTIONS->canonical_url = $post['canonical'];
 
-		<?php
+if ($post['type'] == 'euler')
+	$FRAME_OPTIONS->activeHeader = 'euler';
+else if ($post['type'] == 'euler' && $post['issubview'])
+	$FRAME_OPTIONS->activeHeader = 'aoc';
+else
+	$FRAME_OPTIONS->activeHeader = 'blog';
+?>
 
-        if ($post['type'] === 'plain') {
 
-			include (__DIR__ . '/../fragments/blogview_plain.php');
+<div class="blockcontent">
 
-		} elseif ($post['type'] === 'markdown') {
+    <div class="contentheader"><h1><?php echo htmlspecialchars($post['title']); ?></h1><hr/></div>
 
-			include (__DIR__ . '/../fragments/blogview_markdown.php');
+	<?php
 
-		} elseif ($post['type'] === 'euler') {
-
-			if ($subview === '') include (__DIR__ . '/../fragments/blogview_euler_list.php');
-			else                 include (__DIR__ . '/../fragments/blogview_euler_single.php');
-
-		} elseif ($post['type'] === 'aoc') {
-
-			if ($subview === '') include (__DIR__ . '/../fragments/blogview_aoc_list.php');
-			else                 include (__DIR__ . '/../fragments/blogview_aoc_single.php');
-
-		}
-		?>
-
-	</div>
+	if ($post['type'] === 'plain')
+	{
+	    $SITE->fragments->BlogviewPlain($post);
+	}
+	elseif ($post['type'] === 'markdown')
+    {
+		$SITE->fragments->BlogviewMarkdown($post);
+	}
+	elseif ($post['type'] === 'euler')
+    {
+		if ($subview === '') $SITE->fragments->BlogviewEulerList($post);
+		else                 $SITE->fragments->BlogviewEulerSingle($post, $subview);
+	}
+	elseif ($post['type'] === 'aoc')
+    {
+		if ($subview === '') $SITE->fragments->BlogviewAdventOfCodeList($post);
+		else                 $SITE->fragments->BlogviewAdventOfCodeSingle($post, $subview);
+	}
+	?>
 
 </div>
 
-<?php include (__DIR__ . '/../fragments/footer.php');  ?>
-
-</div>
-<?php printAdditionalScripts(); ?>
-<?php printAdditionalStylesheets(); ?>
-</body>
-</html>
\ No newline at end of file
diff --git a/www/pages/error_notfound.php b/www/pages/error_notfound.php
index 72e4527..1e7ee02 100644
--- a/www/pages/error_notfound.php
+++ b/www/pages/error_notfound.php
@@ -1,34 +1,24 @@
-<!DOCTYPE html>
-<html lang="en">
 <?php
-    require_once (__DIR__ . '/../internals/base.php');
-    global $OPTIONS;
+require_once (__DIR__ . '/../internals/website.php');
 
-    $errorcode = $OPTIONS['code'];
-    $errormsg  = $OPTIONS['message'];
+/** @var PageFrameOptions $FRAME_OPTIONS */ global $FRAME_OPTIONS;
+/** @var URLRoute $ROUTE */ global $ROUTE;
+/** @var Website $SITE */ global $SITE;
 ?>
-<head>
-	<meta charset="utf-8">
-	<title>Mikescher.com - <?php echo $errormsg; ?></title>
-	<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
-    <?php printHeaderCSS(); ?>
-</head>
-<body>
-<div id="mastercontainer">
 
-	<?php $HEADER_ACTIVE='none'; include (__DIR__ . '/../fragments/header.php');  ?>
+<?php
+$message = isset($ROUTE->parameter['message']) ? $ROUTE->parameter['message'] : '';
 
-<div id="content" class="content-responsive content-fullheight">
+$FRAME_OPTIONS->title = 'Mikescher.com - ' . $message;
+$FRAME_OPTIONS->canonical_url = null;
+$FRAME_OPTIONS->activeHeader = null;
+$FRAME_OPTIONS->contentCSSClasses []= 'content-fullheight';
+?>
 
-    <div class="ev_master">
-        <div class="ev_code"><?php echo $errorcode; ?></div>
-        <div class="ev_msg"><?php echo $errormsg; ?></div>
-    </div>
 
-</div>
-
-</div>
-<?php printAdditionalScripts(); ?>
-<?php printAdditionalStylesheets(); ?>
-</body>
-</html>
\ No newline at end of file
+<div class="ev_master">
+    <div class="ev_code">404</div>
+    <?php if ($message !== ''): ?>
+    <div class="ev_msg"><?php echo $message; ?></div>
+	<?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/www/pages/error_servererror.php b/www/pages/error_servererror.php
index 0a3d289..10097d0 100644
--- a/www/pages/error_servererror.php
+++ b/www/pages/error_servererror.php
@@ -19,7 +19,7 @@ $debuginfo = $ROUTE->parameter['debuginfo'];
 
 <div class="ev_master">
 	<div class="ev_code">500</div>
-	<div class="ev_msg">asdasd<?php echo $message; ?></div>
+	<div class="ev_msg"><?php echo $message; ?></div>
 	<?php if ($debuginfo !== null && strlen($debuginfo)>0 && ($SITE != null && !$SITE->isProd())): ?>
 		<p class="ev_statusmore"><?php echo nl2br($debuginfo); ?></p>
 	<?php endif; ?>
