random cleanups

diff --git a/FS/FS/Cron/upload.pm b/FS/FS/Cron/upload.pm
index 877b07f..dceead6 100644 (file)
--- a/FS/FS/Cron/upload.pm
+++ b/FS/FS/Cron/upload.pm
@@ -75,7 +75,7 @@ sub upload {
 
       eval "&billco_upload( 'agentnum' => $agentnum, 'date' => $date );";
       warn "billco_upload failed: $@\n"
-        if ( $@ );
+        if $@;
 
     }
 
@@ -93,6 +93,7 @@ sub billco_upload {
   my $agentnum = $opt{agentnum} or die "no agentnum provided\n";
   my $url      = $conf->config( 'billco-url', $agentnum )
     or die "no url for agent $agentnum\n";
+  $url =~ s/^\s+//; $url =~ s/\s+$//;
   my $username = $conf->config( 'billco-username', $agentnum, 1 )
     or die "no username for agent $agentnum\n";
   my $password = $conf->config( 'billco-password', $agentnum, 1 )
@@ -175,7 +176,7 @@ sub billco_upload {
 
     my($hostname, $path) = ($1, $2);
 
-    my $ftp = new Net::FTP($hostname)
+    my $ftp = new Net::FTP($hostname) #, Passive=>1 )
       or die "can't connect to $hostname: $@\n";
     $ftp->login($username, $password)
       or die "can't login to $hostname: ". $ftp->message."\n";

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index c75b99f..06331d3 100644 (file)
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -17,7 +17,7 @@ FS::cust_main::Packages - Packages mixin for cust_main
 
 =head1 SYNOPSIS
 
-=head1 DESRIPTION
+=head1 DESCRIPTION
 
 These methods are available on FS::cust_main objects;
 

diff --git a/FS/FS/usage_class.pm b/FS/FS/usage_class.pm
index 62beeb4..6c8a278 100644 (file)
--- a/FS/FS/usage_class.pm
+++ b/FS/FS/usage_class.pm
@@ -443,8 +443,7 @@ sub total_line_generator {
 
 }
 
-
-
+# Used by FS::Setup to initialize a new database.
 sub _populate_initial_data {
   my ($class, %opts) = @_;
 
@@ -459,6 +458,7 @@ sub _populate_initial_data {
 
 }
 
+# Used by FS::Upgrade to migrate to a new database.
 sub _upgrade_data {
   my $class = shift;