From 8ad75b781255d27c62f201a990771273a7de8906 Mon Sep 17 00:00:00 2001
From: David Ringsdorf <git@drdf.de>
Date: Tue, 25 Feb 2020 22:52:54 +0100
Subject: [PATCH] 0.4.0.alpha

---
 .htaccess                             |  5 ++-
 README.md                             |  2 +-
 asset/css/style.css                   | 19 ++-------
 genug.php                             | 51 +++++++++++++++++++++++
 genug_core/genug/bootstrap.php        | 20 +++++++++
 genug_user/template/error404.html.php | 13 ------
 genug_user/template/main.html.php     | 59 ---------------------------
 genug_user/view/404.php               | 13 ++++++
 genug_user/view/index.php             | 25 ++++++++++++
 html.php                              | 32 ---------------
 10 files changed, 116 insertions(+), 123 deletions(-)
 create mode 100644 genug.php
 delete mode 100644 genug_user/template/error404.html.php
 delete mode 100644 genug_user/template/main.html.php
 create mode 100644 genug_user/view/404.php
 create mode 100644 genug_user/view/index.php
 delete mode 100644 html.php

diff --git a/.htaccess b/.htaccess
index f149214..ee2e5e0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,7 +4,8 @@ RewriteEngine on
 
 RewriteBase /
 
-RewriteRule ^asset/ -        [L]
-RewriteRule ^       html.php [L]
+RewriteRule ^favicon.ico$ -         [L]
+RewriteRule ^asset/       -         [L]
+RewriteRule ^             genug.php [L]
 
 </IfModule>
\ No newline at end of file
diff --git a/README.md b/README.md
index 4ff6a48..f826501 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ a file-based CMS
 under development
 
 ## requirements
-- PHP 7.0
+- PHP 7.4
 - Apache, .htaccess, rewrite_module (mod_rewrite)
 
 ## installation
diff --git a/asset/css/style.css b/asset/css/style.css
index 52dcd98..8c84415 100644
--- a/asset/css/style.css
+++ b/asset/css/style.css
@@ -1,18 +1,5 @@
-@CHARSET "UTF-8";
+@charset "UTF-8";
 
