X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct_sm.cgi;h=0fd5f76224883f5430121bea4e475b2c5e58fa1d;hb=8fe3fe6ae4075fab902685fd145c48122baedfcb;hp=34846f9f392f6a3c9fd0ae8c3243dd1e9efaca52;hpb=3d671921441ba8422650b54435a1959ad1d4c71d;p=freeside.git

diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 34846f9f3..0fd5f7622 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,23 +1,10 @@
+<!-- mason kludge -->
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
-             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
-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_sm;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct_sm );
 if ( $cgi->param('error') ) {
   $svc_acct_sm = new FS::svc_acct_sm ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
@@ -25,8 +12,8 @@ if ( $cgi->param('error') ) {
   $svcnum = $svc_acct_sm->svcnum;
   $pkgnum = $cgi->param('pkgnum');
   $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+  #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  #die "No part_svc entry!" unless $part_svc;
 } else {
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
@@ -40,8 +27,8 @@ if ( $cgi->param('error') ) {
     $pkgnum=$cust_svc->pkgnum;
     $svcpart=$cust_svc->svcpart;
   
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    #die "No part_svc entry!" unless $part_svc;
 
   } else { #adding
 
@@ -51,36 +38,38 @@ if ( $cgi->param('error') ) {
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    my $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_acct_sm') ) {
-      if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
-        $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_acct_sm->setfield( $part_svc_column->columnname,
+                              $part_svc_column->columnvalue,
+                            );
     }
 
   }
 }
-$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
+my $action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
 
+my %username = ();
+my %domain = ();
 if ($pkgnum) {
 
   #find all possible uids (and usernames)
 
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+  my @u_acct_svcparts = ();
+  foreach my $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}) ) {
+  foreach my $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 
@@ -96,8 +85,8 @@ if ($pkgnum) {
 
   #find all possible domains (and domsvc's)
 
-  my($d_part_svc,@d_acct_svcparts);
-  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+  my @d_acct_svcparts = ();
+  foreach my $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
@@ -125,8 +114,8 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
+my $p1 = popurl(1);
+print header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -149,7 +138,7 @@ print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 #svcpart
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
 
-($domuser,$domsvc,$domuid)=(
+my($domuser,$domsvc,$domuid)=(
   $svc_acct_sm->domuser,
   $svc_acct_sm->domsvc,
   $svc_acct_sm->domuid,