From: ivan Date: Thu, 8 Apr 1999 12:00:19 +0000 (+0000) Subject: aesthetic update X-Git-Tag: freeside_1_2_0~18 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=ef9dcbfdf3c2e7c0ac44eeff478e6eddcd038d62 aesthetic update --- diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi index 939fcc2dc..bf7f29bc1 100755 --- a/htdocs/view/cust_pkg.cgi +++ b/htdocs/view/cust_pkg.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: cust_pkg.cgi,v 1.8 1999-02-28 00:04:01 ivan Exp $ +# $Id: cust_pkg.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $ # # Usage: cust_pkg.cgi pkgnum # http://server.name/path/cust_pkg.cgi?pkgnum @@ -24,7 +24,10 @@ # no FS::Search ivan@sisd.com 98-mar-7 # # $Log: cust_pkg.cgi,v $ -# Revision 1.8 1999-02-28 00:04:01 ivan +# Revision 1.9 1999-04-08 12:00:19 ivan +# aesthetic update +# +# Revision 1.8 1999/02/28 00:04:01 ivan # removed misleading comments # # Revision 1.7 1999/01/19 05:14:20 ivan @@ -54,7 +57,7 @@ use Date::Format; use CGI; use CGI::Carp qw(fatalsToBrowser); use FS::UID qw(cgisuidsetup); -use FS::CGI qw(popurl header); +use FS::CGI qw(popurl header menubar ntable table); use FS::Record qw(qsearch qsearchs); use FS::part_svc; use FS::cust_pkg; @@ -70,8 +73,6 @@ foreach $part_svc ( qsearch('part_svc',{}) ) { $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi"; } -print $cgi->header( '-expires' => 'now' ), header('Package View', ''); - ($query) = $cgi->keywords; $query =~ /^(\d+)$/; $pkgnum = $1; @@ -81,10 +82,11 @@ $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); die "No package!" unless $cust_pkg; $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')}); -#nav bar $custnum = $cust_pkg->getfield('custnum'); -print qq!
View this customer!, - qq! (#$custnum) | Main menu

!; +print $cgi->header( '-expires' => 'now' ), header('Package View', menubar( + "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum", + 'Main Menu' => popurl(2) +)); #print info ($susp,$cancel,$expire)=( @@ -92,67 +94,63 @@ print qq!
View this customer!, $cust_pkg->getfield('cancel'), $cust_pkg->getfield('expire'), ); -print "
Package #$pkgnum"; -print qq!
Package Information!; -print qq! | Service Information! unless $cancel; -print qq!
\n!; - ($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment')); -print qq!
Package Information!, - qq!!; -print qq!
Edit this information
!; -print "

Package: $pkg - $comment"; - ($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill')); -print "
Setup: ", $setup ? time2str("%D",$setup) : "(Not setup)" ,""; -print "
Next bill: ", $bill ? time2str("%D",$bill) : "" ,""; - -if ($susp) { - print "
Suspended: ", time2str("%D",$susp), ""; - print qq! Unsuspend! unless $cancel; -} else { - print qq!
Suspend! unless $cancel; -} - -if ($expire) { - print "
Expire: ", time2str("%D",$expire), ""; -} - print < - -Expire (date): - -END - -if ($cancel) { - print "
Cancelled: ", time2str("%D",$cancel), ""; -} else { - print qq!
Cancel now!; -} - -#otaker $otaker = $cust_pkg->getfield('otaker'); -print "

Order taken by $otaker"; + +print "Package information"; +print ' (unsuspend)' if ( $susp && ! $cancel ); +print ' (suspend)' unless ( $susp || $cancel ); +print ' (cancel)' unless $cancel; + +print ntable("#c0c0c0"), '', ntable("#c0c0c0",2), + 'Package number', + $pkgnum, '', + 'Package', + $pkg, '', + 'Comment', + $comment, '', + 'Setup date', + ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '', + 'Next bill date', + ( $bill ? time2str("%D",$bill) : " " ), '', +; +print 'Suspension date', + time2str("%D",$susp), '' if $susp; +print 'Expiration date', + time2str("%D",$expire), '' if $expire; +print 'Cancellation date', + time2str("%D",$cancel), '' if $cancel; +print 'Order taker', + $otaker, '', + '' +; + +# print < +# +#Expire (date): +# +#END unless ($cancel) { #services - print <

Service Information -
Click on service to view/edit/add service.

