adaption for changes in shcgi external

[confetti] / pages / courses.sh

diff --git a/pages/courses.sh b/pages/courses.sh
index f604515554bd7185b230372c05eda81c8ee1188b..14d1713c9eb8b3b471d402501cb3a3fe9f42a0fb 100755 (executable)
--- a/pages/courses.sh
+++ b/pages/courses.sh
@@ -1,6 +1,23 @@
 #!/bin/sh
 
-[ -z "$_GET[\"order\"]" ] && _GET["order"]=DOW
+# 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/>. 
+
+[ -z "${_GET[order]}" ] && _GET[order]=DOW
 
 listcards() {
   ls -1 ${_DATA}/vcard/*vcf 2>/dev/null |while read file; do
@@ -11,10 +28,10 @@ listcards() {
 
 
 listcourses() {
-  case "$_GET[\"filtertype\"]" in
+  case "${_GET[filtertype]}" in
     *) ls -1 ${_DATA}/ical/*ics 2>/dev/null
       ;;
-  esac |case "$_GET[\"order\"]" in
+  esac |case "${_GET[order]}" in
     DOW)
       while read file; do
         icstime="$(sed -rn 's:^DTSTART\:(TZID=.*\:)?([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z?\r$:\2-\3-\4 \5\:\6\:\7:p' "$file")"
@@ -42,8 +59,7 @@ list_attendance() {
     n_pre="$(   sed -rn 's:^N(;.+)*\:([^;]*;){3} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
     n_post="$(  sed -rn 's:^N(;.+)*\:([^;]*;){4} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
     byear="$(  sed -rn 's:^BDAY(;.+)*\:([0-9]{4})(-[0-9][0-9]){2}.*$:\2:p' "$_DATA/vcard/$each")"
-    #aname="${n_pre} ${n_first} ${n_middle} ${n_last} ${n_post} (*${byear})"
-    aname="${n_pre} ${n_first} ${n_middle} ${n_last} ${n_post}"
+    aname="${n_pre} ${n_first} ${n_middle} ${n_last} ${n_post} (*${byear})"
     echo "$each $aname" |tr -d '\r'
   done
 }