X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Fattachments;h=34a7bebc98b2552387366cb8b5876746b09c9f7e;hb=9422fa86d51fdaba072d04f6b0ae5d7e589a4439;hp=7acc8063b32af36fa84db64f40d89e6367ca1460;hpb=df5a47a0b129485391d78ca5622b89702fdf57f3;p=shellwiki

diff --git a/macros/attachments b/macros/attachments
index 7acc806..34a7beb 100755
--- a/macros/attachments
+++ b/macros/attachments
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 . "$_EXEC/cgilite/cgilite.sh"
+. "$_EXEC/cgilite/users.sh"
+. "$_EXEC/acl.sh"
+. "$_EXEC/tools.sh"
 
 page="$1"
 
@@ -8,7 +11,9 @@ if [ "${page#/}" = "$page" ]; then
   page="$(PATH "${PATH_INFO}/$page")"
 fi
 
-printf %s\\n '<ul class="attachment list">'
+acl_read "$page" || exit 0
+
+printf %s\\n '<ul class="macro attachment list">'
 
 for file in "$_EXEC/pages/$page/#attachments"/* "$_DATA/pages/$page/#attachments"/*; do
   [ "$file" = "$_EXEC/pages/$page/#attachments/${file##*/}" \
@@ -16,25 +21,9 @@ for file in "$_EXEC/pages/$page/#attachments"/* "$_DATA/pages/$page/#attachments
   stat="$(stat -c '%s %Y' -- "$file" 2>&-)" || continue
   size="${stat% *}" date="${stat#* }"
 
-  if [ $size -gt $((1024 * 1024 * 1024)) ]; then
-    size=$((size / 1024 / 1024 / 1024 * 10 + size / 1024 / 1024 % 1024 / 100))
-    size="$((size / 10)).$((size % 10)) GB"
-
-  elif [ $size -gt $((1024 * 1024)) ]; then
-    size=$((size / 1024 / 1024 * 10 + size / 1024 % 1024 / 100))
-    size="$((size / 10)).$((size % 10)) MB"
-
-  elif [ $size -gt $((1024)) ]; then
-    size=$((size / 1024 * 10 + size % 1024 / 100))
-    size="$((size / 10)).$((size % 10)) KB"
-
-  else
-    size="${size} B"
-  fi
-
   printf '<li><span class=name>%s</span>
           <span class=size>%s</span><span class=date>%s</span></li>' \
-    "$(HTML "${file##*/}")" "$size" "$(date -d @"$date" +"%F %T")"
+    "$(HTML "${file##*/}")" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
 done
 
 printf %s\\n '</ul>'