]> git.plutz.net Git - bookman/blobdiff - index.cgi
projects / bookman / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bookmark creation dialog
[bookman] / index.cgi
diff --git a/index.cgi b/index.cgi
index 98e6719e4f9edbe986d984716c9ac3a146906096..911e5eed684715e6e67cf5413617b33752f831d9 100755 (executable)
--- 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}"
     ;;
@@ -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" >&-
+        git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" >&-
+      elif tail -n+2 "$file" >>"$tfile"; then
+        rm -f "$file" >&-
+        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
+    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)"
@@ -210,6 +226,7 @@ case "$(GET action)" in
     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}"
@@ -223,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}"
     ;;
@@ -233,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}"
     ;;
@@ -243,6 +263,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${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}"
     ;;
@@ -261,6 +282,44 @@ case "$(GET action)" in
     ;;
 esac
 
+bookmarkgen(){
+  fid="$(GET newbm |checkid)"
+  name="$(GET nbmname)"
+  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 \
+            | sed -rn ':X;$bY;N;bX;:Y; s;^.*<title[^>]*>([^<]+)<.*$;\1;p;'
+          )"
+  fi
+
+  if [ -n "$fid" -o -n "$name" -o -n "$url" ]; then
+    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)"
@@ -271,7 +330,7 @@ bookmarkmod(){
        $(grep -m1 "^${bmod}" "$file")
        EOF
     cat <<-EOF
-       <form class="modbookmark" method="POST" action="${SCRIPT_NAME}?action=modbookmark">
+       <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>
@@ -290,7 +349,7 @@ bookmarkmod(){
        $(grep -m1 "^${bmove}" "$file")
        EOF
     cat <<-EOF
-       <form class="modbookmark" method="POST" action="${SCRIPT_NAME}?action=movebookmark">
+       <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>
@@ -316,9 +375,11 @@ show_bookmarks(){
       cat <<-EOF
        <div class="bookmark">
          <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
-         <a class="link" target="_blank" href="$(HTML "${url}")")"><img src="${BDB}/favicons/${bid}.ico"/>${name}</a>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">move left</a>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">move right</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
@@ -327,9 +388,10 @@ show_bookmarks(){
          <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
          <input type="hidden" name="fid" value="$fid" />
          <input type="hidden" name="bid" value="$bid" />
-         <img src="${BDB}/favicons/${bid}.ico"/><input name="query" placeholder="$name"/>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">move left</a>
-         <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">move right</a>
+         <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
@@ -344,7 +406,7 @@ foldermod(){
   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>
@@ -360,7 +422,7 @@ foldermod(){
   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>
@@ -379,7 +441,7 @@ foldermod(){
   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>
@@ -402,20 +464,15 @@ show_folders(){
   | while read fid fname order; do
     file="${BDB}/${fid}.bm"
     cache="${BDB}/${fid}.cache"
-    if [ "${cache}" -nt "${file}" ]; then
+    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>
+         <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify folder "${fname}"</a>
          $(show_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="new bookmark" href="${SCRIPT_NAME}?newbm=${fid}">New Bookmark</a>
        </section>
        EOF
     fi
@@ -433,6 +490,7 @@ cat <<EOF
 </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" />
Web based bookmark manager with multi user support.