Commit a76331ae authored by Leigh Stoller's avatar Leigh Stoller

Fix a couple of branding problems.

parent 8a923c98
...@@ -90,7 +90,7 @@ sub wwwBase($) ...@@ -90,7 +90,7 @@ sub wwwBase($)
return ($self->isAPT() ? "https://www.aptlab.net" : return ($self->isAPT() ? "https://www.aptlab.net" :
$self->isCloud() ? "https://www.cloudlab.us" : $self->isCloud() ? "https://www.cloudlab.us" :
$self->isPNet() ? "https://www.phantomnet.org" : $self->isPNet() ? "https://www.phantomnet.org" :
$self->isPowder() ? "@TBBASE@" . "/portal" : $self->isPowder() ? "https://www.powderwireless.net" :
$self->isEmulab() ? "@TBBASE@" . "/portal" : $self->isEmulab() ? "@TBBASE@" . "/portal" :
"@TBBASE@"); "@TBBASE@");
} }
......
...@@ -693,7 +693,7 @@ class Group ...@@ -693,7 +693,7 @@ class Group
# Notify leaders of new (and verified) group member. # Notify leaders of new (and verified) group member.
# #
function NewMemberNotify($user, $nag = false) { function NewMemberNotify($user, $nag = false) {
global $TBWWW, $APTBASE, global $TBWWW, $APTBASE, $TBMAILTAG,
$TBMAIL_APPROVAL, $TBMAIL_AUDIT, $TBMAIL_WWW, $TBMAIL_NOREPLY; $TBMAIL_APPROVAL, $TBMAIL_AUDIT, $TBMAIL_WWW, $TBMAIL_NOREPLY;
if (! $this->project) { if (! $this->project) {
...@@ -807,6 +807,10 @@ class Group ...@@ -807,6 +807,10 @@ class Group
"Country: $usr_country\n". "Country: $usr_country\n".
"Phone: $usr_phone\n"; "Phone: $usr_phone\n";
} }
# Make sure this goes out with the right subject tag,
$oldmailtag = $TBMAILTAG;
$TBMAILTAG = $project->EmailTag();
TBMAIL("$leader_name '$leader_uid' <$leader_email>", TBMAIL("$leader_name '$leader_uid' <$leader_email>",
"$joining_uid $pid Project Join Request", "$joining_uid $pid Project Join Request",
$message . $message .
...@@ -822,6 +826,7 @@ class Group ...@@ -822,6 +826,7 @@ class Group
"Bcc: $TBMAIL_AUDIT\n". "Bcc: $TBMAIL_AUDIT\n".
"Errors-To: $TBMAIL_WWW"); "Errors-To: $TBMAIL_WWW");
$TBMAILTAG = $oldmailtag;
return 0; return 0;
} }
......
<?php <?php
# #
# Copyright (c) 2006-2017 University of Utah and the Flux Group. # Copyright (c) 2006-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -188,7 +188,7 @@ class Project ...@@ -188,7 +188,7 @@ class Project
return ($this->isAPT() ? "https://www.aptlab.net" : return ($this->isAPT() ? "https://www.aptlab.net" :
($this->isCloud() ? "https://www.cloudlab.us" : ($this->isCloud() ? "https://www.cloudlab.us" :
($this->isPNet() ? "https://www.phantomnet.org" : ($this->isPNet() ? "https://www.phantomnet.org" :
($this->isPowder() ? $TBBASE : ($this->isPowder() ? "https://www.powderwireless.net" :
$TBBASE)))); $TBBASE))));
} }
function ApprovalEmailAddress() { function ApprovalEmailAddress() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment