X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_www.cgi;h=4989bb610156faaa765eed5c67e589d7c92ac81b;hp=fe70522923676cc47debf40e40bafa4c762f0074;hb=1238858779262e56f45aef69d33b54052407c7f7;hpb=a5be013b9a08af7adc28b56b45c04bb5c7592343

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index fe7052292..4989bb610 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -1,6 +1,8 @@
 <!-- mason kludge -->
 <%
 
+my $conf = new FS::Conf;
+
 my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_www );
 if ( $cgi->param('error') ) {
   $svc_www = new FS::svc_www ( {
@@ -61,7 +63,8 @@ if ($pkgnum) {
     map { $_->svcpart } qsearch( 'part_svc', { 'svcdb' => 'svc_acct' } )
   ) {
     next if $conf->exists('svc_www-usersvc_svcpart')
-            && grep { $svcpart == $_ } $conf->config('svc_www-usersvc_svcpart');
+            && ! grep { $svcpart == $_ }
+                      $conf->config('svc_www-usersvc_svcpart');
     push @u_acct_svcparts, $svcpart;
   }
 
@@ -89,31 +92,60 @@ if ($pkgnum) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+  foreach $i_cust_pkg ( qsearch( 'cust_pkg', { 'custnum' => $custnum } ) ) {
+    my $cust_pkgnum = $i_cust_pkg->pkgnum;
+
+    foreach my $acct_svcpart (@d_acct_svcparts) {
+
+      foreach my $i_cust_svc (
+        qsearch( 'cust_svc', { 'pkgnum'  => $cust_pkgnum,
+                               'svcpart' => $acct_svcpart } )
+      ) {
+        my $svc_domain =
+          qsearchs( 'svc_domain', { 'svcnum' => $i_cust_svc->svcnum } );
+
+        my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
+        unless ( $conf->exists('svc_www-enable_subdomains') ) {
+          $extra_sql .= " AND ( reczone = '\@' OR reczone = '".
+                        $svc_domain->domain. ".' )";
+        }
+
+        foreach my $domain_rec (
+          qsearch( 'domain_record',
+                   {
+                     'svcnum' => $svc_domain->svcnum,
+                   },
+                   '',
+                   $extra_sql,
+          )
+        ) {
+          $arec{$domain_rec->recnum} = $domain_rec->zone;
+        }
+
         if ( $conf->exists('svc_www-enable_subdomains') ) {
-          foreach my $domain_rec ( qsearch('domain_record',{
-              'svcnum'  => $svc_domain->svcnum,
-              'rectype' => 'A' } ),
-          qsearch('domain_record',{
-              'svcnum'  => $svc_domain->svcnum,
-              'rectype' => 'CNAME'
-              } ) ) {
-            $arec{$domain_rec->recnum} = $domain_rec->zone;
-          }
           $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
-            unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                               reczone => 'www',            } );
+            unless    qsearchs( 'domain_record', {
+                                  svcnum  => $svc_domain->svcnum,
+                                  reczone => 'www',
+                      } )
+                   || qsearchs( 'domain_record', {
+                                  svcnum  => $svc_domain->svcnum,
+                                  reczone => 'www.'.$svc-domain->domain.'.',
+                    } );
         }
+
         $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
-          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                             reczone => '@',                } );
+          unless   qsearchs('domain_record', {
+                              svcnum  => $svc_domain->svcnum,
+                              reczone => '@',
+                   } )
+                || qsearchs('domain_record', {
+                              svcnum  => $svc_domain->svcnum,
+                              reczone => $svc_domain->domain.'.',
+                   } );
+
       }
+
     }
   }