X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=newdate.sh;h=83e27b64cb8c21cd0022db779463d2fb4363d2ba;hb=HEAD;hp=32533b8090b17dce35e21e194134e836e437a1bb;hpb=36247cc4c321b0f3b884a673428598a6c8818d27;p=webpoll
diff --git a/newdate.sh b/newdate.sh
index 32533b8..83e27b6 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
@@ -39,8 +59,8 @@ fs_splittimes() {
pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
- [submit "todremove" "%i" -]
- ' "$day" "${time%-*}" "$day" "${time#*-}" "${c}"
+ [submit "todremove_%s" "%i" -]
+ ' "$day" "${time%-*}" "$day" "${time#*-}" "$day" "${c}"
done
printf '[submit "addtime" "%s" + Add Time Option]' "$day"
done)
@@ -49,8 +69,6 @@ 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')"
@@ -93,7 +111,7 @@ if [ "$REQUEST_METHOD" = POST ]; then
[ "${todstart%:??}" -lt "${todend%:??}" -o "${todstart%:??}" -eq "${todend%:??}" -a "${todstart#*:}" -lt "${todend#*:}" ] \
2>&- \
&& { printf '%02i:%02i-%02i:%02i\n' "${todstart%:??}" "${todstart#*:}" "${todend%:??}" "${todend#*:}"; }\
- || { [ "${todstart%:??}" -ge 0 -a "${todstart#*:}" -ge 0 ] 2>&- && printf '%02i:%02i-\n' "${todstart%:??}" "${todstart#*:}"; }
+ || { [ "${todstart%:??}" -ge 0 -a "${todstart#*:}" -ge 0 ] 2>&- && printf '%02i:%02i-\n' $(dec ${todstart%:??} ${todstart#*:}); }
done |grep -xE '^([01][0-9]|2[0-3]):([0-5][0-9])-(([01][0-9]|2[0-3]):([0-5][0-9]))?$' |sort -u
)"
[ "$addtime" = "$date" ] && DBM "$file" append "tod_${date}" "${BR}-"
@@ -111,15 +129,22 @@ if [ "$REQUEST_METHOD" = POST ]; then
| sort -u
)"
- if [ "$(POST cancel)" = cancel ]; then
- rm -- "$file"
- REDIRECT "$_BASE/"
+ 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)))
@@ -131,9 +156,18 @@ else
yield_page "$(pagename "$id")" "newdate" <<-EOF
$(dlist_timeofday)
- [form method=post
- [input name=title value="$(DBM "$file" get title |HTML)" placeholder="Title"]
+ [main [form method=post
+ [input name=title value="$(DBM "$file" get title |HTML)" placeholder="Title" autocomplete=off]
[textarea name=description placeholder="Description" . $(DBM "$file" get description |HTML)]
+ $(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)
[fieldset .date
$(printf '[hidden "date" "%s"]' $additional)
[submit "month" "$prev" Previous Month]
@@ -142,8 +176,12 @@ 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)
+ ]]
EOF
fi