From 0f6dcbb5c3e51dc9caa8fe44d03991ad998f8319 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:48:28 +0000
Subject: 1.5.0

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6ec108c02..b97142734 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.1beta1
-TAG=freeside_1_4_1beta1
+VERSION=1.5.0pre1
+TAG=freeside_1_5_0pre1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -170,7 +170,7 @@ upload-docs: forcehtmlman
 	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 release: upload-docs
-	cd /home/ivan/freeside_current
+	cd /home/ivan/freeside
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
-- 
cgit v1.2.1


From 2488e8c0b94101a8015369e10e37de660f662f5f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:48:52 +0000
Subject: doc

---
 FS/FS.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS.pm b/FS/FS.pm
index c22557a2d..a2df6f175 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -185,7 +185,7 @@ first time, the suggested order will tend to reduce the number of forward
 references."
 
 If you've never used OO modules before,
-http://www.cpan.org/doc/FMTEYEWTK/easy_objects.html might help you out.
+http://www.perl.com/doc/FMTEYEWTK/easy_objects.html might help you out.
 
 =head1 DESCRIPTION
 
-- 
cgit v1.2.1


From e2a6a581a52e61521cc86140cb4ef57a3af84f48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:49:10 +0000
Subject: installing into /usr/bin, bah

---
 FS/Makefile.PL | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FS/Makefile.PL b/FS/Makefile.PL
index ab4c2281b..1647f8eef 100644
--- a/FS/Makefile.PL
+++ b/FS/Makefile.PL
@@ -5,4 +5,6 @@ WriteMakefile(
     'NAME'	   => 'FS',
     'VERSION_FROM' => 'FS.pm', # finds $VERSION
     'EXE_FILES'    => [ glob 'bin/*' ],
+    'INSTALLSCRIPT'  => '/usr/local/bin',
+    'INSTALLSITEBIN' => '/usr/local/bin',
 );
-- 
cgit v1.2.1


From bfd2c9a7e80f665beca0254065d3f3c7945c23ca Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 20 Sep 2002 15:49:19 +0000
Subject: d

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 2951ceeab..44692e6f9 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Freeside
 
-Copyright (C) 2000,2001 Ivan Kohler
+Copyright (C) 2000,2001,2002 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
 All rights reserved
 
-- 
cgit v1.2.1


From 8965012fa53fd05d851d2f5abed4e056ab758797 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Sep 2002 11:17:39 +0000
Subject: all taxes now have names.  closes: Bug#15

---
 FS/FS/cust_bill.pm                           |  20 ++++++++++++++------
 FS/FS/cust_bill_pkg.pm                       |   5 ++++-
 FS/FS/cust_main.pm                           |  24 +++++++++++++++---------
 FS/FS/cust_main_county.pm                    |   3 +++
 FS/bin/freeside-setup                        |  22 ++++++++++++++++++++--
 README.1.5.0pre1                             |   3 +++
 bin/create-history-tables                    |  13 +++++++++++--
 httemplate/browse/cust_main_county.cgi       |  11 ++++++++++-
 httemplate/docs/schema.dia                   | Bin 14438 -> 14438 bytes
 httemplate/docs/schema.html                  |   2 ++
 httemplate/edit/cust_main_county.cgi         |   5 ++++-
 httemplate/edit/process/cust_main_county.cgi |  17 +++++++++--------
 12 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 258b32e15..f0667258c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -510,10 +510,13 @@ sub send_csv {
         time2str("%x", $cust_bill_pkg->edate),
       );
 
-    } else { #pkgnum Tax
+    } else { #pkgnum tax
       next unless $cust_bill_pkg->setup != 0;
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                       ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+                       : 'Tax';
       ($pkg, $setup, $recur, $sdate, $edate) =
-        ( 'Tax', sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
+        ( $itemdesc, sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
     }
 
     $csv->combine(
@@ -858,7 +861,9 @@ sub print_text {
   }
 
   #new charges
-  foreach ( $self->cust_bill_pkg ) {
+  foreach ( ( grep {   $_->pkgnum } $self->cust_bill_pkg ),  #packages first
+            ( grep { ! $_->pkgnum } $self->cust_bill_pkg ),  #then taxes
+  ) {
 
     if ( $_->pkgnum ) {
 
@@ -882,8 +887,11 @@ sub print_text {
           map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
-    } else { #pkgnum Tax
-      push @buf,["Tax", $money_char. sprintf("%10.2f",$_->setup) ] 
+    } else { #pkgnum tax
+      my $itemdesc = defined $_->dbdef_table->column('itemdesc')
+                     ? ( $_->itemdesc || 'Tax' )
+                     : 'Tax';
+      push @buf,[$itemdesc, $money_char. sprintf("%10.2f",$_->setup) ] 
         if $_->setup != 0;
     }
   }
@@ -1031,7 +1039,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.45 2002-09-17 10:21:47 ivan Exp $
+$Id: cust_bill.pm,v 1.46 2002-09-21 11:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 72f9ce4a9..5a1dcd2aa 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -47,6 +47,8 @@ supported:
 
 =item edate - ending date of recurring fee
 
+=item itemdesc - Line item description (currentlty used only when pkgnum is 0)
+
 =back
 
 sdate and edate are specified as UNIX timestamps; see L<perlfunc/"time">.  Also
@@ -111,6 +113,7 @@ sub check {
       || $self->ut_money('recur')
       || $self->ut_numbern('sdate')
       || $self->ut_numbern('edate')
+      || $self->ut_textn('itemdesc')
   ;
   return $error if $error;
 
@@ -140,7 +143,7 @@ sub cust_pkg {
 
 =head1 VERSION
 
-$Id: cust_bill_pkg.pm,v 1.3 2002-04-06 22:32:43 ivan Exp $
+$Id: cust_bill_pkg.pm,v 1.4 2002-09-21 11:17:39 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 84fd3d150..2701ac35d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -904,10 +904,12 @@ sub bill {
   my( $total_setup, $total_recur ) = ( 0, 0 );
   #my( $taxable_setup, $taxable_recur ) = ( 0, 0 );
   my @cust_bill_pkg = ();
-  my $tax = 0;##
+  #my $tax = 0;##
   #my $taxable_charged = 0;##
   #my $charged = 0;##
 
+  my %tax;
+
   foreach my $cust_pkg (
     qsearch('cust_pkg', { 'custnum' => $self->custnum } )
   ) {
@@ -1101,7 +1103,10 @@ sub bill {
           } #if $cust_main_county->exempt_amount
 
           $taxable_charged = sprintf( "%.2f", $taxable_charged);
-          $tax += $taxable_charged * $cust_main_county->tax / 100
+
+          #$tax += $taxable_charged * $cust_main_county->tax / 100
+          $tax{ $cust_main_county->taxname || 'Tax' } +=
+            $taxable_charged * $cust_main_county->tax / 100
 
         } #unless $self->tax =~ /Y/i
           #       || $self->payby eq 'COMP'
@@ -1134,16 +1139,17 @@ sub bill {
 #      $taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
 #    );
 
-  $tax = sprintf("%.2f", $tax);
-  if ( $tax > 0 ) {
+  foreach my $taxname ( grep { $tax{$_} > 0 } keys %tax ) {
+    my $tax = sprintf("%.2f", $tax{$taxname} );
     $charged = sprintf( "%.2f", $charged+$tax );
 
     my $cust_bill_pkg = new FS::cust_bill_pkg ({
-      'pkgnum' => 0,
-      'setup'  => $tax,
-      'recur'  => 0,
-      'sdate'  => '',
-      'edate'  => '',
+      'pkgnum'   => 0,
+      'setup'    => $tax,
+      'recur'    => 0,
+      'sdate'    => '',
+      'edate'    => '',
+      'itemdesc' => $taxname,
     });
     push @cust_bill_pkg, $cust_bill_pkg;
   }
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index e41564d21..d8796e451 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -61,6 +61,8 @@ currently supported:
 
 =item exempt_amount
 
+=item taxname - if defined, printed on invoices instead of "Tax"
+
 =back
 
 =head1 METHODS
@@ -110,6 +112,7 @@ sub check {
     || $self->ut_float('tax')
     || $self->ut_textn('taxclass') # ...
     || $self->ut_money('exempt_amount')
+    || $self->ut_textn('taxname')
   ;
 
 }
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index e8bb7ec62..f6a543fc8 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -189,7 +189,23 @@ foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
                        'default' => '',
                        'local'   => '',
                      } ),
-                     map { $tableobj->column($_) } $tableobj->columns
+                     map {
+                       my $column = $tableobj->column($_);
+
+                       #clone so as to not disturb the original
+                       $column = DBIx::DBSchema::Column->new( {
+                         map { $_ => $column->$_() }
+                           qw( name type null length default local )
+                       } );
+
+                       $column->type('int')
+                         if $column->type eq 'serial';
+                       #$column->default('')
+                       #  if $column->default =~ /^nextval\(/i;
+                       #( my $local = $column->local ) =~ s/AUTO_INCREMENT//i;
+                       #$column->local($local);
+                       $column;
+                     } $tableobj->columns
                    ],
   } );
   $dbdef->addtable($h_tableobj);
@@ -397,9 +413,10 @@ sub tables_hash_hack {
         'recur',   @money_type,
         'sdate',   @date_type,
         'edate',   @date_type,
+        'itemdesc', 'varchar', 'NULL', $char_d,
       ],
       'primary_key' => '',
-      'unique' => [ ['pkgnum', 'invnum'] ],
+      'unique' => [],
       'index' => [ ['invnum'] ],
     },
 
@@ -504,6 +521,7 @@ sub tables_hash_hack {
         'taxclass',   'varchar', 'NULL', $char_d,
         'exempt_amount', @money_type,
         'tax',      'real',  '',    '', #tax %
+        'taxname',  'varchar',  'NULL',    $char_d,
       ],
       'primary_key' => 'taxnum',
       'unique' => [],
diff --git a/README.1.5.0pre1 b/README.1.5.0pre1
index ff3e5a6cc..57fc36af6 100644
--- a/README.1.5.0pre1
+++ b/README.1.5.0pre1
@@ -4,6 +4,9 @@ schema changes:
   *** get svc_broadband changes from pc-intouch
   *** otaker changes s/8/32 all otkaer fields
   *** optional: sequence changes
+  *** add column cust_main_county.taxname
+  *** add column cust_bill_pkg.itemdesc
+  *** drop index cust_bill_pkg1
 
 install DBIx::DBSchema 0.21
 install NetAddr::IP
diff --git a/bin/create-history-tables b/bin/create-history-tables
index d37d682d8..33eb0e5a3 100755
--- a/bin/create-history-tables
+++ b/bin/create-history-tables
@@ -2,7 +2,7 @@
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.20;
+use DBIx::DBSchema 0.21;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
@@ -64,7 +64,16 @@ foreach my $table ( @tables ) {
                        'default' => '',
                        'local'   => '',
                      } ),
-                     map { $tableobj->column($_) } $tableobj->columns
+                     map {
+                       my $column = $tableobj->column($_);
+                       $column->type('int')
+                         if $column->type eq 'serial';
+                       $column->default('')
+                         if $column->default =~ /^nextval\(/i;
+                       ( my $local = $column->local ) =~ s/AUTO_INCREMENT//i;
+                       $column->local($local);
+                       $column;
+                     } $tableobj->columns
                    ],
   } );
   foreach my $statement ( $h_tableobj->sql_create_table($dbh) ) {
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 991606087..c2473c4c8 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -21,7 +21,8 @@ print '<BR><BR>'. &table(). <<END;
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH>County</TH>
-        <TH>Taxclass</TH>
+        <TH>Taxclass<BR><FONT SIZE=-1>(per-package classification)</FONT></TH>
+        <TH>Tax name<BR><FONT SIZE=-1>(printed on invoices)</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
         <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
@@ -111,6 +112,14 @@ END
   }
   print "</TD>";
 
+  print "<TD";
+  if ( $hashref->{taxname} ) {
+    print ' BGCOLOR="#ffffff">'. $hashref->{taxname};
+  } else {
+    print ' BGCOLOR="#cccccc">Tax';
+  }
+  print "</TD>";
+
   print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>".
         '<TD BGCOLOR="#ffffff">$'.
           sprintf("%.2f", $hashref->{exempt_amount} || 0). '</TD>'.
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
index c0842a602..746561550 100644
Binary files a/httemplate/docs/schema.dia and b/httemplate/docs/schema.dia differ
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index 54adec3a7..c518d4a4d 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -57,6 +57,7 @@
         <li>recur - recurring fee
         <li>sdate - starting date
         <li>edate - ending date
+        <li>itemdesc - Line item description (currently used only when pkgnum is 0)
       </ul>
     <li><a name="cust_credit" href="man/FS/cust_credit.html">cust_credit</a> - Credits.  The equivalent of a negative <a href="#cust_bill">cust_bill</a> record.
       <ul>
@@ -133,6 +134,7 @@
         <li>tax - % rate
         <li>taxclass
         <li>exempt_amount
+        <li>taxname - if defined, printed on invoices instead of "Tax"
       </ul>
     <li><a name="cust_tax_exempt" href="man/FS/cust_tax_exempt.html">cust_tax_exempt</a> - Tax exemption record
       <ul>
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 7ef37a48d..f3d28825a 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -15,7 +15,8 @@ print qq!<FORM ACTION="!, popurl(1),
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH><FONT SIZE=-1>County</FONT></TH>
-        <TH><FONT SIZE=-1>Taxclass</FONT></TH>
+        <TH><FONT SIZE=-1>Taxclass</FONT><BR><FONT SIZE=-2>(per-package classification)</FONT></TH>
+        <TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
         <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
@@ -46,6 +47,8 @@ END
       : ' BGCOLOR="#cccccc">(ALL)'
     , "</TD>";
 
+  print qq!<TD><INPUT TYPE="text" NAME="taxname!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!;
   print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
         qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
   print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 990a23919..6d80ad512 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -2,17 +2,18 @@
 
 foreach ( grep { /^tax\d+$/ } $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
-  my($taxnum)=$1;
-  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  my $taxnum = $1;
+  my $old = qsearchs('cust_main_county', { 'taxnum' => $taxnum })
     or die "Couldn't find taxnum $taxnum!";
-  my $exempt_amount = $cgi->param("exempt_amount$taxnum");
-  next unless $old->tax ne $cgi->param("tax$taxnum")
-              || $old->exempt_amount ne $exempt_amount;
+  next unless    $old->tax           != $cgi->param("tax$taxnum")
+              || $old->exempt_amount != $cgi->param("exempt_amount$taxnum")
+              || $old->taxname       ne $cgi->param("taxname$taxnum");
   my %hash = $old->hash;
   $hash{tax} = $cgi->param("tax$taxnum");
-  $hash{exempt_amount} = $exempt_amount;
-  my($new)=new FS::cust_main_county \%hash;
-  my($error)=$new->replace($old);
+  $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum");
+  $hash{taxname} = $cgi->param("taxname$taxnum");
+  my $new = new FS::cust_main_county \%hash;
+  my $error = $new->replace($old);
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-- 
cgit v1.2.1


From f95dffea25ebcdac0b6a4e0355a3c087ea28de0c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Sep 2002 08:50:42 +0000
Subject: better default Pg datasource

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b97142734..6e9ef650b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+DATASOURCE = DBI:Pg:dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
 DB_USER = freeside
-- 
cgit v1.2.1


From 536d684c3e17375d45a5d62bc5d748fec0224860 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Sep 2002 14:27:28 +0000
Subject: global.asa changes for profiling redirects header-handling changes
 necessary for chart .cgis

---
 FS/FS/CGI.pm     |  34 +++++++++++++++-
 htetc/global.asa | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 htetc/handler.pl |   4 +-
 3 files changed, 143 insertions(+), 12 deletions(-)

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index e44ebcc0a..d69aad2fc 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -10,7 +10,7 @@ use FS::UID;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
-                small_custview myexit);
+                small_custview myexit http_header);
 
 =head1 NAME
 
@@ -68,6 +68,38 @@ END
   $x;
 }
 
