git://git.exim.org
/
buildfarm-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove .htaccess - config now done in an apache config file
[buildfarm-server.git]
/
trunk
/
cgi-bin
/
register.pl
diff --git
a/trunk/cgi-bin/register.pl
b/trunk/cgi-bin/register.pl
index b15a0e24cf88862c4699a604aff695217f641617..37290f8808e13b4fb70f184830b11d67d23483b0 100755
(executable)
--- a/
trunk/cgi-bin/register.pl
+++ b/
trunk/cgi-bin/register.pl
@@
-7,7
+7,7
@@
use CGI;
use Template;
use Captcha::reCAPTCHA;
use Template;
use Captcha::reCAPTCHA;
-use vars qw($dbhost $dbname $dbuser $dbpass $dbport $notifyapp $captcha_pubkey $captcha_privkey $template_dir);
+use vars qw($dbhost $dbname $dbuser $dbpass $dbport $notifyapp $captcha_pubkey $captcha_privkey $template_dir
$default_host
);
require "$ENV{BFConfDir}/BuildFarmWeb.pl";
require "$ENV{BFConfDir}/BuildFarmWeb.pl";
@@
-123,11
+123,14
@@
use Mail::Send;
my $msg = new Mail::Send;
my $msg = new Mail::Send;
-my $me = `id -un`;
+my $me = `id -un`; chomp($me);
+my $host = `hostname`; chomp ($host);
+$host = $default_host unless ($host =~ m/[.]/ || !defined($default_host));
-my $host = `hostname`;
+my $from_addr = "PG Build Farm <$me\@$host>";
+$from_addr =~ tr /\r\n//d;
-$msg->set('From',
"PG Build Farm <$me\@$host>"
);
+$msg->set('From',
$from_addr
);
$msg->to(@$notifyapp);
$msg->subject('New Buildfarm Application');
$msg->to(@$notifyapp);
$msg->subject('New Buildfarm Application');