X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_cert.cgi;h=48494d2d20ecf6d3e637de3843b91b4ae838e389;hp=92902d6d273f6faf0a085c4944c94ed3ef027630;hb=e50b6ec8d63afe4c04ae33384758d8786fcc7cfe;hpb=2d73473ce78c22160b618e93802a9551c9c77d69

diff --git a/httemplate/view/svc_cert.cgi b/httemplate/view/svc_cert.cgi
index 92902d6d2..48494d2d2 100644
--- a/httemplate/view/svc_cert.cgi
+++ b/httemplate/view/svc_cert.cgi
@@ -28,7 +28,156 @@ my @fields = (
       }
     },
   },
-  qw( organization organization_unit city state country cert_contact )
+  qw( common_name organization organization_unit city state country cert_contact
+    ),
+  { 'field'=>'csr',
+    'value'=> sub {
+      my $svc_cert = shift;
+      if ( $svc_cert->csr ) { #display the subject etc?
+        '<PRE><FONT STYLE="font-family:monospace">'. "\n". $svc_cert->csr.
+        '</FONT></PRE>';
+      } elsif ( $svc_cert->common_name ) {
+        my $svcnum = $svc_cert->svcnum;
+        qq(<A HREF="${p}misc/svc_cert-generate.html?action=generate_csr;svcnum=$svcnum">Generate</A>);
+      } else {
+        '';
+      }
+    },
+  },
+  { 'field'=>'certificate',
+    'value'=> sub {
+      my $svc_cert = shift;
+      if ( $svc_cert->certificate ) {
+
+        my %hash = $svc_cert->check_certificate;
+
+        tie my %w, 'Tie::IxHash',
+          'subject' => 'Issued to',
+          'issuer'  => 'Issued by',
+        ;
+
+        my $out = '<TABLE><TR><TD>';
+
+        foreach my $w ( keys %w ) {
+
+          $out .= include('/elements/table-grid.html'). #'<TABLE>'.
+                  '<TR><TH COLSPAN=2 BGCOLOR="#cccccc" ALIGN="center">'.
+                  $w{$w}. '</TH></TR>';
+
+          my $col = $svc_cert->subj_col;
+
+          my $subj = $hash{$w};
+          foreach my $key (keys %$col) { #( keys %$subj ) {
+            $out .= "<TR><TD>". $labels{$col->{$key}}.  "</TD>".
+                        "<TD>". $subj->{$key}. "</TD></TR>";
+          }
+
+          $out .= '</TABLE></TD><TD>';
+        }
+        $out .= '</TD></TR></TABLE>';
+
+        $out .= '<TABLE>'.
+                '<TR><TH ALIGN="right">Serial number</TH>'.
+                    "<TD>$hash{serial}</TD></TR>".
+                '<TR><TH ALIGN="right">Valid</TH>'.
+                    "<TD>$hash{notBefore} - $hash{notAfter}</TD></TR>".
+                '</TABLE>';
+
+        my $svcnum = $svc_cert->svcnum;
+
+        if ( $hash{'selfsigned'} ) {
+          $out .= qq(<BR> <A HREF="${p}misc/svc_cert-generate.html?action=generate_selfsigned;svcnum=$svcnum">Re-generate self-signed</A>).
+                  ' &nbsp; '.
+                  include('/elements/popup_link.html', {
+                    'action'      => $p."edit/svc_cert/import_certificate.html".
+                                     "?svcnum=$svcnum",
+                    'label'       => 'Import issued certificate', #link
+                    'actionlabel' => 'Import issued certificate', #title
+                    #opt
+                    'width'       => '544',
+                    'height'      => '368',
+                    #'color'       => '#ff0000',
+                  }).
+                  '<BR>';
+        }
+
+        $out .= '<PRE><FONT STYLE="font-family:monospace">'.
+                $svc_cert->certificate.
+                '</FONT><PRE>';
+
+        $out;
+      } elsif ( $svc_cert->csr ) {
+        my $svcnum = $svc_cert->svcnum;
+        qq(<A HREF="${p}misc/svc_cert-generate.html?action=generate_selfsigned;svcnum=$svcnum">Generate self-signed</A>);
+      } else {
+        '';
+      }
+    },
+  },
+  { 'field'=>'cacert',
+    'value'=> sub {
+      my $svc_cert = shift;
+      if ( $svc_cert->cacert ) {
+
+        my %hash = $svc_cert->check_cacert;
+
+        tie my %w, 'Tie::IxHash',
+          'subject' => 'Issued to',
+          'issuer'  => 'Issued by',
+        ;
+
+        my $out = '<TABLE><TR><TD>';
+
+        foreach my $w ( keys %w ) {
+
+          $out .= include('/elements/table-grid.html'). #'<TABLE>'.
+                  '<TR><TH COLSPAN=2 BGCOLOR="#cccccc" ALIGN="center">'.
+                  $w{$w}. '</TH></TR>';
+
+          my $col = $svc_cert->subj_col;
+
+          my $subj = $hash{$w};
+          foreach my $key (keys %$col) { #( keys %$subj ) {
+            $out .= "<TR><TD>". $labels{$col->{$key}}.  "</TD>".
+                        "<TD>". $subj->{$key}. "</TD></TR>";
+          }
+
+          $out .= '</TABLE></TD><TD>';
+        }
+        $out .= '</TD></TR></TABLE>';
+
+        $out .= '<TABLE>'.
+                '<TR><TH ALIGN="right">Serial number</TH>'.
+                    "<TD>$hash{serial}</TD></TR>".
+                '<TR><TH ALIGN="right">Valid</TH>'.
+                    "<TD>$hash{notBefore} - $hash{notAfter}</TD></TR>".
+                '</TABLE>';
+
+        $out .= '<PRE><FONT STYLE="font-family:monospace">'.
+                $svc_cert->certificate.
+                '</FONT><PRE>';
+
+        $out;
+
+      } else {
+
+        my $svcnum = $svc_cert->svcnum;
+
+        include('/elements/popup_link.html', {
+          'action'      => $p."edit/svc_cert/import_cacert.html".
+                           "?svcnum=$svcnum",
+          'label'       => 'Import certificate authority chain',#link
+          'actionlabel' => 'Import certificate authority chain',#title
+          #opt
+          'width'       => '544',
+          'height'      => '368',
+          #'color'       => '#ff0000',
+        }). '&nbsp;(optional)'.
+        '<BR>';
+
+      }
+    },
+  },
 );
 
 </%init>