. shcgi/cgilite.sh
mkdir -p users
-#env >>debug
-printf 'POST: %s\n' "$cgilite_post" >>debug
-printf 'action: %s\n' "$(GET action)" >>debug
+# printf 'POST: %s\n' "$cgilite_post" >>debug
+# printf 'action: %s\n' "$(GET action)" >>debug
wget="$(which wget)"
wget(){ "$wget" -T 5 -t 1 -q -U '' $@; }
'
)"
- printf 'Shortcut icon for %s is %s\n' "$url" "$favinfo" >>debug
+ # printf 'Shortcut icon for %s is %s\n' "$url" "$favinfo" >>debug
[ -z "$favinfo" ] && favinfo="${ubase}/favicon.ico"
case "$favinfo" in
http://*|https://*|//*) wget -O "$file" "$favinfo"
BDB="users/${COKID}"
if [ -n "$QRYID" ]; then
- printf '%s 303 See Other\r\n' "$SERVER_PROTOCOL"
- printf 'Location: %s\r\n' "${SCRIPT_NAME}"
+ 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
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>
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>
{ 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'
order="$(((order + 1000) / 1000 * 1000))"
if [ -n "$name" -a -d "${BDB}" ]; then
printf '%s\t%s\t%s\n' "$fid" "$(HTML "$name")" "$order" >"${BDB}/${fid}.bm"
+ git -C "${BDB}" add "${fid}.bm" >&-
+ git -C "${BDB}" commit -m "New bookmark folder: ${name} (${fid})" -- "${fid}.bm" >&-
fi
REDIRECT "${SCRIPT_NAME}#${fid}"
;;
fid="$(POST fid | checkid)"
file="${BDB}/${fid}.bm"
if [ "$(POST control)" = confirm -a -n "$name" -a -f "$file" ]; then
- order="$(head -n1 "$file" |cut -f3 || printf 1000)"
- printf '%s\t%s\t%s\n' "$fid" "$(HTML "$name")" "$order" >"${file%.bm}.tmp"
- tail -n+2 "$file" >>"${file%.bm}.tmp"
- mv "${file%.bm}.tmp" "$file"
+ sed -ri "1s'^(${fid}\t)[^\t]+(\t.+)$'\1${name}\2';" "$file"
+ git -C "${BDB}" add "${fid}.bm" >&-
+ git -C "${BDB}" commit -m "Renamed folder ${fid} to '${name}'" -- "${fid}.bm" >&-
fi
REDIRECT "${SCRIPT_NAME}#${fid}"
;;
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"
+ if [ "$target" = "____________" ]; then
+ 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" "${file%.bm}.cache" >&-
+ git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" "${target}.bm" >&-
fi
fi
REDIRECT "${SCRIPT_NAME}#${target}"
sed -ri "1s;^(([^\t]+\t){2})[^\t]+(.*)$;\1$((${tid:-1} -1))\2;;" "$file"
order_files
fi
+ git -C "${BDB}" commit -a -m "Modified folder order (moved ${fid})" >&-
REDIRECT "${SCRIPT_NAME}#${fid}"
;;
newbookmark)
url="$(POST url |head -n1)"
file="${BDB}/${fid}.bm"
bid="$(timeid)"
- if [ -n "$name" -a -f "${file}" ]; then
- printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$(HTML "$url")" >>"${file}"
+ ctl="$(POST control)"
+ [ "$url" = "${url#*://}" ] && url="http://$url"
+
+ if [ -n "$name" -a -n "$url" -a -f "${file}" -a "$ctl" = "confirm" ]; then
+ printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$url" >>"${file}"
+ git -C "${BDB}" commit -m "New Bookmark: ${name} in ${fid}" -- "${fid}.bm" >&-
+ getFavicon "$url" "$bid"
+ REDIRECT "${SCRIPT_NAME}#${fid}"
+ elif [ "$ctl" = "confirm" ]; then
+ REDIRECT "${SCRIPT_NAME}?newbm=${fid}&nbmurl=${url}&nbmname=${name}"
+ else
+ REDIRECT "${SCRIPT_NAME}#${fid}"
fi
- getFavicon "$url" "$bid"
- REDIRECT "${SCRIPT_NAME}#${fid}"
;;
modbookmark)
bid="$(POST bid | checkid)"
name="$(POST name |head -n1)"
url="$(POST url |head -n1)"
- file="$(grep -lE "^${bid}" "${BDB}"/????????????.bm)"
- if [ -w "$file" -a -n "$name" -a -n "$url" ]; then
- bm="$(printf '%s\t%s\t%s' "$bid" "$(HTML "$name")" "$(HTML "$url")" |sed -r 's;[\&\;];\\&;g;')"
- sed -ri "s;^${bid}\t.*$;${bm};" "$file"
+ file="$(grep -lm1 "^${bid}" "${BDB}"/????????????.bm |head -n1)"
+ if [ -n "$name" -a -n "$url" -a "$(POST control)" = confirm -a -w "$file" ]; then
+ sed -rni "/^${bid}\t/!p; /^${bid}\t/i${bid}\t$(HTML "$name")\t${url}" "$file"
+ git -C "${BDB}" commit -m "Modified Bookmark: ${name} (${bid}) in ${file##*/}" -- "${file##*/}" >&-
fi
getFavicon "$url" "$bid"
REDIRECT "${SCRIPT_NAME}#${fid}"
;;
+ movebookmark)
+ bid="$(POST bid | checkid)"
+ fid="$(POST target | checkid)"
+ sfile="$(grep -lm1 "^${bid}" "${BDB}"/????????????.bm |head -n1)"
+ tfile="${BDB}/${fid}.bm"
+
+ if [ "$(POST control)" = confirm -a -n "$bid" -a -w "$sfile" -a -w "$tfile" ]; then
+ grep -m1 "^${bid}" "$sfile" >>"$tfile" \
+ && sed -ri "0,/^${bid}/{/^${bid}/d;}" "$sfile"
+ git -C "${BDB}" commit -m "Moved Bookmark ${bid} from ${sfile##*/} to ${tfile##*/}" \
+ -- "${sfile##*/}" "${tfile##*/}" >&-
+ fi
+ REDIRECT "${SCRIPT_NAME}#${fid}"
+ ;;
+ bmup)
+ fid="$(GET fid |checkid)"
+ bid="$(GET bid |checkid)"
+ file="${BDB}/${fid}.bm"
+
+ if [ -n "$bid" -a -n "$fid" ] && grep -q "^${bid}" "$file"; then
+ sed -ri ":X;\$bY;N;bX;:Y; s;(\n[^\n]+)(\n${bid}\t[^\n]+);\2\1;;" "$file"
+ git -C "${BDB}" commit -m "Modified bookmark order in ${fid} (raised ${bid})" -- "${fid}.bm" >&-
+ fi
+ REDIRECT "${SCRIPT_NAME}#${fid}"
+ ;;
+ bmdn)
+ fid="$(GET fid |checkid)"
+ bid="$(GET bid |checkid)"
+ file="${BDB}/${fid}.bm"
+
+ if [ -n "$bid" -a -n "$fid" ] && grep -q "^${bid}" "$file"; then
+ sed -ri ":X;\$bY;N;bX;:Y; s;(\n${bid}\t[^\n]+)(\n[^\n]+);\2\1;;" "$file"
+ git -C "${BDB}" commit -m "Modified bookmark order in ${fid} (lowered ${bid})" -- "${fid}.bm" >&-
+ fi
+ REDIRECT "${SCRIPT_NAME}#${fid}"
+ ;;
+ query)
+ fid="$(POST fid |checkid)"
+ bid="$(POST bid |checkid)"
+ file="${BDB}/${fid}.bm"
+ query="$(URL "$(POST query)")"
+
+
+ url="$(grep -m1 "^${bid}" "$file" |cut -f3-)"
+ urlpfx="${url%\{@\}*}"
+ urlsfx="${url#*\{@\}}"
+
+ REDIRECT "${urlpfx}${query}${urlsfx}"
+ ;;
esac
-list_bookmarks(){
+bookmarkgen(){
+ fid="$(GET newbm |checkid)"
+ name="$(GET nbmname)"
+ url="$(GET nbmurl)"
+ file="${BDB}/${fid}.bm"
+
+ if [ -z "$name" -a -n "$url" ]; then
+ name="$(wget -O- "$url" \
+ | head -c4096 \
+ | sed -rn ':X;$bY;N;bX;:Y; s;^.*<title[^>]*>([^<]+)<.*$;\1;p;'
+ )"
+ 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>
+ <label>Folder:</label>
+ <select name="fid">
+ $(list_folders |while read id n; do
+ [ "$id" = "$fid" ] \
+ && printf '<option value="%s" selected="selected">%s</option>' "$id" "$n" \
+ || printf '<option value="%s">%s</option>' "$id" "$n"
+ done)
+ $(printf '<option value="%s">%s</option>' $(list_folders))
+ </select>
+ <label>Name:</label>
+ <input type="text" name="name" value="$(HTML ${name})")" placeholder="Name" />
+ <label>URL:</label>
+ <input type="text" name="url" value="$(HTML "${url}")")" placeholder="URL" />
+ <button type="submit" name="control" value="confirm">OK</button>
+ <button type="submit" name="control" value="cancel">Cancel</button>
+ </form>
+ EOF
+ fi
+}
+
+bookmarkmod(){
+ bmod="$(GET bmodify |checkid)"
+ bmove="$(GET bmove |checkid)"
+
+ if [ -n "$bmod" ]; then
+ file="$(grep -lm1 "^${bmod}" "${BDB}/"????????????.bm |head -n1)"
+ read bid name url <<-EOF
+ $(grep -m1 "^${bmod}" "$file")
+ EOF
+ cat <<-EOF
+ <form class="dialog modbookmark" method="POST" action="${SCRIPT_NAME}?action=modbookmark">
+ <input type="hidden" name="bid" value="${bid}" />
+ <h1>Modify: ${name}</h1>
+ <label class="tab">Modify</label>
+ <a class="tab" href="${SCRIPT_NAME}?bmove=${bid}">Move</a>
+ <label>Name:</label>
+ <input type="text" name="name" value="${name}")" placeholder="Name" />
+ <label>URL:</label>
+ <input type="text" name="url" value="$(HTML "${url}")")" placeholder="URL" />
+ <button type="submit" name="control" value="confirm">OK</button>
+ <button type="submit" name="control" value="cancel">Cancel</button>
+ </form>
+ EOF
+ elif [ -n "$bmove" ]; then
+ file="$(grep -lm1 "^${bmove}" "${BDB}/"????????????.bm |head -n1)"
+ read bid name url <<-EOF
+ $(grep -m1 "^${bmove}" "$file")
+ EOF
+ cat <<-EOF
+ <form class="dialog modbookmark" method="POST" action="${SCRIPT_NAME}?action=movebookmark">
+ <input type="hidden" name="bid" value="${bid}" />
+ <h1>Move: ${name}</h1>
+ <a class="tab" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
+ <label class="tab">Move</label>
+ <label>Move to Folder:</label>
+ <select name="target">
+ $(printf '<option value="%s">%s</option>' $(list_folders))
+ </select>
+ <button type="submit" name="control" value="confirm">OK</button>
+ <button type="submit" name="control" value="cancel">Cancel</button>
+ </form>
+ EOF
+ fi
+}
+
+show_bookmarks(){
fid="$1"
bmodify="$(GET bmodify |checkid)"
tail -n+2 "${BDB}/${fid}.bm" \
| while read bid name url; do
- if [ "${bid}" = "$bmodify" ]; then
+ if [ "${url%\{@\}*}" = "${url}" ]; then
cat <<-EOF
- <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" />
- <button type="submit">Modify</button>
- </form>
+ <div class="bookmark">
+ <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
+ <a class="link" target="_blank" href="$(HTML "${url}")")">
+ <img alt="@" src="${BDB}/favicons/${bid}.ico"/>${name}
+ </a>
+ <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">Move up</a>
+ <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">Move down</a>
+ </div>
EOF
else
cat <<-EOF
- <div class="bookmark">
+ <form class="bookmark" target="_blank" method="POST" action="${SCRIPT_NAME}?action=query">
<a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
- <a class="link" href="${url}")"><img src="${BDB}/favicons/${bid}.ico"/>${name}</a>
- </div>
+ <input type="hidden" name="fid" value="$fid" />
+ <input type="hidden" name="bid" value="$bid" />
+ <img alt="${name}" src="${BDB}/favicons/${bid}.ico"/>
+ <input name="query" placeholder="$name"/>
+ <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">Move up</a>
+ <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">Move down</a>
+ </form>
EOF
fi
done
if [ -n "$fmodify" ]; then
read fid fname order <"${BDB}/${fmodify}.bm"
cat <<-EOF
- <form class="modfolder rename" method="POST" action="${SCRIPT_NAME}?action=modfolder">
+ <form class="dialog 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>
elif [ -n "$fdelete" ]; then
read fid fname order <"${BDB}/${fdelete}.bm"
cat <<-EOF
- <form class="modfolder delete" method="POST" action="${SCRIPT_NAME}?action=delfolder">
+ <form class="dialog 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}?fmodify=${fid}">Rename</a>
elif [ -n "$fmove" ]; then
read fid fname order <"${BDB}/${fmove}.bm"
cat <<-EOF
- <form class="modfolder move" method="POST" action="${SCRIPT_NAME}?action=movefolder">
+ <form class="dialog 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}?fmodify=${fid}">Rename</a>
show_folders(){
list_folders \
| while read fid fname order; do
- cat <<-EOF
+ file="${BDB}/${fid}.bm"
+ cache="${BDB}/${fid}.cache"
+ if [ "${cache}" -nt "${file}" -a "${cache}" -nt "$0" ]; then
+ cat "$cache"
+ else
+ tee "$cache" <<-EOF
<section class="folder" id="${fid}">
<h1>${fname}</h1>
- <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify</a>
- $(list_bookmarks "$fid")
- <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" />
- <button type="submit">New Bookmark</button>
- </form>
+ <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify folder "${fname}"</a>
+ $(show_bookmarks "$fid")
+ <a class="new bookmark" href="${SCRIPT_NAME}?newbm=${fid}">New Bookmark</a>
</section>
EOF
+ fi
done
}
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">
$(foldermod)
+ $(bookmarkmod)
+ $(bookmarkgen)
$(show_folders)
<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>
+ <footer>
+ <a href="${SCRIPT_NAME}?id=${COKID}">Permalink for this Collection</a>
+ </footer>
</body></HTML>
EOF
projects / bookman / blobdiff