X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;h=49bb105d23840ff7a41f30fd941527448d7007fe;hb=HEAD;hp=01ee2bfabf732c52705f42dcc9a11882550699b2;hpb=dab5dbc565daac5f26e957130e49e29fc4d3cb6a;p=www.i-scream.org.git

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index 01ee2bf..49bb105 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -44,18 +44,18 @@ $modulelist = `ls $cvsroot` unless defined $modulelist;
 $modulelist =~ s/[\r\n]/ /gm;
 
 my($cvs2clpath) = "/usr/local/bin/cvs2cl";
-my($cvs2clargs) = "--stdout --no-wrap --no-common-dir -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+my($cvs2clargs) = "--stdout --no-wrap --no-common-dir -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d$firstdate\" -g \"-d$cvsroot\" -g \"-Q\"";
 my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist";
 my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs";
 
-my ($incdir) = "../nwww";
+my ($incdir) = "../htdocs";
 
 # Include files
 my ($doctype) = "$incdir/doctype.inc";
 my ($style) = "$incdir/style.inc";
 my ($header) = "$incdir/header.inc";
 my ($footer) = "$incdir/footer.inc";
-my ($menu) = "$incdir/menu.inc" ;
+my ($menu) = "$incdir/menu-static.inc" ;
 
 # Section markers
 my ($secwho) = 1;
@@ -109,7 +109,7 @@ foreach my $module (@modules) {
     print <<"END";
             <div>
               <h3>
-                <a href="http://cvs.i-scream.org/$module/" class="cvsloghead">$module module</a>
+                <a href="https://cvs.i-scream.org/$module/" class="cvsloghead">$module module</a>
               </h3>
 END
 
@@ -189,7 +189,7 @@ END
                 }
                 $file = escapeHTML($file);
                 print <<"END";
-                  <a href="http://cvs.i-scream.org/$file">$file</a>
+                  <a href="https://cvs.i-scream.org/$file">$file</a>
 END
                 if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) {
                     my $start = $1;
@@ -212,7 +212,7 @@ END
                         $other = escapeHTML($other);
                         chomp $other;
                         print <<"END";
-                  (<a href="http://cvs.i-scream.org/$file$diff">$startend</a>$other)$ext
+                  (<a href="https://cvs.i-scream.org/$file$diff">$startend</a>$other)$ext
 END
                     }
                     else {
@@ -291,13 +291,8 @@ exit 0;
 # Print the contents of a file containing html
 sub print_html {
     my ($filename) = @_;
-    my($virtual) = '<!--#include virtual="/cgi-bin/logo.cgi" -->';
-    my(@virtualresponse) = `/web/i-scream/nwww.cgi-bin/logo.cgi`;
     open(FILE, $filename);
     while(<FILE>) {
-        if(/$virtual/) {
-            s/$virtual/$virtualresponse[@virtualresponse-1]/;
-        }
         print;
     }
     close FILE;