From b7b2eddb872d4deb62b1141b75a5be5b9f1dacf6 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 16 Nov 2008 07:06:29 +0000
Subject: [PATCH] Since the sub code is passed through a "cleaning" function
before it's used in an ID, we need to pass it as an argument.
---
web/root/sajax-forum/body.xjs | 5 +++--
web/root/sajax-forum/client_functions.xjs | 8 ++------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/web/root/sajax-forum/body.xjs b/web/root/sajax-forum/body.xjs
index 973a57d956..d6b7394072 100644
--- a/web/root/sajax-forum/body.xjs
+++ b/web/root/sajax-forum/body.xjs
@@ -26,9 +26,10 @@ if((!msg_area.sub[sub_code.toLowerCase()].ismoderated) || (hdr.attr & MSG_VALIDA
}
}
msgbase.close();
+var html_sub_code_string="'"+html_encode(sub_code, true, false, false, false).replace(/'/,''')+"'";
if(ANSI_formatted) {
- writeln("<div class=\"ansi_toggle\"><a href=\"#\" onclick=\"load_html(this.parentNode.parentNode);return false\">HTML Mode</a></div>");
+ writeln("<div class=\"ansi_toggle\"><a href=\"#\" onclick=\"load_html(this.parentNode.parentNode, "+html_sub_code_string+");return false\">HTML Mode</a></div>");
body=html_encode(body, true, false, true, true);
body=body.replace(/\r?\n+(<\/span>)?$/,'$1');
@@ -51,7 +52,7 @@ if(ANSI_formatted) {
}
}
else {
- writeln("<div class=\"ansi_toggle\"><a href=\"#\" onclick=\"load_ansi(this.parentNode.parentNode);return false\">ANSI Mode</a></div>");
+ writeln("<div class=\"ansi_toggle\"><a href=\"#\" onclick=\"load_ansi(this.parentNode.parentNode, "+html_sub_code_string+");return false\">ANSI Mode</a></div>");
// Strip CTRL-A
body=body.replace(/\1./g,'');
// Strip ANSI
diff --git a/web/root/sajax-forum/client_functions.xjs b/web/root/sajax-forum/client_functions.xjs
index 08e1c45961..3db9d339b1 100644
--- a/web/root/sajax-forum/client_functions.xjs
+++ b/web/root/sajax-forum/client_functions.xjs
@@ -91,30 +91,26 @@ function toggle_replies(sub_code, message_number)
}
}
-function load_ansi(container)
+function load_ansi(container, sub_code)
{
var message=container.parentNode.parentNode;
- var sub_code;
var message_number;
var m;
if((m=container.id.match(/^message-body-(.*)-([0-9]+)$/))!=null) {
- sub_code=m[1];
message_number=m[2];
ajaxpage(body_url+"?sub_code="+encodeURIComponent(sub_code)+"&msg_number="+message_number+'&user='+encodeURIComponent(user)+"&ansi=true",container.id);
container.style.display='block';
}
}
-function load_html(container)
+function load_html(container, sub_code)
{
var message=container.parentNode.parentNode;
- var sub_code;
var message_number;
var m;
if((m=container.id.match(/^message-body-(.*)-([0-9]+)$/))!=null) {
- sub_code=m[1];
message_number=m[2];
ajaxpage(body_url+"?sub_code="+encodeURIComponent(sub_code)+"&msg_number="+message_number+'&user='+encodeURIComponent(user),container.id);
container.style.display='block';
--
GitLab