externalise cgi engine

svn path=/trunk/; revision=62

diff --git a/actions/edit_attendee.sh b/actions/edit_attendee.sh
index a36a3d638abf599b4e8bf3d63d1fe5658c044a1c..766031c8c3fc0796f73106abc8f2145dbdc25c17 100644 (file)
--- a/actions/edit_attendee.sh
+++ b/actions/edit_attendee.sh
@@ -24,4 +24,4 @@ filter="&filter=$_REF[\"filter\"]"
 filtertype="&filtertype=$_REF[\"filtertype\"]"
 order="&order=$_REF[\"order\"]"
 
-echo -n "Location: ?page=attendees${filter}${filtertype}${order}&edit=$card\n\n"
+echo -n "Location: ?p=attendees${filter}${filtertype}${order}&edit=$card\n\n"

diff --git a/actions/edit_course.sh b/actions/edit_course.sh
index abeae20a8b1d8beb99aeac022b1d5ec53bed01ce..ecf5bc67d636587f6e58a3db2b8722d3068a1dba 100644 (file)
--- a/actions/edit_course.sh
+++ b/actions/edit_course.sh
@@ -19,4 +19,4 @@
 
 course="$_GET[\"course\"]"
 
-echo -n "Location: ?page=courses&edit=$course\n\n"
+echo -n "Location: ?p=courses&edit=$course\n\n"

diff --git a/action.sh b/actions/export_ical.sh
similarity index 77%
rename from action.sh
rename to actions/export_ical.sh
index a0240d932d0f718a5088d44d3b942f61dce66c3c..715f4d2aa93c6963aa2a4518842bef8a8c0f07c2 100755 (executable)
--- a/action.sh
+++ b/actions/export_ical.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,8 +17,6 @@
 # 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
+echo -n "Content-Type: text/calendar;charset=utf-8\n\n"
+course="$_GET[\"course\"]"
+cat "$_DATA/ical/$course"

diff --git a/export.sh b/actions/export_vcard.sh
similarity index 68%
rename from export.sh
rename to actions/export_vcard.sh
index 96c2bf5eec06915b41b067050d5aeeedf127abc4..4c7841130084c3481a93949147973effc07b7e38 100755 (executable)
--- a/export.sh
+++ b/actions/export_vcard.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,15 +17,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-case "$_GET[\"export\"]" in
-  vcard)
-    echo -n "Content-Type: text/vcard;charset=utf-8\n\n"
-    card="$_GET[\"card\"]"
-    cat "$_DATA/vcard/$card"
-  ;;
-  ical)
-    echo -n "Content-Type: text/calendar;charset=utf-8\n\n"
-    course="$_GET[\"course\"]"
-    cat "$_DATA/ical/$course"
-  ;;
-esac
+echo -n "Content-Type: text/vcard;charset=utf-8\n\n"
+card="$_GET[\"card\"]"
+cat "$_DATA/vcard/$card"

diff --git a/actions/filter_attendee.sh b/actions/filter_attendee.sh
index a18c1ebae29e7c09a08b52e288ace4f0ac44889f..fcdf8d1c9258bec803bf30709a7be242226b99bd 100755 (executable)
--- a/actions/filter_attendee.sh
+++ b/actions/filter_attendee.sh
@@ -24,9 +24,9 @@ case "$_POST[\"choice\"]"; in
     filter="$_POST[\"filter\"]"
     filtertype="$_POST[\"filtertype\"]"
     order="$_POST[\"order\"]"
-    echo -n "Location: ?page=attendees&filter=$filter&filtertype=$filtertype&order=$order\n\n"
+    echo -n "Location: ?p=attendees&filter=$filter&filtertype=$filtertype&order=$order\n\n"
     ;;
   *)
-    echo -n "Location: ?page=attendees\n\n"
+    echo -n "Location: ?p=attendees\n\n"
     ;;
 esac

diff --git a/actions/new_attendee.sh b/actions/new_attendee.sh
index 72581a7c54f585b2dd993d7d970b6e107f3fd4cf..b998d1dd5664b66afa211a6e212315a539f93de3 100644 (file)
--- a/actions/new_attendee.sh
+++ b/actions/new_attendee.sh
@@ -42,4 +42,4 @@ UID:$uid
 END:VCARD
 EOF
 
-echo -n "Location: ?page=attendees${filter}${filtertype}${order}&edit=$card\n\n"
+echo -n "Location: ?p=attendees${filter}${filtertype}${order}&edit=$card\n\n"

diff --git a/actions/new_course.sh b/actions/new_course.sh
index e33f6812533e2854c0077c27b849c88d1dff6c89..4f97d4aadc94d3144135ad6854efeecd1871d1e0 100644 (file)
--- a/actions/new_course.sh
+++ b/actions/new_course.sh
@@ -43,4 +43,4 @@ END:VEVENT
 END:VCARD
 EOF
 
