},
{
- 'key' => 'domain',
- 'section' => 'deprecated',
- 'description' => 'Your domain name.',
- 'type' => 'text',
- },
-
- {
'key' => 'editreferrals',
'section' => 'UI',
'description' => 'Enable advertising source modification for existing customers',
unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
} elsif ( $self->dest =~ /^([\w\.\-\&\+]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
my($user, $domain) = ($1, $2);
-# if ( $domain eq $mydomain ) {
-# my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
-# return "Unknown local account: $user\@$domain (specified literally)"
-# unless $svc_acct;
-# $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
-# $self->dest($1);
-# }
$self->dest("$1\@$2");
} else {
return gettext("illegal_email_invoice_address");
=head1 VERSION
-$Id: cust_main_invoice.pm,v 1.12 2002-04-12 13:22:02 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.13 2002-09-18 22:50:44 ivan Exp $
=head1 BUGS
$username_ampersand $username_letter $username_letterfirst
$username_noperiod $username_nounderscore $username_nodash
$username_uppercase
- $mydomain
$welcome_template $welcome_from $welcome_subject $welcome_mimetype
$smtpmachine
$dirhash
$username_nodash = $conf->exists('username-nodash');
$username_uppercase = $conf->exists('username-uppercase');
$username_ampersand = $conf->exists('username-ampersand');
- $mydomain = $conf->config('domain');
$dirhash = $conf->config('dirhash') || 0;
if ( $conf->exists('welcome_email') ) {
$welcome_template = new Text::Template (
sub domain {
my $self = shift;
- if ( $self->domsvc ) {
- #$self->svc_domain->domain;
- my $svc_domain = $self->svc_domain
- or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
- $svc_domain->domain;
- } else {
- $mydomain or die "svc_acct.domsvc is null and no legacy domain config file";
- }
+ die "svc_acct.domsvc is null for svcnum ". $self->svcnum unless $self->domsvc;
+ my $svc_domain = $self->svc_domain
+ or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
+ $svc_domain->domain;
}
=item svc_domain
adminsuidsetup $user;
my $conf = new FS::Conf;
-my $domain = $conf->config('domain');
my @svc_acct = qsearch('svc_acct', {});
-my @usernames = map $_->username, @svc_acct;
-my @emails = map "$_\@$domain", @usernames;
+my @emails = map $_->email, @svc_acct;
print join("\n", @emails), "\n";
=head1 VERSION
-$Id: freeside-email,v 1.1 2001-05-15 07:52:34 ivan Exp $
+$Id: freeside-email,v 1.2 2002-09-18 22:50:44 ivan Exp $
=head1 BUGS
<%
my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_forward);
if ( $cgi->param('error') ) {
<%
-my $mydomain = '';
-
my $conf = new FS::Conf;
my $maxrecords = $conf->config('maxsearchrecordsperpage');
$domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
"\">". $svc_domain->domain. "</A>";
} else {
- unless ( $mydomain ) {
- my $conf = new FS::Conf;
- unless ( $mydomain = $conf->config('domain') ) {
- die "No legacy domain config file and no svc_domain.svcnum record ".
- "for svc_acct.domsvc: ". $svc_acct->domsvc;
- }
- }
- $domain = "<i>$mydomain</i><FONT COLOR=\"#FF0000\">*</FONT>";
+ die "No svc_domain.svcnum record for svc_acct.domsvc: ".'
+ $svc_acct->domsvc;
}
my($cust_pkg,$cust_main);
if ( $cust_svc->pkgnum ) {
}
- print "</TABLE>$pager<BR>";
-
- if ( $mydomain ) {
- print "<BR><FONT COLOR=\"#FF0000\">*</FONT> The <I>$mydomain</I> domain ".
- "is contained in your legacy <CODE>domain</CODE> ".
- "<A HREF=\"${p}docs/config.html#domain\">configuration file</A>. ".
- "You should run the <CODE>bin/fs-migrate-svc_acct_sm</CODE> script ".
- "to create a proper svc_domain record for this domain.";
- }
-
- print '</BODY></HTML>';
+ print "</TABLE>$pager<BR>".
+ '</BODY></HTML>';
}
<%
my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
my($query)=$cgi->keywords;
$query ||= ''; #to avoid use of unitialized value errors
<%
my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
die "Unknown domain" unless $svc_domain;
$domain = $svc_domain->domain;
} else {
- unless ( $mydomain ) {
- die "No legacy domain config file and no svc_domain.svcnum record ".
- "for svc_acct.domsvc: ". $cust_svc->domsvc;
- }
- $domain = $mydomain;
+ die "No svc_domain.svcnum record for svc_acct.domsvc: ". $cust_svc->domsvc;
}
%>