+=item http_header
+
+Sets an http header.
+
+=cut
+
+sub http_header {
+  my ( $header, $value ) = @_;
+  if (exists $ENV{MOD_PERL}) {
+    if ( defined $main::Response
+         && $main::Response->isa('Apache::ASP::Response') ) {  #Apache::ASP
+      if ( $header =~ /^Content-Type$/ ) {
+        $main::Response->{ContentType} = $value;
+      } else {
+        $main::Response->AddHeader( $header => $value );
+      }
+    } elsif ( defined $HTML::Mason::Commands::r  ) { #Mason
+      ## is this the correct pacakge for $r ???  for 1.0x and 1.1x ?
+      if ( $header =~ /^Content-Type$/ ) {
+        $HTML::Mason::Commands::r->content_type($value);
+      } else {
+        $HTML::Mason::Commands::r->header_out( $header => $value );
+      }
+    } else {
+      die "http_header called in unknown environment";
+    }
+  } else {
+    die "http_header called not running under mod_perl";
+  }
+
+}
+
 =item menubar ITEM, URL, ...
 
 Returns an HTML menubar.
diff --git a/htetc/global.asa b/htetc/global.asa
index 3c8380fd4..4f1ca45d3 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -1,20 +1,26 @@
+#BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
+#BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); }
+use Devel::AutoProfiler;
+
 use strict;
 use vars qw( $cgi $p );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use Date::Parse;
+use Time::Local;
 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
 use IO::File;
 use String::Approx qw(amatch);
+use Chart::LinesPoints;
 use HTML::Widgets::SelectLayers 0.02;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-               small_custview myexit);
+               small_custview myexit http_header);
 use FS::Msgcat qw(gettext geterror);
 
 use FS::agent;
@@ -68,22 +74,113 @@ sub Script_OnStart {
   &cgisuidsetup($cgi);
   $p = popurl(2);
   #print $cgi->header( '-expires' => 'now' );
+  dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+
+  #really should check for FS::Profiler or something
+    # Devel::AutoProfiler _our_ VERSION?  thanks a fucking lot
+  if ( Devel::AutoProfiler->can('__recursively_fetch_subs_in_package') ) {
+    #should check to see it's my special version.  well, switch to FS::Profiler
+
+    #nicked from Devel::AutoProfiler::INIT
+    my %subs = Devel::AutoProfiler::__recursively_fetch_subs_in_package('main');
+
+
+    SUB : while( my ($name, $ref) = each(%subs) )
+      {
+        #next if $name =~ /^(main::)?Apache::/;
+        next unless $name =~ /FS/;
+        foreach my $sub (@Devel::AutoProfiler::do_not_instrument_this_sub)
+          {
+            if ($name =~ /$sub/)
+              {
+                next SUB;
+              }
+          }
+        next if ($Devel::AutoProfiler::do_not_instrument_this_sub{$name});
+        #warn "INIT name is $name \n";
+        Devel::AutoProfiler::__instrument_sub($name, $ref);
+      }
+
+  }
+
 }
 
 sub Script_OnFlush {
   my $ref = $Response->{BinaryRef};
-  $$ref = $cgi->header( @FS::CGI::header ) . $$ref;
+  #$$ref = $cgi->header( @FS::CGI::header ) . $$ref;
+  #$$ref = $cgi->header() . $$ref;
   if ( dbh->can('sprintProfile') ) {
-
-    $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
-      or warn "can't remove";
+    if ( lc($Response->{ContentType}) eq 'text/html' ) {
+      $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
+        or warn "can't remove";
   
-    #$$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
-    #  wtf?  konqueror...
-    $$ref .= '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()). '</PRE>';
+      #$$ref .= '<PRE>'. ("\n"x96). encode_entities(dbh->sprintProfile()). '</PRE>';
+      #  wtf?  konqueror...
+      $$ref .= '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
+               "\n\n". &sprintAutoProfile(). '</PRE>';
 
-    $$ref .= '</BODY></HTML>';
-    
+      $$ref .= '</BODY></HTML>';
+    }
     dbh->{'private_profile'} = {};
   }
 }
+
+if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+
+  #warn "enabling profiling redirects";
+  *CGI::redirect = sub {
+    my( $self, $location) = @_;
+    my $page =
+      $cgi->header.
+      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A><BR><BR>!.
+      '<PRE>'. encode_entities(dbh->sprintProfile()).
+      "\n\n". &sprintAutoProfile().  '</PRE>'.
+      '</BODY></HTML>';
+    dbh->{'private_profile'} = {};
+    return $page;
+  };
+
+}
+
+sub by_total_time 
+{ 
+  return $a->{total_time_in_sub} <=> $b->{total_time_in_sub}; 
+}
+
+sub sprintAutoProfile {
+  my %caller_info = %Devel::AutoProfiler::caller_info;
+  return unless keys %caller_info;
+
+  %Devel::AutoProfiler::caller_info = ();
+
+  my @keys = keys(%caller_info);
+
+  foreach my $key (@keys)
+    {
+      my $href = $caller_info{$key};
+
+      $href->{who_am_i} = $key;
+    }
+
+  my @subs = values(%caller_info);
+
+  #my @sorted = sort by_total_time ( @subs );
+  my @sorted = reverse sort by_total_time ( @subs );
+
+  # print Dumper \@sorted;
+
+  my @readable_info;
+
+  foreach my $sort (@sorted)
+    {
+      push(@readable_info, delete($sort->{who_am_i}));
+      push(@readable_info, $sort);
+    }
+
+  use Data::Dumper;
+  return encode_entities(Dumper(\@readable_info));
+
+}
+
+1;
+
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 49bcbc08c..d55ba3310 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -61,17 +61,19 @@ sub handler
       #use CGI::Carp qw(fatalsToBrowser);
       use Date::Format;
       use Date::Parse;
+      use Time::Local;
       use Tie::IxHash;
       use HTML::Entities;
       use IO::Handle;
       use IO::File;
       use String::Approx qw(amatch);
+      use Chart::LinesPoints;
       use HTML::Widgets::SelectLayers 0.02;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custview myexit);
+                     small_custview myexit http_header);
       use FS::Msgcat qw(gettext geterror);
 
       use FS::agent;
-- 
cgit v1.2.1


From c7c842f3767e8f11914d3b76c31de591854c9654 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Sep 2002 08:31:25 +0000
Subject: deprecate vpopmailrestart config value

---
 FS/FS/Conf.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e9defdafd..788127a7f 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -803,8 +803,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'vpopmailrestart',
-    'section'     => 'mail',
-    'description' => 'If defined, the shell commands to run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, add a <i>vpopmail</i> <a href="../browse/part_export.cgi">export</a> instead.  This option used to define the shell commands to run on vpopmail machines after files are copied.  An example can be found in eg/vpopmailrestart of the source distribution.',
     'type'        => 'textarea',
   },
 
-- 
cgit v1.2.1


From 7445e66a13a90015eb100d22aab90d0bc1c92ccd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Sep 2002 09:09:26 +0000
Subject: regenerate raddb.pm from freeradius-0.4 dicts add
 "Authentication-Type" for netc.net.au (radiator?)

---
 FS/FS/raddb.pm | 2081 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 1048 insertions(+), 1033 deletions(-)

diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
index 497d98450..a35a757f5 100644
--- a/FS/FS/raddb.pm
+++ b/FS/FS/raddb.pm
@@ -2,1090 +2,1105 @@ package FS::raddb;
 use vars qw(%attrib);
 
 %attrib = (
-  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
-  'h323_connect_time' => 'h323-connect-time',
-  'connect_rate' => 'Connect-Rate',
-  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp',
-  'usr_callback_type' => 'USR-Callback-Type',
-  'erx_primary_wins' => 'ERX-Primary-Wins',
-  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
-  'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
-  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
-  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
-  'dialback_name' => 'Dialback-Name',
-  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
-  'usr_host_type' => 'USR-Host-Type',
-  'le_modem_info' => 'LE-Modem-Info',
-  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
-  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
-  'ascend_ip_direct' => 'Ascend-IP-Direct',
-  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
-  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
-  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
-  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
-  'usr_igmp_robustness' => 'USR-IGMP-Robustness',
-  'ms_chap2_success' => 'MS-CHAP2-Success',
-  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
-  'acc_bridging_support' => 'Acc-Bridging-Support',
-  'annex_transmit_speed' => 'Annex-Transmit-Speed',
-  'old_password' => 'Old-Password',
-  'x_ascend_metric' => 'X-Ascend-Metric',
-  'acc_clearing_location' => 'Acc-Clearing-Location',
-  'ascend_multilink_id' => 'Ascend-Multilink-ID',
-  'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
-  'usr_bridging' => 'USR-Bridging',
-  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
-  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
-  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
-  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
-  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
-  'ascend_backup' => 'Ascend-Backup',
-  'usr_connect_time' => 'USR-Connect-Time',
-  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
-  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
-  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
-  'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
-  'cisco_nas_port' => 'Cisco-NAS-Port',
-  'le_admin_group' => 'LE-Admin-Group',
-  'annex_mrru' => 'Annex-MRRU',
-  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
-  'ascend_token_expiry' => 'Ascend-Token-Expiry',
-  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
-  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
-  'connect_info' => 'Connect-Info',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
-  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
-  'client_dns_pri' => 'Client_DNS_Pri',
-  'ip_host_addr' => 'Ip_Host_Addr',
-  'callback_id' => 'Callback-Id',
-  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets',
-  'acct_input_octets_64' => 'Acct_Input_Octets_64',
-  'tunnel_function' => 'Tunnel_Function',
-  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
-  'h323_incoming_conf_id' => 'h323-incoming-conf-id',
-  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
-  'ms_new_arap_password' => 'MS-New-ARAP-Password',
-  'h323_voice_quality' => 'h323-voice-quality',
-  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
-  'bind_int_interface_name' => 'Bind_Int_Interface_Name',
-  'event_timestamp' => 'Event-Timestamp',
-  'ascend_bir_enable' => 'Ascend-BIR-Enable',
-  'usr_fallback_enabled' => 'USR-Fallback-Enabled',
-  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
-  'acct_session_id' => 'Acct-Session-Id',
-  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
-  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
-  'usr_at_input_filter' => 'USR-AT-Input-Filter',
-  'erx_egress_statistics' => 'ERX-Egress-Statistics',
-  'x_ascend_call_type' => 'X-Ascend-Call-Type',
-  'acct_tunnel_client_endpo' => 'Acct-Tunnel-Client-Endpoint',
-  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
-  'ascend_if_netmask' => 'Ascend-IF-Netmask',
-  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
-  'usr_at_output_filter' => 'USR-AT-Output-Filter',
-  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
-  'rate_limit_rate' => 'Rate_Limit_Rate',
-  'prefix' => 'Prefix',
-  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
-  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
-  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
-  'group_name' => 'Group-Name',
-  'ascend_receive_secret' => 'Ascend-Receive-Secret',
-  'reply_message' => 'Reply-Message',
-  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
-  'framed_callback_id' => 'Framed-Callback-Id',
-  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
-  'stripped_user_name' => 'Stripped-User-Name',
-  'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
-  'annex_receive_speed' => 'Annex-Receive-Speed',
-  'ms_chap_domain' => 'MS-CHAP-Domain',
-  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
-  'usr_send_name' => 'USR-Send-Name',
-  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
-  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
-  'usr_fallback_limit' => 'USR-Fallback-Limit',
-  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
-  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
-  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
-  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
-  'annex_host_allow' => 'Annex-Host-Allow',
-  'x_ascend_force_56' => 'X-Ascend-Force-56',
-  'police_burst' => 'Police_Burst',
-  'pvc_profile_name' => 'PVC_Profile_Name',
-  'ms_filter' => 'MS-Filter',
-  'rate_limit_burst' => 'Rate_Limit_Burst',
-  'ascend_number_sessions' => 'Ascend-Number-Sessions',
-  'cisco_call_filter' => 'Cisco-Call-Filter',
-  'erx_igmp_enable' => 'ERX-Igmp-Enable',
-  'ascend_filter_required' => 'Ascend-Filter-Required',
-  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
-  'acc_callback_delay' => 'Acc-Callback-Delay',
-  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
-  'le_ip_pool' => 'LE-IP-Pool',
-  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
-  'x_ascend_group' => 'X-Ascend-Group',
-  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
-  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
-  'usr_esn' => 'USR-ESN',
-  'annex_user_level' => 'Annex-User-Level',
-  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
-  'no_such_attribute' => 'No-Such-Attribute',
-  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
-  'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
-  'usr_actual_voltage' => 'USR-Actual-Voltage',
-  'annex_acct_servers' => 'Annex-Acct-Servers',
-  'ascend_handle_ipx' => 'Ascend-Handle-IPX',
-  'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
-  'acc_service_profile' => 'Acc-Service-Profile',
-  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
-  'ascend_ckt_type' => 'Ascend-Ckt-Type',
-  'cisco_data_rate' => 'Cisco-Data-Rate',
-  'group' => 'Group',
-  'nas_port' => 'NAS-Port',
-  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
-  'tunnel_type' => 'Tunnel-Type',
-  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
-  'user_name_is_star' => 'User-Name-Is-Star',
-  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
-  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
-  'ascend_send_auth' => 'Ascend-Send-Auth',
-  'user_service_type' => 'User-Service-Type',
-  'annex_cli_filter' => 'Annex-CLI-Filter',
-  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
-  'ascend_call_direction' => 'Ascend-Call-Direction',
-  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
-  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
-  'tunnel_session_auth' => 'Tunnel_Session_Auth',
-  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
-  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
-  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
-  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
-  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
-  'login_host' => 'Login-Host',
-  'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
-  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
-  'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
-  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
-  'framed_protocol' => 'Framed-Protocol',
-  'login_callback_number' => 'Login-Callback-Number',
-  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
-  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
-  'proxy_state' => 'Proxy-State',
-  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
-  'cisco_data_filter' => 'Cisco-Data-Filter',
-  'cisco_target_util' => 'Cisco-Target-Util',
-  'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
-  'usr_blocks_resent' => 'USR-Blocks-Resent',
-  'usr_terminal_type' => 'USR-Terminal-Type',
-  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
-  'framed_routing' => 'Framed-Routing',
-  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
-  'ascend_atm_group' => 'Ascend-ATM-Group',
-  'bind_bypass_bypass' => 'Bind_Bypass_Bypass',
-  'le_ip_gateway' => 'LE-IP-Gateway',
-  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
-  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
-  'usr_request_type' => 'USR-Request-Type',
-  'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
-  'tunnel_domain' => 'Tunnel_Domain',
-  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
-  'shiva_calling_number' => 'Shiva-Calling-Number',
-  'ip_address_pool_name' => 'Ip_Address_Pool_Name',
-  'erx_secondary_dns' => 'ERX-Secondary-Dns',
-  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
-  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
-  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
-  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
-  'tunnel_password' => 'Tunnel-Password',
-  'usr_compression_type' => 'USR-Compression-Type',
-  'usr_connect_speed' => 'USR-Connect-Speed',
-  'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
-  'arap_challenge_response' => 'ARAP-Challenge-Response',
-  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
-  'usr_mp_edo' => 'USR-MP-EDO',
-  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
-  'usr_imsi' => 'USR-IMSI',
-  'ascend_fr_direct' => 'Ascend-FR-Direct',
-  'ascend_vrouter_name' => 'Ascend-VRouter-Name',
-  'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
-  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
-  'h323_gw_id' => 'h323-gw-id',
-  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
-  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
-  'login_lat_node' => 'Login-LAT-Node',
-  'acct_session_time' => 'Acct-Session-Time',
-  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
-  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
-  'ms_ras_version' => 'MS-RAS-Version',
-  'class' => 'Class',
-  'caller_id' => 'Caller-ID',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log',
-  'ascend_service_type' => 'Ascend-Service-Type',
-  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
-  'exec_program_wait' => 'Exec-Program-Wait',
-  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
-  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
-  'login_lat_group' => 'Login-LAT-Group',
-  'strip_user_name' => 'Strip-User-Name',
-  'nas_ip_address' => 'NAS-IP-Address',
-  'ascend_maximum_time' => 'Ascend-Maximum-Time',
-  'erx_atm_pcr' => 'ERX-Atm-PCR',
-  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
-  'auth_type' => 'Auth-Type',
-  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
-  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
-  'ms_ras_vendor' => 'MS-RAS-Vendor',
-  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
-  'ascend_bridge' => 'Ascend-Bridge',
-  'h323_redirect_number' => 'h323-redirect-number',
-  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
-  'annex_edo' => 'Annex-EDO',
-  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
-  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
-  'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
-  'le_terminate_detail' => 'LE-Terminate-Detail',
-  'acct_output_octets' => 'Acct-Output-Octets',
-  'usr_calling_party_number' => 'USR-Calling-Party-Number',
-  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
-  'ascend_force_56' => 'Ascend-Force-56',
-  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
-  'tunnel_algorithm' => 'Tunnel_Algorithm',
-  'usr_max_channels' => 'USR-Max-Channels',
-  'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
-  'le_nat_outmap' => 'LE-NAT-Outmap',
-  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
-  'usr_supports_tags' => 'USR-Supports-Tags',
-  'idle_timeout' => 'Idle-Timeout',
-  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
-  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
-  'usr_pw_cutoff' => 'USR-PW_Cutoff',
-  'usr_channel_expansion' => 'USR-Channel-Expansion',
-  'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
-  'h323_call_origin' => 'h323-call-origin',
-  'h323_preferred_lang' => 'h323-preferred-lang',
-  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
-  'bind_auth_context' => 'Bind_Auth_Context',
-  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
-  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
-  'tunnel_police_burst' => 'Tunnel_Police_Burst',
-  'pvc_circuit_padding' => 'PVC_Circuit_Padding',
-  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
-  'usr_end_time' => 'USR-End-Time',
-  'usr_ipx' => 'USR-IPX',
-  'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
-  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
-  'usr_blocks_sent' => 'USR-Blocks-Sent',
-  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id',
-  'ascend_private_route' => 'Ascend-Private-Route',
-  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
-  'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
-  'cisco_route_ip' => 'Cisco-Route-IP',
-  'nas_identifier' => 'NAS-Identifier',
-  'ascend_presession_time' => 'Ascend-PreSession-Time',
-  'usr_call_type' => 'USR-Call-Type',
-  'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
-  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
-  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
-  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
-  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
-  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
-  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
-  'ascend_group' => 'Ascend-Group',
-  'crypt_password' => 'Crypt-Password',
-  'usr_port_tap_address' => 'USR-Port-Tap-Address',
-  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
-  'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
+  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
+  'ms_filter' => 'MS-Filter',
   'usr_blocks_received' => 'USR-Blocks-Received',
-  'tunnel_group' => 'Tunnel_Group',
-  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
-  'replicate_to_realm' => 'Replicate-To-Realm',
-  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
-  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
-  'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
-  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate',
-  'acc_access_community' => 'Acc-Access-Community',
-  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
-  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
-  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
-  'erx_primary_dns' => 'ERX-Primary-Dns',
-  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
-  'ascend_token_immediate' => 'Ascend-Token-Immediate',
-  'cisco_idle_limit' => 'Cisco-Idle-Limit',
-  'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
-  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
-  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
-  'cisco_multilink_id' => 'Cisco-Multilink-ID',
-  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
-  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
-  'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
-  'acct_unique_session_id' => 'Acct-Unique-Session-Id',
-  'framed_pool' => 'Framed-Pool',
-  'usr_igmp_version' => 'USR-IGMP-Version',
-  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels',
-  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
-  'bg_path_cost' => 'BG_Path_Cost',
-  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
-  'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
-  'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
-  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
-  'usr_channel_decrement' => 'USR-Channel-Decrement',
-  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
-  'port_limit' => 'Port-Limit',
-  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
-  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
-  'usr_multicast_receive' => 'USR-Multicast-Receive',
-  'usr_auth_mode' => 'USR-Auth-Mode',
-  'expiration' => 'Expiration',
-  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
-  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
-  'ascend_ft1_caller' => 'Ascend-FT1-Caller',
-  'shiva_event_flags' => 'Shiva-Event-Flags',
-  'framed_netmask' => 'Framed-Netmask',
-  'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
-  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
-  'bind_sub_password' => 'Bind_Sub_Password',
-  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
-  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
-  'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
-  'ascend_session_type' => 'Ascend-Session-Type',
-  'usr_pw_packet' => 'USR-PW_Packet',
-  'session' => 'Session',
-  'usr_mic' => 'USR-MIC',
-  'usr_line_reversals' => 'USR-Line-Reversals',
-  'assigned_ip_address' => 'Assigned_IP_Address',
-  'cisco_ip_direct' => 'Cisco-IP-Direct',
-  'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
-  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst',
-  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
-  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
-  'h323_return_code' => 'h323-return-code',
-  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
-  'filter_id' => 'Filter-Id',
-  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
-  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
-  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
-  'h323_billing_model' => 'h323-billing-model',
-  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
-  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
-  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
-  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound',
-  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
-  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
-  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
-  'bind_dot1q_slot' => 'Bind_Dot1q_Slot',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim',
-  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
-  'ascend_authen_alias' => 'Ascend-Authen-Alias',
-  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
-  'dhcp_max_leases' => 'DHCP_Max_Leases',
   'shiva_called_number' => 'Shiva-Called-Number',
-  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
-  'usr_call_error_code' => 'USR-Call-Error-Code',
-  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
-  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
-  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
-  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
-  'suffix' => 'Suffix',
-  'bind_tun_context' => 'Bind_Tun_Context',
-  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
-  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
-  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
-  'ms_chap_error' => 'MS-CHAP-Error',
-  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
-  'ascend_data_svc' => 'Ascend-Data-Svc',
-  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
-  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
-  'context_name' => 'Context-Name',
-  'usr_card_type' => 'USR-Card-Type',
-  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
-  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
-  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
-  'tunnel_medium_type' => 'Tunnel-Medium-Type',
-  'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
-  'ascend_connect_progress' => 'Ascend-Connect-Progress',
-  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
-  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
-  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
-  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
-  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
-  'shiva_link_protocol' => 'Shiva-Link-Protocol',
-  'bridge_group' => 'Bridge_Group',
-  'client_port_dnis' => 'Client-Port-DNIS',
-  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
-  'le_nat_log_options' => 'LE-NAT-Log-Options',
-  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
-  'usr_retrains_granted' => 'USR-Retrains-Granted',
-  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
-  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
-  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
   'annex_filter' => 'Annex-Filter',
-  'ascend_mtu' => 'Ascend-MTU',
-  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
-  'private_group_id' => 'Private-Group-Id',
-  'ascend_cache_time' => 'Ascend-Cache-Time',
-  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
-  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
-  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
-  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
-  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
-  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
-  'acc_clearing_cause' => 'Acc-Clearing-Cause',
-  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
-  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
-  'termination_action' => 'Termination-Action',
-  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
-  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
-  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
-  'client_ip_address' => 'Client-IP-Address',
-  'ascend_add_seconds' => 'Ascend-Add-Seconds',
-  'login_ip_host' => 'Login-IP-Host',
-  'annex_sw_version' => 'Annex-SW-Version',
-  'huntgroup_name' => 'Huntgroup-Name',
-  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
-  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
-  'lac_real_port' => 'LAC_Real_Port',
-  'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
+  'usr_channel_expansion' => 'USR-Channel-Expansion',
+  'session_timeout' => 'Session-Timeout',
+  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
+  'ascend_route_ipx' => 'Ascend-Route-IPX',
   'annex_user_server_locati' => 'Annex-User-Server-Location',
-  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
-  'acct_output_gigawords' => 'Acct-Output-Gigawords',
-  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name',
-  'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
-  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
-  'ip_tos_field' => 'IP_TOS_Field',
-  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
-  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
-  'framed_address' => 'Framed-Address',
-  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
-  'hint' => 'Hint',
-  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
-  'arap_zone_access' => 'ARAP-Zone-Access',
-  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
+  'acc_callback_mode' => 'Acc-Callback-Mode',
+  'usr_filter_zones' => 'USR-Filter-Zones',
+  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
+  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
+  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
+  'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
+  'ascend_private_route' => 'Ascend-Private-Route',
+  'prompt' => 'Prompt',
+  'acct_link_count' => 'Acct-Link-Count',
+  'login_lat_node' => 'Login-LAT-Node',
+  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
+  'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
+  'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
+  'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
+  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
+  'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
+  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
+  'chap_challenge' => 'CHAP-Challenge',
+  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
+  'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
+  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
+  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type',
+  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
+  'ascend_atm_group' => 'Ascend-ATM-Group',
+  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
+  'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
+  'le_ip_pool' => 'LE-IP-Pool',
+  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
+  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
+  'login_port' => 'Login-Port',
+  'ms_chap2_response' => 'MS-CHAP2-Response',
+  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
+  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
+  'usr_accm_type' => 'USR-ACCM-Type',
+  'simultaneous_use' => 'Simultaneous-Use',
+  'framed_protocol' => 'Framed-Protocol',
+  'ascend_recv_name' => 'Ascend-Recv-Name',
+  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
+  'tunnel_remote_name' => 'Tunnel_Remote_Name',
+  'usr_vts_session_key' => 'USR-VTS-Session-Key',
+  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
+  'login_host' => 'Login-Host',
+  'usr_reply_script3' => 'USR-Reply-Script3',
+  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
+  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
   'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address',
-  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
+  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
+  'annex_cli_command' => 'Annex-CLI-Command',
+  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
+  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
+  'ascend_call_by_call' => 'Ascend-Call-By-Call',
+  'ascend_first_dest' => 'Ascend-First-Dest',
+  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
+  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
+  'sql_user_name' => 'SQL-User-Name',
+  'erx_secondary_dns' => 'ERX-Secondary-Dns',
+  'h323_return_code' => 'h323-return-code',
+  'annex_host_allow' => 'Annex-Host-Allow',
+  'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
+  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
+  'annex_edo' => 'Annex-EDO',
+  'acct_delay_time' => 'Acct-Delay-Time',
+  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
+  'login_tcp_port' => 'Login-TCP-Port',
+  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
+  'ascend_dialed_number' => 'Ascend-Dialed-Number',
+  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
+  'ascend_fr_dlci' => 'Ascend-FR-DLCI',
+  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
+  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
+  'char_noecho' => 'Char-Noecho',
+  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
+  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
+  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
+  'prefix' => 'Prefix',
+  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
+  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
+  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
   'ascend_home_network_name' => 'Ascend-Home-Network-Name',
+  'acc_customer_id' => 'Acc-Customer-Id',
+  'message_authenticator' => 'Message-Authenticator',
+  'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
+  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
+  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
+  'ascend_call_direction' => 'Ascend-Call-Direction',
+  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
+  'ascend_force_56' => 'Ascend-Force-56',
+  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
+  'shasta_service_profile' => 'Shasta-Service-Profile',
+  'cisco_maximum_time' => 'Cisco-Maximum-Time',
+  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
+  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
+  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
+  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
+  'ascend_bridge_address' => 'Ascend-Bridge-Address',
+  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
+  'ascend_handle_ipx' => 'Ascend-Handle-IPX',
+  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
+  'ascend_group' => 'Ascend-Group',
+  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
   'ascend_require_auth' => 'Ascend-Require-Auth',
-  'source_validation' => 'Source_Validation',
-  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
-  'h323_setup_time' => 'h323-setup-time',
-  'tunnel_remote_name' => 'Tunnel_Remote_Name',
-  'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
+  'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
+  'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
+  'ascend_remote_fw' => 'Ascend-Remote-FW',
+  'acct_output_packets' => 'Acct-Output-Packets',
+  'lm_password' => 'LM-Password',
+  'tunnel_window' => 'Tunnel_Window',
+  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
+  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
+  'cisco_avpair' => 'Cisco-AVPair',
+  'shiva_event_flags' => 'Shiva-Event-Flags',
+  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
+  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
+  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
+  'state' => 'State',
+  'usr_keypress_timeout' => 'USR-Keypress-Timeout',
+  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
+  'ldap_userdn' => 'Ldap-UserDn',
+  'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
   'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
-  'arap_security_data' => 'ARAP-Security-Data',
-  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
-  'ascend_cir_timer' => 'Ascend-CIR-Timer',
-  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
-  'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
-  'usr_rmmie_status' => 'USR-RMMIE-Status',
-  'annex_callback_portlist' => 'Annex-Callback-Portlist',
-  'usr_port_tap' => 'USR-Port-Tap',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS',
+  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
+  'nas_ip_address' => 'NAS-IP-Address',
+  'usr_call_end_time' => 'USR-Call-End-Time',
+  'tunnel_algorithm' => 'Tunnel_Algorithm',
+  'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
+  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
+  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
+  'login_callback_number' => 'Login-Callback-Number',
+  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
+  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
+  'h323_disconnect_cause' => 'h323-disconnect-cause',
+  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
+  'usr_igmp_version' => 'USR-IGMP-Version',
+  'usr_imsi' => 'USR-IMSI',
+  'group_name' => 'Group-Name',
+  'usr_nas_type' => 'USR-NAS-Type',
+  'ascend_ip_tos' => 'Ascend-IP-TOS',
+  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
+  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
+  'ms_chap2_cpw' => 'MS-CHAP2-CPW',
+  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx',
+  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
+  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
+  'ascend_x25_nui' => 'Ascend-X25-Nui',
   'x_ascend_first_dest' => 'X-Ascend-First-Dest',
-  'lac_port' => 'LAC_Port',
-  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
-  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
-  'mcast_receive' => 'Mcast_Receive',
-  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
-  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
-  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
-  'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
-  'arap_password' => 'ARAP-Password',
-  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
-  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
-  'tunnel_dnis' => 'Tunnel_DNIS',
+  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
+  'usr_send_password' => 'USR-Send-Password',
+  'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
+  'acct_input_octets' => 'Acct-Input-Octets',
+  'bridge_group' => 'Bridge_Group',
+  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
+  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
   'ms_acct_auth_type' => 'MS-Acct-Auth-Type',
-  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
-  'shasta_service_profile' => 'Shasta-Service-Profile',
-  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
-  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
-  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
-  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
-  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
-  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
-  'usr_routing_protocol' => 'USR-Routing-Protocol',
-  'pam_auth' => 'Pam-Auth',
-  'client_dns_sec' => 'Client_DNS_Sec',
-  'bg_trans_bpdu' => 'BG_Trans_BPDU',
-  'police_rate' => 'Police_Rate',
+  'tunnel_password' => 'Tunnel-Password',
+  'usr_reply_script5' => 'USR-Reply-Script5',
+  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
+  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
+  'ascend_mtu' => 'Ascend-MTU',
+  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
+  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
+  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
+  'ascend_bridge' => 'Ascend-Bridge',
+  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
+  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout',
+  'ascend_multicast_client' => 'Ascend-Multicast-Client',
+  'tunnel_private_group_id' => 'Tunnel-Private-Group-Id',
+  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
   'calling_station_id' => 'Calling-Station-Id',
+  'tunnel_rate_limit_burst' => 'Tunnel_Rate_Limit_Burst',
+  'usr_device_connected_to' => 'USR-Device-Connected-To',
+  'login_lat_service' => 'Login-LAT-Service',
+  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
+  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
   'usr_called_party_number' => 'USR-Called-Party-Number',
-  'shiva_network_protocols' => 'Shiva-Network-Protocols',
+  'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
+  'shiva_user_attributes' => 'Shiva-User-Attributes',
+  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
+  'acc_route_policy' => 'Acc-Route-Policy',
   'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway',
-  'acct_input_octets' => 'Acct-Input-Octets',
-  'ascend_call_type' => 'Ascend-Call-Type',
-  'annex_product_name' => 'Annex-Product-Name',
-  'framed_compression' => 'Framed-Compression',
+  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
+  'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
   'ascend_atm_direct' => 'Ascend-ATM-Direct',
-  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
-  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
-  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
-  'ascend_atm_vci' => 'Ascend-ATM-Vci',
-  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
-  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
-  'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
-  'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
-  'h323_conf_id' => 'h323-conf-id',
-  'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
-  'ascend_fr_t391' => 'Ascend-FR-T391',
-  'bg_aging_time' => 'BG_Aging_Time',
-  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
-  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
-  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
-  'ascend_fr_t392' => 'Ascend-FR-T392',
-  'acct_link_count' => 'Acct-Link-Count',
-  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
-  'h323_credit_time' => 'h323-credit-time',
-  'nas_port_id' => 'NAS-Port-Id',
-  'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
-  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
-  'arap_features' => 'ARAP-Features',
-  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
-  'annex_host_restrict' => 'Annex-Host-Restrict',
-  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
-  'cisco_maximum_time' => 'Cisco-Maximum-Time',
+  'ascend_session_type' => 'Ascend-Session-Type',
+  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
+  'ascend_metric' => 'Ascend-Metric',
+  'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
+  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
+  'pppoe_url' => 'PPPOE_URL',
+  'acct_mcast_out_octets' => 'Acct_Mcast_Out_Octets',
+  'ascend_callback' => 'Ascend-Callback',
+  'tunnel_client_auth_id' => 'Tunnel-Client-Auth-Id',
+  'acct_unique_session_id' => 'Acct-Unique-Session-Id',
+  'usr_port_tap_format' => 'USR-Port-Tap-Format',
+  'ascend_ckt_type' => 'Ascend-Ckt-Type',
+  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
+  'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
+  'ascend_filter' => 'Ascend-Filter',
+  'h323_redirect_number' => 'h323-redirect-number',
+  'port_limit' => 'Port-Limit',
+  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
+  'tunnel_police_rate' => 'Tunnel_Police_Rate',
+  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
+  'usr_multicast_proxy' => 'USR-Multicast-Proxy',
+  'usr_bridging' => 'USR-Bridging',
+  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
+  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
+  'usr_request_type' => 'USR-Request-Type',
+  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
+  'ascend_host_info' => 'Ascend-Host-Info',
+  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
+  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
+  'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
+  'x_ascend_bridge' => 'X-Ascend-Bridge',
+  'tunnel_deadtime' => 'Tunnel_Deadtime',
+  'ms_chap_error' => 'MS-CHAP-Error',
+  'framed_route' => 'Framed-Route',
+  'expiration' => 'Expiration',
+  'ascend_backup' => 'Ascend-Backup',
+  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
+  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
+  'annex_audit_level' => 'Annex-Audit-Level',
+  'bind_auth_context' => 'Bind_Auth_Context',
+  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool',
+  'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
+  'mcast_receive' => 'Mcast_Receive',
+  'usr_ds0' => 'USR-DS0',
+  'ms_ras_vendor' => 'MS-RAS-Vendor',
+  'tunnel_domain' => 'Tunnel_Domain',
+  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
   'tunnel_max_sessions' => 'Tunnel_Max_Sessions',
-  'bind_ses_context' => 'Bind_Ses_Context',
-  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
-  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
-  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
-  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
-  'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
-  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets',
-  'shiva_type_of_service' => 'Shiva-Type-Of-Service',
+  'ascend_ip_direct' => 'Ascend-IP-Direct',
+  'idle_timeout' => 'Idle-Timeout',
+  'tunnel_server_auth_id' => 'Tunnel-Server-Auth-Id',
+  'usr_start_time' => 'USR-Start-Time',
+  'usr_ip' => 'USR-IP',
+  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
+  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
+  'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
+  'ms_chap_domain' => 'MS-CHAP-Domain',
+  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
+  'acct_session_time' => 'Acct-Session-Time',
+  'framed_ip_address' => 'Framed-IP-Address',
+  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
+  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
+  'medium_type' => 'Medium_Type',
+  'acct_output_octets_64' => 'Acct_Output_Octets_64',
+  'ascend_cir_timer' => 'Ascend-CIR-Timer',
+  'police_rate' => 'Police_Rate',
+  'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
+  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
+  'x_ascend_host_info' => 'X-Ascend-Host-Info',
+  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
+  'user_name' => 'User-Name',
+  'bind_bypass_bypass' => 'Bind_Bypass_Bypass',
+  'annex_acct_servers' => 'Annex-Acct-Servers',
+  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
+  'annex_input_filter' => 'Annex-Input-Filter',
+  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
+  'nas_port_type' => 'NAS-Port-Type',
+  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
+  'tunnel_police_burst' => 'Tunnel_Police_Burst',
+  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions',
+  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
+  'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
+  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
+  'erx_egress_statistics' => 'ERX-Egress-Statistics',
   'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392',
-  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
-  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
-  'x_ascend_backup' => 'X-Ascend-Backup',
-  'char_noecho' => 'Char-Noecho',
-  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
-  'le_advice_of_charge' => 'LE-Advice-of-Charge',
-  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
-  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
+  'usr_esn' => 'USR-ESN',
+  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
+  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
+  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
+  'ascend_ipx_alias' => 'Ascend-IPX-Alias',
+  'acc_tunnel_port' => 'Acc-Tunnel-Port',
+  'acct_input_gigawords' => 'Acct-Input-Gigawords',
+  'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
+  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
+  'usr_retrains_requested' => 'USR-Retrains-Requested',
+  'x_ascend_metric' => 'X-Ascend-Metric',
+  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
+  'erx_atm_pcr' => 'ERX-Atm-PCR',
+  'usr_ipx_routing' => 'USR-IPX-Routing',
+  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
+  'usr_send_script5' => 'USR-Send-Script5',
+  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
+  'ascend_bacp_enable' => 'Ascend-BACP-Enable',
+  'login_time' => 'Login-Time',
+  'ascend_call_type' => 'Ascend-Call-Type',
+  'erx_address_pool_name' => 'ERX-Address-Pool-Name',
+  'h323_incoming_conf_id' => 'h323-incoming-conf-id',
+  'packet_type' => 'Packet-Type',
+  'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
+  'ip_address_pool_name' => 'Ip_Address_Pool_Name',
+  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
+  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
+  'ascend_menu_selector' => 'Ascend-Menu-Selector',
+  'usr_ds0s' => 'USR-DS0s',
+  'usr_actual_voltage' => 'USR-Actual-Voltage',
+  'annex_sw_version' => 'Annex-SW-Version',
+  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
+  'ascend_receive_secret' => 'Ascend-Receive-Secret',
+  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
+  'ascend_pw_warntime' => 'Ascend-PW-Warntime',
+  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
+  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
+  'usr_blocks_resent' => 'USR-Blocks-Resent',
+  'usr_fallback_enabled' => 'USR-Fallback-Enabled',
+  'arap_challenge_response' => 'ARAP-Challenge-Response',
+  'tunnel_session_auth' => 'Tunnel_Session_Auth',
   'usr_sync_async_mode' => 'USR-Sync-Async-Mode',
-  'state' => 'State',
-  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
-  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
-  'ascend_ip_tos' => 'Ascend-IP-TOS',
-  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
-  'tunnel_session_auth_ctx' => 'Tunnel_Session_Auth_Ctx',
-  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
+  'client_port_dnis' => 'Client-Port-DNIS',
+  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
+  'ascend_remote_addr' => 'Ascend-Remote-Addr',
+  'ascend_fr_n391' => 'Ascend-FR-N391',
+  'client_port_id' => 'Client-Port-Id',
+  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
+  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
+  'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
+  'usr_callback_type' => 'USR-Callback-Type',
+  'login_lat_group' => 'Login-LAT-Group',
+  'x_ascend_call_type' => 'X-Ascend-Call-Type',
+  'ascend_route_ip' => 'Ascend-Route-IP',
+  'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
+  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
+  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
+  'h323_billing_model' => 'h323-billing-model',
+  'usr_equalization_type' => 'USR-Equalization-Type',
+  'acc_clearing_cause' => 'Acc-Clearing-Cause',
+  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
+  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
+  'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
+  'police_burst' => 'Police_Burst',
+  'ascend_filter_required' => 'Ascend-Filter-Required',
+  'usr_compression_algorith' => 'USR-Compression-Algorithm',
+  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
+  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
+  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
+  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
+  'ip_tos_field' => 'IP_TOS_Field',
+  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
+  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
   'usr_call_event_code' => 'USR-Call-Event-Code',
-  'chap_password' => 'CHAP-Password',
-  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
-  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
-  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
-  'client_id' => 'Client-Id',
-  'sql_user_name' => 'SQL-User-Name',
-  'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
-  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
-  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
-  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
+  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
+  'usr_host_type' => 'USR-Host-Type',
+  'ascend_send_auth' => 'Ascend-Send-Auth',
+  'shiva_compression_type' => 'Shiva-Compression-Type',
+  'filter_id' => 'Filter-Id',
+  'ascend_ft1_caller' => 'Ascend-FT1-Caller',
+  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
+  'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
+  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
+  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
+  'acc_input_errors' => 'Acc-Input-Errors',
   'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port',
-  'usr_local_ip_address' => 'USR-Local-IP-Address',
-  'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
-  'ascend_metric' => 'Ascend-Metric',
-  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
-  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
-  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
-  'annex_authen_servers' => 'Annex-Authen-Servers',
-  'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
-  'ascend_idle_limit' => 'Ascend-Idle-Limit',
-  'ldap_userdn' => 'Ldap-UserDn',
-  'x_ascend_target_util' => 'X-Ascend-Target-Util',
-  'shiva_connect_reason' => 'Shiva-Connect-Reason',
-  'usr_ds0' => 'USR-DS0',
-  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
-  'shasta_vpn_name' => 'Shasta-VPN-Name',
-  'acct_tunnel_connection_i' => 'Acct-Tunnel-Connection-Id',
-  'h323_prompt_id' => 'h323-prompt-id',
-  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
-  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
-  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
-  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
-  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
-  'lac_port_type' => 'LAC_Port_Type',
-  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
-  'usr_interface_index' => 'USR-Interface-Index',
-  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
-  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
-  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
+  'erx_secondary_wins' => 'ERX-Secondary-Wins',
+  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
+  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
+  'usr_slot_connected_to' => 'USR-Slot-Connected-To',
+  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
+  'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
+  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
+  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
+  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
+  'ascend_fr_type' => 'Ascend-FR-Type',
+  'tunnel_client_endpoint' => 'Tunnel-Client-Endpoint',
+  'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
+  'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
+  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
+  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
+  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
+  'pvc_profile_name' => 'PVC_Profile_Name',
+  'ascend_global_call_id' => 'Ascend-Global-Call-Id',
+  'tunnel_local_name' => 'Tunnel_Local_Name',
+  'ascend_fr_t392' => 'Ascend-FR-T392',
+  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
+  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
+  'ascend_token_immediate' => 'Ascend-Token-Immediate',
+  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
+  'rate_limit_burst' => 'Rate_Limit_Burst',
+  'cisco_route_ip' => 'Cisco-Route-IP',
+  'dhcp_max_leases' => 'DHCP_Max_Leases',
+  'user_category' => 'User-Category',
+  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
   'bind_type' => 'Bind_Type',
-  'acc_ccp_option' => 'Acc-Ccp-Option',
+  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
+  'rate_limit_rate' => 'Rate_Limit_Rate',
+  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
+  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
+  'connect_info' => 'Connect-Info',
+  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
+  'usr_port_tap_address' => 'USR-Port-Tap-Address',
+  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
+  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
+  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
   'ascend_route_appletalk' => 'Ascend-Route-Appletalk',
-  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
-  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
-  'erx_atm_mbs' => 'ERX-Atm-MBS',
-  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
-  'ms_old_arap_password' => 'MS-Old-ARAP-Password',
-  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
-  'x_ascend_host_info' => 'X-Ascend-Host-Info',
-  'bind_auth_protocol' => 'Bind_Auth_Protocol',
-  'cisco_link_compression' => 'Cisco-Link-Compression',
-  'annex_syslog_tap' => 'Annex-Syslog-Tap',
-  'tunnel_window' => 'Tunnel_Window',
-  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
-  'ascend_redirect_number' => 'Ascend-Redirect-Number',
+  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
+  'ascend_callback_delay' => 'Ascend-Callback-Delay',
+  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
+  'bg_trans_bpdu' => 'BG_Trans_BPDU',
+  'huntgroup_name' => 'Huntgroup-Name',
+  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
   'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
-  'usr_pw_index' => 'USR-PW_Index',
-  'le_multicast_client' => 'LE-Multicast-Client',
-  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
-  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
-  'erx_secondary_wins' => 'ERX-Secondary-Wins',
-  'fall_through' => 'Fall-Through',
-  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets',
-  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
-  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
-  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
-  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
-  'usr_syslog_tap' => 'USR-Syslog-Tap',
-  'ascend_multicast_client' => 'Ascend-Multicast-Client',
-  'usr_device_connected_to' => 'USR-Device-Connected-To',
-  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
-  'add_prefix' => 'Add-Prefix',
-  'tunnel_cmd_timeout' => 'Tunnel_Cmd_Timeout',
-  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
-  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets',
-  'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
-  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
-  'acc_ip_compression' => 'Acc-Ip-Compression',
-  'usr_modem_training_time' => 'USR-Modem-Training-Time',
-  'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
-  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
-  'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
-  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
-  'password_retry' => 'Password-Retry',
-  'ascend_source_auth' => 'Ascend-Source-Auth',
-  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
-  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
-  'ascend_netware_timeout' => 'Ascend-Netware-timeout',
-  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
-  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
-  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
-  'simultaneous_use' => 'Simultaneous-Use',
-  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
-  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
-  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
-  'h323_call_type' => 'h323-call-type',
-  'tunnel_context' => 'Tunnel_Context',
-  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
   'usr_ipx_wan' => 'USR-IPX-WAN',
-  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
+  'menu' => 'Menu',
+  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
+  'acct_status_type' => 'Acct-Status-Type',
+  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
+  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
+  'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
+  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
+  'ascend_ipx_route' => 'Ascend-IPX-Route',
   'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT',
-  'acct_multi_session_id' => 'Acct-Multi-Session-Id',
-  'usr_reply_script1' => 'USR-Reply-Script1',
+  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
+  'usr_event_id' => 'USR-Event-Id',
+  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
+  'usr_send_script3' => 'USR-Send-Script3',
+  'framed_callback_id' => 'Framed-Callback-Id',
+  'arap_zone_access' => 'ARAP-Zone-Access',
+  'service_type' => 'Service-Type',
+  'usr_nfas_id' => 'USR-NFAS-ID',
+  'shiva_calling_number' => 'Shiva-Calling-Number',
+  'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
+  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
+  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
+  'quintum_avpair' => 'Quintum-AVPair',
+  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
+  'ascend_transit_number' => 'Ascend-Transit-Number',
+  'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
+  'versanet_termination_cau' => 'Versanet-Termination-Cause',
+  'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
+  'usr_mic' => 'USR-MIC',
+  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
+  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
+  'ms_chap2_success' => 'MS-CHAP2-Success',
+  'cisco_idle_limit' => 'Cisco-Idle-Limit',
+  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
+  'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
+  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
+  'acct_input_packets_64' => 'Acct_Input_Packets_64',
+  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
+  'usr_characters_received' => 'USR-Characters-Received',
+  'ms_bap_usage' => 'MS-BAP-Usage',
+  'cisco_data_filter' => 'Cisco-Data-Filter',
+  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'h323_setup_time' => 'h323-setup-time',
+  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
+  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
+  'usr_sap_filter_in' => 'USR-SAP-Filter-In',
+  'framed_appletalk_link' => 'Framed-AppleTalk-Link',
+  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
+  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
+  'usr_ipx' => 'USR-IPX',
+  'shiva_connect_reason' => 'Shiva-Connect-Reason',
   'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp',
+  'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
+  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
+  'usr_igmp_robustness' => 'USR-IGMP-Robustness',
+  'add_prefix' => 'Add-Prefix',
+  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
+  'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
+  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
+  'erx_igmp_enable' => 'ERX-Igmp-Enable',
+  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
+  'usr_pw_packet' => 'USR-PW_Packet',
+  'dialback_no' => 'Dialback-No',
+  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
+  'annex_cli_filter' => 'Annex-CLI-Filter',
+  'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
+  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
+  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
+  'shiva_type_of_service' => 'Shiva-Type-Of-Service',
+  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
+  'bind_ses_context' => 'Bind_Ses_Context',
+  'acc_reason_code' => 'Acc-Reason-Code',
+  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
+  'h323_call_type' => 'h323-call-type',
+  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
+  'usr_calling_party_number' => 'USR-Calling-Party-Number',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-RtLim',
   'usr_reply_script2' => 'USR-Reply-Script2',
-  'usr_reply_script3' => 'USR-Reply-Script3',
-  'usr_reply_script4' => 'USR-Reply-Script4',
-  'usr_reply_script5' => 'USR-Reply-Script5',
-  'usr_reply_script6' => 'USR-Reply-Script6',
-  'user_category' => 'User-Category',
-  'mcast_send' => 'Mcast_Send',
-  'ascend_send_secret' => 'Ascend-Send-Secret',
-  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
-  'tunnel_retransmit' => 'Tunnel_Retransmit',
-  'add_port_to_ip_address' => 'Add-Port-To-IP-Address',
-  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
-  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
-  'erx_sa_validate' => 'ERX-Sa-Validate',
-  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
-  'usr_chassis_slot' => 'USR-Chassis-Slot',
-  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
-  'usr_nfas_id' => 'USR-NFAS-ID',
-  'called_station_id' => 'Called-Station-Id',
-  'login_lat_port' => 'Login-LAT-Port',
-  'ascend_dialed_number' => 'Ascend-Dialed-Number',
-  'h323_credit_amount' => 'h323-credit-amount',
-  'tunnel_local_name' => 'Tunnel_Local_Name',
-  'framed_ip_netmask' => 'Framed-IP-Netmask',
-  'client_port_id' => 'Client-Port-Id',
-  'bg_span_dis' => 'BG_Span_Dis',
+  'usr_security_login_limit' => 'USR-Security-Login-Limit',
+  'cisco_link_compression' => 'Cisco-Link-Compression',
+  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
+  'ascend_vrouter_name' => 'Ascend-VRouter-Name',
+  'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
+  'cisco_ip_direct' => 'Cisco-IP-Direct',
+  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
+  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
+  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
+  'configuration_token' => 'Configuration-Token',
+  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
+  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
+  'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
+  'stripped_user_name' => 'Stripped-User-Name',
+  'cisco_call_filter' => 'Cisco-Call-Filter',
+  'termination_menu' => 'Termination-Menu',
+  'port_message' => 'Port-Message',
+  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
+  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
+  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
+  'acc_service_profile' => 'Acc-Service-Profile',
+  'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
+  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
+  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
+  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
+  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
+  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
+  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
+  'login_service' => 'Login-Service',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Bound',
+  'ascend_dial_number' => 'Ascend-Dial-Number',
+  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
+  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
+  'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
+  'bind_dot1q_slot' => 'Bind_Dot1q_Slot',
+  'le_connect_detail' => 'LE-Connect-Detail',
+  'annex_user_level' => 'Annex-User-Level',
+  'tunnel_dnis' => 'Tunnel_DNIS',
+  'assigned_ip_address' => 'Assigned_IP_Address',
+  'acc_bridging_support' => 'Acc-Bridging-Support',
+  'usr_channel' => 'USR-Channel',
+  'arap_security_data' => 'ARAP-Security-Data',
+  'bind_auth_service_grp' => 'Bind_Auth_Service_Grp',
+  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
+  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
+  'h323_voice_quality' => 'h323-voice-quality',
+  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
+  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
+  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
+  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
+  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
+  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
+  'ascend_bir_enable' => 'Ascend-BIR-Enable',
+  'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
+  'ascend_presession_time' => 'Ascend-PreSession-Time',
+  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
+  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
+  'framed_compression' => 'Framed-Compression',
+  'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
+  'proxy_state' => 'Proxy-State',
+  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
+  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
+  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
+  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
+  'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
+  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
+  'bind_auth_protocol' => 'Bind_Auth_Protocol',
+  'shasta_user_privilege' => 'Shasta-User-Privilege',
+  'acct_interim_interval' => 'Acct-Interim-Interval',
+  'hint' => 'Hint',
+  'x_ascend_target_util' => 'X-Ascend-Target-Util',
+  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
+  'acc_access_partition' => 'Acc-Access-Partition',
+  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
+  'usr_power_supply_number' => 'USR-Power-Supply-Number',
+  'acc_ipx_compression' => 'Acc-Ipx-Compression',
+  'nomadix_bw_down' => 'Nomadix-Bw-Down',
+  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
+  'cisco_target_util' => 'Cisco-Target-Util',
+  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
+  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
+  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
+  'usr_connect_time' => 'USR-Connect-Time',
+  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
+  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
+  'dialback_name' => 'Dialback-Name',
+  'bind_tun_context' => 'Bind_Tun_Context',
+  'h323_redirect_ip_address' => 'h323-redirect-ip-address',
+  'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
+  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
+  'ms_chap_response' => 'MS-CHAP-Response',
+  'usr_max_channels' => 'USR-Max-Channels',
+  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
+  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
+  'erx_atm_mbs' => 'ERX-Atm-MBS',
+  'usr_line_reversals' => 'USR-Line-Reversals',
+  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
+  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
+  'ascend_data_filter' => 'Ascend-Data-Filter',
+  'framed_address' => 'Framed-Address',
+  'context_name' => 'Context-Name',
+  'usr_send_script2' => 'USR-Send-Script2',
+  'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
+  'acct_session_id' => 'Acct-Session-Id',
+  'initial_modulation_type' => 'Initial-Modulation-Type',
+  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
+  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
+  'tunnel_type' => 'Tunnel-Type',
   'multi_link_flag' => 'Multi-Link-Flag',
-  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
-  'usr_ipx_routing' => 'USR-IPX-Routing',
-  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
-  'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
-  'pppoe_url' => 'PPPOE_URL',
-  'ascend_ara_pw' => 'Ascend-Ara-PW',
-  'acc_callback_mode' => 'Acc-Callback-Mode',
-  'usr_server_time' => 'USR-Server-Time',
-  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'ascend_idle_limit' => 'Ascend-Idle-Limit',
+  'password_retry' => 'Password-Retry',
+  'h323_remote_address' => 'h323-remote-address',
+  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
+  'acct_input_packets' => 'Acct-Input-Packets',
+  'h323_disconnect_time' => 'h323-disconnect-time',
+  'ascend_billing_number' => 'Ascend-Billing-Number',
+  'usr_syslog_tap' => 'USR-Syslog-Tap',
+  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
+  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
+  'usr_routing_protocol' => 'USR-Routing-Protocol',
+  'usr_rad_location_type' => 'USR-Rad-Location-Type',
+  'usr_characters_sent' => 'USR-Characters-Sent',
+  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
+  'annex_host_restrict' => 'Annex-Host-Restrict',
+  'user_service_type' => 'User-Service-Type',
+  'acct_multi_session_id' => 'Acct-Multi-Session-Id',
+  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
+  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
+  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
+  'ascend_connect_progress' => 'Ascend-Connect-Progress',
+  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
   'ns_mta_md5_password' => 'NS-MTA-MD5-Password',
-  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
-  'usr_channel' => 'USR-Channel',
+  'callback_number' => 'Callback-Number',
+  'acct_output_packets_64' => 'Acct_Output_Packets_64',
+  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
+  'ascend_modem_portno' => 'Ascend-Modem-PortNo',
+  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
+  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
+  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
+  'client_ip_address' => 'Client-IP-Address',
+  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
   'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
-  'acct_session_start_time' => 'Acct-Session-Start-Time',
-  'ascend_send_passwd' => 'Ascend-Send-Passwd',
-  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
-  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
-  'vendor_specific' => 'Vendor-Specific',
+  'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
+  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
+  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
+  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
+  'shiva_customer_id' => 'Shiva-Customer-Id',
+  'lac_real_port' => 'LAC_Real_Port',
+  'h323_connect_time' => 'h323-connect-time',
+  'old_password' => 'Old-Password',
+  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
+  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
+  'add_suffix' => 'Add-Suffix',
+  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
+  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
+  'usr_terminal_type' => 'USR-Terminal-Type',
+  'usr_spoofing' => 'USR-Spoofing',
+  'erx_tunnel_password' => 'ERX-Tunnel-Password',
+  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
+  'usr_server_time' => 'USR-Server-Time',
+  'ascend_data_svc' => 'Ascend-Data-Svc',
+  'annex_authen_servers' => 'Annex-Authen-Servers',
+  'nomadix_bw_up' => 'Nomadix-Bw-Up',
+  'shiva_link_speed' => 'Shiva-Link-Speed',
+  'usr_reply_script6' => 'USR-Reply-Script6',
+  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
+  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
+  'cisco_data_rate' => 'Cisco-Data-Rate',
+  'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
+  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
+  'ascend_target_util' => 'Ascend-Target-Util',
+  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
   'x_ascend_event_type' => 'X-Ascend-Event-Type',
-  'lac_real_port_type' => 'LAC_Real_Port_Type',
-  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
-  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
-  'framed_ipx_network' => 'Framed-IPX-Network',
-  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
-  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
-  'annex_cli_command' => 'Annex-CLI-Command',
-  'acct_status_type' => 'Acct-Status-Type',
-  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
-  'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
-  'usr_sap_filter_in' => 'USR-SAP-Filter-In',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto',
-  'annex_audit_level' => 'Annex-Audit-Level',
-  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
-  'ascend_dial_number' => 'Ascend-Dial-Number',
-  'ascend_link_compression' => 'Ascend-Link-Compression',
-  'usr_event_date_time' => 'USR-Event-Date-Time',
-  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
-  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
-  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
-  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
-  'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
-  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
-  'nas_real_port' => 'NAS_Real_Port',
-  'usr_power_supply_number' => 'USR-Power-Supply-Number',
-  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
-  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
-  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
-  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
-  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
-  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
-  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
-  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
-  'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
-  'annex_input_filter' => 'Annex-Input-Filter',
-  'menu' => 'Menu',
-  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
-  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
-  'acc_request_type' => 'Acc-Request-Type',
-  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
-  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
-  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
+  'usr_mp_mrru' => 'USR-MP-MRRU',
   'bind_bypass_context' => 'Bind_Bypass_Context',
-  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
-  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
-  'x_ascend_bridge' => 'X-Ascend-Bridge',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
-  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
-  'acct_input_gigawords' => 'Acct-Input-Gigawords',
-  'usr_equalization_type' => 'USR-Equalization-Type',
-  'usr_port_tap_format' => 'USR-Port-Tap-Format',
-  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
-  'acc_ipx_compression' => 'Acc-Ipx-Compression',
-  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
-  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
-  'ascend_modem_portno' => 'Ascend-Modem-PortNo',
-  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
-  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
-  'framed_appletalk_link' => 'Framed-AppleTalk-Link',
-  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
-  'ascend_route_ipx' => 'Ascend-Route-IPX',
-  'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
-  'ascend_token_idle' => 'Ascend-Token-Idle',
-  'framed_ip_address' => 'Framed-IP-Address',
-  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
-  'ascend_ppp_address' => 'Ascend-PPP-Address',
-  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
-  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
-  'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
-  'usr_characters_received' => 'USR-Characters-Received',
+  'no_such_attribute' => 'No-Such-Attribute',
+  'acct_mcast_out_packets' => 'Acct_Mcast_Out_Packets',
+  'tunnel_medium_type' => 'Tunnel-Medium-Type',
+  'acc_callback_delay' => 'Acc-Callback-Delay',
+  'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
+  'acct_input_octets_64' => 'Acct_Input_Octets_64',
+  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
+  'erx_primary_dns' => 'ERX-Primary-Dns',
+  'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
+  'ms_new_arap_password' => 'MS-New-ARAP-Password',
+  'usr_call_error_code' => 'USR-Call-Error-Code',
+  'acct_output_octets' => 'Acct-Output-Octets',
+  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
+  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
+  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
+  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
+  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
+  'usr_blocks_sent' => 'USR-Blocks-Sent',
+  'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
+  'acc_ccp_option' => 'Acc-Ccp-Option',
+  'ascend_client_gateway' => 'Ascend-Client-Gateway',
+  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
+  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
+  'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
+  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
+  'password' => 'Password',
+  'le_nat_log_options' => 'LE-NAT-Log-Options',
+  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
+  'usr_fallback_limit' => 'USR-Fallback-Limit',
+  'suffix' => 'Suffix',
+  'usr_multicast_receive' => 'USR-Multicast-Receive',
+  'client_dns_sec' => 'Client_DNS_Sec',
+  'annex_product_name' => 'Annex-Product-Name',
+  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
+  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
+  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
+  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
+  'mcast_send' => 'Mcast_Send',
+  'pppoe_motm' => 'PPPOE_MOTM',
+  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
   'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
-  'usr_call_end_time' => 'USR-Call-End-Time',
-  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
-  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
-  'initial_modulation_type' => 'Initial-Modulation-Type',
-  'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
-  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
-  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
+  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
+  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
+  'ms_ras_version' => 'MS-RAS-Version',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
+  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
+  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
   'ascend_menu_item' => 'Ascend-Menu-Item',
-  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
-  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
-  'message_authenticator' => 'Message-Authenticator',
-  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
-  'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
-  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
-  'usr_modem_group' => 'USR-Modem-Group',
-  'x_ascend_callback' => 'X-Ascend-Callback',
-  'acct_input_packets_64' => 'Acct_Input_Packets_64',
-  'ascend_third_prompt' => 'Ascend-Third-Prompt',
-  'configuration_token' => 'Configuration-Token',
-  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
-  'acct_output_octets_64' => 'Acct_Output_Octets_64',
-  'h323_time_and_day' => 'h323-time-and-day',
-  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
-  'acct_interim_interval' => 'Acct-Interim-Interval',
-  'ascend_uu_info' => 'Ascend-UU-Info',
-  'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
+  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
+  'callback_id' => 'Callback-Id',
+  'framed_ipx_network' => 'Framed-IPX-Network',
+  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
+  'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
+  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
+  'user_name_is_star' => 'User-Name-Is-Star',
+  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
+  'framed_pool' => 'Framed-Pool',
+  'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
+  'realm' => 'Realm',
+  'arap_features' => 'ARAP-Features',
+  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
+  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
+  'usr_chassis_temperature' => 'USR-Chassis-Temperature',
+  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
+  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
+  'le_modem_info' => 'LE-Modem-Info',
+  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
+  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
+  'tunnel_rate_limit_rate' => 'Tunnel_Rate_Limit_Rate',
   'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
-  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
-  'acc_input_errors' => 'Acc-Input-Errors',
-  'bind_dot1q_port' => 'Bind_Dot1q_Port',
-  'ascend_first_dest' => 'Ascend-First-Dest',
-  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
-  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
-  'annex_local_ip_address' => 'Annex-Local-IP-Address',
-  'termination_menu' => 'Termination-Menu',
-  'ms_chap2_cpw' => 'MS-CHAP2-CPW',
-  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
-  'usr_characters_sent' => 'USR-Characters-Sent',
-  'eap_message' => 'EAP-Message',
-  'acct_delay_time' => 'Acct-Delay-Time',
-  'ascend_remote_fw' => 'Ascend-Remote-FW',
-  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
-  'shiva_session_id' => 'Shiva-Session-Id',
-  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
-  'usr_accm_type' => 'USR-ACCM-Type',
-  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
-  'usr_rad_location_type' => 'USR-Rad-Location-Type',
-  'ascend_filter' => 'Ascend-Filter',
-  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
-  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
-  'chap_challenge' => 'CHAP-Challenge',
-  'acct_output_packets_64' => 'Acct_Output_Packets_64',
-  'bind_auth_max_sessions' => 'Bind_Auth_Max_Sessions',
-  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
-  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
-  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
-  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
-  'ascend_bridge_address' => 'Ascend-Bridge-Address',
-  'user_name' => 'User-Name',
-  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
-  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
-  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
-  'usr_physical_state' => 'USR-Physical-State',
-  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
-  'bind_int_context' => 'Bind_Int_Context',
-  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
-  'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
-  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
+  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
+  'x_ascend_callback' => 'X-Ascend-Callback',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-Log',
+  'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
+  'nas_port_id' => 'NAS-Port-Id',
+  'le_advice_of_charge' => 'LE-Advice-of-Charge',
+  'ascend_add_seconds' => 'Ascend-Add-Seconds',
+  'annex_transmit_speed' => 'Annex-Transmit-Speed',
+  'usr_port_tap' => 'USR-Port-Tap',
+  'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
+  'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
+  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
+  'lac_port' => 'LAC_Port',
+  'tunnel_assignment_id' => 'Tunnel-Assignment-Id',
+  'fall_through' => 'Fall-Through',
+  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
+  'module_message' => 'Module-Message',
+  'framed_ip_netmask' => 'Framed-IP-Netmask',
+  'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
   'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode',
-  'ascend_data_rate' => 'Ascend-Data-Rate',
-  'realm' => 'Realm',
-  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
-  'ascend_ipx_route' => 'Ascend-IPX-Route',
-  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
-  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
-  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
+  'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
+  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
+  'acct_terminate_cause' => 'Acct-Terminate-Cause',
+  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
+  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
+  'ascend_ppp_address' => 'Ascend-PPP-Address',
+  'caller_id' => 'Caller-ID',
+  'bind_int_interface_name' => 'Bind_Int_Interface_Name',
+  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
+  'usr_modem_group' => 'USR-Modem-Group',
+  'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
+  'ascend_link_compression' => 'Ascend-Link-Compression',
+  'usr_retrains_granted' => 'USR-Retrains-Granted',
+  'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
+  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
+  'quintum_nas_port' => 'Quintum-NAS-Port',
+  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
+  'tunnel_function' => 'Tunnel_Function',
+  'usr_mp_edo' => 'USR-MP-EDO',
+  'le_nat_outmap' => 'LE-NAT-Outmap',
   'usr_modulation_type' => 'USR-Modulation-Type',
-  'service_type' => 'Service-Type',
-  'ascend_callback_delay' => 'Ascend-Callback-Delay',
-  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
-  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
-  'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
-  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
-  'h323_disconnect_time' => 'h323-disconnect-time',
-  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
-  'usr_number_of_blers' => 'USR-Number-of-Blers',
-  'x_ascend_fr_type' => 'X-Ascend-FR-Type',
-  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
-  'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
-  'usr_nas_type' => 'USR-NAS-Type',
-  'acc_dial_port_index' => 'Acc-Dial-Port-Index',
-  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
-  'ascend_fr_type' => 'Ascend-FR-Type',
-  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
-  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
-  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
-  'usr_appletalk' => 'USR-Appletalk',
-  'usr_send_script1' => 'USR-Send-Script1',
-  'usr_send_script2' => 'USR-Send-Script2',
-  'usr_send_script3' => 'USR-Send-Script3',
-  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
-  'acct_input_packets' => 'Acct-Input-Packets',
-  'usr_send_script4' => 'USR-Send-Script4',
-  'usr_send_script5' => 'USR-Send-Script5',
+  'ascend_maximum_time' => 'Ascend-Maximum-Time',
+  'annex_callback_portlist' => 'Annex-Callback-Portlist',
+  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
+  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
+  'arap_password' => 'ARAP-Password',
+  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
+  'ascend_source_auth' => 'Ascend-Source-Auth',
+  'group' => 'Group',
   'usr_send_script6' => 'USR-Send-Script6',
-  'usr_service_option' => 'USR-Service-Option',
-  'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
-  'usr_ip' => 'USR-IP',
-  'usr_tunnel_security' => 'USR-Tunnel-Security',
+  'le_nat_inmap' => 'LE-NAT-Inmap',
+  'chap_password' => 'CHAP-Password',
+  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
+  'annex_receive_speed' => 'Annex-Receive-Speed',
+  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
+  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
+  'smb_account_ctrl' => 'SMB-Account-CTRL',
+  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
+  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
+  'le_admin_group' => 'LE-Admin-Group',
+  'nas_identifier' => 'NAS-Identifier',
+  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
+  'tunnel_connection_id' => 'Tunnel-Connection-Id',
+  'nas_real_port' => 'NAS_Real_Port',
+  'ms_old_arap_password' => 'MS-Old-ARAP-Password',
+  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
+  'erx_primary_wins' => 'ERX-Primary-Wins',
+  'usr_pw_index' => 'USR-PW_Index',
+  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
+  'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
+  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
+  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
+  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
+  'client_dns_pri' => 'Client_DNS_Pri',
+  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
+  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
+  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
+  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
   'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason',
-  'shiva_compression_type' => 'Shiva-Compression-Type',
-  'ascend_pw_warntime' => 'Ascend-PW-Warntime',
-  'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
-  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
-  'cisco_asing_ip_pool' => 'Cisco-Asing-IP-Pool',
-  'acc_route_policy' => 'Acc-Route-Policy',
-  'annex_local_username' => 'Annex-Local-Username',
-  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
-  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
-  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
-  'nas_port_type' => 'NAS-Port-Type',
-  'ascend_route_ip' => 'Ascend-Route-IP',
-  'ascend_client_gateway' => 'Ascend-Client-Gateway',
-  'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
-  'ms_bap_usage' => 'MS-BAP-Usage',
-  'usr_vts_session_key' => 'USR-VTS-Session-Key',
-  'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
-  'ascend_expect_callback' => 'Ascend-Expect-Callback',
-  'password' => 'Password',
-  'packet_type' => 'Packet-Type',
-  'ascend_remote_addr' => 'Ascend-Remote-Addr',
-  'ascend_recv_name' => 'Ascend-Recv-Name',
-  'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
-  'usr_filter_zones' => 'USR-Filter-Zones',
-  'annex_output_filter' => 'Annex-Output-Filter',
-  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
-  'usr_mp_mrru' => 'USR-MP-MRRU',
-  'ascend_call_filter' => 'Ascend-Call-Filter',
-  'usr_keypress_timeout' => 'USR-Keypress-Timeout',
-  'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
-  'acct_authentic' => 'Acct-Authentic',
-  'pppoe_motm' => 'PPPOE_MOTM',
-  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
-  'erx_atm_scr' => 'ERX-Atm-SCR',
-  'erx_address_pool_name' => 'ERX-Address-Pool-Name',
-  'challenge_state' => 'Challenge-State',
-  'usr_multicast_proxy' => 'USR-Multicast-Proxy',
-  'framed_filter_id' => 'Framed-Filter-Id',
-  'add_suffix' => 'Add-Suffix',
-  'ascend_auth_type' => 'Ascend-Auth-Type',
-  'session_timeout' => 'Session-Timeout',
-  'ascend_callback' => 'Ascend-Callback',
-  'usr_chat_script_name' => 'USR-Chat-Script-Name',
-  'port_message' => 'Port-Message',
-  'acct_output_packets' => 'Acct-Output-Packets',
-  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
-  'login_tcp_port' => 'Login-TCP-Port',
-  'erx_tunnel_password' => 'ERX-Tunnel-Password',
-  'shasta_user_privilege' => 'Shasta-User-Privilege',
-  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
-  'usr_security_login_limit' => 'USR-Security-Login-Limit',
-  'usr_start_time' => 'USR-Start-Time',
-  'acc_access_partition' => 'Acc-Access-Partition',
-  'versanet_termination_cau' => 'Versanet-Termination-Cause',
-  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
-  'mcast_maxgroups' => 'Mcast_MaxGroups',
-  'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
-  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
-  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
-  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
-  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
-  'ascend_call_by_call' => 'Ascend-Call-By-Call',
-  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
-  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
-  'ascend_billing_number' => 'Ascend-Billing-Number',
-  'usr_ds0s' => 'USR-DS0s',
-  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
-  'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
-  'login_port' => 'Login-Port',
-  'arap_security' => 'ARAP-Security',
-  'tunnel_deadtime' => 'Tunnel_Deadtime',
-  'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
+  'le_multicast_client' => 'LE-Multicast-Client',
+  'ascend_send_passwd' => 'Ascend-Send-Passwd',
+  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
+  'tunnel_context' => 'Tunnel_Context',
+  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
+  'usr_channel_decrement' => 'USR-Channel-Decrement',
+  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
   'ms_chap_challenge' => 'MS-CHAP-Challenge',
+  'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
+  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
   'ascend_x25_rpoa' => 'Ascend-X25-Rpoa',
-  'login_time' => 'Login-Time',
-  'current_time' => 'Current-Time',
-  'login_service' => 'Login-Service',
-  'ascend_menu_selector' => 'Ascend-Menu-Selector',
-  'ascend_bacp_enable' => 'Ascend-BACP-Enable',
-  'shiva_link_speed' => 'Shiva-Link-Speed',
-  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
-  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
-  'ascend_data_filter' => 'Ascend-Data-Filter',
-  'ascend_target_util' => 'Ascend-Target-Util',
+  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Proto',
+  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
+  'usr_physical_state' => 'USR-Physical-State',
+  'ascend_fr_t391' => 'Ascend-FR-T391',
+  'bind_dot1q_port' => 'Bind_Dot1q_Port',
+  'lac_port_type' => 'LAC_Port_Type',
+  'bg_aging_time' => 'BG_Aging_Time',
+  'erx_atm_scr' => 'ERX-Atm-SCR',
+  'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
+  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
+  'h323_gw_id' => 'h323-gw-id',
+  'h323_preferred_lang' => 'h323-preferred-lang',
+  'usr_min_compression_size' => 'USR-Min-Compression-Size',
+  'usr_compression_type' => 'USR-Compression-Type',
+  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
+  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
+  'annex_local_username' => 'Annex-Local-Username',
+  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
+  'ascend_send_secret' => 'Ascend-Send-Secret',
   'shiva_function' => 'Shiva-Function',
-  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
-  'usr_igmp_routing' => 'USR-IGMP-Routing',
-  'acc_tunnel_port' => 'Acc-Tunnel-Port',
-  'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
-  'medium_type' => 'Medium_Type',
-  'annex_domain_name' => 'Annex-Domain-Name',
-  'ascend_fr_n391' => 'Ascend-FR-N391',
-  'callback_number' => 'Callback-Number',
-  'usr_chassis_temperature' => 'USR-Chassis-Temperature',
-  'dialback_no' => 'Dialback-No',
-  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
-  'ascend_ipx_alias' => 'Ascend-IPX-Alias',
-  'le_nat_inmap' => 'LE-NAT-Inmap',
-  'tunnel_police_rate' => 'Tunnel_Police_Rate',
-  'acct_terminate_cause' => 'Acct-Terminate-Cause',
-  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
-  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
+  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
+  'usr_number_of_blers' => 'USR-Number-of-Blers',
+  'usr_card_type' => 'USR-Card-Type',
+  'ascend_token_idle' => 'Ascend-Token-Idle',
+  'x_ascend_group' => 'X-Ascend-Group',
+  'nt_password' => 'NT-Password',
+  'acct_mcast_in_packets' => 'Acct_Mcast_In_Packets',
+  'usr_supports_tags' => 'USR-Supports-Tags',
+  'ascend_number_sessions' => 'Ascend-Number-Sessions',
+  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
+  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
+  'proxy_to_realm' => 'Proxy-To-Realm',
+  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
+  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
+  'acc_access_community' => 'Acc-Access-Community',
+  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
+  'usr_send_name' => 'USR-Send-Name',
+  'usr_chassis_slot' => 'USR-Chassis-Slot',
+  'login_ip_host' => 'Login-IP-Host',
+  'ascend_netware_timeout' => 'Ascend-Netware-timeout',
+  'vendor_specific' => 'Vendor-Specific',
+  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
+  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
+  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
+  'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
+  'source_validation' => 'Source_Validation',
+  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
+  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
+  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
+  'usr_service_option' => 'USR-Service-Option',
+  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
+  'ascend_fr_direct' => 'Ascend-FR-Direct',
+  'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
+  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
+  'framed_netmask' => 'Framed-Netmask',
+  'usr_connect_speed' => 'USR-Connect-Speed',
+  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
+  'cisco_multilink_id' => 'Cisco-Multilink-ID',
+  'bg_span_dis' => 'BG_Span_Dis',
+  'ascend_multilink_id' => 'Ascend-Multilink-ID',
+  'tunnel_max_tunnels' => 'Tunnel_Max_Tunnels',
+  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
+  'ascend_x25_cug' => 'Ascend-X25-Cug',
+  'shiva_network_protocols' => 'Shiva-Network-Protocols',
+  'ascend_ara_pw' => 'Ascend-Ara-PW',
+  'ip_host_addr' => 'Ip_Host_Addr',
+  'le_ip_gateway' => 'LE-IP-Gateway',
+  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
+  'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
+  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
+  'tunnel_group' => 'Tunnel_Group',
+  'bind_sub_password' => 'Bind_Sub_Password',
+  'eap_message' => 'EAP-Message',
   'exec_program' => 'Exec-Program',
-  'h323_disconnect_cause' => 'h323-disconnect-cause',
-  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
-  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
-  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
-  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
-  'cisco_presession_time' => 'Cisco-PreSession-Time',
-  'ms_chap_response' => 'MS-CHAP-Response',
-  'usr_spoofing' => 'USR-Spoofing',
-  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
-  'ascend_x25_cug' => 'Ascend-X25-Cug',
-  'ascend_fr_dlci' => 'Ascend-FR-DLCI',
-  'shiva_user_attributes' => 'Shiva-User-Attributes',
-  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
-  'ascend_transit_number' => 'Ascend-Transit-Number',
-  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
-  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
-  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
-  'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
-  'le_connect_detail' => 'LE-Connect-Detail',
-  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
-  'proxy_to_realm' => 'Proxy-To-Realm',
-  'usr_retrains_requested' => 'USR-Retrains-Requested',
-  'h323_remote_address' => 'h323-remote-address',
-  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
-  'acc_customer_id' => 'Acc-Customer-Id',
-  'ms_chap2_response' => 'MS-CHAP2-Response',
-  'ascend_host_info' => 'Ascend-Host-Info',
-  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
-  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
-  'login_lat_service' => 'Login-LAT-Service',
-  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
-  'ascend_event_type' => 'Ascend-Event-Type',
-  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
-  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
-  'usr_min_compression_size' => 'USR-Min-Compression-Size',
-  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
-  'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
-  'usr_port_tap_output' => 'USR-Port-Tap-Output',
-  'ascend_x25_nui' => 'Ascend-X25-Nui',
-  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
+  'bg_path_cost' => 'BG_Path_Cost',
+  'auth_type' => 'Auth-Type',
+  'usr_modem_training_time' => 'USR-Modem-Training-Time',
   'ascend_cbcp_enable' => 'Ascend-CBCP-Enable',
-  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
+  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
+  'ascend_redirect_number' => 'Ascend-Redirect-Number',
+  'h323_credit_time' => 'h323-credit-time',
+  'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
+  'shiva_link_protocol' => 'Shiva-Link-Protocol',
+  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
+  'client_id' => 'Client-Id',
+  'usr_appletalk' => 'USR-Appletalk',
+  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
+  'annex_output_filter' => 'Annex-Output-Filter',
+  'pvc_circuit_padding' => 'PVC_Circuit_Padding',
+  'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
+  'h323_time_and_day' => 'h323-time-and-day',
+  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
+  'termination_action' => 'Termination-Action',
+  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
+  'acct_tunnel_packets_lost' => 'Acct-Tunnel-Packets-Lost',
+  'framed_filter_id' => 'Framed-Filter-Id',
+  'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
+  'ascend_token_expiry' => 'Ascend-Token-Expiry',
+  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
+  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
+  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
+  'acc_request_type' => 'Acc-Request-Type',
+  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
+  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
+  'cisco_presession_time' => 'Cisco-PreSession-Time',
+  'usr_chat_script_name' => 'USR-Chat-Script-Name',
+  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
+  'ascend_expect_callback' => 'Ascend-Expect-Callback',
+  'framed_mtu' => 'Framed-MTU',
+  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
+  'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
+  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
+  'shasta_vpn_name' => 'Shasta-VPN-Name',
+  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
+  'ascend_third_prompt' => 'Ascend-Third-Prompt',
+  'connect_rate' => 'Connect-Rate',
+  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
+  'called_station_id' => 'Called-Station-Id',
+  'usr_pw_cutoff' => 'USR-PW_Cutoff',
+  'ascend_data_rate' => 'Ascend-Data-Rate',
+  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
+  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
+  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
+  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
+  'ascend_call_filter' => 'Ascend-Call-Filter',
+  'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
+  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
+  'bind_int_context' => 'Bind_Int_Context',
+  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
+  'crypt_password' => 'Crypt-Password',
+  'challenge_state' => 'Challenge-State',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-DNS',
+  'strip_user_name' => 'Strip-User-Name',
+  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
+  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
+  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
+  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
   'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name',
-  'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
+  'usr_call_type' => 'USR-Call-Type',
+  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
+  'acct_output_gigawords' => 'Acct-Output-Gigawords',
+  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
+  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
+  'login_lat_port' => 'Login-LAT-Port',
+  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
+  'acct_mcast_in_octets' => 'Acct_Mcast_In_Octets',
+  'erx_sa_validate' => 'ERX-Sa-Validate',
+  'ascend_service_type' => 'Ascend-Service-Type',
+  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
+  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
+  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
+  'acc_ip_compression' => 'Acc-Ip-Compression',
+  'lac_real_port_type' => 'LAC_Real_Port_Type',
+  'ascend_if_netmask' => 'Ascend-IF-Netmask',
+  'acct_session_start_time' => 'Acct-Session-Start-Time',
+  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
+  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
+  'mcast_maxgroups' => 'Mcast_MaxGroups',
+  'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
+  'ascend_cache_time' => 'Ascend-Cache-Time',
+  'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
+  'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
+  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
+  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
+  'usr_igmp_routing' => 'USR-IGMP-Routing',
+  'h323_prompt_id' => 'h323-prompt-id',
+  'le_terminate_detail' => 'LE-Terminate-Detail',
+  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
+  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
+  'nas_port' => 'NAS-Port',
+  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
+  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
+  'ascend_auth_type' => 'Ascend-Auth-Type',
+  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
+  'h323_credit_amount' => 'h323-credit-amount',
+  'usr_reply_script1' => 'USR-Reply-Script1',
+  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
+  'current_time' => 'Current-Time',
+  'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
+  'ascend_authen_alias' => 'Ascend-Authen-Alias',
+  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
+  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
+  'usr_event_date_time' => 'USR-Event-Date-Time',
+  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
+  'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
+  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
+  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
   'acc_output_errors' => 'Acc-Output-Errors',
-  'h323_redirect_ip_address' => 'h323-redirect-ip-address',
-  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
-  'cisco_avpair' => 'Cisco-AVPair',
-  'usr_slot_connected_to' => 'USR-Slot-Connected-To',
-  'framed_route' => 'Framed-Route',
-  'ascend_global_call_id' => 'Ascend-Global-Call-Id',
-  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
-  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
+  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
+  'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
+  'bind_l2tp_tunnel_name' => 'Bind_L2TP_Tunnel_Name',
+  'replicate_to_realm' => 'Replicate-To-Realm',
+  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
+  'annex_mrru' => 'Annex-MRRU',
+  'event_timestamp' => 'Event-Timestamp',
+  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
+  'h323_call_origin' => 'h323-call-origin',
+  'x_ascend_fr_type' => 'X-Ascend-FR-Type',
+  'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
+  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
+  'ascend_atm_vci' => 'Ascend-ATM-Vci',
+  'usr_port_tap_output' => 'USR-Port-Tap-Output',
+  'session' => 'Session',
+  'ascend_uu_info' => 'Ascend-UU-Info',
+  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
+  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
+  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
+  'acc_dial_port_index' => 'Acc-Dial-Port-Index',
+  'cisco_nas_port' => 'Cisco-NAS-Port',
+  'usr_send_script1' => 'USR-Send-Script1',
+  'usr_tunnel_security' => 'USR-Tunnel-Security',
+  'arap_security' => 'ARAP-Security',
+  'tunnel_preference' => 'Tunnel-Preference',
+  'usr_reply_script4' => 'USR-Reply-Script4',
   'h323_currency_type' => 'h323-currency-type',
-  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
-  'pvc_encapsulation_type' => 'PVC_Encapsulation_Type',
-  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
+  'usr_rmmie_status' => 'USR-RMMIE-Status',
+  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
+  'annex_syslog_tap' => 'Annex-Syslog-Tap',
+  'usr_send_script4' => 'USR-Send-Script4',
+  'acc_clearing_location' => 'Acc-Clearing-Location',
+  'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
+  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
+  'usr_at_input_filter' => 'USR-AT-Input-Filter',
+  'usr_auth_mode' => 'USR-Auth-Mode',
+  'shiva_session_id' => 'Shiva-Session-Id',
   'usr_expected_voltage' => 'USR-Expected-Voltage',
-  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
-  'shiva_customer_id' => 'Shiva-Customer-Id',
-  'usr_compression_algorith' => 'USR-Compression-Algorithm',
-  'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
-  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
-  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
-  'usr_send_password' => 'USR-Send-Password',
-  'prompt' => 'Prompt',
-  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
-  'usr_event_id' => 'USR-Event-Id',
-  'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
-  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
-  'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
-  'framed_mtu' => 'Framed-MTU',
-  'acc_reason_code' => 'Acc-Reason-Code',
-  'bind_l2tp_flow_control' => 'Bind_L2TP_Flow_Control',
+  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
+  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
+  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
+  'framed_routing' => 'Framed-Routing',
+  'pam_auth' => 'Pam-Auth',
+  'usr_interface_index' => 'USR-Interface-Index',
+  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
+  'usr_end_time' => 'USR-End-Time',
+  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
+  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
+  'bind_dot1q_vlan_tag_id' => 'Bind_Dot1q_Vlan_Tag_Id',
+  'acct_tunnel_connection' => 'Acct-Tunnel-Connection',
+  'tunnel_retransmit' => 'Tunnel_Retransmit',
+  'x_ascend_backup' => 'X-Ascend-Backup',
+  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
+  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
+  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
+  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
+  'acct_authentic' => 'Acct-Authentic',
+  'x_ascend_force_56' => 'X-Ascend-Force-56',
+  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
+  'reply_message' => 'Reply-Message',
+  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
+  'class' => 'Class',
+  'h323_conf_id' => 'h323-conf-id',
   'ascend_cbcp_delay' => 'Ascend-CBCP-Delay',
-  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
+  'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
+  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
+  'usr_local_ip_address' => 'USR-Local-IP-Address',
+  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
+  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
+  'annex_local_ip_address' => 'Annex-Local-IP-Address',
+  'usr_at_output_filter' => 'USR-AT-Output-Filter',
+  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
+  'annex_domain_name' => 'Annex-Domain-Name',
+  'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
+  'ascend_event_type' => 'Ascend-Event-Type',
+  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
+  'exec_program_wait' => 'Exec-Program-Wait',
 
   #NOMENT
-  'nomadix_bw_down' => 'Nomadix-Bw-Down',
-  'nomadix_bw_up' => 'Nomadix-Bw-Up',
   'nomadix_ip_upsell' => 'Nomadix-IP-Upsell',
+
+  #NETC.NET.AU (RADIATOR?)
+  'authentication_type' => 'Authentication-Type',
+
 );
 
 1;
