X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=attachment.sh;h=43e70c545239385c2277293a3e17a7b0f8743c1b;hb=7b1d88cf33d962e2ac98e03d0fd21327aee583a6;hp=68e03b9b7ab9435961ca41abbaa93e2667aced7d;hpb=ad80bc2c5d655b67abea18b7b6c107896e7b3150;p=shellwiki

diff --git a/attachment.sh b/attachment.sh
index 68e03b9..43e70c5 100755
--- a/attachment.sh
+++ b/attachment.sh
@@ -17,7 +17,7 @@ attachment_convert(){
   elif [ -f "$cachepath" ]; then
     printf %s "$attpath"
     return 0
-  elif ! touch "$cachepath"; then
+  elif ! mkdir -p -- "${cachepath%/*}" && touch "$cachepath"; then
     printf %s "$attpath"
     return 0
   fi
@@ -39,7 +39,8 @@ attachment_convert(){
       res=$(ffprobe -show_entries stream=width "$attpath" 2>&-)
       res="${res#*width=}" res="${res%%${BR}*}"
       if [ "$res" -gt 1280 ]; then
-        ( ffmpeg -y -nostdin -i "$attpath" \
+        ( exec >&- 2>&1;
+          ffmpeg -y -nostdin -i "$attpath" \
           -c:v libvpx -vf scale=1280:-2 -crf 28 -b:v 0 \
           -c:a libvorbis -q:a 6 \
           "${cachepath%.*}.tmp.webm" \
@@ -47,7 +48,8 @@ attachment_convert(){
         & ) &
        
       else
-        ( ffmpeg -y -nostdin -i "$attpath" \
+        ( exec >&- 2>&1;
+          ffmpeg -y -nostdin -i "$attpath" \
           -c:v libvpx -crf 28 -b:v 0 \
           -c:a libvorbis -q:a 6 \
           "${cachepath%.*}.tmp.webm" \
@@ -60,9 +62,33 @@ attachment_convert(){
   esac
 }
 
-if [ "${PATH_INFO%/\[attachment\]/*}" != "${PATH_INFO}" ]; then
+if [ "${PATH_INFO%/\[attachment\]/}"  != "${PATH_INFO}" ]; then
+  . "$_EXEC/multipart.sh"
+
+  if [ "${CONTENT_TYPE%%;*}" = "multipart/form-data" ] && acl_write "${PATH_INFO%\[attachment\]/}"; then
+    multipart_cache
+    mkdir -p "$_DATA/pages/${PATH_INFO%/\[attachment\]/}/#attachments/"
+    n=1; while filename=$(multipart_filename "file" "$n"); do
+      filename="$(printf %s "$filename" |tr /\\0 __)"
+      multipart "file" "$n" >"$_DATA/pages/${PATH_INFO%/\[attachment\]/}/#attachments/$filename"
+      n=$((n + 1))
+    done
+    rm -- "$multipart_cachefile"
+    REDIRECT "${_BASE}${PATH_INFO}"
+  elif [ "${CONTENT_TYPE%%;*}" = "multipart/form-data" ]; then
+    theme_403
+  elif acl_read "${PATH_INFO%\[attachment\]/}"; then
+    theme_attachments "${PATH_INFO%\[attachment\]/}"
+  else
+    theme_404
+  fi
+
+elif [ "${PATH_INFO%/\[attachment\]/*}" != "${PATH_INFO}" ]; then
   attpath="${PATH_INFO%/\[attachment\]/*}/#attachments/${PATH_INFO##*/}"
-  if [ -f "$_DATA/pages/$attpath" ]; then
+
+  if ! acl_read "${PATH_INFO%/\[attachment\]/*}"; then
+    theme_403
+  elif [ -f "$_DATA/pages/$attpath" ]; then
     FILE "$_DATA/pages/$attpath"
   elif [ -f "$_EXEC/pages/$attpath" ]; then
     FILE "$_EXEC/pages/$attpath"
@@ -73,12 +99,17 @@ if [ "${PATH_INFO%/\[attachment\]/*}" != "${PATH_INFO}" ]; then
   
 elif [ "${PATH_INFO%/}" = "${PATH_INFO}" ]; then
   attpath="${PATH_INFO%/*}/#attachments/${PATH_INFO##*/}"
-  if [ -f "$_DATA/pages/$attpath" ]; then
+
+  if ! acl_read "${PATH_INFO%/*}/"; then
+    theme_403
+  elif [ -f "$_DATA/pages/$attpath" ]; then
     FILE "$(attachment_convert "$_DATA/pages/$attpath")"
   elif [ -f "$_EXEC/pages/$attpath" ]; then
     FILE "$(attachment_convert "$_EXEC/pages/$attpath")"
   elif [ -d "$_DATA/pages/${PATH_INFO}" -o -d "$_EXEC/pages/${PATH_INFO}" ]; then
     REDIRECT "${_BASE}${PATH_INFO}/"
+  else
+    theme_404
   fi
   exit 0