From: Paul Hänsch Date: Fri, 22 Jan 2021 23:47:13 +0000 (+0100) Subject: remove some obsolte files X-Git-Url: https://git.plutz.net/?p=confetti;a=commitdiff_plain;h=fabe138567d771b70b849ab178a3f7a649ac5bcd;hp=85ff3b292b0775165a0b889b3714151f135bf84c remove some obsolte files --- diff --git a/.gitmodules b/.gitmodules index fb39709..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "shcgi"] - path = shcgi - url = http://git.plutz.net/git/shcgi diff --git a/courses/courses.sh b/courses/courses.sh deleted file mode 100755 index 93e8261..0000000 --- a/courses/courses.sh +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/zsh - -# Copyright 2014, 2016, 2017 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 . - -[ -z "${_GET[order]}" ] && _GET[order]=DOW - -listcards() { - ls -1 ${_DATA}/vcard/*vcf 2>/dev/null |while read file; do - fn=$(sed -rn 's:^N(;.+)*\:([^;]*;){1} *([^;]*).*$:\3:p' "$file") - echo "$fn\t$file" - done |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:' -} - - -listcourses() { - case "${_GET[filtertype]}" in - *) ls -1 ${_DATA}/ical/*ics 2>/dev/null - ;; - 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")" - echo "$(date -d "$icstime" "+%u %H%M%S")\t$file" - done - ;; - TOD) - 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")" - echo "$(date -d "$icstime" +%H%M%S)\t$file" - done - ;; - *) - sed -r 's:^.*$:x\t&:' - ;; - esac |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:' -} - -list_attendance() { - id="$1" - sed -rn 's:'$id'\t(.+)$:\1:p' "$_DATA/mappings/attendance" |while read each; do - 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 -} - -course_mail() { - id="$1" - coursemail="" - sed -rn 's:'$id'\t(.+)$:\1:p' "$_DATA/mappings/attendance" |while read each; do - coursemail="$coursemail$(sed -rn 's:^EMAIL(;.+)*\:(.+)\r$:\2,:p' "$_DATA/vcard/$each")" - done - echo "$coursemail" -} - -ics_parse() { - unset key - sed -r ':X;N;$!bX; s;\r\n[ \t];;g; s;\r\n;\n;g;' "$1" \ - | sed -rn ' - # === turn property names to upper case, strip group names === - h; s;^([^;:]+);;; - x; s;^([^;:\.]+\.)?([^;:]+).*$;\2;; - y;abcdefghijklmnopqrstuvwxyz;ABCDEFGHIJKLMNOPQRSTUVWXYZ; - G; s;\n;;; - - /^([A-Z0-9-]+)((\;[A-z0-9-]+=?|\;[A-z0-9-]+=([^;,:"]+|"[^"]+")(,[^;,:"]+|,"[^"]+")*)*):(.*)$/{ - h; - s;^([A-Z0-9-]+)((\;[A-z0-9-]+=?|\;[A-z0-9-]+=([^;,:"]+|"[^"]+")(,[^;,:"]+|,"[^"]+")*)*):(.*)$;key='\''\1'\'';; - H; g; - - s;^([A-Z0-9-]+)((\;[A-z0-9-]+=?|\;[A-z0-9-]+=([^;,:"]+|"[^"]+")(,[^;,:"]+|,"[^"]+")*)*):([^\n]*)\n.*$;\2;; - s;'\'';'\'\\\\\'\'';g - s;\;([A-Z0-9-]+)(=|=(([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*))?;\ntag[\1]='\''\3'\'';g - s;^\n+;;; s;\n+$;;; - /^.+$/H; g; - - s;^([A-Z0-9-]+)((\;[A-z0-9-]+=?|\;[A-z0-9-]+=([^;,:"]+|"[^"]+")(,[^;,:"]+|,"[^"]+")*)*):([^\n]*)\n.*$;\6;; - # :X s;((^|[^\\])(\\\\)*)[;,];\1\n;g; s;((^|[^\\])(\\\\)*)\\([;,]);\4;g; tX; - s;'\'';'\'\\\\\'\'';g - s;^.*$;value='\''&'\''; - H; g; - - s;^[^\n]*[\n ]+;; - s;\n+$;;; - - p; - } - ' \ - | while read -r line; do - declare -A tag - case "$line" in - value*) eval "$line";; - tag*) eval "$line";; - key*) - if [ -z "$key" ]; then - eval "$line" - else - values[$key]="$value" - for t in ${(k)tag}; do - values[${key}_$t]="$tag[$t]" - done - eval "$line" - if [ -n "$values[$key]" ]; then - n=0 - while [ -n "$values[$key$n]" ]; do n=$(($n + 1)); done - key=$key$n - fi - unset value - unset tag - fi - ;; - esac - done -} - -view_course() { #Parameter: Calendarfile - id="$1" - calendarfile="$_DATA/ical/${id}" - cachefile="$_DATA/cache/${id}.cache" - unset key - if [ "$cachefile" -nt "$calendarfile" ]; then - cat "$cachefile" - else - declare -A values - ics_parse "$calendarfile" - . ${_EXEC}/templates/view_course.sh |tee "$cachefile" - fi -} - -edit_course() { #Parameter: Calendarfile - id="$1" - calendarfile="$_DATA/ical/$id" - tempfile="$_DATA/temp/$id" - [ -f "$tempfile" ] && calendarfile="$tempfile" - unset key - - declare -A values - ics_parse "$calendarfile" - . ${_EXEC}/templates/edit_course.sh -} diff --git a/frame.html.sh b/frame.html.sh deleted file mode 100755 index 6ba48b5..0000000 --- a/frame.html.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/zsh - -# Copyright 2014, 2015, 2017 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 . - -cat <. - -date() { - LANG=de_DE.UTF-8 LC_ALL=de_DE.UTF-8 /bin/date $@ -} - -PROFILE=$(validate "$PROFILE" 'medical|circus' circus ) - -PAGE="${_GET[p]:-${PAGE:-cards}}" - -uuidgenerator(){ - head -c16 /dev/urandom |sha1sum - |cut -c1-32 -} - -_checked='' -checked(){ - if [ "$_checked" = "$1" ]; then - printf 'checked="checked"' - fi -} - - -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 X-HEALTH-INSURANCE X-HEALTH-INSURANCE-NOCONTRIB X-CLIENT-REFERRAL) - -case "${PROFILE}" in -medical) - data_dirs vcard cache temp mappings prescriptions therapies - [ -z "$NAVIGATION" ] && NAVIGATION=(cards) -;; -circus) - data_dirs vcard ical cache temp mappings - [ -z "$NAVIGATION" ] && NAVIGATION=(cards courses) -;; -esac diff --git a/shcgi b/shcgi deleted file mode 160000 index 8d60af4..0000000 --- a/shcgi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8d60af41a80ea3760dd51c3bc34eab68d88b16ae diff --git a/text_frame.sh b/text_frame.sh deleted file mode 100755 index 75e1511..0000000 --- a/text_frame.sh +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2014 - 2016, 2018 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 . - -item_name[p_cards]="Personen" -item_name[p_courses]="Kurse" -item_name[p_email]="Email" -item_name[p_error]="Fehler" -item_name[p_categories]="Kategorien" -item_name[p_prescriptions]="Verschreibungen" -item_name[p_therapy]="Therapie" -item_name[nc_edit]="⚙" -#item_name[nc_edit]="☰" -item_name[bm_add]="+" -item_name[bm_del]="-" -item_name[configure]="Anpassen"