*) situation-dependent lock-buttons for search-page

*) removed one unused import and a double definition of "ogg" as media-type

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3817 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/ConfigBasic.html

@@ -56,7 +56,7 @@
           </fieldset>
         </li>
         <li>
-          #(statusPort)#<img src="/env/grafics/bad.png" height="32" width="32" alt="warning" />&nbsp;Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::<img src="/env/grafics/ok.png" height="32" width="32" alt="ok" />&nbsp;Your peer can be reached by other peers#(/statusPort)#<br />
+          #(statusPort)#<img src="/env/grafics/bad.png" height="32" width="32" alt="warning" />&nbsp;Your peer cannot be reached from outside (which is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::<img src="/env/grafics/ok.png" height="32" width="32" alt="ok" />&nbsp;Your peer can be reached by other peers#(/statusPort)#<br />
           <fieldset>
             <dl>
               <dt><label for="port">Peer Port: </label></dt>

htroot/index.html

@@ -10,8 +10,8 @@
     #(display)#
     #%env/templates/simpleheader.template%#
     ::
-    #%env/templates/header.template%#
-	::
+    #%env/templates/header.template%#
+	::
 	#%env/templates/embeddedheader.template%#
     #(/display)#
 
@@ -111,25 +111,28 @@
       #(/searchoptions)#
       <p>This peer holds #[links]# URLs of #[total-links]# in the known network.</p>
     </form>
-    #(searchoptions)#::
-    <p>
-    <form action="index.html" method="get" class="search">
-      <button type="submit" name="publicPage" value="0">
-        <img src="/env/grafics/lock.gif" alt="authentication required" />
-          Disable search function for users without autorization
-      </button>
-      <button type="submit" name="publicPage" value="1">
-        <img src="/env/grafics/lock.gif" alt="authentication required" />
-          Enable web search to everyone
-      </button>
-    </form>
-    </p>
+    #(searchoptions)#::
+    <p>
+    <form action="index.html" method="get" class="search">
+    #(publicSearchpage)#
+      <button type="submit" name="publicPage" value="0">
+        <img src="/env/grafics/lock.gif" alt="authentication required" />
+          Disable search function for users without autorization
+      </button>
+      ::
+      <button type="submit" name="publicPage" value="1">
+        <img src="/env/grafics/lock.gif" alt="authentication required" />
+          Enable web search to everyone
+      </button>
+    #(/publicSearchpage)#
+    </form>
+    </p>
     #(/searchoptions)#
     #(display)#
     #%env/templates/simplefooter.template%#
     ::
-    #%env/templates/footer.template%#
-	::
+    #%env/templates/footer.template%#
+	::
 	#%env/templates/embeddedfooter.template%#
     #(/display)#
   </body>

htroot/index.java

@@ -138,6 +138,7 @@ public class index {
         prop.put("searchoptions_prefermaskoptions", 0);
         prop.put("searchoptions_prefermaskoptions_prefermaskfilter", prefermaskfilter);
         prop.put("searchoptions_indexofChecked", "");
+        prop.put("searchoptions_publicSearchpage", (publicPage == true) ? 0 : 1);
         prop.put("results", "");
         prop.put("cat", cat);
         prop.put("type", type);

htroot/yacysearch.java

@@ -52,7 +52,6 @@ import java.net.MalformedURLException;
 import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.regex.PatternSyntaxException;
 import java.util.TreeSet;
 

locales/de.lng

@@ -204,7 +204,7 @@ Peer User:==Peer-Nutzer:
 New Peer Password:==Neues Peer-Passwort:
 Repeat Peer Password:==Peer-Passwort bestätigen:
 Your peer cannot be reached from outside==Ihr Peer kann nicht von außen erreicht werden
-what is not fatal, but would be good for the YaCy network==was nicht schlimm ist, aber anders wäre für das YaCy-Netzwerk noch besser
+which is not fatal, but would be good for the YaCy network==was nicht schlimm ist, aber anders wäre für das YaCy-Netzwerk noch besser
 please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port==Bitte öffnen Sie Ihre Firewall auf diesem Port und/oder stellen Sie einen virtuellen Server in Ihrem Router ein um Verbindungen auf diesem Port zu erlauben
 Your peer can be reached by other peers==Ihr Peer kann von anderen Peers erreicht werden
 Peer Port:==Peer-Port:

source/de/anomic/plasma/crawler/http/CrawlWorker.java

@@ -119,7 +119,7 @@ public final class CrawlWorker extends AbstractCrawlWorker {
     }
 
     public void init() {
-        // refreshing timeout value        
+        // refreshing timeout value
         if (this.theMsg.timeout < 0) {
             this.socketTimeout = (int) this.sb.getConfigLong("crawler.clientTimeout", 10000);
         } else {
@@ -267,7 +267,7 @@ public final class CrawlWorker extends AbstractCrawlWorker {
                                     fos = new httpdBoundedSizeOutputStream(fos,this.maxFileSize);                     
                                 } else if (contentLength > this.maxFileSize) {
                                     remote.close();
-                                    this.log.logInfo("REJECTED URL " + this.url + " because file size '" + contentLength + "' exceeds max filesize limit.");
+                                    this.log.logInfo("REJECTED URL " + this.url + " because file size '" + contentLength + "' exceeds max filesize limit of " + this.maxFileSize + " bytes.");
                                     addURLtoErrorDB(plasmaCrawlEURL.DENIED_FILESIZE_LIMIT_EXCEEDED);                    
                                     return null;
                                 }
@@ -492,4 +492,4 @@ public final class CrawlWorker extends AbstractCrawlWorker {
             } catch (Exception e) {/* ignore this. shutdown in progress */}
         }
     }    
-}
+}

source/de/anomic/plasma/plasmaParser.java

@@ -172,8 +172,8 @@ public final class plasmaParser {
      * @see #initMediaExt(String)
      */
     static {
-        String apps = "sit,hqx,img,dmg,exe,com,bat,sh,zip,jar";
-        String audio = "mp2,mp3,ogg,aac,aif,aiff,wav,ogg";
+        String apps = "sit,hqx,img,dmg,exe,com,bat,sh,vbs,zip,jar";
+        String audio = "mp2,mp3,ogg,aac,aif,aiff,wav";
         String video = "swf,avi,wmv,rm,mov,mpg,mpeg,ram,m4v";
         String image = "jpg,jpeg,jpe,gif,png";
         initMediaExt(extString2extList(