No & in JavaScript-embeded URLs, added ability to stop focus in

ConfigPortal.html preview (is this not secured with _p????) Conflicts: htroot/yacyinteractive.java htroot/yacysearch.java
13 years ago · 5f983faef9
parent 52d307c735
commit 5f983faef9
4 changed files with 12 additions and 8 deletions
--- a/htroot/index.html
+++ b/htroot/index.html
@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    #(forward)#::<meta http-equiv="REFRESH" content="0; url=#[target]#" />#(/forward)#
--- a/htroot/yacyinteractive.java
+++ b/htroot/yacyinteractive.java
@ -54,9 +54,9 @@ public class yacyinteractive {
        prop.put("startRecord", startRecord);
        prop.put("maximumRecords", maximumRecords);
        prop.putHTML("querys", query.replaceAll(" ", "+"));
-        prop.put("serverlist", query.length() == 0 ? 1 : 0);
+        prop.put("serverlist", query.isEmpty() ? 1 : 0);
        prop.put("focus", focus ? 1 : 0);
        prop.put("allowrealtime", sb.indexSegments.URLCount() < 100000 ? 1 : 0);
        return prop;
    }
-}
+}
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@ -252,4 +252,4 @@ window.setTimeout('latestinfo();',10000);
 </script>

 </body>
-</html>
+</html>
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@ -28,6 +28,7 @@
 // if the shell's current path is HTROOT

 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@ -120,9 +121,8 @@ public class yacysearch {
        prop.put("topmenu", sb.getConfigBool("publicTopmenu", true) ? 1 : 0);

        //get focus option
-        final boolean focus  = (post == null) ? true : post.get("focus", "1").equals("1");
-        prop.put("focus", focus ? 1 : 0);
-
+        prop.put("focus", ((post == null) ? true : post.get("focus", "1").equals("1")) ? 1 : 0);
+        
        // produce vocabulary navigation sidebars
        Collection<Vocabulary> vocabularies = LibraryProvider.autotagging.getVocabularies();
        int j = 0;
@ -1104,7 +1104,12 @@ public class yacysearch {
        prop.putXML("rss_query", originalquerystring);
        prop.putXML("rss_queryenc", originalquerystring.replace(' ', '+'));

-        sb.localSearchLastAccess = System.currentTimeMillis();
+        sb.localSearchLastAccess = System.currentTimeMillis();
+
+        // hostname and port (assume locahost if nothing helps)
+        final InetAddress hostIP = Domains.myPublicLocalIP();
+        prop.put("myhost", hostIP != null ? hostIP.getHostAddress() : "localhost");
+        prop.put("myport", serverCore.getPortNr(sb.getConfig("port", "8090")));

        // return rewrite properties
        return prop;