X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FMail.pm;h=897976e2f79de546cc26ac8d9f987f72645b7f1d;hb=57f880656c4486f68583058121a5bcb3b316199c;hp=0278ebe8bbbc8542dc6763e5c2bbd7cdd2e33991;hpb=a074bd17f5e8ba341a22bbfca1da7093b8351774;p=ndwebbie.git

diff --git a/NDWeb/Pages/Mail.pm b/NDWeb/Pages/Mail.pm
index 0278ebe..897976e 100644
--- a/NDWeb/Pages/Mail.pm
+++ b/NDWeb/Pages/Mail.pm
@@ -40,16 +40,19 @@ sub render_body {
 
 	return $self->noAccess unless $self->isHC;
 
-	my $groups = $DBH->prepare(q{SELECT gid,groupname FROM groups ORDER BY gid});
+	my $groups = $DBH->prepare(q{SELECT gid,groupname FROM groups WHERE gid > 0 ORDER BY gid});
 	$groups->execute;
 	my @groups;
+	push @groups,{gid => -1, groupname => 'Pick a group'};
 	while (my $group = $groups->fetchrow_hashref){
 		push @groups,$group;
 	}
 	$BODY->param(Groups => \@groups);
 
-	if (defined param('cmd')){
-		my $emails = $DBH->prepare(q{SELECT email FROM users WHERE (uid IN (SELECT uid FROM groupmembers WHERE gid = $1) OR $1 = -1) AND email is not null});
+	if (defined param('cmd') && param('group') > 0){
+		my $emails = $DBH->prepare(q{SELECT email FROM users
+			WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = $1)
+				AND email is not null});
 		$emails->execute(param('group'));
 		my @emails;
 		while (my $email = $emails->fetchrow_hashref){
@@ -71,6 +74,9 @@ sub render_body {
 		}else {
 			$ND::ERROR .= p $Mail::Sendmail::error;
 		}
+	}elsif(defined param('message')) {
+		$BODY->param(Subject => param('subject'));
+		$BODY->param(Message => param('message'));
 	}
 	return $BODY;
 }