X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=newdate.sh;h=4b220c14c49fa8908b5ea80ee38dfaf2dd4cbb4d;hb=982dbbfd100e35f266b577c248d2046e63a7e270;hp=790d7400ed0027bf1aa6daecf6c3eed719d4ff7d;hpb=447f5c44138c7c71f4ec93068eccc07b3124066b;p=webpoll diff --git a/newdate.sh b/newdate.sh index 790d740..4b220c1 100755 --- 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 @@ -25,11 +43,13 @@ fs_timeofday() { } fs_splittimes() { - local day times time c + local days day times time c + days="$(DBM "$file" get dates)" cat <<-EOF [fieldset .splittimes [checkbox "none" "none" .splittimes checked disabled=disabled] [submit "splittimes" "no" Separate Time Options per Day] - $(for day in $(DBM "$file" get dates); do + $([ ! "$days" ] && printf '[p You have not selected any days yet.]\n') + $(for day in $days; do date -d $day +"[h2 . %A - %B %_d, %Y]" times=$(DBM "$file" get "tod_$day") for time in ${times:--}; do @@ -49,29 +69,23 @@ fs_splittimes() { } 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')" addtime="$(POST addtime)" - [ "$splittimes" ] && DBM "$file" set splittimes "$splittimes" || splittimes="$(DBM "$file" get splittimes || printf no)" + if [ "$splittimes" = yes ]; then + DBM "$file" set splittimes "$splittimes" + splittimes="no" # receive remainder of todall form + elif [ "$splittimes" = no ]; then + DBM "$file" set splittimes "$splittimes" + splittimes="yes" # receive remainder of splittimes form + else + splittimes="$(DBM "$file" get splittimes || printf no)" + fi DBM "$file" set title "$(POST title)" DBM "$file" set description "$(POST description)" - DBM "$file" set dates "$( - for date in $(seq 0 $(POST_COUNT date)); do - [ "$date" -eq 0 ] \ - && POST date_add \ - || POST date "$date" - printf \\n - done \ - | grep -vxF "$(POST date_remove)" \ - | grep -xE '^[0-9]{4}-((01|03|05|07|08|10|12)-([012][0-9]|3[01])|(04|06|09|11)-([012][0-9]|30)|02-[012][0-9])$' \ - | sort -u - )" - # Store common time options "todall" [ "$splittimes" = no ] && DBM "$file" set todall "$( for todcount in $(seq 1 $(POST_COUNT todstart)); do @@ -103,15 +117,34 @@ if [ "$REQUEST_METHOD" = POST ]; then [ "$addtime" = "$date" ] && DBM "$file" append "tod_${date}" "${BR}-" done - if [ "$(POST cancel)" = cancel ]; then - rm -- "$file" - REDIRECT "$_BASE/" + DBM "$file" set dates "$( + for date in $(seq 0 $(POST_COUNT date)); do + [ "$date" -eq 0 ] \ + && POST date_add \ + || POST date "$date" + printf \\n + done \ + | grep -vxF "$(POST date_remove)" \ + | grep -xE '^[0-9]{4}-((01|03|05|07|08|10|12)-([012][0-9]|3[01])|(04|06|09|11)-([012][0-9]|30)|02-[012][0-9])$' \ + | sort -u + )" + + if [ "$(POST delete)" = delete ]; then + if [ "$(POST delconfirm)" -o ! "$(DBM "$file" get participants)" ]; then + rm -- "$file" + REDIRECT "$_BASE/" + else + REDIRECT "$_BASE$PATH_INFO${month:+?month=}${month}#ERROR_NEEDCONFIRM" + fi + 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))) @@ -134,8 +167,21 @@ else [hidden "month" "$month"] ] $([ "$splittimes" = "yes" ] && fs_splittimes || fs_timeofday ) - [submit "cancel" "cancel" Cancel] - [submit "post" "post" Post Event] + $(if [ "$(DBM "$file" get participants)" ]; then + printf '[checkbox "delconfirm" "confirm" id="delconfirm"][label for=delconfirm Delete Poll] + [submit "delete" "delete" Delete Poll] [submit "post" "post" Poll page]' + 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.' \ + "$(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.
[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