X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Fpagelist;h=7c800418c41c02a259caab7bc7eeb79c14963e42;hb=9422fa86d51fdaba072d04f6b0ae5d7e589a4439;hp=24252a920c6fc2f1e55dad4a666e4fff7cf3f836;hpb=9228c5d601c0ffe2b334dd13af02c7be7fa57f79;p=shellwiki

diff --git a/macros/pagelist b/macros/pagelist
index 24252a9..7c80041 100755
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 . "$_EXEC/cgilite/cgilite.sh"
+. "$_EXEC/cgilite/users.sh"
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
@@ -10,14 +11,17 @@ depth="${2:-1}"
 printf '<ul class="pagelist">\n'
   page_glob "$dir" \
   | while read -r glob; do
-    page_children "$glob" "$depth"
+    printf %s\\n "$glob"
+    page_children "$glob" "$((depth - 1))"
   done \
   | while read -r page; do
     case $page in
       /*) pagedir="$(PATH "$page")";;
       *)  pagedir="$(PATH "$PATH_INFO/$page")";;
     esac
-    acl_read "$pagedir" \
+    [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
+      -f "$_EXEC/pages/${pagedir}/#page.md" ] \
+    && acl_read "$pagedir" \
     && printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
   done
 printf '</ul>\n'