}
if (exists $attrs{-cgi} && $attrs{-cgi}->can("cookie")) {
my $cgi=$attrs{-cgi};
+ load_config($cgi);
my $sess_id = $cgi->cookie(COOKIE_NAME);
return undef unless $sess_id;
- load_config();
if (!exists($config{-sessionbase})) {
croak "No VJournal config read";
}
if (exists $params{-avatar}) {
@avatar = VJournal::Avatar::cache($params{-avatar});
} else {
- @avatar = VJournal::Avatar::by_openid($user);
+ @avatar = VJournal::Avatar::by_openid($identity);
}
if (!@avatar && exists $params{-email}) {
@avatar = VJournal::Avatar::by_email($params{-email});
$users{$identity}=join(":",$params{-name}||$identity
,$params{-email},$a{-src},$a{-width},$a{-height});
}
- my ($name,$email,$avatarsrc,$avatarwidth,$avatarheight)=split(":",$users{$user});
+ my ($name,$email,$avatarsrc,$avatarwidth,$avatarheight)=split(":",$users{$identity});
$session->{-name} = $name;
$session->{-email} = $email if $email;
if ($avatarsrc) {
sub isowner {
my $self=shift;
- return $self->{-identity} eq $config->{-owner};
+ return $self->{-identity} eq $config{-owner};
}
=head2 banned
sub ban {
my ($self,$foe) = @_;
- if (!$self->isowner()) return undef;
+ return undef if (!$self->isowner()) ;
my %bans;
dbmopen %bans,$config{-topdir}."/bans",0644;
$bans{$foe}=time();
sub _readban {
my $identity = shift;
+ my %bans;
dbmopen %bans,$config{-topdir}."/bans",0644;
if (exists $bans{-identity}) {
return (-ban=>1);
sub load_config {
my $cgi = $_[0];
- my $path=$cgi->path_translated();
+ my $path;
+ $path=$1 if $cgi->path_translated()=~/^(.*)$/;
my @dirs = File::Spec->splitdir($path);
my @uri = File::Spec->splitdir($cgi->path_info);
my $found =0;
my $d=File::Spec->catdir(@dirs,CONFIG_NAME);
if (-r $d) {
open F,"<",$d;
- local $/=undef;
- my $config = <F>;
+ while (<F>) {
+ $config{"-$1"} = $2 if /^\s*(\w+)\s*=\s*"([^"]*)"\s*$/;
+ }
close F;
- eval "%config = {$d}";
$config{-topdir}=File::Spec->catdir(@dirs);
$config{-topurl}=$cgi->url(-base=>1).File::Spec->catdir(@uri);
die $@ if ($@);
foreach my $key (@reqkeys) {
die "Required key $key missing from config"
unless exists $config{$key};
+
}
# sensible defaults
$config{-sessionbase}||=$config{-statedir}."/sessions.db";
$config{-userbase}||=$config{-statedir}."/user.db";
$config{-sessiontime}||=86400*30;
$config{-gracetime}||=86400;
- $config{-templatedir}||=$config{-topdir}."/templates"
+ $config{-templatedir}||=$config{-topdir}."/templates";
$config{-avatardir}||=$config{-topdir}."/avatars";
if (!$config{-owner}) {
- my $uri=substr($config{-topurl},index($config{-topurl},"://")+2;
+ my $uri=substr($config{-topurl},index($config{-topurl},"://")+3);
$uri =~ s/:\d+(\/.*)?$//;
$config{-owner} = $uri;
}