factor out common HTML page creation notice ...

[bugscan.git] / dohtml

diff --git a/dohtml b/dohtml
index d3a8bd17b45bd8ba49058b6035c57f11c4561359..8315a3820f38e66cc869f72032a82f51c7a3b0f2 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -2,7 +2,7 @@
 
 htmldir=/org/bugs.debian.org/www/bugscan
 
-header() {
+html_header() {
        local   title="$1"      # Title of page
        local   date="$2"       # Date
 
@@ -21,6 +21,15 @@ header() {
 EOF
 }
 
+html_page_creation_notice() {
+       cat <<EOF
+<hr>
+This page is automatically generated.<br>
+Please contact
+<a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a> for comments.
+EOF
+}
+
 realmakepage() {
        local   filter="$1"     # Distributions to list
        local   title="$2"      # Title of page
@@ -37,7 +46,7 @@ realmakepage() {
 
        filter="$filter $worry"
 
-       header "$title" "$date"
+       html_header "$title" "$date"
 
        cat <<EOF
 
@@ -76,11 +85,9 @@ U for unstable (sid) or E for experimental.
 EOF
        ./bugreport -H -l $filter
 
+       html_page_creation_notice
+
        cat <<EOF
-<hr>
-This page is automatically generated.<br>
-Please contact
-<a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a> for comments.
 </body>
 </html>
 EOF
@@ -88,7 +95,7 @@ EOF
 
 makemainpage() {
 
-       header "$title" "$date"
+       header "$title" "$time"
 
        cat <<EOF
 
@@ -140,10 +147,11 @@ EOF
      + <a href="other/testing.html">Only bugs relevant to testing</a>
 </ul>
 <p clear=both>
-<hr>
-This page is automatically generated.<br>
-Please contact
-<a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a> for comments.
+EOF
+
+       html_page_creation_notice
+
+       cat <<EOF
 To receive all mails sent to release-critical bugs, subscribe to the
 <a href="http://lists.debian.org/debian-bugs-rc/">debian-bugs-rc</a>
 mailing list.