* When CharSet is not 'iso-8859-1' or 'iso-8859-15', don't provide

     conversions for characters. Fixes problems for many other languages, e.g.
     greek, korean etc.

docs/Changelog

@@ -10,6 +10,9 @@ pisg (x.xx)
    * Add modified version of patch from minicus - allows browser to split words
      at QuoteWidth number of characters into any given word, without splitting
      URL's (new config option)
+   * When CharSet is not 'iso-8859-1' or 'iso-8859-15', don't provide
+     conversions for characters. Fixes problems for many other languages, e.g.
+     greek, korean etc.
    * Fix bug in mIRC6 format where it didn't recognize logfiles logging seconds
    * Fix bug in mIRC6 format where it didn't recognize kicks of the maintainer
    * Add support for sirc format (thanks bartko)

modules/Pisg/Common.pm

@@ -184,20 +184,23 @@ sub match_email
 sub htmlentities
 {
     my $str = shift;
-
-    $str =~ s/\&/\&/go;
-    $str =~ s/\</\&lt;/go;
-    $str =~ s/\>/\&gt;/go;
-    $str =~ s/ü/&uuml;/go;
-    $str =~ s/ö/&ouml;/go;
-    $str =~ s/ä/&auml;/go;
-    $str =~ s/ß/&szlig;/go;
-    $str =~ s/å/&aring;/go;
-    $str =~ s/æ/&aelig;/go;
-    $str =~ s/ø/&oslash;/go;
-    $str =~ s/Å/&Aring;/go;
-    $str =~ s/Æ/&AElig;/go;
-    $str =~ s/Ø/&Oslash;/go;
+    my $charset = shift;
+
+    if ($charset eq "iso-8859-1" or $charset eq "iso-8859-15") {
+        $str =~ s/\&/\&amp;/go;
+        $str =~ s/\</\&lt;/go;
+        $str =~ s/\>/\&gt;/go;
+        $str =~ s/ü/&uuml;/go;
+        $str =~ s/ö/&ouml;/go;
+        $str =~ s/ä/&auml;/go;
+        $str =~ s/ß/&szlig;/go;
+        $str =~ s/å/&aring;/go;
+        $str =~ s/æ/&aelig;/go;
+        $str =~ s/ø/&oslash;/go;
+        $str =~ s/Å/&Aring;/go;
+        $str =~ s/Æ/&AElig;/go;
+        $str =~ s/Ø/&Oslash;/go;
+    }
 
     return $str;
 }

modules/Pisg/HTMLGenerator.pm

@@ -1496,16 +1496,19 @@ sub _template_text
 
     foreach my $key (sort keys %hash) {
         $text =~ s/\[:$key\]/$hash{$key}/;
-        $text =~ s/ü/ü/go;
-        $text =~ s/ö/ö/go;
-        $text =~ s/ä/ä/go;
-        $text =~ s/ß/ß/go;
-        $text =~ s/å/å/go;
-        $text =~ s/æ/æ/go;
-        $text =~ s/ø/ø/go;
-        $text =~ s/Å/Å/go;
-        $text =~ s/Æ/Æ/go;
-        $text =~ s/Ø/Ø/go;
+
+        if ($self->{cfg}->{charset} eq "iso-8859-1" or $self->{cfg}->{charset} eq "iso-8859-15") {
+            $text =~ s/ü/ü/go;
+            $text =~ s/ö/ö/go;
+            $text =~ s/ä/ä/go;
+            $text =~ s/ß/ß/go;
+            $text =~ s/å/å/go;
+            $text =~ s/æ/æ/go;
+            $text =~ s/ø/ø/go;
+            $text =~ s/Å/Å/go;
+            $text =~ s/Æ/Æ/go;
+            $text =~ s/Ø/Ø/go;
+        }
     }
 
     if ($text =~ /\[:[^:]*?:[^:]*?:[^:]*?:\]/o) {
@@ -1523,7 +1526,7 @@ sub _format_word
     # This function formats a word -- should ONLY be called on words used alone (EG: not whole line printed)
     my ($self, $word) = @_;
 
-    $word = htmlentities($word);
+    $word = htmlentities($word, $self->{cfg}->{charset});
     $word = $self->_replace_links($word);
     return $word;
 }
@@ -1557,7 +1560,7 @@ sub _format_line
             $line = '*** ' . $hashref->{nick} . ' changes topic to: ' . $hashref->{newtopic};
         }
     }
-    $line = htmlentities($line);
+    $line = htmlentities($line, $self->{cfg}->{charset});
     $line = $self->_replace_links($line);
     return $line;
 }