X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=newdate.sh;h=d909cbdd23c7edec8feb0ad4959b4fa16ab136a3;hb=e59a6e2a6ebf4dbdd12d03cbd2ef91fd0acaad6d;hp=2efa7485a44a73e715318c3bdf47bc874db5ec83;hpb=22d77b49555ed424e7d9064b06f37b8caa83f914;p=webpoll
diff --git a/newdate.sh b/newdate.sh
index 2efa748..d909cbd 100755
--- a/newdate.sh
+++ b/newdate.sh
@@ -59,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)
@@ -111,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}-"
@@ -156,9 +156,18 @@ else
yield_page "$(pagename "$id")" "newdate" <<-EOF
$(dlist_timeofday)
- [form method=post
+ [main [form method=post
[input name=title value="$(DBM "$file" get title |HTML)" placeholder="Title"]
[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]
@@ -173,15 +182,6 @@ else
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