boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

- final step for Advanced Settings pages to XHTML

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3121 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
karlchenofhell 18 years ago
parent 18c841b3c0
commit 4a1dd8ecc8
12 changed files with 57 additions and 63 deletions
Show Stats Download Patch File Download Diff File

2
htroot/SettingsAck_p.java
Unescape View File

@ -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();

36
htroot/Settings_Crawler.inc
Unescape View File

@ -1,37 +1,37 @@
<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="admin">Crawler Settings</legend>
<table border="0" cellspacing="5" width="100%">
<tr><td colspan="3"><p><b>Generic Crawler Settings:</b></p></td></tr>
<tr><td colspan="3"><p><strong>Generic Crawler Settings</strong>:</p></td></tr>
<tr valign="top">
<td>Timeout:</td>
<td><input name="crawler.clientTimeout" type="text" size="16" maxlength="16" value="#[crawler.clientTimeout]#"></td>
<td width="100%"><i>Connection timeout in ms. <code>0</code> means unlimited.</i></td>
<td><input name="crawler.clientTimeout" type="text" size="16" maxlength="16" value="#[crawler.clientTimeout]#" /></td>
<td><em>Connection timeout in ms. <code>0</code> means unlimited.</em></td>
</tr>
<tr><td colspan="3"><hr></td></tr>
<tr><td colspan="3"><hr /></td></tr>
<tr><td colspan="3"><p><b>HTTP Crawler Settings:</b></p></td></tr>
<tr valign="top">
<td>Maximum&nbsp;Filesize:</td>
<td><input name="crawler.http.maxFileSize" type="text" size="16" maxlength="16" value="#[crawler.http.maxFileSize]#"></td>
<td><i>Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. <code>-1</code> means unlimited.<br>
Please note that if the crawler uses content compression, this limit is used to check the compressed content size.</i></td>
<td>Maximum Filesize:</td>
<td><input name="crawler.http.maxFileSize" type="text" size="16" maxlength="16" value="#[crawler.http.maxFileSize]#" /></td>
<td><em>Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. <code>-1</code> means unlimited.<br />
Please note that if the crawler uses content compression, this limit is used to check the compressed content size.</em></td>
</tr>
<tr><td colspan="3"><hr></td></tr>
<tr><td colspan="3"><hr /></td></tr>
<tr><td colspan="3"><p><b>FTP Crawler Settings:</b></p></td></tr>
<tr><td colspan="3"><p><strong>FTP Crawler Settings</strong>:</p></td></tr>
<tr valign="top">
<td>Maximum&nbsp;Filesize:</td>
<td><input name="crawler.ftp.maxFileSize" type="text" size="16" maxlength="16" value="#[crawler.ftp.maxFileSize]#"></td>
<td><i>Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. <code>-1</code> means unlimited.</i></td>
<td>Maximum Filesize:</td>
<td><input name="crawler.ftp.maxFileSize" type="text" size="16" maxlength="16" value="#[crawler.ftp.maxFileSize]#" /></td>
<td><em>Maximum allowed file size in bytes that should be downloaded. Larger files will be skipped. <code>-1</code> means unlimited.</em></td>
</tr>
<tr><td colspan="3"><hr></td></tr>
<tr><td colspan="3"><hr /></td></tr>
<tr valign="top">
<td>&nbsp;</td>
<td><input type="submit" name="crawlerSettings" value="Submit"></td>
<td><i>Changes will take effect immediately.</i></td>
<td><input type="submit" name="crawlerSettings" value="Submit" /></td>
<td><em>Changes will take effect immediately.</em></td>
</tr>
</table>
</fieldset>
</form><br>
</form>

12
htroot/Settings_Http.inc
Unescape View File

