X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=bc598545a4b97e66da5a478710fbb6ff671ade62;hp=76da6befeb3466f6620f354ad5a8ef251b7f99a6;hb=b5572d621fe221ee9dcbf990118dd6aa69125cda;hpb=59921df12b46d8d77698a7a5fb268fc98c6c2c4c

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 76da6be..bc59854 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.05";
+	$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();
 }
@@ -117,21 +120,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 +152,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 +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";
 		}
 	}
@@ -192,8 +203,8 @@ sub update_width_height {
 
 	# update the last_picture cache as well (this should of course be done
 	# via a trigger, but this is less complicated :-) )
-	$dbh->do('UPDATE events SET last_picture=(SELECT COALESCE(MAX(date),\'1970-01-01 00:00:00\') FROM images WHERE event=events.id) WHERE id=(SELECT event FROM images WHERE id=?)',
-		undef, $id)
+	$dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?) WHERE event=(SELECT event FROM images WHERE id=?)',
+		undef, $datetime, $id)
 		or die "Couldn't update last_picture in SQL: $!";
 }
 
@@ -288,7 +299,6 @@ sub ensure_cached {
 
 		# NEF files aren't autodetected
 		$fname = "NEF:$fname" if ($filename =~ /\.nef$/i);
-		$r->log->warn("Generating $fname for $filename");
 		
 		my $err = $magick->Read($fname);
 		if ($err) {
@@ -394,7 +404,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)?$/) {
@@ -438,9 +453,13 @@ sub make_infobox {
 	}
 
 	if (defined($info->{'Flash'})) {
-		if ($info->{'Flash'} =~ /did not fire/ || $info->{'Flash'} =~ /No Flash/) {
+		if ($info->{'Flash'} =~ /did not fire/i ||
+		    $info->{'Flash'} =~ /no flash/i ||
+		    $info->{'Flash'} =~ /not fired/i ||
+		    $info->{'Flash'} =~ /Off/)  {
 			push @lines, "No flash";
-		} elsif ($info->{'Flash'} =~ /fired/) {
+		} elsif ($info->{'Flash'} =~ /fired/i ||
+		         $info->{'Flash'} =~ /On/) {
 			push @lines, "Flash";
 		} else {
 			push @lines, $info->{'Flash'};
@@ -507,6 +526,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;