oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preparing for 6.2.4 bugfix cycle

Browse source
This commit is contained in:
JT Smith 2004-09-16 21:11:12 +00:00
parent eeecbe8afb
commit ce9cfe43a2
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/changelog/6.x.x.txt
View file

@ -1,3 +1,8 @@
6.2.4
- Changed text processor to convert HTML tags into text rather than
discarding them.
6.2.3
- Changed to new POD format.
- Fixed GUID related bugs in search indexer and passive profiling.

6
docs/previousVersion.sql
View file

File diff suppressed because one or more lines are too long

2
lib/WebGUI.pm
View file

@ -1,5 +1,5 @@
package WebGUI;
our $VERSION = "6.2.3";
our $VERSION = "6.2.4";
our $STATUS = "beta";
#-------------------------------------------------------------------

17
lib/WebGUI/HTML.pm
View file

@ -156,19 +156,20 @@ The content type to use as formatting. Valid types are 'html', 'text', 'code', a
sub format {
my ($content, $contentType) = @_;
$contentType = 'mixed' unless ($contentType);
if ($contentType eq "mixed") {
unless ($content =~ /\<div/ig || $content =~ /\<br/ig || $content =~ /\<p/ig) {
$content =~ s/\n/\<br \/\>/g;
}
} elsif ($contentType eq "text") {
$content =~ s/\t/&nbsp;&nbsp;&nbsp;&nbsp;/g;
$content =~ s/\n/\<br \/\>/g;
} elsif ($contentType eq "code") {
if ($contentType eq "text" || $contentType eq "code") {
$content =~ s/&/&amp;/g;
$content =~ s/\</&lt;/g;
$content =~ s/\>/&gt;/g;
$content =~ s/\n/\<br \/\>/g;
$content =~ s/\t/&nbsp;&nbsp;&nbsp;&nbsp;/g;
}
if ($contentType eq "mixed") {
unless ($content =~ /\<div/ig || $content =~ /\<br/ig || $content =~ /\<p/ig) {
$content =~ s/\n/\<br \/\>/g;
}
} elsif ($contentType eq "text") {
$content =~ s/ / &nbsp;/g;
} elsif ($contentType eq "code") {
$content =~ s/ /&nbsp;/g;
$content = '<div style="font-family: monospace;">'.$content.'</div>';
}