use FS::svc_acct;
use FS::svc_acct_sm;
use FS::svc_domain;
+use FS::svc_forward;
@ISA = qw( FS::Record );
my $svc_domain = qsearchs ( 'svc_domain', { 'svcnum' => $svc_x->domsvc } );
my $domain = $svc_domain->domain;
$tag = "$domuser\@$domain";
+ } elsif ( $svcdb eq 'svc_forward' ) {
+ my $svc_acct = qsearchs ( 'svc_acct', { 'svcnum' => $svc_x->srcsvc } );
+ $tag = $svc_acct->email . '->';
+ if ($svc_x->dstsvc) {
+ $svc_acct = qsearchs ( 'svc_acct', { 'svcnum' => $svc_x->dstsvc } );
+ $tag .= $svc_acct->email;
+ }else{
+ $tag .= $svc_x->dst;
+ }
} elsif ( $svcdb eq 'svc_domain' ) {
$tag = $svc_x->getfield('domain');
} else {
=head1 VERSION
-$Id: cust_svc.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_svc.pm,v 1.2 2001-08-19 15:53:34 jeff Exp $
=head1 BUGS
} grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
}
+=item email
+
+Returns an email address associated with the account.
+
+=cut
+
+sub email {
+ my $self = shift;
+ my $domain;
+ my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+ if ($svc_domain) {
+ $domain=$svc_domain->domain;
+ }else{
+ warn "couldn't find svc_acct.domsvc " . $self->domsvc . "!";
+ $domain="unknown";
+ }
+ return $self->username . "@" . $domain;
+}
+
=back
=head1 VERSION
-$Id: svc_acct.pm,v 1.23 2001-08-19 08:18:01 ivan Exp $
+$Id: svc_acct.pm,v 1.24 2001-08-19 15:53:34 jeff Exp $
=head1 BUGS
}
if ($recref->{dst}) {
- $recref->{dst} =~ /^(\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/
+ $recref->{dst} =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/
or return "Illegal dst";
- $recref->{dst} = $1;
}
''; #no error
=head1 VERSION
-$Id: svc_forward.pm,v 1.2 2001-08-12 19:41:24 jeff Exp $
+$Id: svc_forward.pm,v 1.3 2001-08-19 15:53:35 jeff Exp $
=head1 BUGS
test.pl
README
bin/freeside-bill
+bin/freeside-email
bin/freeside-print-batch
FS/domain_record.pm
FS/prepay_credit.pm
FS/svc_www.pm
FS/CGIwrapper.pm
+FS/svc_forward.pm
-<!-- $Id: part_svc.cgi,v 1.3 2001-08-11 23:19:09 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.4 2001-08-19 15:53:35 jeff Exp $ -->
<%
my $part_svc;
if ( $cgi->param('error') ) { #error
Services are items you offer to your customers.
<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
<LI>svc_domain - Virtual domains
- <LI>svc_acct_sm - Virtual domain mail aliasing
+ <LI>svc_acct_sm - Virtual domain mail aliasing (*depreciated*)
+ <LI>svc_forward - mail forwarding
<LI>svc_www - Virtual domain website
<!-- <LI>svc_charge - One-time charges (Partially unimplemented)
<LI>svc_wo - Work orders (Partially unimplemented)
var something = null;
function changed(what) {
svcdb = what.options[what.selectedIndex].value;
-<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_www ) ) { %>
+<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
if (svcdb == "<%= $svcdb %>" ) {
<% foreach my $not ( grep { $_ ne $svcdb } (
- qw(svc_acct svc_domain svc_acct_sm svc_www) ) ) { %>
+ qw(svc_acct svc_domain svc_acct_sm svc_forward svc_www) ) ) { %>
if (document.getElementById) {
document.getElementById('d<%= $not %>').style.visibility = "hidden";
} else {
</SCRIPT>
<% my @dbs = $hashref->{svcdb}
? ( $hashref->{svcdb} )
- : qw( svc_acct svc_domain svc_acct_sm svc_www ); %>
+ : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ); %>
Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
<% foreach my $svcdb (@dbs) { %>
<OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
'domuid' => 'UID where domuser@virtualdomain.com mail is forwarded',
'domsvc' => 'svcnum from svc_domain for virtualdomain.com',
},
+ 'svc_forward' => {
+ 'srcsvc' => 'service from which mail is to be forwarded',
+ 'dstsvc' => 'service to which mail is to be forwarded',
+ 'dst' => 'someone@another.domain.com to use when dstsvc is 0',
+ },
'svc_charge' => {
'amount' => 'amount',
},
# svc_acct svc_domain svc_acct_sm svc_charge svc_wo
foreach my $svcdb ( qw(
- konq_kludge svc_acct svc_domain svc_acct_sm svc_www
+ konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
) ) {
my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
--- /dev/null
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: post form to:
+# http://server.name/path/svc_forward.cgi
+#
+# $Log: svc_forward.cgi,v $
+# Revision 1.1 2001-08-19 15:53:35 jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_forward;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum =$1;
+
+$old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
+
+$new = new FS::svc_forward ( {
+ map {
+ ($_, scalar($cgi->param($_)));
+ } ( fields('svc_forward'), qw( pkgnum svcpart ) )
+} );
+
+if ( $svcnum ) {
+ $error = $new->replace($old);
+} else {
+ $error = $new->insert;
+ $svcnum = $new->getfield('svcnum');
+}
+
+if ($error) {
+ $cgi->param('error', $error);
+ print $cgi->redirect(popurl(2). "svc_forward.cgi?". $cgi->query_string );
+} else {
+ print $cgi->redirect(popurl(3). "view/svc_forward.cgi?$svcnum");
+}
+
+%>
<%
#
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:35 jeff Exp $
#
# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
# http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
#
# $Log: svc_acct.cgi,v $
-# Revision 1.1 2001-07-30 07:36:04 ivan
+# Revision 1.2 2001-08-19 15:53:35 jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1 2001/07/30 07:36:04 ivan
# templates!!!
#
# Revision 1.10 1999/04/14 11:27:06 ivan
use strict;
use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
$part_svc $svc $otaker $username $password $ulen $ulen2 $p1
- $popnum $uid $gid $finger $dir $shell $quota $slipip );
+ $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip );
use CGI;
use CGI::Carp qw(fatalsToBrowser);
use FS::UID qw(cgisuidsetup getotaker);
(blank to generate)
END
+#domain
+$domsvc = $svc_acct->domsvc || 0;
+if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
+ print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
+} else {
+ print qq!<BR>Domain: <SELECT NAME="domsvc" SIZE=1>\n!;
+ my($svc_domain);
+ foreach $svc_domain
+ ( sort {$a->domain cmp $b->domain} (qsearch ('svc_domain',{} ) ) )
+ {
+ print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
+ $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
+ ">", $svc_domain->domain, "\n"
+ ;
+ }
+ print "</SELECT>";
+}
+
#pop
$popnum = $svc_acct->popnum || 0;
if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
--- /dev/null
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: svc_forward.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+# http://server.name/path/svc_forward.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
+#
+# should error out in a more CGI-friendly way, and should have more error checking (sigh).
+#
+# $Log: svc_forward.cgi,v $
+# Revision 1.1 2001-08-19 15:53:35 jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
+ $part_svc $query %email $p1 $srcsvc $dstsvc $dst );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_forward;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+if ( $cgi->param('error') ) {
+ $svc_forward = new FS::svc_forward ( {
+ map { $_, scalar($cgi->param($_)) } fields('svc_forward')
+ } );
+ $svcnum = $svc_forward->svcnum;
+ $pkgnum = $cgi->param('pkgnum');
+ $svcpart = $cgi->param('svcpart');
+ $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ die "No part_svc entry!" unless $part_svc;
+} else {
+ my($query) = $cgi->keywords;
+ if ( $query =~ /^(\d+)$/ ) { #editing
+ $svcnum=$1;
+ $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
+ or die "Unknown (svc_forward) svcnum!";
+
+ my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+ or die "Unknown (cust_svc) svcnum!";
+
+ $pkgnum=$cust_svc->pkgnum;
+ $svcpart=$cust_svc->svcpart;
+
+ $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ die "No part_svc entry!" unless $part_svc;
+
+ } else { #adding
+
+ $svc_forward = new FS::svc_forward({});
+
+ foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+ $pkgnum=$1 if /^pkgnum(\d+)$/;
+ $svcpart=$1 if /^svcpart(\d+)$/;
+ }
+ $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ die "No part_svc entry!" unless $part_svc;
+
+ $svcnum='';
+
+ #set fixed and default fields from part_svc
+ my($field);
+ foreach $field ( fields('svc_forward') ) {
+ if ( $part_svc->getfield('svc_forward__'. $field. '_flag') ne '' ) {
+ $svc_forward->setfield($field,$part_svc->getfield('svc_forward__'. $field) );
+ }
+ }
+
+ }
+}
+$action = $svc_forward->svcnum ? 'Edit' : 'Add';
+
+if ($pkgnum) {
+
+ #find all possible user svcnums (and emails)
+
+ #starting with those currently attached
+ my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
+ $email{$svc_forward->srcsvc} = $svc_acct->email;
+
+ if ($svc_forward->dstsvc) {
+ $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+ $email{$svc_forward->dstsvc} = $svc_acct->email;
+ }
+
+ #and including the rest for this customer
+ my($u_part_svc,@u_acct_svcparts);
+ foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+ push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+ }
+
+ my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+ my($custnum)=$cust_pkg->getfield('custnum');
+ my($i_cust_pkg);
+ foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+ my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+ my($acct_svcpart);
+ foreach $acct_svcpart (@u_acct_svcparts) { #now find the corresponding
+ #record(s) in cust_svc ( for this
+ #pkgnum ! )
+ my($i_cust_svc);
+ foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+ $svc_acct=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+ $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
+ }
+ }
+ }
+
+} elsif ( $action eq 'Edit' ) {
+
+ my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
+ $email{$svc_forward->srcsvc} = $svc_acct->email;
+
+ $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+ $email{$svc_forward->dstsvc} = $svc_acct->email;
+
+} else {
+ die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+($srcsvc,$dstsvc,$dst)=(
+ $svc_forward->srcsvc,
+ $svc_forward->dstsvc,
+ $svc_forward->dst,
+);
+
+#display
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Mail Forward $action", '',
+ " onLoad=\"visualize()\"");
+
+%>
+
+<SCRIPT>
+function visualize(what){
+ if (document.getElementById) {
+ document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+ }
+}
+function fixup(what){
+ if (document.getElementById) {
+ if (document.getElementById('dother').style.visibility == 'hidden') {
+ what.dst.value='';
+ }
+ }
+}
+</SCRIPT>
+
+<%
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+ "</FONT>"
+ if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_forward.cgi" onSubmit="fixup(this)" METHOD=POST>!;
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+print qq!<BR>!;
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+#srcsvc
+print qq!\n\nMail to <SELECT NAME="srcsvc" SIZE=1>!;
+foreach $_ (keys %email) {
+ print "<OPTION", $_ eq $srcsvc ? " SELECTED" : "",
+ qq! VALUE="$_">$email{$_}!;
+}
+print "</SELECT>";
+
+#dstsvc
+print qq! forwards to <SELECT NAME="dstsvc" SIZE=1 onChange="changed(this)">!;
+foreach $_ (keys %email) {
+ print "<OPTION", $_ eq $dstsvc ? " SELECTED" : "",
+ qq! VALUE="$_">$email{$_}!;
+}
+print "<OPTION", 0 eq $dstsvc ? " SELECTED" : "",
+ qq! VALUE="0">(other)!;
+print "</SELECT> mailbox.";
+
+%>
+
+<SCRIPT>
+var selectchoice = null;
+function changed(what) {
+ selectchoice = what.options[what.selectedIndex].value;
+ if (selectchoice == "0") {
+ if (document.getElementById) {
+ document.getElementById('dother').style.visibility = "visible";
+ }
+ }else{
+ if (document.getElementById) {
+ document.getElementById('dother').style.visibility = "hidden";
+ }
+ }
+}
+if (document.getElementById) {
+ document.write("<DIV ID=\"dother\" STYLE=\"visibility: hidden\">");
+}
+</SCRIPT>
+
+<%
+print qq! Other destination: <INPUT TYPE="text" NAME="dst" VALUE="$dst">!;
+%>
+
+<SCRIPT>
+if (document.getElementById) {
+ document.write("</DIV>");
+}
+</SCRIPT>
+
+<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
+</FORM>
+
+<TAG onLoad="
+ if (document.getElementById) {
+ document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+ document.getElementById('dlabel').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+ }
+">
+
+
+ </BODY>
+</HTML>
--- /dev/null
+<%
+#
+# $Id: catchall.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: catchall.cgi {svcnum}
+# http://server.name/path/catchall.cgi? {svcnum}
+#
+# $Log: catchall.cgi,v $
+# Revision 1.1 2001-08-19 15:53:35 jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
+ $part_svc $query %email $p1 $domain $catchall );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct;
+use FS::svc_domain;
+use FS::svc_forward;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+if ( $cgi->param('error') ) {
+ $svc_domain = new FS::svc_domain ( {
+ map { $_, scalar($cgi->param($_)) } fields('svc_domain')
+ } );
+ $svcnum = $svc_domain->svcnum;
+ $pkgnum = $cgi->param('pkgnum');
+ $svcpart = $cgi->param('svcpart');
+ $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ die "No part_svc entry!" unless $part_svc;
+} else {
+ my($query) = $cgi->keywords;
+ if ( $query =~ /^(\d+)$/ ) { #editing
+ $svcnum=$1;
+ $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
+ or die "Unknown (svc_domain) svcnum!";
+
+ my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+ or die "Unknown (cust_svc) svcnum!";
+
+ $pkgnum=$cust_svc->pkgnum;
+ $svcpart=$cust_svc->svcpart;
+
+ $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ die "No part_svc entry!" unless $part_svc;
+
+ } else {
+
+ die "Invalid (svc_domain) svcnum!";
+
+ }
+}
+
+if ($pkgnum) {
+
+ #find all possible user svcnums (and emails)
+
+ #starting with that currently attached
+ if ($svc_domain->catchall) {
+ my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_domain->catchall});
+ $email{$svc_domain->catchall} = $svc_acct->email;
+ }
+
+ #and including the rest for this customer
+ my($u_part_svc,@u_acct_svcparts);
+ foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+ push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+ }
+
+ my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+ my($custnum)=$cust_pkg->getfield('custnum');
+ my($i_cust_pkg);
+ foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+ my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+ my($acct_svcpart);
+ foreach $acct_svcpart (@u_acct_svcparts) { #now find the corresponding
+ #record(s) in cust_svc ( for this
+ #pkgnum ! )
+ my($i_cust_svc);
+ foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+ my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+ $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
+ }
+ }
+ }
+
+} else {
+
+ my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_domain->catchall});
+ $email{$svc_domain->catchall} = $svc_acct->email;
+}
+
+# add an absence of a catchall
+$email{0} = "(none)";
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Domain Catchall Edit", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+ "</FONT>"
+ if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/catchall.cgi" METHOD=POST>!;
+
+#display
+
+ #formatting
+ print "<PRE>";
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+($domain,$catchall)=(
+ $svc_domain->domain,
+ $svc_domain->catchall,
+);
+
+print qq!<INPUT TYPE="hidden" NAME="domain" VALUE="$domain">!;
+
+#catchall
+print qq!\n\nMail to <I>(anything)</I>@<B>$domain</B> forwards to <SELECT NAME="catchall" SIZE=1>!;
+foreach $_ (keys %email) {
+ print "<OPTION", $_ eq $catchall ? " SELECTED" : "",
+ qq! VALUE="$_">$email{$_}!;
+}
+print "</SELECT>";
+
+ #formatting
+ print "</PRE>\n";
+
+print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
+
+print <<END;
+
+ </FORM>
+ </BODY>
+</HTML>
+END
+
+%>
--- /dev/null
+<%
+#
+# $Id: catchall.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: post form to:
+# http://server.name/path/catchall.cgi
+#
+# $Log: catchall.cgi,v $
+# Revision 1.1 2001-08-19 15:53:35 jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_domain;
+use FS::CGI qw(popurl);
+
+$FS::svc_domain::whois_hack=1;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum =$1;
+
+$old = qsearchs('svc_domain',{'svcnum'=>$svcnum}) if $svcnum;
+
+$new = new FS::svc_domain ( {
+ map {
+ ($_, scalar($cgi->param($_)));
+ } ( fields('svc_domain'), qw( pkgnum svcpart ) )
+} );
+
+$new->setfield('action' => 'M');
+
+if ( $svcnum ) {
+ $error = $new->replace($old);
+} else {
+ $error = $new->insert;
+ $svcnum = $new->getfield('svcnum');
+}
+
+if ($error) {
+ $cgi->param('error', $error);
+ print $cgi->redirect(popurl(2). "catchall.cgi?". $cgi->query_string );
+} else {
+ print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+}
+
+%>
<%
-# <!-- $Id: svc_acct.cgi,v 1.2 2001-08-15 10:04:53 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.3 2001-08-19 15:53:35 jeff Exp $ -->
use strict;
use vars qw( $cgi @svc_acct $sortby $query );
<TR>
<TH><FONT SIZE=-1>Service #</FONT></TH>
<TH><FONT SIZE=-1>Username</FONT></TH>
+ <TH><FONT SIZE=-1>Domain</FONT></TH>
<TH><FONT SIZE=-1>UID</FONT></TH>
<TH><FONT SIZE=-1>Service</FONT></TH>
<TH><FONT SIZE=-1>Customer #</FONT></TH>
or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
or die "No part_svc record for svcpart ". $cust_svc->svcpart;
+ my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc })
+ or die "No svc_domain record for domsvc ". $cust_svc->domsvc;
my($cust_pkg,$cust_main);
if ( $cust_svc->pkgnum ) {
$cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
$cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
or die "No cust_main record for custnum ". $cust_pkg->custnum;
}
- my($svcnum,$username,$uid,$svc,$custnum,$last,$first,$company)=(
+ my($svcnum,$username,$domain,$uid,$svc,$custnum,$last,$first,$company)=(
$svc_acct->svcnum,
$svc_acct->getfield('username'),
+ $svc_domain->getfield('domain'),
$svc_acct->getfield('uid'),
$part_svc->svc,
$cust_svc->pkgnum ? $cust_main->custnum : '',
<TR>
<TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
<TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$username</FONT></A></TD>
+ <TD><FONT SIZE=-1>$domain</FONT></TD>
<TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$uid</FONT></A></TD>
<TD><FONT SIZE=-1>$svc</FONT></TH>
<TD><FONT SIZE=-1>$pcustnum</FONT></TH>
<%
#
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_domain.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
#
# Usage: post form to:
# http://server.name/path/svc_domain.cgi
# display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
#
# $Log: svc_domain.cgi,v $
-# Revision 1.1 2001-07-30 07:36:04 ivan
+# Revision 1.2 2001-08-19 15:53:36 jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1 2001/07/30 07:36:04 ivan
# templates!!!
#
# Revision 1.11 2000/03/03 18:22:44 ivan
use FS::CGI qw(header eidiot popurl);
use FS::svc_domain;
use FS::cust_svc;
-use FS::svc_acct_sm;
use FS::svc_acct;
+use FS::svc_forward;
$cgi = new CGI;
&cgisuidsetup($cgi);
<TR>
<TH>Service #</TH>
<TH>Domain</TH>
- <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
+ <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
<TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
</TR>
END
- my(%saw,$svc_domain);
+# my(%saw); # if we've multiple domains with the same
+ # svcnum, then we've a corrupt database
+
+ my($svc_domain);
my $p = popurl(2);
foreach $svc_domain (
- sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
+# sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
+ sort $sortby (@svc_domain)
) {
my($svcnum,$domain)=(
$svc_domain->svcnum,
# $malias='';
#}
- my @svc_acct_sm=qsearch('svc_acct_sm',{'domsvc' => $svcnum});
- my $rowspan = scalar(@svc_acct_sm) || 1;
-
- print <<END;
- <TR>
- <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
- <TD ROWSPAN=$rowspan>$domain</TD>
-END
+ my @svc_acct=qsearch('svc_acct',{'domsvc' => $svcnum});
+ my $rowspan = 0;
my $n1 = '';
- # false laziness: this was stolen from search/svc_acct_sm.cgi. but the
- # web interface in general needs to be rewritten in a mucho cleaner way
- my($svc_acct_sm);
- foreach $svc_acct_sm (@svc_acct_sm) {
- my($svcnum,$domuser,$domuid,$domsvc)=(
- $svc_acct_sm->svcnum,
- $svc_acct_sm->domuser,
- $svc_acct_sm->domuid,
- $svc_acct_sm->domsvc,
+ my($svc_acct, @rows);
+ foreach $svc_acct (
+ sort {$b->getfield('username') cmp $a->getfield('username')} (@svc_acct)
+ ) {
+
+ my (@forwards) = ();
+
+ my($svcnum,$username)=(
+ $svc_acct->svcnum,
+ $svc_acct->username,
);
- #my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $domsvc } );
- #if ( $svc_domain ) {
- # my $domain = $svc_domain->domain;
-
- print qq!$n1<TD><A HREF="!. popurl(2). qq!view/svc_acct_sm.cgi?$svcnum">!,
- #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
- ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ),
- qq!\@$domain</A> </TD>!,
- ;
- #} else {
- # my $warning = "couldn't find svc_domain.svcnum $svcnum ( svc_acct_sm.svcnum $svcnum";
- # warn $warning;
- # print "$n1<TD>WARNING: $warning</TD>";
- #}
-
- my $svc_acct = qsearchs( 'svc_acct', { 'uid' => $domuid } );
- if ( $svc_acct ) {
- my $username = $svc_acct->username;
- my $svc_acct_svcnum =$svc_acct->svcnum;
- print qq!<TD><A HREF="!, popurl(2),
- qq!view/svc_acct.cgi?$svc_acct_svcnum">$username\@$mydomain</A>!,
- qq!</TD></TR>!
- ;
- } else {
- my $warning = "couldn't find svc_acct.uid $domuid (svc_acct_sm.svcnum $svcnum)!";
- warn $warning;
- print "<TD>WARNING: $warning</TD>";
+
+ my @svc_forward = qsearch( 'svc_forward', { 'srcsvc' => $svcnum } );
+ my $svc_forward;
+ foreach $svc_forward (@svc_forward) {
+ my($dstsvc,$dst) = (
+ $svc_forward->dstsvc,
+ $svc_forward->dst,
+ );
+ if ($dstsvc) {
+ my $dst_svc_acct=qsearchs( 'svc_acct', { 'svcnum' => $dstsvc } );
+ my $destination=$dst_svc_acct->email;
+ push @forwards, qq!<TD><A HREF="!, popurl(2),
+ qq!view/svc_acct.cgi?$dstsvc">$destination</A>!,
+ qq!</TD></TR>!
+ ;
+ }else{
+ push @forwards, qq!<TD>$dst</TD></TR>!
+ ;
+ }
}
+
+ push @rows, qq!$n1<TD ROWSPAN=!, (scalar(@svc_forward) || 1),
+ qq!><A HREF="!. popurl(2). qq!view/svc_acct.cgi?$svcnum">!,
+ #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+ ( ($username eq '*') ? "<I>(anything)</I>" : $username ),
+ qq!\@$domain</A> </TD>!,
+ ;
+
+ push @rows, @forwards;
+
+ $rowspan += (scalar(@svc_forward) || 1);
$n1 = "</TR><TR>";
}
#end of false laziness
+
+
+
+ print <<END;
+ <TR>
+ <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+ <TD ROWSPAN=$rowspan>$domain</TD>
+END
+
+ print @rows;
print "</TR>";
}
}
sub domain_sort {
- $a->getfield('domain') cmp $b->getfield('doimain');
+ $a->getfield('domain') cmp $b->getfield('domain');
}
<%
#
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
#
# Usage: svc_acct.cgi svcnum
# http://server.name/path/svc_acct.cgi?svcnum
# displays arbitrary radius attributes ivan@sisd.com 98-aug-16
#
# $Log: svc_acct.cgi,v $
-# Revision 1.1 2001-07-30 07:36:04 ivan
+# Revision 1.2 2001-08-19 15:53:36 jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1 2001/07/30 07:36:04 ivan
# templates!!!
#
# Revision 1.12 2001/01/31 07:21:00 ivan
#
use strict;
-use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
+use vars qw( $conf $cgi $svc_domain $query $svcnum $svc_acct $cust_svc $pkgnum
$cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
use CGI;
use CGI::Carp qw( fatalsToBrowser );
&cgisuidsetup($cgi);
$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unknown svcpart" unless $part_svc;
+$svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+die "Unknown domain" unless $svc_domain;
+
$p = popurl(2);
print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
( ( $pkgnum || $custnum )
"<BR><BR>Username: <B>", $svc_acct->username, "</B>"
;
+print "<BR>Domain: <B>", $svc_domain->domain, "</B>";
+
print "<BR>Password: ";
$password = $svc_acct->_password;
if ( $password =~ /^\*\w+\* (.*)$/ ) {
<%
#
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_domain.cgi,v 1.2 2001-08-19 15:53:36 jeff Exp $
#
# Usage: svc_domain svcnum
# http://server.name/path/svc_domain.cgi?svcnum
# bmccane@maxbaud.net 98-apr-3
#
# $Log: svc_domain.cgi,v $
-# Revision 1.1 2001-07-30 07:36:04 ivan
+# Revision 1.2 2001-08-19 15:53:36 jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1 2001/07/30 07:36:04 ivan
# templates!!!
#
# Revision 1.11 2000/12/03 15:14:00 ivan
use strict;
use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum
- $cust_pkg $custnum $part_svc $p );
+ $cust_pkg $custnum $part_svc $p $svc_acct $email);
use CGI;
use FS::UID qw(cgisuidsetup);
use FS::CGI qw(header menubar popurl menubar);
}
$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unkonwn svcpart" unless $part_svc;
+die "Unknown svcpart" unless $part_svc;
+
+if ($svc_domain->catchall) {
+ $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
+ die "Unknown svcpart" unless $svc_acct;
+ $email = $svc_acct->email;
+}
$domain = $svc_domain->domain;
"Service #$svcnum",
"<BR>Service: <B>", $part_svc->svc, "</B>",
"<BR>Domain name: <B>$domain</B>.",
+ qq!<BR>Catch all email <A HREF="${p}misc/catchall.cgi?$svcnum">(change)</A>:!,
+ $email ? "<B>$email</B>." : "<I>(none)<I>",
qq!<BR><BR><A HREF="http://www.geektools.com/cgi-bin/proxy.cgi?query=$domain;targetnic=auto">View whois information.</A>!,
'</BODY></HTML>',
;
--- /dev/null
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:36 jeff Exp $
+#
+# Usage: svc_forward.cgi svcnum
+# http://server.name/path/svc_forward.cgi?svcnum
+#
+# based on view/svc_acct.cgi
+#
+# $Log: svc_forward.cgi,v $
+# Revision 1.1 2001-08-19 15:53:36 jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
+ $pkgnum $cust_pkg $custnum $part_svc $p $srcsvc $dstsvc $dst
+ $svc $svc_acct $source $destination);
+use CGI;
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl menubar );
+use FS::Record qw(qsearchs);
+use FS::Conf;
+use FS::cust_svc;
+use FS::cust_pkg;
+use FS::part_svc;
+use FS::svc_acct;
+use FS::svc_forward;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+
+($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+$svcnum = $1;
+$svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
+die "Unknown svcnum" unless $svc_forward;
+
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
+if ($pkgnum) {
+ $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+ $custnum=$cust_pkg->getfield('custnum');
+} else {
+ $cust_pkg = '';
+ $custnum = '';
+}
+
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+ or die "Unkonwn svcpart";
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header('Mail Forward View', menubar(
+ ( ( $pkgnum || $custnum )
+ ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
+ "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+ )
+ : ( "Cancel this (unaudited) account" =>
+ "${p}misc/cancel-unaudited.cgi?$svcnum" )
+ ),
+ "Main menu" => $p,
+));
+
+($srcsvc,$dstsvc,$dst) = (
+ $svc_forward->srcsvc,
+ $svc_forward->dstsvc,
+ $svc_forward->dst,
+);
+$svc = $part_svc->svc;
+$svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
+ or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
+$source = $svc_acct->email;
+if ($dstsvc) {
+ $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
+ or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
+ $destination = $svc_acct->email;
+}else{
+ $destination = $dst;
+}
+
+print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!,
+ "<BR>Service #$svcnum",
+ "<BR>Service: <B>$svc</B>",
+ qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!,
+ '</BODY></HTML>'
+;
+
+%>
projects / freeside.git / commitdiff