X-Git-Url: http://git.plutz.net/?p=bookman;a=blobdiff_plain;f=index.cgi;h=e96c9f01e750c7c323a8b7d031177918f6c96e7f;hp=911e5eed684715e6e67cf5413617b33752f831d9;hb=23174101e3fa987e895755e988bb4832d89ed125;hpb=28ce309347435c1dd23beab8104d36cbe640d2dd
diff --git a/index.cgi b/index.cgi
index 911e5ee..e96c9f0 100755
--- 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
+
Bookman - New Collection
You have not yet set up a collection on this server.
@@ -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
+
Bookman - 404
The collection you requested does not exist on this server.
@@ -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
+
EOF