X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=2079d6aad69c182bb26c392dec7feaf32f2ed916;hp=0b2fa2488f1df4e7e3e463e015d6db0a13a4663e;hb=9e55351cd6b7618026477ab7d0d674af6cc8322a;hpb=08c2d6184b4ad4c1fbe1e15b8e8563dfd3136f02

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 0b2fa24..2079d6a 100644
--- 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;
@@ -31,7 +33,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.10";
+	$VERSION     = "v2.12";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -67,6 +69,7 @@ sub error {
         footer($r);
 
 	$r->log->error($err);
+	$r->log->error("Stack trace follows: " . Carp::longmess());
 
 	ModPerl::Util::exit();
 }
@@ -126,7 +129,7 @@ sub get_query_string {
 		next unless defined($value);
 		next if (defined($defparam->{$key}) && $value == $defparam->{$key});
 	
-		$str .= ($first) ? "?" : '&';
+		$str .= ($first) ? "?" : ';';
 		$str .= "$key=$value";
 		$first = 0;
 	}
@@ -134,8 +137,12 @@ sub get_query_string {
 }
 
 sub print_link {
-	my ($r, $title, $baseurl, $param, $defparam) = @_;
-	my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\">$title</a>";
+	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);
 }
 
@@ -182,10 +189,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";
 		}
 	}