display main navigation menu

svn path=/trunk/; revision=5

diff --git a/index.cgi b/index.cgi
index 4d050e8700c19407fc2c85a8082109077a958d7a..ec358c8cbd9aced5c135d1a597d0e597d4be88a1 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -6,7 +6,8 @@ die() {
   exit 1
 }
 debug() { #change to false to disable debugging
   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
 }
 
 # this program is supposed to be symlinked into a http root directory

diff --git a/page.sh b/page.sh
index ef1cf4de8a72a1f45d387027ec93c8b9e26d6e16..a26e8828ee5c1ea257e91efdb13d2c242e1d542b 100755 (executable)
--- a/page.sh
+++ b/page.sh
@@ -1,8 +1,8 @@
 #!/bin/zsh
 
 #!/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"
 
 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)"
   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
 }
 
   done
 }