bugfix: allow index generation

diff --git a/index.cgi b/index.cgi
index fa342bb3908d46b9e770c938bf6729e07e6fffc3..8367f92f7bd4ab31e8de6d8569e35bc4fc3588f6 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -18,8 +18,9 @@ SEARCH="$(GET s)"
 ORDER="$(GET o |grep -m1 -axE 'Date|Name|Length' || printf Name)"
 LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
 ITEM="$(PATH "${PATH_INFO#/}")"
+ACTION="$(GET a)"
 
-case $(GET a) in
+case $ACTION in
   setprefs)
     SET_COOKIE +$((86400 * 90)) pagesize="$(POST pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
     SET_COOKIE +$((86400 * 90))     mode="$(POST     mode |grep -m1 -axE 'browse|index' || printf browse)"
@@ -48,7 +49,7 @@ if [ "$ITEM" = "/style.css" ]; then
   [ -r "$_DATA/$ITEM" ] && FILE "$_DATA/$ITEM" \
                         || FILE "$_EXEC/style.css"
 elif [ -f "$_DATA/$ITEM" ]; then
-  case $(GET a) in
+  case $ACTION in
     tag)
     ;;
     thumbnail)
@@ -67,21 +68,22 @@ elif [ -f "$_DATA/$ITEM" ]; then
     ;;
   esac
 elif [ -d "$_DATA/$ITEM" ]; then
-  case $(GET a) in
+  case $ACTION in
     advsearch)
       . "$_EXEC/advsearch.sh"
     ;;
-    spawnindex)
-      if [ "$(POST recursive)" = yes ]; then
-        find "$_DATA/$ITEM" -depth -type d \! -name .index \
-                            -exec mkdir -p '{}'/.index \;
-      else
-        mkdir -p "$_DATA/$ITEM/.index"
-      fi
-      REDIRECT "$(POST ref)"
-    ;;
     multitag)
+      if [ "$(POST spawn)" = spawn ]; then
+        case "$(POST recursive)" in
+          yes) find "$_DATA/$ITEM" \
+                    -depth -type d \! -name .index \
+                    -exec mkdir -p '{}'/.index \;
+          ;;
+          *) mkdir -p "$_DATA/$ITEM/.index";;
+        esac
+      else
       . "$_EXEC/multitag.sh"
+      fi
       REDIRECT "$(POST ref)"
     ;;
     *) . "$_EXEC/list.sh"

diff --git a/list.sh b/list.sh
index 71f70f9ca8590f796ec9e847069b63683911c48b..778ea11a0d96d9c1441bd65482e5ce99ad55d08f 100644 (file)
--- a/list.sh
+++ b/list.sh
@@ -191,8 +191,7 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
     list_items \
     | list_paginate
     printf '
-    [div #editing
-      [a href="#multitag" Add Tags]'
+    [div #editing'
       w_index || w_tagging
       printf '
     ]

diff --git a/widgets.sh b/widgets.sh
index 446b5d2edfafe6d1078dbcaccb8005db8ff08e56..27f5c5b4957523711fea4ef4b6dd182c17093787 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -148,7 +148,7 @@ w_prefs(){
 
 w_index(){
   [ -d "$_DATA/$ITEM/.index" ] && return 1 || printf '
-  [form #index method="POST" action="?a=spawnindex"
+  [form #index method="POST" action="?a=multitag"
     [hidden "ref" "%s"]
     [label Set up for Index view: ]
     [checkbox "recursive" "yes" #spawn_recursive] [label for=spawn_recursive Include subdirectories]
@@ -225,7 +225,8 @@ w_advsearch(){
 
 w_tagging(){
   local tag category
-  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
+  printf '[a href="#multitag" Add Tags]
+          [div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
   printf '[a href="#" Hide][br]'
 
   printf 'Tags\n%s\n' "$w_tagcategories" \