Fix Recursive *.author Hook Bug

mecha-cms · Feb 14, 2018 · 494d5aa · 494d5aa
1 parent 749268b
commit 494d5aa
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/user/about.page b/user/about.page
@@ -3,7 +3,7 @@ title: User
 description: Rich user data.
 author: Taufik Nurrohman
 type: Markdown
-version: 1.3.4
+version: 1.4.0
 ...
 
 ### Without User Extension
@@ -42,8 +42,8 @@ The user file as `lot\user\ta-tau-taufik.page`:
 
 ~~~ .yaml
 ---
+$: Taufik Nurrohman
 link: http://example.com
-author: Taufik Nurrohman
 ...
 
 Page content.

diff --git a/user/engine/kernel/user.php b/user/engine/kernel/user.php
@@ -6,10 +6,8 @@ class User extends Genome {
 
     public function __construct($id, $lot = [], $NS = []) {
         $input = File::exist(USER . DS . $id . '.page', null);
-        $this->lot = new Page($input, $lot, array_replace([
-            X, // TODO: re-enable the `*.key` hook
-            __c2f__(static::class, '_', '\\')
-        ], $NS));
+        $this->lot = new Page($input, $lot, array_replace([1 => __c2f__(static::class, '_', '\\')], $NS));
+        $this->lot->url = $GLOBALS['URL']['$'] . '/' . Extend::state('user', 'path') . '/' . $id;
         if (!$this->lot->key) {
             $this->lot->key = $id;
         }
@@ -45,7 +43,7 @@ public function __unset($key) {
     }
 
     public function __toString() {
-        return $this->lot->author('@' . $this->lot->key) . "";
+        return $this->lot->{'$'}('@' . $this->lot->key) . "";
     }
 
 }
diff --git a/user/index.php b/user/index.php
@@ -14,4 +14,6 @@ function fn_user($author) {
     return $author;
 }
 
-Hook::set('*.author', 'fn_user', 1);
+Hook::set('*.author', 'fn_user', 1);
+
+include __DIR__ . DS . 'lot' . DS . 'worker' . DS . 'route.php';
diff --git a/user/lot/worker/route.php b/user/lot/worker/route.php
@@ -0,0 +1,24 @@
+<?php
+
+Route::lot('%*%', function($path) use($site) {
+    $s = explode('/', $path);
+    if (count($s) === 2 && $s[0] === Extend::state('user', 'path')) {
+        if (!$f = File::exist([
+            USER . DS . $s[1] . '.page',
+            USER . DS . $s[1] . '.archive'
+        ])) {
+            Shield::abort();
+        }
+        $page = new Page($f);
+        if ($t = $page->{'$'}) {
+            $page->title = $t;
+        }
+        Config::set('page.title', new Anemon([$t . ' (@' . $s[1] . ')', $site->title], ' &#x00B7; '));
+        Lot::set([
+            'page' => $page,
+            'pages' => [],
+            'pager' => new Elevator([], 1, 0, true)
+        ]);
+        Shield::attach('page/' . $path);
+    }
+});