]> i-scream Git - www.i-scream.org.git/blobdiff - cgi-bin/cvslog.cgi
i-scream / www.i-scream.org.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added the title and bottom in the correct fashion. This is inline with the i-scream
[www.i-scream.org.git] / cgi-bin / cvslog.cgi
diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index fe62526d0e79a7428945677a83ce8eb4d1f0c46c..d3ca45366881446ae76c37990f9d6dc30e4ae8e6 100755 (executable)
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -24,14 +24,22 @@ else {
    $heading = "Today's i-scream CVS commits";
 }
 
-print "Content-type: text/html\n\n";
+my($cvsroot) = "/cvs/i-scream";
+
+my($modulelist)=$query->param('module');
+$modulelist = `ls $cvsroot` unless defined $modulelist;
 
 my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
-my($cvsroot) = "/cvs/i-scream";
 my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
-my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh";
+my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist";
 my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
 
+my ($left) = "../left.inc" ;
+my ($title) = "../title.inc";
+my ($bottom) = "../bottom.inc";
+
+print "Content-type: text/html\n\n";
+
 print <<"END";
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
@@ -43,53 +51,69 @@ print <<"END";
 
 <body bgcolor="#ffffff" link="#ffffff" alink="#ffffff" vlink="#ffffff" text="#000066">
 
-<a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a>
+<table border="0" cellpadding="2" cellspacing="2">
+ <tr>
+  <td valign="top">
+END
 
-<center><table border="0" cellpadding="4" cellspacing="1" bgcolor="#000066" align="center"><tr><td bgcolor="#ffffcc"><font color="#000066" face="arial,sans-serif" size="5"><b><center>$heading</center></b></font></td></tr></table></center>
-<p>&nbsp;</p>
+&print_html($left);
 
+print <<"END";
+  </td>
+  <td valign="top">
+END
+
+&print_html($title);
+
+print <<"END";
+<h2>$heading</h2>
 END
 
 print `$updatecmd`;
 
-my $modulelist = `ls $cvsroot`;
 my(@modules) = split (/\s+/, $modulelist);
 
 foreach my $module (@modules) {
 
-    print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">";
-    print "<tr><td><font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">$module module</a></b></font></td></tr>";
-    print "<tr><td bgcolor=\"white\">";
+    print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
+    print "<tr><td>\n<font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">$module module</a></b></font>\n</td></tr>\n\n";
+    print "<tr><td bgcolor=\"white\">\n";
 
     my(@lines) = `$logcmd $module 2>&1`;
     if(@lines == 0) {
-        print "There have been no commits in this module during this period.";
+        print "There have been no commits in this module during this period.\n";
     }
     else {
         foreach my $line (@lines) {
 
             if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
-                print "<font color=\"blue\"><b>";
+                print "\n<font color=\"blue\"><b>";
                 print HTML_encode($1);
                 print "</b><i>";
                 print HTML_encode("by $2");
-                print "</i></font>"
+                print "</i></font>\n"
             }
             else {
                 chop $line;
                 print "<code>";
                 print HTML_encode($line);
-                print "</code><br>"
+                print "</code><br>\n"
             }
         }
     }
-    print "</td></tr>";
+    print "</td></tr>\n";
 
     print "</table><p>\n\n";
 }
 
+&print_html($bottom);
+
 print <<"END";
 
+  </td>
+ </tr>
+</table>
+
 </body>
 
 </html>
@@ -111,3 +135,9 @@ sub HTML_encode ($){
     $encoded =~ s/>/&gt;/g;
     return $encoded;
 }
+
+# Print a file without escaping HTML: -
+sub print_html ($) {
+    my ($filename) = @_;
+    print `cat $filename 2>&1`;
+}
www.i-scream.org