64 lines
2.9 KiB
Diff
64 lines
2.9 KiB
Diff
diff -ur kdelibs-orig/kio/kssl/ksslcertificatebox.cpp kdelibs-4.7.1/kio/kssl/ksslcertificatebox.cpp
|
|
--- kdelibs-orig/kio/kssl/ksslcertificatebox.cpp 2011-05-20 22:24:54.000000000 +0200
|
|
+++ kdelibs-4.7.1/kio/kssl/ksslcertificatebox.cpp 2011-10-04 18:05:51.542741747 +0200
|
|
@@ -36,6 +36,10 @@
|
|
d(new KSslCertificateBoxPrivate())
|
|
{
|
|
d->ui.setupUi(this);
|
|
+ // No fooling us with html tags
|
|
+ Q_FOREACH(QLabel* label, qFindChildren<QLabel *>(this)) {
|
|
+ label->setTextFormat(Qt::PlainText);
|
|
+ }
|
|
}
|
|
|
|
|
|
diff -ur kdelibs-orig/kioslave/http/http.cpp kdelibs-4.7.1/kioslave/http/http.cpp
|
|
--- kdelibs-orig/kioslave/http/http.cpp 2011-08-22 15:22:03.000000000 +0200
|
|
+++ kdelibs-4.7.1/kioslave/http/http.cpp 2011-10-04 18:05:51.544741717 +0200
|
|
@@ -86,6 +86,27 @@
|
|
//string parsing helpers and HeaderTokenizer implementation
|
|
#include "parsinghelpers.cpp"
|
|
|
|
+// KDE5 TODO (QT5) : use QString::htmlEscape or whatever https://qt.gitorious.org/qt/qtbase/merge_requests/56
|
|
+// ends up with.
|
|
+static QString htmlEscape(const QString &plain)
|
|
+{
|
|
+ QString rich;
|
|
+ rich.reserve(int(plain.length() * 1.1));
|
|
+ for (int i = 0; i < plain.length(); ++i) {
|
|
+ if (plain.at(i) == QLatin1Char('<'))
|
|
+ rich += QLatin1String("<");
|
|
+ else if (plain.at(i) == QLatin1Char('>'))
|
|
+ rich += QLatin1String(">");
|
|
+ else if (plain.at(i) == QLatin1Char('&'))
|
|
+ rich += QLatin1String("&");
|
|
+ else if (plain.at(i) == QLatin1Char('"'))
|
|
+ rich += QLatin1String(""");
|
|
+ else
|
|
+ rich += plain.at(i);
|
|
+ }
|
|
+ rich.squeeze();
|
|
+ return rich;
|
|
+}
|
|
|
|
// see filenameFromUrl(): a sha1 hash is 160 bits
|
|
static const int s_hashedUrlBits = 160; // this number should always be divisible by eight
|
|
@@ -3431,7 +3452,7 @@
|
|
authinfo.url = reqUrl;
|
|
authinfo.keepPassword = true;
|
|
authinfo.comment = i18n("<b>%1</b> at <b>%2</b>",
|
|
- authinfo.realmValue, authinfo.url.host());
|
|
+ htmlEscape(authinfo.realmValue), authinfo.url.host());
|
|
|
|
if (!openPasswordDialog(authinfo, errorMsg)) {
|
|
if (sendErrorPageNotification()) {
|
|
@@ -5262,7 +5283,7 @@
|
|
"to access any sites.");
|
|
info.keepPassword = true;
|
|
info.commentLabel = i18n("Proxy:");
|
|
- info.comment = i18n("<b>%1</b> at <b>%2</b>", info.realmValue, m_request.proxyUrl.host());
|
|
+ info.comment = i18n("<b>%1</b> at <b>%2</b>", htmlEscape(info.realmValue), m_request.proxyUrl.host());
|
|
const bool dataEntered = openPasswordDialog(info, i18n("Proxy Authentication Failed."));
|
|
if (!dataEntered) {
|
|
kDebug(7103) << "looks like the user canceled proxy authentication.";
|