show a full stack backtrace if we wind up in the hash method with an empty Hash attri...

[freeside.git] / httemplate / edit / svc_www.cgi

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index ed8d425..e15978f 100644 (file)
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -31,12 +31,12 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
+    $svc_www = new FS::svc_www({});
+
     foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
-    $svc_www = new FS::svc_www { svcpart => $svcpart };
-
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
@@ -105,9 +105,8 @@ if ($pkgnum) {
           qsearchs( 'svc_domain', { 'svcnum' => $i_cust_svc->svcnum } );
 
         my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
-        if ( $conf->exists('svc_www-enable_subdomains') ) {
-          my $domain = $
-          $extra_sql .= " AND ( reczone = '@' OR reczone = '".
+        unless ( $conf->exists('svc_www-enable_subdomains') ) {
+          $extra_sql .= " AND ( reczone = '\@' OR reczone = '".
                         $svc_domain->domain. ".' )";
         }
 
@@ -203,14 +202,6 @@ foreach $_ (keys %svc_acct) {
 }
 print "</SELECT></TD></TR>";
 
-foreach my $field ($svc_www->virtual_fields) {
-  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
-    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
-    print $svc_www->pvf($field)->widget('HTML', 'edit', 
-        $svc_www->getfield($field));
-  }
-}
-
 print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
 
 print <<END;