X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Frouter.pm;h=99373e5d1e02965ea63ba23911f0b4f5fe6e583e;hb=eb9d1063e1203231ee0c6922ea5638370f7b5ece;hp=7a9fda398e53f7ac71f222a803f5e0dead0f2cef;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git

diff --git a/FS/FS/router.pm b/FS/FS/router.pm
index 7a9fda398..99373e5d1 100755
--- a/FS/FS/router.pm
+++ b/FS/FS/router.pm
@@ -2,7 +2,7 @@ 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 FS::m2m_Common );
@@ -40,6 +40,9 @@ fields are currently supported:
 
 =item svcnum - svcnum of the owning FS::svc_broadband, if appropriate
 
+=item auto_addr - flag to automatically assign IP addresses to services
+linked to this router ('Y' or null).
+
 =back
 
 =head1 METHODS
@@ -83,6 +86,7 @@ sub check {
   my $error =
     $self->ut_numbern('routernum')
     || $self->ut_text('routername')
+    || $self->ut_enum('auto_addr', [ '', 'Y' ])
     || $self->ut_agentnum_acl('agentnum', 'Broadband global configuration')
   ;
   return $error if $error;
@@ -90,11 +94,49 @@ sub check {
   $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
 
 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 {
@@ -102,6 +144,13 @@ sub addr_block {
   return qsearch('addr_block', { routernum => $self->routernum });
 }
 
+sub auto_addr_block {
+  my $self = shift;
+  return () if !$self->auto_addr;
+  return qsearch('addr_block', { routernum => $self->routernum,
+                                 manual_flag => '' });
+}
+
 =item part_svc_router
 
 Returns a list of FS::part_svc_router objects associated with this 
@@ -139,8 +188,6 @@ sub agent {
 
 =back
 
-=head1 BUGS
-
 =head1 SEE ALSO
 
 FS::svc_broadband, FS::router, FS::addr_block, FS::part_svc,