X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=actions%2Fgenerate_courselist.sh;h=71eb80abcf162cc213bf19bc1cdcfb3705abc1c5;hp=6e62a0b2727cfbc0b8adc00b217b425c83edcfd8;hb=0148cdea1cf6f906cc401885013da20774034d75;hpb=61666ee9e4ce45e915ead39c575493c075c68845

diff --git a/actions/generate_courselist.sh b/actions/generate_courselist.sh
index 6e62a0b..71eb80a 100755
--- a/actions/generate_courselist.sh
+++ b/actions/generate_courselist.sh
@@ -19,8 +19,8 @@
 
 pdflatex="$(where pdflatex |head -n1 || echo false)"
 course="${_GET[course]}"
-fromdate=$_GET[fromdate]
-fromdate=$(date -d "$fromdate" +%s)
+fromdate="${_GET[fromdate]}"
+fromdate="$(date -d "$fromdate" +%s)" 2>/dev/null
 [ -z "$fromdate" ] && fromdate=$(date +%s)
 
 . ${_EXEC}/pages/courses.sh
@@ -64,8 +64,8 @@ list_attendee() {  #Parameter: Cardfile
     esac
   done
 
-  n=$(printf %s "$values[N]" 
-      | sed -rn 's:^([^;]*)(;[^;]*)(;[^;]*)?(;[^;]*)?(;[^;]*)?$:4 2 3 1 5:gp' 
+  n=$(printf %s "$values[N]" \
+      | sed -rn 's:^([^;]*)(;[^;]*)(;[^;]*)?(;[^;]*)?(;[^;]*)?$:\4 \2 \3 \1 \5:gp' \
       | sed -r 's:,: :;s:;: :g;s: +: :g;s:^ $::;'
      )
   fullname="${n:-${values[FN]:-${values[NICKNAME]}}}"
@@ -124,7 +124,7 @@ get_dates() {  #Parameter: Calendarfile
   rrule="$values[RRULE]"
   rr_int="$(echo $rrule |sed -rn 's:^.*INTERVAL=([0-9]+)(;.*)?$:\1:p')"
   rr_freq="$(echo $rrule |sed -rn 's:^.*FREQ=(YEARLY|MONTHLY|WEEKLY|DAILY)(;.*)?$:\1:p')"
-  case "$rr_freq" in;
+  case "$rr_freq" in
     YEARLY) rec="$rr_int year";;
     MONTHLY) rec="$rr_int month";;
     DAILY) rec="$rr_int day";;