more Properties

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

htroot/htdocsdefault/dir.java

@@ -108,8 +108,9 @@ public class dir {
         String adminAccountBase64MD5    = switchboard.getConfig("adminAccountBase64MD5", "");
         String uploadAccountBase64MD5   = switchboard.getConfig("uploadAccountBase64MD5", "");
         String downloadAccountBase64MD5 = switchboard.getConfig("downloadAccountBase64MD5", "");
-        String logoutAccountBase64MD5 = serverCodings.standardCoder.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(":"));
-	String authorizationMD5 = serverCodings.standardCoder.encodeMD5Hex(((String) header.get("Authorization", "xxxxxx")).trim().substring(6));
+        
+    String logoutAccountBase64MD5 = de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(":"));
+    String authorizationMD5 = de.anomic.server.serverCodings.encodeMD5Hex(((String) header.get("Authorization", "xxxxxx")).trim().substring(6));
 	//if (logoutAccountBase64.equals(authorization))
 	boolean adminAuthorization =
             ((adminAccountBase64MD5.length() != 0) &&

htroot/htdocsdefault/welcome.java

@@ -77,8 +77,8 @@ public class welcome {
 	prop.put("port", env.getConfig("port", "8080"));
         prop.put("clientip", header.get("CLIENTIP", ""));
         
-        String peertype = (yacyCore.seedDB.mySeed == null) ? "virgin" : yacyCore.seedDB.mySeed.get("PeerType", "virgin");
-	boolean senior = (peertype.equals("senior")) || (peertype.equals("principal"));
+        String peertype = (yacyCore.seedDB.mySeed == null) ? serverSwitch.PEERTYPE_JUNIOR : yacyCore.seedDB.mySeed.get(serverSwitch.PEERTYPE, serverSwitch.PEERTYPE_VIRGIN);
+	boolean senior = (peertype.equals(serverSwitch.PEERTYPE_SENIOR)) || (peertype.equals(serverSwitch.PEERTYPE_PRINCIPAL));
 	if (senior) prop.put("couldcan", "can"); else prop.put("couldcan", "could");
 	if (senior) prop.put("seniorinfo", "This peer runs in senior mode which means that your peer can be accessed using the addresses shown above."); else prop.put("seniorinfo", "<b>Nobody can access your peer from the outside of your intranet. You must open your firewall and/or set a 'virtual server' in the settings of your router to enable access to the addresses as shown below.</b>");
 	prop.put("wwwpath", "<application_root_path>/" + env.getConfig("htDocsPath", "DATA/HTDOCS"));