Item13741: More URLPARAM updates

Allow searching for %MACROS%
foswiki · Sep 25, 2015 · 24def3c · 24def3c
1 parent 7caaabe
commit 24def3c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/JQueryPlugin/data/System/JQueryAjaxHelper.txt b/JQueryPlugin/data/System/JQueryAjaxHelper.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1417294557" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1443185186" format="1.1" version="1"}%
 %META:TOPICPARENT{name="JQueryPlugin"}%
 ---+!! %TOPIC%
 %JQREQUIRE{"chili, ui, ui::autocomplete" warn="off"}%
@@ -63,7 +63,7 @@ loads the =topic= section of this topic, which expands to the topic list.
   "^%URLPARAM{"term" default="does not exist"}%.*"
   type="regex"
   scope="topic"
-  format="<nop>%URLPARAM{"format" encode="quote" default="{\\"label\\":\\"$topic\\", \\"value\\":\\"$topic\\"}"}%"
+  format="<nop>%URLPARAM{"format" encode="safe,quote" default="{\\"label\\":\\"$topic\\", \\"value\\":\\"$topic\\"}"}%"
   separator=","
   limit="%URLPARAM{"limit" default="10"}%"
   nonoise="on"

diff --git a/TipsContrib/data/System/TipsTopics.txt b/TipsContrib/data/System/TipsTopics.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1288964903" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1443185186" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TipsContrib"}%
 ---+ Tips
 
@@ -7,7 +7,7 @@ Tips are tips and hints contributed by users. Use this form to search for tips.
 <form action="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%">
 Search (perl regular expression): <input name="searchfor" type="text" value="%URLPARAM{"searchfor" default="Enter search keywords here"}%" size="100" />
 </form>
-%SEARCH{ "%URLPARAM{"searchfor" encode="quote" default="search results go here"}%" topic="*TipTopic*" type="keyword" web="%SYSTEMWEB%, %USERSWEB%" format="   * [[$web.$topic][$pattern(.*?\-\-\-\+([^\n\r]+).*)]]:$n()   $summary(noheader, 100)$n()$percntCALC{$SETM(total, +1)}$percnt"}%
+%SEARCH{ "%URLPARAM{"searchfor" encode="entities, quote" default="search results go here"}%" decode="entities" topic="*TipTopic*" type="keyword" web="%SYSTEMWEB%, %USERSWEB%" format="   * [[$web.$topic][$pattern(.*?\-\-\-\+([^\n\r]+).*)]]:$n()   $summary(noheader, 100)$n()$percntCALC{$SETM(total, +1)}$percnt"}%
 
 Total: %CALC{$GET(total)}% tips
 

diff --git a/core/data/System/FormattedSearch.txt b/core/data/System/FormattedSearch.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1435757231" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1443185186" format="1.1" version="1"}%
 %META:TOPICPARENT{name="UserDocumentationCategory"}%
 ---+ Formatted Search
 Customize the display of search results.
