From: Paul Hänsch <paul@plutz.net>
Date: Sun, 13 Apr 2025 12:40:35 +0000 (+0200)
Subject: fix url display for poll link (http/https)
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=b4b842657d81f3079ec50c0ff389c01baeadc5dc;p=webpoll

fix url display for poll link (http/https)
---

diff --git a/index.cgi b/index.cgi
index 060d7dc..b2b9531 100755
--- a/index.cgi
+++ b/index.cgi
@@ -6,6 +6,8 @@
 . "$_EXEC"/cgilite/storage.sh
 . "$_EXEC"/widgets.sh
 
+[ -n "$HTTPS" ] && HTTPs=https || HTTPs=http
+
 # PATH_INFO="$(PATH "/${PATH_INFO#${_BASE}}")"
 
 # 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})?)*')"
diff --git a/newdate.sh b/newdate.sh
index 83e27b6..fc25ca5 100755
--- a/newdate.sh
+++ b/newdate.sh
@@ -162,11 +162,11 @@ else
 	  $(if [ "$bookmarks" ]; then
 	    printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! The poll has also been bookmarked and will be listed on the front page.]' \
 	    "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
-	    "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
+	    "$(HTML "${HTTPs}://$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
           else
 	    printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! You can also set a Cookie to bookmark all polls you visit, including this admin page. Bookmarked polls will be listed on the frontpage.<br/> [submit "bookmark" "add" Set Cookie]]' \
 	    "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
-	    "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
+	    "$(HTML "${HTTPs}://$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
 	  fi)
 	  [fieldset .date
 	    $(printf '[hidden "date" "%s"]' $additional)