SAK-29197

chundcm · Aug 4, 2015 · bb23872 · bb23872
2 parents 584a5f7 + 560671c
commit bb23872
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/editRealm-many.vm b/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/editRealm-many.vm
@@ -108,12 +108,12 @@
 
                 <tr> 
                   <td colspan="7"> 
-                        <input type="hidden" name="pageName" value="${multiRealmEditBean.pageName}" />
+                        <input type="hidden" name="pageName" value="${util.escapeHtml($multiRealmEditBean.pageName)}" />
                         <input type="hidden" name="panel" value="Main"/>
                         <input type="hidden" name="action" value="editRealmMany"/>
                         <input type="submit" name="command_save" value="${rlb.jsp_button_save}"/>
                         <input type="submit" name="command_cancel" value="${rlb.jsp_button_cancel}"/>
-                        <input type="hidden" name="realm" value="${multiRealmEditBean.localSpace}"/>
+                        <input type="hidden" name="realm" value="${util.escapeHtml($multiRealmEditBean.localSpace)}"/>
                   </td>
                 </tr>
               </table>

diff --git a/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/editRealm-manyv2.vm b/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/editRealm-manyv2.vm
@@ -2,7 +2,7 @@
 #set( $realmCollectionBean = ${requestScope.AuthZGroupCollectionBean} )
 #set( $errorBean = ${requestScope.rsacMap.errorBean} )
 #set( $rlb = ${requestScope.rsacMap.resourceLoaderBean} )
-#set( $title = "${rlb.jsp_edit_section}: ${multiRealmEditBean.localSpace}" )
+#set( $title = "${rlb.jsp_edit_section}: ${util.escapeHtml($multiRealmEditBean.localSpace)}" )
 #header(${title} false "" )  
 <div id="rwiki_container">
   <div class="portletBody">
@@ -108,12 +108,12 @@
 
                 <tr> 
                   <td colspan="7"> 
-                        <input type="hidden" name="pageName" value="${multiRealmEditBean.getPageName()}" />
+                        <input type="hidden" name="pageName" value="${util.escapeHtml($multiRealmEditBean.getPageName())}" />
                         <input type="hidden" name="panel" value="Main"/>
                         <input type="hidden" name="action" value="editRealmMany"/>
                         <input type="submit" name="command_save" value="${rlb.getString("jsp_button_save")}"/>
                         <input type="submit" name="command_cancel" value="${rlb.getString("jsp_button_cancel")}"/>
-                        <input type="hidden" name="realm" value="${multiRealmEditBean.getLocalSpace()}"/>
+                        <input type="hidden" name="realm" value="${util.escapeHtml($multiRealmEditBean.getLocalSpace())}"/>
                   </td>
                 </tr>
               </table>

diff --git a/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/full_search.vm b/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/full_search.vm
@@ -64,7 +64,7 @@
 					#set ($pageTotal=0)
 					#foreach( $pages in ${searchPages})
 					#set ($pageTotal=$pageTotal + 1)
-						<li><a href="${util.escapeHtml(${pages.fullSearchLinkUrl})}" >${pages.page}</a></li>
+						<li><a href="${util.escapeHtml(${pages.fullSearchLinkUrl})}" >${util.escapeHtml($pages.page)}</a></li>
 					#end
 				</ol>
 
@@ -76,8 +76,8 @@
 				#set ($itemCount =$itemCount + 1)
 				<!--is-->
 				<li>
-					<h5> <a href="${result.url}" class="searchTopLink" >${searchBean.pageNameFromSearchTitle(${result.title})}</a></h5> 
-					<div class="searchItemBody" >${result.searchResult}</div>
+					<h5> <a href="${result.url}" class="searchTopLink" >${util.escapeHtml($searchBean.pageNameFromSearchTitle(${result.title}))}</a></h5> 
+					<div class="searchItemBody" >${util.escapeHtml($result.searchResult)}</div>
 					<div class="searchItemFooter" ><a href="${result.url}" target="searchresult" class="searchBottonLink" >${result.url}</a></div>
 				</li>	
 				<!--ie-->
@@ -118,7 +118,7 @@
 	<p>
 	${foundItem.index}&nbsp;<a href="${util.escapeHtml(${foundItem.url})}" >${foundItem.title}</a><br />
 	${rlb.jsp_search_content}: <br />
-	${foundItem.searchResult} <br />
+	${util.escapeHtml($foundItem.searchResult)} <br />
 	<span style="font-size: smaller;" >${rlb.jsp_search_realms}:<br />
 	#foreach( $realm in ${foundItem.valueMap.realm} )
 	${realm}<br />

diff --git a/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/history.vm b/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/history.vm
@@ -6,7 +6,7 @@
 #set( $referencesBean = ${requestScope.referencesBean} )
 #set( $homeBean = ${requestScope.homeBean} )
 #set( $rlb = ${requestScope.resourceLoaderBean} )
-#set( $title = "${rlb.jsp_info}: ${historyBean.localName}" )
+#set( $title = "${rlb.jsp_info}: ${util.escapeHtml($historyBean.localName)}" )
 #header(${title} false "" )  
 
 

diff --git a/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/printview.vm b/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/printview.vm
@@ -8,7 +8,7 @@
 #set( $rlb = ${requestScope.ResourceLoaderBean} )
 
 #set(${recentlyVisitedBean.ViewPage}=${viewBean})  
-#set( $title = "${rlb.jsp_view}: ${renderBean.localisedPageName}" )
+#set( $title = "${rlb.jsp_view}: ${util.escapeHtml($renderBean.localisedPageName)}" )
 #header(${title} ${viewBean} "" )  
 <div id="rwiki_container">
   <div class="portletBody">

diff --git a/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/publicview.vm b/rwiki/rwiki-tool/tool/src/webapp/WEB-INF/vm/publicview.vm
@@ -8,7 +8,7 @@
 #set( $rlb = ${requestScope.ResourceLoaderBean} )
 
 #set(${recentlyVisitedBean.ViewPage}=${viewBean})  
-#set( $title = "${rlb.jsp_view}: ${renderBean.localisedPageName}" )
+#set( $title = "${rlb.jsp_view}: ${util.escapeHtml($renderBean.localisedPageName)}" )
 #header(${title} ${viewBean} "" )  
 <div id="rwiki_container">
   <div class="portletBody">