]>
Commit | Line | Data |
---|---|---|
a8bff8ad PG |
1 | Index: khtml_part.cpp |
2 | =================================================================== | |
3 | RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v | |
4 | retrieving revision 1.770.2.27 | |
5 | diff -u -r1.770.2.27 khtml_part.cpp | |
6 | --- khtml_part.cpp 3 Jul 2003 17:13:02 -0000 1.770.2.27 | |
7 | +++ khtml_part.cpp 10 Jul 2003 11:45:10 -0000 | |
8 | @@ -4171,7 +4171,27 @@ | |
9 | ||
10 | QString KHTMLPart::referrer() const | |
11 | { | |
12 | - return d->m_pageReferrer; | |
13 | + return d->m_referrer; | |
14 | +} | |
15 | + | |
16 | +QString KHTMLPart::pageReferrer() const | |
17 | +{ | |
18 | + KURL referrerURL = d->m_pageReferrer; | |
19 | + if (referrerURL.isValid()) | |
20 | + { | |
21 | + QString protocol = referrerURL.protocol(); | |
22 | + | |
23 | + if ((protocol == "http") || | |
24 | + ((protocol == "https") && (m_url.protocol() == "https"))) | |
25 | + { | |
26 | + referrerURL.setRef(QString::null); | |
27 | + referrerURL.setUser(QString::null); | |
28 | + referrerURL.setPass(QString::null); | |
29 | + return referrerURL.url(); | |
30 | + } | |
31 | + } | |
32 | + | |
33 | + return QString::null; | |
34 | } | |
35 | ||
36 | QString KHTMLPart::lastModified() const | |
37 | Index: khtml_part.h | |
38 | =================================================================== | |
39 | RCS file: /home/kde/kdelibs/khtml/khtml_part.h,v | |
40 | retrieving revision 1.197.2.5 | |
41 | diff -u -r1.197.2.5 khtml_part.h | |
42 | --- khtml_part.h 18 May 2003 12:34:36 -0000 1.197.2.5 | |
43 | +++ khtml_part.h 10 Jul 2003 11:45:11 -0000 | |
44 | @@ -702,6 +702,11 @@ | |
45 | QString referrer() const; | |
46 | ||
47 | /** | |
48 | + * Referrer used to obtain this page. | |
49 | + */ | |
50 | + QString pageReferrer() const; | |
51 | + | |
52 | + /** | |
53 | * Last-modified date (in raw string format), if received in the [HTTP] headers. | |
54 | */ | |
55 | QString lastModified() const; | |
56 | Index: html/html_documentimpl.cpp | |
57 | =================================================================== | |
58 | RCS file: /home/kde/kdelibs/khtml/html/html_documentimpl.cpp,v | |
59 | retrieving revision 1.143.2.6 | |
60 | diff -u -r1.143.2.6 html_documentimpl.cpp | |
61 | --- html/html_documentimpl.cpp 27 Jun 2003 09:55:33 -0000 1.143.2.6 | |
62 | +++ html/html_documentimpl.cpp 10 Jul 2003 11:45:11 -0000 | |
63 | @@ -85,7 +85,7 @@ | |
64 | DOMString HTMLDocumentImpl::referrer() const | |
65 | { | |
66 | if ( view() ) | |
67 | - return view()->part()->referrer(); | |
68 | + return view()->part()->pageReferrer(); | |
69 | return DOMString(); | |
70 | } | |
71 |