@ -3,21 +3,21 @@
<table border="0" cellspacing="5">
<tr valign="top">
<td><label for="trans_proxy">Transparent Proxy</label>:</td>
<td><input type="checkbox" name="isTransparentProxy" id="trans_proxy" align="top" #(isTransparentProxy)#::checked="checked" #(/isTransparentProxy)#/></td>
<td><input type="checkbox" name="isTransparentProxy" id="trans_proxy" #(isTransparentProxy)#::checked="checked" #(/isTransparentProxy)#/></td>
<td>
With this you can specify if YaCy can be used as transparent proxy.<br />
<i>Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule:</i><br />
<em>Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule</em>:<br />
<small><code>iptables -t nat -A PREROUTING -p tcp -s 192.168.0.0/16 --dport 80 -j DNAT --to 192.168.0.1:#[port]#</code></small>
</td>
</tr>
<tr valign="top">
<td><label for="conn_keep_alive">Connection Keep-Alive</label>:</td>
<td><input type="checkbox" name="connectionKeepAliveSupport" id="conn_keep_alive" align="top" #(connectionKeepAliveSupport)#::checked="checked" #(/connectionKeepAliveSupport)#/></td>
<td><input type="checkbox" name="connectionKeepAliveSupport" id="conn_keep_alive" #(connectionKeepAliveSupport)#::checked="checked" #(/connectionKeepAliveSupport)#/></td>
<td>With this you can specify if YaCy should support the HTTP connection keep-alive feature.</td>
</tr>
<tr valign="top">
<td><label for="via_header">Send "Via" Header</label>:</td>
<td><input type="checkbox" name="proxy.sendViaHeader" id="via_header" align="top" #(proxy.sendViaHeader)#::checked="checked" #(/proxy.sendViaHeader)#/></td>
<td><input type="checkbox" name="proxy.sendViaHeader" id="via_header" #(proxy.sendViaHeader)#::checked="checked" #(/proxy.sendViaHeader)#/></td>
<td>
Specifies if the proxy should send the <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.45">Via</a>
http header according to RFC 2616 Sect 14.45.
@ -25,11 +25,11 @@
</tr>
<tr valign="top">
<td><label for="x_forwarded_header">Send "X-Forwarded-For" Header</label>:</td>
<td><input type="checkbox" name="proxy.sendXForwardedForHeader" id="x_forwarded_header" align="top" #(proxy.sendXForwardedForHeader)#::checked="checked" #(/proxy.sendXForwardedForHeader)#/></td>
<td><input type="checkbox" name="proxy.sendXForwardedForHeader" id="x_forwarded_header" #(proxy.sendXForwardedForHeader)#::checked="checked" #(/proxy.sendXForwardedForHeader)#/></td>
<td>Specifies if the proxy should send the X-Forwarded-For http header.</td>
</tr>
<tr valign="top">
<td colspan="3"><input type="submit" name="httpNetworking" value="Submit"> <i>Changes will take effect immediately.</i></td>
<td colspan="3"><input type="submit" name="httpNetworking" value="Submit" /> <em>Changes will take effect immediately.</em></td>
</tr>
</table>
</fieldset>

8
htroot/Settings_MessageForwarding.inc
Unescape View File

@ -4,12 +4,12 @@
<table border="0" cellspacing="5">
<tr valign="top">
<td><label for="msg_forwarding">Enable message forwarding</label>:</td>
<td><input type="checkbox" name="msgForwardingEnabled" id="msg_forwarding" align="top" #(msgForwardingEnabled)#::checked="checked" #(/msgForwardingEnabled)#/></td>
<td><input type="checkbox" name="msgForwardingEnabled" id="msg_forwarding" #(msgForwardingEnabled)#::checked="checked" #(/msgForwardingEnabled)#/></td>
<td><i>Enabling/Disabling message forwarding via email.</i></td>
</tr>
<tr valign="top">
<td><label for="fwd_cmd">Forwarding Command</label>:</td>
<td><input name="msgForwardingCmd" id="fwd_cmd" type="text" size="32" value="#[msgForwardingCmd]#"></td>
<td><input name="msgForwardingCmd" id="fwd_cmd" type="text" size="32" value="#[msgForwardingCmd]#" /></td>
<td>
<i>The command-line program that should be used to forward the message.<br />
e.g.:</i> <code>/usr/sbin/sendmail</code>
@ -17,14 +17,14 @@
</tr>
<tr valign="top">
<td><label for="fwd_to">Forwarding To</label>:</td>
<td><input name="msgForwardingTo" id="fwd_to" type="text" size="32" maxlength="128" value="#[msgForwardingTo]#"></td>
<td><input name="msgForwardingTo" id="fwd_to" type="text" size="32" maxlength="128" value="#[msgForwardingTo]#" /></td>
<td>
<i>The recipient email-address.<br />
e.g.:</i> <code>root@localhost</code>
</td>
</tr>
<tr valign="top">
<td colspan="3"><input type="submit" name="msgForwarding" value="Submit"> <i>Changes will take effect immediately.</i></td>
<td colspan="3"><input type="submit" name="msgForwarding" value="Submit" /> <em>Changes will take effect immediately.</em></td>
</tr>
</table>
</fieldset>

