Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions

blog model improvements

Browse Source
This commit is contained in:
Mike Schwörer 2019-12-02 14:57:01 +01:00
parent d23c3f45be
commit 42095e4c1f
2 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
www/internals/blog.php
View File

@ -40,6 +40,45 @@ class Blog
return null; return null;
} }
public static function getFullBlogpost($id, $subview, &$error)
{
$post = self::getBlogpost($id);
if ($post === null) { $error="Blogpost not found"; return null; }
$post['issubview'] = false;
$isSubEuler = ($post['type'] === 'euler' && $subview !== '');
$eulerproblem = null;
if ($isSubEuler)
{
require_once(__DIR__ . '/../internals/euler.php');
$eulerproblem = Euler::getEulerProblemFromStrIdent($subview);
if ($eulerproblem === null) { $error="Project Euler entry not found"; return null; }
$post['submodel'] = $eulerproblem;
$post['issubview'] = true;
}
$isSubAdventOfCode = ($post['type'] === 'aoc' && $subview !== '');
$adventofcodeday = null;
if ($isSubAdventOfCode)
{
require_once(__DIR__ . '/../internals/adventofcode.php');
$adventofcodeday = AdventOfCode::getDayFromStrIdent($post['extras']['aoc:year'], $subview);
if ($adventofcodeday === null) { $error="AdventOfCode entry not found"; return null; }
$post['submodel'] = $adventofcodeday;
$post['issubview'] = true;
}
if ($isSubEuler) $post['title'] = $eulerproblem['title'];
if ($isSubAdventOfCode) $post['title'] = $adventofcodeday['title'];
if ($isSubEuler) $post['canonical'] = $eulerproblem['canonical'];
if ($isSubAdventOfCode) $post['canonical'] = $adventofcodeday['canonical'];
return $post;
}
public static function getPostFragment($post) public static function getPostFragment($post)
{ {
return file_get_contents($post['file_fragment']); return file_get_contents($post['file_fragment']);

44
www/pages/blog_view.php
View File

@ -8,49 +8,27 @@ require_once (__DIR__ . '/../internals/blog.php');
$id = $OPTIONS['id']; $id = $OPTIONS['id'];
$subview = $OPTIONS['subview']; $subview = $OPTIONS['subview'];
$post = Blog::getBlogpost($id); $post = Blog::getFullBlogpost($id, $subview, $err);
if ($post === NULL) httpError(404, 'Blogpost not found'); if ($post === null) httpError(404, $err);
$isSubEuler = ($post['type'] === 'euler' && $subview !== '');
$isBaseEuler = ($post['type'] === 'euler');
$eulerproblem = null;
if ($isSubEuler)
{
require_once(__DIR__ . '/../internals/euler.php');
$eulerproblem = Euler::getEulerProblemFromStrIdent($subview);
}
if ($eulerproblem === null) $isSubEuler = false;
$isSubAdventOfCode = ($post['type'] === 'aoc' && $subview !== '');
$isAdventOfCode = ($post['type'] === 'aoc');
$adventofcodeday = null;
if ($isSubAdventOfCode)
{
require_once(__DIR__ . '/../internals/adventofcode.php');
$adventofcodeday = AdventOfCode::getDayFromStrIdent($post['extras']['aoc:year'], $subview);
}
if ($adventofcodeday === null) $isSubAdventOfCode = false;
$htmltitle = $post['title'];
if ($isSubEuler) $htmltitle = $eulerproblem['title'];
if ($isSubAdventOfCode) $htmltitle = $adventofcodeday['title'];
$canonical = $post['canonical'];
if ($isSubEuler) $canonical = $eulerproblem['canonical'];
if ($isSubAdventOfCode) $canonical = $adventofcodeday['canonical'];
?> ?>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Mikescher.com - <?php echo $htmltitle; ?></title> <title>Mikescher.com - <?php echo htmlspecialchars($post['title']); ?></title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/> <link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<?php printHeaderCSS(); ?> <?php printHeaderCSS(); ?>
<?php echo '<link rel="canonical" href="' . $canonical . '"/>'; ?> <?php echo '<link rel="canonical" href="' . $post['canonical'] . '"/>'; ?>
</head> </head>
<body> <body>
<div id="mastercontainer"> <div id="mastercontainer">
<?php $HEADER_ACTIVE = (($isSubEuler || $isBaseEuler) ? 'euler' : 'blog'); include (__DIR__ . '/../fragments/header.php'); ?> <?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');
?>
<div id="content" class="content-responsive"> <div id="content" class="content-responsive">