From 1c98cb6461e83c28e14341de568ba33328048293 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 18 Feb 2002 10:14:00 +0000 Subject: oops! --- httemplate/edit/svc_www.cgi | 179 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 httemplate/edit/svc_www.cgi (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi new file mode 100644 index 000000000..e1a914f1a --- /dev/null +++ b/httemplate/edit/svc_www.cgi @@ -0,0 +1,179 @@ + +<% + +my( $svcnum, $pkgnum, $svcpart, $part_svc, $svc_www ); +if ( $cgi->param('error') ) { + $svc_www = new FS::svc_www ( { + map { $_, scalar($cgi->param($_)) } fields('svc_www') + } ); + $svcnum = $svc_www->svcnum; + $pkgnum = $cgi->param('pkgnum'); + $svcpart = $cgi->param('svcpart'); + $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); + die "No part_svc entry!" unless $part_svc; +} else { + my($query) = $cgi->keywords; + if ( $query =~ /^(\d+)$/ ) { #editing + $svcnum=$1; + $svc_www=qsearchs('svc_www',{'svcnum'=>$svcnum}) + or die "Unknown (svc_www) svcnum!"; + + my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum}) + or die "Unknown (cust_svc) svcnum!"; + + $pkgnum=$cust_svc->pkgnum; + $svcpart=$cust_svc->svcpart; + + $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); + die "No part_svc entry!" unless $part_svc; + + } 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+)$/; + } + $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); + die "No part_svc entry!" unless $part_svc; + + $svcnum=''; + + #set fixed and default fields from part_svc + foreach my $part_svc_column ( + grep { $_->columnflag } $part_svc->all_part_svc_column + ) { + $svc_www->setfield( $part_svc_column->columnname, + $part_svc_column->columnvalue, + ); + } + + } +} +my $action = $svc_www->svcnum ? 'Edit' : 'Add'; + +my( %username, %arec ); +if ($pkgnum) { + + my($u_part_svc,@u_acct_svcparts); + foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) { + push @u_acct_svcparts,$u_part_svc->getfield('svcpart'); + } + + my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); + my($custnum)=$cust_pkg->getfield('custnum'); + my($i_cust_pkg); + foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) { + my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum'); + my($acct_svcpart); + foreach $acct_svcpart (@u_acct_svcparts) { #now find the corresponding + #record(s) in cust_svc ( for this + #pkgnum ! ) + my($i_cust_svc); + foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) { + my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')}); + $username{$svc_acct->getfield('svcnum')}=$svc_acct->getfield('username'); + } + } + } + + + my($d_part_svc,@d_acct_svcparts); + foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) { + 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')}); + my $domain_rec; + foreach $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->reczone eq '@' + ? $svc_domain->domain + : $domain_rec->reczone. '.'. $svc_domain->domain; + } + $arec{'@.'. $svc_domain->domain} = $svc_domain->domain + unless qsearchs('domain_record', { svcnum => $svc_domain->svcnum, + reczone => '@', } ); + $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain + unless qsearchs('domain_record', { svcnum => $svc_domain->svcnum, + reczone => 'www', } ); + } + } + } + +} elsif ( $action eq 'Edit' ) { + + my($domain_rec) = qsearchs('domain_record', { 'recnum'=>$svc_www->recnum }); + $arec{$svc_www->recnum} = join '.', $domain_rec->recdata, $domain_rec->reczone; + +} else { + die "\$action eq Add, but \$pkgnum is null!\n"; +} + + +my $p1 = popurl(1); +print header("Web Hosting $action", ''); + +print qq!Error: !, $cgi->param('error'), + "" + if $cgi->param('error'); + +print qq!
!; + +#display + + + +#svcnum +print qq!!; +print qq!Service #!, $svcnum ? $svcnum : "(NEW)", "

"; + +#pkgnum +print qq!!; + +#svcpart +print qq!!; + +my($recnum,$usersvc)=( + $svc_www->recnum, + $svc_www->usersvc, +); + +print &ntable("#cccccc",2), + 'Zone"; + +print 'Username"; + +print '
'; + +print < + + +END + + -- cgit v1.2.1 From 551e695713ce31e4608a0a608a3941eaa7cdd64b Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 23 Jun 2002 01:33:28 +0000 Subject: forgot %> when converting from CGI, works now, patch from "Stephen Bechard" --- httemplate/edit/svc_www.cgi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index e1a914f1a..d2c9ade5c 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -175,5 +175,4 @@ print < END - - +%> -- cgit v1.2.1 From 58d44fbe5eb9ab32e6d87063a4a3b22ddba9a828 Mon Sep 17 00:00:00 2001 From: khoff Date: Tue, 5 Aug 2003 00:20:51 +0000 Subject: Virtual field merge --- httemplate/edit/svc_www.cgi | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index d2c9ade5c..043af610b 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -29,12 +29,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; @@ -167,6 +167,14 @@ foreach $_ (keys %username) { } print ""; +foreach $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 '
'; print < Date: Fri, 26 Sep 2003 23:33:09 +0000 Subject: $field is not a global. --- httemplate/edit/svc_www.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index 043af610b..ec5169e05 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -167,7 +167,7 @@ foreach $_ (keys %username) { } print ""; -foreach $field ($svc_www->virtual_fields) { +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', -- cgit v1.2.1 From 2a3703dad2a512c709152c1a8d99acbe6c27b668 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 6 May 2004 22:18:24 +0000 Subject: show service name and fully-qualified address on service add --- httemplate/edit/svc_www.cgi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index ec5169e05..e13bb44c0 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -53,7 +53,7 @@ if ( $cgi->param('error') ) { } my $action = $svc_www->svcnum ? 'Edit' : 'Add'; -my( %username, %arec ); +my( %svc_acct, %arec ); if ($pkgnum) { my($u_part_svc,@u_acct_svcparts); @@ -73,7 +73,8 @@ if ($pkgnum) { my($i_cust_svc); foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) { my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')}); - $username{$svc_acct->getfield('svcnum')}=$svc_acct->getfield('username'); + $svc_acct{$svc_acct->getfield('svcnum')}= + $svc_acct->part-svc->svc. ': '. $svc_acct->email; } } } @@ -161,9 +162,9 @@ foreach $_ (keys %arec) { print ""; print 'Username"; -- cgit v1.2.1 From e520b9f7d88539634225560d462d03c7d2057d9d Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 6 May 2004 22:34:14 +0000 Subject: tyop --- httemplate/edit/svc_www.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index e13bb44c0..313ebee0b 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -74,7 +74,7 @@ if ($pkgnum) { foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) { my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')}); $svc_acct{$svc_acct->getfield('svcnum')}= - $svc_acct->part-svc->svc. ': '. $svc_acct->email; + $svc_acct->part_svc->svc. ': '. $svc_acct->email; } } } -- cgit v1.2.1 From 28f7684d096f8f5c97a68d04193bc9ba1d503ef5 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 6 May 2004 22:37:13 +0000 Subject: brainfart --- httemplate/edit/svc_www.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index 313ebee0b..ebc4b1148 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -74,7 +74,7 @@ if ($pkgnum) { foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) { my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')}); $svc_acct{$svc_acct->getfield('svcnum')}= - $svc_acct->part_svc->svc. ': '. $svc_acct->email; + $svc_acct->cust_svc->part_svc->svc. ': '. $svc_acct->email; } } } -- cgit v1.2.1 From a5be013b9a08af7adc28b56b45c04bb5c7592343 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 11 May 2004 11:19:11 +0000 Subject: one reasonable default and one kludge, to improve webhosting UI --- httemplate/edit/svc_www.cgi | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index ebc4b1148..fe7052292 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -56,9 +56,13 @@ my $action = $svc_www->svcnum ? 'Edit' : 'Add'; my( %svc_acct, %arec ); if ($pkgnum) { - my($u_part_svc,@u_acct_svcparts); - foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) { - push @u_acct_svcparts,$u_part_svc->getfield('svcpart'); + my @u_acct_svcparts; + foreach my $svcpart ( + map { $_->svcpart } qsearch( 'part_svc', { 'svcdb' => 'svc_acct' } ) + ) { + next if $conf->exists('svc_www-usersvc_svcpart') + && grep { $svcpart == $_ } $conf->config('svc_www-usersvc_svcpart'); + push @u_acct_svcparts, $svcpart; } my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); @@ -92,25 +96,23 @@ if ($pkgnum) { 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')}); - my $domain_rec; - foreach $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->reczone eq '@' - ? $svc_domain->domain - : $domain_rec->reczone. '.'. $svc_domain->domain; + 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', } ); } $arec{'@.'. $svc_domain->domain} = $svc_domain->domain unless qsearchs('domain_record', { svcnum => $svc_domain->svcnum, reczone => '@', } ); - $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain - unless qsearchs('domain_record', { svcnum => $svc_domain->svcnum, - reczone => 'www', } ); } } } -- cgit v1.2.1 From a5c64e8089d4e6c76ee070102e3a67baf1485181 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 11 May 2004 11:22:09 +0000 Subject: need to pull in $conf --- httemplate/edit/svc_www.cgi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index fe7052292..b89672a52 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -1,6 +1,8 @@ <% +my $conf = new FS::Conf; + my( $svcnum, $pkgnum, $svcpart, $part_svc, $svc_www ); if ( $cgi->param('error') ) { $svc_www = new FS::svc_www ( { -- cgit v1.2.1 From af37880d5ac36f2b141b2eeeb1c7aa49a50d0c5b Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 11 May 2004 11:52:02 +0000 Subject: clean this up a bit, fix svc_www-usersvc_svcpart and hopefully simplified zone select too --- httemplate/edit/svc_www.cgi | 73 ++++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 21 deletions(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index b89672a52..ed8d42501 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -63,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; } @@ -91,31 +92,61 @@ 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' )"; + if ( $conf->exists('svc_www-enable_subdomains') ) { + my $domain = $ + $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.'.', + } ); + } + } } -- cgit v1.2.1 From 20431ca2cc197c3d3a109d43318a0f96ea7e24d1 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 11 May 2004 11:54:02 +0000 Subject: so close --- httemplate/edit/svc_www.cgi | 1 - 1 file changed, 1 deletion(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index ed8d42501..cb58ce979 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -106,7 +106,6 @@ if ($pkgnum) { my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )"; if ( $conf->exists('svc_www-enable_subdomains') ) { - my $domain = $ $extra_sql .= " AND ( reczone = '@' OR reczone = '". $svc_domain->domain. ".' )"; } -- cgit v1.2.1 From 29da3c125643b73cb6f6219b99eadb67673e4d6d Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 11 May 2004 11:58:42 +0000 Subject: this has been an evening of logical negation --- httemplate/edit/svc_www.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index cb58ce979..a9b1ed348 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -105,7 +105,7 @@ 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') ) { + unless ( $conf->exists('svc_www-enable_subdomains') ) { $extra_sql .= " AND ( reczone = '@' OR reczone = '". $svc_domain->domain. ".' )"; } -- cgit v1.2.1 From a800fde5d31fb9b9cfe46b1ce2f68ea8e56bff53 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 11 May 2004 12:01:29 +0000 Subject: i'm not usually like this. --- httemplate/edit/svc_www.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index a9b1ed348..4989bb610 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -106,7 +106,7 @@ if ($pkgnum) { my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )"; unless ( $conf->exists('svc_www-enable_subdomains') ) { - $extra_sql .= " AND ( reczone = '@' OR reczone = '". + $extra_sql .= " AND ( reczone = '\@' OR reczone = '". $svc_domain->domain. ".' )"; } -- cgit v1.2.1 From 74d770e94f656d69ae156903360238822a8baa45 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 23 Dec 2004 11:39:19 +0000 Subject: fix typo that manifests when using svc_www-enable_subdomains config option --- httemplate/edit/svc_www.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index 4989bb610..02fa64c07 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -130,7 +130,7 @@ if ($pkgnum) { } ) || qsearchs( 'domain_record', { svcnum => $svc_domain->svcnum, - reczone => 'www.'.$svc-domain->domain.'.', + reczone => 'www.'.$svc_domain->domain.'.', } ); } -- cgit v1.2.1 From 0327e2c7c79a11ec950a58e518f8f36cd0f85302 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 26 May 2005 19:16:59 +0000 Subject: make svc_www.usersvc optional --- httemplate/edit/svc_www.cgi | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/edit/svc_www.cgi') diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index 02fa64c07..3cb752850 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -196,6 +196,7 @@ foreach $_ (keys %arec) { print ""; print 'Username