boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

replaced some put(String, String) by putHTML(String, String) on serverObjects respond

Browse Source 
in htroot/ root
didn't touch htroot/xml/
this should solve potential xss issues

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5184 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
lotus 17 years ago
parent 5b2a57bfd0
commit 029e16b653
33 changed files with 116 additions and 116 deletions
Show Stats Download Patch File Download Diff File

8
htroot/Blacklist_p.java
Unescape View File

@ -264,8 +264,8 @@ prop.putHTML("asd", "0");
final String selectedEntry = post.get("selectedEntry"); final String selectedEntry = post.get("selectedEntry");
final String currentBlacklist = post.get("currentBlacklist"); final String currentBlacklist = post.get("currentBlacklist");
if (selectedEntry != null && currentBlacklist != null) { if (selectedEntry != null && currentBlacklist != null) {
prop.put(DISABLED + "edit_item", selectedEntry); prop.putHTML(DISABLED + "edit_item", selectedEntry);
prop.put(DISABLED + "edit_currentBlacklist", currentBlacklist); prop.putHTML(DISABLED + "edit_currentBlacklist", currentBlacklist);
prop.put(DISABLED + "edit", "1"); prop.put(DISABLED + "edit", "1");
} }
} }
@ -298,7 +298,7 @@ prop.putHTML("asd", "0");
if (nextEntry.length() == 0) continue; if (nextEntry.length() == 0) continue;
if (nextEntry.startsWith("#")) continue; if (nextEntry.startsWith("#")) continue;
prop.put(DISABLED + "Itemlist_" + entryCount + "_item", nextEntry); prop.putHTML(DISABLED + "Itemlist_" + entryCount + "_item", nextEntry);
entryCount++; entryCount++;
} }
prop.put(DISABLED + "Itemlist", entryCount); prop.put(DISABLED + "Itemlist", entryCount);
@ -318,7 +318,7 @@ prop.putHTML("asd", "0");
String peername; String peername;
while ((peername = hostList.firstKey()) != null) { while ((peername = hostList.firstKey()) != null) {
final String Hash = hostList.get(peername); final String Hash = hostList.get(peername);
prop.put(DISABLED + "otherHosts_" + peerCount + "_hash", Hash); prop.putHTML(DISABLED + "otherHosts_" + peerCount + "_hash", Hash);
prop.putHTML(DISABLED + "otherHosts_" + peerCount + "_name", peername, true); prop.putHTML(DISABLED + "otherHosts_" + peerCount + "_name", peername, true);
hostList.remove(peername); hostList.remove(peername);
peerCount++; peerCount++;

2
htroot/Blog.java
Unescape View File

@ -213,7 +213,7 @@ public class Blog {
else if(post.get("delete", "").equals("try")) { else if(post.get("delete", "").equals("try")) {
if(hasRights) { if(hasRights) {
prop.put("mode", "4"); prop.put("mode", "4");
prop.put("mode_pageid", pagename); prop.putHTML("mode_pageid", pagename, xml);
try { try {
prop.putHTML("mode_author",new String(page.getAuthor(), "UTF-8"), xml); prop.putHTML("mode_author",new String(page.getAuthor(), "UTF-8"), xml);
} catch (final UnsupportedEncodingException e) { } catch (final UnsupportedEncodingException e) {

8
htroot/BlogComments.java
Unescape View File

@ -143,7 +143,7 @@ public class BlogComments {
blogEntry.addComment(commentID); blogEntry.addComment(commentID);
sb.blogDB.writeBlogEntry(blogEntry); sb.blogDB.writeBlogEntry(blogEntry);
sb.blogCommentDB.write(sb.blogCommentDB.newEntry(commentID, subject, author, ip, date, content)); sb.blogCommentDB.write(sb.blogCommentDB.newEntry(commentID, subject, author, ip, date, content));
prop.put("LOCATION","BlogComments.html?page=" + pagename); prop.putHTML("LOCATION","BlogComments.html?page=" + pagename);
messageBoard.entry msgEntry = null; messageBoard.entry msgEntry = null;
try { try {
@ -191,8 +191,8 @@ public class BlogComments {
if(post.containsKey("preview") && page.getCommentMode() != 0) { if(post.containsKey("preview") && page.getCommentMode() != 0) {
//preview the page //preview the page
prop.put("mode", "1");//preview prop.put("mode", "1");//preview
prop.put("mode_pageid", pagename); prop.putHTML("mode_pageid", pagename);
prop.put("mode_allow_pageid", pagename); prop.putHTML("mode_allow_pageid", pagename);
try { try {
prop.putHTML("mode_author", new String(author, "UTF-8")); prop.putHTML("mode_author", new String(author, "UTF-8"));
prop.putHTML("mode_allow_author", new String(author, "UTF-8")); prop.putHTML("mode_allow_author", new String(author, "UTF-8"));
@ -212,7 +212,7 @@ public class BlogComments {
} else { } else {
//show 1 blog entry //show 1 blog entry
prop.put("mode_pageid", page.getKey()); prop.put("mode_pageid", page.getKey());
prop.put("mode_allow_pageid", pagename); prop.putHTML("mode_allow_pageid", pagename);
try { try {
prop.putHTML("mode_subject", new String(page.getSubject(),"UTF-8")); prop.putHTML("mode_subject", new String(page.getSubject(),"UTF-8"));
} catch (final UnsupportedEncodingException e) { } catch (final UnsupportedEncodingException e) {

8
htroot/Bookmarks.java
Unescape View File

@ -83,7 +83,7 @@ public class Bookmarks {
// set user name // set user name
if(user != null) username=user.getUserName(); if(user != null) username=user.getUserName();
else if(isAdmin) username="admin"; else if(isAdmin) username="admin";
prop.put("user", username); prop.putHTML("user", username);
//redirect to userpage //redirect to userpage
/* /*
@ -167,7 +167,7 @@ public class Bookmarks {
prop.put("mode_edit", "0"); // create mode prop.put("mode_edit", "0"); // create mode
prop.putHTML("mode_title", post.get("title")); prop.putHTML("mode_title", post.get("title"));
prop.putHTML("mode_description", post.get("description")); prop.putHTML("mode_description", post.get("description"));
prop.put("mode_url", post.get("url")); prop.putHTML("mode_url", post.get("url"));
prop.putHTML("mode_tags", post.get("tags")); prop.putHTML("mode_tags", post.get("tags"));
prop.putHTML("mode_path", post.get("path")); prop.putHTML("mode_path", post.get("path"));
prop.put("mode_public", "0"); prop.put("mode_public", "0");
@ -197,7 +197,7 @@ public class Bookmarks {
prop.put("mode_edit", "1"); // edit mode prop.put("mode_edit", "1"); // edit mode
prop.putHTML("mode_title", bookmark.getTitle()); prop.putHTML("mode_title", bookmark.getTitle());
prop.putHTML("mode_description", bookmark.getDescription()); prop.putHTML("mode_description", bookmark.getDescription());
prop.put("mode_url", bookmark.getUrl()); prop.put("mode_url", bookmark.getUrl()); //TODO: XSS protection - how is this stored?
prop.putHTML("mode_tags", bookmark.getTagsString()); prop.putHTML("mode_tags", bookmark.getTagsString());
prop.putHTML("mode_path",bookmark.getFoldersString()); prop.putHTML("mode_path",bookmark.getFoldersString());
if (bookmark.getPublic()) { if (bookmark.getPublic()) {
@ -304,7 +304,7 @@ public class Bookmarks {
while (tagsIt.hasNext()) { while (tagsIt.hasNext()) {
final String tname = tagsIt.next(); final String tname = tagsIt.next();
if ((!tname.startsWith("/")) && (!tname.equals(""))) { if ((!tname.startsWith("/")) && (!tname.equals(""))) {
prop.put("bookmarks_"+count+"_tags_"+tagCount+"_tag", tname); prop.putHTML("bookmarks_"+count+"_tags_"+tagCount+"_tag", tname);
tagCount++; tagCount++;
} }
} }

4
htroot/ConfigAccounts_p.java
Unescape View File

@ -132,8 +132,8 @@ public class ConfigAccounts_p {
// link: "If you want to manage more Users, return to the user page." (parameter "user" is empty) // link: "If you want to manage more Users, return to the user page." (parameter "user" is empty)
if (entry != null) { if (entry != null) {
//TODO: set username read-only in html //TODO: set username read-only in html
prop.put("current_user", post.get("user")); prop.putHTML("current_user", post.get("user"));
prop.put("username", post.get("user")); prop.putHTML("username", post.get("user"));
prop.putHTML("firstname", entry.getFirstName()); prop.putHTML("firstname", entry.getFirstName());
prop.putHTML("lastname", entry.getLastName()); prop.putHTML("lastname", entry.getLastName());
prop.putHTML("address", entry.getAddress()); prop.putHTML("address", entry.getAddress());

10
htroot/ConfigAppearance_p.java
Unescape View File

@ -140,12 +140,12 @@ public class ConfigAppearance_p {
} }
prop.put("skinlist", i); prop.put("skinlist", i);
prop.put("currentskin", env.getConfig("currentSkin", "default")); prop.putHTML("currentskin", env.getConfig("currentSkin", "default"));
prop.put("promoteSearchPageGreeting", sb.getConfig("promoteSearchPageGreeting", "")); prop.putHTML("promoteSearchPageGreeting", sb.getConfig("promoteSearchPageGreeting", ""));
prop.put("promoteSearchPageGreeting.homepage", sb.getConfig("promoteSearchPageGreeting.homepage", "")); prop.putHTML("promoteSearchPageGreeting.homepage", sb.getConfig("promoteSearchPageGreeting.homepage", ""));
prop.put("promoteSearchPageGreeting.largeImage", sb.getConfig("promoteSearchPageGreeting.largeImage", "")); prop.putHTML("promoteSearchPageGreeting.largeImage", sb.getConfig("promoteSearchPageGreeting.largeImage", ""));
prop.put("promoteSearchPageGreeting.smallImage", sb.getConfig("promoteSearchPageGreeting.smallImage", "")); prop.putHTML("promoteSearchPageGreeting.smallImage", sb.getConfig("promoteSearchPageGreeting.smallImage", ""));
String myaddress = sb.webIndex.seedDB.mySeed().getPublicAddress(); String myaddress = sb.webIndex.seedDB.mySeed().getPublicAddress();
if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8080"); if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8080");
prop.put("myaddress", myaddress); prop.put("myaddress", myaddress);

10
htroot/ConfigBasic.java
Unescape View File

@ -83,9 +83,9 @@ public class ConfigBasic {
final String peerName = (post == null) ? env.getConfig("peerName","") : (String) post.get("peername", ""); final String peerName = (post == null) ? env.getConfig("peerName","") : (String) post.get("peername", "");
// port settings // port settings
String port = env.getConfig("port", "8080"); //this allows a low port, but it will only get one, if the user edits the config himself. long port = env.getConfigLong("port", 8080); //this allows a low port, but it will only get one, if the user edits the config himself.
if (post != null && Integer.parseInt(post.get("port")) > 1023) { if (post != null && Integer.parseInt(post.get("port")) > 1023) {
port = post.get("port", "8080"); port = post.getLong("port", 8080);
} }
// check if peer name already exists // check if peer name already exists
@ -98,7 +98,7 @@ public class ConfigBasic {
// check port // check port
boolean reconnect = false; boolean reconnect = false;
if (!env.getConfig("port", port).equals(port)) { if (!(env.getConfigLong("port", port) == port)) {
// validate port // validate port
final serverCore theServerCore = (serverCore) env.getThread("10_httpd"); final serverCore theServerCore = (serverCore) env.getThread("10_httpd");
env.setConfig("port", port); env.setConfig("port", port);
@ -201,8 +201,8 @@ public class ConfigBasic {
// set default values // set default values
prop.put("defaultName", env.getConfig("peerName", "")); prop.putHTML("defaultName", env.getConfig("peerName", ""));
prop.put("defaultPort", env.getConfig("port", "8080")); prop.putHTML("defaultPort", env.getConfig("port", "8080"));
lang = env.getConfig("locale.language", "default"); // re-assign lang, may have changed lang = env.getConfig("locale.language", "default"); // re-assign lang, may have changed
if (lang.equals("default")) { if (lang.equals("default")) {
prop.put("langDeutsch", "0"); prop.put("langDeutsch", "0");

14
htroot/ConfigNetwork_p.java
Unescape View File

@ -192,8 +192,8 @@ public class ConfigNetwork_p {
// set p2p/robinson mode flags and values // set p2p/robinson mode flags and values
prop.put("p2p.checked", (indexDistribute || indexReceive) ? "1" : "0"); prop.put("p2p.checked", (indexDistribute || indexReceive) ? "1" : "0");
prop.put("robinson.checked", (indexDistribute || indexReceive) ? "0" : "1"); prop.put("robinson.checked", (indexDistribute || indexReceive) ? "0" : "1");
prop.put("cluster.peers.ipport", sb.getConfig("cluster.peers.ipport", "")); prop.putHTML("cluster.peers.ipport", sb.getConfig("cluster.peers.ipport", ""));
prop.put("cluster.peers.yacydomain", sb.getConfig("cluster.peers.yacydomain", "")); prop.putHTML("cluster.peers.yacydomain", sb.getConfig("cluster.peers.yacydomain", ""));
prop.put("cluster.peers.yacydomain.hashes", (sb.clusterhashes.size() == 0) ? "" : sb.clusterhashes.toString()); prop.put("cluster.peers.yacydomain.hashes", (sb.clusterhashes.size() == 0) ? "" : sb.clusterhashes.toString());
// set p2p mode flags // set p2p mode flags
@ -203,11 +203,11 @@ public class ConfigNetwork_p {
prop.put("publicpeerChecked", (sb.getConfig("cluster.mode", "").equals("publicpeer")) ? "1" : "0"); prop.put("publicpeerChecked", (sb.getConfig("cluster.mode", "").equals("publicpeer")) ? "1" : "0");
// set network configuration // set network configuration
prop.put("network.unit.definition", sb.getConfig("network.unit.definition", "")); prop.putHTML("network.unit.definition", sb.getConfig("network.unit.definition", ""));
prop.put("network.unit.name", sb.getConfig("network.unit.name", "")); prop.putHTML("network.unit.name", sb.getConfig("network.unit.name", ""));
prop.put("network.unit.description", sb.getConfig("network.unit.description", "")); prop.putHTML("network.unit.description", sb.getConfig("network.unit.description", ""));
prop.put("network.unit.domain", sb.getConfig("network.unit.domain", "")); prop.putHTML("network.unit.domain", sb.getConfig("network.unit.domain", ""));
prop.put("network.unit.dht", sb.getConfig("network.unit.dht", "")); prop.putHTML("network.unit.dht", sb.getConfig("network.unit.dht", ""));
networkBootstrapLocations.remove(sb.getConfig("network.unit.definition", "")); networkBootstrapLocations.remove(sb.getConfig("network.unit.definition", ""));
int c = 0; int c = 0;
for (final String s: networkBootstrapLocations) prop.put("networks_" + c++ + "_network", s); for (final String s: networkBootstrapLocations) prop.put("networks_" + c++ + "_network", s);

30
htroot/ConfigProfile_p.java
Unescape View File

@ -74,14 +74,14 @@ public class ConfigProfile_p {
prop.putHTML("name", profile.getProperty("name", "")); prop.putHTML("name", profile.getProperty("name", ""));
prop.putHTML("nickname", profile.getProperty("nickname", "")); prop.putHTML("nickname", profile.getProperty("nickname", ""));
prop.put("homepage", profile.getProperty("homepage", "")); prop.putHTML("homepage", profile.getProperty("homepage", ""));
prop.put("email", profile.getProperty("email", "")); prop.putHTML("email", profile.getProperty("email", ""));
prop.put("icq", profile.getProperty("icq", "")); prop.putHTML("icq", profile.getProperty("icq", ""));
prop.put("jabber", profile.getProperty("jabber", "")); prop.putHTML("jabber", profile.getProperty("jabber", ""));
prop.put("yahoo", profile.getProperty("yahoo", "")); prop.putHTML("yahoo", profile.getProperty("yahoo", ""));
prop.put("msn", profile.getProperty("msn", "")); prop.putHTML("msn", profile.getProperty("msn", ""));
prop.put("skype", profile.getProperty("skype", "")); prop.putHTML("skype", profile.getProperty("skype", ""));
prop.putHTML("comment", profile.getProperty("comment", "")); prop.putHTML("comment", profile.getProperty("comment", ""));
@ -105,14 +105,14 @@ public class ConfigProfile_p {
else{ else{
prop.putHTML("name", profile.getProperty("name", "")); prop.putHTML("name", profile.getProperty("name", ""));
prop.putHTML("nickname", profile.getProperty("nickname", "")); prop.putHTML("nickname", profile.getProperty("nickname", ""));
prop.put("homepage", profile.getProperty("homepage", "")); prop.putHTML("homepage", profile.getProperty("homepage", ""));
prop.put("email", profile.getProperty("email", "")); prop.putHTML("email", profile.getProperty("email", ""));
prop.put("icq", profile.getProperty("icq", "")); prop.putHTML("icq", profile.getProperty("icq", ""));
prop.put("jabber", profile.getProperty("jabber", "")); prop.putHTML("jabber", profile.getProperty("jabber", ""));
prop.put("yahoo", profile.getProperty("yahoo", "")); prop.putHTML("yahoo", profile.getProperty("yahoo", ""));
prop.put("msn", profile.getProperty("msn", "")); prop.putHTML("msn", profile.getProperty("msn", ""));
prop.put("skype", profile.getProperty("skype", "")); prop.putHTML("skype", profile.getProperty("skype", ""));
prop.putHTML("comment", profile.getProperty("comment", "")); prop.putHTML("comment", profile.getProperty("comment", ""));
} }

10
htroot/ConfigUpdate_p.java
Unescape View File

@ -51,7 +51,7 @@ public class ConfigUpdate_p {
if (post != null) { if (post != null) {
if (post.containsKey("update")) { if (post.containsKey("update")) {
prop.put("forwardToSteering", "1"); prop.put("forwardToSteering", "1");
prop.put("forwardToSteering_release",post.get("releaseinstall", "")); prop.putHTML("forwardToSteering_release",post.get("releaseinstall", ""));
prop.put("deploys", "1"); prop.put("deploys", "1");
prop.put("candeploy", "2"); // display nothing else prop.put("candeploy", "2"); // display nothing else
return prop; return prop;
@ -92,7 +92,7 @@ public class ConfigUpdate_p {
// there is a version that is more recent. Load it and re-start with it // there is a version that is more recent. Load it and re-start with it
sb.getLog().logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.url); sb.getLog().logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.url);
final File downloaded = yacyVersion.downloadRelease(updateVersion); final File downloaded = yacyVersion.downloadRelease(updateVersion);
prop.put("candeploy_autoUpdate_downloadedRelease", updateVersion.name); prop.putHTML("candeploy_autoUpdate_downloadedRelease", updateVersion.name);
final boolean devenvironment = yacyVersion.combined2prettyVersion(sb.getConfig("version","0.1")).startsWith("dev"); final boolean devenvironment = yacyVersion.combined2prettyVersion(sb.getConfig("version","0.1")).startsWith("dev");
if (devenvironment) { if (devenvironment) {
sb.getLog().logInfo("AUTO-UPDATE: omiting update because this is a development environment"); sb.getLog().logInfo("AUTO-UPDATE: omiting update because this is a development environment");
@ -129,7 +129,7 @@ public class ConfigUpdate_p {
// version information // version information
final String versionstring = yacyVersion.combined2prettyVersion(sb.getConfig("version","0.1")); final String versionstring = yacyVersion.combined2prettyVersion(sb.getConfig("version","0.1"));
prop.put("candeploy_versionpp", versionstring); prop.putHTML("candeploy_versionpp", versionstring);
final boolean devenvironment = versionstring.startsWith("dev"); final boolean devenvironment = versionstring.startsWith("dev");
double thisVersion = Double.parseDouble(sb.getConfig("version","0.1")); double thisVersion = Double.parseDouble(sb.getConfig("version","0.1"));
// cut off the SVN Rev in the Version // cut off the SVN Rev in the Version
@ -161,7 +161,7 @@ public class ConfigUpdate_p {
while (i.hasNext()) { while (i.hasNext()) {
release = i.next(); release = i.next();
prop.put("candeploy_downloadedreleases_" + relcount + "_name", ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn); prop.put("candeploy_downloadedreleases_" + relcount + "_name", ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
prop.put("candeploy_downloadedreleases_" + relcount + "_file", release.name); prop.putHTML("candeploy_downloadedreleases_" + relcount + "_file", release.name);
prop.put("candeploy_downloadedreleases_" + relcount + "_selected", (release == dflt) ? "1" : "0"); prop.put("candeploy_downloadedreleases_" + relcount + "_selected", (release == dflt) ? "1" : "0");
relcount++; relcount++;
} }
@ -201,7 +201,7 @@ public class ConfigUpdate_p {
prop.put("candeploy_manualUpdateChecked", (sb.getConfig("update.process", "manual").equals("manual")) ? "1" : "0"); prop.put("candeploy_manualUpdateChecked", (sb.getConfig("update.process", "manual").equals("manual")) ? "1" : "0");
prop.put("candeploy_autoUpdateChecked", (sb.getConfig("update.process", "manual").equals("auto")) ? "1" : "0"); prop.put("candeploy_autoUpdateChecked", (sb.getConfig("update.process", "manual").equals("auto")) ? "1" : "0");
prop.put("candeploy_cycle", sb.getConfigLong("update.cycle", 168)); prop.put("candeploy_cycle", sb.getConfigLong("update.cycle", 168));
prop.put("candeploy_blacklist", sb.getConfig("update.blacklist", "")); prop.putHTML("candeploy_blacklist", sb.getConfig("update.blacklist", ""));
prop.put("candeploy_releaseTypeMainChecked", (sb.getConfig("update.concept", "any").equals("any")) ? "0" : "1"); prop.put("candeploy_releaseTypeMainChecked", (sb.getConfig("update.concept", "any").equals("any")) ? "0" : "1");
prop.put("candeploy_releaseTypeAnyChecked", (sb.getConfig("update.concept", "any").equals("any")) ? "1" : "0"); prop.put("candeploy_releaseTypeAnyChecked", (sb.getConfig("update.concept", "any").equals("any")) ? "1" : "0");
prop.put("candeploy_lastlookup", (sb.getConfigLong("update.time.lookup", 0) == 0) ? "0" : "1"); prop.put("candeploy_lastlookup", (sb.getConfigLong("update.time.lookup", 0) == 0) ? "0" : "1");

2
htroot/CookieTest_p.java
Unescape View File

@ -82,7 +82,7 @@ public class CookieTest_p {
outgoingHeader.setCookie(cookieName,cookieValue); outgoingHeader.setCookie(cookieName,cookieValue);
prop.setOutgoingHeader(outgoingHeader); prop.setOutgoingHeader(outgoingHeader);
prop.put("cookiesin", "1"); prop.put("cookiesin", "1");
prop.put("cookiesin_0_name", cookieName); prop.putHTML("cookiesin_0_name", cookieName);
prop.putHTML("cookiesin_0_value", cookieValue); prop.putHTML("cookiesin_0_value", cookieValue);
//header. //header.

6
htroot/FeedReader_p.java
Unescape View File

@ -67,9 +67,9 @@ public class FeedReader_p {
for (final RSSMessage item: feed) { for (final RSSMessage item: feed) {
prop.putHTML("page_items_" + i + "_author", item.getAuthor()); prop.putHTML("page_items_" + i + "_author", item.getAuthor());
prop.putHTML("page_items_" + i + "_title", item.getTitle()); prop.putHTML("page_items_" + i + "_title", item.getTitle());
prop.put("page_items_" + i + "_link", item.getLink()); prop.putHTML("page_items_" + i + "_link", item.getLink());
prop.put("page_items_" + i + "_description", item.getDescription()); prop.putHTML("page_items_" + i + "_description", item.getDescription());
prop.put("page_items_" + i + "_date", item.getPubDate()); prop.putHTML("page_items_" + i + "_date", item.getPubDate());
i++; i++;
} }
prop.put("page_items", feed.size()); prop.put("page_items", feed.size());

6
htroot/IndexControlRWIs_p.java
Unescape View File

@ -77,7 +77,7 @@ public class IndexControlRWIs_p {
final String keystring = post.get("keystring", "").trim(); final String keystring = post.get("keystring", "").trim();
String keyhash = post.get("keyhash", "").trim(); String keyhash = post.get("keyhash", "").trim();
prop.putHTML("keystring", keystring); prop.putHTML("keystring", keystring);
prop.put("keyhash", keyhash); prop.putHTML("keyhash", keyhash);
// read values from checkboxes // read values from checkboxes
String[] urlx = post.getAll("urlhx.*"); String[] urlx = post.getAll("urlhx.*");
@ -90,7 +90,7 @@ public class IndexControlRWIs_p {
final plasmaSearchRankingProcess ranking = plasmaSearchAPI.genSearchresult(prop, sb, keyhash, null); final plasmaSearchRankingProcess ranking = plasmaSearchAPI.genSearchresult(prop, sb, keyhash, null);
if (ranking.filteredCount() == 0) { if (ranking.filteredCount() == 0) {
prop.put("searchresult", 1); prop.put("searchresult", 1);
prop.put("searchresult_word", keystring); prop.putHTML("searchresult_word", keystring);
} }
} }
@ -101,7 +101,7 @@ public class IndexControlRWIs_p {
final plasmaSearchRankingProcess ranking = plasmaSearchAPI.genSearchresult(prop, sb, keyhash, null); final plasmaSearchRankingProcess ranking = plasmaSearchAPI.genSearchresult(prop, sb, keyhash, null);
if (ranking.filteredCount() == 0) { if (ranking.filteredCount() == 0) {
prop.put("searchresult", 2); prop.put("searchresult", 2);
prop.put("searchresult_wordhash", keyhash); prop.putHTML("searchresult_wordhash", keyhash);
} }
} }

8
htroot/IndexControlURLs_p.java
Unescape View File

@ -104,7 +104,7 @@ public class IndexControlURLs_p {
!urlstring.startsWith("https://")) { urlstring = "http://" + urlstring; } !urlstring.startsWith("https://")) { urlstring = "http://" + urlstring; }
prop.putHTML("urlstring", urlstring); prop.putHTML("urlstring", urlstring);
prop.put("urlhash", urlhash); prop.putHTML("urlhash", urlhash);
prop.put("result", " "); prop.put("result", " ");
if (post.containsKey("urlhashdeleteall")) { if (post.containsKey("urlhashdeleteall")) {
@ -117,7 +117,7 @@ public class IndexControlURLs_p {
if (post.containsKey("urlhashdelete")) { if (post.containsKey("urlhashdelete")) {
final indexURLReference entry = sb.webIndex.getURL(urlhash, null, 0); final indexURLReference entry = sb.webIndex.getURL(urlhash, null, 0);
if (entry == null) { if (entry == null) {
prop.put("result", "No Entry for URL hash " + urlhash + "; nothing deleted."); prop.putHTML("result", "No Entry for URL hash " + urlhash + "; nothing deleted.");
} else { } else {
urlstring = entry.comp().url().toNormalform(false, true); urlstring = entry.comp().url().toNormalform(false, true);
prop.put("urlstring", ""); prop.put("urlstring", "");
@ -168,7 +168,7 @@ public class IndexControlURLs_p {
if (post.containsKey("urlhashsearch")) { if (post.containsKey("urlhashsearch")) {
final indexURLReference entry = sb.webIndex.getURL(urlhash, null, 0); final indexURLReference entry = sb.webIndex.getURL(urlhash, null, 0);
if (entry == null) { if (entry == null) {
prop.put("result", "No Entry for URL hash " + urlhash); prop.putHTML("result", "No Entry for URL hash " + urlhash);
} else { } else {
prop.putHTML("urlstring", entry.comp().url().toNormalform(false, true)); prop.putHTML("urlstring", entry.comp().url().toNormalform(false, true));
prop.putAll(genUrlProfile(sb, entry, urlhash)); prop.putAll(genUrlProfile(sb, entry, urlhash));
@ -203,7 +203,7 @@ public class IndexControlURLs_p {
prop.put("urlhashsimilar_rows", rows); prop.put("urlhashsimilar_rows", rows);
prop.put("result", result.toString()); prop.put("result", result.toString());
} catch (final IOException e) { } catch (final IOException e) {
prop.put("result", "No Entries for URL hash " + urlhash); prop.putHTML("result", "No Entries for URL hash " + urlhash);
} }
prop.put("lurlexport", 0); prop.put("lurlexport", 0);
prop.put("reload", 0); prop.put("reload", 0);

4
htroot/IndexShare_p.java
Unescape View File

@ -51,8 +51,8 @@ public class IndexShare_p {
return prop; // be save return prop; // be save
} }
if (post == null) { if (post == null) {
prop.put("linkfreq", switchboard.getConfig("defaultLinkReceiveFrequency","30")); prop.put("linkfreq", switchboard.getConfigLong("defaultLinkReceiveFrequency",30));
prop.put("wordfreq", switchboard.getConfig("defaultWordReceiveFrequency","10")); prop.put("wordfreq", switchboard.getConfigLong("defaultWordReceiveFrequency",10));
prop.put("dtable", ""); prop.put("dtable", "");
prop.put("rtable", ""); prop.put("rtable", "");
prop.putNum("wcount", switchboard.webIndex.size()); prop.putNum("wcount", switchboard.webIndex.size());

2
htroot/IndexTransfer_p.java
Unescape View File

@ -99,7 +99,7 @@ public final class IndexTransfer_p {
prop.putNum("running_twEntrySpeed", sb.transferIdxThread.getTransferedEntrySpeed()); prop.putNum("running_twEntrySpeed", sb.transferIdxThread.getTransferedEntrySpeed());
prop.put("running_deleteIndex", sb.transferIdxThread.deleteIndex() ? "1" : "0"); prop.put("running_deleteIndex", sb.transferIdxThread.deleteIndex() ? "1" : "0");
prop.put("running_peerName",sb.transferIdxThread.getSeed().getName()); prop.putHTML("running_peerName",sb.transferIdxThread.getSeed().getName());
prop.put("running_stopped",(sb.transferIdxThread.isFinished()) || (!sb.transferIdxThread.isAlive()) ? "1" : "0"); prop.put("running_stopped",(sb.transferIdxThread.isFinished()) || (!sb.transferIdxThread.isAlive()) ? "1" : "0");
} else { } else {
if (!prop.containsKey("running_status")) prop.put("running_status","Not running"); if (!prop.containsKey("running_status")) prop.put("running_status","Not running");

8
htroot/LogStatistics_p.java
Unescape View File

@ -146,8 +146,8 @@ public class LogStatistics_p {
String[] hashes = ((HashSet<String>) r.get(LogParserPLASMA.DHT_REJECTED_PEERS_HASH)).toArray(new String[1]); String[] hashes = ((HashSet<String>) r.get(LogParserPLASMA.DHT_REJECTED_PEERS_HASH)).toArray(new String[1]);
int i; int i;
for (i = 0; i<names.length && i<hashes.length; i++) { for (i = 0; i<names.length && i<hashes.length; i++) {
prop.put(RESULTS + "useDHTRejectPeers_DHTRejectPeers_" + i + "_name", names[i]); prop.putHTML(RESULTS + "useDHTRejectPeers_DHTRejectPeers_" + i + "_name", names[i]);
prop.put(RESULTS + "useDHTRejectPeers_DHTRejectPeers_" + i + "_hash", hashes[i]); prop.putHTML(RESULTS + "useDHTRejectPeers_DHTRejectPeers_" + i + "_hash", hashes[i]);
} }
prop.put(RESULTS + "DHTRejectPeers", i); prop.put(RESULTS + "DHTRejectPeers", i);
prop.put(RESULTS + "useDHTRejectPeers", (i > 0) ? "1" : "0"); prop.put(RESULTS + "useDHTRejectPeers", (i > 0) ? "1" : "0");
@ -156,8 +156,8 @@ public class LogStatistics_p {
names = ((HashSet<String>)r.get(LogParserPLASMA.DHT_SENT_PEERS_NAME)).toArray(new String[1]); names = ((HashSet<String>)r.get(LogParserPLASMA.DHT_SENT_PEERS_NAME)).toArray(new String[1]);
hashes = ((HashSet<String>)r.get(LogParserPLASMA.DHT_SENT_PEERS_HASH)).toArray(new String[1]); hashes = ((HashSet<String>)r.get(LogParserPLASMA.DHT_SENT_PEERS_HASH)).toArray(new String[1]);
for (i = 0; i<names.length && i<hashes.length; i++) { for (i = 0; i<names.length && i<hashes.length; i++) {
prop.put(RESULTS + "useDHTPeers_DHTPeers_" + i + "_name", names[i]); prop.putHTML(RESULTS + "useDHTPeers_DHTPeers_" + i + "_name", names[i]);
prop.put(RESULTS + "useDHTPeers_DHTPeers_" + i + "_hash", hashes[i]); prop.putHTML(RESULTS + "useDHTPeers_DHTPeers_" + i + "_hash", hashes[i]);
} }
prop.put(RESULTS + "DHTPeers", i); prop.put(RESULTS + "DHTPeers", i);
prop.put(RESULTS + "useDHTPeers", (i > 0) ? "1" : "0"); prop.put(RESULTS + "useDHTPeers", (i > 0) ? "1" : "0");

2
htroot/MessageSend_p.java
Unescape View File

@ -103,7 +103,7 @@ public class MessageSend_p {
prop.put("mode_permission_attachmentsize", attachmentsize); prop.put("mode_permission_attachmentsize", attachmentsize);
prop.putHTML("mode_permission_subject", subject, true); prop.putHTML("mode_permission_subject", subject, true);
prop.putHTML("mode_permission_message", message, true); prop.putHTML("mode_permission_message", message, true);
prop.put("mode_permission_hash", hash); prop.putHTML("mode_permission_hash", hash);
if (post.containsKey("preview")) { if (post.containsKey("preview")) {
prop.putWiki("mode_permission_previewmessage", message); prop.putWiki("mode_permission_previewmessage", message);

8
htroot/Network.java
Unescape View File

@ -193,7 +193,7 @@ public class Network {
peer = sb.webIndex.seedDB.getConnected(peer.hash); peer = sb.webIndex.seedDB.getConnected(peer.hash);
if (peer == null) { if (peer == null) {
prop.put("table_comment",1); prop.put("table_comment",1);
prop.put("table_comment_status","publish: disconnected peer 'UNKNOWN/" + post.get("peerHash") + "' from UNKNOWN"); prop.putHTML("table_comment_status","publish: disconnected peer 'UNKNOWN/" + post.get("peerHash") + "' from UNKNOWN");
} else { } else {
prop.put("table_comment",2); prop.put("table_comment",2);
prop.putHTML("table_comment_status","publish: handshaked " + peer.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR) + " peer '" + peer.getName() + "' at " + peer.getPublicAddress()); prop.putHTML("table_comment_status","publish: handshaked " + peer.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR) + " peer '" + peer.getName() + "' at " + peer.getPublicAddress());
@ -201,9 +201,9 @@ public class Network {
} }
} }
prop.put("table_peerHash",post.get("peerHash")); prop.putHTML("table_peerHash",post.get("peerHash"));
prop.put("table_peerIP",post.get("peerIP")); prop.putHTML("table_peerIP",post.get("peerIP"));
prop.put("table_peerPort",post.get("peerPort")); prop.putHTML("table_peerPort",post.get("peerPort"));
} else { } else {
prop.put("table_peerHash",""); prop.put("table_peerHash","");
prop.put("table_peerIP",""); prop.put("table_peerIP","");

4
htroot/News.java
Unescape View File

@ -118,7 +118,7 @@ public class News {
prop.putHTML("table_list_" + i + "_ori", (seed == null) ? record.originator() : seed.getName()); prop.putHTML("table_list_" + i + "_ori", (seed == null) ? record.originator() : seed.getName());
prop.put("table_list_" + i + "_cre", serverDate.formatShortSecond(record.created())); prop.put("table_list_" + i + "_cre", serverDate.formatShortSecond(record.created()));
prop.put("table_list_" + i + "_crerfcdate", HttpClient.dateString(record.created())); prop.put("table_list_" + i + "_crerfcdate", HttpClient.dateString(record.created()));
prop.put("table_list_" + i + "_cat", category); prop.putHTML("table_list_" + i + "_cat", category);
prop.put("table_list_" + i + "_rec", (record.received() == null) ? "-" : serverDate.formatShortSecond(record.received())); prop.put("table_list_" + i + "_rec", (record.received() == null) ? "-" : serverDate.formatShortSecond(record.received()));
prop.put("table_list_" + i + "_dis", record.distributed()); prop.put("table_list_" + i + "_dis", record.distributed());
@ -169,7 +169,7 @@ public class News {
title = ""; title = "";
description = ""; description = "";
} }
prop.put("table_list_" + i + "_link", link); prop.putHTML("table_list_" + i + "_link", link);
prop.putHTML("table_list_" + i + "_title", title); prop.putHTML("table_list_" + i + "_title", title);
prop.putHTML("table_list_" + i + "_description", description); prop.putHTML("table_list_" + i + "_description", description);

8
htroot/ProxyIndexingMonitor_p.java
Unescape View File

@ -115,10 +115,10 @@ public class ProxyIndexingMonitor_p {
// proxyCache - only display on change // proxyCache - only display on change
if (oldProxyCachePath.equals(newProxyCachePath)) { if (oldProxyCachePath.equals(newProxyCachePath)) {
prop.put("info_path", "0"); prop.put("info_path", "0");
prop.put("info_path_return", oldProxyCachePath); prop.putHTML("info_path_return", oldProxyCachePath);
} else { } else {
prop.put("info_path", "1"); prop.put("info_path", "1");
prop.put("info_path_return", newProxyCachePath); prop.putHTML("info_path_return", newProxyCachePath);
} }
// proxyCacheSize - only display on change // proxyCacheSize - only display on change
if (oldProxyCacheSize.equals(newProxyCacheSize)) { if (oldProxyCacheSize.equals(newProxyCacheSize)) {
@ -146,13 +146,13 @@ public class ProxyIndexingMonitor_p {
} }
} }
prop.put("proxyPrefetchDepth", env.getConfig("proxyPrefetchDepth", "0")); prop.put("proxyPrefetchDepth", env.getConfigLong("proxyPrefetchDepth", 0));
prop.put("proxyStoreHTCacheChecked", env.getConfig("proxyStoreHTCache", "").equals("true") ? "1" : "0"); prop.put("proxyStoreHTCacheChecked", env.getConfig("proxyStoreHTCache", "").equals("true") ? "1" : "0");
prop.put("proxyIndexingRemote", env.getConfig("proxyIndexingRemote", "").equals("true") ? "1" : "0"); prop.put("proxyIndexingRemote", env.getConfig("proxyIndexingRemote", "").equals("true") ? "1" : "0");
prop.put("proxyIndexingLocalText", env.getConfig("proxyIndexingLocalText", "").equals("true") ? "1" : "0"); prop.put("proxyIndexingLocalText", env.getConfig("proxyIndexingLocalText", "").equals("true") ? "1" : "0");
prop.put("proxyIndexingLocalMedia", env.getConfig("proxyIndexingLocalMedia", "").equals("true") ? "1" : "0"); prop.put("proxyIndexingLocalMedia", env.getConfig("proxyIndexingLocalMedia", "").equals("true") ? "1" : "0");
prop.put("proxyCache", env.getConfig(plasmaSwitchboardConstants.HTCACHE_PATH, plasmaSwitchboardConstants.HTCACHE_PATH_DEFAULT)); prop.put("proxyCache", env.getConfig(plasmaSwitchboardConstants.HTCACHE_PATH, plasmaSwitchboardConstants.HTCACHE_PATH_DEFAULT));
prop.put("proxyCacheSize", env.getConfig("proxyCacheSize", "64")); prop.put("proxyCacheSize", env.getConfigLong("proxyCacheSize", 64));
// return rewrite properties // return rewrite properties
return prop; return prop;
} }

8
htroot/SettingsAck_p.java
Unescape View File

@ -447,7 +447,7 @@ public class SettingsAck_p {
prop.put("info", "21"); prop.put("info", "21");
prop.put("info_msgForwardingEnabled", post.containsKey("msgForwardingEnabled") ? "on" : "off"); prop.put("info_msgForwardingEnabled", post.containsKey("msgForwardingEnabled") ? "on" : "off");
prop.put("info_msgForwardingCmd", post.get("msgForwardingCmd")); prop.putHTML("info_msgForwardingCmd", post.get("msgForwardingCmd"));
prop.putHTML("info_msgForwardingTo", post.get("msgForwardingTo")); prop.putHTML("info_msgForwardingTo", post.get("msgForwardingTo"));
return prop; return prop;
@ -522,7 +522,7 @@ public class SettingsAck_p {
env.setConfig("crawler.clientTimeout", Integer.toString(crawlerTimeout)); env.setConfig("crawler.clientTimeout", Integer.toString(crawlerTimeout));
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
prop.put("info", "29"); prop.put("info", "29");
prop.put("info_crawler.clientTimeout",post.get("crawler.clientTimeout")); prop.putHTML("info_crawler.clientTimeout",post.get("crawler.clientTimeout"));
return prop; return prop;
} }
@ -539,7 +539,7 @@ public class SettingsAck_p {
env.setConfig("crawler.http.maxFileSize", Long.toString(maxHttpSize)); env.setConfig("crawler.http.maxFileSize", Long.toString(maxHttpSize));
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
prop.put("info", "30"); prop.put("info", "30");
prop.put("info_crawler.http.maxFileSize",post.get("crawler.http.maxFileSize")); prop.putHTML("info_crawler.http.maxFileSize",post.get("crawler.http.maxFileSize"));
return prop; return prop;
} }
@ -553,7 +553,7 @@ public class SettingsAck_p {
env.setConfig("crawler.ftp.maxFileSize", Long.toString(maxFtpSize)); env.setConfig("crawler.ftp.maxFileSize", Long.toString(maxFtpSize));
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
prop.put("info", "31"); prop.put("info", "31");
prop.put("info_crawler.ftp.maxFileSize",post.get("crawler.ftp.maxFileSize")); prop.putHTML("info_crawler.ftp.maxFileSize",post.get("crawler.ftp.maxFileSize"));
return prop; return prop;
} }

24
htroot/Settings_p.java
Unescape View File

@ -84,10 +84,10 @@ public final class Settings_p {
prop.put("port", env.getConfig("port", "8080")); prop.put("port", env.getConfig("port", "8080"));
prop.putHTML("peerName", env.getConfig("peerName", "nameless")); prop.putHTML("peerName", env.getConfig("peerName", "nameless"));
prop.put("staticIP", env.getConfig("staticIP", "")); prop.putHTML("staticIP", env.getConfig("staticIP", ""));
String peerLang = env.getConfig("locale.language", "default"); String peerLang = env.getConfig("locale.language", "default");
if (peerLang.equals("default")) peerLang = "en"; if (peerLang.equals("default")) peerLang = "en";
prop.put("peerLang", peerLang); prop.putHTML("peerLang", peerLang);
// http networking settings // http networking settings
prop.put("isTransparentProxy", env.getConfig("isTransparentProxy", "false").equals("true") ? "1" : "0"); prop.put("isTransparentProxy", env.getConfig("isTransparentProxy", "false").equals("true") ? "1" : "0");
@ -118,13 +118,13 @@ public final class Settings_p {
prop.put("remoteProxyUse4Yacy", env.getConfig("remoteProxyUse4Yacy", "true").equals("true") ? 1 : 0); prop.put("remoteProxyUse4Yacy", env.getConfig("remoteProxyUse4Yacy", "true").equals("true") ? 1 : 0);
prop.put("remoteProxyUse4SSL", env.getConfig("remoteProxyUse4SSL", "true").equals("true") ? 1 : 0); prop.put("remoteProxyUse4SSL", env.getConfig("remoteProxyUse4SSL", "true").equals("true") ? 1 : 0);
prop.put("remoteProxyHost", env.getConfig("remoteProxyHost", "")); prop.putHTML("remoteProxyHost", env.getConfig("remoteProxyHost", ""));
prop.put("remoteProxyPort", env.getConfig("remoteProxyPort", "")); prop.putHTML("remoteProxyPort", env.getConfig("remoteProxyPort", ""));
prop.put("remoteProxyUser", env.getConfig("remoteProxyUser", "")); prop.putHTML("remoteProxyUser", env.getConfig("remoteProxyUser", ""));
prop.put("remoteProxyPwd", env.getConfig("remoteProxyPwd", "")); prop.putHTML("remoteProxyPwd", env.getConfig("remoteProxyPwd", ""));
prop.put("remoteProxyNoProxy", env.getConfig("remoteProxyNoProxy", "")); prop.putHTML("remoteProxyNoProxy", env.getConfig("remoteProxyNoProxy", ""));
// proxy access filter // proxy access filter
prop.putHTML("proxyfilter", env.getConfig("proxyClient", "*")); prop.putHTML("proxyfilter", env.getConfig("proxyClient", "*"));
@ -211,8 +211,8 @@ public final class Settings_p {
* Message forwarding configuration * Message forwarding configuration
*/ */
prop.put("msgForwardingEnabled",env.getConfig("msgForwardingEnabled","false").equals("true") ? "1" : "0"); prop.put("msgForwardingEnabled",env.getConfig("msgForwardingEnabled","false").equals("true") ? "1" : "0");
prop.put("msgForwardingCmd",env.getConfig("msgForwardingCmd", "")); prop.putHTML("msgForwardingCmd",env.getConfig("msgForwardingCmd", ""));
prop.put("msgForwardingTo",env.getConfig("msgForwardingTo", "")); prop.putHTML("msgForwardingTo",env.getConfig("msgForwardingTo", ""));
/* /*
* Parser Configuration * Parser Configuration
@ -274,9 +274,9 @@ public final class Settings_p {
prop.put("parser.colspan", configArray.length+2); prop.put("parser.colspan", configArray.length+2);
// Crawler settings // Crawler settings
prop.put("crawler.clientTimeout",sb.getConfig("crawler.clientTimeout", "10000")); prop.putHTML("crawler.clientTimeout",sb.getConfig("crawler.clientTimeout", "10000"));
prop.put("crawler.http.maxFileSize",sb.getConfig("crawler.http.maxFileSize", "-1")); prop.putHTML("crawler.http.maxFileSize",sb.getConfig("crawler.http.maxFileSize", "-1"));
prop.put("crawler.ftp.maxFileSize",sb.getConfig("crawler.ftp.maxFileSize", "-1")); prop.putHTML("crawler.ftp.maxFileSize",sb.getConfig("crawler.ftp.maxFileSize", "-1"));
// return rewrite properties // return rewrite properties
return prop; return prop;

8
htroot/Status.java
Unescape View File

@ -159,7 +159,7 @@ public class Status {
prop.put("port",serverCore.getPortNr(extendedPortString)); prop.put("port",serverCore.getPortNr(extendedPortString));
if (pos!=-1) { if (pos!=-1) {
prop.put("extPortFormat", "1"); prop.put("extPortFormat", "1");
prop.put("extPortFormat_extPort",extendedPortString); prop.putHTML("extPortFormat_extPort",extendedPortString);
} else { } else {
prop.put("extPortFormat", "0"); prop.put("extPortFormat", "0");
} }
@ -237,13 +237,13 @@ public class Status {
if (seedUploadMethod.equalsIgnoreCase("ftp")) { if (seedUploadMethod.equalsIgnoreCase("ftp")) {
prop.put(SEEDSERVER, "1"); // enabled prop.put(SEEDSERVER, "1"); // enabled
prop.put("seedServer_seedServer", sb.getConfig("seedFTPServer", "")); prop.putHTML("seedServer_seedServer", sb.getConfig("seedFTPServer", ""));
} else if (seedUploadMethod.equalsIgnoreCase("scp")) { } else if (seedUploadMethod.equalsIgnoreCase("scp")) {
prop.put(SEEDSERVER, "1"); // enabled prop.put(SEEDSERVER, "1"); // enabled
prop.put("seedServer_seedServer", sb.getConfig("seedScpServer", "")); prop.putHTML("seedServer_seedServer", sb.getConfig("seedScpServer", ""));
} else if (seedUploadMethod.equalsIgnoreCase("file")) { } else if (seedUploadMethod.equalsIgnoreCase("file")) {
prop.put(SEEDSERVER, "2"); // enabled prop.put(SEEDSERVER, "2"); // enabled
prop.put("seedServer_seedFile", sb.getConfig("seedFilePath", "")); prop.putHTML("seedServer_seedFile", sb.getConfig("seedFilePath", ""));
} }
prop.put("seedServer_lastUpload", prop.put("seedServer_lastUpload",
serverDate.formatInterval(System.currentTimeMillis() - sb.webIndex.seedDB.lastSeedUpload_timeStamp)); serverDate.formatInterval(System.currentTimeMillis() - sb.webIndex.seedDB.lastSeedUpload_timeStamp));

2
htroot/Steering.java
Unescape View File

@ -73,7 +73,7 @@ public class Steering {
yacyVersion.deployRelease(releaseFile); yacyVersion.deployRelease(releaseFile);
} }
prop.put("info", "5"); prop.put("info", "5");
prop.put("info_release", releaseFileName); prop.putHTML("info_release", releaseFileName);
return prop; return prop;
} }

2
htroot/User.java
Unescape View File

@ -113,7 +113,7 @@ public class User{
prop.put("logged-in", "1"); prop.put("logged-in", "1");
prop.put("logged-in_identified-by", "1"); prop.put("logged-in_identified-by", "1");
prop.put("logged-in_username", username); prop.putHTML("logged-in_username", username);
if(post.containsKey("returnto")){ if(post.containsKey("returnto")){
prop.put("LOCATION", post.get("returnto")); prop.put("LOCATION", post.get("returnto"));
} }

2
htroot/ViewLog_p.java
Unescape View File

@ -78,7 +78,7 @@ public class ViewLog_p {
prop.put("reverseChecked", reversed ? "1" : "0"); prop.put("reverseChecked", reversed ? "1" : "0");
prop.put("lines", lines); prop.put("lines", lines);
prop.put("maxlines",maxlines); prop.put("maxlines",maxlines);
prop.put("filter", filter); prop.putHTML("filter", filter);
// trying to compile the regular expression filter expression // trying to compile the regular expression filter expression
Matcher filterMatcher = null; Matcher filterMatcher = null;

2
htroot/ViewProfile.java
Unescape View File

@ -179,7 +179,7 @@ public class ViewProfile {
//This will display unknown items(of newer versions) as plaintext //This will display unknown items(of newer versions) as plaintext
} else { } else {
//unknown //unknown
prop.put("success_other_" + numUnknown + "_key", key); prop.putHTML("success_other_" + numUnknown + "_key", key);
prop.putHTML("success_other_" + numUnknown + "_value", value); prop.putHTML("success_other_" + numUnknown + "_value", value);
numUnknown++; numUnknown++;
} }

2
htroot/WatchWebStructure_p.java
Unescape View File

@ -48,7 +48,7 @@ public class WatchWebStructure_p {
} }
} }
prop.put("host", host); prop.putHTML("host", host);
prop.put("depth", depth); prop.put("depth", depth);
prop.put("depthi", Math.min(8, depth + 1)); prop.put("depthi", Math.min(8, depth + 1));
prop.put("depthd", Math.max(0, depth - 1)); prop.put("depthd", Math.max(0, depth - 1));

2
htroot/Wiki.java
Unescape View File

@ -118,7 +118,7 @@ public class Wiki {
if (post.get("content", "").trim().length() > 0 && !page.page().equals(content)) if (post.get("content", "").trim().length() > 0 && !page.page().equals(content))
sb.webIndex.newsPool.publishMyNews(yacyNewsRecord.newRecord(sb.webIndex.seedDB.mySeed(), yacyNewsPool.CATEGORY_WIKI_UPDATE, map)); sb.webIndex.newsPool.publishMyNews(yacyNewsRecord.newRecord(sb.webIndex.seedDB.mySeed(), yacyNewsPool.CATEGORY_WIKI_UPDATE, map));
page = newEntry; page = newEntry;
prop.put("LOCATION", "/Wiki.html?page=" + pagename); prop.putHTML("LOCATION", "/Wiki.html?page=" + pagename);
} }
if (post != null && post.containsKey("edit")) { if (post != null && post.containsKey("edit")) {

4
htroot/index.java
Unescape View File

@ -106,11 +106,11 @@ public class index {
prop.put("searchoptions_indexofChecked", ""); prop.put("searchoptions_indexofChecked", "");
prop.put("searchoptions_publicSearchpage", (publicPage == true) ? "0" : "1"); prop.put("searchoptions_publicSearchpage", (publicPage == true) ? "0" : "1");
prop.put("results", ""); prop.put("results", "");
prop.put("cat", cat); prop.putHTML("cat", cat);
prop.put("type", type); prop.put("type", type);
prop.put("depth", "0"); prop.put("depth", "0");
prop.put("display", display); prop.put("display", display);
prop.put("constraint", constraint); prop.putHTML("constraint", constraint);
prop.put("searchoptions_display", display); prop.put("searchoptions_display", display);
prop.put("contentdomCheckText", (contentdom == plasmaSearchQuery.CONTENTDOM_TEXT) ? "1" : "0"); prop.put("contentdomCheckText", (contentdom == plasmaSearchQuery.CONTENTDOM_TEXT) ? "1" : "0");
prop.put("contentdomCheckAudio", (contentdom == plasmaSearchQuery.CONTENTDOM_AUDIO) ? "1" : "0"); prop.put("contentdomCheckAudio", (contentdom == plasmaSearchQuery.CONTENTDOM_AUDIO) ? "1" : "0");

8
htroot/sharedBlacklist_p.java
Unescape View File

@ -70,8 +70,8 @@ public class sharedBlacklist_p {
selectedBlacklistName = "shared.black"; selectedBlacklistName = "shared.black";
} }
prop.put("currentBlacklist", selectedBlacklistName); prop.putHTML("currentBlacklist", selectedBlacklistName);
prop.put("page_target", selectedBlacklistName); prop.putHTML("page_target", selectedBlacklistName);
if (post != null) { if (post != null) {
ArrayList<String> otherBlacklist = null; ArrayList<String> otherBlacklist = null;
@ -143,7 +143,7 @@ public class sharedBlacklist_p {
* Import the blacklist from file * Import the blacklist from file
* ====================================================== */ * ====================================================== */
final String sourceFileName = post.get("file"); final String sourceFileName = post.get("file");
prop.put("page_source", sourceFileName); prop.putHTML("page_source", sourceFileName);
final File sourceFile = new File(listManager.listsPath, sourceFileName); final File sourceFile = new File(listManager.listsPath, sourceFileName);
if (!sourceFile.exists() || !sourceFile.canRead() || !sourceFile.isFile()) { if (!sourceFile.exists() || !sourceFile.canRead() || !sourceFile.isFile()) {
@ -209,7 +209,7 @@ public class sharedBlacklist_p {
if (pw != null) try { pw.close(); } catch (final Exception e){ /* */} if (pw != null) try { pw.close(); } catch (final Exception e){ /* */}
} }
prop.put("LOCATION","Blacklist_p.html?selectedListName=" + selectedBlacklistName + "&selectList="); prop.putHTML("LOCATION","Blacklist_p.html?selectedListName=" + selectedBlacklistName + "&selectList=");
return prop; return prop;
} }

6
htroot/yacysearchitem.java
Unescape View File

@ -193,11 +193,11 @@ public class yacysearchitem {
prop.put("content", theQuery.contentdom + 1); // switch on specific content prop.put("content", theQuery.contentdom + 1); // switch on specific content
prop.put("content_authorized", authenticated ? "1" : "0"); prop.put("content_authorized", authenticated ? "1" : "0");
prop.put("content_authorized_recommend", (sb.webIndex.newsPool.getSpecific(yacyNewsPool.OUTGOING_DB, yacyNewsPool.CATEGORY_SURFTIPP_ADD, "url", result.urlstring()) == null) ? "1" : "0"); prop.put("content_authorized_recommend", (sb.webIndex.newsPool.getSpecific(yacyNewsPool.OUTGOING_DB, yacyNewsPool.CATEGORY_SURFTIPP_ADD, "url", result.urlstring()) == null) ? "1" : "0");
prop.put("content_authorized_recommend_deletelink", "/yacysearch.html?search=" + theQuery.queryString + "&Enter=Search&count=" + theQuery.displayResults() + "&offset=" + (theQuery.neededResults() - theQuery.displayResults()) + "&order=" + crypt.simpleEncode(theQuery.ranking.toExternalString()) + "&resource=local&time=3&deleteref=" + result.hash() + "&urlmaskfilter=.*"); prop.putHTML("content_authorized_recommend_deletelink", "/yacysearch.html?search=" + theQuery.queryString + "&Enter=Search&count=" + theQuery.displayResults() + "&offset=" + (theQuery.neededResults() - theQuery.displayResults()) + "&order=" + crypt.simpleEncode(theQuery.ranking.toExternalString()) + "&resource=local&time=3&deleteref=" + result.hash() + "&urlmaskfilter=.*");
prop.put("content_authorized_recommend_recommendlink", "/yacysearch.html?search=" + theQuery.queryString + "&Enter=Search&count=" + theQuery.displayResults() + "&offset=" + (theQuery.neededResults() - theQuery.displayResults()) + "&order=" + crypt.simpleEncode(theQuery.ranking.toExternalString()) + "&resource=local&time=3&recommendref=" + result.hash() + "&urlmaskfilter=.*"); prop.putHTML("content_authorized_recommend_recommendlink", "/yacysearch.html?search=" + theQuery.queryString + "&Enter=Search&count=" + theQuery.displayResults() + "&offset=" + (theQuery.neededResults() - theQuery.displayResults()) + "&order=" + crypt.simpleEncode(theQuery.ranking.toExternalString()) + "&resource=local&time=3&recommendref=" + result.hash() + "&urlmaskfilter=.*");
prop.put("content_authorized_urlhash", result.hash()); prop.put("content_authorized_urlhash", result.hash());
prop.putHTML("content_description", result.title()); prop.putHTML("content_description", result.title());
prop.put("content_url", result.urlstring()); prop.putHTML("content_url", result.urlstring());
final int port=result.url().getPort(); final int port=result.url().getPort();
yacyURL faviconURL; yacyURL faviconURL;

Write Preview
Loading…
Cancel
Save