15
htroot/Settings_Parser.inc
Unescape View File

@ -1,4 +1,4 @@
<form name="parsersettings" action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form id="parsersettings" action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="parser">Content Parser Settings</legend>
<p>
With this settings you can activate or deactivate parsing of additional content-types based on their MIME-types.<br />
@ -10,30 +10,27 @@
<td class="small" >#[name]#</td>#{/parserMode}#
<td class="small" >Mime-Type</td>
<td class="small" >Parser&nbsp;Usage</td>
<td class="small" ></td>
</tr>#{parser}#
<tr class="TableCellDark">
<td colspan="#[colspan]#"><nobr>#[name]# V#[version]#</nobr></td>
<td colspan="#[colspan]#">#[name]# V#[version]#</td>
<td>#[usage]#</td>
<td>&nbsp;</td>
</tr>#{mime}#
<tr class="TableCellLight">#{parserMode}#
<td class="small" align="center"><input type="checkbox" name="#[optionName]#" align="top" #(status)#::checked="checked" #(/status)#/></td>#{/parserMode}#
<td class="small" align="center"><input type="checkbox" name="#[optionName]#" #(status)#::checked="checked" #(/status)#/></td>#{/parserMode}#
<td class="small">#[mimetype]#</td>
<td class="small">&nbsp;</td>
<td class="small" width="100%"></td>
</tr>#{/mime}#
#{/parser}#
<tr class="TableCellDark">#{parserMode}#
<td class="small" align="center">
<input type="checkbox" name="#[name]#.allParserEnabled" align="top" onclick="javascript: ParserCheckboxes(this);" #(allParserEnabled)#::checked="checked" #(/allParserEnabled)#/>#{/parserMode}#
</td>
<input type="checkbox" name="#[name]#.allParserEnabled" onclick="javascript: ParserCheckboxes(this);" #(allParserEnabled)#::checked="checked" #(/allParserEnabled)#/>
</td>#{/parserMode}#
<td colspan="2" class="small">Enable all parsers</td>
<td class="small">&nbsp;</td>
</tr>
<tr class="TableCellDark">
<td colspan="#[parser.colspan]#" class="small" ><input type="submit" name="parserSettings" value="Submit" /> Changes take effect immediately</td>
</tr>
</table>
</fieldset>
</form><br>
</form>

6
htroot/Settings_PortForwarding.inc
Unescape View File

