6 files changed, 16 insertions, 49 deletions
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index a58099184..aa21ac076 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -7,6 +7,7 @@ use subs qw( _cache _provision );
 use IO::Scalar;
 use Data::Dumper;
 use Digest::MD5 qw(md5_hex);
+use Digest::SHA qw(sha512_hex);
 use Date::Format;
 use Time::Duration;
 use Time::Local qw(timelocal_nocheck);
@@ -278,7 +279,7 @@ sub login {
 
   my $session_id;
   do {
-    $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
+    $session_id = sha512_hex(time(). {}. rand(). $$)
   } until ( ! defined _cache->get($session_id) ); #just in case
 
   my $timeout = $conf->config('selfservice-session_timeout') || '1 hour';
@@ -2896,7 +2897,7 @@ sub reset_passwd {
 
   my $reset_session_id;
   do {
-    $reset_session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
+    $reset_session_id = sha512_hex(time(). {}. rand(). $$)
   } until ( ! defined _cache->get("reset_passwd_$reset_session_id") ); #just in case
 
   _cache->set( "reset_passwd_$reset_session_id", $reset_session, $timeout );
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0eed8ee5d..301d972b3 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2150,7 +2150,7 @@ and customer address. Include units.',
     'section'     => 'self-service',
     'description' => 'Acceptable payment types for the signup server',
     'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD DCRD CHEK DCHK LECB PREPAY PPAL BILL COMP) ],
+    'select_enum' => [ qw(CARD DCRD CHEK DCHK PREPAY PPAL BILL COMP) ],
   },
 
   {
@@ -2538,7 +2538,7 @@ and customer address. Include units.',
     'section'     => 'billing',
     'description' => 'Available payment types.',
     'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD PPAL COMP) ],
+    'select_enum' => [ qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD PPAL COMP) ],
   },
 
   {
@@ -2546,7 +2546,7 @@ and customer address. Include units.',
     'section'     => 'UI',
     'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
     'type'        => 'select',
-    'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD PPAL COMP HIDE) ],
+    'select_enum' => [ '', qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD PPAL COMP HIDE) ],
   },
 
   {
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index fefa1bc5e..4e9c4f19b 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -358,6 +358,9 @@ if ( -e $addl_handler_use_file ) {
   use FS::cable_provider;
   use FS::cust_credit_void;
   use FS::discount_class;
+  use FS::alarm_system;
+  use FS::alarm_type;
+  use FS::alarm_station;
   use FS::addr_range;
   # Sammath Naur
 
diff --git a/FS/FS/part_export/bulkvs_e911.pm b/FS/FS/part_export/bulkvs_e911.pm
index c66305bc4..a8af3a055 100644
--- a/FS/FS/part_export/bulkvs_e911.pm
+++ b/FS/FS/part_export/bulkvs_e911.pm
@@ -57,7 +57,7 @@ sub _export_insert {
   my ($self, $svc_phone) = @_;
   my @login = $self->login;
 
-  my $location = $svc_phone->cust_location
+  my $location = $svc_phone->cust_location_or_main
     or return 'no e911 location defined for this phone service';
 
   warn "$me validating address for svcnum ".$svc_phone->svcnum."\n"
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 0b36e24c5..1f2dfccc4 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -729,5 +729,11 @@ FS/cust_credit_void.pm
 t/cust_credit_void.t
 FS/discount_class.pm
 t/discount_class.t
+FS/alarm_system.pm
+t/alarm_system.t
+FS/alarm_type.pm
+t/alarm_type.t
+FS/alarm_station.pm
+t/alarm_station.t
 FS/addr_range.pm
 t/addr_range.t
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 07da88dea..a6908e172 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -37,51 +37,8 @@ getsecrets();
 #needs to match FS::Record
 my($dbdef_file) = "%%%FREESIDE_CONF%%%/dbdef.". datasrc;
 
-###
-
 my $username_len = 32;
 
-#print "\n\n", <<END, ":";
-#Freeside tracks the RADIUS User-Name, check attribute Password and
-#reply attribute Framed-IP-Address for each user.  You can specify additional
-#check and reply attributes (or you can add them later with the
-#fs-radius-add-check and fs-radius-add-reply programs).
-#
-#First enter any additional RADIUS check attributes you need to track for each 
-#user, separated by whitespace.
-#END
-#my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-#                         split(" ",&getvalue);
-#
-#print "\n\n", <<END, ":";
-#Now enter any additional reply attributes you need to track for each user,
-#separated by whitespace.
-#END
-#my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-#                   split(" ",&getvalue);
-#
-#print "\n\n", <<END, ":";
-#Do you wish to enable the tracking of a second, separate shipping/service
-#address?
-#END
-#my $ship = &_yesno;
-#
-#sub getvalue {
-#  my($x)=scalar(<STDIN>);
-#  chop $x;
-#  $x;
-#}
-#
-#sub _yesno {
-#  print " [y/N]:";
-#  my $x = scalar(<STDIN>);
-#  $x =~ /^y/i;
-#}
-
-#my @check_attributes = (); #add later
-#my @attributes = (); #add later
-#my $ship = $opt_s;
-
 ###
 # create a dbdef object from the old data structure
 ###