From 8a8c9386cbd3383b0134aae8e32b5995f8886fb2 Mon Sep 17 00:00:00 2001 From: jeff Date: Sun, 19 Aug 2001 15:53:36 +0000 Subject: added user interface for svc_forward and vpopmail support --- httemplate/view/svc_forward.cgi | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100755 httemplate/view/svc_forward.cgi (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi new file mode 100755 index 000000000..7930ab5ec --- /dev/null +++ b/httemplate/view/svc_forward.cgi @@ -0,0 +1,91 @@ +<% +# +# $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!Edit this information!, + "
Service #$svcnum", + "
Service: $svc", + qq!
Mail to $source forwards to $destination mailbox.!, + '' +; + +%> -- cgit v1.2.1 From 3d671921441ba8422650b54435a1959ad1d4c71d Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 21 Aug 2001 02:31:57 +0000 Subject: remove $Log$ messages. whew. --- httemplate/view/svc_forward.cgi | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index 7930ab5ec..e40935bc4 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -1,17 +1,5 @@ <% -# -# $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 -- cgit v1.2.1 From 91387f8f489e561deaf1de052d80ef800a4970a3 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 26 Oct 2001 10:24:56 +0000 Subject: cache foo *sigh* --- httemplate/view/svc_forward.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index e40935bc4..4a636c60e 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -1,5 +1,5 @@ <% -# +# use strict; use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc @@ -41,7 +41,7 @@ $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( +print $cgi->header( @FS::CGI::header ), 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", -- cgit v1.2.1 From c14a267229fc0d6f2d2afdebab3bd34d825df2ef Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 30 Oct 2001 14:54:07 +0000 Subject: get rid of header foo in individual templates --- httemplate/view/svc_forward.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index 4a636c60e..bb9587062 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -1,5 +1,5 @@ <% -# +# use strict; use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc @@ -41,7 +41,7 @@ $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) or die "Unkonwn svcpart"; $p = popurl(2); -print $cgi->header( @FS::CGI::header ), header('Mail Forward View', menubar( +print 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", -- cgit v1.2.1 From 1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 30 Jan 2002 14:18:09 +0000 Subject: remove use Module; and $cgi = new CGI; &cgisuidsetup(); from all templates. should work better under Mason. --- httemplate/view/svc_forward.cgi | 47 +++++++++++++---------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index bb9587062..fc465dbab 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -1,34 +1,17 @@ + <% -# -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; +my $conf = new FS::Conf; -$cgi = new CGI; -cgisuidsetup($cgi); - -$conf = new FS::Conf; - -($query) = $cgi->keywords; +my($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$svcnum = $1; -$svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum}); +my $svcnum = $1; +my $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'); +my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum}); +my $pkgnum = $cust_svc->getfield('pkgnum'); +my($cust_pkg, $custnum); if ($pkgnum) { $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); $custnum=$cust_pkg->getfield('custnum'); @@ -37,10 +20,9 @@ if ($pkgnum) { $custnum = ''; } -$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) +my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) or die "Unkonwn svcpart"; -$p = popurl(2); print header('Mail Forward View', menubar( ( ( $pkgnum || $custnum ) ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", @@ -52,17 +34,18 @@ print header('Mail Forward View', menubar( "Main menu" => $p, )); -($srcsvc,$dstsvc,$dst) = ( +my($srcsvc,$dstsvc,$dst) = ( $svc_forward->srcsvc, $svc_forward->dstsvc, $svc_forward->dst, ); -$svc = $part_svc->svc; -$svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc}) +my $svc = $part_svc->svc; +my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc}) or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc"; -$source = $svc_acct->email; +my $source = $svc_acct->email; +my $destination; if ($dstsvc) { - $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc}) + my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc}) or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc"; $destination = $svc_acct->email; }else{ -- cgit v1.2.1 From 22a35047ecdffff80110e06cc08fc84f9ddba9b0 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 10 Feb 2002 13:21:31 +0000 Subject: removed from all files to fix any redirects, whew Mason handler.pl overrides CGI::redirect fixed strict; problems in edit/part_pkg.cgi & edit/process/part_pkg.cgi --- httemplate/view/svc_forward.cgi | 1 - 1 file changed, 1 deletion(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index fc465dbab..a5096e92c 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -1,4 +1,3 @@ - <% my $conf = new FS::Conf; -- cgit v1.2.1 From a4c96748eb6eab29a70f3a944c6520283a635c78 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 10 Feb 2002 16:05:22 +0000 Subject: *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. --- httemplate/view/svc_forward.cgi | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index a5096e92c..cafb9e5b8 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -1,3 +1,4 @@ + <% my $conf = new FS::Conf; -- cgit v1.2.1 From 8f42b751aebda2e7dce2c363bed6f1e15b411b1d Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 20 Feb 2002 01:03:10 +0000 Subject: use Net::SSH::ssh_cmd for all job queueing rather than local duplicated ssh subs queue daemon updates: retry & remove links work, bubble up error message to webinterface, link to svcnum & have job listings on view/svc_* pages, closes: Bug#280 s/option/optionname/ schema change, dumb mysql, closes: Bug#334 --- httemplate/view/svc_forward.cgi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index cafb9e5b8..8d2afc823 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -52,10 +52,11 @@ if ($dstsvc) { $destination = $dst; } -print qq!Edit this information!, - "
Service #$svcnum", - "
Service: $svc", - qq!
Mail to $source forwards to $destination mailbox.!, +print qq!Edit this information!. + "
Service #$svcnum". + "
Service: $svc". + qq!
Mail to $source forwards to $destination mailbox.!. + '
'. joblisting({'svcnum'=>$svcnum}, 1). '' ; -- cgit v1.2.1 From 9b6e476ab5a9f42877543065eff960928df2304b Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 6 Jul 2002 11:08:48 +0000 Subject: fix UI for forwards - use HTML::Widgets::SelectLayers, closes: Bug#303 --- httemplate/view/svc_forward.cgi | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index 8d2afc823..c8d1d6213 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -53,9 +53,15 @@ if ($dstsvc) { } print qq!Edit this information!. - "
Service #$svcnum". - "
Service: $svc". - qq!
Mail to $source forwards to $destination mailbox.!. + ntable("#cccccc",2). + 'Service number'. + qq!$svcnum!. + 'Service'. + qq!$svc!. + qq!Email to!. + qq!$source!. + qq!Forwards to !. + qq!$destination!. '
'. joblisting({'svcnum'=>$svcnum}, 1). '' ; -- cgit v1.2.1 From 58d44fbe5eb9ab32e6d87063a4a3b22ddba9a828 Mon Sep 17 00:00:00 2001 From: khoff Date: Tue, 5 Aug 2003 00:20:51 +0000 Subject: Virtual field merge --- httemplate/view/svc_forward.cgi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index c8d1d6213..5d619de54 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -61,7 +61,14 @@ print qq!Edit this information!. qq!Email to!. qq!$source!. qq!Forwards to !. - qq!$destination!. + qq!$destination!; + +foreach (sort { $a cmp $b } $svc_forward->virtual_fields) { + print $svc_forward->pvf($_)->widget('HTML', 'view', $svc_forward->getfield($_)), + "\n"; +} + +print qq! !. '
'. joblisting({'svcnum'=>$svcnum}, 1). '' ; -- cgit v1.2.1 From ecf57b84d7a29c9bebac62eb5ebf178332163fd9 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 13 Feb 2004 11:28:07 +0000 Subject: add mail alias browse to main menu and fix mail alias view to recognize new schema also --- httemplate/view/svc_forward.cgi | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index 5d619de54..c2ce164d1 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -39,16 +39,25 @@ my($srcsvc,$dstsvc,$dst) = ( $svc_forward->dstsvc, $svc_forward->dst, ); +my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : ''; + my $svc = $part_svc->svc; -my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc}) - or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc"; -my $source = $svc_acct->email; + +my $source; +if ($srcsvc) { + my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc}) + or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc"; + $source = $svc_acct->email; +} else { + $source = $src; +} + my $destination; if ($dstsvc) { my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc}) or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc"; $destination = $svc_acct->email; -}else{ +} else { $destination = $dst; } -- cgit v1.2.1 From 68b54c10131ae55a6ac537673fa70ac103fed22b Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 26 Feb 2004 19:21:28 +0000 Subject: correct cancel link s/account/mail forward/ --- httemplate/view/svc_forward.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index c2ce164d1..650972429 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -28,7 +28,7 @@ print header('Mail Forward View', menubar( ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", ) - : ( "Cancel this (unaudited) account" => + : ( "Cancel this (unaudited) mail forward" => "${p}misc/cancel-unaudited.cgi?$svcnum" ) ), "Main menu" => $p, -- cgit v1.2.1 From e3f327b2af9e6a591bae41d315fda731ec7f5128 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 22 Mar 2004 11:05:58 +0000 Subject: remove everything that links to package view also, closes: Bug#569 --- httemplate/view/svc_forward.cgi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'httemplate/view/svc_forward.cgi') diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index 650972429..52360bcc2 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -25,8 +25,7 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) print 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", + ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", ) : ( "Cancel this (unaudited) mail forward" => "${p}misc/cancel-unaudited.cgi?$svcnum" ) -- cgit v1.2.1