# | Line 4 | Line 4 | use CGI; | |
---|---|---|
4 | $query=new CGI; | |
5 | my($period)=$query->param('period'); | |
6 | $period = "today" unless defined $period; | |
7 | + | my($modulelist)=$query->param('module'); |
8 | + | my $moduleext=""; $moduleext=":$modulelist" if defined $modulelist; |
9 | ||
10 | my($firstdate); | |
11 | if($period eq "days") { | |
12 | my($days)=$query->param('days'); | |
13 | $days = 1 unless defined $days; | |
14 | if ($days < 1) {$days = 1}; | |
15 | < | $heading = "i-scream CVS commits in the past $days day(s)"; |
15 | > | $heading = "i-scream CVS$moduleext commits in the past $days day(s)"; |
16 | $days--; | |
17 | < | $firstdate = `date --date \"$days days ago\" \"+%Y/%m/%d\"`; |
17 | > | $firstdate = ">" . `date --date \"$days days ago\" \"+%Y/%m/%d\"`; |
18 | } | |
19 | + | elsif($period eq "date") { |
20 | + | my($date)=$query->param('date'); |
21 | + | $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date; |
22 | + | $heading = "i-scream CVS$moduleext commits on $date"; |
23 | + | $firstdate = "$date 00:00<$date 23:59" |
24 | + | } |
25 | + | elsif($period eq "since") { |
26 | + | my($date)=$query->param('date'); |
27 | + | $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date; |
28 | + | $heading = "i-scream CVS$moduleext commits since $date"; |
29 | + | $firstdate = ">$date"; |
30 | + | } |
31 | elsif($period eq "thisweek") { | |
32 | < | $firstdate = "last Sunday"; |
33 | < | $heading = "i-scream CVS commits this week"; |
32 | > | $firstdate = ">last Sunday"; |
33 | > | $heading = "i-scream CVS$moduleext commits this week"; |
34 | } | |
35 | else { | |
36 | < | # default to "today only" |
37 | < | $firstdate = `/bin/date \"+%Y/%m/%d\"`; |
38 | < | $heading = "Today's i-scream CVS commits"; |
36 | > | # default to "today only" |
37 | > | $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`; |
38 | > | $heading = "Today's i-scream CVS$moduleext commits"; |
39 | } | |
40 | ||
27 | – | print "Content-type: text/html\n\n"; |
28 | – | |
29 | – | my($cvs) = "/usr/bin/cvs"; |
30 | – | my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl"; |
41 | my($cvsroot) = "/cvs/i-scream"; | |
42 | < | my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
43 | < | my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh"; |
42 | > | |
43 | > | $modulelist = `ls $cvsroot` unless defined $modulelist; |
44 | > | $modulelist =~ s/[\r\n]/ /gm; |
45 | > | |
46 | > | my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl"; |
47 | > | #my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
48 | > | my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
49 | > | my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; |
50 | my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; | |
51 | ||
52 | + | my ($left) = "../left.inc" ; |
53 | + | my ($title) = "../title.inc"; |
54 | + | my ($bottom) = "../bottom.inc"; |
55 | + | |
56 | + | print "Content-type: text/html\n\n"; |
57 | + | |
58 | print <<"END"; | |
59 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> | |
60 | ||
61 | <html> | |
62 | ||
63 | <head> | |
64 | < | <title>The i-scream Project Daily Commit Log</title> |
64 | > | <title>The i-scream Project Commit Log</title> |
65 | </head> | |
66 | ||
67 | <body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066"> | |
68 | ||
69 | < | <a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a> |
69 | > | <table border="0" cellpadding="2" cellspacing="2"> |
70 | > | <tr> |
71 | > | <td valign="top"> |
72 | > | END |
73 | ||
74 | < | <h2>$heading</h2> |
74 | > | &print_html($left); |
75 | ||
76 | + | print <<"END"; |
77 | + | </td> |
78 | + | <td valign="top"> |
79 | END | |
80 | ||
81 | + | &print_html($title); |
82 | + | |
83 | + | print <<"END"; |
84 | + | <h2>$heading</h2> |
85 | + | END |
86 | + | |
87 | print `$updatecmd`; | |
88 | ||
55 | – | my $modulelist = `ls $cvsroot`; |
89 | my(@modules) = split (/\s+/, $modulelist); | |
90 | ||
91 | foreach my $module (@modules) { | |
92 | ||
93 | < | print "<p><h3>$module module</h3>\n"; |
94 | < | print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">"; |
95 | < | print "Browse i-scream "$module" cvs module</a>\n"; |
63 | < | print "<pre>\n"; |
93 | > | print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n"; |
94 | > | print "<tr><td>\n<font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n"; |
95 | > | print "<tr><td bgcolor=\"white\">\n"; |
96 | ||
97 | my(@lines) = `$logcmd $module 2>&1`; | |
98 | if(@lines == 0) { | |
99 | < | print "There have been no commits in this module during this period."; |
99 | > | print "There have been no commits in this module during this period.\n"; |
100 | } | |
101 | else { | |
102 | foreach my $line (@lines) { | |
103 | < | print HTML_encode($line); |
103 | > | |
104 | > | if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) { |
105 | > | print "\n<font color=\"blue\">\n<b>"; |
106 | > | print HTML_encode($1); |
107 | > | print "</b>\n<i>"; |
108 | > | print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">"; |
109 | > | print HTML_encode("$2"); |
110 | > | print "</a></i>\n</font>\n" |
111 | > | } |
112 | > | elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) { |
113 | > | print "\n<font color=\"blue\">\n<b>"; |
114 | > | print HTML_encode($1); |
115 | > | print "</b>\n<i>"; |
116 | > | print " commited by "; |
117 | > | print HTML_encode("$2"); |
118 | > | print "</i>\n</font>\n" |
119 | > | } |
120 | > | elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { |
121 | > | #chop $line; |
122 | > | my ($file, $rest, $ext) = ($1, $2, $3); |
123 | > | print "<code>"; |
124 | > | print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">"; |
125 | > | print HTML_encode($file); |
126 | > | print "</a> "; |
127 | > | if($rest =~ /\((\d+).(\d+)(.*)\)/) { |
128 | > | my $newrev = "$1.$2"; |
129 | > | my $oldminver = $2-1; |
130 | > | my $oldrev = "$1.$oldminver"; |
131 | > | if(!($1==1 && $2==1)) { |
132 | > | my $diff = ".diff?r1=$oldrev&r2=$newrev"; |
133 | > | print "(<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">"; |
134 | > | print HTML_encode("$1.$2"); |
135 | > | print "</a>"; |
136 | > | print HTML_encode("$3)"); |
137 | > | } |
138 | > | else { |
139 | > | print HTML_encode($rest); |
140 | > | } |
141 | > | } |
142 | > | else { |
143 | > | print HTML_encode($rest); |
144 | > | } |
145 | > | print HTML_encode($ext); |
146 | > | print "</code><br>\n" |
147 | > | } |
148 | > | else { |
149 | > | chop $line; |
150 | > | print "<code>"; |
151 | > | print HTML_encode($line); |
152 | > | print "</code><br>\n" |
153 | > | } |
154 | } | |
155 | } | |
156 | + | print "</td></tr>\n"; |
157 | ||
158 | < | print "</pre></p>\n\n"; |
158 | > | print "</table><p>\n\n"; |
159 | } | |
160 | ||
161 | + | &print_html($bottom); |
162 | + | |
163 | print <<"END"; | |
164 | + | |
165 | + | </td> |
166 | + | </tr> |
167 | + | </table> |
168 | + | |
169 | </body> | |
170 | ||
171 | </html> | |
# | Line 96 | Line 186 | sub HTML_encode ($){ | |
186 | $encoded =~ s/</</g; | |
187 | $encoded =~ s/>/>/g; | |
188 | return $encoded; | |
189 | + | } |
190 | + | |
191 | + | # Print a file without escaping HTML: - |
192 | + | sub print_html ($) { |
193 | + | my ($filename) = @_; |
194 | + | print `cat $filename 2>&1`; |
195 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |