jquery bugfix

htroot/env/templates/jqueryheader.template

@@ -1,5 +1,5 @@
 <!-- jQuery header /env/jqueryheader.template -->
-	<link media="screen" type="text/css" href="/currentyacypeer/query/themes/start/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
+	<link media="screen" type="text/css" href="/currentyacypeer/jquery/themes/start/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
 	<link media="screen" type="text/css" href="/currentyacypeer/jquery/css/jquery-ui-combobox.css" rel="stylesheet" />
 	<link media="screen" type="text/css" href="/currentyacypeer/jquery/slider/jquery.slider.min.css" rel="stylesheet" />
 	<script src="/currentyacypeer/jquery/js/jquery-1.7.min.js" type="text/javascript"></script>    

htroot/env/templates/metas.template

@@ -1,8 +1,8 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <link rel="shortcut icon" href="favicon.ico" />
   <meta name="Content-Language" content="English, Englisch" />
-  <meta name="keywords" content="Anomic YaCy HTTP Proxy search engine spider indexer java network open free download Mac Windows Linux Software development" />
+  <meta name="keywords" content="YaCy HTTP search engine spider indexer java network open free download Mac Windows Linux Software development" />
-  <meta name="description" content="Anomic Software HTTP Proxy Freeware Home Page" />
+  <meta name="description" content="Software HTTP Freeware Home Page" />
   <meta name="copyright" content="Michael Christen et al." />
   <link rel="stylesheet" type="text/css" media="all" href="/env/base.css" />
   <link rel="stylesheet" type="text/css" media="screen" href="/env/style.css" />
@@ -17,4 +17,4 @@
   <![endif]-->
   #%env/templates/jqueryheader.template%#
   #%env/templates/portalheader.template%#
-<!-- (C), Architecture and Realisation: Michael Peter Christen; Contact: mc <at> anomic.de -->
+<!-- (C), Architecture: Michael Peter Christen; Contact: mc <at> yacy.net -->

source/de/anomic/http/server/AugmentedHtmlStream.java

@@ -12,13 +12,13 @@ import java.nio.charset.Charset;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.interaction.AugmentHtmlStream;
 import net.yacy.kelondro.data.meta.DigestURI;
-import net.yacy.search.Switchboard;
 
 public class AugmentedHtmlStream extends FilterOutputStream {
     private final Writer out;
     private final ByteArrayOutputStream buffer;
     private final Charset charset;
     private final DigestURI url;
+    private final String urls;
     private final RequestHeader requestHeader;
 
     public AugmentedHtmlStream(OutputStream out, Charset charset, DigestURI url, RequestHeader requestHeader) {
@@ -27,6 +27,7 @@ public class AugmentedHtmlStream extends FilterOutputStream {
         this.buffer = new ByteArrayOutputStream();
         this.charset = charset;
         this.url = url;
+        this.urls = this.url.toNormalform(false, true);
         this.requestHeader = requestHeader;
     }
 
@@ -49,19 +50,10 @@ public class AugmentedHtmlStream extends FilterOutputStream {
 	}
 
     public StringBuffer process(StringBuffer data) {
-
+        if (this.urls.contains("currentyacypeer/")) {
-		if (Switchboard.getSwitchboard().getConfigBool("proxyAugmentation", false) == true) {
-
-			if (!this.url.toNormalform(false, true).contains("currentyacypeer/")) {
-
-				return AugmentHtmlStream.process (data, this.charset, this.url, this.requestHeader);
-
-			} else {
             return data;
-			}
-
         } else {
-			return data;
+            return AugmentHtmlStream.process (data, this.charset, this.url, this.requestHeader);
         }
     }
 

source/de/anomic/http/server/HTTPDProxyHandler.java

@@ -468,14 +468,6 @@ public final class HTTPDProxyHandler {
             	path = path.substring(16);
             }
 
-         // point virtual directory to my peer
-            if (path.startsWith("/currentyacypeer/")) {
-            	host = sb.peers.myIP();
-            	port = sb.peers.myPort();
-            	path = path.substring(16);
-            }
-
-
             // resolve yacy and yacyh domains
             String yAddress = resolveYacyDomains(host);