X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Frouter.cgi;h=a2fa46dd9016fbe6e485001f34d68b0e6cb1f05c;hb=a5a258c91c5dc78897d16627b8092385ceb4c4d2;hp=c0cb884f06cd929db46d8cb9f3930e37258e03c2;hpb=0354f39ed0e74fd2eae1d9da13906625b4f56591;p=freeside.git

diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
index c0cb884f0..a2fa46dd9 100644
--- a/httemplate/edit/process/router.cgi
+++ b/httemplate/edit/process/router.cgi
@@ -1,8 +1,5 @@
 <%
 
-use FS::UID qw(dbh);
-
-my $dbh = dbh;
 local $FS::UID::AutoCommit=0;
 
 sub check {
@@ -10,7 +7,7 @@ sub check {
   if($error) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(3) . "edit/router.cgi?". $cgi->query_string);
-    $dbh->rollback;
+    dbh->rollback;
     exit;
   }
 }
@@ -19,28 +16,26 @@ my $error = '';
 my $routernum  = $cgi->param('routernum');
 my $routername = $cgi->param('routername');
 my $old = qsearchs('router', { routernum => $routernum });
-my @old_rf;
 my @old_psr;
 
 my $new = new FS::router {
-    routernum  => $routernum,
-    routername => $routername,
-    svcnum     => 0
-    };
+  map {
+    ($_, scalar($cgi->param($_)));
+  } fields('router')
+};
 
 if($old) {
-  if($old->routername ne $new->routername) {
-    $error = $new->replace($old);
-  } #else do nothing
+  $error = $new->replace($old);
 } else {
   $error = $new->insert;
+  $routernum = $new->routernum;
 }
 
 check($error);
 
 if ($old) {
   @old_psr = $old->part_svc_router;
-  foreach $psr (@old_psr) {
+  foreach my $psr (@old_psr) {
     if($cgi->param('svcpart_'.$psr->svcpart) eq 'ON') {
       # do nothing
     } else {
@@ -48,21 +43,6 @@ if ($old) {
     }
   }
   check($error);
-  @old_rf = $old->router_field;
-  foreach $rf (@old_rf) {
-    if(my $new_val = $cgi->param('rf_'.$rf->routerfieldpart)) {
-      if($new_val ne $rf->value) {
-        my $new_rf = new FS::router_field 
-	  { routernum       => $routernum,
-	    value           => $new_val,
-	    routerfieldpart => $rf->routerfieldpart };
-	$error = $new_rf->replace($rf);
-      } #else do nothing
-    } else {
-      $error = $rf->delete;
-    }
-    check($error);
-  }
 }
 
 foreach($cgi->param) {
@@ -76,25 +56,12 @@ foreach($cgi->param) {
       $error = $new_psr->insert;
     }
     check($error);
-  } elsif($cgi->param($_) ne '' and /^rf_(\d+)$/) {
-    my $part = $1;
-    if(my @x = grep {$_->routerfieldpart == $part} @old_rf) {
-      # already handled all of these
-    } else {
-      my $new_rf = new FS::router_field
-        { routernum       => $routernum,
-	  value           => $cgi->param('rf_'.$part),
-	  routerfieldpart => $part };
-      $error = $new_rf->insert;
-      check($error);
-    }
   }
 }
 
 
-
 # Yay, everything worked!
-$dbh->commit or die $dbh->errstr;
-print $cgi->redirect(popurl(3). "edit/router.cgi?$routernum");
+dbh->commit or die dbh->errstr;
+print $cgi->redirect(popurl(3). "browse/router.cgi");
 
 %>