Merge branch 'mailcommand' of github.com:oqapi/webgui_newsletter into mailcommand

Conflicts:
	sbin/newsletter-transport.pl
This commit is contained in:
Martin Kamerbeek 2010-11-03 18:19:06 +01:00
commit b5a5a4e829

View file

@ -79,7 +79,6 @@ sub getCredentials {
print "Received mail addressed to [$user\@$domain] which contains no id" && exit( $NO_SUCH_USER ) unless $id;
print "Received mail addressed to [$user\@$domain] which contains no command" && exit( $NO_SUCH_USER ) unless $command;
return ( $configFile, $command, $id, $sender, $senderIp );
}