From 7d0086d18ad86dee35dcdbd219574ead791ba0e5 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sat, 4 Mar 2006 00:20:59 +0000
Subject: [PATCH] Fix up word_wrap usage... especially in reply.ssjs.
---
web/root/msgs/msg.ssjs | 2 +-
web/root/msgs/msgframe.ssjs | 2 +-
web/root/msgs/reply.ssjs | 4 +++-
web/root/msgs/savemsg.ssjs | 2 +-
web/root/rss.ssjs | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/web/root/msgs/msg.ssjs b/web/root/msgs/msg.ssjs
index 93fde236b1..36f41dd1f8 100644
--- a/web/root/msgs/msg.ssjs
+++ b/web/root/msgs/msg.ssjs
@@ -112,7 +112,7 @@ if(msg.type=="plain") {
}
/* Plain text */
else {
- template.body=word_wrap(template.body,80);
+ template.body=word_wrap(template.body);
template.body=html_encode(template.body,true,false,false,false);
}
}
diff --git a/web/root/msgs/msgframe.ssjs b/web/root/msgs/msgframe.ssjs
index 376c1c9bc0..dd1294fdd3 100644
--- a/web/root/msgs/msgframe.ssjs
+++ b/web/root/msgs/msgframe.ssjs
@@ -49,7 +49,7 @@ if(msg.type=="plain") {
}
/* Plain text */
else {
- template.body=word_wrap(template.body,80);
+ template.body=word_wrap(template.body);
template.body=html_encode(template.body,true,false,false,false);
}
if(template.hdr != null) {
diff --git a/web/root/msgs/reply.ssjs b/web/root/msgs/reply.ssjs
index fabe3f50dc..376e5868b4 100644
--- a/web/root/msgs/reply.ssjs
+++ b/web/root/msgs/reply.ssjs
@@ -60,7 +60,9 @@ template.number=hdr.number;
template.body=msgbase.get_msg_body(false,parseInt(http_request.query.reply_to),true);
if(this.word_wrap != undefined) {
- template.body=quote_msg(word_wrap(template.body,79),79);
+ // quote_msg adds three chars to each line. Re-wrap to 76 chars...
+ // with the extra three, we're still under 80 *.
+ template.body=quote_msg(word_wrap(template.body,76),79);
}
else {
template.body=template.body.replace(/^(.)/mg,"> $1");
diff --git a/web/root/msgs/savemsg.ssjs b/web/root/msgs/savemsg.ssjs
index d3857c0dc5..2fd38dc458 100644
--- a/web/root/msgs/savemsg.ssjs
+++ b/web/root/msgs/savemsg.ssjs
@@ -38,7 +38,7 @@ else {
var body=http_request.query.body[0];
body=body.replace(/([^\r])\n/g,"$1\r\n");
-body=word_wrap(body, 80);
+body=word_wrap(body);
hdrs.from=user.alias;
hdrs.from_ext=user.number;
diff --git a/web/root/rss.ssjs b/web/root/rss.ssjs
index a9f0e93b57..36c8f1b4a0 100644
--- a/web/root/rss.ssjs
+++ b/web/root/rss.ssjs
@@ -84,7 +84,7 @@ if(http_request.query["item"]) {
}
/* Plain text */
else {
- template.body=word_wrap(template.body,80);
+ template.body=word_wrap(template.body);
template.body=html_encode(template.body,true,false,false,false);
}
}
--
GitLab