*) Bugfix for wrong "Statusanzeige"

See: http://www.yacy-forum.de/viewtopic.php?p=4560

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

htroot/Status.html

@@ -69,7 +69,8 @@ Junior - You cannot be reached. A possible reason is that you are behind a firew
 ::
 Senior - You are running a server and you support the global internet index, which you can also <a href="index.html">search yourself</a>. Thank you!
 ::
-Principal - You are senior and you publish your seed-list to a ftp account which can be retrieved at #[seedURL]#. You can of course <a href="index.html">search the internet</a> using the other peers' global index on your own search page.
+Principal - You are senior and you publish your seed-list to a public accessible server where it can be retrieved using the url <a href="#[seedURL]#">#[seedURL]#</a>.<br>
+You can of course <a href="index.html">search the internet</a> using the other peers' global index on your own search page.
 #(/peerStatus)#
 </td></tr>
 <tr class="TableCellLight"><td>Other peers</td><td>#(otherPeers)#not online.::#[num]# other peers online.#(/otherPeers)#</td></tr>
@@ -77,7 +78,9 @@ Principal - You are senior and you publish your seed-list to a ftp account which
 #(seedServer)#
 Disabled. To enable this you need a ftp account where you can upload files to a web space. If you do that, you become a YaCy root server. You can configure your account details on the <a href="Settings_p.html">Settings page</a>.
 ::
-Enabled: Updating periodically to server #[seedFTPServer]#
+Enabled: Updating periodically to server #[seedServer]#
+::
+Enabled: Updating periodically to file #[seedFile]#
 #(/seedServer)#
 </td></tr>
 <tr class="TableCellLight"><td>Auto-popup on start-up</td><td>

htroot/Status.java

@@ -145,12 +145,28 @@ public class Status {
         }
         prop.put("peerName", thisName);
         prop.put("hash", thisHash);
-        if ((env.getConfig("seedFTPServer","").length() != 0) &&
-                (env.getConfig("seedFTPAccount","").length() != 0) &&
-                (env.getConfig("seedFTPPassword","").length() != 0) &&
-                (env.getConfig("seedFTPPath","").length() != 0)) {
-            prop.put("seedServer", 1);//enabled
-            prop.put("seedServer_seedFTPServer", env.getConfig("seedFTPServer",""));
+        String seedUploadMethod = env.getConfig("seedUploadMethod","");
+        if (
+                (!seedUploadMethod.equalsIgnoreCase("none")) || 
+                ((seedUploadMethod.equals("")) && (env.getConfig("seedFTPPassword","").length() > 0)) ||
+                ((seedUploadMethod.equals("")) && (env.getConfig("seedFilePath", "").length() > 0))
+        ) {
+            if (seedUploadMethod.equals("")) {
+                if (env.getConfig("seedFTPPassword","").length() > 0)
+                    env.setConfig("seedUploadMethod","Ftp");
+                if (env.getConfig("seedFilePath","").length() > 0)
+                    env.setConfig("seedUploadMethod","File");                
+            }                        
+            if (seedUploadMethod.equalsIgnoreCase("ftp")) {
+                prop.put("seedServer", 1);//enabled
+                prop.put("seedServer_seedServer", env.getConfig("seedFTPServer",""));
+            } else if (seedUploadMethod.equalsIgnoreCase("scp")) {
+                prop.put("seedServer", 1);//enabled
+                prop.put("seedServer_seedServer", env.getConfig("seedScpServer",""));
+            } else if (seedUploadMethod.equalsIgnoreCase("file")) {
+                prop.put("seedServer", 2);//enabled
+                prop.put("seedServer_seedFile", env.getConfig("seedFilePath",""));
+            }
         } else {
             prop.put("seedServer", 0);//disabled
         }