X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=0694c6e4d9b5f8c9c9ea8fa3c744149d8a2ece86;hb=5238c404a50861cf1dbbe610d2c4977c048d3b12;hp=d1469cdbfcbb446e1bdf0ed25539986afc99f399;hpb=57b8376ada25742ac4d1078997bdeeeb20c56911;p=webpoll

diff --git a/index.cgi b/index.cgi
index d1469cd..0694c6e 100755
--- a/index.cgi
+++ b/index.cgi
@@ -11,6 +11,13 @@ _BASE="${_BASE%/}"
 #. "$_EXEC"/session_lock.sh
 . "$_EXEC"/widgets.sh
 
+export MD_HTML="false"
+if [ "$(which awk)" ]; then
+  markdown() { awk -f "$_EXEC/cgilite/markdown.awk"; }
+else
+  markdown() { busybox awk -f "$_EXEC/cgilite/markdown.awk"; }
+fi
+
 PATH_INFO="$(PATH "/${PATH_INFO#${_BASE}}")"
 
 #git init "$_DATA" >/dev/null &
@@ -28,7 +35,7 @@ yield_page(){
       [link rel="stylesheet" type="text/css" href="%s/webpoll.css"]
       [title %s]
     ] [body class="%s"
-  ' "$_BASE" "$_BASE" "$_BASE" "$title" "$page"
+  ' "$_BASE" "$_BASE" "$_BASE" "$(HTML "$title")" "$page"
   cat
   printf '] ]'
   } |"$_EXEC/cgilite/html-sh.sed" -u
@@ -44,8 +51,8 @@ pagename() {
   fi
 }
 
-[ "$REQUEST_METHOD" = POST ] && case ${PATH_INFO} in
-  /)
+page_home() {
+  if [ "$REQUEST_METHOD" = POST ]; then
     case $(POST start) in
       date)
         id="$(randomid)"
@@ -58,82 +65,35 @@ pagename() {
         REDIRECT "$_BASE/$id/newoptions"
         ;;
       *) REDIRECT "$_BASE/";;
-      esac
-    ;;
-  /*/newdate)
-    id="${PATH_INFO%/newdate}"; id="${id#/}"
-    file="$_DATA/$id"
-    month="$(POST month |grep -m1 -xE '[0-9]{4}-(0[1-9]|1[012])')"
-    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 |sort
-    )"
-    if [ "$(POST cancel)" = cancel ]; then
-      rm -- "$file"
-      REDIRECT "$_BASE/"
-    elif [ "$month" ]; then
-      REDIRECT "$_BASE$PATH_INFO?month=$month"
-    else
-      REDIRECT "$_BASE$PATH_INFO"
-    fi
-    ;;
-esac
-
-
-case ${PATH_INFO} in
-  /favicon.ico) printf '%s\r\n' 'Content-Length: 0' '';;
-  /common.css) FILE "$_EXEC/cgilite/common.css";;
-  /widgets.css|/webpoll.css) FILE "${_EXEC}/${PATH_INFO}";;
-  /)  recent="$(COOKIE pages)"
-      yield_page "Start a Poll" "home" <<-EOF
+    esac
+  else
+    recent="$(COOKIE pages)"
+    yield_page "Start a Poll" "home" <<-EOF
 	[form method=post
 	  [submit "start" "date" Start a new poll]
 	  $(if [ "$recent" ]; then
 	    printf '[h2 Recent Polls][ul .recent'
 	    for page in $recent; do
-	      [ -f "$_DATA/$(printf %s "$page" |checkid)" ] \
+	      [ -f "$_DATA/$(checkid "$page")" ] \
 	      && printf '[li [a href="./%s" . %s]]' "$page" "$(pagename "$page" |HTML)"
 	    done
 	    printf ']'
 	  fi)
 	]
 	EOF
-    ;;
-  /*/newdate)
-    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)))
-    [ "$m" = 12 ] && next=$(printf '%04i-%02i' $((Y + 1)) 01) || next=$(printf '%04i-%02i' $Y $((m + 1)))
-    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;")"
-    yield_page "$(pagename "$id")" "newdate" <<-EOF
-	[form method=post
-	  [input name=title value="$(DBM "$file" get title |HTML)" placeholder="Title"]
-	  [textarea name=description placeholder="Description" . $(DBM "$file" get description |HTML)]
-	  [submit "month" "$prev" Previous Month]
-	  $(w_month multiple date "$month" $days)
-	  [submit "month" "$next" Next Month]
-	  $(printf '[hidden "date" "%s"]' $additional)
-	  [submit "cancel" "cancel" Cancel]
-	  [submit "post" "post" Post Event]
-	]
-	EOF
-    ;;
+  fi
+}
+page_newdate() { . "$_EXEC"/newdate.sh; }
+page_poll() { . "$_EXEC/poll.sh"; }
+
+case ${PATH_INFO} in
+  /favicon.ico) printf '%s\r\n' 'Content-Length: 0' '';;
+  /common.css) FILE "$_EXEC/cgilite/common.css";;
+  /widgets.css|/webpoll.css) FILE "${_EXEC}/${PATH_INFO}";;
+  /) page_home;;
+  /*/newdate) page_newdate;;
   /*/newoptions);;
-  *);;
-  /) yield_page <<-EOF
-	$(w_month none date 2019-12 24 25 26)
-	$(w_month select date 2020-01)
-	$(w_month multiple date 2020-02)
-	EOF
-    return 0
-    ;;
+  /[0-9a-zA-Z:=]???????????????) page_poll;;
 esac
 
+exit 0