externalise cgi engine

svn path=/trunk/; revision=64

diff --git a/action.sh b/action.sh
deleted file mode 100755 (executable)
index a0240d9..0000000
--- a/action.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/zsh
-
-# Copyright 2014 Paul Hänsch
-#
-# This file is part of Confetti.
-# 
-# Confetti 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.
-# 
-# Confetti 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 Confetti.  If not, see <http://www.gnu.org/licenses/>. 
-
-ACTION="$(echo "$_GET[\"action\"]" |egrep '^[a-zA-Z0-9_-]+$')"
-ACTION="${_EXEC}/actions/${ACTION}.sh"
-[ -x "$ACTION" ] || echo -n "Location: ?page=error\n\n"
-
-. $ACTION

diff --git a/cgi.sh b/cgi.sh
deleted file mode 100755 (executable)
index 7a19a10..0000000
--- a/cgi.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/zsh
-
-# Copyright 2014 Paul Hänsch
-#
-# This file is part of Confetti.
-# 
-# Confetti 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.
-# 
-# Confetti 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 Confetti.  If not, see <http://www.gnu.org/licenses/>. 
-
-declare -A _GET
-declare -A _POST
-declare -A _REF
-
-[ -z "$HTTP_REFERER" ] && HTTP_REFERER="./"
-
-cgi_get() {  # parse HTTP GET string
-  debug "== CGI DATA: GET =="
-  echo "$QUERY_STRING" |tr '&' '\n' |while read query; do
-    key="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-    val="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-    _GET["$key"]="$(echo -e "$(echo -E "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
-    debug "_GET[$key] => $val"
-  done
-}
-
-cgi_post() {  # parse HTTP POST string
-  debug "== CGI DATA: POST =="
-  sed -u 1q |tr '&' '\n' |while read query; do
-    key="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-    val="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-    value="$(echo -e "$(echo -E "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g;')")"
-    if [ -n "$_POST[\"$key\"]" ]; then
-      n=0
-      while [ -n "$_POST[\"$key$n\"]" ]; do n=$(($n + 1)); done
-      _POST["$key$n"]="$value"
-    else
-      _POST["$key"]="$value"
-    fi
-    debug "_POST[$key] => $value"
-  done
-}
-
-cgi_refdata() { # Parse GET data from referer
-  debug "== CGI DATA: REFERER =="
-  echo "$HTTP_REFERER" |cut -d'?' -f2- |tr '&' '\n' |while read query; do
-    key="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-    val="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-    _REF["$key"]="$(echo -e "$(echo -E "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
-    debug "_REF[$key] => $val"
-  done
-}

diff --git a/constants.sh b/constants.sh
index 2636e0bd0a5cb8d6aaa1ef48d566896143d549d4..36af54681c1a72bde323d839c08e4ac8a9044546 100755 (executable)
--- a/constants.sh
+++ b/constants.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014 Paul Hänsch
+# Copyright 2014,2015 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
+data_dirs Home Tasks Wiki QRcodes
+
 umask=002
 #alias _wiki="stx2any --no-template --link-abbrevs --quote -T html"
 _wiki(){

diff --git a/index.cgi b/index.cgi
deleted file mode 100755 (executable)
index 6f6f9601b67ce067a784b798c9f301f2971e80f2..0000000000000000000000000000000000000000
--- a/index.cgi
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/zsh
-
-# Copyright 2014 Paul Hänsch
-#
-# This file is part of Busy.
-# (originally written for and copied from Confetti)
-# 
-# Busy 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.
-# 
-# Busy 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 Busy.  If not, see <http://www.gnu.org/licenses/>. 
-
-export LC_ALL=C LANG=C
-DBG_ENABLED=false
-DBG_FILE=/dev/stderr
-
-# 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
-# programs from the directory in which the real executable resides
-# therefore we need to identify the code and data directories _EXEC and _DATA
-call="$0"
-real="$(readlink -f $call)"
-_EXEC="$(dirname "$real")"  #execution directory
-_DATA="$(dirname "$call")"  #storage directory
-
-# put debug options in the local.opts file
-[ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
-
-# basic functions
-debug() { #change to false to disable debugging
-  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
-    echo -E "$*" >>"$DBG_FILE"
-  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
-    tee -a "$DBG_FILE"
-  elif [ -z "$*" ]; then
-    cat
-  fi
-}
-
-die() {
-  debug "$*"
-  echo -E "$*" >>/dev/stderr
-  exit 1
-}
-
-# create directories for object storage
-[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
-
-for each in "$_DATA"/{Home,Tasks,Wiki,QRcodes}; do
-  [ ! -e "$each" ] && mkdir "$each"
-  [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
-done
-
-# create htaccess file
-[ -f .htaccess ] || cat >.htaccess <<EOF
-Options                +ExecCGI
-AddHandler     cgi-script .cgi
-DirectoryIndex index.cgi
-EOF
-[ -f .htaccess ] || die "no htaccess file present and unable to create one"
-
-. "$_EXEC/cgi.sh"
-. "$_EXEC/constants.sh"
-
-cgi_get
-
-if [ -n "$_GET[\"action\"]" ]; then
-  . "$_EXEC/action.sh"
-elif [ -n "$_GET[\"export\"]" ]; then
-  . "$_EXEC/export.sh"
-else
-  . "$_EXEC/page.sh"
-fi

diff --git a/index.cgi b/index.cgi
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..410e699d63ab9fc7348d1ad94344a7d904bbd060
--- /dev/null
+++ b/index.cgi
@@ -0,0 +1 @@
+shcgi/index.cgi
\ No newline at end of file

diff --git a/local.opts b/local.opts
deleted file mode 100644 (file)
index a473b58..0000000
--- a/local.opts
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is meaningless in the exec directory
-# You can copy it to your data directory (usually
-# your HTTP root) to set per instance debug
-# options and the like
-# beware that the file is sourced as a shell script
-
-DBG_ENABLED=false
-DBG_FILE=/dev/stderr

diff --git a/page.sh b/page.sh
deleted file mode 100755 (executable)
index 4e370c0..0000000
--- a/page.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/zsh
-
-# Copyright 2014 Paul Hänsch
-#
-# This file is part of Confetti.
-# 
-# Confetti 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.
-# 
-# Confetti 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 Confetti.  If not, see <http://www.gnu.org/licenses/>. 
-
-echo -n "Content-Type: text/html;charset=utf-8\n\n"
-
-PAGE="$(echo -E "$_GET[\"p\"]" |egrep '^[a-zA-Z0-9_-]+$')"
-PAGE="${_EXEC}/pages/${PAGE}.sh"
-[ -x "$PAGE" ] || PAGE="${_EXEC}/pages/error.sh"
-
-NAVIGATION() {
-  for each in "${_EXEC}"/pages/*.sh; do
-    link="$(echo -E "$each" |sed -r "s:^.*/([^/]*)\.sh$:\1:")"
-    title="$($each title)"
-    [ -n "$title" ] && echo -E "/?page=$link $title"
-  done
-}
-
-. ${_EXEC}/templates/frame.html.sh