@ -9,7 +9,7 @@
<table border="0" cellspacing="5">
<tr valign="top">
<td><label for="pfwd">Enable port forwarding</label>:</td>
<td><input type="checkbox" name="portForwarding.Enabled" id="pfwd" align="top" #(portForwarding.Enabled)#::checked="checked" #(/portForwarding.Enabled)##(portForwarding.Available)#disabled="disabled" ::#(/portForwarding.Available)#/></td>
<td><input type="checkbox" name="portForwarding.Enabled" id="pfwd" #(portForwarding.Enabled)#::checked="checked" #(/portForwarding.Enabled)##(portForwarding.Available)#disabled="disabled" ::#(/portForwarding.Available)#/></td>
<td>Enabling / disabling port forwarding</td>
</tr>
<tr valign="top">
@ -26,7 +26,7 @@
<tr><td colspan="3"><b>Special settings for port forwarding using secure channel</b></td></tr>
<tr valign="top">
<td><label for="pfwd_proxy">Forwarding via proxy</label>:</td>
<td><input type="checkbox" name="portForwarding.sch.UseProxy" id="pfwd_proxy" align="top" #(portForwarding.sch.UseProxy)#::checked="checked" #(/portForwarding.sch.UseProxy)#disabled="disabled" /></td>
<td><input type="checkbox" name="portForwarding.sch.UseProxy" id="pfwd_proxy" #(portForwarding.sch.UseProxy)#::checked="checked" #(/portForwarding.sch.UseProxy)#disabled="disabled" /></td>
<td>
<!-- Specifies if the connection should be established through the <a href="#proxy">remote proxy</a>.-->
<i>Function not available at the moment.</i>
@ -57,7 +57,7 @@
<td><input name="portForwarding.sch.HostPwd" id="pfwd_host_pwd" type="password" size="32" maxlength="128" value="#[portForwarding.sch.HostPwd]#" /></td>
<td>Password to login on the remote server.</td>
</tr>
<tr><td colspan="3"><hr></td></tr>
<tr><td colspan="3"><hr /></td></tr>
<tr valign="top">
<td colspan="3"><input type="submit" name="portForwarding" value="Submit"#(portForwarding.Available)# disabled="disabled"::#(/portForwarding.Available)# /> <i>Changes will take effect immediately.</i></td>
</tr>

11
htroot/Settings_Proxy.inc
Unescape View File

@ -6,13 +6,13 @@
<!-- enabling/disabling remote proxy usage -->
<tr valign="top">
<td><label for="rem_prxy">Use remote proxy</label>:</td>
<td><input type="checkbox" name="remoteProxyUse" id="rem_prxy" align="top"#(remoteProxyUseChecked)#:: checked="checked"#(/remoteProxyUseChecked)# /></td>
<td><input type="checkbox" name="remoteProxyUse" id="rem_prxy"#(remoteProxyUseChecked)#:: checked="checked"#(/remoteProxyUseChecked)# /></td>
<td>&nbsp;</td>
<td>Enables the usage of the remote proxy by yacy</td>
</tr>
<tr valign="top">
<td colspan="2"><label for="prxy4yacy">Use remote proxy for yacy &lt;-&gt; yacy communication</label></td>
<td><input type="checkbox" name="remoteProxyUse4Yacy" id="prxy4yacy" align="top"#(remoteProxyUse4Yacy)#:: checked="checked"#(/remoteProxyUse4Yacy)# /></td>
<td><input type="checkbox" name="remoteProxyUse4Yacy" id="prxy4yacy"#(remoteProxyUse4Yacy)#:: checked="checked"#(/remoteProxyUse4Yacy)# /></td>
<td>
Specifies if the remote proxy should be used for the communication of this peer to other yacy peers.<br />
<em>Hint:</em> Enabling this option could cause this peer to remain in junior status.
@ -20,10 +20,10 @@
</tr>
<tr valign="top">
<td colspan="2"><label for="prxy4ssl">Use remote proxy for HTTPS</label></td>
<td><input type="checkbox" name="remoteProxyUse4SSL" id="prxy4ssl" align="top"#(remoteProxyUse4SSL)#:: checked="checked"#(/remoteProxyUse4SSL)# /></td>
<td><input type="checkbox" name="remoteProxyUse4SSL" id="prxy4ssl"#(remoteProxyUse4SSL)#:: checked="checked"#(/remoteProxyUse4SSL)# /></td>
<td>Specifies if YaCy should forward ssl connections to the remote proxy.</td>
</tr>
<tr><td colspan="4"><hr></td></tr>
<tr><td colspan="4"><hr /></td></tr>
<!-- remote proxy hostname + port -->
<tr valign="top">
@ -42,14 +42,13 @@
<td><label for="user">Remote proxy user</label>:</td>
<td colspan="2"><input name="remoteProxyUser" type="text" id="user" size="32" maxlength="128" value="#[remoteProxyUser]#" /></td>
<td>&nbsp;</td>
</tr>
</tr>
<tr valign="top">
<td><label for="pwd">Remote proxy password</label>:</td>
<td colspan="2"><input name="remoteProxyPwd" id="pwd" type="password" size="32" maxlength="128" value="#[remoteProxyPwd]#" /></td>
<td>&nbsp;</td>
</tr>
<tr><td colspan="4"><hr></td></tr>
<tr><td colspan="4"><hr /></td></tr>
<!-- no remote proxy pattern -->
<tr valign="top">

