Detect Recursive Page(s)

mecha-cms · Dec 15, 2023 · b60ddc3 · b60ddc3
1 parent 4d85806
commit b60ddc3
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 20 deletions.
diff --git a/about.page b/about.page
@@ -8,7 +8,7 @@ images:
 author: Taufik Nurrohman
 link: https://www.styleshout.com/legacy-templates
 type: Markdown
-version: 2.0.0
+version: 2.0.1
 ...
 
 A classic template designed by [StyleShout][1]. The first time I found it on the [BTemplates][2] website around 2009

diff --git a/index.php b/index.php
@@ -20,14 +20,14 @@
     return $links;
 })([], $state, $url));
 
-$defaults = [
+$states = [
     'route-blog' => '/article',
-    'x.comment.page.type' => 'Markdown',
-    'x.page.page.type' => 'Markdown'
+    'x.comment.page.type' => isset($state->x->comment) ? 'Markdown' : null,
+    'x.page.page.type' => isset($state->x->page) ? 'Markdown' : null
 ];
 
-foreach ($defaults as $k => $v) {
-    !State::get($k) && State::set($k, $v);
+foreach ($states as $k => $v) {
+    !State::get($k) && null !== $v && State::set($k, $v);
 }
 
 if (!empty($state->y->outdoor->page->header) && $state->is('pages')) {
@@ -38,7 +38,7 @@
     if ($search = trim(strip_tags(isset($state->x->search) ? ($_GET[$state->x->search->key ?? 'query'] ?? "") : ""))) {
         Hook::set('route.search', function ($content, $path, $query, $hash) use ($search, $state) {
             if (!$state->is('archives') && !$state->is('tags')) {
-                Alert::info('Showing %s matched with query %s.', ['posts', '<em>' . $search . '</em>']);
+                Alert::info('Showing %s matched with query %s.', ['posts', '<b>' . $search . '</b>']);
             }
         });
     }
@@ -48,9 +48,9 @@
             $archive = new Time(substr_replace('1970-01-01-00-00-00', $name, 0, strlen($name)));
             $format = (false === strpos($name, '-') ? "" : '%B ') . '%Y';
             if ($search) {
-                Alert::info('Showing %s published in %s and matched with query %s.', ['posts', '<em>' . $archive->i($format) . '</em>', '<em>' . $search . '</em>']);
+                Alert::info('Showing %s published in %s and matched with query %s.', ['posts', '<b>' . $archive->i($format) . '</b>', '<b>' . $search . '</b>']);
             } else {
-                Alert::info('Showing %s published in %s.', ['posts', '<em>' . $archive->i($format) . '</em>']);
+                Alert::info('Showing %s published in %s.', ['posts', '<b>' . $archive->i($format) . '</b>']);
             }
         }
     });
@@ -60,9 +60,9 @@
             if (is_file($file = LOT . D . 'tag' . D . $name . '.page')) {
                 $tag = new Tag($file);
                 if ($search) {
-                    Alert::info('Showing %s tagged in %s and matched with query %s.', ['posts', '<em>' . $tag->title . '</em>', '<em>' . $search . '</em>']);
+                    Alert::info('Showing %s tagged in %s and matched with query %s.', ['posts', '<b>' . $tag->title . '</b>', '<b>' . $search . '</b>']);
                 } else {
-                    Alert::info('Showing %s tagged in %s.', ['posts', '<em>' . $tag->title . '</em>']);
+                    Alert::info('Showing %s tagged in %s.', ['posts', '<b>' . $tag->title . '</b>']);
                 }
             }
         }

diff --git a/widget/archive.php b/widget/archive.php
@@ -4,9 +4,18 @@
 
 if (isset($state->x->archive)) {
     $archives = [];
+    $deep = 0;
     $route_archive = $state->x->archive->route ?? '/archive';
     $route_blog = $route ?? $state->routeBlog;
-    foreach (g(LOT . D . 'page' . $route_blog, 'page') as $k => $v) {
+    $folder = LOT . D . 'page' . $route_blog;
+    if ($file = exist([
+        $folder . '.archive',
+        $folder . '.page'
+    ], 1)) {
+        $p = new Page($file);
+        $deep = $p->deep ?? 0;
+    }
+    foreach (g($folder, 'page', $deep) as $k => $v) {
         $p = new Page($k);
         $v = $p->time;
         if ($v) {

diff --git a/widget/page.php b/widget/page.php
@@ -1,7 +1,17 @@
 <?php
 
+$deep = 0;
+$folder = LOT . D . 'page' . ($route ?? $state->routeBlog);
+if ($file = exist([
+    $folder . '.archive',
+    $folder . '.page'
+], 1)) {
+    $page = new Page($file);
+    $deep = $page->deep ?? 0;
+}
+
 $pages = [];
-$pages_data = Pages::from(LOT . D . 'page' . ($route ?? $state->routeBlog))->sort([$sort[0] ?? -1, $sort[1] ?? 'time']);
+$pages_data = Pages::from($folder, 'page', $deep)->sort([$sort[0] ?? -1, $sort[1] ?? 'time']);
 
 if (!empty($shake)) {
     $pages_data->shake();

diff --git a/widget/tag.php b/widget/tag.php
@@ -1,22 +1,26 @@
 <?php
 
 if (isset($state->x->tag)) {
+    $deep = 0;
+    $folder = LOT . D . 'page' . ($route ?? $state->routeBlog);
+    if ($file = exist([
+        $folder . '.archive',
+        $folder . '.page'
+    ], 1)) {
+        $page = new Page($file);
+        $deep = $page->deep ?? 0;
+    }
     $tags = [];
     $tags_found = [];
-    foreach (g($folder = LOT . D . 'page' . ($route ?? $state->routeBlog), 'page') as $k => $v) {
+    foreach (g($folder, 'page', $deep) as $k => $v) {
         $page = new Page($k);
         $v = (array) ($page->kind ?? []);
         $v && ($tags_found = array_merge($tags_found, $v));
     }
     foreach (array_count_values($tags_found) as $k => $v) {
         if ($n = To::tag($k)) {
             if (is_file($f = LOT . D . 'tag' . D . $n . '.page')) {
-                $tag = new Tag($f, [
-                    'parent' => exist([
-                        $folder . '.archive',
-                        $folder . '.page'
-                    ], 1) ?: null
-                ]);
+                $tag = new Tag($f, ['parent' => $file ?: null]);
                 $tags[$tag->link] = $tag->title . ' <span aria-label="' . eat(i('%d post' . (1 === $v ? "" : 's'), [$v])) . '" role="status">' . $v . '</span>';
             }
         }