adaptions to updated shcgi

svn path=/trunk/; revision=71

diff --git a/actions/update_attendee.sh b/actions/update_attendee.sh
index 4d2157f45f3d71688d59c3c7d5bbe2ffe6be7780..4bdd6ba6a7e8bfe16ea6bf437693ad4f0735063e 100755 (executable)
--- a/actions/update_attendee.sh
+++ b/actions/update_attendee.sh
@@ -29,11 +29,11 @@ tempfile="$_DATA/temp/$card"
 cardfile="$_DATA/vcard/$card"
 attfile="$_DATA/mappings/attendance"
 
-_POST[0N]="${(echo "$_POST[0N]}" |sed 's:;: :')"
-_POST[1N]="${(echo "$_POST[1N]}" |sed 's:;: :')"
-_POST[2N]="${(echo "$_POST[2N]}" |sed 's:;: :')"
-_POST[3N]="${(echo "$_POST[3N]}" |sed 's:;: :')"
-_POST[4N]="${(echo "$_POST[4N]}" |sed 's:;: :')"
+_POST[0N]="$(echo "${_POST[0N]}" |sed 's:;: :')"
+_POST[1N]="$(echo "${_POST[1N]}" |sed 's:;: :')"
+_POST[2N]="$(echo "${_POST[2N]}" |sed 's:;: :')"
+_POST[3N]="$(echo "${_POST[3N]}" |sed 's:;: :')"
+_POST[4N]="$(echo "${_POST[4N]}" |sed 's:;: :')"
 
 echo "BEGIN:VCARD\r" >"$tempfile"
 echo "VERSION:4.0\r" >>"$tempfile"

diff --git a/constants.sh b/globals.sh
similarity index 92%
rename from constants.sh
rename to globals.sh
index c526da4095a4032d27fc17ca78333dac01bec38e..aac6dc9e92bbc5ae662b747a3f0a366253dd6798 100755 (executable)
--- a/constants.sh
+++ b/globals.sh
@@ -22,6 +22,9 @@ 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)
 
+[ -z "$NAVIGATION" ] && NAVIGATION=(attendees courses)
+PAGE="${_GET[p]:-$PAGE}"
+
 uuidgenerator(){
   head -c16 /dev/urandom |sha1sum - |cut -c1-32
 }

