optional bookmarking of poll and admin pages

[webpoll] / newdate.sh

diff --git a/newdate.sh b/newdate.sh
index b2e35a6b5144c94b602640628a86897cdacc8c5a..e2902e471256cd1dd42e0fd385de94efc7d6c6e6 100755 (executable)
--- a/newdate.sh
+++ b/newdate.sh
@@ -50,9 +50,23 @@ 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
-  id="${PATH_INFO%/newdate}"; id="${id#/}"
-  file="$_DATA/$id"
   month="$(POST month |grep -m 1 -xE '[0-9]{4}-(0[1-9]|1[012])')"
   todremove="$(POST todremove |grep -m 1 -xE '[0-9]+')"
   splittimes="$(POST splittimes |grep -m 1 -xE 'yes|no')"
@@ -118,12 +132,13 @@ if [ "$REQUEST_METHOD" = POST ]; then
     REDIRECT "$_BASE/"
   elif [ "$(POST post)" = post ]; then
     REDIRECT "$_BASE${PATH_INFO%/*}"
+  elif [ "$(POST bookmark)" -a ! "$bookmarks" ]; then
+    SET_COOKIE +$((182 * 86400)) bookmarks="${id}/${admin}" Path="${_BASE}/"
+    REDIRECT "$_BASE$PATH_INFO${month:+?month=}${month}"
   else
     REDIRECT "$_BASE$PATH_INFO${month:+?month=}${month}"
   fi
 else
-  id="${PATH_INFO%/newdate}"; id="${id#/}"
-  file="$_DATA/$id"
   month="$(GET month |grep -m1 -xE '[0-9]{4}-(0[1-9]|1[012])' || date +%Y-%m)"
   Y="${month%-*}"; m="${month#*-}"; Y=${Y#0}; m=${m#0};
   [ "$m" = 1 ] && prev=$(printf '%04i-%02i' $((Y - 1)) 12) || prev=$(printf '%04i-%02i' $Y $((m - 1)))
@@ -148,6 +163,15 @@ else
          $([ "$splittimes" = "yes" ] && fs_splittimes || fs_timeofday )
          [submit "cancel" "cancel" Cancel]
          [submit "post" "post" Post Event]
+         $(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.' \
+           "$(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]]' \
+           "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
+           "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
+         fi)
        ]
        EOF
 fi