Fix: proper shorthand-escape for display of admin link

[webpoll] / newdate.sh

diff --git a/newdate.sh b/newdate.sh
index 9c5a1e71cb9dd654c55cc2642eb46f5ae8963035..4b220c14c49fa8908b5ea80ee38dfaf2dd4cbb4d 100755 (executable)
--- a/newdate.sh
+++ b/newdate.sh
@@ -1,5 +1,23 @@
 #!/bin/sh
 
+id="${PATH_INFO%/*}"; id="${id#/}"
+admin=${PATH_INFO##*/}
+file="$_DATA/$id"
+
+if [ "$(DBM "$file" get adminkey)" != "$admin" ]; then
+  page_home;
+  return 0
+  # REDIRECT "$_BASE/#ERRO_INVALIDKEY"
+elif expr match "$bookmarks" ".*${id}/${admin}.*" >/dev/null; then
+  :
+elif expr match "$bookmarks" ".*${id}.*" >/dev/null; then
+  bookmarks="$(printf %s "$bookmarks" |tr \  \\n |grep -vxF "${id}")"
+  bookmarks="$(printf %s "$bookmarks" |tr \\n \ )"
+  SET_COOKIE +$((182 * 86400)) bookmarks="${bookmarks}${bookmarks:+ }${id}/${admin}" Path="${_BASE}/"
+elif [ "$bookmarks" ]; then
+  SET_COOKIE +$((182 * 86400)) bookmarks="${bookmarks} ${id}/${admin}" Path="${_BASE}/"
+fi
+
 fs_timeofday() {
   local todall="$(DBM "$file" get todall)" time c=0
   cat <<-EOF
@@ -50,22 +68,6 @@ fs_splittimes() {
        EOF
 }
 
-id="${PATH_INFO%/*}"; id="${id#/}"
-admin=${PATH_INFO##*/}
-file="$_DATA/$id"
-
-if [ "$(DBM "$file" get adminkey)" != "$admin" ]; then
-  REDIRECT "$_BASE/#ERRO_INVALIDKEY"
-elif expr match "$bookmarks" ".*${id}/${admin}.*" >/dev/null; then
-  :
-elif expr match "$bookmarks" ".*${id}.*" >/dev/null; then
-  bookmarks="$(printf %s "$bookmarks" |tr \  \\n |grep -vxF "${id}")"
-  bookmarks="$(printf %s "$bookmarks" |tr \\n \ )"
-  SET_COOKIE +$((182 * 86400)) bookmarks="${bookmarks}${bookmarks:+ }${id}/${admin}" Path="${_BASE}/"
-elif [ "$bookmarks" ]; then
-  SET_COOKIE +$((182 * 86400)) bookmarks="${bookmarks} ${id}/${admin}" Path="${_BASE}/"
-fi
-
 if [ "$REQUEST_METHOD" = POST ]; then
   month="$(POST month |grep -m 1 -xE '[0-9]{4}-(0[1-9]|1[012])')"
   todremove="$(POST todremove |grep -m 1 -xE '[0-9]+')"
@@ -172,11 +174,11 @@ else
            printf '[submit "delete" "delete" Cancel] [submit "post" "post" Post Event]'
          fi)
          $(if [ "$bookmarks" ]; then
-           printf '[section .bookmark This admin page is accessible via the link [a href="%s" %s]. You must copy this link and keep it safe, so you can modify this poll later! The poll has also been bookmarked and will be listed on the front page.' \
+           printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! The poll has also been bookmarked and will be listed on the front page.' \
            "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
            "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
           else
-           printf '[section .bookmark This admin page is accessible via the link [a href="%s" %s]. You must copy this link and keep it safe, so you can modify this poll later! You can also set a Cookie to bookmark all polls you visit, including this admin page. Bookmarked polls will be listed on the frontpage.<br/> [submit "bookmark" "add" Set Cookie]]' \
+           printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! You can also set a Cookie to bookmark all polls you visit, including this admin page. Bookmarked polls will be listed on the frontpage.<br/> [submit "bookmark" "add" Set Cookie]]' \
            "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
            "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
          fi)