From 789e093a9d54f6e8f8d66a7a07ba268c2564c3ae Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Mon, 26 Mar 2018 14:35:04 +0200
Subject: [PATCH] Use list name, not list id, in generated search form

The coupling between main site and archives was supposed to be loose,
which means that id's can be different. Meaning a listid sent from the
archives server might mean a different list on the website. So make sure
we pass out the list *name*, which the website knows what to do with.
---
 .../archives/mailarchives/templates/searchform.html  |  4 ++--
 django/archives/mailarchives/views.py                | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/django/archives/mailarchives/templates/searchform.html b/django/archives/mailarchives/templates/searchform.html
index 4222df5..139fdb7 100644
--- a/django/archives/mailarchives/templates/searchform.html
+++ b/django/archives/mailarchives/templates/searchform.html
@@ -2,7 +2,7 @@
 </p>
 <form name="searchform" method="get" action="https://www.postgresql.org/search/">
  <input type="hidden" name="m" value="1" />
-{%if searchform_list%} <input type="hidden" name="l" value="{{searchform_list}}"/>{%endif%}
+{%if searchform_listname%} <input type="hidden" name="ln" value="{{searchform_listname}}"/>{%endif%}
  <div class="tblBasic">
   <table border="0" cellpadding="0" cellspacing="0" class="tblBasicGrey">
    <tr>
@@ -14,7 +14,7 @@
    <tr class="lastrow">
     <td class="colFirst"></td>
     <td>(enter a message-id to go directly to that message)</td>
-    <td class="colLast" align="right"><a href="https://www.postgresql.org/search/?m=1{%if searchform_list%}&amp;l={{searchform_list}}{%endif%}">Advanced Search</a></td>
+    <td class="colLast" align="right"><a href="https://www.postgresql.org/search/?m=1{%if searchform_list%}&amp;ln={{searchform_listname}}{%endif%}">Advanced Search</a></td>
    </tr>
   </table>
  </div>
diff --git a/django/archives/mailarchives/views.py b/django/archives/mailarchives/views.py
index 37a4f69..47ef35f 100644
--- a/django/archives/mailarchives/views.py
+++ b/django/archives/mailarchives/views.py
@@ -157,7 +157,7 @@ def get_all_groups_and_lists(request, listid=None):
 
 
 class NavContext(object):
-	def __init__(self, request, listid=None, all_groups=None, expand_groupid=None):
+	def __init__(self, request, listid=None, listname=None, all_groups=None, expand_groupid=None):
 		self.request = request
 		self.ctx = {}
 
@@ -177,8 +177,8 @@ class NavContext(object):
 				g['lists'] = []
 
 		self.ctx.update({'listgroups': groups})
-		if listid:
-			self.ctx.update({'searchform_list': listid})
+		if listname:
+			self.ctx.update({'searchform_listname': listname})
 
 def render_nav(navcontext, template, ctx):
 	ctx.update(navcontext.ctx)
@@ -214,7 +214,7 @@ def monthlist(request, listname):
 	curs.execute("SELECT year, month FROM list_months WHERE listid=%(listid)s ORDER BY year DESC, month DESC", {'listid': l.listid})
 	months=[{'year':r[0],'month':r[1], 'date':datetime(r[0],r[1],1)} for r in curs.fetchall()]
 
-	return render_nav(NavContext(request, l.listid), 'monthlist.html', {
+	return render_nav(NavContext(request, l.listid, l.listname), 'monthlist.html', {
 			'list': l,
 			'months': months,
 			})
@@ -261,7 +261,7 @@ def _render_datelist(request, l, d, datefilter, title, queryproc):
 	allyearmonths = set([(m.date.year, m.date.month) for m in mlist])
 	(yearmonth, daysinmonth) = get_monthday_info(mlist, l, d)
 
-	r = render_nav(NavContext(request, l.listid), 'datelist.html', {
+	r = render_nav(NavContext(request, l.listid, l.listname), 'datelist.html', {
 			'list': l,
 			'messages': mlist,
 			'title': title,
@@ -443,7 +443,7 @@ def message(request, msgid):
 		parent = None
 	nextprev = _get_nextprevious(listmap, m.date)
 
-	r = render_nav(NavContext(request, lists[0].listid), 'message.html', {
+	r = render_nav(NavContext(request, lists[0].listid, lists[0].listname), 'message.html', {
 			'msg': m,
 			'threadstruct': threadstruct,
 			'responses': responses,
-- 
2.39.5