Filter URLs with ampersands, and add a pagefooter()

modules/Pisg.pm

@@ -92,6 +92,7 @@ sub get_default_config_settings
         outputfile => 'index.html',
         maintainer => 'MAINTAINER',
         pagehead => 'none',
+        pagefoot => 'none',
         configfile => 'pisg.cfg',
         imagepath => '',
         default_pic => '',

modules/Pisg/HTMLGenerator.pm

@@ -54,7 +54,9 @@ sub create_html
     }
     $self->{cfg}->{headwidth} = $self->{cfg}->{tablewidth} - 4;
     $self->_htmlheader();
-    $self->_pageheader();
+    $self->_pageheader()
+        if ($self->{cfg}->{pagehead} ne 'none');
+
     if ($self->{cfg}->{show_activetimes}) {
         $self->_activetimes();
     }
@@ -109,6 +111,9 @@ sub create_html
     my %hash = ( lines => $self->{stats}->{totallines} );
     _html($self->_template_text('totallines', %hash) . "<br /><br />");
 
+    $self->_pagefooter()
+        if ($self->{cfg}->{pagefoot} ne 'none');
+
     $self->_htmlfooter();
 
     close(OUTPUT);
@@ -270,11 +275,18 @@ HTML
 sub _pageheader
 {
     my $self = shift;
-    if ($self->{cfg}->{pagehead} ne 'none') {
-        open(PAGEHEAD, $self->{cfg}->{pagehead}) or die("$0: Unable to open $self->{cfg}->{pagehead} for reading: $!\n");
-        while (<PAGEHEAD>) {
-            _html($_);
-        }
+    open(PAGEHEAD, $self->{cfg}->{pagehead}) or die("$0: Unable to open $self->{cfg}->{pagehead} for reading: $!\n");
+    while (<PAGEHEAD>) {
+        _html($_);
+    }
+}
+
+sub _pagefooter
+{
+    my $self = shift;
+    open(PAGEFOOT, $self->{cfg}->{pagefoot}) or die("$0: Unable to open $self->{cfg}->{pagefoot} for reading: $!\n");
+    while (<PAGEFOOT>) {
+        _html($_);
     }
 }
 
@@ -1570,6 +1582,7 @@ sub _replace_links
         $str =~ s/(http|https|ftp|telnet|news)(:\/\/[-a-zA-Z0-9_\/~]+\.[-a-zA-Z0-9.,_~=:&amp;@%?#\/+]+)/<a href="$1$2" target="_blank" title="Open in new window: $1$2">$1$2<\/a>/g;
         $str =~ s/([-a-zA-Z0-9._]+@[-a-zA-Z0-9_]+\.[-a-zA-Z0-9._]+)/<a href="mailto:$1" title="Mail to $1">$1<\/a>/g;
     }
+    $str =~ s/&/&amp;/g
     return $str;
 }
 

modules/Pisg/Parser/Logfile.pm

@@ -279,10 +279,11 @@ sub _parse_file
 
                     # Find URLs
                     if (my @urls = match_urls($saying)) {
-                        foreach (@urls) {
-                            if(!url_is_ignored($_)) {
-                                $stats->{urlcounts}{$_}++;
-                                $stats->{urlnicks}{$_} = $nick;
+                        foreach my $url (@urls) {
+                            if(!url_is_ignored($url)) {
+                                $url =~ s/&/&/g;
+                                $stats->{urlcounts}{$url}++;
+                                $stats->{urlnicks}{$url} = $nick;
                             }
                         }
                     }