implemented folder actions, keep secret ID out of address bar
authorpaul <paul@plutz.net>
Tue, 28 Nov 2017 19:35:55 +0000 (19:35 +0000)
committerpaul <paul@plutz.net>
Tue, 28 Nov 2017 19:35:55 +0000 (19:35 +0000)
svn path=/trunk/; revision=8

index.cgi

index 3cf7e29..0c563ea 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -78,10 +78,54 @@ list_folders(){
   | cut -f1,2
 }
 
+order_files(){
+  n=1000
+  list_folders \
+  | while read fid nan; do
+    file="${BDB}/${fid}.bm"
+    sed -ri "1s;^(([^\t]+\t){2})[^\t]+(.*)$;\1${n}\3;;" "$file"
+    n=$((n + 1000))
+  done
+}
 
-QRYID="$(GET    id |checkid)"
 COKID="$(COOKIE id |checkid)"
-BDB="users/${QRYID}"
+QRYID="$(GET    id |checkid)"
+BDB="users/${COKID}"
+
+if [ -n "$QRYID" ]; then
+  printf '%s 303 See Other\r\n' "$SERVER_PROTOCOL"
+  printf 'Location: %s\r\n' "${SCRIPT_NAME}"
+  SET_COOKIE +8640000 "id=${QRYID}"
+  printf '\r\n'
+  exit 0
+elif [ -z "$COKID" -a -z "$QRYID" ]; then
+  printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
+
+  cat <<-EOF
+       <!DOCTYPE HTML>
+       <HTML><head>
+         <title>Bookman - New Collection</title>
+       </head><body id="newcollection">
+         <h1>You have not yet set up a collection on this server.</h1>
+         Click <a href="${SCRIPT_NAME}?action=newid">here</a> to start a new collection.
+       </body></HTML>
+       EOF
+  exit 0
+elif ! [ -d "${BDB}" ]; then
+  printf '%s 404 Not Found\r\n' "$SERVER_PROTOCOL"
+  printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
+
+  cat <<-EOF
+       <!DOCTYPE HTML>
+       <HTML><head>
+         <title>Bookman - 404</title>
+       </head><body id="missingcollection">
+         <h1>The collection you requested does not exist on this server.</h1>
+         Click <a href="${SCRIPT_NAME}?action=newid">here</a> to start a new collection.
+       </body></HTML>
+       EOF
+  exit 0
+fi
 
 case "$(GET action)" in
   newid)
@@ -109,7 +153,7 @@ case "$(GET action)" in
     if [ -n "$name" -a -d "${BDB}" ]; then
       printf '%s\t%s\t%s\n' "$fid" "$(HTML "$name")" "$order" >"${BDB}/${fid}.bm"
     fi
-    REDIRECT "${SCRIPT_NAME}?id=${QRYID}#${fid}"
+    REDIRECT "${SCRIPT_NAME}#${fid}"
     ;;
   modfolder)
     name="$(POST name |head -n1)"
@@ -121,7 +165,34 @@ case "$(GET action)" in
       tail -n+2 "$file" >>"${file%.bm}.tmp"
       mv "${file%.bm}.tmp" "$file"
     fi
-    REDIRECT "${SCRIPT_NAME}?id=${QRYID}#${fid}"
+    REDIRECT "${SCRIPT_NAME}#${fid}"
+    ;;
+  delfolder)
+    fid="$(POST fid | checkid)"
+    target="$(POST target | checkid)"
+    file="${BDB}/${fid}.bm"
+    tfile="${BDB}/${target}.bm"
+    if [ "$(POST control)" = confirm -a -f "$file" ]; then
+      if [ "$target" = "____________" ] || tail -n+2 "$file" >>"$tfile"; then
+        rm -f "$file"
+      fi
+    fi
+    REDIRECT "${SCRIPT_NAME}#${target}"
+    ;;
+  movefolder)
+    fid="$(POST fid | checkid)"
+    target="$(POST target | checkid)"
+    file="${BDB}/${fid}.bm"
+    tfile="${BDB}/${target}.bm"
+    if [ "$target" = "____________" -a -f "$file" -a "$(POST control)" = confirm ]; then
+      read nan1 nan2 last nan3 <"${BDB}/$(list_folders |tail -n1 |cut -f1).bm"
+      sed -ri "1s;^(([^\t]+\t){2})[^\t]+(.*)$;\1$((${last:-0} + 1000))\3;;" "$file"
+    elif [ -f "$tfile" -a -f "$file" -a "$(POST control)" = confirm ]; then
+      read nan1 nan2 tid nan3 <"$tfile"
+      sed -ri "1s;^(([^\t]+\t){2})[^\t]+(.*)$;\1$((${tid:-1} -1))\2;;" "$file"
+      order_files
+    fi
+    REDIRECT "${SCRIPT_NAME}#${fid}"
     ;;
   newbookmark)
     fid="$(POST fid | checkid)"
