# HG changeset patch # User HIROSE Yuuji # Date 1685014431 -32400 # Node ID 1c19b0ea0125de27614d670cb9b92e05a8778204 # Parent 0967a3ef14cfbbf261ad7dc2c79419a3757af0eb [TEST] There's no need to return number from getvalquote. diff -r 0967a3ef14cf -r 1c19b0ea0125 s4-funcs.sh --- a/s4-funcs.sh Fri May 19 08:20:21 2023 +0900 +++ b/s4-funcs.sh Thu May 25 20:33:51 2023 +0900 @@ -63,7 +63,7 @@ filesize_max=${FILESIZE_MAX:-$((5*1024*1024))} filesize_max_MB="$((filesize_max/1024/1024))MB" file_accept='accept="image/*,text/*,audio/*,application/vnd.oasis.*,application/pdf,application/x-*,application/sqlite*,application/csv"' -file_accept='accept=".jpg,.jpeg,.gif,.png,.tiff,.pdf,.odt,.ods,.odp,.odg,.mp3,.mp4,.m4a,.m4v,.obj,.avi,.ogg,.mov,.webm,.gpx,.json,.geojson,.kml,.kmz,.html,.css,.js,.java,.go,.cc,.rb,.rs,.py,.pl,lua,.awk,.sh,.c,.h,.txt,.tex,.sty,.zip,.xcf,.bz2,.gz,.xz,.7z,.csv,.dat,.db,.sq3,.blend,.gltf"' +file_accept='accept=".jpg,.jpeg,.gif,.png,.tiff,.pdf,.odt,.ods,.odp,.odg,.mp3,.mp4,.m4a,.m4v,.mkv,.obj,.avi,.ogg,.mov,.webm,.gpx,.json,.geojson,.kml,.kmz,.html,.css,.js,.java,.go,.cc,.rb,.rs,.py,.pl,lua,.awk,.sh,.c,.h,.txt,.tex,.sty,.zip,.xcf,.bz2,.gz,.xz,.7z,.csv,.dat,.db,.sq3,.blend,.gltf"' file_accept_egrep='^(text/|message/|image/|audio/|video/|application/(vnd.(oasis|sqlite)|pdf|epub|xml|.*zip|[xz]-|json|csv|javascript|octet-stream))' file_accept_help=" 添付可能ファイル: テキスト、画像、音声、動画、ODF、PDF、 @@ -906,7 +906,7 @@ (v=`getval "$@"` case "$v" in "") echo NULL ;; - *) sqlquote "$v" ;; + *) sqlquotestr "$v" ;; esac) } getparquote() {