X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fdownload.cgi;h=51727ec1df5da4170750dcf2acf0a9d43e2f99c3;hb=refs%2Ftags%2FPRE_WWW_REDESIGN;hp=3ad3ae8b7bed85c01adddc203dc886788a900d85;hpb=1af4a32d227fe2d6fee3e572e1d0121addfba93d;p=www.i-scream.org.git

diff --git a/cgi-bin/download.cgi b/cgi-bin/download.cgi
index 3ad3ae8..51727ec 100755
--- a/cgi-bin/download.cgi
+++ b/cgi-bin/download.cgi
@@ -19,11 +19,11 @@ $| = 1;
 #--------------------------------------------------------------
 # Essential Settings
 #--------------------------------------------------------------
-my ($build_dir) = "/builds";
+my ($build_dir) = "/downloads";
 my ($log_file) = "download_log";
-my ($left) = "../left.inc" ;
-my ($title) = "../title.inc";
-my ($bottom) = "../bottom.inc";
+my ($left) = "../htdocs/left.inc" ;
+my ($title) = "../htdocs/title.inc";
+my ($bottom) = "../htdocs/bottom.inc";
 #--------------------------------------------------------------
 
 
@@ -48,7 +48,7 @@ if (!defined($file_name) || $file_name eq "") {
 
 if (defined($submit) && $submit eq "Download") {
     open(LOGFILE, ">>$log_file");
-    print LOGFILE "$date|$file_name|$your_name|$email_address|$country\n";
+    print LOGFILE "$date|$ENV{'REMOTE_ADDR'}|$file_name|$your_name|$email_address|$country\n";
     close(LOGFILE);
     print $query->redirect("$build_dir/$file_name");
 }
@@ -90,16 +90,18 @@ END
     &print_html($title);
 
     print <<EOT;
-        <table align="center" width="600">
+        <table align="center" width="500">
          <tr>
           <td>
-           <center><img src="/i-scream.gif" width="502" height="37" border="0"></center>
+           <font face="arial,sans-serif">
            <center><h3>i-scream builds</h3></center>
            <font size="2">
-            At the current moment, all i-scream builds may be downloaded <b>free
-            of charge</b>.  If you wish to be alerted infrequently about important issues
-            regarding the i-scream montoring system, then we would recommend that
-            you provide your contact details below.  All fields are optional.
+            If you wish your details to be kept so we can contact you in the
+            future about i-scream, please enter them below. At the moment we
+            are not using this information, but we may collate a list of
+            details for when we make a new major release. All details are
+            optional - do not feel obliged to enter anything!
+           </font>
            </font>
           </td>
          </tr>
@@ -107,22 +109,22 @@ END
         
         <p>&nbsp;</p>
         
-        <form action="download.cgi" method="POST">
+        <form action="/cgi-bin/download.cgi" method="POST">
          <table border="0" align="center">
           <tr>
-           <td>Filename:</td>
-           <td><b>$file_name</b><input type="hidden" name="file_name" value="$file_name"></td>
+           <td><font face="arial,sans-serif">Filename:</font></td>
+           <td><font face="arial,sans-serif"><b>$file_name</b></font><input type="hidden" name="file_name" value="$file_name"></td>
           </tr>
           <tr>
-           <td>Your name:</td>
+           <td><font face="arial,sans-serif">Your name:</font></td>
            <td><input type="text" name="your_name" value=""></td>
           </tr>
           <tr>
-           <td>Email address:</td>
+           <td><font face="arial,sans-serif">Email address:</font></td>
            <td><input type="text" name="email_address" value=""></td>
           </tr>
           <tr>
-           <td>Country:</td>
+           <td><font face="arial,sans-serif">Country:</font></td>
            <td><input type="text" name="country" value=""></td>
           </tr>
           <tr>
@@ -143,10 +145,6 @@ EOT
           </td>
          </tr>
         </table>
-
-        </body>
-
-        </html>
 END
 
 }
@@ -157,5 +155,5 @@ exit;
 # Print a file without escaping HTML: -
 sub print_html ($) {
     my ($filename) = @_;
-    print `cat $filename`;
-}
\ No newline at end of file
+    print `cat $filename 2>&1`;
+}