Project

General

Profile

« Previous | Next » 

Revision 8253

include optional email.overrideURL property for the account management page to send an email link that will result in a styled response. https://projects.ecoinformatics.org/ecoinfo/issues/6066

View differences:

lib/style/skins/metacatui/metacatui.properties
27 27
registry.templates.getReviews=
28 28

  
29 29
# email settings
30
email.sender=KNB Data Repository <help@nceas.ucsb.edu>
30
email.sender=Data Repository <help@nceas.ucsb.edu>
31 31
email.recipient=help@nceas.ucsb.edu
32 32
email.admin=the repository administrator
33
email.overrideURL=/#external/
33 34

  
34 35
# registry display settings
35 36
registry.show.siteList=false 
src/perl/ldapweb.cgi
67 67
if ( $properties->getProperty('server.httpPort') eq '443' ) {
68 68
	$protocol = 'https://';
69 69
}
70
my $contextUrl = $protocol . $properties->getProperty('server.name');
70
my $serverUrl = $protocol . $properties->getProperty('server.name');
71 71
if ($properties->getProperty('server.httpPort') ne '80') {
72
        $contextUrl = $contextUrl . ':' . $properties->getProperty('server.httpPort');
72
        $serverUrl = $serverUrl . ':' . $properties->getProperty('server.httpPort');
73 73
}
74
$contextUrl = $contextUrl . '/' .  $properties->getProperty('application.context');
74
my $context = $properties->getProperty('application.context');
75
my $contextUrl = $serverUrl . '/' .  $context;
75 76

  
76 77
my $metacatUrl = $contextUrl . "/metacat";
77
my $cgiPrefix = "/" . $properties->getProperty('application.context') . "/cgi-bin";
78
my $cgiPrefix = "/" . $context . "/cgi-bin";
78 79
my $styleSkinsPath = $contextUrl . "/style/skins";
79 80
my $styleCommonPath = $contextUrl . "/style/common";
80 81

  
......
1122 1123
    
1123 1124
    
1124 1125
    ####################send the verification email to the user
1125
    my $link = $contextUrl. '/cgi-bin/ldapweb.cgi?cfg=' . $skinName . '&' . 'stage=' . $emailVerification . '&' . 'dn=' . $dn . '&' . 'hash=' . $randomStr . '&o=' . $org . '&uid=' . $query->param('uid'); #even though we use o=something. The emailVerification will figure the real o= or ou=something.
1126
    my $link = '/' . $context . '/cgi-bin/ldapweb.cgi?cfg=' . $skinName . '&' . 'stage=' . $emailVerification . '&' . 'dn=' . $dn . '&' . 'hash=' . $randomStr . '&o=' . $org . '&uid=' . $query->param('uid'); #even though we use o=something. The emailVerification will figure the real o= or ou=something.
1126 1127
    
1128
    my $overrideURL;
1129
    $overrideURL = $skinProperties->getProperty("email.overrideURL");
1130
    debug("the overrideURL is " . $overrideURL);
1131
    if (defined($overrideURL) && !($overrideURL eq '')) {
1132
    	$link = $serverUrl . $overrideURL . $link;
1133
    } else {
1134
    	$link = $serverUrl . $link;
1135
    }
1136
    
1127 1137
    my $mailhost = $properties->getProperty('email.mailhost');
1128 1138
    my $sender;
1129 1139
    $sender = $skinProperties->getProperty("email.sender") or $sender = $properties->getProperty('email.sender');

Also available in: Unified diff