X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=a2059e290bf84e58a20e733167123b3fa932d09c;hb=d612c1a5c25d9e7370b1725bd9749125532cc1ad;hp=1bfc2b7e3231b27c2af4cbeb1653daa5322aba6d;hpb=1b9f025da80bb30db913635a60e799a3e523f2e1;p=webpoll

diff --git a/index.cgi b/index.cgi
index 1bfc2b7..a2059e2 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,20 +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}}")"
 
-#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})?)*')"
+# 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"
@@ -57,6 +58,7 @@ case ${PATH_INFO} in
   /[0-9a-zA-Z:=]???????????????/[0-9a-zA-Z:=]???????????????) page_newdate;;
   /*/newoptions);;
   /[0-9a-zA-Z:=]???????????????) page_poll;;
+  /*) page_home;;
 esac
 
 exit 0