derive structure which avoids multiple execution

svn path=/trunk/; revision=15

diff --git a/debug.sh b/debug.sh
new file mode 100755 (executable)
index 0000000..259407b
--- /dev/null
+++ b/debug.sh
@@ -0,0 +1,39 @@
+#!/bin/zsh
+
+# Copyright 2014, 2015 Paul Hänsch
+#
+# This file is part of shcgi.
+# 
+# shcgi is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# shcgi is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
+
+# put debug options in the local.opts file
+DBG_ENABLED=false
+DBG_FILE=/dev/stderr
+
+# basic functions
+debug() { #change to false to disable debugging
+  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
+    printf '%s\n' "$*" >>"$DBG_FILE"
+  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
+    tee -a "$DBG_FILE"
+  elif [ -z "$*" ]; then
+    cat
+  fi
+}
+
+die() {
+  debug FATAL: "$*"
+  printf '%s\n' "$*" >&2
+  exit 1
+}

diff --git a/htaccess.example b/htaccess.example
new file mode 100644 (file)
index 0000000..2c8b66e
--- /dev/null
+++ b/htaccess.example
@@ -0,0 +1,3 @@
+Options         +ExecCGI
+AddHandler      cgi-script .cgi
+DirectoryIndex  index.cgi

diff --git a/index.cgi b/index.cgi
index b407fc17ea0dcf6d556dba7b5ad5df5eb91189b2..89be69c6b39eaca9bcefcfff035634fd274a1de7 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -18,8 +18,16 @@
 # along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
 
 export LC_ALL=C LANG=C
-DBG_ENABLED=false
-DBG_FILE=/dev/stderr
+
+data_dirs(){
+  # create directories for object storage
+
+  [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable"
+  for each in "$@"; do
+    [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each"
+    [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory"
+  done
+}
 
 # this program is supposed to be symlinked into a http root directory
 # we will use the http root as object storage (data directory) and call sub
@@ -31,48 +39,13 @@ _DATA="$(dirname "$call")"  #storage directory
 _EXEC="${real%/shcgi/index.cgi}"  #execution directory
 
 # put debug options in the local.opts file
+. "$_EXEC/shcgi/debug.sh"
 [ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
 
-# basic functions
-debug() { #change to false to disable debugging
-  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
-    printf '%s\n' "$*" >>"$DBG_FILE"
-  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
-    tee -a "$DBG_FILE"
-  elif [ -z "$*" ]; then
-    cat
-  fi
-}
-
-die() {
-  debug FATAL: "$*"
-  printf '%s\n' "$*" >&2
-  exit 1
-}
-
-data_dirs(){
-  # create directories for object storage
-
-  [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable"
-  for each in "$@"; do
-    [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each"
-    [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory"
-  done
-}
-
-# create htaccess file
-[ -f "$_DATA/.htaccess" ] || cat >"$_DATA/.htaccess" <<EOF
-Options                +ExecCGI
-AddHandler     cgi-script .cgi
-DirectoryIndex index.cgi
-EOF
-[ -f "$_DATA/.htaccess" ] || die "no htaccess file present and unable to create one"
-
 . "$_EXEC/shcgi/cgi.sh"
-
 cgi_get
 
-[ -x "$_EXEC/constants.sh" ] && . "$_EXEC/constants.sh"
+[ -x "$_EXEC/globals.sh" ] && . "$_EXEC/globals.sh"
 
 if [ -n "${_GET[action]}" ]; then
   . "$_EXEC/shcgi/action.sh"

diff --git a/page.sh b/page.sh
index ef9df2e3def9271c49ec455cf3d251df17ed4e68..5726ed9d8d39d2cf18e32647d3ca18891a3c394f 100755 (executable)
--- a/page.sh
+++ b/page.sh
@@ -19,16 +19,13 @@
 
 printf "Content-Type: text/html;charset=utf-8\n\n"
 
-PAGE="$(printf %s "${_GET[p]}" |egrep '^[a-zA-Z0-9_-]+$')"
-PAGE="${_EXEC}/pages/${PAGE}.sh"
-[ -x "$PAGE" ] || PAGE="${_EXEC}/pages/error.sh"
+[ -z "$PAGE" ] && PAGE="$(printf %s "${_GET[page]}" |egrep '^[a-zA-Z0-9_-]+$')"
+[ -x "${_EXEC}/pages/${PAGE}.sh" ] || PAGE="error"
 
-NAVIGATION() {
-  for each in "${_EXEC}"/pages/*.sh; do
-    link="$(printf %s "$each" |sed -r "s:^.*/([^/]*)\.sh$:\1:")"
-    title="$($each title)"
-    [ -n "$title" ] && printf '%s\n' "?p=$link $title"
-  done
-}
+[ -z "$NAVIGATION" ] && NAVIGATION=($(printf %s\\n "${_EXEC}"/pages/*.sh |sed -r 's;^.*/([^/]*)\.sh$;\1;'))
 
-. ${_EXEC}/templates/frame.html.sh
+CSS="${_EXEC}/templates/${PAGE}.css.sh"
+BODY="${_EXEC}/templates/${PAGE}.html.sh"
+
+. "${_EXEC}/pages/${PAGE}.sh"
+. "${_EXEC}/templates/frame.html.sh"