X-Git-Url: http://git.plutz.net/?p=bookman;a=blobdiff_plain;f=index.cgi;h=4f24149bd8f53024b5903c7e4a1ed37196185b22;hp=12caed196f2da889f783a410cbdcce921618b9c1;hb=104596e3d1aa06eb5cb6108b477e2b379b202537;hpb=408a5fe49cabd0d7c025e86f9fb0053e57385ef3
diff --git a/index.cgi b/index.cgi
index 12caed1..4f24149 100755
--- a/index.cgi
+++ b/index.cgi
@@ -4,9 +4,8 @@ exec 2>>error.log
. 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 '' $@; }
@@ -58,7 +57,7 @@ getFavicon(){
'
)"
- 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"
@@ -94,7 +93,7 @@ BDB="users/${COKID}"
if [ -n "$QRYID" ]; then
printf '%s 303 See Other\r\n' "$SERVER_PROTOCOL"
- printf 'Location: %s\r\n' "${SCRIPT_NAME}"
+ printf 'Location: %s\r\n' "${SCRIPT_NAME}?${QUERY_STRING#id=*&}"
SET_COOKIE +8640000 "id=${QRYID}"
printf '\r\n'
exit 0
@@ -152,6 +151,8 @@ case "$(GET action)" in
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}"
;;
@@ -161,6 +162,8 @@ case "$(GET action)" in
file="${BDB}/${fid}.bm"
if [ "$(POST control)" = confirm -a -n "$name" -a -f "$file" ]; then
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}"
;;
@@ -171,7 +174,8 @@ case "$(GET action)" in
tfile="${BDB}/${target}.bm"
if [ "$(POST control)" = confirm -a -f "$file" ]; then
if [ "$target" = "____________" ] || tail -n+2 "$file" >>"$tfile"; then
- rm -f "$file"
+ rm -f "$file" >&-
+ git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" "${target}.bm" >&-
fi
fi
REDIRECT "${SCRIPT_NAME}#${target}"
@@ -189,6 +193,7 @@ case "$(GET action)" in
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)
@@ -198,7 +203,8 @@ case "$(GET action)" in
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}"
+ printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$url" >>"${file}"
+ git -C "${BDB}" commit -m "New Bookmark: ${name} in ${fid}" -- "${fid}.bm" >&-
fi
getFavicon "$url" "$bid"
REDIRECT "${SCRIPT_NAME}#${fid}"
@@ -209,8 +215,8 @@ case "$(GET action)" in
url="$(POST url |head -n1)"
file="$(grep -lm1 "^${bid}" "${BDB}"/????????????.bm |head -n1)"
if [ -n "$name" -a -n "$url" -a "$(POST control)" = confirm -a -w "$file" ]; then
- bm="$(printf '%s\t%s\t%s' "$bid" "$(HTML "$name")" "$(HTML "$url")" |sed -r 's;[\&\;];\\&;g;')"
- sed -ri "s;^${bid}\t.*$;${bm};" "$file"
+ 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}"
@@ -224,6 +230,8 @@ case "$(GET action)" in
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}"
;;
@@ -234,6 +242,7 @@ case "$(GET action)" in
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}"
;;
@@ -244,9 +253,23 @@ case "$(GET action)" in
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
bookmarkmod(){
@@ -267,7 +290,7 @@ bookmarkmod(){
-
+
@@ -300,14 +323,30 @@ show_bookmarks(){
tail -n+2 "${BDB}/${fid}.bm" \
| while read bid name url; do
- cat <<-EOF
+ if [ "${url%\{@\}*}" = "${url}" ]; then
+ cat <<-EOF
EOF
+ else
+ cat <<-EOF
+
+ EOF
+ fi
done
}
@@ -375,10 +414,15 @@ foldermod(){
show_folders(){
list_folders \
| while read fid fname order; do
- cat <<-EOF
+ file="${BDB}/${fid}.bm"
+ cache="${BDB}/${fid}.cache"
+ if [ "${cache}" -nt "${file}" ]; then
+ cat "$cache"
+ else
+ tee "$cache" <<-EOF
EOF
+ fi
done
}