From ecfef3c2e1d92e78e33bdb351554278c25ddcc52 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Date: Fri, 28 Oct 2011 09:56:42 +0200
Subject: [PATCH] Doc: fix security issue in HTML template

Change-Id: I2fbcb030195a9104eeba8b83037623103efdb5c0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
---
 doc/config/qt-html-templates-online.qdocconf | 13 -------------
 doc/templates/scripts/functions.js           |  5 -----
 2 files changed, 18 deletions(-)

diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index b6ff0509fee..874a2c7229a 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -96,8 +96,6 @@ HTML.postpostheader = \
     "        <div class=\"content mainContent\">\n"
 
 HTML.footer = \
-    "        <div class=\"feedback t_button\">\n" \
-    "          [+] Documentation Feedback</div>\n" \
     "      </div>\n" \
     "    </div>\n" \
     "    </div> \n" \
@@ -123,17 +121,6 @@ HTML.footer = \
     "      Free Documentation License version 1.3</a>\n" \
     "      as published by the Free Software Foundation.</p>\n" \
     "  </div>\n" \
-    "  <div id=\"feedbackBox\">\n" \
-    "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
-    "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
-    "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
-    "      requests, please use the <a href=\"https://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
-    "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
-    "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
-    "    </form>\n" \
-    "  </div>\n" \
-    "  <div id=\"blurpage\">\n" \
-    "  </div>\n" \
     "\n" \
     "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \
     "  <script type=\"text/javascript\">\n" \
diff --git a/doc/templates/scripts/functions.js b/doc/templates/scripts/functions.js
index faa4ca49374..32cc901fe93 100644
--- a/doc/templates/scripts/functions.js
+++ b/doc/templates/scripts/functions.js
@@ -117,13 +117,8 @@ function processNokiaData(response){
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
 {
-	var pageUrl = window.location.href;
-	var pageVal = $('title').html();
 	$('#feedUrl').remove();
-	$('#pageVal').remove();
 	$('.menuAlert').remove();
-	$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
-	$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
 	$('.liveResult').remove();
     $('.defaultLink').css('display','block');
 	var value = document.getElementById('pageType').value;