diff options
author | ivan <ivan> | 1999-04-14 07:47:53 +0000 |
---|---|---|
committer | ivan <ivan> | 1999-04-14 07:47:53 +0000 |
commit | a4cdd045fcb3edab2b49d5603e02ce5683a778af (patch) | |
tree | 6ea7e099cd313d857f29377866c217cc6dd63d6c /htdocs/edit | |
parent | 6acd692c933d5d47459114b400e04c5a3675335b (diff) |
i18n fixes
Diffstat (limited to 'htdocs/edit')
-rwxr-xr-x | htdocs/edit/cust_main.cgi | 22 | ||||
-rwxr-xr-x | htdocs/edit/process/cust_main.cgi | 10 |
2 files changed, 21 insertions, 11 deletions
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi index d144beba6..813c4b54f 100755 --- a/htdocs/edit/cust_main.cgi +++ b/htdocs/edit/cust_main.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: cust_main.cgi,v 1.13 1999-04-09 03:52:55 ivan Exp $ +# $Id: cust_main.cgi,v 1.14 1999-04-14 07:47:53 ivan Exp $ # # Usage: cust_main.cgi custnum # http://server.name/path/cust_main.cgi?custnum @@ -38,7 +38,10 @@ # fixed one missed day->daytime ivan@sisd.com 98-jul-13 # # $Log: cust_main.cgi,v $ -# Revision 1.13 1999-04-09 03:52:55 ivan +# Revision 1.14 1999-04-14 07:47:53 ivan +# i18n fixes +# +# Revision 1.13 1999/04/09 03:52:55 ivan # explicit & for table/itable/ntable # # Revision 1.12 1999/04/06 11:16:16 ivan @@ -115,9 +118,12 @@ if ( $cgi->param('error') ) { map { $_, scalar($cgi->param($_)) } fields('cust_main') } ); $custnum = $cust_main->custnum; - $pkgpart = $cgi->param('pkgpart_svcpart'); - $pkgpart =~ /^(\d+)_/; - $pkgpart = $1; + $pkgpart = $cgi->param('pkgpart_svcpart') || ''; + if ( $pkgpart =~ /^(\d+)_/ ) { + $pkgpart = $1; + } else { + $pkgpart = ''; + } $username = $cgi->param('username'); $password = $cgi->param('_password'); $popnum = $cgi->param('popnum'); @@ -385,9 +391,9 @@ unless ( $custnum ) { foreach my $part_pkg ( @part_pkg ) { print qq!<OPTION VALUE="!, - $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"', - " SELECTED"x($part_pkg->pkgpart == $pkgpart), - ">", $part_pkg->pkg, " - ", $part_pkg->comment; + $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"'; + print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart ); + print ">", $part_pkg->pkg, " - ", $part_pkg->comment; } print "</SELECT></TD></TR>"; diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi index 729bed7c4..a66432ad1 100755 --- a/htdocs/edit/process/cust_main.cgi +++ b/htdocs/edit/process/cust_main.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: cust_main.cgi,v 1.9 1999-04-07 15:22:19 ivan Exp $ +# $Id: cust_main.cgi,v 1.10 1999-04-14 07:47:53 ivan Exp $ # # Usage: post form to: # http://server.name/path/cust_main.cgi @@ -20,7 +20,10 @@ # bmccane@maxbaud.net 98-apr-3 # # $Log: cust_main.cgi,v $ -# Revision 1.9 1999-04-07 15:22:19 ivan +# Revision 1.10 1999-04-14 07:47:53 ivan +# i18n fixes +# +# Revision 1.9 1999/04/07 15:22:19 ivan # don't use anchor in redirect # # Revision 1.8 1999/03/25 13:55:10 ivan @@ -68,7 +71,8 @@ $cgi->param('tax','') unless defined($cgi->param('tax')); $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] ); -$cgi->param('state') =~ /^(\w+)( \((\w+)\))? \/ (\w+)$/; +$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ + or die "Oops, illegal \"state\" param: ". $cgi->param('state'); $cgi->param('state', $1); $cgi->param('county', $3 || ''); $cgi->param('country', $4); |