diff options
| author | reger <reger18@arcor.de> | 2016-12-23 19:03:44 +0100 |
|---|---|---|
| committer | reger <reger18@arcor.de> | 2016-12-23 19:03:44 +0100 |
| commit | f153cc4b5d07a8ca9865012142596a733036c74f (patch) | |
| tree | 72f5230c8a45257555422b2db27c113d320b5da8 /htroot/proxymsg | |
| parent | 7bf2bcf504cc7e3607f508ff4907b1a4d1ad1859 (diff) | |
add/allow to create a bookmark of result viewed via urlproxy.
For this on the header of the viewed result a "add bookmark" button is
available (for authenticated users).
Currently the bookmark is added to a (virtual) bookmark folder "/proxy"
w/o any additional tags etc.
Diffstat (limited to 'htroot/proxymsg')
| -rw-r--r-- | htroot/proxymsg/urlproxyheader.html | 7 | ||||
| -rw-r--r-- | htroot/proxymsg/urlproxyheader.java | 19 |
2 files changed, 22 insertions, 4 deletions
diff --git a/htroot/proxymsg/urlproxyheader.html b/htroot/proxymsg/urlproxyheader.html index 5f53ef526..61bf64a12 100644 --- a/htroot/proxymsg/urlproxyheader.html +++ b/htroot/proxymsg/urlproxyheader.html @@ -2,8 +2,11 @@ <html> <body style="background:white"> <div align="center" style="width:98%; padding:5px; background:white; border-bottom: medium solid lightgrey;"> - <form method="get" target="_parent" action="#[proxyurl]#"> - <input type="submit" value="YaCy stop proxy"> #(httpsAlertMsg)#:: - <span style='color:red'>(Warning: secure target viewed over normal http)</span>#(/httpsAlertMsg)# + <form method="get" action="?url=#[proxyurl]#"> + <button name="exit" onclick="parent.location='#[proxyurl]#'">YaCy stop proxy</button> + #(httpsAlertMsg)#:: - <span style='color:red'>(Warning: secure target viewed over normal http)</span>#(/httpsAlertMsg)# + #(allowbookmark)#::<input type="hidden" name="bookmark" value="#[proxyurl]#"> + <input type="submit" name="addbookmark" value="add bookmark">#(/allowbookmark)# </form> </div> </body> diff --git a/htroot/proxymsg/urlproxyheader.java b/htroot/proxymsg/urlproxyheader.java index ff7d86cf9..4c0bff9f7 100644 --- a/htroot/proxymsg/urlproxyheader.java +++ b/htroot/proxymsg/urlproxyheader.java @@ -1,4 +1,5 @@ import net.yacy.cora.protocol.RequestHeader; +import net.yacy.data.BookmarksDB.Bookmark; import net.yacy.search.Switchboard; import net.yacy.server.serverObjects; import net.yacy.server.serverSwitch; @@ -13,10 +14,24 @@ public class urlproxyheader { final serverObjects prop = new serverObjects(); final Switchboard sb = (Switchboard) env; - final String proxyurlstr = post.get("url",""); // the url of remote page currently viewed + String proxyurlstr = post.get("url",""); // the url of remote page currently viewed + boolean hasRights = sb.verifyAuthentication(requestHeader); + prop.put("allowbookmark", hasRights); + + if (post.containsKey("addbookmark")) { + proxyurlstr = post.get("bookmark"); + Bookmark bmk = sb.bookmarksDB.createorgetBookmark(proxyurlstr, null); + if (bmk != null) { + bmk.setPublic(false); + bmk.addTag("/proxy"); // add to bookmark folder + sb.bookmarksDB.saveBookmark(bmk); + } + } + prop.put("proxyurl", proxyurlstr); + prop.put("allowbookmark_proxyurl", proxyurlstr); - if (proxyurlstr.startsWith("https")) { + if (proxyurlstr.startsWith("https") && !requestHeader.getScheme().equalsIgnoreCase("https")) { prop.put("httpsAlertMsg", "1"); } else { prop.put("httpsAlertMsg", "0"); |