Index: openacs-4/packages/search/lib/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/lib/search.adp,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/search/lib/search.adp	17 Jun 2015 07:40:14 -0000	1.5
+++ openacs-4/packages/search/lib/search.adp	22 May 2016 19:30:38 -0000	1.5.2.1
@@ -1,6 +1,7 @@
-<form method=GET action="@search_url@" class="inline-form">
+<form method="GET" action="@search_url@" class="inline-form">
   <div>
     <input type="text" name="q" title="#search.Enter_keywords_to_search_for#" size="16" maxlength="256">
+    <if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if>
     <input type="submit" value="#acs-kernel.common_search#" name="t">
     <br>
     <a href="@advanced_search_url@">#search.Advanced_Search#</a>
Index: openacs-4/packages/search/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/index.adp,v
diff -u -N -r1.13 -r1.13.2.1
--- openacs-4/packages/search/www/index.adp	17 Jun 2015 07:40:14 -0000	1.13
+++ openacs-4/packages/search/www/index.adp	22 May 2016 19:30:38 -0000	1.13.2.1
@@ -2,11 +2,12 @@
 <property name="doc(title)">#search.Search#</property>
 
 <div style="text-align:center">
-<form method=GET action=search>
+<form method="GET" action="search">
   <div><small><a href="advanced-search">#search.Advanced_Search#</a></small></div>
   <div>
   <input type="text" name="q" size="80" maxlength="256">
   <br>
+  <if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if>
   <input type="submit" value="#search.Search#" name="t">
   <input type="submit" value="#search.Feeling_Lucky#" name="t">
   </div>
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -N -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/search/www/search.adp	5 Sep 2015 10:58:48 -0000	1.18.2.1
+++ openacs-4/packages/search/www/search.adp	22 May 2016 19:30:38 -0000	1.18.2.2
@@ -68,6 +68,7 @@
     <form method="get" action="search">
       <div>
 	<input type="text" name="q" size="60" maxlength="256" value="@query@">
+         <if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if>
 	<input type="submit" value="#search.Search#">
       </div>
     </form>
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -N -r1.40.2.3 -r1.40.2.4
--- openacs-4/packages/search/www/search.tcl	17 May 2016 22:06:32 -0000	1.40.2.3
+++ openacs-4/packages/search/www/search.tcl	22 May 2016 19:30:38 -0000	1.40.2.4
@@ -18,6 +18,7 @@
             ad_complain "#search.lt_You_must_specify_some#"
         }
     }
+    csrf { security::csrf::validate }
 }
 
 set page_title "Search Results"