From 3e39dae6551b82017469fd4b2599a364ac288dba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Wed, 28 Jul 2021 01:19:18 +0200 Subject: [PATCH] put home page into separate file --- home.sh | 35 +++++++++++++++++++++++++++++++++++ index.cgi | 38 ++++---------------------------------- 2 files changed, 39 insertions(+), 34 deletions(-) create mode 100755 home.sh diff --git a/home.sh b/home.sh new file mode 100755 index 0000000..bea9940 --- /dev/null +++ b/home.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +if [ "$REQUEST_METHOD" = POST ]; then + case $(POST start) in + date) + id="$(randomid)" + admin="$(randomid)" + file="$_DATA/$id" + # touch "$file" + DBM "$file" add adminkey "$admin" + REDIRECT "$_BASE/$id/$admin" + ;; + options) + id="$(randomid)" + touch "$_DATA/$id" + REDIRECT "$_BASE/$id/newoptions" + ;; + *) REDIRECT "$_BASE/";; + esac +else + yield_page "Start a Poll" "home" <<-EOF + [form method=post + [submit "start" "date" Start a new poll] + $(if [ "$bookmarks" ]; then + printf '[h2 Recent Polls][ul .recent' + for page in $bookmarks; do + page="${page%/*}" + [ -f "$_DATA/$(checkid "$page")" ] \ + && printf '[li [a href="./%s" . %s]]' "$page" "$(pagename "$page" |HTML)" + done + printf ']' + fi) + ] + EOF +fi diff --git a/index.cgi b/index.cgi index 0694c6e..8bc1ad0 100755 --- a/index.cgi +++ b/index.cgi @@ -21,6 +21,7 @@ fi PATH_INFO="$(PATH "/${PATH_INFO#${_BASE}}")" #git init "$_DATA" >/dev/null & +bookmarks="$(COOKIE bookmarks |grep -xE '[0-9a-zA-Z:=]{16}(/[0-9a-zA-Z:=]{16})?( [0-9a-zA-Z:=]{16}(/[0-9a-zA-Z:=]{16})?)*')" yield_page(){ title="${1:-Webpoll}" page="$2" @@ -51,47 +52,16 @@ pagename() { fi } -page_home() { - if [ "$REQUEST_METHOD" = POST ]; then - case $(POST start) in - date) - id="$(randomid)" - touch "$_DATA/$id" - REDIRECT "$_BASE/$id/newdate" - ;; - options) - id="$(randomid)" - touch "$_DATA/$id" - REDIRECT "$_BASE/$id/newoptions" - ;; - *) REDIRECT "$_BASE/";; - 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/$(checkid "$page")" ] \ - && printf '[li [a href="./%s" . %s]]' "$page" "$(pagename "$page" |HTML)" - done - printf ']' - fi) - ] - EOF - fi -} + page_home() { . "$_EXEC"/home.sh; } page_newdate() { . "$_EXEC"/newdate.sh; } -page_poll() { . "$_EXEC/poll.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;; + /[0-9a-zA-Z:=]???????????????/[0-9a-zA-Z:=]???????????????) page_newdate;; /*/newoptions);; /[0-9a-zA-Z:=]???????????????) page_poll;; esac -- 2.39.2