Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / router.pm

diff --git a/FS/FS/router.pm b/FS/FS/router.pm
index 3f9459a..6fa44b4 100755 (executable)
--- a/FS/FS/router.pm
+++ b/FS/FS/router.pm
@@ -2,10 +2,10 @@ package FS::router;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearchs qsearch );
+use FS::Record qw( qsearchs qsearch dbh );
 use FS::addr_block;
 
-@ISA = qw( FS::Record );
+@ISA = qw( FS::Record FS::m2m_Common );
 
 =head1 NAME
 
@@ -40,6 +40,10 @@ fields are currently supported:
 
 =item svcnum - svcnum of the owning FS::svc_broadband, if appropriate
 
+=item manual_addr - set to 'Y' to allow services linked to this router 
+to have any IP address, rather than one in an address block belonging 
+to the router.
+
 =back
 
 =head1 METHODS
@@ -82,10 +86,46 @@ sub check {
 
   my $error =
     $self->ut_numbern('routernum')
-    || $self->ut_text('routername');
+    || $self->ut_text('routername')
+    || $self->ut_enum('manual_addr', [ '', 'Y' ])
+    || $self->ut_agentnum_acl('agentnum', 'Broadband global configuration')
+  ;
   return $error if $error;
 
-  '';
+  $self->SUPER::check;
+}
+
+=item delete
+
+Deletes this router if and only if no address blocks (see L<FS::addr_block>)
+are currently allocated to it.
+
+=cut
+
+sub delete {
+    my $self = shift;
+
+    return 'Router has address blocks allocated to it' if $self->addr_block;
+    
+    local $SIG{HUP} = 'IGNORE';
+    local $SIG{INT} = 'IGNORE';
+    local $SIG{QUIT} = 'IGNORE';
+    local $SIG{TERM} = 'IGNORE';
+    local $SIG{TSTP} = 'IGNORE';
+    local $SIG{PIPE} = 'IGNORE';
+
+    my $oldAutoCommit = $FS::UID::AutoCommit;
+    local $FS::UID::AutoCommit = 0;
+    my $dbh = dbh;
+    
+    my $error = $self->SUPER::delete;
+    if ( $error ) {
+       $dbh->rollback if $oldAutoCommit;
+       return $error;
+    }
+  
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    '';
 }
 
 =item addr_block
@@ -93,6 +133,11 @@ sub check {
 Returns a list of FS::addr_block objects (address blocks) associated
 with this object.
 
+=item auto_addr_block
+
+Returns a list of address blocks on which auto-assignment of IP addresses
+is enabled.
+
 =cut
 
 sub addr_block {
@@ -100,16 +145,11 @@ sub addr_block {
   return qsearch('addr_block', { routernum => $self->routernum });
 }
 
-=item router_field
-
-Returns a list of FS::router_field objects assigned to this object.
-
-=cut
-
-sub router_field {
+sub auto_addr_block {
   my $self = shift;
-
-  return qsearch('router_field', { routernum => $self->routernum });
+  return () if $self->manual_addr;
+  return qsearch('addr_block', { routernum => $self->routernum,
+                                 manual_flag => '' });
 }
 
 =item part_svc_router
@@ -137,17 +177,21 @@ sub part_svc {
       $self->part_svc_router;
 }
 
-=back
+=item agent
 
-=head1 VERSION
+Returns the agent associated with this router, if any.
 
-$Id:
+=cut
 
-=head1 BUGS
+sub agent {
+  qsearchs('agent', { 'agentnum' => shift->agentnum });
+}
+
+=back
 
 =head1 SEE ALSO
 
-FS::svc_broadband, FS::router, FS::addr_block, FS::router_field, FS::part_svc,
+FS::svc_broadband, FS::router, FS::addr_block, FS::part_svc,
 schema.html from the base documentation.
 
 =cut