Fixed some problems where special characters could be used where they shouldn't be. Also fixed a couple of template inconsistencies.
This commit is contained in:
parent
6e9f024c3f
commit
4d3c8cc5a3
6 changed files with 74 additions and 66 deletions
|
|
@ -180,7 +180,7 @@ sub deleteMessageConfirm {
|
|||
#-------------------------------------------------------------------
|
||||
sub formatHeader {
|
||||
my ($output, $subject);
|
||||
$subject = formatSubject($_[0]);
|
||||
$subject = $_[0];
|
||||
if ($_[5] ne "") {
|
||||
$subject = '<a href="'.$_[5].'">'.$subject.'</a>';
|
||||
}
|
||||
|
|
@ -204,14 +204,6 @@ sub formatMessage {
|
|||
return $output;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub formatSubject {
|
||||
my $output;
|
||||
$output = $_[0];
|
||||
$output = WebGUI::HTML::filter($output,'all');
|
||||
return $output;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub getMessage {
|
||||
my (%message);
|
||||
|
|
@ -239,7 +231,7 @@ sub post {
|
|||
'',$message{status})
|
||||
.'<p>'.formatMessage($message{message});
|
||||
$message{message} = "";
|
||||
$message{subject} = formatSubject("Re: ".$message{subject}) unless ($message{subject} =~ /^Re:/);
|
||||
$message{subject} = "Re: ".$message{subject} unless ($message{subject} =~ /^Re:/);
|
||||
$session{form}{mid} = "new";
|
||||
$f->hidden("replyTo",$session{form}{replyTo});
|
||||
if ($session{user}{userId} == 1) {
|
||||
|
|
@ -256,7 +248,6 @@ sub post {
|
|||
$footer = formatHeader($message{subject},$message{userId},$message{username},$message{dateOfPost},$message{views},
|
||||
'',$message{status})
|
||||
.'<p>'.formatMessage($message{message});
|
||||
$message{subject} = formatSubject($message{subject});
|
||||
}
|
||||
$f->hidden("func","postSave");
|
||||
$f->hidden("wid",$session{form}{wid});
|
||||
|
|
@ -276,7 +267,9 @@ sub postSave {
|
|||
my ($u, $rid, $status, $username, $pid);
|
||||
if ($session{form}{subject} eq "") {
|
||||
$session{form}{subject} = WebGUI::International::get(232);
|
||||
}
|
||||
} else {
|
||||
$session{form}{subject} = WebGUI::HTML::filter($session{form}{subject},'all');
|
||||
}
|
||||
if ($session{form}{message} eq "") {
|
||||
$session{form}{subject} .= ' '.WebGUI::International::get(233);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue