X-Git-Url: http://git.plutz.net/?p=bookman;a=blobdiff_plain;f=index.cgi;h=e28675cfe31496ac70c03729446f689a892e14a1;hp=12caed196f2da889f783a410cbdcce921618b9c1;hb=ee45a65869f9a77232980c05c2ceb17238149f84;hpb=408a5fe49cabd0d7c025e86f9fb0053e57385ef3;ds=sidebyside diff --git a/index.cgi b/index.cgi index 12caed1..e28675c 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" @@ -93,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}" + 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 @@ -112,7 +111,7 @@ 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 @@ -133,7 +132,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' @@ -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}" ;; @@ -170,8 +173,12 @@ case "$(GET action)" in 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}" @@ -189,6 +196,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) @@ -197,11 +205,19 @@ case "$(GET action)" in 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)" @@ -209,8 +225,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 +240,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 +252,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,11 +263,63 @@ 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 +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;^.*