diff --git a/htroot/MessageSend_p.html b/htroot/MessageSend_p.html index 9dfddf038..4a2bb4396 100644 --- a/htroot/MessageSend_p.html +++ b/htroot/MessageSend_p.html @@ -9,7 +9,68 @@

Send message


+#(mode)# + + #(permission)# + +

You cannot send a message to #[peerName]#.
+ The peer does not respond. It was now removed from the peer-list. +

+ :: + +

The peer #[peerName]# is alive and responded:

+

#[response]# + You are allowed to send me a message ≤ #[messagesize]# kb and an + attachment ≤ #[attachmentsize]#. +

+ +
+
+
+

Your Message

+

Subject:
+ +

+

Text:
+ +

+ + + + +
+ :: + +

You cannot send a message to #[peerName]#.
+ The peer is alive but cannot respond. Sorry. +

+ #(/permission)# + +:: + + #(status)# + + +

Your message has been sent. The target peer responded:

+

#[response]#

+ + :: + +

The target peer is alive but did not receive your message. Sorry.

+

+ Here is a copy of your message, so you can copy it to save it for further attempts:
+ #[message]# +

+ #(/status)# + +:: + +

You cannot call this page directly. Instead, use a link on the Network page.

+#(/mode)# + + #%env/templates/footer.template%# diff --git a/htroot/MessageSend_p.java b/htroot/MessageSend_p.java index f597b2572..8924e43bc 100644 --- a/htroot/MessageSend_p.java +++ b/htroot/MessageSend_p.java @@ -67,9 +67,10 @@ public class MessageSend_p { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { serverObjects prop = new serverObjects(); - String body = ""; + //String body = ""; if ((post == null) || (post.get("hash","").length() == 0)) { - prop.put("body", "

You cannot call this page directly. Instead, use a link on the Network page.

"); + prop.put("mode",2); + // prop.put("body", "

You cannot call this page directly. Instead, use a link on the Network page.

"); return prop; } @@ -78,77 +79,100 @@ public class MessageSend_p { String message = post.get("message", ""); if (message.length() == 0) { + prop.put("mode", 0); + // open an editor page for the message // first ask if the other peer is online, and also what kind of document it accepts HashMap result = yacyClient.permissionMessage(hash); - //System.out.println("DEBUG: permission request result = " + result.toString()); + //System.out.println("DEBUG: permission request result = " + result.toString()); String peerName; - yacySeed targetPeer = null; + yacySeed targetPeer = null; if (hash.equals(yacyCore.seedDB.mySeed.hash)) { - peerName = yacyCore.seedDB.mySeed.get(yacySeed.NAME,"nameless"); - } else { - targetPeer = yacyCore.seedDB.getConnected(hash); - if (targetPeer == null) - peerName = "nameless"; - else - peerName = targetPeer.get(yacySeed.NAME,"nameless"); - } - String response = (result == null) ? "-1" : (String) result.get("response"); - if ((response == null) || (response.equals("-1"))) { - // we don't have permission or other peer does not exist - body += "

You cannot send a message to '" + peerName + "'. The peer does not respond. It was now removed from the peer-list.

"; - if (targetPeer != null) { - yacyCore.peerActions.disconnectPeer(targetPeer); - } + peerName = yacyCore.seedDB.mySeed.get(yacySeed.NAME,"nameless"); } else { - // write input form - try { - int messagesize = Integer.parseInt((String) result.get("messagesize")); - int attachmentsize = Integer.parseInt((String) result.get("attachmentsize")); - body += "

The peer '" + peerName + "' is alive and responded:
"; - body += "'" + response + " You are allowed to send me a message ≤ " + messagesize + " kb and an attachment ≤ " + attachmentsize + ".'

"; - body += "


"; - body += "

Your Message

"; - body += "

Subject:

"; - body += "

Text:

"; - body += ""; - body += ""; - body += ""; - body += "
"; - } catch (NumberFormatException e) { - // "unresolved pattern", the remote peer is alive but had an exception - body += "

The peer '" + peerName + "' is alive but cannot respond. Sorry..

