use Exporter ();
our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
- $VERSION = "v2.04";
+ use Sesse::pr0n::Config;
+ eval {
+ require Sesse::pr0n::Config_local;
+ };
+
+ $VERSION = "v2.05";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
@EXPORT_OK = qw(&error &dberror);
- our $dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=127.0.0.1", "pr0n", "EsVdwImY")
+ our $dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host,
+ $Sesse::pr0n::Config::db_username, $Sesse::pr0n::Config::db_password)
or die "Couldn't connect to PostgreSQL database: " . DBI->errstr;
our $mimetypes = new MIME::Types;
if (!(defined($dbh) && $dbh->ping)) {
# 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=127.0.0.1", "pr0n", "EsVdwImY")) {
+ unless ($dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host,
+ $Sesse::pr0n::Config::db_user, $Sesse::pr0n::Config::db_password)) {
$dbh = undef;
die "Couldn't connect to PostgreSQL database";
}
my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
- unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || $dbwidth == -1 || $dbheight == -1)) {
+ unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || $dbwidth == -1 || $dbheight == -1 || $xres == -1)) {
return ($fname, 0);
}
$quality = 80;
}
- $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
+ if ($xres != -1) {
+ $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
+ }
- if (($nwidth >= 800 || $nheight >= 600) && $infobox == 1) {
+ if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox == 1) {
make_infobox($cimg, $info, $r);
}