From 8f42b751aebda2e7dce2c363bed6f1e15b411b1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2002 01:03:10 +0000
Subject: use Net::SSH::ssh_cmd for all job queueing rather than local
 duplicated ssh subs

queue daemon updates: retry & remove links work, bubble up error message
to webinterface, link to svcnum & have job listings on view/svc_* pages,
closes: Bug#280

s/option/optionname/ schema change, dumb mysql, closes: Bug#334
---
 httemplate/view/svc_acct.cgi    | 4 +++-
 httemplate/view/svc_domain.cgi  | 6 +++---
 httemplate/view/svc_forward.cgi | 9 +++++----
 httemplate/view/svc_www.cgi     | 9 +++++----
 4 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 90ca1a240..d1c61576d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -129,6 +129,8 @@ if ($svc_acct->slipip) {
   print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
 }
 
-print "</TABLE></TD></TR></TABLE></BODY></HTML>";
+print "</TABLE></TD></TR></TABLE>".
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      "</BODY></HTML>";
 
 %>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index f086cda1a..61194a26d 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -55,8 +55,8 @@ foreach my $domain_record ( qsearch('domain_record', { svcnum => $svcnum } ) ) {
         '<td>'. $domain_record->recaf. ' '. $domain_record->rectype. '</td>'.
         '<td>'. $domain_record->recdata. '</td></tr>';
 }
-print '</table>';
-
-print '</BODY></HTML>';
+print '</table>'.
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      '</BODY></HTML>';
 
 %>
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index cafb9e5b8..8d2afc823 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -52,10 +52,11 @@ if ($dstsvc) {
   $destination = $dst;
 }
 
-print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!,
-      "<BR>Service #$svcnum",
-      "<BR>Service: <B>$svc</B>",
-      qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!,
+print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
+      "<BR>Service #$svcnum".
+      "<BR>Service: <B>$svc</B>".
+      qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!.
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
 
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index a82921f1b..70a7a1be4 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -38,9 +38,10 @@ print header('Website View', menubar(
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
-)),
-      "Service #$svcnum",
-      qq!<BR>Website name: <B><A HREF="http://$www">$www</A></B>!,
-      '</BODY></HTML>',                
+)).
+      "Service #$svcnum".
+      qq!<BR>Website name: <B><A HREF="http://$www">$www</A></B>!.
+      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      '</BODY></HTML>'
 ;
 %>
-- 
cgit v1.2.1