diff --git a/htroot/index.html b/htroot/index.html index 522c2cf56..847eef2bd 100644 --- a/htroot/index.html +++ b/htroot/index.html @@ -42,9 +42,9 @@ - + - + - + - +
Max. number of results:: - @@ -53,18 +53,18 @@
Resource:: -
Max. search time (seconds):: - @@ -75,9 +75,9 @@
URL mask:: #(urlmaskoptions)# - + :: restrict on show all @@ -86,11 +86,11 @@
- Prefer mask: + : #(prefermaskoptions)# - + :: restrict on show all diff --git a/htroot/proxymsg/authfail.inc b/htroot/proxymsg/authfail.inc index 1416b31da..187ddd5d7 100644 --- a/htroot/proxymsg/authfail.inc +++ b/htroot/proxymsg/authfail.inc @@ -1,7 +1,12 @@ -Your Username/Password is wrong. -
-username:
-password:
-
- -
+
+
Your Username/Password is wrong. +
+
:
+
+
:
+
+
+
+ +
+
diff --git a/htroot/proxymsg/error.html b/htroot/proxymsg/error.html index ff3595274..1520e6875 100644 --- a/htroot/proxymsg/error.html +++ b/htroot/proxymsg/error.html @@ -1,87 +1,35 @@ - - - -YaCy: Proxy Message - - - - - - - - - - - - - - - -
- - - - - - -
- - YaCy-Logo - - -
#[peerName]#: Proxy message
- 		-
-
-

- - - - - -#(printStackTrace)# - -:: - - - - -#(/printStackTrace)# - - - - -
-

-

Problems with request: #[requestMethod]# #[requestURL]#

-
-
- #[httpStatus]# -

- #(errorMessageType)# - unspecified error - :: - not-yet-assigned error - :: - You don't have an active internet connection. Please go online. - :: - Could not load resource. The file is not available. - :: - #[detailedErrorMsg]# - :: - #%[file]%# - #(/errorMessageType)# -

-

-
- #[stacktrace]# -
Generated #[date]# by #[peerName]#.yacy -
- - + + + + YaCy: Proxy Message + #%env/templates/metas.template%# + + +
+

YaCy - Distributed Web Indexing - Administration

+
+
+

Problems with request: #[requestMethod]# #[requestURL]#

+

#[httpStatus]#

+ #(errorMessageType)# +

unspecified error

+ ::

not-yet-assigned error

+ ::

You don't have an active internet connection. Please go online.

+ ::

Could not load resource. The file is not available.

+ ::

#[detailedErrorMsg]#

+ :: + #%[file]%# + #(/errorMessageType)# + + #(printStackTrace)#:: +
+

Exception occured: #[exception]#

+ 
TRACE:
+#[stacktrace]#
+ #(/printStackTrace)# + +
+

Generated #[date]# by #[peerName]#.yacy

+
+ diff --git a/htroot/proxymsg/unknownHost.inc b/htroot/proxymsg/unknownHost.inc index 0676b7f82..d77fbcf23 100644 --- a/htroot/proxymsg/unknownHost.inc +++ b/htroot/proxymsg/unknownHost.inc @@ -1,19 +1,13 @@ - -
-

The server #[hostName]# could not be found.

-Did you mean: - - #{list}# - - - - #{/list}# -
#[hostName]#
- + + +
+

The server #[hostName]# could not be found.

+

Did you mean:

+ diff --git a/source/de/anomic/http/httpd.java b/source/de/anomic/http/httpd.java index b2306227e..eb2aa04b4 100644 --- a/source/de/anomic/http/httpd.java +++ b/source/de/anomic/http/httpd.java @@ -1149,16 +1149,16 @@ public final class httpd implements serverHandler { switch (errorcase) { case ERRORCASE_MESSAGE: - tp.put("errorMessageType_detailedErrorMsg",(detailedErrorMsgText==null)?"":detailedErrorMsgText.replaceAll("\n","
")); + tp.putASIS("errorMessageType_detailedErrorMsg", (detailedErrorMsgText == null) ? "" : detailedErrorMsgText.replaceAll("\n", "
")); break; case ERRORCASE_FILE: - tp.put("errorMessageType_file",(detailedErrorMsgFile==null)?"":detailedErrorMsgFile); - if ((detailedErrorMsgValues != null)&&(detailedErrorMsgValues.size()>0)) { + tp.put("errorMessageType_file", (detailedErrorMsgFile == null) ? "" : detailedErrorMsgFile); + if ((detailedErrorMsgValues != null) && (detailedErrorMsgValues.size() > 0)) { // rewriting the value-names and add the proper name prefix: Iterator nameIter = detailedErrorMsgValues.keySet().iterator(); while (nameIter.hasNext()) { String name = (String) nameIter.next(); - tp.put("errorMessageType_" + name,detailedErrorMsgValues.get(name)); + tp.put("errorMessageType_" + name, detailedErrorMsgValues.get(name)); } } break; @@ -1169,24 +1169,18 @@ public final class httpd implements serverHandler { // building the stacktrace if (stackTrace != null) { tp.put("printStackTrace",1); - serverByteBuffer errorMsg = new serverByteBuffer(100); - errorMsg.append("Exception occurred: ".getBytes("UTF-8")) - .append(stackTrace.toString().getBytes("UTF-8")) - .append("\r\n\r\n".getBytes("UTF-8")) - .append("TRACE:\r\n".getBytes("UTF-8")); stackTrace.printStackTrace(new PrintStream(errorMsg)); - errorMsg.append("\r\n".getBytes("UTF-8")); - - tp.put("printStackTrace_stacktrace",(new String(errorMsg.getBytes(),"UTF-8")).replaceAll("\n","
")); + tp.put("printStackTrace_exception", stackTrace.toString()); + tp.put("printStackTrace_stacktrace", new String(errorMsg.getBytes(),"UTF-8")); } else { - tp.put("printStackTrace",0); + tp.put("printStackTrace", 0); } // Generated Tue, 23 Aug 2005 11:19:14 GMT by brain.wg (squid/2.5.STABLE3) // adding some system information String systemDate = httpc.dateString(httpc.nowDate()); - tp.put("date",systemDate); + tp.put("date", systemDate); // rewrite the file File htRootPath = new File(switchboard.getRootPath(), switchboard.getConfig("htRootPath","htroot"));