Merge branch 'master' of git@gitorious.org:yacy/rc1.git

defaults/yacy.init

@@ -498,7 +498,6 @@ allowDistributeIndexWhileCrawling=false
 allowDistributeIndexWhileIndexing=true
 allowReceiveIndex=true
 allowReceiveIndex.search=true
-allowUnlimitedReceiveIndexFrom=
 indexReceiveBlockBlacklist=true
 
 # the frequency is the number of links per minute, that the peer allowes
@@ -1222,7 +1221,6 @@ interaction.feedback.url =
 interaction.feedback.accept = false
 interaction.usertracking.enabled = true
 interaction.addcontent.enabled = false
-interaction.userlogon.enabled = false
 interaction.approvelist.enabled = false
 interaction.suggestrejected.enabled = false
 

htroot/ConfigPortal.html

@@ -48,11 +48,6 @@
           <input type="radio" name="search.options" value="false" #(search.options)#checked="checked"::#(/search.options)# />do not show Advanced Search
           </dd>
           
-          <dt>Show additional interaction features in footer</dt>
-          <dd>
-          <input type="checkbox" name="interaction.userlogon" value="true" #(interaction.userlogon)#::checked="checked"#(/interaction.userlogon)# />User-Logon&nbsp;
-          </dd>
-          
           <dt>Snippet Fetch Strategy &amp; Link Verification</dt>
           <dd>
           <img src="env/grafics/idea.png" width="32" height="32" alt="idea" align="center"/>Speed up search results with this option! (use CACHEONLY or FALSE to switch off verification)<br/>

htroot/ConfigPortal.java

@@ -89,7 +89,6 @@ public class ConfigPortal {
                 sb.setConfig(SwitchboardConstants.PUBLIC_SEARCHPAGE, !post.containsKey(SwitchboardConstants.PUBLIC_SEARCHPAGE) || post.getBoolean(SwitchboardConstants.PUBLIC_SEARCHPAGE));
                 sb.setConfig("search.options", post.getBoolean("search.options"));
 
-                sb.setConfig("interaction.userlogon.enabled", post.getBoolean("interaction.userlogon"));
                 sb.setConfig(SwitchboardConstants.GREEDYLEARNING_ACTIVE, post.getBoolean(SwitchboardConstants.GREEDYLEARNING_ACTIVE));
 
                 sb.setConfig(SwitchboardConstants.SEARCH_VERIFY, post.get("search.verify", "ifexist"));
@@ -144,7 +143,6 @@ public class ConfigPortal {
                 sb.setConfig(SwitchboardConstants.PUBLIC_SEARCHPAGE, config.getProperty(SwitchboardConstants.PUBLIC_SEARCHPAGE,"true"));
                 sb.setConfig("search.navigation", config.getProperty("search.navigation","hosts,authors,namespace,topics"));
                 sb.setConfig("search.options", config.getProperty("search.options","true"));
-                sb.setConfig("interaction.userlogon.enabled", config.getProperty("interaction.userlogon.enabled","false"));
                 sb.setConfig(SwitchboardConstants.GREEDYLEARNING_ACTIVE, config.getProperty(SwitchboardConstants.GREEDYLEARNING_ACTIVE));
                 sb.setConfig(SwitchboardConstants.SEARCH_VERIFY, config.getProperty(SwitchboardConstants.SEARCH_VERIFY,"iffresh"));
                 sb.setConfig(SwitchboardConstants.SEARCH_VERIFY_DELETE, config.getProperty(SwitchboardConstants.SEARCH_VERIFY_DELETE,"true"));
@@ -164,7 +162,6 @@ public class ConfigPortal {
         prop.put(SwitchboardConstants.PUBLIC_SEARCHPAGE, sb.getConfigBool(SwitchboardConstants.PUBLIC_SEARCHPAGE, false) ? 1 : 0);
         prop.put("search.options", sb.getConfigBool("search.options", false) ? 1 : 0);
 
-        prop.put("interaction.userlogon", sb.getConfigBool("interaction.userlogon.enabled", false) ? 1 : 0);
         prop.put(SwitchboardConstants.GREEDYLEARNING_ACTIVE, sb.getConfigBool(SwitchboardConstants.GREEDYLEARNING_ACTIVE, false) ? 1 : 0);
         prop.put(SwitchboardConstants.GREEDYLEARNING_LIMIT_DOCCOUNT, sb.getConfig(SwitchboardConstants.GREEDYLEARNING_LIMIT_DOCCOUNT, "0"));