X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=060d7dcc0670432a98b0ea97dcb671a64ae8288f;hb=refs%2Fheads%2Fmaster;hp=efae974727b9340b4206c613059a3648de079ab8;hpb=3fdd2a599459588ed9054c16ce20b79d27faa353;p=webpoll

diff --git a/index.cgi b/index.cgi
index efae974..060d7dc 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,19 +1,21 @@
 #!/bin/sh
 
-_EXEC="${_EXEC:-${0%/*}/}"
-_DATA="${_DATA:-.}"
-_BASE="${_BASE%/}"
-
-. "$_EXEC"/cgilite/cgilite.sh
+. "${_EXEC:-${0%/*}}"/cgilite/cgilite.sh
 . "$_EXEC"/cgilite/session.sh
 . "$_EXEC"/cgilite/file.sh
 . "$_EXEC"/cgilite/storage.sh
-#. "$_EXEC"/session_lock.sh
 . "$_EXEC"/widgets.sh
 
-PATH_INFO="$(PATH "/${PATH_INFO#${_BASE}}")"
+# PATH_INFO="$(PATH "/${PATH_INFO#${_BASE}}")"
 
-#git init "$_DATA" >/dev/null &
+# bookmarks_cookie="$(COOKIE bookmarks |grep -xE '[0-9a-zA-Z:=]{16}(/[0-9a-zA-Z:=]{16})?( [0-9a-zA-Z:=]{16}(/[0-9a-zA-Z:=]{16})?)*')"
+bookmarks=''
+for bm in $(COOKIE bookmarks); do
+  [ -f "${_DATA}/$(checkid "${bm%/*}")" ] && bookmarks="${bookmarks}${bookmarks:+ }${bm}"
+done
+if [ "$bookmarks" ]; then
+  SET_COOKIE +$((182 * 86400)) bookmarks="${bm}" Path="${_BASE}/"
+fi
 
 yield_page(){
   title="${1:-Webpoll}" page="$2"
@@ -28,7 +30,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,47 +46,19 @@ 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_newdate() { . $_EXEC/newdate.sh; }
+   page_home() { . "$_EXEC"/home.sh; }
+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;;
+  /[0-9a-zA-Z:=]???????????????/[0-9a-zA-Z:=]???????????????) page_newdate;;
   /*/newoptions);;
-  *);;
+  /[0-9a-zA-Z:=]???????????????) page_poll;;
+  /*) page_home;;
 esac
 
+exit 0