@@ -347,7 +347,8 @@ Use an HTML form and an embedded formatted search on the same topic. You can lin
 %STARTSECTION{"example7_results"}%
 <div class="search_results">
 %SEARCH{
-   "%URLPARAM{"q" encode="quote"}%"
+   "%URLPARAM{"q" encode="entity, quote"}%"
+   decode="entity"
    type="keyword"
    nosearch="on"
    format="<div class='search_hit'> [[$web.$topic]]

diff --git a/core/data/System/WebAtomBase.txt b/core/data/System/WebAtomBase.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1434484983" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1443185186" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminToolsCategory"}%
 ---+ ATOM News Feeds
 
@@ -42,18 +42,19 @@ Below part is included by each <nop>WebAtom topic:
 <id>%SCRIPTURL{"view"}%/%BASEWEB%</id>
 <rights>%WEBRSSCOPYRIGHT%</rights>%CALC{$SET(c,0)}%
 %SEARCH{
-  "%URLPARAM{"search" encode="quote" default=".*" }%"
-  web="%URLPARAM{"web" encode="quote" default="%BASEWEB%" }%"
-  excludetopic="%URLPARAM{"excludetopic" encode="quote" default="%STATISTICSTOPIC%" }%"
-  type="%URLPARAM{"type" encode="quote" default="regex" }%"
+  "%URLPARAM{"search" encode="entities, quote" default=".*" }%"
+  decode="entities"
+  web="%URLPARAM{"web" encode="safe, quote" default="%BASEWEB%" }%"
+  excludetopic="%URLPARAM{"excludetopic" encode="safe, quote" default="%STATISTICSTOPIC%" }%"
+  type="%URLPARAM{"type" encode="safe, quote" default="regex" }%"
   nosearch="on"
   order="modified"
   reverse="on"
   nototal="on"
-  limit="%URLPARAM{"limit" encode="quote" default="16" }%"
-  scope="%URLPARAM{"scope" encode="quote" default="text" }%"
-  casesensitive="%URLPARAM{"casesensitive" encode="quote" default="on" }%"
-  date="%URLPARAM{"date" encode="quote" default="" }%"
+  limit="%URLPARAM{"limit" encode="safe, quote" default="16" }%"
+  scope="%URLPARAM{"scope" encode="safe, quote" default="text" }%"
+  casesensitive="%URLPARAM{"casesensitive" encode="safe, quote" default="on" }%"
+  date="%URLPARAM{"date" encode="safe, quote" default="" }%"
   format="$percentCALC{$IF($GET(c)>0, , <updated>$isodate</updated>$CHAR(10))$SETM(c, +1)}$percent<entry>$n <title>$topic</title>$n <link rel=\"alternate\" type=\"text/html\" href=\"%SCRIPTURL{"view"}%/$web/$topic?t=$isodate\"/>$n <id>%SCRIPTURL{"view"}%/$web/$topic</id>$n <updated>$isodate</updated>$n <summary>$summary (last changed by <nop>$wikiname)</summary>$n <author>$n  <name><nop>$wikiname</name></author>$n</entry>"
 }%
 %STOPINCLUDE%

diff --git a/core/data/System/WebRssBase.txt b/core/data/System/WebRssBase.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1440080166" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1443185186" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminToolsCategory"}%
 ---+ RSS News Feeds
 %JQREQUIRE{"chili"}%
@@ -51,18 +51,19 @@ The part below is included by each <nop>WebRss topic:
   <items>
     <rdf:Seq>
 %SEARCH{
-  "%URLPARAM{"search" encode="quote" default=".*" }%"
-  web="%URLPARAM{"web" encode="quote" default="%BASEWEB%" }%"
-  excludetopic="%URLPARAM{"excludetopic" encode="quote" default="%STATISTICSTOPIC%" }%"
-  type="%URLPARAM{"type" encode="quote" default="regex" }%"
+  "%URLPARAM{"search" encode="entities, quote" default=".*" }%"
+  decode="entities"
+  web="%URLPARAM{"web" encode="safe, quote" default="%BASEWEB%" }%"
+  excludetopic="%URLPARAM{"excludetopic" encode="safe, quote" default="%STATISTICSTOPIC%" }%"
+  type="%URLPARAM{"type" encode="safe, quote" default="regex" }%"
   nosearch="on"
   order="modified"
   reverse="on"
   nototal="on"
-  limit="%URLPARAM{"limit" encode="quote" default="16" }%"
-  scope="%URLPARAM{"scope" encode="quote" default="text" }%"
-  casesensitive="%URLPARAM{"casesensitive" encode="quote" default="on" }%"
-  date="%URLPARAM{"date" encode="quote" default="" }%"
+  limit="%URLPARAM{"limit" encode="safe, quote" default="16" }%"
+  scope="%URLPARAM{"scope" encode="safe, quote" default="text" }%"
+  casesensitive="%URLPARAM{"casesensitive" encode="safe, quote" default="on" }%"
+  date="%URLPARAM{"date" encode="safe, quote" default="" }%"
   format="      <rdf:li rdf:resource=\"%SCRIPTURL{"view"}%/$web/$topic\" />"
  }%
     </rdf:Seq>
@@ -74,18 +75,19 @@ The part below is included by each <nop>WebRss topic:
   <url>%WIKILOGOIMG%</url>
 </image>
 %SEARCH{
-  "%URLPARAM{"search" encode="quote" default=".*" }%"
-  web="%URLPARAM{"web" encode="quote" default="%BASEWEB%" }%"
-  excludetopic="%URLPARAM{"excludetopic" encode="quote" default="%STATISTICSTOPIC%" }%"
-  type="%URLPARAM{"type" encode="quote" default="regex" }%"
+  "%URLPARAM{"search" encode="entities, quote" default=".*" }%"
+  decode="entities"
+  web="%URLPARAM{"web" encode="safe, quote" default="%BASEWEB%" }%"
+  excludetopic="%URLPARAM{"excludetopic" encode="safe, quote" default="%STATISTICSTOPIC%" }%"
+  type="%URLPARAM{"type" encode="safe, quote" default="regex" }%"
   nosearch="on"
   order="modified"
   reverse="on"
   nototal="on"
-  limit="%URLPARAM{"limit" encode="quote" default="16" }%"
-  scope="%URLPARAM{"scope" encode="quote" default="text" }%"
-  casesensitive="%URLPARAM{"casesensitive" encode="quote" default="on" }%"
-  date="%URLPARAM{"date" encode="quote" default="" }%"
+  limit="%URLPARAM{"limit" encode="safe, quote" default="16" }%"
+  scope="%URLPARAM{"scope" encode="safe, quote" default="text" }%"
+  casesensitive="%URLPARAM{"casesensitive" encode="safe, quote" default="on" }%"
+  date="%URLPARAM{"date" encode="safe, quote" default="" }%"
   format="<item rdf:about=\"%SCRIPTURL{"view"}%/$web/$topic\">$n  <title>$topic</title>$n  <link>%SCRIPTURL{"view"}%/$web/$topic</link>$n  <description>$summary (last changed by <nop>$wikiname)</description>$n  <dc:date>$isodate</dc:date>$n  <dc:contributor>$n    <rdf:Description link=\"%SCRIPTURL{"view"}%?topic=$wikiusername\">$n      <rdf:value>$username</rdf:value>$n    </rdf:Description>$n  </dc:contributor>$n</item>"
 }%
 %STOPINCLUDE%