From f8f9d509d5889c0d2a63d7621629d545a49e20ec Mon Sep 17 00:00:00 2001
From: allo <allo@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 14 Nov 2005 12:48:14 +0000
Subject: [PATCH] removed dead Code

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1078 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/SettingsAck_p.java              | 14 --------------
 source/de/anomic/data/userDB.java      |  1 -
 source/de/anomic/yacy/yacyVersion.java |  4 ----
 3 files changed, 19 deletions(-)

diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java
index 8b14d6cf7..89e34a4ed 100644
--- a/htroot/SettingsAck_p.java
+++ b/htroot/SettingsAck_p.java
@@ -157,20 +157,6 @@ public class SettingsAck_p {
             if (filter.length() == 0) filter = "*";
             // check passed. set account:
             env.setConfig("proxyClient", filter);
-            /*if (pw1.length() == 0) {
-                // only ip filter setting without account
-                env.setConfig("proxyAccountBase64MD5", "");
-                env.setConfig("proxyAccount", "");
-                prop.put("info", 6);//proxy account has changed(no pw)
-                prop.put("info_filter", filter);
-            } else {
-                // also paccount setting
-                env.setConfig("proxyAccountBase64MD5", serverCodings.standardCoder.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(user + ":" + pw1)));
-                env.setConfig("proxyAccount", "");
-                prop.put("info", 7);//proxy account has changed
-                prop.put("info_user", user);
-                prop.put("info_filter", filter);
-            }*/
             env.setConfig("use_proxyAccounts", use_proxyAccounts);//"true" or "false"
 			if (use_proxyAccounts.equals("false")){
                 prop.put("info", 6);//proxy account has changed(no pw)
diff --git a/source/de/anomic/data/userDB.java b/source/de/anomic/data/userDB.java
index dcb860280..c96a0e245 100644
--- a/source/de/anomic/data/userDB.java
+++ b/source/de/anomic/data/userDB.java
@@ -161,7 +161,6 @@ public final class userDB {
             auth=codings.decodeBase64String(auth);
         }catch(StringIndexOutOfBoundsException e){} //no valid Base64
         String[] tmp=auth.split(":");
-        System.out.println("proxyAuth: "+auth);
         if(tmp.length == 2){
             entry=this.getEntry(tmp[0]);
             if( entry != null && entry.getMD5EncodedUserPwd().equals(serverCodings.encodeMD5Hex(auth)) ){
diff --git a/source/de/anomic/yacy/yacyVersion.java b/source/de/anomic/yacy/yacyVersion.java
index 7436668f6..1689941ca 100644
--- a/source/de/anomic/yacy/yacyVersion.java
+++ b/source/de/anomic/yacy/yacyVersion.java
@@ -11,10 +11,6 @@ public final class yacyVersion {
     public static void migrate(plasmaSwitchboard sb){
     		//set preset accounts/passwords
         String acc;
-        if ((acc = sb.getConfig("proxyAccount", "")).length() > 0) {
-            sb.setConfig("proxyAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
-            sb.setConfig("proxyAccount", "");
-        }
         if ((acc = sb.getConfig("serverAccount", "")).length() > 0) {
             sb.setConfig("serverAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
             sb.setConfig("serverAccount", "");