@@ -133,7 +204,7 @@ case "$(GET action)" in
       printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$(HTML "$url")" >>"${file}"
     fi
     getFavicon "$url" "$bid"
-    REDIRECT "${SCRIPT_NAME}?id=${QRYID}#${fid}"
+    REDIRECT "${SCRIPT_NAME}#${fid}"
     ;;
   modbookmark)
     bid="$(POST bid | checkid)"
@@ -145,45 +216,10 @@ case "$(GET action)" in
       sed -ri "s;^${bid}\t.*$;${bm};" "$file"
     fi
     getFavicon "$url" "$bid"
-    REDIRECT "${SCRIPT_NAME}?id=${QRYID}#${fid}"
+    REDIRECT "${SCRIPT_NAME}#${fid}"
     ;;
 esac
 
-if [ -z "$QRYID" -a -n "$COKID" ]; then
-  REDIRECT "${SCRIPT_NAME}?id=${COKID}"
-elif [ -n "$QRYID" -a -z "$COKID" ]; then
-  SET_COOKIE +8640000 "id=${QRYID}"
-fi
-
-if [ -z "$QRYID" -a -z "$COKID" ]; then
-  printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
-
-  cat <<-EOF
-       <!DOCTYPE HTML>
-       <HTML><head>
-         <title>Bookman - New Collection</title>
-       </head><body id="newcollection">
-         <h1>You have not yet set up a collection on this server.</h1>
-         Click <a href="${SCRIPT_NAME}?action=newid">here</a> to start a new collection.
-       </body></HTML>
-       EOF
-  exit 0
-elif ! [ -d "users/${QRYID}" ]; then
-  printf '%s 404 Not Found\r\n' "$SERVER_PROTOCOL"
-  printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
-
-  cat <<-EOF
-       <!DOCTYPE HTML>
-       <HTML><head>
-         <title>Bookman - 404</title>
-       </head><body id="missingcollection">
-         <h1>The collection you requested does not exist on this server.</h1>
-         Click <a href="${SCRIPT_NAME}?action=newid">here</a> to start a new collection.
-       </body></HTML>
-       EOF
-  exit 0
-fi
-
 list_bookmarks(){
   fid="$1"
   bmodify="$(GET bmodify |checkid)"
@@ -192,7 +228,7 @@ list_bookmarks(){
   | while read bid name url; do
     if [ "${bid}" = "$bmodify" ]; then
       cat <<-EOF
-       <form class="modbookmark" method="POST" action="${SCRIPT_NAME}?id=${QRYID}&action=modbookmark">
+       <form class="modbookmark" method="POST" action="${SCRIPT_NAME}?action=modbookmark">
          <input type="hidden" name="bid" value="${bid}" />
          <input type="text" name="name" value="${name}")" placeholder="Name" />
          <input type="text" name="url"  value="${url}")" placeholder="URL" />
@@ -202,7 +238,7 @@ list_bookmarks(){
     else
       cat <<-EOF
        <div class="bookmark">
-         <a class="modify" href="${SCRIPT_NAME}?id=${QRYID}&bmodify=${bid}">Modify</a>
+         <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
          <a class="link" href="${url}")"><img src="${BDB}/favicons/${bid}.ico"/>${name}</a>
        </div>
        EOF
