diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 575595925..4bfe17915 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -570,7 +570,7 @@ public class SettingsAck_p { */ if (post.containsKey("parserSettings")) { post.remove("parserSettings"); - + Set parserModes = plasmaParser.getParserConfigList().keySet(); HashMap newConfigList = new HashMap(); Iterator parserModeIter = parserModes.iterator(); diff --git a/htroot/Settings_Crawler.inc b/htroot/Settings_Crawler.inc index 924550b66..f375ebeb3 100644 --- a/htroot/Settings_Crawler.inc +++ b/htroot/Settings_Crawler.inc @@ -1,37 +1,37 @@ -

+
Crawler Settings - + - - + + - + - - - + + + - + - + - - - + + + - + - - + +

Generic Crawler Settings:

Generic Crawler Settings:

Timeout:Connection timeout in ms. 0 means unlimited.Connection timeout in ms. 0 means unlimited.

HTTP Crawler Settings:

Maximum Filesize:Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. -1 means unlimited.
- Please note that if the crawler uses content compression, this limit is used to check the compressed content size.		Maximum Filesize:Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. -1 means unlimited.
+ Please note that if the crawler uses content compression, this limit is used to check the compressed content size.

FTP Crawler Settings:

FTP Crawler Settings:

Maximum Filesize:Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. -1 means unlimited.Maximum Filesize:Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. -1 means unlimited.
 Changes will take effect immediately.Changes will take effect immediately.
-

\ No newline at end of file + \ No newline at end of file diff --git a/htroot/Settings_Http.inc b/htroot/Settings_Http.inc index 688b85fa8..8a23ace87 100644 --- a/htroot/Settings_Http.inc +++ b/htroot/Settings_Http.inc @@ -3,21 +3,21 @@ - + - + - + - + - +
: With this you can specify if YaCy can be used as transparent proxy.
- Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule:
+ Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule:
iptables -t nat -A PREROUTING -p tcp -s 192.168.0.0/16 --dport 80 -j DNAT --to 192.168.0.1:#[port]#
: With this you can specify if YaCy should support the HTTP connection keep-alive feature.
: Specifies if the proxy should send the Via http header according to RFC 2616 Sect 14.45. @@ -25,11 +25,11 @@
: Specifies if the proxy should send the X-Forwarded-For http header.
Changes will take effect immediately. Changes will take effect immediately.
diff --git a/htroot/Settings_MessageForwarding.inc b/htroot/Settings_MessageForwarding.inc index f9b458f08..958f71aec 100644 --- a/htroot/Settings_MessageForwarding.inc +++ b/htroot/Settings_MessageForwarding.inc @@ -4,12 +4,12 @@ - + - + - + - +
: Enabling/Disabling message forwarding via email.
: The command-line program that should be used to forward the message.
e.g.: /usr/sbin/sendmail @@ -17,14 +17,14 @@
: The recipient email-address.
e.g.: root@localhost
Changes will take effect immediately. Changes will take effect immediately.
diff --git a/htroot/Settings_Parser.inc b/htroot/Settings_Parser.inc index 12ccf10bd..fd958eeb0 100644 --- a/htroot/Settings_Parser.inc +++ b/htroot/Settings_Parser.inc @@ -1,4 +1,4 @@ -
+
Content Parser Settings

With this settings you can activate or deactivate parsing of additional content-types based on their MIME-types.
@@ -10,30 +10,27 @@ #[name]##{/parserMode}# Mime-Type Parser Usage - #{parser}# - #[name]# V#[version]# + #[name]# V#[version]# #[usage]#   #{mime}# #{parserMode}# - #{/parserMode}# + #{/parserMode}# #[mimetype]#   - #{/mime}# #{/parser}# #{parserMode}# - #{/parserMode}# - + + #{/parserMode}# Enable all parsers -   Changes take effect immediately

-

\ No newline at end of file + \ No newline at end of file diff --git a/htroot/Settings_PortForwarding.inc b/htroot/Settings_PortForwarding.inc index e00f3c073..59ed9634d 100644 --- a/htroot/Settings_PortForwarding.inc +++ b/htroot/Settings_PortForwarding.inc @@ -9,7 +9,7 @@ - + @@ -26,7 +26,7 @@ - + - + diff --git a/htroot/Settings_Proxy.inc b/htroot/Settings_Proxy.inc index bd954296e..133b03448 100644 --- a/htroot/Settings_Proxy.inc +++ b/htroot/Settings_Proxy.inc @@ -6,13 +6,13 @@ - + - + - + - + @@ -42,14 +42,13 @@ - - + diff --git a/htroot/Settings_ProxyAccess.inc b/htroot/Settings_ProxyAccess.inc index 1e64764db..43c4d2d44 100644 --- a/htroot/Settings_ProxyAccess.inc +++ b/htroot/Settings_ProxyAccess.inc @@ -56,7 +56,7 @@ - +
: Enabling / disabling port forwarding
Special settings for port forwarding using secure channel
: Function not available at the moment. @@ -57,7 +57,7 @@ Password to login on the remote server.
Changes will take effect immediately.
:   Enables the usage of the remote proxy by yacy
Specifies if the remote proxy should be used for the communication of this peer to other yacy peers.
Hint: Enabling this option could cause this peer to remain in junior status. @@ -20,10 +20,10 @@
Specifies if YaCy should forward ssl connections to the remote proxy.
:  
:  
diff --git a/htroot/Settings_ServerAccess.inc b/htroot/Settings_ServerAccess.inc index e9c8b2a02..88c504a8f 100644 --- a/htroot/Settings_ServerAccess.inc +++ b/htroot/Settings_ServerAccess.inc @@ -1,10 +1,9 @@ -

+
Server Access Settings -

- + - + - +
IP-Number filter: Here you can restrict access to the server. By default, the access is not limited, because this function is needed to spawn the p2p index-sharing function. If you block access to your server (setting anything else than '*'), then you will also be blocked @@ -14,37 +13,37 @@
staticIP (optional): The staticIP can help that your peer can be reached by other peers in case that your peer is behind a firewall or proxy. You can create a tunnel through the firewall/proxy (look out for 'tunneling through https proxy with connect command') and create an access point for incoming connections. This access address can be set here (either as IP number or domain name). If the address of outgoing connections is equal to the address of incoming connections, - you don't need to set anything here, please leave it blank.
+ you don't need to set anything here, please leave it blank.
ATTENTION: Your current IP is recognized as "#[clientIP]#". If the value you enter here does not match with this IP, you will not be able to access the server pages anymore.

diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html index b5bd27655..0a415aabe 100644 --- a/htroot/Settings_p.html +++ b/htroot/Settings_p.html @@ -9,11 +9,11 @@ function ParserCheckboxes(reference) { var mode = reference.name.substring(0,reference.name.indexOf(".")); - for(i=0; i= 0) + if(document.getElementById("parsersettings").elements[i].type=="checkbox" && document.getElementById("parsersettings").elements[i].name.indexOf(mode) >= 0) { - document.parsersettings.elements[i].checked=reference.checked; + document.getElementById("parsersettings").elements[i].checked=reference.checked; } } } diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java index 67032e261..69b90331d 100644 --- a/htroot/Settings_p.java +++ b/htroot/Settings_p.java @@ -299,7 +299,7 @@ public final class Settings_p { prop.put("parser_" + parserIdx + "_name", parserInfo.parserName); prop.put("parser_" + parserIdx + "_version", parserInfo.parserVersionNr); prop.put("parser_" + parserIdx + "_usage", Integer.toString(parserInfo.usageCount)); - prop.put("parser_" + parserIdx + "_colspan",Integer.toString(configArray.length+1)); + prop.put("parser_" + parserIdx + "_colspan",Integer.toString(configArray.length)); int mimeIdx = 0; Enumeration mimeTypeIter = parserInfo.supportedMimeTypes.keys(); @@ -329,7 +329,7 @@ public final class Settings_p { } prop.put("parserMode",configArray.length); prop.put("parser", parserIdx); - prop.put("parser.colspan", Integer.toString(configArray.length+3)); + prop.put("parser.colspan", Integer.toString(configArray.length+2)); // Crawler settings prop.put("crawler.clientTimeout",sb.getConfig("crawler.clientTimeout", "10000")); diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc index 134d8cd0c..019458a3f 100644 --- a/htroot/Status_p.inc +++ b/htroot/Status_p.inc @@ -50,7 +50,6 @@ [Disable] #(/popup)# - Memory Usage