X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=0c7e914062c3d99c38420e106c32b6a29c3dc59d;hb=38202c7e5f15596fd2cb2a82f0e635cf63495f60;hp=9b9bb5fb473ca02ba50fef4d40190303d3505d9a;hpb=c54b9fb65cc638117cae1c7185ab4ac937462296;p=shellwiki diff --git a/index.cgi b/index.cgi index 9b9bb5f..0c7e914 100755 --- a/index.cgi +++ b/index.cgi @@ -6,20 +6,6 @@ . "${_EXEC}/cgilite/users.sh" . "${_EXEC}/acl.sh" -. "${_EXEC}/themes/default.sh" - -CACHE_AGE=${CACHE_AGE:-1800} -export MD_MACROS="$_EXEC/macros" -export MD_HTML="${MD_HTML:-false}" - -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 - mdfile(){ local page="$(PATH "$1")" @@ -42,58 +28,11 @@ wiki_text() { cat -- "$mdfile" } -wiki() { - # Print content of a wiki page - # Get page from data or underlay dir, handle caching - local page="$(PATH "$1")" mdfile cache cachetime - - cache="$_DATA/pages/$page/#page.${USER_ID}.cache" - - mdfile="$(mdfile "$page")" || return 4 - acl_read "$page" || return 3 - - cachetime="$(stat -c %Y -- "$mdfile" "$cache" 2>/dev/null)" - - if [ "${cachetime#*${BR}}" -gt "${cachetime%${BR}*}" \ - -a "${cachetime#*${BR}}" -gt "$((_DATE - CACHE_AGE))" ]; then - cat "${cache}" - else - mkdir -p -- "$_DATA/pages/$page/" - # Macros expect to find page directory as working dir - ( cd -- "$_DATA/pages/$page/"; - sed -E '1,20{ /^%[a-z]+/d; }' "$mdfile" \ - | md |tee -- "${cache}.$$" - ) - grep -q '^%nocache' "$mdfile" \ - && rm -- "${cache}.$$" \ - || mv -- "${cache}.$$" "${cache}" - fi -} - -case "${PATH_INFO}" in - /"[.]"/*) - FILE "${_EXEC}/${PATH_INFO#/\[.\]}" - ;; - */"#"*/*) - export ERROR_MSG="This page name is not allowed" - theme_error 400 - ;; - /|*[^]]/) - theme_page "${PATH_INFO}" - ;; - */"[login]") - theme_page "/[wiki]/login/" - ;; - */"[register]") - theme_page "/[wiki]/register/" - ;; - */"[invite]") - theme_page "/[wiki]/invite/" - ;; - *) - . "$_EXEC/page_edit.sh" \ - || . "$_EXEC/attachment.sh" \ - || theme_error 404 - ;; -esac +for handler in "$_EXEC"/handlers/*; do + . "$handler" && break +done +if [ $? != 0 ]; then + export ERROR_MSG="The presented URL schema cannot be handled" + theme_error 400 +fi