-echo -n "Location: ?page=courses&edit=$course\n\n"
+echo -n "Location: ?p=courses&edit=$course\n\n"

diff --git a/actions/update_attendee.sh b/actions/update_attendee.sh
index b6c38bcdd621490c1119fa89b9a70cb1529bb989..6125b2f2128666286f925ed8a67d777079e13363 100644 (file)
--- a/actions/update_attendee.sh
+++ b/actions/update_attendee.sh
@@ -54,7 +54,7 @@ case "$_POST[\"action\"]" in
   addfield)
     echo "$_POST[\"newfield\"]:\r" >>"$tempfile"
     echo "END:VCARD\r" >>"$tempfile"
-    echo -n "Location: ?page=attendees${filter}${filtertype}${order}&edit=$card\n\n"
+    echo -n "Location: ?p=attendees${filter}${filtertype}${order}&edit=$card\n\n"
     ;;
   update)
     attendance=()
@@ -74,16 +74,16 @@ case "$_POST[\"action\"]" in
 
     echo "END:VCARD\r" >>"$tempfile"
     mv "$tempfile" "$cardfile"
-    echo -n "Location: ?page=attendees${filter}${filtertype}${order}#$card\n\n"
+    echo -n "Location: ?p=attendees${filter}${filtertype}${order}#$card\n\n"
     ;;
   cancel)
     rm "$tempfile"
     [ -f "$cardfile" ] \
-      && echo -n "Location: ?page=attendees${filter}${filtertype}${order}#$card\n\n" \
-      || echo -n "Location: ?page=attendees${filter}${filtertype}${order}\n\n"
+      && echo -n "Location: ?p=attendees${filter}${filtertype}${order}#$card\n\n" \
+      || echo -n "Location: ?p=attendees${filter}${filtertype}${order}\n\n"
     ;;
   delete)
     rm "$tempfile" "$cardfile"
-    echo -n "Location: ?page=attendees${filter}${filtertype}${order}\n\n"
+    echo -n "Location: ?p=attendees${filter}${filtertype}${order}\n\n"
     ;;
 esac

diff --git a/actions/update_course.sh b/actions/update_course.sh
index 0e1ee244a50380072087bdaa467cdeec41bbbdd6..d95d06250fb19ed71408a1b993a7c5a94b8022ff 100644 (file)
--- a/actions/update_course.sh
+++ b/actions/update_course.sh
@@ -88,27 +88,27 @@ case "$_POST[\"action\"]" in
     echo "$_POST[\"newfield\"]:\r" >>"$tempfile"
     echo "END:VEVENT\r" >>"$tempfile"
     echo "END:VCALENDAR\r" >>"$tempfile"
-    echo -n "Location: ?page=courses&edit=$course\n\n"
+    echo -n "Location: ?p=courses&edit=$course\n\n"
     ;;
   update)
     echo "END:VEVENT\r" >>"$tempfile"
     echo "END:VCALENDAR\r" >>"$tempfile"
     mv "$tempfile" "$coursefile"
-    echo -n "Location: ?page=courses#$course\n\n"
+    echo -n "Location: ?p=courses#$course\n\n"
     ;;
   cancel)
     rm "$tempfile"
     [ -f "$coursefile" ] \
-      && echo -n "Location: ?page=courses#$course\n\n" \
-      || echo -n "Location: ?page=courses\n\n"
+      && echo -n "Location: ?p=courses#$course\n\n" \
+      || echo -n "Location: ?p=courses\n\n"
     ;;
   delete)
     rm "$tempfile" "$coursefile"
-    echo -n "Location: ?page=courses\n\n"
+    echo -n "Location: ?p=courses\n\n"
     ;;
   *)
     echo "END:VEVENT\r" >>"$tempfile"
     echo "END:VCALENDAR\r" >>"$tempfile"
-    echo -n "Location: ?page=courses&edit=$course\n\n"
+    echo -n "Location: ?p=courses&edit=$course\n\n"
     ;;
 esac