@@ -218,14 +254,14 @@ foldermod(){
   if [ -n "$fmodify" ]; then
     read fid fname order <"${BDB}/${fmodify}.bm"
     cat <<-EOF
-       <form class="modfolder rename" method="POST" action="${SCRIPT_NAME}?id=${QRYID}&action=modfolder">
+       <form class="modfolder rename" method="POST" action="${SCRIPT_NAME}?action=modfolder">
           <h1>Rename Folder: ${fname}</h1>
          <input type="hidden" name="fid" value="${fid}" />
          <label class="tab">Rename</label>
          <a class="tab"
-           href="${SCRIPT_NAME}?id=${QRYID}&fdelete=${fid}">Delete</a>
+           href="${SCRIPT_NAME}?fdelete=${fid}">Delete</a>
          <a class="tab"
-           href="${SCRIPT_NAME}?id=${QRYID}&fmove=${fid}">Move</a>
+           href="${SCRIPT_NAME}?fmove=${fid}">Move</a>
          <input type="text" name="name" value="${fname}" />
          <button type="submit" name="control" value="confirm">OK</button>
          <button type="submit" name="control" value="cancel">Cancel</button>
@@ -234,17 +270,17 @@ foldermod(){
   elif [ -n "$fdelete" ]; then
     read fid fname order <"${BDB}/${fdelete}.bm"
     cat <<-EOF
-       <form class="modfolder delete" method="POST" action="${SCRIPT_NAME}?id=${QRYID}&action=delfolder">
+       <form class="modfolder delete" method="POST" action="${SCRIPT_NAME}?action=delfolder">
           <h1>Delete Folder: ${fname}</h1>
          <input type="hidden" name="fid" value="${fid}" />
-         <a class="tab" href="${SCRIPT_NAME}?id=${QRYID}&fmodify=${fid}">Rename</a>
+         <a class="tab" href="${SCRIPT_NAME}?fmodify=${fid}">Rename</a>
          <label class="tab">Delete</label>
          <a class="tab"
-           href="${SCRIPT_NAME}?id=${QRYID}&fmove=${fid}">Move</a>
+           href="${SCRIPT_NAME}?fmove=${fid}">Move</a>
          <label>Pass Bookmarks on to:</label>
          <select name="target">
            $(printf '<option value="%s">%s</option>' $(list_folders |grep -v "^${fid}"))
-           <option value="____________">(none)</option>
+           <option value="____________">(discard)</option>
          </select>
          <button type="submit" name="control" value="confirm">OK</button>
          <button type="submit" name="control" value="cancel">Cancel</button>
@@ -253,11 +289,11 @@ foldermod(){
   elif [ -n "$fmove" ]; then
     read fid fname order <"${BDB}/${fmove}.bm"
     cat <<-EOF
-       <form class="modfolder move" method="POST" action="${SCRIPT_NAME}?id=${QRYID}&action=modfolder">
+       <form class="modfolder move" method="POST" action="${SCRIPT_NAME}?action=movefolder">
           <h1>Move Folder: ${fname}</h1>
          <input type="hidden" name="fid" value="${fid}" />
-         <a class="tab" href="${SCRIPT_NAME}?id=${QRYID}&fmodify=${fid}">Rename</a>
-         <a class="tab" href="${SCRIPT_NAME}?id=${QRYID}&fdelete=${fid}">Delete</a>
+         <a class="tab" href="${SCRIPT_NAME}?fmodify=${fid}">Rename</a>
+         <a class="tab" href="${SCRIPT_NAME}?fdelete=${fid}">Delete</a>
          <label class="tab">Move</label>
          <label>Move before folder:</label>
          <select name="target">
@@ -277,9 +313,9 @@ show_folders(){
     cat <<-EOF
        <section class="folder" id="${fid}">
          <h1>${fname}</h1>
-         <a class="modify" href="${SCRIPT_NAME}?id=${QRYID}&fmodify=${fid}">Modify</a>
+         <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify</a>
          $(list_bookmarks "$fid")
-          <form class="newbookmark" method="POST" action="${SCRIPT_NAME}?id=${QRYID}&action=newbookmark">
+          <form class="newbookmark" method="POST" action="${SCRIPT_NAME}?action=newbookmark">
            <input type="hidden" name="fid" value="${fid}" />
            <input type="text" name="name" value="" placeholder="Name" />
            <input type="text" name="url"  value="" placeholder="URL" />
@@ -290,7 +326,9 @@ show_folders(){
   done
 }
 
+SET_COOKIE +8640000 "id=${COKID}"      # Refresh Cookie
 printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
+
 cat <<EOF
 <!DOCTYPE HTML>
 <HTML><head>
@@ -299,7 +337,7 @@ cat <<EOF
 </head><body id="collection">
   $(foldermod)
   $(show_folders)
-  <form class="newfolder" method="POST" action="${SCRIPT_NAME}?id=${QRYID}&action=newfolder">
+  <form class="newfolder" method="POST" action="${SCRIPT_NAME}?action=newfolder">
     <input type="text" name="name" value="" placeholder="New Folder" />
     <button type="submit">New</button>
   </form>