X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=handlers%2F10_page.sh;h=334df197d9694f72dfd8ccdfbc7c4fba69a96feb;hb=03faace5d5ef48267bfd0108edf65b29f285b2ac;hp=e010ab12c4e7bc7d797c3a9fe81c706d664a2f74;hpb=b86e88d2d6acd3eda7d9858539818a290db67d41;p=shellwiki

diff --git a/handlers/10_page.sh b/handlers/10_page.sh
index e010ab1..334df19 100755
--- a/handlers/10_page.sh
+++ b/handlers/10_page.sh
@@ -7,14 +7,6 @@ export WIKI_THEME=${WIKI_THEME:-default}
 
 . "$_EXEC/themes/${WIKI_THEME}.sh"
 
-if [ "$(which awk)" ]; then
-  md() { awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
-elif [ "$(which busybox)" ]; then
-  md() { busybox awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
-else
-  md() { cat; }
-fi
-
 wiki() {
   # Print content of a wiki page
   # Get page from data or underlay dir, handle caching
@@ -48,25 +40,18 @@ case "${PATH_INFO}" in
     FILE "${_EXEC}/${PATH_INFO#/\[.\]}"
     return 0
     ;;
-  */\[*\]/*/)
-    return 1
-    ;;
-  */"#"*/*)
-    export ERROR_MSG="This page name is not allowed"
+  *${BR}*)
+    export ERROR_MSG='Page names containing newline character are not allowed'
     theme_error 400
     return 0
     ;;
-  */"[login]")
-    theme_page "/[wiki]/login/"
-    return 0
-    ;;
-  */"[register]")
-    theme_page "/[wiki]/register/"
+  */\#*)
+    export ERROR_MSG='Page names starting with "#" are not allowed'
+    theme_error 400
     return 0
     ;;
-  */"[invite]")
-    theme_page "/[wiki]/invite/"
-    return 0
+  */\[*\]/*)
+    return 1
     ;;
   */)
     theme_page "${PATH_INFO}"