X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=060d7dcc0670432a98b0ea97dcb671a64ae8288f;hb=ba2f64a4c4bd30046d357c51e222674af64b740e;hp=48c9a79e6fb0f5850afce0adff6109d41c5707d9;hpb=1f9e021f60ba98de80fd9185770ca884b3cd18b3;p=webpoll

diff --git a/index.cgi b/index.cgi
index 48c9a79..060d7dc 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,25 +1,21 @@
 #!/bin/sh
 
-_EXEC="${_EXEC:-${0%/*}/}"
-_DATA="${_DATA:-.}"
-
-. "$_EXEC"/cgilite/cgilite.sh
-#. "$_EXEC"/cgilite/session.sh
+. "${_EXEC:-${0%/*}}"/cgilite/cgilite.sh
+. "$_EXEC"/cgilite/session.sh
 . "$_EXEC"/cgilite/file.sh
-#. "$_EXEC"/session_lock.sh
+. "$_EXEC"/cgilite/storage.sh
+. "$_EXEC"/widgets.sh
 
-#git init "$_DATA" >/dev/null &
+# PATH_INFO="$(PATH "/${PATH_INFO#${_BASE}}")"
 
-checked(){
-  if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then
-    printf 'checked="checked"'
-  fi 2>/dev/null
-}
-selected(){
-  if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then
-    printf 'selected="selected"'
-  fi 2>/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"
@@ -29,72 +25,40 @@ yield_page(){
   { printf '[html
     [head
       [meta name="viewport" content="width=device-width"]
-      [link rel="stylesheet" type="text/css" href="common.css"]
+      [link rel="stylesheet" type="text/css" href="%s/common.css"]
+      [link rel="stylesheet" type="text/css" href="%s/widgets.css"]
+      [link rel="stylesheet" type="text/css" href="%s/webpoll.css"]
       [title %s]
     ] [body class="%s"
-  ' "$title" "$page"
+  ' "$_BASE" "$_BASE" "$_BASE" "$(HTML "$title")" "$page"
   cat
   printf '] ]'
   } |"$_EXEC/cgilite/html-sh.sed" -u
 }
 
-w_month() {
-  local month="$1" selected="$2"
-  local dow dom days n=1 Y m d V w B
-  if [ $month ]; then
-    read Y m d V w B<<-EOF
-	$(date -d "${month}-01" +"%Y %m %d %V %w %B")
-	EOF
+pagename() {
+  local id="$1"
+  local file="$_DATA/$id"
+  if [ -f "$file" ]; then
+    DBM "$file" get title || printf 'Unnamed Page'
   else
-    read Y m d V w <<-EOF
-	$(date +"%Y %m %d %V %w")
-	EOF
-    month="$Y-$m"
-    V="$((V - d / 7))"
-    [ $V -lt 1 ] && V=$((V + 53))
+    return 1;
   fi
-
-  case $m in
-    0[13578]|10|12)
-      days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31";;
-    0[469]|11)
-      days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30";;
-    02) if [ $(( Y / 400 )) = 0 ]; then
-        days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29";
-      elif [ $(( Y / 100 )) = 0 ]; then
-        days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28";
-      elif [ $(( Y /   4 )) = 0 ]; then
-        days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29";
-      else
-        days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28";
-      fi;;
-  esac
-
-  printf '[table .calendar month=%s [thead
-            [tr .monthname [th colspan=8 . %s]]
-            [tr   .weekday [th][th . %s][th . %s][th . %s][th . %s][th . %s][th . %s][th . %s]]
-          ][tbody
-         ' "$month" "$B $Y" Mo Di Mi Do Fr Sa So
-  for dom in $days; do
-    dow=$(( (w - d + 35 + dom ) % 7))
-    [ $dow = 1 -o $dom = 1 ] && printf '[tr [th .weekno . %i]' $V
-    [ $dom = 1 ] && while [ $n -lt $(( ($dow + 6) % 7 + 1)) ]; do printf '[td ]'; n=$((n + 1)); done
-    printf '[td [label [input type=radio name=date value="%04i-%02i-%02i" %s] %i]]' $Y $m $dom "$(checked $dom $selected)" $dom
-    [ $dow = 0 ] && printf ']\n'
-    [ $dow = 0 ] && V=$(( V % 53 + 1))
-  done
-  printf ']]'
 }
 
-case ${PATH_INFO##*/} in
-  favicon.ico) printf '%s\r\n' 'Content-Length: 0' '';;
-  common.css) FILE "$_EXEC/cgilite/common.css";;
-  '') yield_page <<-EOF
-	$(w_month 2019-12 24)
-	$(w_month 2020-01)
-	$(w_month 2020-02)
-	EOF
-    return 0
-    ;;
+   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;;
+  /[0-9a-zA-Z:=]???????????????/[0-9a-zA-Z:=]???????????????) page_newdate;;
+  /*/newoptions);;
+  /[0-9a-zA-Z:=]???????????????) page_poll;;
+  /*) page_home;;
 esac
 
+exit 0