Andreas Schneider wrote:
Kyle Johnson wrote:
David Rees wrote:
On Dec 7, 2007 11:33 AM, Kyle Johnson <[EMAIL PROTECTED]> wrote:
I've completed Feature Request #000022.
Should I send in a patch, or do I apply to CVS, or what?
I would recommend sending a patch to the list for review.
-Dave
Attached is my .patch file. I've never made a patch before, so let me
know if I did it wrong (probably something with paths).
--Kyle Johnson
Great. Please always send a diff -u which is human readable :)
Thanks,
-- andreas
There we go!
--Kyle Johnson
diff -ur dspam/webui/cgi-bin/admin.cgi webui/cgi-bin/admin.cgi
--- dspam/webui/cgi-bin/admin.cgi 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/admin.cgi 2007-12-07 14:46:54.000000000 -0500
@@ -95,6 +95,11 @@
$DATA{'REMOTE_USER'} = $ENV{'REMOTE_USER'};
#
+# Display Dspam Version
+#
+$DATA{'DSPAMVERSION'} = "Version " . `$CONFIG{'DSPAM'} --version | grep Suite | cut -d " " -f4`;
+
+#
# Process Commands
#
Only in dspam/webui/cgi-bin: .cvsignore
diff -ur dspam/webui/cgi-bin/dspam.cgi webui/cgi-bin/dspam.cgi
--- dspam/webui/cgi-bin/dspam.cgi 2007-12-06 19:11:52.000000000 -0500
+++ webui/cgi-bin/dspam.cgi 2007-12-07 14:46:29.000000000 -0500
@@ -122,6 +122,11 @@
$DATA{'REMOTE_USER'} = $CURRENT_USER;
#
+# Display Dspam Version
+#
+$DATA{'DSPAMVERSION'} = "Version " . `$CONFIG{'DSPAM'} --version | grep Suite | cut -d " " -f4`;
+
+#
# Process Commands
#
Only in dspam/webui/cgi-bin/templates: .cvsignore
diff -ur dspam/webui/cgi-bin/templates/nav_admin_error.html webui/cgi-bin/templates/nav_admin_error.html
--- dspam/webui/cgi-bin/templates/nav_admin_error.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_admin_error.html 2007-12-07 15:07:47.000000000 -0500
@@ -31,9 +31,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</body>
diff -ur dspam/webui/cgi-bin/templates/nav_admin_preferences.html webui/cgi-bin/templates/nav_admin_preferences.html
--- dspam/webui/cgi-bin/templates/nav_admin_preferences.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_admin_preferences.html 2007-12-07 15:07:41.000000000 -0500
@@ -118,9 +118,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</BODY>
diff -ur dspam/webui/cgi-bin/templates/nav_admin_status.html webui/cgi-bin/templates/nav_admin_status.html
--- dspam/webui/cgi-bin/templates/nav_admin_status.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_admin_status.html 2007-12-07 15:07:53.000000000 -0500
@@ -111,9 +111,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</body>
diff -ur dspam/webui/cgi-bin/templates/nav_admin_user.html webui/cgi-bin/templates/nav_admin_user.html
--- dspam/webui/cgi-bin/templates/nav_admin_user.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_admin_user.html 2007-12-07 15:08:00.000000000 -0500
@@ -52,9 +52,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</body>
diff -ur dspam/webui/cgi-bin/templates/nav_alerts.html webui/cgi-bin/templates/nav_alerts.html
--- dspam/webui/cgi-bin/templates/nav_alerts.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_alerts.html 2007-12-07 15:08:04.000000000 -0500
@@ -46,9 +46,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</BODY>
diff -ur dspam/webui/cgi-bin/templates/nav_analysis.html webui/cgi-bin/templates/nav_analysis.html
--- dspam/webui/cgi-bin/templates/nav_analysis.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_analysis.html 2007-12-07 15:08:09.000000000 -0500
@@ -46,9 +46,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a>. Copyright © 2002-2006, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</BODY>
diff -ur dspam/webui/cgi-bin/templates/nav_error.html webui/cgi-bin/templates/nav_error.html
--- dspam/webui/cgi-bin/templates/nav_error.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_error.html 2007-12-07 15:08:13.000000000 -0500
@@ -34,9 +34,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a>. Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</BODY>
diff -ur dspam/webui/cgi-bin/templates/nav_history.html webui/cgi-bin/templates/nav_history.html
--- dspam/webui/cgi-bin/templates/nav_history.html 2007-12-06 00:11:14.000000000 -0500
+++ webui/cgi-bin/templates/nav_history.html 2007-12-07 15:08:26.000000000 -0500
@@ -59,9 +59,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
<script language="javascript">
diff -ur dspam/webui/cgi-bin/templates/nav_performance.html webui/cgi-bin/templates/nav_performance.html
--- dspam/webui/cgi-bin/templates/nav_performance.html 2006-05-19 13:16:03.000000000 -0400
+++ webui/cgi-bin/templates/nav_performance.html 2007-12-07 15:08:36.000000000 -0500
@@ -103,9 +103,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a>. Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</body>
diff -ur dspam/webui/cgi-bin/templates/nav_preferences.html webui/cgi-bin/templates/nav_preferences.html
--- dspam/webui/cgi-bin/templates/nav_preferences.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_preferences.html 2007-12-07 15:08:41.000000000 -0500
@@ -112,9 +112,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</BODY>
diff -ur dspam/webui/cgi-bin/templates/nav_quarantine.html webui/cgi-bin/templates/nav_quarantine.html
--- dspam/webui/cgi-bin/templates/nav_quarantine.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_quarantine.html 2007-12-07 15:08:46.000000000 -0500
@@ -78,9 +78,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a>. Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</BODY>
diff -ur dspam/webui/cgi-bin/templates/nav_viewmessage.html webui/cgi-bin/templates/nav_viewmessage.html
--- dspam/webui/cgi-bin/templates/nav_viewmessage.html 2006-05-12 21:13:01.000000000 -0400
+++ webui/cgi-bin/templates/nav_viewmessage.html 2007-12-07 15:08:50.000000000 -0500
@@ -48,9 +48,7 @@
</div>
<div id="footer">
-<p>
-<a href="http://dspam.nuclearelephant.com";>DSPAM</a> is a registered trademark of <a href="http://www.nuclearelephant.com";>Jonathan A. Zdziarski</a> Copyright © 2005, Jonathan A. Zdziarski
-</p>
+$DSPAMVERSION$
</div>
</BODY>
Only in dspam/webui/: .cvsignore
diff -ur dspam/webui/htdocs/base.css webui/htdocs/base.css
--- dspam/webui/htdocs/base.css 2005-07-01 23:59:53.000000000 -0400
+++ webui/htdocs/base.css 2007-12-07 15:09:43.000000000 -0500
@@ -146,9 +146,6 @@
}
#footer a {
- color: #666666;
-}
-#footer p {
- color: #666666;
- padding: 8px;
+ text-align;center;
+ font-size:80%;
}
Only in dspam/webui/htdocs: .cvsignore
