X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=pages%2Fcourses.sh;h=0fa5542f13efa1ceaafe7fa709e2d8e0236c467b;hp=f604515554bd7185b230372c05eda81c8ee1188b;hb=e7f611ea33c1a8c8165088db41f04c6a903018c8;hpb=41083d642a4468fbec3146c3b1c71dc9c1179fe2

diff --git a/pages/courses.sh b/pages/courses.sh
index f604515..0fa5542 100755
--- a/pages/courses.sh
+++ b/pages/courses.sh
@@ -1,6 +1,23 @@
-#!/bin/sh
+#!/bin/zsh
 
-[ -z "$_GET[\"order\"]" ] && _GET["order"]=DOW
+# Copyright 2014, 2016 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")"
@@ -36,15 +53,25 @@ listcourses() {
 list_attendance() {
   id="$1"
   sed -rn 's:'$id'\t(.+)$:\1:p' "$_DATA/mappings/attendance" |while read each; do
-    n_last="$(  sed -rn 's:^N(;.+)*\:([^;]*;){0} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-    n_first="$( sed -rn 's:^N(;.+)*\:([^;]*;){1} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-    n_middle="$(sed -rn 's:^N(;.+)*\:([^;]*;){2} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-    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}"
-    echo "$each $aname" |tr -d '\r'
+    card="$_DATA/vcard/$each"
+    if [ -r "$card" ]; then
+      aname="$(sed -rn '
+          /^N(;.+)*:/{
+          h;
+          s;^N(\;.+)*:([^\;]*\;){3} *([^\;]*).*$;\3;p; g;
+          s;^N(\;.+)*:([^\;]*\;){1} *([^\;]*).*$;\3;p; g;
+          s;^N(\;.+)*:([^\;]*\;){2} *([^\;]*).*$;\3;p; g;
+          s;^N(\;.+)*:([^\;]*\;){0} *([^\;]*).*$;\3;p; g;
+          s;^N(\;.+)*:([^\;]*\;){4} *([^\;]*).*$;\3;p; g;
+          }' "$card" \
+        | sed -r ':X;N;$!bX; s;([\;\n\r,]| )+; ;g;; s;^ +| +$;;g;'
+      )"
+      fname="$(sed -rn 's;^FN(\;.+)*:(.+)\r?$;\2;g; s;([\;\n,]| )+; ;g;; s;^ +| +$;;g;' "$card")"
+      nname="$(sed -rn 's;^NICKNAME(\;.+)*:(.+)\r?$;\2;g; s;([\;\n,]| )+; ;g;; s;^ +| +$;;g;' "$card")"
+      byear="$(sed -rn 's:^BDAY(\;.+)*\:([0-9]{4})(-[0-9][0-9]){2}.*$:\2:p' "$_DATA/vcard/$each")"
+
+      printf '%s %s (*%04i)\n' "$each" "${aname:-${fname:-${nname}}}" "$byear"
+    fi
   done
 }
 
@@ -158,17 +185,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
-