new call rate editor (VoIP/telephony)

[freeside.git] / httemplate / edit / process / cust_main_county-expand.cgi

diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index a452711..4e04f37 100755 (executable)
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,22 +1,25 @@
-<%
+<% include('/elements/header-popup.html', 'Addition successful' ) %>
+
+<SCRIPT TYPE="text/javascript">
+  window.top.location.reload();
+</SCRIPT>
+
+</BODY>
+</HTML>
+<%init>
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
 my $taxnum = $1;
 my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
-my @expansion;
-if ( $cgi->param('delim') eq 'n' ) {
-  @expansion=split(/\n/,$cgi->param('expansion'));
-} elsif ( $cgi->param('delim') eq 's' ) {
-  @expansion=split(' ',$cgi->param('expansion'));
-} else {
-  die "Illegal delim!";
-}
+my @expansion = split /[\n\r]{1,2}/, $cgi->param('expansion');
+#warn scalar(@expansion);
+#warn "$_: $expansion[$_]\n" foreach (0..$#expansion);
 
 @expansion=map {
   unless ( /^\s*([\w\- ]+)\s*$/ ) {
-    $cgi->param('error', "Illegal item in expansion");
+    $cgi->param('error', "Illegal item in expansion: $_");
     print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
     myexit();
   }
@@ -34,11 +37,7 @@ foreach ( @expansion) {
   } else {
     $new->setfield('county',$_);
   }
-  #if (datasrc =~ m/Pg/)
-  #{
-  #    $new->setfield('tax',0.0);
-  #}
-  my($error)=$new->insert;
+  my $error = $new->insert;
   die $error if $error;
 }
 
@@ -49,10 +48,8 @@ unless ( qsearch( 'cust_main', {
                                } )
          || ! @expansion
 ) {
-  my($error)=($cust_main_county->delete);
+  my $error = $cust_main_county->delete;
   die $error if $error;
 }
 
-print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-
-%>
+</%init>