From df47e7e07c175d11b2fa6464024bb2b2b8829c5c Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 7 Aug 2013 13:30:25 +0000 Subject: [PATCH] display main navigation menu svn path=/trunk/; revision=5 --- index.cgi | 3 ++- page.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/index.cgi b/index.cgi index 4d050e8..ec358c8 100755 --- a/index.cgi +++ b/index.cgi @@ -6,7 +6,8 @@ die() { exit 1 } debug() { #change to false to disable debugging - true && echo "$*" >>debug + #true && echo "$*" >>debug + true && echo "$*" >>/dev/stderr } # this program is supposed to be symlinked into a http root directory diff --git a/page.sh b/page.sh index ef1cf4d..a26e882 100755 --- a/page.sh +++ b/page.sh @@ -1,8 +1,8 @@ #!/bin/zsh -echo "Content-Type: text/html\n\n" +echo -n "Content-Type: text/html;charset=utf-8\n\n" -PAGE="$(echo "$_GET['page']" |egrep '^[a-zA-Z0-9_-]+$')" +PAGE="$(echo "$_GET[\"page\"]" |egrep '^[a-zA-Z0-9_-]+$')" PAGE="${_EXEC}/ifcomponent/page_${PAGE}.sh" [ -x "$PAGE" ] || PAGE="${_EXEC}/ifcomponent/page_error.sh" @@ -12,7 +12,7 @@ NAVIGATION() { for each in "${_EXEC}/ifcomponent"/page_*.sh; do link="$(echo "$each" |sed -r "s:^.*page_(.*)\.sh$:\1:")" title="$($each title)" - echo "/?page=$link $title" + [ -n "$title" ] && echo "/?page=$link $title" done } -- 2.39.2