-
Do NOT pick the "Link to existing" option unless you are auditing!!!
-
- -END + print '
Service Information', table, + ; #list of services this pkgpart includes - my($pkg_svc,%pkg_svc); + my $pkg_svc; + my %pkg_svc = (); foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) { $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity; } #list of records from cust_svc - my($svcpart); + my $svcpart; foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) { my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc'); @@ -167,8 +165,9 @@ END my($cust_svc); if ( $cust_svc=shift @cust_svc ) { my($svcnum)=$cust_svc->svcnum; + my($label, $value, $svcdb) = $cust_svc->label; print < + END } else { print <"; - + print "
Service(View) $svc
(View) $svc: $value
", + "Choose (View) to view or edit an existing service
", + "Choose (Add) to setup a new service
", + "Choose (Link to existing) to link to a legacy (pre-Freeside) service", + "" + ; } #formatting diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi index 900dc56a8..a191c25dd 100755 --- a/htdocs/view/svc_acct.cgi +++ b/htdocs/view/svc_acct.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_acct.cgi,v 1.8 1999-02-28 00:04:02 ivan Exp $ +# $Id: svc_acct.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $ # # Usage: svc_acct.cgi svcnum # http://server.name/path/svc_acct.cgi?svcnum @@ -33,7 +33,10 @@ # displays arbitrary radius attributes ivan@sisd.com 98-aug-16 # # $Log: svc_acct.cgi,v $ -# Revision 1.8 1999-02-28 00:04:02 ivan +# Revision 1.9 1999-04-08 12:00:19 ivan +# aesthetic update +# +# Revision 1.8 1999/02/28 00:04:02 ivan # removed misleading comments # # Revision 1.7 1999/01/19 05:14:21 ivan @@ -63,7 +66,7 @@ use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum use CGI; use CGI::Carp qw( fatalsToBrowser ); use FS::UID qw( cgisuidsetup ); -use FS::CGI qw( header popurl ); +use FS::CGI qw( header popurl menubar); use FS::Record qw( qsearchs fields ); use FS::Conf; use FS::svc_acct; @@ -78,7 +81,6 @@ $cgi = new CGI; $conf = new FS::Conf; $mydomain = $conf->config('domain'); -#untaint svcnum ($query) = $cgi->keywords; $query =~ /^(\d+)$/; $svcnum = $1; @@ -90,83 +92,58 @@ $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 } ); die "Unkonwn svcpart" unless $part_svc; -print $cgi->header( '-expires' => 'now' ), header('Account View', ''); - $p = popurl(2); -if ($pkgnum || $custnum) { - print <View this package (#$pkgnum) | -View this customer (#$custnum) | -END -} else { - print <Cancel this (unaudited)account | -END -} - -print <Main menu

-Service #$svcnum -END +print $cgi->header( '-expires' => 'now' ), header('Account 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, +)); -print qq!
Edit this information!; #print qq!
Send account information!; -print qq!

General | Shell account | !; -print qq!SLIP/PPP account
!; - -#formatting -print qq!
General
!; - -#svc -print "Service: ", $part_svc->svc, ""; -#username -print "
Username: ", $svc_acct->username, ""; - -#password +print qq!Edit this information!, + "
Service #$svcnum", + "
Service: ", $part_svc->svc, "", + "

Username: ", $svc_acct->username, "" +; if (substr($svc_acct->_password,0,1) eq "*") { - print "
Password: (Login disabled)
"; + print "
Password: (Login disabled)"; } else { - print "
Password: (hidden)
"; + print "
Password: (hidden)"; } -# popnum -> svc_acct_pop record $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum}); - -#pop -print "POP: ", $svc_acct_pop->city, ", ", $svc_acct_pop->state, +print "
POP: ", $svc_acct_pop->city, ", ", $svc_acct_pop->state, " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "<\B>" if $svc_acct_pop; -#shell account -print qq!
!; if ($svc_acct->uid ne '') { - print "Shell account"; - print "
"; - print "Uid: ", $svc_acct->uid, ""; - print "
Gid: ", $svc_acct->gid, ""; - - print qq!
Finger name: !, $svc_acct->finger, qq!
!; - - print "Home directory: ", $svc_acct->dir, "
"; - - print "Shell: ", $svc_acct->shell, "
"; - - print "Quota: ", $svc_acct->quota, " (unimplemented)"; + print "

Uid: ", $svc_acct->uid, "", + "
Gid: ", $svc_acct->gid, "", + "
Finger name: ", $svc_acct->finger, "", + "
Home directory: ", $svc_acct->dir, "", + "
Shell: ", $svc_acct->shell, "", + "
Quota: ", $svc_acct->quota, " (unimplemented)" + ; } else { - print "No shell account."; + print "

(No shell account)"; } -# SLIP/PPP -print qq!
!; if ($svc_acct->slipip) { - print "SLIP/PPP account
"; - print "IP address: ", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "(Dynamic)" : $svc_acct->slipip ,""; + print "

IP address: ", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "(Dynamic)" : $svc_acct->slipip ,""; my($attribute); foreach $attribute ( grep /^radius_/, fields('svc_acct') ) { #warn $attribute; @@ -176,15 +153,8 @@ if ($svc_acct->slipip) { print "
Radius $pattribute: ". $svc_acct->getfield($attribute), ""; } } else { - print "No SLIP/PPP account" + print "

(No SLIP/PPP account)"; } -print "
"; - - #formatting - print < - -END +print ""; diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi index 89ca6be6b..51fbc0351 100755 --- a/htdocs/view/svc_acct_sm.cgi +++ b/htdocs/view/svc_acct_sm.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_acct_sm.cgi,v 1.9 1999-02-28 00:04:03 ivan Exp $ +# $Id: svc_acct_sm.cgi,v 1.10 1999-04-08 12:00:19 ivan Exp $ # # Usage: svc_acct_sm.cgi svcnum # http://server.name/path/svc_acct_sm.cgi?svcnum @@ -20,7 +20,10 @@ # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17 # # $Log: svc_acct_sm.cgi,v $ -# Revision 1.9 1999-02-28 00:04:03 ivan +# Revision 1.10 1999-04-08 12:00:19 ivan +# aesthetic update +# +# Revision 1.9 1999/02/28 00:04:03 ivan # removed misleading comments # # Revision 1.8 1999/02/09 09:23:00 ivan @@ -53,7 +56,7 @@ use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc $svc $svc_domain $domain $svc_acct $username ); use CGI; use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header popurl); +use FS::CGI qw(header popurl menubar ); use FS::Record qw(qsearchs); use FS::Conf; use FS::svc_acct_sm; @@ -69,7 +72,6 @@ cgisuidsetup($cgi); $conf = new FS::Conf; $mydomain = $conf->config('domain'); -#untaint svcnum ($query) = $cgi->keywords; $query =~ /^(\d+)$/; $svcnum = $1; @@ -89,25 +91,17 @@ if ($pkgnum) { $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unkonwn svcpart" unless $part_svc; -print $cgi->header( '-expires' => 'now' ), header('Mail Alias View'); - $p = popurl(2); -if ($pkgnum || $custnum) { - print <View this package (#$pkgnum) | -View this customer (#$custnum) | -END -} else { - print <Cancel this (unaudited)account | -END -} - -print <Main menu
- Service #$svcnum -

Edit this information -END +print $cgi->header( '-expires' => 'now' ), header('Mail Alias 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, +)); ($domsvc,$domuid,$domuser) = ( $svc_acct_sm->domsvc, @@ -120,20 +114,10 @@ $domain = $svc_domain->domain; $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid}); $username = $svc_acct->username; -#formatting -print qq!

!; - -#svc -print "Service: $svc"; - -print "

"; - -print qq!Mail to !, ( ($domuser eq '*') ? "(anything)" : $domuser ) , qq!\@$domain forwards to $username\@$mydomain mailbox.!; - - #formatting - print < - -END +print qq!Edit this information!, + "
Service #$svcnum", + "
Service: $svc", + qq!
Mail to !, ( ($domuser eq '*') ? "(anything)" : $domuser ) , qq!\@$domain forwards to $username\@$mydomain mailbox.!, + '' +; diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi index 84fa9db0b..90526973d 100755 --- a/htdocs/view/svc_domain.cgi +++ b/htdocs/view/svc_domain.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_domain.cgi,v 1.8 1999-02-28 00:04:04 ivan Exp $ +# $Id: svc_domain.cgi,v 1.9 1999-04-08 12:00:19 ivan Exp $ # # Usage: svc_domain svcnum # http://server.name/path/svc_domain.cgi?svcnum @@ -13,7 +13,10 @@ # bmccane@maxbaud.net 98-apr-3 # # $Log: svc_domain.cgi,v $ -# Revision 1.8 1999-02-28 00:04:04 ivan +# Revision 1.9 1999-04-08 12:00:19 ivan +# aesthetic update +# +# Revision 1.8 1999/02/28 00:04:04 ivan # removed misleading comments # # Revision 1.7 1999/02/23 08:09:25 ivan @@ -43,7 +46,7 @@ use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum $cust_pkg $custnum $part_svc $p ); use CGI; use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header menubar popurl); +use FS::CGI qw(header menubar popurl menubar); use FS::Record qw(qsearchs); use FS::svc_domain; use FS::cust_svc; @@ -53,47 +56,41 @@ use FS::part_svc; $cgi = new CGI; cgisuidsetup($cgi); -#untaint svcnum ($query) = $cgi->keywords; $query =~ /^(\d+)$/; $svcnum = $1; $svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum}); die "Unknown svcnum" unless $svc_domain; -$domain = $svc_domain->domain; $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 } ); die "Unkonwn svcpart" unless $part_svc; +$domain = $svc_domain->domain; + $p = popurl(2); print $cgi->header( '-expires' => 'now' ), header('Domain 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, - "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", - "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", -)), <Service #$svcnum - -END - -print "

"; -print "Service: ", $part_svc->svc, ""; -print "
"; - -print qq!Domain name $domain.!; -print qq!

View whois information.!; - -print "

"; - - #formatting - print < - -END - +)), + "Service #$svcnum", + "
Service: ", $part_svc->svc, "", + "
Domain name: $domain.", + qq!

View whois information.!, + '', +;