X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=e3b33324bcb8de120b80187cc777360d6deb63c5;hp=d5e672746a3b8708777cf51e469fa3c037ee31e4;hb=35e8aefa9fb061d78f1f47951a0e520e872c6cf7;hpb=de8ae1d729f234ffba9e69e65d4b929b6c0d4256

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index d5e6727..e3b3332 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -31,7 +31,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.05";
+	$VERSION     = "v2.10";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -117,10 +117,10 @@ 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);
@@ -130,8 +130,16 @@ sub print_link {
 		$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 +149,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 +186,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";
 		}
 	}
@@ -393,7 +401,12 @@ sub make_infobox {
 		push @lines, "$1-$2-$3 $4:$5";
 	}
 
-	push @lines, $info->{'Model'} if (defined($info->{'Model'}));
+	if (defined($info->{'Model'})) {
+		my $model = $info->{'Model'}; 
+		$model =~ s/^\s+//;
+		$model =~ s/\s+$//;
+		push @lines, $model;
+	}
 	
 	# classic fields
 	if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) {
@@ -439,9 +452,11 @@ sub make_infobox {
 	if (defined($info->{'Flash'})) {
 		if ($info->{'Flash'} =~ /did not fire/i ||
 		    $info->{'Flash'} =~ /no flash/i ||
-		    $info->{'Flash'} =~ /not fired/i)  {
+		    $info->{'Flash'} =~ /not fired/i ||
+		    $info->{'Flash'} =~ /Off/)  {
 			push @lines, "No flash";
-		} elsif ($info->{'Flash'} =~ /fired/i) {
+		} elsif ($info->{'Flash'} =~ /fired/i ||
+		         $info->{'Flash'} =~ /On/) {
 			push @lines, "Flash";
 		} else {
 			push @lines, $info->{'Flash'};