|
 |
21065e3 |
--- kdelibs-3.5.10/kio/kssl/ksslinfodlg.cc 2007-05-14 09:52:36.000000000 +0200
|
|
|
21065e3 |
+++ kdelibs-3.5.10/kio/kssl/ksslinfodlg.cc 2011-10-07 20:38:30.000000000 +0200
|
|
|
21065e3 |
@@ -253,6 +253,14 @@
|
|
|
21065e3 |
layout->addWidget(new QLabel(i18n("%1 bits used of a %2 bit cipher").arg(usedbits).arg(bits), this), 10, 1);
|
|
|
21065e3 |
d->m_layout->addMultiCell(layout, 2, 2, 0, 2);
|
|
|
21065e3 |
|
|
|
21065e3 |
+ ipl->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
+ urlLabel->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
+ d->_serialNum->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
+ d->_csl->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
+ d->_validFrom->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
+ d->_validUntil->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
+ d->_digest->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
+
|
|
|
21065e3 |
displayCert(cert);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
|
|
|
21065e3 |
@@ -400,32 +408,32 @@
|
|
|
21065e3 |
if (!(tmp = cert.getValue("O")).isEmpty()) {
|
|
|
21065e3 |
label = new QLabel(i18n("Organization:"), _frame);
|
|
|
21065e3 |
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
|
|
21065e3 |
- new QLabel(tmp, _frame);
|
|
|
21065e3 |
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
if (!(tmp = cert.getValue("OU")).isEmpty()) {
|
|
|
21065e3 |
label = new QLabel(i18n("Organizational unit:"), _frame);
|
|
|
21065e3 |
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
|
|
21065e3 |
- new QLabel(tmp, _frame);
|
|
|
21065e3 |
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
if (!(tmp = cert.getValue("L")).isEmpty()) {
|
|
|
21065e3 |
label = new QLabel(i18n("Locality:"), _frame);
|
|
|
21065e3 |
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
|
|
21065e3 |
- new QLabel(tmp, _frame);
|
|
|
21065e3 |
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
if (!(tmp = cert.getValue("ST")).isEmpty()) {
|
|
|
21065e3 |
label = new QLabel(i18n("Federal State","State:"), _frame);
|
|
|
21065e3 |
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
|
|
21065e3 |
- new QLabel(tmp, _frame);
|
|
|
21065e3 |
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
if (!(tmp = cert.getValue("C")).isEmpty()) {
|
|
|
21065e3 |
label = new QLabel(i18n("Country:"), _frame);
|
|
|
21065e3 |
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
|
|
21065e3 |
- new QLabel(tmp, _frame);
|
|
|
21065e3 |
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
if (!(tmp = cert.getValue("CN")).isEmpty()) {
|
|
|
21065e3 |
label = new QLabel(i18n("Common name:"), _frame);
|
|
|
21065e3 |
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
|
|
21065e3 |
- new QLabel(tmp, _frame);
|
|
|
21065e3 |
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
if (!(tmp = cert.getValue("Email")).isEmpty()) {
|
|
|
21065e3 |
label = new QLabel(i18n("Email:"), _frame);
|
|
|
21065e3 |
@@ -435,6 +443,7 @@
|
|
|
21065e3 |
connect(mail, SIGNAL(leftClickedURL(const QString &)), mailCatcher, SLOT(mailClicked(const QString &)));
|
|
|
21065e3 |
} else {
|
|
|
21065e3 |
label = new QLabel(tmp, _frame);
|
|
|
21065e3 |
+ label->setTextFormat(Qt::PlainText);
|
|
|
21065e3 |
}
|
|
|
21065e3 |
}
|
|
|
21065e3 |
if (label && viewport()) {
|
|
|
21065e3 |
--- kdelibs-3.5.10/kioslave/http/http.cc 2008-02-13 10:41:06.000000000 +0100
|
|
|
21065e3 |
+++ kdelibs-3.5.10-kio_http-qlabel/kioslave/http/http.cc 2011-10-07 21:09:39.000000000 +0200
|
|
|
21065e3 |
@@ -183,6 +183,26 @@
|
|
|
21065e3 |
return sanitizedHeaders.stripWhiteSpace();
|
|
|
21065e3 |
}
|
|
|
21065e3 |
|
|
|
21065e3 |
+static QString htmlEscape(const QString &plain)
|
|
|
21065e3 |
+{
|
|
|
21065e3 |
+ QString rich;
|
|
|
21065e3 |
+ rich.reserve(uint(plain.length() * 1.1));
|
|
|
21065e3 |
+ for (uint i = 0; i < plain.length(); ++i) {
|
|
|
21065e3 |
+ if (plain.at(i) == '<')
|
|
|
21065e3 |
+ rich += "<";
|
|
|
21065e3 |
+ else if (plain.at(i) == '>')
|
|
|
21065e3 |
+ rich += ">";
|
|
|
21065e3 |
+ else if (plain.at(i) == '&')
|
|
|
21065e3 |
+ rich += "&";
|
|
|
21065e3 |
+ else if (plain.at(i) == '"')
|
|
|
21065e3 |
+ rich += """;
|
|
|
21065e3 |
+ else
|
|
|
21065e3 |
+ rich += plain.at(i);
|
|
|
21065e3 |
+ }
|
|
|
21065e3 |
+ rich.squeeze();
|
|
|
21065e3 |
+ return rich;
|
|
|
21065e3 |
+}
|
|
|
21065e3 |
+
|
|
|
21065e3 |
|
|
|
21065e3 |
#define NO_SIZE ((KIO::filesize_t) -1)
|
|
|
21065e3 |
|
|
|
21065e3 |
@@ -5173,7 +5193,7 @@
|
|
|
21065e3 |
info.verifyPath = false;
|
|
|
21065e3 |
info.digestInfo = m_strAuthorization;
|
|
|
21065e3 |
info.commentLabel = i18n( "Site:" );
|
|
|
21065e3 |
- info.comment = i18n("%1 at %2").arg( m_strRealm ).arg( m_request.hostname );
|
|
|
21065e3 |
+ info.comment = i18n("%1 at %2").arg( htmlEscape(m_strRealm) ).arg( m_request.hostname );
|
|
|
21065e3 |
}
|
|
|
21065e3 |
}
|
|
|
21065e3 |
else if ( m_responseCode == 407 )
|
|
|
21065e3 |
@@ -5190,7 +5210,7 @@
|
|
|
21065e3 |
info.verifyPath = false;
|
|
|
21065e3 |
info.digestInfo = m_strProxyAuthorization;
|
|
|
21065e3 |
info.commentLabel = i18n( "Proxy:" );
|
|
|
21065e3 |
- info.comment = i18n("%1 at %2").arg( m_strProxyRealm ).arg( m_proxyURL.host() );
|
|
|
21065e3 |
+ info.comment = i18n("%1 at %2").arg( htmlEscape(m_strProxyRealm) ).arg( m_proxyURL.host() );
|
|
|
21065e3 |
}
|
|
|
21065e3 |
}
|
|
|
21065e3 |
}
|