[freeside-commits] freeside/FS/FS Conf.pm, 1.151, 1.152 svc_forward.pm, 1.18, 1.19

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv578/FS/FS

Modified Files:
	Conf.pm svc_forward.pm 
Log Message:
add the svc_forward-arbitrary_dst flag to enable arbitrary svc_forward destinations

Index: svc_forward.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_forward.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- svc_forward.pm	6 Apr 2005 22:52:12 -0000	1.18
+++ svc_forward.pm	14 Apr 2006 11:55:58 -0000	1.19
@@ -257,9 +257,15 @@
   }
 
   if ( $self->dst ) {
-    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
-       or return "Illegal dst: ". $self->dst;
-    $self->dst("$1$2");
+    my $conf = new FS::Conf;
+    if ( $conf->exists('svc_forward-arbitrary_dst') ) {
+      my $error = $self->ut_textn('dst');
+      return $error if $error;
+    } else {
+      $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
+         or return "Illegal dst: ". $self->dst;
+      $self->dst("$1$2");
+    }
   } else {
     $self->dst('');
   }

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- Conf.pm	3 Apr 2006 23:26:03 -0000	1.151
+++ Conf.pm	14 Apr 2006 11:55:58 -0000	1.152
@@ -1695,6 +1695,13 @@
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'svc_forward-arbitrary_dst',
+    'section'     => '',
+    'description' => "Allow forwards to point to arbitrary strings that don't necessarily look like email addresses.  Only used when using forwards for weird, non-email things.",
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;