-- 
cgit v1.2.1


From 25fdab941288302f1aa8063d4e237f62876c59b8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Sep 2002 09:11:13 +0000
Subject: doc

---
 Makefile                     | 17 +++++++++++++++--
 httemplate/docs/install.html |  9 ++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6e9ef650b..adb9d61df 100644
--- a/Makefile
+++ b/Makefile
@@ -11,18 +11,31 @@ TEMPLATE = asp
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
+#deb, others?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#freebsd
+#FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 
+#deb, others?
 INIT_FILE = /etc/init.d/freeside
+#freebsd
+#INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
+#deb, others?
 HTTPD_RESTART = /etc/init.d/apache restart
-FREESIDE_RESTART = /etc/init.d/freeside restart
+#freebsd
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
+FREESIDE_RESTART = $INIT_FILE restart
+
+#deb, others?
 INSTALLGROUP = root
+#freebsd
+INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
-QUEUED_USER=ivan
+QUEUED_USER=fs_queue
 
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index e6f4edbbc..3d19e4d35 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -64,7 +64,7 @@ Install the Freeside distribution:
     <ul>
       <li> with <a href="http://www.postgresql.org/users-lounge/docs/7.1/postgres/user-manag.html#DATABASE-USERS">PostgreSQL</a>:
         <pre>
-$ su postgres
+$ su postgres (pgsql on some distributions)
 $ createuser -P freeside
 Enter password for user "freeside": 
 Enter it again: 
@@ -81,7 +81,7 @@ mysql> GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP on freeside.* T
 <!--  <li>Unpack the tarball: <pre>gunzip -c fs-x.y.z.tar.gz | tar xvf -</pre>-->
   <li>Edit the top-level Makefile:
     <ul>
-      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:host=localhost;dbname=freeside</tt> for PostgresSQL<!-- or <tt>DBI:mysql:freeside</tt> for MySQL-->.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
+      <li>Set <tt>DATASOURCE</tt> to your <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI data source</a>, for example, <tt>DBI:Pg:dbname=freeside</tt> for PostgresSQL<!-- or <tt>DBI:mysql:freeside</tt> for MySQL-->.  See the <a href="http://search.cpan.org/doc/TIMB/DBI-1.28/DBI.pm">DBI manpage</a> and the <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">manpage for your DBD</a> for the exact syntax of your DBI data source.
       <li>Set <tt>DB_PASSWORD</tt> to the freeside database user's password.
     </ul>
   <li>Add the freeside database to your database engine:
@@ -164,7 +164,6 @@ require&nbsp;"/usr/local/apache/conf/handler.pl";
 <li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
 <pre>
 &lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
