Merge remote-tracking branch 'yacy/master' into archLinuxDocker

README.md

@@ -1,6 +1,7 @@
 # YaCy
 [![Gitter](https://badges.gitter.im/yacy/yacy_search_server.svg)](https://gitter.im/yacy/yacy_search_server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/yacy/yacy_search_server.svg?branch=master)](https://travis-ci.com/yacy/yacy_search_server)
+[![Install Link](https://img.shields.io/badge/install-stable-blue.svg)](https://yacy.net/download_installation/)
 
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
 
@@ -46,12 +47,13 @@ The (GPLv2+) source code used to build YaCy is distributed with the package (in
 
 - [Homepage](https://yacy.net)
 - [International Forum](https://community.searchlab.eu)
+- [English wiki](https://wiki.yacy.net/index.php/En:Start)
 - [German wiki](https://wiki.yacy.net/index.php/De:Start)
 - [Esperanto wiki](https://wiki.yacy.net/index.php/Eo:Start)
 - [French wiki](https://wiki.yacy.net/index.php/Fr:Start)
 - [Spanish wiki](https://wiki.yacy.net/index.php/Es:Start)
 - [Russian wiki](https://wiki.yacy.net/index.php/Ru:Start)
-- [Video tutorials in English](https://yacy.net/en/Tutorials.html) and [video tutorials in German](https://yacy.net/de/Lehrfilme.html)
+- [Video tutorials](https://www.youtube.com/@YaCyTutorials/videos)
 
 All these have (YaCy) search functionality combining all these locations into one search result.
 

htroot/Crawler_p.html

@@ -293,7 +293,7 @@ window.setInterval("setTableSize()", 1000);
 <script src="js/d3.v5.min.js"></script>
 <script src="js/hypertree.js"></script>
 <div id="linkstructure"></div>
-<script>$(document).ready(linkstructure("#[hosts]#", "#linkstructure", 1280, 720, 3000, 700));</script>::
+<script>$(document).ready(linkstructure("#[hosts]#", "#linkstructure", 1600, 900, 3000, 700));</script>::
 <td>
   <form style="float:right;" action="Crawler_p.html"><input type="submit" name="hidewebstructuregraph" class="btn btn-default btn-xs" value="hide graphic"/><form>
 </td></tr></table>

source/net/yacy/htroot/NetworkPicture.java

@@ -99,22 +99,8 @@ public class NetworkPicture {
         }
 
         //too small values lead to an error, too big to huge CPU/memory consumption, resulting in possible DOS.
-        if ( width < 320 ) {
+        width  = Math.min(2048, Math.max(320, width));
-            width = 320;
+        height = Math.min(1280, Math.max(240, height));
-        }
-        if ( width > 1920 ) {
-            width = 1920;
-        }
-        if ( height < 240 ) {
-            height = 240;
-        }
-        if ( height > 1280 ) {
-            height = 1280;
-        }
-        if ( !authorized ) {
-            width = Math.min(1280, width);
-            height = Math.min(1280, height);
-        }
         if ( passiveLimit > 1000000 ) {
             passiveLimit = 1000000;
         }