--- trunk/Nos.pm	2005/05/18 12:29:35	43
+++ 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;
 	}
 
@@ -177,6 +177,8 @@
 
 =head2 list_members
 
+List all members of some list.
+
  my @members = list_members(
  	list => 'My list',
  );
@@ -184,10 +186,12 @@
 Returns array of hashes with user informations like this:
 
  $member = {
- 	full_name => 'Dobrica Pavlinusic',
+ 	name => 'Dobrica Pavlinusic',
 	email => 'dpavlin@rot13.org
  }
 
+If list is not found, returns false.
+
 =cut
 
 sub list_members {
@@ -200,13 +204,13 @@
 	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 || croak "can't find list $list_name\n";
+	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 = {
-			full_name => $user_on_list->user_id->full_name,
+			name => $user_on_list->user_id->name,
 			email => $user_on_list->user_id->email,
 		};
 
@@ -218,6 +222,43 @@
 }
 
 
+=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.
@@ -331,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";