2
htroot/Settings_ProxyAccess.inc
Unescape View File

@ -56,7 +56,7 @@
</td>
</tr>
<tr valign="top">
<td colspan="2"><input type="submit" name="proxyaccount" value="Submit"></td>
<td colspan="2"><input type="submit" name="proxyaccount" value="Submit" /></td>
</tr>
</table>
</fieldset>

17
htroot/Settings_ServerAccess.inc
Unescape View File

@ -1,10 +1,9 @@
<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="general">Server Access Settings</legend>
<p>
<table border="0" cellspacing="5">
<tr valign="top">
<td>IP-Number filter:</td>
<td><input name="serverfilter" type="text" size="50" maxlength="1000" value="#[serverfilter]#"></td>
<td><input name="serverfilter" type="text" size="50" maxlength="1000" value="#[serverfilter]#" /></td>
<td><strong>Here you can restrict access to the server.</strong> 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 @@
</tr>
<!--
<tr valign="top">
<td><input name="serveruser" type="text" size="16" maxlength="16" value="#[serveruser]#"></td>
<td><input name="serveruser" type="text" size="16" maxlength="16" value="#[serveruser]#" /></td>
<td></td>
<td></td>
</tr>
<tr valign="top">
<td>Password:</td>
<td><input name="serverpw1" type="password" size="16" maxlength="16" value=""></td>
<td><input name="serverpw1" type="password" size="16" maxlength="16" value="" /></td>
<td></td>
</tr>
<tr valign="top">
<td>Password (repeat same as above):</td>
<td><input name="serverpw2" type="password" size="16" maxlength="16" value=""></td>
<td><input name="serverpw2" type="password" size="16" maxlength="16" value="" /></td>
<td></td>
</tr>
-->
<tr valign="top">
<td>staticIP (optional):</td>
<td><input name="staticIP" type="text" size="32" maxlength="80" value="#[staticIP]#"></td>
<td><input name="staticIP" type="text" size="32" maxlength="80" value="#[staticIP]#" /></td>
<td><strong>The staticIP can help that your peer can be reached by other peers in case that your
peer is behind a firewall or proxy.</strong> 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.<br>
you don't need to set anything here, please leave it blank.<br />
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.</td>
</tr>
<tr valign="top">
<td colspan="3"><input type="submit" name="serveraccount" value="Submit"></td>
<td colspan="3"><input type="submit" name="serveraccount" value="Submit" /></td>
</tr>
</table>
</fieldset>

6
htroot/Settings_p.html
Unescape View File

@ -9,11 +9,11 @@
function ParserCheckboxes(reference)
{
var mode = reference.name.substring(0,reference.name.indexOf("."));
for(i=0; i<document.parsersettings.elements.length; i++)
for(i=0; i<document.getElementById("parsersettings").elements.length; i++)
{
if(document.parsersettings.elements[i].type=="checkbox" && document.parsersettings.elements[i].name.indexOf(mode) >= 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;
}
}
}

4
htroot/Settings_p.java
Unescape View File

@ -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"));

1
htroot/Status_p.inc
Unescape View File

@ -50,7 +50,6 @@
<a href="Status.html?popup=false">[Disable]</a>
</td>
#(/popup)#
</td>
</tr>
<tr class="TableCellLight">
<td>Memory Usage</td>

Write Preview
Loading…
Cancel
Save