From bfeab4bee78e38c272b295e251e00735f30af17b Mon Sep 17 00:00:00 2001
From: echicken <>
Date: Wed, 13 Mar 2013 17:53:57 +0000
Subject: [PATCH] Fixed a bug re: new message posting.
---
web/lib/forum.ssjs | 19 +++++++-------
web/root/ecwebv3/lib/client.js | 46 +++++++++++-----------------------
2 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/web/lib/forum.ssjs b/web/lib/forum.ssjs
index 03a864b674..98cd2af1a2 100644
--- a/web/lib/forum.ssjs
+++ b/web/lib/forum.ssjs
@@ -4,7 +4,7 @@
load('sbbsdefs.js');
load('msgutils.js');
-function getSig() {
+var getSig = function() {
var sigFile = format("%04s", user.number.toString()) + ".sig";
if(file_exists(system.data_dir + "user/" + sigFile)) {
var f = new File(system.data_dir + "user/" + sigFile);
@@ -18,7 +18,9 @@ function getSig() {
return false;
}
-function linkify(body) {
+var sig = getSig();
+
+var linkify = function(body) {
// Magical URL-ify
urlRE=/(?:https?|ftp|telnet|ssh|gopher|rlogin|news):\/\/[^\s'"'<>()]*|[-\w.+]+@(?:[-\w]+\.)+[\w]{2,6}/gi;
body=body.replace(urlRE,
@@ -35,7 +37,7 @@ function linkify(body) {
return(body);
}
-function printBoards() {
+var printBoards = function() {
for(var g = 0; g < msg_area.grp_list.length; g++) {
var out = format(
"<div class='border box msg'>"
@@ -71,7 +73,7 @@ function printBoards() {
if(user.alias != webIni.WebGuest && user.compare_ars(msgBase.cfg.post_ars)) {
out += format(
"<br />"
- + "<a class='ulLink' onclick='addPost(\"http://%s/%sforum-async.ssjs\", \"%s\", \"%s\", \"%s\", \"%s\")'>Post a new message</a>"
+ + "<a class='ulLink' onclick='addPost(\"http://%s/%sforum-async.ssjs\", \"%s\", \"%s\", \"%s\")'>Post a new message</a>"
+ "<div id='sub-%s-newMsgBox'></div>",
http_request.host,
webIni.appendURL,
@@ -95,7 +97,7 @@ function printBoards() {
return;
}
-function printThreads(sub) {
+var printThreads = function(sub) {
try {
msgBase = new MsgBase(sub);
msgBase.open();
@@ -139,7 +141,7 @@ function printThreads(sub) {
}
}
-function printThread(sub, t) {
+var printThread = function(sub, t) {
try {
var msgBase = new MsgBase(sub);
msgBase.open();
@@ -197,7 +199,7 @@ function printThread(sub, t) {
msgBase.close();
}
-function printMessage(sub, number) {
+var printMessage = function(sub, number) {
try {
var msgBase = new MsgBase(sub);
msgBase.open();
@@ -216,13 +218,12 @@ function printMessage(sub, number) {
"alias" : user.alias,
"name" : user.name
};
- var sig = getSig();
if(sig)
ret.sig = sig;
print(JSON.stringify(ret));
}
-function postMessage(sub, irt, to, from, subject, body) {
+var postMessage = function(sub, irt, to, from, subject, body) {
for(var a = 0; a < arguments.length; a++) {
if(a == "irt")
continue;
diff --git a/web/root/ecwebv3/lib/client.js b/web/root/ecwebv3/lib/client.js
index 0c1cb996e2..2b35d9d5ed 100644
--- a/web/root/ecwebv3/lib/client.js
+++ b/web/root/ecwebv3/lib/client.js
@@ -5,8 +5,7 @@
- Resizes an IFrame to the height of its contents
- If 'width' is true, will also resize to content width */
-
-function loadIFrame(id, width) {
+var loadIFrame = function(id, width) {
document.getElementById(id).style.height = document.getElementById(id).contentWindow.document.body.scrollHeight;
if(width == 1)
document.getElementById(id).style.width = document.getElementById(id).contentWindow.document.body.scrollWidth;
@@ -16,8 +15,7 @@ function loadIFrame(id, width) {
Switches the "display" style of element 'elementID' between 'block'
and 'none'. */
-
-function toggleVisibility(elementID) {
+var toggleVisibility = function(elementID) {
if(document.getElementById(elementID).style.display == 'none') {
document.getElementById(elementID).style.display = 'block';
return true;
@@ -35,17 +33,13 @@ function toggleVisibility(elementID) {
the server or it times out. If 'async' is true, it will return the
XMLHttpRequest object, and your function must monitor it for a
ReadyStateChange. */
-
-function httpGet(url, async) {
+var httpGet = function(url, async) {
if(async === undefined)
async = true;
var XMLReq = new XMLHttpRequest();
XMLReq.open('GET', url, async);
XMLReq.send(null);
- if(async)
- return XMLReq;
- else
- return XMLReq.responseText;
+ return (async) ? XMLReq : XMLReq.responseText;
}
/* httpPost(url, postData, divID)
@@ -58,8 +52,7 @@ function httpGet(url, async) {
the server or it times out. If 'async' is true, it will return the
XMLHttpRequest object, and your function must monitor it for a
ReadyStateChange. */
-
-function httpPost(url, headers, postData, async) {
+var httpPost = function(url, headers, postData, async) {
if(async === undefined)
async = true;
var XMLReq = new XMLHttpRequest();
@@ -67,10 +60,7 @@ function httpPost(url, headers, postData, async) {
for(var h in headers)
XMLReq.setRequestHeader(headers[h][0], headers[h][1]);
XMLReq.send(postData);
- if(async)
- return XMLReq;
- else
- return XMLReq.responseText;
+ return (async) ? XMLReq : XMLReq.responseText;
}
/* httpLoad(url, elementID, popUp, async)
@@ -87,8 +77,7 @@ function httpPost(url, headers, postData, async) {
the server or it times out. If 'async' is true, it will return the
XMLHttpRequest object, and your function must monitor it for a
ReadyStateChange. */
-
-function httpLoad(url, elementID, popUp, async) {
+var httpLoad = function(url, elementID, popUp, async) {
toggleVisibility(popUp);
document.getElementById(popUp).innerHTML = "Loading ...";
if(async === undefined)
@@ -122,8 +111,7 @@ function httpLoad(url, elementID, popUp, async) {
the server or it times out. If 'async' is true, it will return the
XMLHttpRequest object, and your function must monitor it for a
ReadyStateChange. */
-
-function httpSend(url, elementID, headers, postData, async) {
+var httpSend = function(url, elementID, headers, postData, async) {
document.getElementById(elementID).innerHTML = "Sending ...";
if(async === undefined)
async = true;
@@ -141,8 +129,7 @@ function httpSend(url, elementID, headers, postData, async) {
/* addReply(url, sub, thread, number)
ecWeb forum use only. */
-
-function addReply(url, sub, thread, number) {
+var addReply = function(url, sub, thread, number) {
var response = httpGet(url + "?sub=" + sub + "&getmessage=" + number, false);
var outDivID = "sub-" + sub + "-thread-" + thread + "-" + number;
var divID = "sub-" + sub + "-thread-" + thread + "-" + number + "-reply";
@@ -172,7 +159,7 @@ function addReply(url, sub, thread, number) {
document.getElementById(outDivID).innerHTML += out;
}
-function addPost(url, sub, alias, name, sig) {
+var addPost = function(url, sub, alias, name) {
var divID = "sub-" + sub + "-newMsgBox";
var formID = divID + "-newMsgForm";
var out = "<br /><br />";
@@ -199,8 +186,7 @@ function addPost(url, sub, alias, name, sig) {
Submits the form 'formID' to 'url' and pushes the response text into the
element with id 'elementID'. */
-
-function submitForm(url, elementID, formID) {
+var submitForm = function(url, elementID, formID) {
var theForm = document.getElementById(formID);
var postData = "";
for(var e in theForm.elements)
@@ -217,8 +203,7 @@ function submitForm(url, elementID, formID) {
/* loadThreads(url, sub, async)
ecWeb forum use only. */
-
-function loadThreads(url, sub, async) {
+var loadThreads = function(url, sub, async) {
if(toggleVisibility("sub-" + sub))
httpLoad(url + "?sub=" + sub, "sub-" + sub, "sub-" + sub + "-info", async);
}
@@ -226,14 +211,13 @@ function loadThreads(url, sub, async) {
/* loadThread(url, sub, htread, async)
ecWeb forum use only. */
-
-function loadThread(url, sub, thread, async) {
+var loadThread = function(url, sub, thread, async) {
if(toggleVisibility("sub-" + sub + "-thread-" + thread))
httpLoad(url + "?sub=" + sub + "&thread=" + thread, "sub-" + sub + "-thread-" + thread, "sub-" + sub + "-thread-" + thread + "-info", async);
}
// This sucks, but I don't feel like revisiting it just now. (Copied from v2)
-function validateNewUserForm() {
+var validateNewUserForm = function() {
var theForm = document.getElementById('newUser');
var sexCheck = 0;
var returnValue = true;
@@ -364,7 +348,7 @@ function validateNewUserForm() {
}
}
if(sexCheck == 2) {
- document.getElementById('sexError').innerHTML = ' <- Sex please.';
+ document.getElementById('sexError').innerHTML = ' <- Sex please.'; // She said that.
returnValue = false;
}
return returnValue;
--
GitLab