--- trunk/Nos.pm 2005/05/17 22:23:40 39 +++ trunk/Nos.pm 2005/05/18 13:12:54 45 @@ -16,7 +16,7 @@ our @EXPORT = qw( ); -our $VERSION = '0.3'; +our $VERSION = '0.4'; use Class::DBI::Loader; use Email::Valid; @@ -158,8 +158,8 @@ email => $email, }) || croak "can't find or create member\n"; - if ($name && $this_user->full_name ne $name) { - $this_user->full_name($name || ''); + if ($name && $this_user->name ne $name) { + $this_user->name($name || ''); $this_user->update; } @@ -175,6 +175,90 @@ return $this_user->id; } +=head2 list_members + +List all members of some list. + + my @members = list_members( + list => 'My list', + ); + +Returns array of hashes with user informations like this: + + $member = { + name => 'Dobrica Pavlinusic', + email => 'dpavlin@rot13.org + } + +If list is not found, returns false. + +=cut + +sub list_members { + my $self = shift; + + my $args = {@_}; + + my $list_name = $args->{'list'} || confess "need list name"; + + my $lists = $self->{'loader'}->find_class('lists'); + my $user_list = $self->{'loader'}->find_class('user_list'); + + my $this_list = $lists->search( name => $list_name )->first || return; + + my @results; + + foreach my $user_on_list ($user_list->search(list_id => $this_list->id)) { + my $row = { + name => $user_on_list->user_id->name, + email => $user_on_list->user_id->email, + }; + + push @results, $row; + } + + return @results; + +} + + +=head2 delete_member + +Delete member from database. + + my $ok = delete_member( + name => 'Dobrica Pavlinusic' + ); + + my $ok = delete_member( + email => 'dpavlin@rot13.org' + ); + +Returns false if user doesn't exist. + +=cut + +sub delete_member { + my $self = shift; + + my $args = {@_}; + + croak "need name or email of user to delete" unless ($args->{'name'} || $args->{'email'}); + + my $key = 'name'; + $key = 'email' if ($args->{'email'}); + + my $users = $self->{'loader'}->find_class('users'); + + my $this_user = $users->search( $key => $args->{$key} )->first || return; + +print Dumper($this_user); + + $this_user->delete || croak "can't delete user\n"; + + return $users->dbi_commit || croak "can't commit"; +} + =head2 add_message_to_list Adds message to one list's queue for later sending. @@ -288,7 +372,7 @@ my $hash = $auth->generate_hash( $to_email ); my $from = $u->list_id->name . " <" . $from . "+" . $hash . ( $domain ? "@" . $domain : '' ). ">"; - my $to = $u->user_id->full_name . " <$to_email>"; + my $to = $u->user_id->name . " <$to_email>"; my $m_obj = Email::Simple->new($msg) || croak "can't parse message"; @@ -370,7 +454,6 @@ $user_id = $sent_msg->user_id || carp "no user_id"; } -print "message_id: ",($message_id || "not found"),"\n"; my $is_bounce = 0; @@ -393,6 +476,9 @@ $this_received->dbi_commit; + print "message_id: ",($message_id || "not found")," -- $is_bounce\n"; + + warn "inbox is not yet implemented"; } @@ -469,6 +555,8 @@ package Nos::SOAP; +use Carp; + =head1 SOAP methods This methods are thin wrappers to provide SOAP calls. They are grouped in @@ -517,12 +605,13 @@ } } + =head2 AddMemberToList $member_id = AddMemberToList( - list => "My list", - email => "e-mail@example.com", - name => "Full Name" + list => 'My list', + email => 'e-mail@example.com', + name => 'Full Name' ); =cut @@ -539,6 +628,31 @@ } } + +=head2 ListMembers + + my @members = ListMembers( + list => 'My list', + ); + +Returns array of hashes with user informations, see C. + +=cut + +sub ListMembers { + my $self = shift; + + my $list_name; + + if ($_[0] !~ m/^HASH/) { + $list_name = shift; + } else { + $list_name = $_[0]->{'list'}; + } + + return $nos->list_members( list => $list_name ); +} + =head2 AddMessageToList $message_id = AddMessageToList(