-PerlSetVar Global /usr/local/etc/freeside/asp-global/
 AuthName Freeside
 AuthType Basic
 AuthUserFile /usr/local/etc/freeside/htpasswd
@@ -181,7 +180,7 @@ $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/
 $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
   <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
-  <li>As the freeside UNIX user, run <tt>freeside--setup <b>username</b></tt> (in the untar'ed freeside directory) to create the database tables, passing the username of a Freeside user you created above:
+  <li>As the freeside UNIX user, run <tt>freeside-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
 $ freeside-setup <b>username</b>
@@ -190,7 +189,7 @@ $ freeside-setup <b>username</b>
   <li>As the freeside UNIX user, run <tt>bin/populate-msgcat <b>username</b></tt> (in the untar'ed freeside directory) to populate the message catalog, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
-$ cd <b>/path/to/freeside-1.4.0/</b>
+$ cd <b>/path/to/freeside/</b>
 $ bin/populate-msgcat <b>username</b>
 </pre>
   <li><tt>freeside-queued</tt> was installed with the Perl modules.  Start it now and ensure that is run upon system startup (Do this manually, or edit the top-level Makefile, replacing INIT_FILE with the appropriate location on your systemand QUEUED_USER with the username of a Freeside user you created above, and run <tt>make install-init</tt>)
-- 
cgit v1.2.1


From abfd68d00c867c64c033915374f8fc6b1ff7e6d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 04:45:21 +0000
Subject: tyop

---
 httemplate/search/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index dcf261296..b2ed723e2 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -145,7 +145,7 @@ END
       $domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
                 "\">". $svc_domain->domain. "</A>";
     } else {
-      die "No svc_domain.svcnum record for svc_acct.domsvc: ".'
+      die "No svc_domain.svcnum record for svc_acct.domsvc: ".
           $svc_acct->domsvc;
     }
     my($cust_pkg,$cust_main);
-- 
cgit v1.2.1


From b51f1d29bb0c6b81c23e8f14dc88e3876a5f2815 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 05:25:38 +0000
Subject: oops

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index adb9d61df..1c5f1d40d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ FREESIDE_RESTART = $INIT_FILE restart
 #deb, others?
 INSTALLGROUP = root
 #freebsd
-INSTALLGROUP = wheel
+#INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
-- 
cgit v1.2.1


From c7b4ef5e2731387e15d369d6561db679ad070cfa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 05:26:05 +0000
Subject: fix for inserting un-audited accounts

---
 FS/FS/svc_acct.pm | 84 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 991bbef48..04a86a8e0 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -338,53 +338,57 @@ sub insert {
   }
 
   my $cust_pkg = $self->cust_svc->cust_pkg;
-  my $cust_main = $cust_pkg->cust_main;
 
-  if ( $conf->exists('emailinvoiceauto') ) {
-    my @invoicing_list = $cust_main->invoicing_list;
-    push @invoicing_list, $self->email;
-    $cust_main->invoicing_list(@invoicing_list);
-  }
+  if ( $cust_pkg ) {
+    my $cust_main = $cust_pkg->cust_main;
 
-  #welcome email
-  my $to = '';
-  if ( $welcome_template && $cust_pkg ) {
-    my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
-    if ( $to ) {
-      my $wqueue = new FS::queue {
-        'svcnum' => $self->svcnum,
-        'job'    => 'FS::svc_acct::send_email'
-      };
-      warn "attempting to queue email to $to";
-      my $error = $wqueue->insert(
-        'to'       => $to,
-        'from'     => $welcome_from,
-        'subject'  => $welcome_subject,
-        'mimetype' => $welcome_mimetype,
-        'body'     => $welcome_template->fill_in( HASH => {
-                        'username' => $self->username,
-                        'password' => $self->_password,
-                        'first'    => $cust_main->first,
-                        'last'     => $cust_main->getfield('last'),
-                        'pkg'      => $cust_pkg->part_pkg->pkg,
-                      } ),
-      );
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "queuing welcome email: $error";
-      }
-  
-      foreach my $jobnum ( @jobnums ) {
-        my $error = $wqueue->depend_insert($jobnum);
+    if ( $conf->exists('emailinvoiceauto') ) {
+      my @invoicing_list = $cust_main->invoicing_list;
+      push @invoicing_list, $self->email;
+      $cust_main->invoicing_list(\@invoicing_list);
+    }
+
+    #welcome email
+    my $to = '';
+    if ( $welcome_template && $cust_pkg ) {
+      my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
+      if ( $to ) {
+        my $wqueue = new FS::queue {
+          'svcnum' => $self->svcnum,
+          'job'    => 'FS::svc_acct::send_email'
+        };
+        warn "attempting to queue email to $to";
+        my $error = $wqueue->insert(
+          'to'       => $to,
+          'from'     => $welcome_from,
+          'subject'  => $welcome_subject,
+          'mimetype' => $welcome_mimetype,
+          'body'     => $welcome_template->fill_in( HASH => {
+                          'username' => $self->username,
+                          'password' => $self->_password,
+                          'first'    => $cust_main->first,
+                          'last'     => $cust_main->getfield('last'),
+                          'pkg'      => $cust_pkg->part_pkg->pkg,
+                        } ),
+        );
         if ( $error ) {
           $dbh->rollback if $oldAutoCommit;
-          return "queuing welcome email job dependancy: $error";
+          return "queuing welcome email: $error";
         }
+
+        foreach my $jobnum ( @jobnums ) {
+          my $error = $wqueue->depend_insert($jobnum);
+          if ( $error ) {
+            $dbh->rollback if $oldAutoCommit;
+            return "queuing welcome email job dependancy: $error";
+          }
+        }
+
       }
 
     }
-  
-  }
+
+  } # if ( $cust_pkg )
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   ''; #no error
@@ -760,7 +764,7 @@ sub check {
   unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) {
     unless ( $recref->{slipip} eq '0e0' ) {
       $recref->{slipip} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/
-        or return "Illegal slipip". $self->slipip;
+        or return "Illegal slipip: ". $self->slipip;
       $recref->{slipip} = $1;
     } else {
       $recref->{slipip} = '0e0';
-- 
cgit v1.2.1


From 191efe9f769091cab0ebcf66d906736bfc0745a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Sep 2002 05:28:11 +0000
Subject: fix $INIT_FILE usage

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1c5f1d40d..b2b2fcdbc 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
-FREESIDE_RESTART = $INIT_FILE restart
+FREESIDE_RESTART = ${INIT_FILE} restart
 
 #deb, others?
 INSTALLGROUP = root
-- 
cgit v1.2.1


From e88050711de04bdd33f298d84a35c943bc6dec24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 05:36:29 +0000
Subject: lock mapsecrets file

---
 FS/bin/freeside-adduser | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 424123226..c3ee05b9b 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,9 +1,10 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.7 2002-08-25 01:16:30 ivan Exp $
+# $Id: freeside-adduser,v 1.8 2002-09-27 05:36:29 ivan Exp $
 
 use strict;
 use vars qw($opt_h $opt_b $opt_c $opt_s);
+use Fcntl qw(:flock);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
@@ -24,7 +25,8 @@ if ( $opt_h ) {
 my $secretfile = $opt_s || 'secrets';
 
 open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-  or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+  and flock(MAPSECRETS,LOCK_EX)
+    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
 print MAPSECRETS "$user $secretfile\n";
 close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
 
-- 
cgit v1.2.1


From 13988e77a2e52f427783f13f3a5b0131fcb7b01b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 06:00:37 +0000
Subject: only load Devel::AutoProfiler if it is installed

---
 htetc/global.asa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htetc/global.asa b/htetc/global.asa
index 4f1ca45d3..a2d8dee12 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -1,6 +1,6 @@
-#BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
+BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
 #BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); }
-use Devel::AutoProfiler;
+#use Devel::AutoProfiler;
 
 use strict;
 use vars qw( $cgi $p );
-- 
cgit v1.2.1


From bbcf7a70f3e87872b991cef23fc15ae27a4c6bec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 12:14:12 +0000
Subject: don't chop blanks

---
 FS/FS/UID.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 6962b2768..ebf9b96e5 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -87,7 +87,7 @@ sub forksuidsetup {
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
-                          'ChopBlanks' => 1,
+                          #'ChopBlanks' => 1,
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
   foreach ( keys %callback ) {
@@ -256,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.20 2002-09-20 10:16:28 ivan Exp $
+$Id: UID.pm,v 1.21 2002-09-27 12:14:12 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 70353b6415b4a9b07a78b3f108bc26272d603847 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 27 Sep 2002 12:14:32 +0000
Subject: allow + in md5 encrypted passwords

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 04a86a8e0..44f3ef45f 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -791,7 +791,7 @@ sub check {
     #$recref->{password} = $1.
     #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
     #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;]{13,34})$/ ) {
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;\+]{13,34})$/ ) {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
-- 
cgit v1.2.1


From b3c55b5f123b1b5c8ebedfa1826cbf19a0dcc013 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Oct 2002 15:29:14 +0000
Subject: fix implicit RADIUS password attribute to be Crypt-Password for
 encrypted pw's

---
 FS/FS/svc_acct.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 44f3ef45f..6c0807df2 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -857,7 +857,9 @@ expected to change in the future.
 
 sub radius_check {
   my $self = shift;
-  ( 'Password' => $self->_password,
+  my $password = $self->_password;
+  my $pw_attrib = length($password) <= 12 ? 'Password' : 'Crypt-Password';
+  ( $pw_attrib => $password,
     map {
       /^(rc_(.*))$/;
       my($column, $attrib) = ($1, $2);
-- 
cgit v1.2.1


From a47374ae5aba9530e999f630ca5a21eb758cc0b5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:09:21 +0000
Subject: default for customers with no invoices   was: print   is now: send
 email to invoice from address

---
 FS/FS/cust_bill.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f0667258c..296c8b6a6 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -352,7 +352,11 @@ sub send {
   my @print_text = $self->print_text('', $template);
   my @invoicing_list = $self->cust_main->invoicing_list;
 
-  if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+  if ( grep { $_ ne 'POST' } @invoicing_list or !@invoicing_list  ) { #email
+
+    #better to notify this person than silence
+    @invoicing_list = ($invoice_from) unless @invoicing_list;
+
     #false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
     #$ENV{SMTPHOSTS} = $smtpmachine;
     $ENV{MAILADDRESS} = $invoice_from;
@@ -377,7 +381,7 @@ sub send {
 
   }
 
-  if ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { #postal
+  if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
     open(LPR, "|$lpr")
       or return "Can't open pipe to $lpr: $!";
     print LPR @print_text;
@@ -1039,7 +1043,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.46 2002-09-21 11:17:39 ivan Exp $
+$Id: cust_bill.pm,v 1.47 2002-10-04 12:09:21 ivan Exp $
 
 =head1 BUGS
 
-- 
cgit v1.2.1


From 2f742fce69ed1d168f95478f36a5e70b381d64a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:30:19 +0000
Subject: adding

---
 FS/bin/freeside-count-active-customers | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 FS/bin/freeside-count-active-customers

diff --git a/FS/bin/freeside-count-active-customers b/FS/bin/freeside-count-active-customers
new file mode 100755
index 000000000..759085a73
--- /dev/null
+++ b/FS/bin/freeside-count-active-customers
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+domain=$1
+
+echo "\t
+select count(*) from cust_main where 
+          0 < ( SELECT COUNT(*) FROM cust_pkg
+                       WHERE cust_pkg.custnum = cust_main.custnum
+                         AND ( cust_pkg.cancel IS NULL
+                               OR cust_pkg.cancel = 0
+                             )
+                   )
+            OR 0 = ( SELECT COUNT(*) FROM cust_pkg
+                       WHERE cust_pkg.custnum = cust_main.custnum
+                   );
+" | psql -U freeside -q $domain | head -1
+
-- 
cgit v1.2.1


From 54a27b35957baddb725e2b7544d9f134989bfd99 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:39:29 +0000
Subject: turn on AutoCommit when vacuuming

---
 FS/bin/freeside-daily | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 22bf2c963..52028b773 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -50,6 +50,7 @@ foreach $cust_main ( @cust_main ) {
 }
 
 if ( driver_name eq 'Pg' ) {
+  dbh->{AutoCommit} = 1; #so we can vacuum
   foreach my $statement ( 'vacuum', 'vacuum analyze' ) {
     my $sth = dbh->prepare($statement) or die dbh->errstr;
     $sth->execute or die $sth->errstr;
-- 
cgit v1.2.1


From c4d2226e0cc4bdd6d9f689b061b5f4f5b9609b0b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:57:06 +0000
Subject: working on the road:   - easier "change package" link for changing
 one package to another   - sqlradius export now compatible with Pg   -
 indices on phone numbers   - install instructions specify Pg 7.1 (at least
 until ILIKE thing is changed)   - searching on phone number fragments

---
 FS/FS/part_export/sqlradius.pm       |  8 ++---
 FS/FS/type_pkgs.pm                   | 15 +++++++-
 FS/bin/freeside-setup                |  9 +++--
 httemplate/docs/install.html         |  2 +-
 httemplate/edit/process/cust_pkg.cgi | 25 +++++++++-----
 httemplate/misc/change_pkg.cgi       | 66 ++++++++++++++++++++++++++++++++++++
 httemplate/search/cust_main.cgi      | 19 +++++++----
 httemplate/view/cust_main.cgi        |  3 ++
 8 files changed, 123 insertions(+), 24 deletions(-)
 create mode 100755 httemplate/misc/change_pkg.cgi

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 3c781c043..0f93703ae 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -187,10 +187,10 @@ sub sqlradius_insert { #subroutine, not method
     } else {
 
       my $i_sth = $dbh->prepare(
-        "INSERT INTO rad$table ( id, UserName, Attribute, Value ) ".
-          "VALUES ( ?, ?, ?, ? )"
+        "INSERT INTO rad$table ( UserName, Attribute, Value ) ".
+          "VALUES ( ?, ?, ? )"
       ) or die $dbh->errstr;
-      $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
+      $i_sth->execute( $username, $attribute, $attributes{$attribute} )
         or die $i_sth->errstr;
 
     }
@@ -204,7 +204,7 @@ sub sqlradius_usergroup_insert { #subroutine, not method
   my( $username, @groups ) = @_;
 
   my $sth = $dbh->prepare( 
-    "INSERT INTO usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+    "INSERT INTO usergroup ( UserName, GroupName ) VALUES ( ?, ? )"
   ) or die $dbh->errstr;
   foreach my $group ( @groups ) {
     $sth->execute( '', $username, $group )
diff --git a/FS/FS/type_pkgs.pm b/FS/FS/type_pkgs.pm
index 8e0d4ef56..efba60dbd 100644
--- a/FS/FS/type_pkgs.pm
+++ b/FS/FS/type_pkgs.pm
@@ -94,11 +94,24 @@ sub check {
   ''; #no error
 }
 
+=item part_pkg
+
+Returns the FS::part_pkg object associated with this record.
+
+=cut
+
+sub part_pkg {
+  my $self = shift;
+  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+}
+
+=cut
+
 =back
 
 =head1 VERSION
 
-$Id: type_pkgs.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: type_pkgs.pm,v 1.2 2002-10-04 12:57:06 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index f6a543fc8..d61e8b0bf 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -111,8 +111,9 @@ my($dbdef) = new DBIx::DBSchema ( map {
 my $cust_main = $dbdef->table('cust_main');
 unless ($ship) { #remove ship_ from cust_main
   $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
-} else { #add indices on ship_last and ship_company
-  push @{$cust_main->index->lol_ref}, ( ['ship_last'], ['ship_company'] ) 
+} else { #add indices
+  push @{$cust_main->index->lol_ref},
+    map { [ "ship_$_" ] } qw( last company daytime night fax );
 }
 
 #add radius attributes to svc_acct
@@ -496,7 +497,9 @@ sub tables_hash_hack {
       'primary_key' => 'custnum',
       'unique' => [],
       #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
+      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
+                   [ 'daytime' ], [ 'night' ], [ 'fax' ],
+                 ],
     },
 
     'cust_main_invoice' => {
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 3d19e4d35..3c48a746f 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -12,7 +12,7 @@ Before installing, you need:
   <li><a href="http://rsync.samba.org/">rsync</a>
   <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
-      <li><a href="http://www.postgresql.org/">PostgreSQL</a> (v7 or higher) is recommended.
+      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7.1.x or later, not 7.0.x).
       <li>MySQL versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list.
 <!--       <li>MySQL has been reported to work.
          <b>MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported</b>.  If you want to use MySQL, you <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>, and set it as the default table type using the <code>--default-table-type=BDB</code> or <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=BDB</code> or <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>. -->
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index f8c9f5151..df8471c27 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -11,16 +11,23 @@ my @remove_pkgnums = map {
   $1;
 } $cgi->param('remove_pkg');
 
+my $error_redirect;
 my @pkgparts;
-foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
-    my $num_pkgs = $1;
-    while ( $num_pkgs-- ) {
-      push @pkgparts,$pkgpart;
+if ( $cgi->param('new_pkgpart') =~ /^(\d+)$/ ) { #came from misc/change_pkg.cgi
+  $error_redirect = "misc/change_pkg.cgi";
+  @pkgparts = ($1);
+} else { #came from edit/cust_pkg.cgi
+  $error_redirect = "edit/cust_pkg.cgi";
+  foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+    if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
+      my $num_pkgs = $1;
+      while ( $num_pkgs-- ) {
+        push @pkgparts,$pkgpart;
+      }
+    } else {
+      $error = "Illegal quantity";
+      last;
     }
-  } else {
-    $error = "Illegal quantity";
-    last;
   }
 }
 
@@ -28,7 +35,7 @@ $error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
+  print $cgi->redirect(popurl(3). $error_redirect. '?'. $cgi->query_string );
 } else {
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
new file mode 100755
index 000000000..5346fd9d8
--- /dev/null
+++ b/httemplate/misc/change_pkg.cgi
@@ -0,0 +1,66 @@
+<!-- mason kludge -->
+<%
+
+my $pkgnum;
+if ( $cgi->param('error') ) {
+  #$custnum = $cgi->param('custnum');
+  #%remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
+  $pkgnum = ($cgi->param('remove_pkg'))[0];
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  #$custnum = $1;
+  $pkgnum = $1;
+  #%remove_pkg = ();
+}
+
+my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } )
+  or die "unknown pkgnum $pkgnum";
+my $custnum = $cust_pkg->custnum;
+
+my $conf = new FS::Conf;
+
+my $p1 = popurl(1);
+
+my $cust_main = $cust_pkg->cust_main
+  or die "can't get cust_main record for custnum ". $cust_pkg->custnum.
+         " ( pkgnum ". cust_pkg->pkgnum. ")";
+my $agent = $cust_main->agent;
+
+print header("Change Package",  menubar(
+  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+  'Main Menu' => $p,
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT><BR><BR>"
+  if $cgi->param('error');
+
+my $part_pkg = $cust_pkg->part_pkg;
+
+print small_custview( $cust_main, $conf->config('countrydefault') ).
+      qq!<FORM ACTION="${p}edit/process/cust_pkg.cgi" METHOD=POST>!.
+      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+      qq!<INPUT TYPE="hidden" NAME="remove_pkg" VALUE="$pkgnum">!.
+      '<BR>Current package: '. $part_pkg->pkg. ' - '. $part_pkg->comment.
+      qq!<BR>New package: <SELECT NAME="new_pkgpart"><OPTION VALUE=0></OPTION>!;
+
+foreach my $part_pkg (
+  grep { ! $_->disabled && $_->pkgpart != $cust_pkg->pkgpart }
+    map { $_->part_pkg } $agent->agent_type->type_pkgs
+) {
+  my $pkgpart = $part_pkg->pkgpart;
+  print qq!<OPTION VALUE="$pkgpart"!;
+  print ' SELECTED' if $cgi->param('error')
+                       && $cgi->param('new_pkgpart') == $pkgpart;
+  print qq!>$pkgpart: !. $part_pkg->pkg. ' - '. $part_pkg->comment. '</OPTION>';
+}
+
+print <<END;
+</SELECT>
+<BR><BR><INPUT TYPE="submit" VALUE="Change package">
+    </FORM>
+  </BODY>
+</HTML>
+END
+%>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 0a98b1891..ac238b63e 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -636,12 +636,19 @@ sub phonesearch {
 
   my $phone = $cgi->param('phone_text');
 
-  #false laziness with Record::ut_phonen, only works with US/CA numbers...
+  #(no longer really) false laziness with Record::ut_phonen
+  #only works with US/CA numbers...
   $phone =~ s/\D//g;
-  $phone =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
-    or eidiot gettext('illegal_phone'). ": $phone";
-  $phone = "$1-$2-$3";
-  $phone .= " x$4" if $4;
+  if ( $phone =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/ ) {
+    $phone = "$1-$2-$3";
+    $phone .= " x$4" if $4;
+  } elsif ( $phone =~ /^(\d{3})(\d{4})$/ ) {
+    $phone = "$1-$2";
+  } elsif ( $phone =~ /^(\d{3,4})$/ ) {
+    $phone = $1;
+  } else {
+    eidiot gettext('illegal_phone'). ": $phone";
+  }
 
   my @fields = qw(daytime night fax);
   push @fields, qw(ship_daytime ship_night ship_fax)
@@ -650,7 +657,7 @@ sub phonesearch {
   for my $field ( @fields ) {
     push @cust_main, qsearch ( 'cust_main', 
                                { $field => { 'op'    => 'LIKE',
-                                             'value' => "$phone%" } } );
+                                             'value' => "%$phone%" } } );
   }
 
   \@cust_main;
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 0610bc324..707de8d70 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -370,6 +370,9 @@ foreach my $package (@packages) {
         qq!$pkg - $comment (&nbsp;<a href="$pkgview">Details</a>&nbsp;)!;
        # | !;
 
+  print qq! (&nbsp;<A HREF="${p}misc/change_pkg.cgi?$pkgnum">!.
+        'Change&nbsp;package</A>&nbsp;)';
+
   #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
   unless ( $package->getfield('cancel') ) {
     print ' (&nbsp;';
-- 
cgit v1.2.1