diff --git a/cgi.sh b/cgi.sh
deleted file mode 100755 (executable)
index b840770..0000000
--- a/cgi.sh
+++ /dev/null
@@ -1,54 +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
-
-cgi_get() {  # parse HTTP GET string
-  echo "$QUERY_STRING" |tr '&' '\n' |while read query; do
-    key="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-    val="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-    _GET["$key"]="$(echo -e "$(echo "$val" |sed 's:+: :g;s:%:\\x:g')")"
-  done
-}
-
-cgi_post() {  # parse HTTP POST string
-  sed -u 1q |tr '&' '\n' |while read query; do
-    key="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-    val="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-    value="$(echo -e "$(echo "$val" |sed '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
-  echo "$HTTP_REFERER" |cut -d'?' -f2- |tr '&' '\n' |while read query; do
-    key="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-    val="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-    _REF["$key"]="$(echo -e "$(echo "$val" |sed 's:+: :g;s:%:\\x:g')")"
-  done
-}

diff --git a/constants.sh b/constants.sh
index 3d4e64839658e51c569c41f4bc86c080581eee7b..c526da4095a4032d27fc17ca78333dac01bec38e 100644 (file)
--- 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,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
+export LC_ALL=de_DE.UTF-8
+data_dirs vcard ical cache temp mappings
+
 VCF_FIELDS=(PHOTO LOGO FN NICKNAME SOUND GENDER KIND TITLE ROLE ORG MEMBER CATEGORIES ANNIVERSARY BDAY EMAIL TEL IMPP ADR URL LANG NOTE RELATED X-ZACK-JOINDATE X-ZACK-LEAVEDATE)
 
 uuidgenerator(){

diff --git a/index.cgi b/index.cgi
deleted file mode 100755 (executable)
index c908d7b..0000000
--- a/index.cgi
+++ /dev/null
@@ -1,81 +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/>. 
-
-export LC_ALL=de_DE.UTF-8
-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"/{vcard,ical,cache,temp,mappings}; do
-  [ ! -e "$each" ] && mkdir "$each"
-  [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
-done
-touch "$_DATA/mappings/attendance"
-
-# 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"
-cgi_get
-
-. "$_EXEC/constants.sh"
-
-if [ -n "$_GET[\"action\"]" ]; then
-  . "$_EXEC/action.sh"
-elif [ -n "$_GET[\"export\"]" ]; then
-  . "$_EXEC/export.sh"
-else
-  . "$_EXEC/page.sh"
-fi

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 22e1671..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 "$_GET[\"page\"]" |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 "$each" |sed -r "s:^.*/([^/]*)\.sh$:\1:")"
-    title="$($each title)"
-    [ -n "$title" ] && echo "?page=$link $title"
-  done
-}
-
-. ${_EXEC}/templates/frame.html.sh

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index 4d14e750cf12da1d81f5c145eb42dae8df61b402..0265a807e2d44ac4c69996303d4046711b178e04 100755 (executable)
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -85,12 +85,12 @@ echo '  <div class="section">'
 echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
 sed -rn 's:(.*)\t'$id'$:\1:p' "$_DATA/mappings/attendance" |while read each; do
   cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
-  echo '    <a class="item attendance" href="?page=courses#'$each'">'$cname'</a>'
+  echo '    <a class="item attendance" href="?p=courses#'$each'">'$cname'</a>'
 done
 echo '  </div>'
 echo ''
 echo '  <div class="section control">'
 echo '    <a class="item control" href="?action=edit_attendee&card='${id}'">'$(l10n edit)'</a>'
-echo '    <a class="item control" href="?export=vcard&card='${id}'">'$(l10n vcf_export)'</a>'
+echo '    <a class="item control" href="?action=export_vcard&card='${id}'">'$(l10n vcf_export)'</a>'
 echo '  </div>'
 echo '</div>'

diff --git a/templates/view_course.sh b/templates/view_course.sh
index 9ebe377880e614cd419ff13cd8930174f2b8cf6a..ab93e021fd50c1c49645908e88b7c33ebf45249b 100755 (executable)
--- a/templates/view_course.sh
+++ b/templates/view_course.sh
@@ -87,13 +87,13 @@ echo '  </div>'
 
 echo '  <div class="section attendance">'
 echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
-list_attendance "$id" |sort -k 2 |sed -r 's:^([^ ]+) (.*)$:<a class="attendance" href="?page=attendees#\1">\2</a>:'
+list_attendance "$id" |sort -k 2 |sed -r 's:^([^ ]+) (.*)$:<a class="attendance" href="?p=attendees#\1">\2</a>:'
 echo '  </div>'
 
 echo '  <div class="section control">'
 echo '    <a class="item control" href="?action=edit_course&course='${id}'">'$(l10n edit)'</a>'
 echo '    <a class="item control" href="?action=generate_courselist&course='${id}'" target="_blank">'$(l10n courselist)'</a>'
-echo '    <a class="item control" href="?export=ical&course='${id}'">'$(l10n ics_export)'</a>'
+echo '    <a class="item control" href="?action=export_ical&course='${id}'">'$(l10n ics_export)'</a>'
 echo '    <a class="item control" href="mailto:zack@vuesch.org?bcc='$(course_mail "$id")'">'$(l10n course_mail)'</a>'
 echo '  </div>'
 echo '<input type="hidden" name="UID" value="'$values["UID"]'"/>'