"; - } + targetPeer = yacyCore.seedDB.getConnected(hash); + if (targetPeer == null) + peerName = "nameless"; + else + peerName = targetPeer.get(yacySeed.NAME,"nameless"); } - } else { - // send written message to peer + + prop.put("mode_permission_peerName", peerName); + String response = (result == null) ? "-1" : (String) result.get("response"); + if ((response == null) || (response.equals("-1"))) { + prop.put("mode_permission",0); + + // we don't have permission or other peer does not exist + //body += "

You cannot send a message to '" + peerName + "'. The peer does not respond. It was now removed from the peer-list.

"; + if (targetPeer != null) { + yacyCore.peerActions.disconnectPeer(targetPeer); + } + } else { + prop.put("mode_permission",1); + + // write input form try { - int messagesize = Integer.parseInt(post.get("messagesize", "0")); - //int attachmentsize = Integer.parseInt(post.get("attachmentsize", "0")); + int messagesize = Integer.parseInt((String) result.get("messagesize")); + int attachmentsize = Integer.parseInt((String) result.get("attachmentsize")); + + prop.put("mode_permission_response", response); + prop.put("mode_permission_messagesize", messagesize); + prop.put("mode_permission_attachmentsize", attachmentsize); + prop.put("mode_permission_subject", subject); + prop.put("mode_permission_message", message); + prop.put("mode_permission_hash", hash); - if (messagesize < 1000) messagesize = 1000; // debug - if (subject.length() > 100) subject = subject.substring(0, 100); - if (message.length() > messagesize) message = message.substring(0, messagesize); - byte[] mb; - try { - mb = message.getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - mb = message.getBytes(); - } - HashMap result = yacyClient.postMessage(hash, subject, mb); - body += "

Your message has been sent. The target peer responded:

"; - body += "

" + result.get("response") + "

"; +// body += "

The peer '" + peerName + "' is alive and responded:
"; +// body += "'" + response + " You are allowed to send me a message ≤ " + messagesize + " kb and an attachment ≤ " + attachmentsize + ".'

"; +// body += "


"; +// body += "

Your Message

"; +// body += "

Subject:

"; +// body += "

Text:

"; +// body += ""; +// body += ""; +// body += ""; +// body += "
"; } catch (NumberFormatException e) { // "unresolved pattern", the remote peer is alive but had an exception - body += "

The target peer is alive but did not receive your message. Sorry..

"; - body += "

Here is a copy of your message, so you can copy it to save it for further attempts:
"; - body += message; - body += "

"; + //body += "

The peer '" + peerName + "' is alive but cannot respond. Sorry..

"; + prop.put("mode_permission",2); } + } + } else { + prop.put("mode", 1); + // send written message to peer + try { + prop.put("mode_status", 0); + int messagesize = Integer.parseInt(post.get("messagesize", "0")); + //int attachmentsize = Integer.parseInt(post.get("attachmentsize", "0")); + + if (messagesize < 1000) messagesize = 1000; // debug + if (subject.length() > 100) subject = subject.substring(0, 100); + if (message.length() > messagesize) message = message.substring(0, messagesize); + byte[] mb; + try { + mb = message.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + mb = message.getBytes(); + } + HashMap result = yacyClient.postMessage(hash, subject, mb); + + prop.put("mode_status_response", result.get("response")); +// body += "

Your message has been sent. The target peer responded:

"; +// body += "

" + result.get("response") + "

"; + } catch (NumberFormatException e) { + prop.put("mode_status", 1); + // "unresolved pattern", the remote peer is alive but had an exception + prop.put("mode_status_message", message); +// body += "

The target peer is alive but did not receive your message. Sorry..

"; +// body += "

Here is a copy of your message, so you can copy it to save it for further attempts:
"; +// body += message; +// body += "

"; + } } // return rewrite properties - prop.put("body", body); + //prop.put("body", body); return prop; } diff --git a/htroot/proxymsg/error.html b/htroot/proxymsg/error.html index c069ff46d..662c2c116 100644 --- a/htroot/proxymsg/error.html +++ b/htroot/proxymsg/error.html @@ -43,32 +43,33 @@

#[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)# - +

+ #(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)# + :: +
#[stacktrace]#