diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 5f3ed1044..db08cf10d 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -121,7 +121,6 @@ public class yacysearch { // we create empty entries for template strings prop.put("searchagain", "0"); prop.put("display", display); - prop.put("display", display); prop.put("former", ""); prop.put("count", "10"); prop.put("offset", "0"); diff --git a/htroot/yacysearch_location.html b/htroot/yacysearch_location.html new file mode 100644 index 000000000..eebe977bf --- /dev/null +++ b/htroot/yacysearch_location.html @@ -0,0 +1,52 @@ + + + + #[former]# - YaCy '#[clientname]#': Search Page + #%env/templates/metas.template%# + + + + + + + + + + +#(display)# + #%env/templates/simpleheader.template%# + :: + #%env/templates/header.template%# + :: + #%env/templates/embeddedheader.template%# +#(/display)# +
+
+
+ +
+ + \ No newline at end of file diff --git a/htroot/yacysearch_location.java b/htroot/yacysearch_location.java index 09e04ac5e..bfb385ea1 100644 --- a/htroot/yacysearch_location.java +++ b/htroot/yacysearch_location.java @@ -27,6 +27,7 @@ import net.yacy.document.geolocalization.Location; import de.anomic.data.LibraryProvider; import de.anomic.http.server.HeaderFramework; import de.anomic.http.server.RequestHeader; +import de.anomic.search.Switchboard; import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; @@ -113,9 +114,14 @@ public class yacysearch_location { prop.put("kml_contentdom", (post == null ? "text" : post.get("contentdom", "text"))); prop.put("kml_verify", (post == null) ? "true" : post.get("verify", "true")); + } else if (header.get(HeaderFramework.CONNECTION_PROP_EXT, "").equals("html")) { + final Switchboard sb = (Switchboard) env; + final boolean authenticated = sb.adminAuthenticated(header) >= 2; + int display = (post == null) ? 0 : post.getInt("display", 0); + if (!authenticated) display = 2; + prop.put("display", display); } - // return rewrite properties return prop; }