Commit cb00cd5f2fe83a42a1b36220ba663542b199ed99

Jakub Wieczorek <faw217 @gm…l.com>
Mon Jun 22 21:53:52 CEST 2009

Tree SHA1: dd460fa
Parent SHA1: f0696b0 ([Autotest] Rename the qrc files so that we don't get naming collision)
raw diff | raw patch

Tweak the certToFormattedString() function:
- make it a static member of NetworkAccessManager
- use tr() rather than QLatin1String
- clean up the code, extract the translatable parts from the HTML
  code.

Diff rendering mode:
inline
side by side


256	256	}
257	257
258	258	#ifndef QT_NO_OPENSSL
259		static QString certToFormattedString(QSslCertificate cert)
	259	QString NetworkAccessManager::certToFormattedString(QSslCertificate cert)
260	260	{
261		QString resultstring = QLatin1String("<p>");
262		QStringList tmplist;
	261	QStringList message;
	262	message << cert.subjectInfo(QSslCertificate::CommonName);
	263	message << tr("Issuer: %1").arg(cert.issuerInfo(QSslCertificate::CommonName));
	264	message << tr("Not valid before: %1").arg(cert.effectiveDate().toString());
	265	message << tr("Valid until: %1").arg(cert.expiryDate().toString());
263	266
264		resultstring += cert.subjectInfo(QSslCertificate::CommonName);
265
266		resultstring += QString::fromLatin1("<br/>Issuer: %1")
267		.arg(cert.issuerInfo(QSslCertificate::CommonName));
268
269		resultstring += QString::fromLatin1("<br/>Not valid before: %1<br/>Valid Until: %2")
270		.arg(cert.effectiveDate().toString(Qt::ISODate))
271		.arg(cert.expiryDate().toString(Qt::ISODate));
272
273	267	QMultiMap<QSsl::AlternateNameEntryType, QString> names = cert.alternateSubjectNames();
274	268	if (names.count() > 0) {
275		tmplist = names.values(QSsl::DnsEntry);
276		resultstring += QLatin1String("<br/>Alternate Names:<ul><li>")
277		+ tmplist.join(QLatin1String("</li><li>"))
278		+ QLatin1String("</li></ul>");
	269	QString list;
	270	list += QLatin1String("<br />");
	271	list += tr("Alternate Names:");
	272	list += QLatin1String("<ul><li>");
	273	list += QStringList(names.values(QSsl::DnsEntry)).join(QLatin1String("</li><li>"));
	274	list += QLatin1String("</li></ul>");
	275	message << list;
279	276	}
280	277
281		resultstring += QLatin1String("</p>");
	278	QString result = QLatin1String("<p>") + message.join(QLatin1String("<br />")) + QLatin1String("</p>");
282	279
283		return resultstring;
	280	return result;
284	281	}
285	282
286	283	void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)


65	65
66	66	#include <qnetworkaccessmanager.h>
67	67	#include <qnetworkproxy.h>
	68	#include <qsslconfiguration.h>
68	69
69	70	#if QT_VERSION >= 0x040500
70	71	class NetworkProxyFactory : public QNetworkProxyFactory
…	…
108	108	#endif
109	109
110	110	private:
	111	#ifndef QT_NO_OPENSSL
	112	static QString certToFormattedString(QSslCertificate cert);
	113	#endif
	114
111	115	QByteArray m_acceptLanguage;
112	116	};
113	117


215	215	return QLatin1String("POST");
216	216	break;
217	217	default:
218		return QLatin1String("Unknown");
	218	return tr("Unknown");
219	219	}
220	220	case 1:
221	221	return m_requests[index.row()].request.url().toEncoded();

Commit cb00cd5f2fe83a42a1b36220ba663542b199ed99

Gitorious