X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=page.sh;h=94d864da2c2f014604add8588bf6bd54e20a0124;hp=5726ed9d8d39d2cf18e32647d3ca18891a3c394f;hb=456423f02f12ac71d2d14e1abf959dafdc5eb041;hpb=3ff1de1d7bf98b5ee3c30a21737a31196bcb6ec3 diff --git a/page.sh b/page.sh index 5726ed9..94d864d 100755 --- a/page.sh +++ b/page.sh @@ -1,6 +1,6 @@ #!/bin/zsh -# Copyright 2014,2015 Paul Hänsch +# Copyright 2014 - 2016 Paul Hänsch # # This file is part of shcgi. # @@ -19,13 +19,11 @@ printf "Content-Type: text/html;charset=utf-8\n\n" -[ -z "$PAGE" ] && PAGE="$(printf %s "${_GET[page]}" |egrep '^[a-zA-Z0-9_-]+$')" -[ -x "${_EXEC}/pages/${PAGE}.sh" ] || PAGE="error" +[ -z "$NAVIGATION" ] \ +&& NAVIGATION=($(printf %s\\n "${_EXEC}"/pages/*.sh |sed -r 's;^.*/([^/]*)\.sh$;\1;')) -[ -z "$NAVIGATION" ] && NAVIGATION=($(printf %s\\n "${_EXEC}"/pages/*.sh |sed -r 's;^.*/([^/]*)\.sh$;\1;')) - -CSS="${_EXEC}/templates/${PAGE}.css.sh" -BODY="${_EXEC}/templates/${PAGE}.html.sh" +CSS="${CSS:-${_EXEC}/templates/${PAGE}.css.sh}" +BODY="${BODY:-${_EXEC}/templates/${PAGE}.html.sh}" . "${_EXEC}/pages/${PAGE}.sh" . "${_EXEC}/templates/frame.html.sh"