-.is_requested::before {
-  content: '\2192\A0';
+nav a[aria-current="page"]::before {
+  content: "\2192\A0";
 }
-
-time,
-[data-category] {
-  font-style: italic;
-}
-
-[data-category=site] {
-  color: green;
-}
-
-[data-category=news] {
-  color: red;
-}
\ No newline at end of file
diff --git a/genug.php b/genug.php
new file mode 100644
index 0000000..38764cd
--- /dev/null
+++ b/genug.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ *
+ * @author David Ringsdorf http://davidringsdorf.de
+ * @license MIT License
+ */
+
+(function () {
+    try {
+        \ob_start();
+
+        (function (){
+            $bootstrapFile = __DIR__ . '/genug_core/genug/bootstrap.php';
+            if (! \is_readable($bootstrapFile)) {
+                throw new \Error("Failed opening required '" . $bootstrapFile . "'");
+            }
+            require_once $bootstrapFile;
+        })();
+
+        spl_autoload_register('\genug\autoloader');
+
+        \header('Content-Type: ' . \genug\Setting\CONTENT_TYPE);
+        \http_response_code(200);
+
+        try {
+            \genug\Api::requestedPage();
+
+            if (! \is_readable(\genug\Setting\VIEW_INDEX_FILE)) {
+                throw new \Error("Failed opening required '" . \genug\Setting\VIEW_INDEX_FILE . "'");
+            }
+            require_once \genug\Setting\VIEW_INDEX_FILE;
+        } catch (\genug\throwable_RequestedPageNotFound $t) {
+            \ob_clean();
+            \http_response_code(404);
+
+            if (\is_readable(\genug\Setting\VIEW_404_FILE)) {
+                require_once \genug\Setting\VIEW_404_FILE;
+            } else {
+                echo '404 Not Found';
+            }
+        }
+    } catch (\Throwable $t) {
+        \ob_clean();
+        \http_response_code(500);
+
+        echo '500 Internal Server Error';
+        throw $t;
+    } finally {
+        \ob_end_flush();
+    }
+})();
\ No newline at end of file
diff --git a/genug_core/genug/bootstrap.php b/genug_core/genug/bootstrap.php
index 7d3475e..0332b50 100644
--- a/genug_core/genug/bootstrap.php
+++ b/genug_core/genug/bootstrap.php
@@ -13,6 +13,11 @@
 namespace genug\Setting
 {
 
+    if (! \defined(__NAMESPACE__ . '\CONTENT_TYPE')) {
+        
+        \define(__NAMESPACE__ . '\CONTENT_TYPE', 'text/html; charset=UTF-8');
+    }
+
     if (! \defined(__NAMESPACE__ . '\MAIN_CATEGORY_ID')) {
         
         \define(__NAMESPACE__ . '\MAIN_CATEGORY_ID', 'site');
@@ -55,6 +60,21 @@
         
         \define(__NAMESPACE__ . '\CONTENT_DIR', namespace\USER_DIR . '/content');
     }
+
+    if (! \defined(__NAMESPACE__ . '\VIEW_DIR')) {
+        
+        \define(__NAMESPACE__ . '\VIEW_DIR', namespace\USER_DIR . '/view');
+    }
+
+    if (! \defined(__NAMESPACE__ . '\VIEW_INDEX_FILE')) {
+        
+        \define(__NAMESPACE__ . '\VIEW_INDEX_FILE', namespace\VIEW_DIR . '/index.php');
+    }
+
+    if (! \defined(__NAMESPACE__ . '\VIEW_404_FILE')) {
+        
+        \define(__NAMESPACE__ . '\VIEW_404_FILE', namespace\VIEW_DIR . '/404.php');
+    }
 }
 namespace genug
 {
diff --git a/genug_user/template/error404.html.php b/genug_user/template/error404.html.php
deleted file mode 100644
index 2ac38f9..0000000
--- a/genug_user/template/error404.html.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Not Found (404)</title>
-</head>
-<body>
-  <h1>Not Found (404)</h1>
-  <nav>
-    <a href="<?= genug\Api::homepage()->id() ?>">homepage</a>
-  </nav>
-</body>
-</html>
\ No newline at end of file
diff --git a/genug_user/template/main.html.php b/genug_user/template/main.html.php
deleted file mode 100644
index 17b5cc3..0000000
--- a/genug_user/template/main.html.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-use genug\Api as g;
-
-const SITE_TITLE = 'my site';
-
-/**
- * @deprecated
- */
-function genug_helper_categoryTitle(\genug\Page\Category $pageCat) {
-    try {
-      return g::categories()->fetch($pageCat)->title();
-    } catch (\Throwable $e) {
-      return $pageCat;
-    }
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title><?= g::requestedPage()->title()?><?php if ((string) g::requestedPage()->category() !== (string) g::mainCategory()->id()) echo ' - ' . genug_helper_categoryTitle(g::requestedPage()->category()) ?> | <?= SITE_TITLE ?></title>
-<link
-  rel="stylesheet"
-  href="/asset/css/style.css" />
-</head>
-<body>
-  <header>
-    <h1>
-      <a href="<?= g::homepage()->id() ?>"><?= SITE_TITLE ?></a>
-    </h1>
-  </header>
-  <main>
-  <article>
-    <header>
-      <h1><?= g::requestedPage()->title() ?></h1>
-    </header>
-    <?= g::requestedPage()->content()?>
-    <footer>
-      <ul>
-        <li>date: <time datetime="<?= g::requestedPage()->date() ?>"><?= g::requestedPage()->date()->format(DATE_RFC1123) ?></time></li>
-        <li>category: <span
-          data-category="<?= g::requestedPage()->category() ?>"><?= genug_helper_categoryTitle(g::requestedPage()->category()) ?></span></li>
-      </ul>
-    </footer>
-  </article>
-  </main>
-  <nav>
-    <h1>all pages</h1>
-    <ul>
-  <?php foreach (g::pages() as $page): ?>
-  <li><a
-        href="<?= $page->id() ?>"
-        class="<?php if ($page === g::requestedPage()) echo 'is_requested' ?>"><?= $page->title() ?></a></li>
-  <?php endforeach; ?>
-  </ul>
-  </nav>
-</body>
-</html>
\ No newline at end of file
diff --git a/genug_user/view/404.php b/genug_user/view/404.php
new file mode 100644
index 0000000..7546693
--- /dev/null
+++ b/genug_user/view/404.php
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Not Found (404)</title>
+</head>
+<body>
+    <h1>Not Found (404)</h1>
+    <nav>
+        <a href="<?= genug\Api::homepage()->id() ?>">homepage</a>
+    </nav>
+</body>
+</html>
\ No newline at end of file
diff --git a/genug_user/view/index.php b/genug_user/view/index.php
new file mode 100644
index 0000000..d373c0e
--- /dev/null
+++ b/genug_user/view/index.php
@@ -0,0 +1,25 @@
+<?php use genug\Api as g; ?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title><?= g::requestedPage()->title()?></title>
+    <link rel="stylesheet" href="/asset/css/style.css" />
+</head>
+<body>
+    <h1><?= g::requestedPage()->title() ?></h1>
+    <p><time datetime="<?= g::requestedPage()->date() ?>"><?= g::requestedPage()->date()->format(DATE_RFC1123) ?></time></p>
+    <?= g::requestedPage()->content()?>
+
+    <nav>
+        <h1>all pages</h1>
+        <ul>
+<?php foreach (g::pages() as $page): ?>
+            <li>
+                <a href="<?= $page->id() ?>"<?php if ($page === g::requestedPage()) echo ' aria-current="page"' ?>><?= $page->title() ?></a>
+            </li>
+<?php endforeach; ?>
+        </ul>
+    </nav>
+</body>
+</html>
\ No newline at end of file
diff --git a/html.php b/html.php
deleted file mode 100644
index 180b150..0000000
--- a/html.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- *
- * @author David Ringsdorf http://davidringsdorf.de
- * @license MIT License
- */
-require __DIR__ . '/genug_core/genug/bootstrap.php';
-
-spl_autoload_register('genug\autoloader');
-
-(function () {
-    try {
-        \ob_start();
-        \header('Content-Type: text/html; charset=UTF-8');
-        \http_response_code(200);
-        try {
-            genug\Api::requestedPage();
-            require_once __DIR__ . '/genug_user/template/main.html.php';
-        } catch (\genug\throwable_RequestedPageNotFound $t) {
-            \ob_clean();
-            \http_response_code(404);
-            require_once __DIR__ . '/genug_user/template/error404.html.php';
-        }
-    } catch (\Throwable $t) {
-        \ob_clean();
-        \http_response_code(500);
-        echo '500 Internal Server Error';
-        throw $t;
-    } finally {
-        \ob_end_flush();
-    }
-})();
\ No newline at end of file