From: Michael Andreen <harv@ruin.nu>
Date: Tue, 30 Oct 2007 18:28:35 +0000 (+0100)
Subject: Don't add the Everyone group for mail, also don't pick a group by default
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=460231f1aba8ae3474a65b7927278ce229d81a25;p=ndwebbie.git

Don't add the Everyone group for mail, also don't pick a group by default
---

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;
 }
diff --git a/templates/mail.tmpl b/templates/mail.tmpl
index 0b02575..246de10 100644
--- a/templates/mail.tmpl
+++ b/templates/mail.tmpl
@@ -4,13 +4,13 @@
 </TMPL_LOOP>
 
 <form action="<TMPL_VAR NAME=PAGE>" method="post"><fieldset> <legend>Mail</legend>
-	Subject: <input type="text" name="subject" value=""/>
+	Subject: <input type="text" name="subject" value="<TMPL_VAR NAME=Subject>"/>
 	<br/>To: <select name="group">
 		<TMPL_LOOP Groups>
 		<option value="<TMPL_VAR NAME=GID>"><TMPL_VAR NAME=GroupName></option>
 		</TMPL_LOOP>
 	</select>
-	<br/><textarea rows="20" cols="50" name="message"></textarea>
+	<br/><textarea rows="20" cols="50" name="message"><TMPL_VAR NAME=Message></textarea>
 	<input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
 	<br/><input type="submit" name="cmd" value="Submit"/>
 </fieldset></form>