diff --git a/htroot/Blog.rss b/htroot/Blog.rss index a1e07a9ab..d5444747a 100644 --- a/htroot/Blog.rss +++ b/htroot/Blog.rss @@ -1,11 +1,17 @@ - YaCy-Blog of Peer #[peername]# + <![CDATA[YaCy '#[clientname]#': Bookmarks]]> http://#[address]#/Blog.html + + http://#[address]#/env/grafics/yacy.png + YaCy + http://#[address]#/ + + #(mode)# #{entries}# - #[author]# - #[subject]# + + <![CDATA[#[subject]#]]> http://#[address]#/Blog.html?page=#[pageid]# #[date]# #[pageid]# diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html index b23ca42b6..fd4f9ed41 100644 --- a/htroot/Bookmarks.html +++ b/htroot/Bookmarks.html @@ -5,6 +5,7 @@ #%env/templates/metas.template%# + #%env/templates/header.template%# diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index 03f0263e5..5fb3df837 100644 --- a/htroot/Bookmarks.java +++ b/htroot/Bookmarks.java @@ -47,6 +47,7 @@ import java.io.File; import java.net.MalformedURLException; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -75,14 +76,17 @@ public class Bookmarks { userDB.Entry user=switchboard.userDB.getUser(header); boolean isAdmin=(switchboard.verifyAuthentication(header, true) || user!= null && user.hasBookmarkRight()); String username=""; - if(user != null) - username=user.getUserName(); - else if(isAdmin) - username="admin"; + if(user != null) username=user.getUserName(); + else if(isAdmin) username="admin"; //redirect to userpage if(username!="" &&(post == null || !post.containsKey("user") && !post.containsKey("mode"))) prop.put("LOCATION", "/Bookmarks.html?user="+username); + prop.put("user",username); + + // set peer address + final String address = yacyCore.seedDB.mySeed.getAddress(); + prop.put("address", address); //defaultvalues prop.put("mode", 0); @@ -252,6 +256,7 @@ public class Bookmarks { prop.put("bookmarks_"+count+"_link", de.anomic.data.wikiCode.replaceXMLEntities(bookmark.getUrl())); prop.put("bookmarks_"+count+"_title", bookmark.getTitle()); prop.put("bookmarks_"+count+"_description", bookmark.getDescription()); + prop.put("bookmarks_"+count+"_date", bookmarksDB.dateToiso8601(new Date(bookmark.getTimeStamp()))); prop.put("bookmarks_"+count+"_public", (bookmark.getPublic()? 1:0)); //List Tags. diff --git a/htroot/Bookmarks.rss b/htroot/Bookmarks.rss new file mode 100644 index 000000000..5e8311f1c --- /dev/null +++ b/htroot/Bookmarks.rss @@ -0,0 +1,16 @@ + + + + YaCy-Blog of Peer #[clientname]# + http://#[address]#/Bookmarks.html + + + #{bookmarks}# + <![CDATA[#[title]#]]> + #[link]# + #[date]# + #[hash]# + #[description]#

Tagged with | #{tags}##[tag]# | #{/tags}#

]]> + #{tags}##{/tags}# + #{/bookmarks}# + \ No newline at end of file