diff --git a/pages/attendees.sh b/pages/attendees.sh
index 9cc387e48ca025f6e2f077fa6f2109fab57b4032..0a1f88df2ec0d9935b3d3eb696299a98f78c76d2 100755 (executable)
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 
 # Copyright 2014, 2015 Paul Hänsch
 #
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-[ -z "${_GET[order]}" ] && _GET[order]=firstname
+[ -z "${_GET[order]}" ] && _GET[order]="firstname"
 
 listcourses() {
   ls -1 ${_DATA}/ical/*ics |while read file; do
@@ -279,17 +279,3 @@ edit_attendee() {  #Parameter: Cardfile
   done
   . ${_EXEC}/templates/edit_attendee.sh
 }
-
-case "$1" in
-  title)
-    echo "Teilnehmende"
-  ;;
-  css)
-    . ${_EXEC}/templates/attendees.css.sh
-  ;;
-  body)
-    . ${_EXEC}/templates/text_attendee.sh
-    . ${_EXEC}/templates/attendees.html.sh
-  ;;
-esac
-  

diff --git a/pages/courses.sh b/pages/courses.sh
index 14d1713c9eb8b3b471d402501cb3a3fe9f42a0fb..ad92ae7b0a161a31f3b9b5c0a6b2db08b97f87b5 100755 (executable)
--- a/pages/courses.sh
+++ b/pages/courses.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 
 # Copyright 2014 Paul Hänsch
 #
@@ -174,17 +174,3 @@ edit_course() {  #Parameter: Calendarfile
   done
   . ${_EXEC}/templates/edit_course.sh
 }
-
-case "$1" in
-  title)
-    echo "Kurse"
-  ;;
-  css)
-    . ${_EXEC}/templates/courses.css.sh
-  ;;
-  body)
-    . ${_EXEC}/templates/text_courses.sh
-    . ${_EXEC}/templates/courses.html.sh
-  ;;
-esac
-  

diff --git a/pages/email.sh b/pages/email.sh
index 817d5c673dd1053c8e4d18e53dfb5631cc7123a7..c79876fe23476c22e20ce8d859aefc4eab1ed3b2 100755 (executable)
--- a/pages/email.sh
+++ b/pages/email.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 
 # Copyright 2014 Paul Hänsch
 #
@@ -32,17 +32,3 @@ listcourses() {
     echo "$(date -d "$icstime" "+%u %H%M%S")\t$file"
   done |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:'
 }
-
-case "$1" in
-  title)
-    echo "Email"
-  ;;
-  css)
-    . ${_EXEC}/templates/email.css.sh
-  ;;
-  body)
-    . ${_EXEC}/templates/text_email.sh
-    . ${_EXEC}/templates/email.html.sh
-  ;;
-esac
-  

diff --git a/templates/email.html.sh b/templates/email.html.sh
index 6061a8aee81ef08c25ae3d34825a96f4e0eb58ac..7f9389361c2d5fdf916eecd49f02f82a6486f35d 100755 (executable)
--- a/templates/email.html.sh
+++ b/templates/email.html.sh
@@ -51,8 +51,6 @@ cat <<EOF
 </div>
 
 <div class="maillist">
-$(
-)
 </div>
 EOF
 

diff --git a/templates/frame.html.sh b/templates/frame.html.sh
index 27d946668922195dd2252e731e82a5acb0563f54..738ec2994438fc3094f6c66c44bb23c80d193f9a 100755 (executable)
--- a/templates/frame.html.sh
+++ b/templates/frame.html.sh
@@ -1,4 +1,6 @@
-# Copyright 2014 Paul Hänsch
+#!/bin/zsh
+
+# Copyright 2014, 2015 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -15,12 +17,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
+. "${_EXEC}/templates/text_frame.sh"
+[ -x "${_EXEC}/templates/text_${PAGE}.sh" ] && . "${_EXEC}/templates/text_${PAGE}.sh"
+
 cat <<EOF
 <!Doctype HTML>
 
 <html>
   <head>
-    <title>$($PAGE title)</title>
+    <title>$(l10n p_${PAGE})</title>
     <style type="text/css">
     <!--
 * {
@@ -60,15 +65,15 @@ body {
 }
 
 /* dynamic page CSS starts here */
-$(. $PAGE css)
+$(debug CSS; [ -x "${CSS}" ] && . "${CSS}")
     -->
     </style>
   </head>
   <body class="$PAGE">
     <div class="NAVIGATION">
-      $(NAVIGATION |sed -r 's:^([^ ]+) (.+)$:<a href="\1">\2</a>:g')
+      $(debug NAVIGATION = "$NAVIGATION"; for each in ${NAVIGATION}; do printf %s "<a href=\"?p=${each}\">$(l10n "p_${each}")</a>"; done)
     </div>
-    $(. $PAGE body)
+    $(debug BODY; [ -x "${BODY}" ] && . "${BODY}" || printf %s 'Error')
   </body>
 </html>
 EOF

diff --git a/pages/error.sh b/templates/text_frame.sh
similarity index 72%
rename from pages/error.sh
rename to templates/text_frame.sh
index c42df35f920613a79a42a469b5c0591054d63d1d..b76b58439baf3f9e35b012bcf0481f9cfd83720a 100755 (executable)
--- a/pages/error.sh
+++ b/templates/text_frame.sh
@@ -1,6 +1,4 @@
-#!/bin/sh
-
-# Copyright 2014 Paul Hänsch
+# Copyright 2014, 2015 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -17,16 +15,13 @@
 # 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 "$1" in
-  title)
-  ;;
-  css)
-  ;;
-  body)
-cat <<EOF
-Page not found or nevermore<br />
-Quoth the server: 404
-EOF
-  ;;
-esac
-  
+declare -A item_name
+
+item_name[p_attendees]="Teilnehmende"
+item_name[p_courses]="Kurse"
+item_name[p_email]="Email"
+item_name[p_error]="Fehler"
+
+l10n() {
+  [ -n "$item_name[$1]" ] && echo -n "$item_name[$1]" || echo -n "$1"
+}