return $class->$orig( $args );
};
+## These checks don't cover store($id, $obj)
before [ qw/ store update insert delete / ] => sub {
my $self = shift;
my @nontrad;
foreach my $obj ( @_ ) {
-# if( ref( $obj ) && ref( $obj ) ne 'Text::Tradition' ) {
-
if( ref( $obj ) && ref( $obj ) ne 'Text::Tradition'
&& ref ($obj) ne 'Text::Tradition::User' ) {
# Is it an id => Tradition hash?
my ($self, $user) = @_;
my @tlist;
- if($user && $user ne 'public') {
+ if(ref $user && $user->is_admin) {
+ ## Admin sees all
+ return $self->traditionlist();
+ } elsif(ref $user) {
## We have a user object already, so just fetch its traditions and use tose
- foreach my $t (@{ $self->lookup($user)->traditions }) {
+ foreach my $t (@{ $user->traditions }) {
push( @tlist, { 'id' => $self->object_to_id( $t ),
'name' => $t->name } );
}
return @tlist;
+ } elsif($user ne 'public') {
+ die "Passed neither a user object nor 'public' to user_traditionlist";
}
## Search for all traditions which allow public viewing
my ($self, $userinfo) = @_;
my $username = $userinfo->{url} || $userinfo->{username};
my $password = $userinfo->{password};
+ my $role = $userinfo->{role} || 'user';
return unless ($username =~ /^https?:/
|| ($username && $self->validate_password($password))) ;
my $user = Text::Tradition::User->new(
id => $username,
password => ($password ? crypt_password($password) : ''),
+ role => $role,
);
$self->store($user->kiokudb_object_id, $user);
# 'url' => 'http://castaway.myopenid.com/',
my $username = $userinfo->{url} || $userinfo->{username};
- return $self->lookup(Text::Tradition::User->id_for_user($username));
+ ## No logins if user is deactivated (use lookup to fetch to re-activate)
+ my $user = $self->lookup(Text::Tradition::User->id_for_user($username));
+ return if($user && !$user->active);
+
+ return $user;
}
return if !$username;
- my $user = $self->find_user({ username => $username });
+ my $user = $self->lookup(Text::Tradition::User->id_for_user($username));
return if !$user;
return $user if $user->active;