s4

changeset 995:9a54ad622318

Remove superfluous To:
author HIROSE Yuuji <yuuji@gentei.org>
date Sun, 16 Oct 2022 07:46:37 +0859
parents f0a62a22e33c
children a50f5b0b2c3d
files s4-funcs.sh
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/s4-funcs.sh	Sat Oct 15 17:52:25 2022 +0859
     1.2 +++ b/s4-funcs.sh	Sun Oct 16 07:46:37 2022 +0859
     1.3 @@ -60,7 +60,7 @@
     1.4  iconxy_M=400x400
     1.5  maximagexy=1600x1600
     1.6  ### maximagexy=400x400
     1.7 -filesize_max=$((5*1024*1024))
     1.8 +filesize_max=${FILESIZE_MAX:-$((5*1024*1024))}
     1.9  filesize_max_MB="$((filesize_max/1024/1024))MB"
    1.10  file_accept='accept="image/*,text/*,audio/*,application/vnd.oasis.*,application/pdf,application/x-*,application/sqlite*,application/csv"'
    1.11  file_accept='accept=".jpg,.jpeg,.gif,.png,.tiff,.pdf,.odt,.ods,.odp,.odg,.mp3,.mp4,.m4v,.obj,.avi,.ogg,.mov,.webm,.gpx,.json,.geojson,.kml,.html,.css,.js,.java,.go,.cc,.rb,.py,.pl,lua,.awk,.sh,.c,.h,.txt,.tex,.sty,.zip,.xcf,.bz2,.gz,.xz,.7z,.csv,.dat,.db,.sq3"'
    1.12 @@ -1346,7 +1346,7 @@
    1.13    rcpt=`echo $1|tr ' ' '\n'|sort -u|tr '\n' ' '` # uniq and strip newlines
    1.14    ## Gmail rejects below(Duplicated headers)
    1.15    ##rcptheader=`echo $1|tr ' ' '\n'|sort -u|sed '2,$s/^/To: /g'`
    1.16 -  rcptheader="To: `echo $1|tr ' ' '\n'|sort -u|tr '\n' ','|sed 's/,$//'`"
    1.17 +  rcptheader=`echo $1|tr ' ' '\n'|sort -u|tr '\n' ','|sed 's/,$//'`
    1.18    subj=`echo $2|nkf -jM|tr -d '\n'`
    1.19    sender=${SENDER:-$admin}
    1.20    # Do not call m4 with directly passing text
    1.21 @@ -4606,6 +4606,12 @@
    1.22        fi
    1.23        ct="text/plain${charset:+; charset=$charset}"
    1.24        ;;
    1.25 +    video/*)
    1.26 +      if [ -z "$3" ]; then
    1.27 +	_m4 -D_TITLE_="$fn" \
    1.28 +	    -D_SRC_="?showattc+$1+$2+raw" $layout/videoplay.m4.html
    1.29 +	exit $?
    1.30 +      fi
    1.31    esac
    1.32    contenttype "$ct"
    1.33    echo "Content-Disposition: filename=\"$fn\""