make "new folder" button visible again

[bookman] / index.cgi
diff --git a/index.cgi b/index.cgi

index 911e5eed684715e6e67cf5413617b33752f831d9..e96c9f01e750c7c323a8b7d031177918f6c96e7f 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -92,8 +92,8 @@ 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}?${QUERY_STRING#id=*&}"
+  printf 'Status: 303 See Other\r\n'
+  printf 'Location: %s\r\n' "${SCRIPT_NAME}?${QUERY_STRING#id=????????????}"
    SET_COOKIE +8640000 "id=${QRYID}"
    printf '\r\n'
    exit 0
@@ -103,6 +103,7 @@ elif [ -z "$COKID" -a -z "$QRYID" ]; then
    cat <<-EOF
         <!DOCTYPE HTML>
         <HTML><head>
+         <meta name="viewport" content="width=device-width" />
           <title>Bookman - New Collection</title>
         </head><body id="newcollection">
           <h1>You have not yet set up a collection on this server.</h1>
@@ -111,12 +112,13 @@ elif [ -z "$COKID" -a -z "$QRYID" ]; then
         EOF
    exit 0
  elif ! [ -d "${BDB}" ]; then
-  printf '%s 404 Not Found\r\n' "$SERVER_PROTOCOL"
+  printf 'Status: 404 Not Found\r\n'
    printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
  
    cat <<-EOF
         <!DOCTYPE HTML>
         <HTML><head>
+         <meta name="viewport" content="width=device-width" />
           <title>Bookman - 404</title>
         </head><body id="missingcollection">
           <h1>The collection you requested does not exist on this server.</h1>
@@ -132,7 +134,7 @@ case "$(GET action)" in
  
      { git init "users/${NEWID}" || mkdir -p "users/${NEWID}"; } >&-
  
-    printf '%s 303 See Other\r\n' "$SERVER_PROTOCOL"
+    printf 'Status: 303 See Other\r\n'
      printf 'Location: %s\r\n' "${SCRIPT_NAME}?id=${NEWID}"
      SET_COOKIE +8640000 "id=${NEWID}"
      printf '\r\n'
@@ -174,10 +176,10 @@ case "$(GET action)" in
      tfile="${BDB}/${target}.bm"
      if [ "$(POST control)" = confirm -a -f "$file" ]; then
        if [ "$target" = "____________" ]; then
-        rm -f "$file" >&-
+        rm -f "$file" "${file%.bm}.cache" >&-
          git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" >&-
        elif tail -n+2 "$file" >>"$tfile"; then
-        rm -f "$file" >&-
+        rm -f "$file" "${file%.bm}.cache" >&-
          git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" "${target}.bm" >&-
        fi
      fi
@@ -288,7 +290,6 @@ bookmarkgen(){
    url="$(GET nbmurl)"
    file="${BDB}/${fid}.bm"
  
-  [ "$url" = "${url#*://}" ] && url="http://$url"
    if [ -z "$name" -a -n "$url" ]; then
      name="$(wget -O- "$url" \
              | head -c4096 \
@@ -297,6 +298,7 @@ bookmarkgen(){
    fi
  
    if [ -n "$fid" -o -n "$name" -o -n "$url" ]; then
+    [ "$url" = "${url#*://}" ] && url="http://$url"
      cat <<-EOF
         <form class="dialog newbookmark" method="POST" action="${SCRIPT_NAME}?action=newbookmark">
            <h1>New Bookmark</h1>
@@ -485,6 +487,7 @@ printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
  cat <<EOF
  <!DOCTYPE HTML>
  <HTML><head>
+  <meta name="viewport" content="width=device-width" />
    <title>Bookman - Your Collection</title>
    <link rel="stylesheet" type="text/css" href="bookmarks.css" />
  </head><body id="collection">
@@ -496,6 +499,9 @@ cat <<EOF
      <input type="text" name="name" value="" placeholder="New Folder" />
      <button type="submit">New</button>
    </form>
+  <footer>
+    <a href="${SCRIPT_NAME}?id=${COKID}">Permalink for this Collection</a>
+  </footer>
  </body></HTML>
  EOF