fix 1682; missing b=bname in CGI mode in buttons_place

geneweb · Dec 27, 2023 · 7ab19e8 · 7ab19e8
1 parent 4319e41
commit 7ab19e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/hd/etc/buttons_places.txt b/hd/etc/buttons_places.txt
@@ -7,6 +7,9 @@
   %if;(e.lang!=default_lang)
     <input type="hidden" name="lang" value="%e.lang;">
   %end;
+  %if;cgi;
+    <input type="hidden" name="b" value="%bname_token;">
+  %end;
   <div class="form-inline">
     <label class="sr-only" for="k">[*place/places]0 (k)</label>
     <input type="search" class="form-control col-4 ml-2" name="k"

diff --git a/lib/templ.ml b/lib/templ.ml
@@ -143,6 +143,7 @@ let url_aux ?(pwd = true) conf =
 
 let order =
   [
+    "b";
     "lang";
     "templ";
     "iz";
@@ -483,6 +484,9 @@ and eval_simple_variable conf = function
   | "plugins" ->
       let l = List.map Filename.basename conf.plugins in
       String.concat "," l
+  | "bname" -> conf.bname
+  | "token" -> conf.cgi_passwd
+  | "bname_token" -> String.concat "_" [ conf.bname; conf.cgi_passwd ]
   | "prefix" -> (Util.commd conf :> string)
   | "prefix_base" -> (Util.commd ~pwd:false conf :> string)
   | "prefix_base_password" -> (Util.commd conf :> string)