removed internal addres presentation in interface according to http://www.yacy-forum.de/viewtopic.php?p=6779#6779

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@541 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 20 years ago
parent 5cb00889d9
commit dbba052331

@ -36,10 +36,12 @@ Your settings are protected by a password.
<tr class="TableCellLight"><td>System version</td><td>
#[versionpp]# #(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to <a href="http://www.yacy.net/yacy/Download.html">download</a> it.#(/versioncomment)#
</td></tr>
<!--
<tr class="TableCellDark"><td>Proxy host</td><td>#[host]#:#[port]#</td></tr>
<tr class="TableCellLight"><td>Port forwarding host</td><td>#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#</td></tr>
<tr class="TableCellDark"><td>Remote proxy</td><td>#(remoteProxy)#not used::#[host]#:#[port]##(/remoteProxy)#</td></tr>
<tr class="TableCellLight"><td>This peer's address</td><td>
-->
<tr class="TableCellDark"><td>This peer's address</td><td>
#(peerAddress)#
Not assigned
::
@ -52,8 +54,8 @@ see the <a href="http://www.yacy.net/yacy/Installation.html#wininst">installatio
#[address]# ; Your '.yacy' home at http://www.#[peername]#.yacy
#(/peerAddress)#
</td></tr>
<tr class="TableCellDark"><td>This peer's name</td><td>#[peerName]#/#[hash]#</td></tr>
<tr class="TableCellLight"><td>This peer's statistics</td><td>
<tr class="TableCellLight"><td>This peer's name</td><td>#[peerName]#/#[hash]#</td></tr>
<tr class="TableCellDark"><td>This peer's statistics</td><td>
#(peerStatistics)#
Unknown
::
@ -61,7 +63,7 @@ Uptime = #[uptime]#, Links# = #[links]#, RWIs# = #[words]#, PPM = #[pagesperminu
Connects (#[juniorConnects]#|#[seniorConnects]#|#[principalConnects]#|#[disconnects]#) #[connects]# peers/hour
#(/peerStatistics)#
</td></tr>
<tr class="TableCellDark"><td>This peer's status</td><td>
<tr class="TableCellLight"><td>This peer's status</td><td>
#(peerStatus)#
Virgin - You have not published your peer yet, because you have not used the proxy yet. If you configured your browser's proxy settings (see online: <a href="http://www.yacy.net/yacy/Installation.html#wininst">configure your browser's proxy settings</a>), you must first load any page through the proxy to prove that this works. With this status you are not allowed to search other peers!
::
@ -73,8 +75,8 @@ Principal - You are senior and you publish your seed-list to a public accessible
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>
<tr class="TableCellDark"><td>Seed server</td><td>
<tr class="TableCellDark"><td>Other peers</td><td>#(otherPeers)#not online::#[num]# other peers online.#(/otherPeers)#</td></tr>
<tr class="TableCellLight"><td>Seed server</td><td>
#(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>.
::
@ -85,14 +87,14 @@ Enabled: Updating periodically to file #[seedFile]#.
Last upload: #[lastUpload]# ago.
#(/seedServer)#
</td></tr>
<tr class="TableCellLight"><td>Auto-popup on start-up</td><td>
<tr class="TableCellDark"><td>Auto-popup on start-up</td><td>
#(popup)#
Disabled. To enable this again please use the <a href="Settings_p.html#SystemBehaviour">Settings</a> page
::
Enabled. To disable this please use the <a href="Settings_p.html#SystemBehaviour">Settings</a> page
#(/popup)#
</td></tr>
<tr class="TableCellDark"><td>Online-mode</td><td>
<tr class="TableCellLight"><td>Online-mode</td><td>
#(omode)#
<!-- online Mode 0 -->
::
@ -114,10 +116,10 @@ You are in <i>permanent</i> mode. Attention: If you don't have a flatrate or are
-->
free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#
</td></tr>
<tr class="TableCellDark"><td>Traffic</td><td>
<tr class="TableCellLight"><td>Traffic</td><td>
Out: #[trafficIn]# | In: #[trafficOut]#
</td></tr>
<tr class="TableCellLight"><td>System Resources</td><td>
<tr class="TableCellDark"><td>System Resources</td><td>
Processors: #[processors]#
</td></tr>

@ -92,23 +92,23 @@ public class Status {
prop.put("versioncomment_latestVersion", Float.toString(yacyCore.latestVersion));
prop.put("host", serverCore.publicLocalIP());
prop.put("port", env.getConfig("port", "<unknown>"));
//prop.put("host", serverCore.publicLocalIP());
//prop.put("port", env.getConfig("port", "<unknown>"));
// port forwarding: hostname and port
if ((serverCore.portForwardingEnabled) && (serverCore.portForwarding != null)) {
prop.put("portForwarding", 1);
prop.put("portForwarding_host", serverCore.portForwarding.getHost());
prop.put("portForwarding_port", Integer.toString(serverCore.portForwarding.getPort()));
prop.put("portForwarding_status", serverCore.portForwarding.isConnected() ? 1:0);
//prop.put("portForwarding_host", serverCore.portForwarding.getHost());
//prop.put("portForwarding_port", Integer.toString(serverCore.portForwarding.getPort()));
//prop.put("portForwarding_status", serverCore.portForwarding.isConnected() ? 1:0);
} else {
prop.put("portForwarding", 0);
}
if (env.getConfig("remoteProxyUse", "false").equals("true")) {
prop.put("remoteProxy", 1);
prop.put("remoteProxy_host", env.getConfig("remoteProxyHost", "<unknown>"));
prop.put("remoteProxy_port", env.getConfig("remoteProxyPort", "<unknown>"));
//prop.put("remoteProxy_host", env.getConfig("remoteProxyHost", "<unknown>"));
//prop.put("remoteProxy_port", env.getConfig("remoteProxyPort", "<unknown>"));
} else {
prop.put("remoteProxy", 0);//not used
}

Loading…
Cancel
Save