X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=newdate.sh;h=83e27b64cb8c21cd0022db779463d2fb4363d2ba;hb=HEAD;hp=f486ebb86a24458dc33bb52d1751aef40504fd38;hpb=3fdd2a599459588ed9054c16ce20b79d27faa353;p=webpoll

diff --git a/newdate.sh b/newdate.sh
index f486ebb..83e27b6 100755
--- a/newdate.sh
+++ b/newdate.sh
@@ -1,21 +1,93 @@
 #!/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
+	[fieldset .timeofday
+	  [label .todstart Start Time (optional):
+	  ]
+	  [label .todend   End Time (optional):
+	  ]
+	  $(for time in ${todall:--}; do
+	    c=$((c + 1))
+	    printf '
+	      <input name="todstart" value="%s" placeholder="HH:MM" list="dlist_timeofday"
+	             pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
+	      <input name="todend"   value="%s" placeholder="HH:MM"   list="dlist_timeofday"
+	             pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
+	      [submit "todremove" "%i" -]
+	    ' "${time%-*}" "${time#*-}" "${c}"
+	  done)
+	  [submit "addtime" "global" + Add Time Option]
+	  [checkbox "none" "none" .splittimes disabled=disabled] [submit "splittimes" "yes" Separate Time Options per Day]
+	]
+	EOF
+}
+
+fs_splittimes() {
+  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]
+	  $([ ! "$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
+	      c=$((c + 1))
+	      printf '
+	        <input name="todstart_%s" value="%s" placeholder="HH:MM" list="dlist_timeofday"
+	               pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
+	        <input name="todend_%s"   value="%s" placeholder="HH:MM"   list="dlist_timeofday"
+	               pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
+	        [submit "todremove_%s" "%i" -]
+	      ' "$day" "${time%-*}" "$day" "${time#*-}" "$day" "${c}"
+	    done
+	    printf '[submit "addtime" "%s" + Add Time Option]' "$day"
+	  done)
+	]
+	EOF
+}
+
 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)"
+
+  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 1 $(POST_COUNT date)); do
-      POST date "$date"
-      printf \\n
-    done \
-    | 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
-  )"
-  DBM "$file" set todall "$(
+  # Store common time options "todall"
+  [ "$splittimes" = no ] && DBM "$file" set todall "$(
     for todcount in $(seq 1 $(POST_COUNT todstart)); do
       [ "$todremove" -eq "$todcount" ] 2>&- && continue;
       todstart="$(POST todstart "$todcount")"
@@ -26,20 +98,53 @@ if [ "$REQUEST_METHOD" = POST ]; then
       || { [ "${todstart%:??}" -ge 0 -a  "${todstart#*:}" -ge 0 ] 2>&- && printf '%02i:%02i-\n' "${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
   )"
-  if [ "$(POST cancel)" = cancel ]; then
-    rm -- "$file"
-    REDIRECT "$_BASE/"
-  elif [ "$(POST addtime)" = global ]; then
-    DBM "$file" append todall "${BR}-"
+  [ "$addtime" = global ] && DBM "$file" append todall "${BR}-"
+
+  # Store per-date time options "tod_YYYY-mm-dd"
+  [ "$splittimes" = yes ] && for date in $(DBM "$file" get dates); do
+    todremove="$(POST todremove_$date |grep -m 1 -xE '[0-9]+')"
+    DBM "$file" set "tod_$date" "$(
+      for todcount in $(seq 1 $(POST_COUNT "todstart_${date}")); do
+        [ "$todremove" -eq "$todcount" ] 2>&- && continue;
+        todstart="$(POST "todstart_${date}" "$todcount")"
+        todend="$(POST "todend_${date}" "$todcount")"
+        [ "${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' $(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}-"
+  done
+
+  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}"
-  elif [ "$month" ]; then
-    REDIRECT "$_BASE$PATH_INFO?month=$month"
   else
-    REDIRECT "$_BASE$PATH_INFO"
+    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)))
@@ -47,39 +152,36 @@ else
   dates="$(DBM "$file" get dates)"
   days="$(printf %s "$dates" |sed -E "/^${month}-/!d; s;^.*-([0-9]{2})$;\1;g")"
   additional="$(printf %s "$dates" |sed -E "/^${month}-/d;")"
-  todall="$(DBM "$file" get todall)"
+  splittimes="$(DBM "$file" get splittimes || printf no)"
 
   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.<br/> [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]
-	    $(w_month multiple date "$month" $days)
+	    $([ "$splittimes" = yes ] && w_month submit date "$month" $days || w_month multiple date "$month" $days)
 	    [submit "month" "$next" Next Month]
 	    [hidden "month" "$month"]
 	  ]
-	  [fieldset .timeofday
-	    [label .todstart Start Time (optional):
-	    ]
-	    [label .todend   End Time (optional):
-	    ]
-	    $(c=0; for time in ${todall:--}; do
-	      c=$((c + 1))
-	      printf '
-	        <input name="todstart" value="%s" placeholder="HH:MM" list="dlist_timeofday"
-                       pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
-	        <input name="todend"   value="%s" placeholder="HH:MM"   list="dlist_timeofday"
-                       pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
-	        [submit "todremove" "%i" -]
-	      ' "${time%-*}" "${time#*-}" "${c}"
-	    done)
-	    [submit "addtime" "global" + Add time option]
-	  ]
-	  [submit "cancel" "cancel" Cancel]
-	  [submit "post" "post" Post Event]
-	]
+	  $([ "$splittimes" = "yes" ] && fs_splittimes || fs_timeofday )
+	  $(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