freeside/FS/FS Conf.pm,1.124,1.125 svc_domain.pm,1.43,1.44 domain_record.pm,1.18,1.19

[Kristian Hoffmann]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory pouncequick:/tmp/cvs-serv29360/FS/FS

Modified Files:
	Conf.pm svc_domain.pm domain_record.pm 
Log Message:
Added support for TXT records.


Index: svc_domain.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_domain.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- svc_domain.pm	28 May 2004 07:02:37 -0000	1.43
+++ svc_domain.pm	15 Apr 2005 20:29:38 -0000	1.44
@@ -369,6 +369,7 @@
     MX => 3,
     CNAME => 4,
     A => 5,
+    TXT => 6,
   );
 
   sort { $order{$a->rectype} <=> $order{$b->rectype} }

Index: domain_record.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/domain_record.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- domain_record.pm	30 Dec 2004 01:41:28 -0000	1.18
+++ domain_record.pm	15 Apr 2005 20:29:38 -0000	1.19
@@ -257,8 +257,8 @@
   $self->recaf =~ /^(IN)$/ or return "Illegal recaf: ". $self->recaf;
   $self->recaf($1);
 
-  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|_mstr)$/
-    or return "Illegal rectype (only SOA NS MX A PTR CNAME recognized): ".
+  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|TXT|_mstr)$/
+    or return "Illegal rectype (only SOA NS MX A PTR CNAME TXT recognized): ".
               $self->rectype;
   $self->rectype($1);
 
@@ -290,6 +290,10 @@
   } elsif ( $self->rectype eq 'CNAME' ) {
     $self->recdata =~ /^([a-z0-9\.\-]+|\@)$/i
       or return "Illegal data for CNAME record: ". $self->recdata;
+    $self->recdata($1);
+  } elsif ( $self->rectype eq 'TXT' ) {
+    $self->recdata =~ /^((?:\S+)|(?:"[[:ascii:]]+"))$/
+      or return "Illegal data for TXT record: ". $self->recdata;
     $self->recdata($1);
   } elsif ( $self->rectype eq '_mstr' ) {
     $self->recdata =~ /^((\d{1,3}\.){3}\d{1,3})$/

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- Conf.pm	11 Apr 2005 20:13:16 -0000	1.124
+++ Conf.pm	15 Apr 2005 20:29:38 -0000	1.125
@@ -647,7 +647,7 @@
     'editlist_parts' => [ { type=>'text' },
                           { type=>'immutable', value=>'IN' },
                           { type=>'select',
-                            select_enum=>{ map { $_=>$_ } qw(A CNAME MX NS)} },
+                            select_enum=>{ map { $_=>$_ } qw(A CNAME MX NS TXT)} },
                           { type=> 'text' }, ],
   },