add eps preview to config, for RT#5025

4 files changed, 37 insertions, 15 deletions

diff --git a/httemplate/config/config-image.cgi b/httemplate/config/config-image.cgi
index 892f7c65b..0de9d4278 100644
--- a/httemplate/config/config-image.cgi
+++ b/httemplate/config/config-image.cgi
@@ -1,4 +1,4 @@
-<% $conf->config_binary($name, $agentnum) %>
+<% $logo %>
 <%init>
 
 die "access denied"
@@ -16,4 +16,7 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   $agentnum = $1;
 }
 
+my $logo = $conf->config_binary($name, $agentnum);
+$logo = eps2png($logo) if $name =~ /\.eps$/i;
+
 </%init>
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 0f5fd6213..f2ae892a6 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -69,22 +69,32 @@ Click on a configuration value to change it.
 %   } elsif (   $type eq 'image' ) {
 
             <tr>
-
-              <% $conf->exists($i->key, $agentnum)
-                   ? '<img src="config-image.cgi?key='.      $i->key.
-                                               ';agentnum='. $agentnum. '">'
-                   : 'empty'
-              %>
+              <td bgcolor='#ffffff'>
+                <% $conf->exists($i->key, $agentnum)
+                     ? '<img src="config-image.cgi?key='.      $i->key.
+                                                 ';agentnum='. $agentnum. '">'
+                     : 'empty'
+                %>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <% $conf->exists($i->key, $agentnum)
+                     ? qq!<a href="config-download.cgi?key=!. $i->key. ';agentnum='. $agentnum. qq!">download</a>!
+                     : ''
+                %>
+              </td>
             </tr>
 
 %   } elsif (   $type eq 'binary' ) {
 
             <tr>
-
-              <% $conf->exists($i->key, $agentnum)
-                   ? qq!<a href="config-download.cgi?key=!. $i->key. ';agentnum='. $agentnum. qq!">download</a>!
-                   : 'empty'
-              %>
+              <td>
+                <% $conf->exists($i->key, $agentnum)
+                     ? qq!<a href="config-download.cgi?key=!. $i->key. ';agentnum='. $agentnum. qq!">download</a>!
+                     : 'empty'
+                %>
+              </td>
             </tr>
 
 %   } elsif (    $type eq 'textarea'
diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index 3c5564da3..38d384bcf 100644
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -33,7 +33,7 @@
 
 <CENTER>
 
-<H3>Core team</H3>
+<H3>Core Team</H3>
 Peter Bowen<BR>
 Jeff Finucane<BR>
 Jason Hall<BR>
@@ -42,6 +42,11 @@ Ivan Kohler<BR>
 Richard Siddall<BR>
 <BR>
 
+<H3>Core Emeritus</H3>
+Brian McCane<BR>
+Matt Simerson<BR>
+<BR>
+
 <H3>Contributors</H3>
 Stephen Amadei<BR>
 Eric Arvidsson<BR>
@@ -57,6 +62,7 @@ Rebecca Cardennis<BR>
 Shane Chrisp<BR>
 Luke Crawford<BR>
 Brad Dameron<BR>
+Jeremy Davis<BR>
 Dave Denney<BR>
 Serge Dolgov<BR>
 Scott Edwards<BR>
@@ -74,19 +80,18 @@ Greg Kuhnert<BR>
 Randall Lucas<BR>
 Foteos Macrides<BR>
 Roger Mangraviti<BR>
-Brian McCane<BR>
 mimooh<BR>
 Mack Nagashima<BR>
 Matt Peterson<BR>
 Luke Pfeifer<BR>
 Ricardo Signes<BR>
-Matt Simerson<BR>
 Steve Simitzis<BR>
 Jason Spence<BR>
 James Switzer<BR>
 Audrey Tang<BR>
 Jason Thomas<BR>
 Jesse Vincent<BR>
+Johan Vromans<BR>
 Mark Wells<BR>
 Peter Wemm<BR>
 Mark Williamson<BR>
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 54537307e..a673bc9dd 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -100,6 +100,10 @@ terms of the BSD license.<BR>
 &copy; 2005 modernmethod, inc<BR>
 Perl backend version &copy; 2005 Nathan Schmidt
 
+<P>
+Contains code derived from eps2png by Johan Vromans, licensed under the same
+terms as Perl (GPL/Artistic).
+
 <!-- artwork -->
 
 <P>