Escape titles and dates on their way out of the HTML. It _shouldn't_ be

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 6bcc538307f1fe9b4dbcab61dc50ac8858157092..1f1eac878537ebaffcfdb4e0c54187d0bfdf1841 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -11,6 +11,8 @@ use Apache2::Const -compile => ':common';
 use Apache2::Log;
 use ModPerl::Util;
 
+use Carp;
+use Encode;
 use DBI;
 use DBD::Pg;
 use Image::Magick;
@@ -21,6 +23,7 @@ use MIME::Types;
 use LWP::Simple;
 # use Image::Info;
 use Image::ExifTool;
+use HTML::Entities;
 
 BEGIN {
        use Exporter ();
@@ -31,7 +34,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.05";
+       $VERSION     = "v2.21";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -67,6 +70,7 @@ sub error {
         footer($r);
 
        $r->log->error($err);
+       $r->log->error("Stack trace follows: " . Carp::longmess());
 
        ModPerl::Util::exit();
 }
@@ -117,21 +121,29 @@ sub scale_aspect {
        return ($width, $height);
 }
 
-sub print_link {
-       my ($r, $title, $baseurl, $param, $defparam) = @_;
-       my $str = "<a href=\"$baseurl";
+sub get_query_string {
+       my ($param, $defparam) = @_;
        my $first = 1;
+       my $str = "";
 
        while (my ($key, $value) = each %$param) {
                next unless defined($value);
                next if (defined($defparam->{$key}) && $value == $defparam->{$key});
        
-               $str .= ($first) ? "?" : '&amp;';
+               $str .= ($first) ? "?" : ';';
                $str .= "$key=$value";
                $first = 0;
        }
-       
-       $str .= "\">$title</a>";
+       return $str;
+}
+
+sub print_link {
+       my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
+       my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\"";
+       if (defined($accesskey) && length($accesskey) == 1) {
+               $str .= " accesskey=\"$accesskey\"";
+       }
+       $str .= ">$title</a>";
        $r->print($str);
 }
 
@@ -141,7 +153,7 @@ sub get_dbh {
                # Try to reconnect
                Apache2::ServerUtil->server->log_error("Lost contact with PostgreSQL server, trying to reconnect...");
                unless ($dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host,
-                       $Sesse::pr0n::Config::db_user, $Sesse::pr0n::Config::db_password)) {
+                       $Sesse::pr0n::Config::db_username, $Sesse::pr0n::Config::db_password)) {
                        $dbh = undef;
                        die "Couldn't connect to PostgreSQL database";
                }
@@ -178,10 +190,10 @@ sub update_width_height {
        # Also find the date taken if appropriate (from the EXIF tag etc.)
        my $info = Image::ExifTool::ImageInfo(get_disk_location($r, $id));
        my $datetime = undef;
-
+                       
        if (defined($info->{'DateTimeOriginal'})) {
                # Parse the date and time over to ISO format
-               if ($info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/ && $1 > 1990) {
+               if ($info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)(?:\+\d\d:\d\d)?$/ && $1 > 1990) {
                        $datetime = "$1-$2-$3 $4:$5:$6";
                }
        }
@@ -351,7 +363,12 @@ sub ensure_cached {
                        # Strip EXIF tags etc.
                        $cimg->Strip();
 
-                       $err = $cimg->write(filename=>$cachename, quality=>$quality);
+                       if (($nwidth >= 640 && $nheight >= 480) ||
+                           ($nwidth >= 480 && $nheight >= 640)) {
+                               $err = $cimg->write(filename=>$cachename, quality=>$quality, interlace=>'Plane');
+                       } else {
+                               $err = $cimg->write(filename=>$cachename, quality=>$quality);
+                       }
 
                        undef $cimg;
 
@@ -515,6 +532,48 @@ sub gcd {
        return gcd($b, $a % $b);
 }
 
+sub add_new_event {
+       my ($dbh, $id, $date, $desc, $vhost) = @_;
+       my @errors = ();
+
+       if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) {
+               push @errors, "Manglende eller ugyldig ID.";
+       }
+       if (!defined($date) || $date =~ /^\s*$/ || $date =~ /[<>&]/ || length($date) > 100) {
+               push @errors, "Manglende eller ugyldig dato.";
+       }
+       if (!defined($desc) || $desc =~ /^\s*$/ || $desc =~ /[<>&]/ || length($desc) > 100) {
+               push @errors, "Manglende eller ugyldig beskrivelse.";
+       }
+       
+       if (scalar @errors > 0) {
+               return @errors;
+       }
+               
+       $dbh->do("INSERT INTO events (id,date,name,vhost) VALUES (?,?,?,?)",
+               undef, $id, $date, $desc, $vhost)
+               or return ("Kunne ikke sette inn ny hendelse" . $dbh->errstr);
+       $dbh->do("INSERT INTO last_picture_cache (event,last_picture) VALUES (?,NULL)",
+               undef, $id)
+               or return ("Kunne ikke sette inn ny cache-rad" . $dbh->errstr);
+
+       return ();
+}
+
+sub guess_charset {
+       my $text = shift;
+       my $decoded;
+
+       eval {
+               $decoded = Encode::decode("utf-8", $text, Encode::FB_CROAK);
+       };
+       if ($@) {
+               $decoded = Encode::decode("iso8859-1", $text);
+       }
+
+       return $decoded;
+}
+
 1;