Changeset 4072


Ignore:
Timestamp:
2003-04-02T00:09:26+12:00 (21 years ago)
Author:
dana
Message:

added end tags, general interface tidying, code tidying

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/cgi-bin/perl.cgi

    r3904 r4072  
    11#!/usr/bin/perl
     2
     3use usabcgi;
    24
    35print "Content-type:text/html\n\n";
    46
    5 open(FILEIN, "gsdlsite.cfg") or die "Could not open site configuration file\n";
    6 @config=<FILEIN>;
    7 close(FILEIN);
    87
    9 foreach $line (@config)
    10 {
    11     if($line=~/(gsdlhome)\s+(\S+)/)
    12     {
    13     $fileoutloc=$2;
    14     $fileoutloc =~ s/\"//g;
    15     if(!($fileoutloc=~ /\/$/)) {$fileoutloc.="/"; }
    16     $fileoutloc.= "etc/usability.txt";
    17     }
    18     elsif($line=~/(httpimg)\s+(\S+)/)
    19     {
    20     $imageloc =$2;
    21     if(!($2=~/http/)){
    22         $imageloc="http://".$ENV{HTTP_HOST}."\/".$2;
    23     }
    24     }
    25 }
    268
    279
    … …  
    2911$idno =~ s/\.//g;
    3012$idno .= time;
    31 
    32 if(!($fileoutloc=~/etc\/usability\.txt/))
    33 {
    34     die "Could not open log file etc/usability.txt\n";
    35 }
    3613
    3714print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
    … …  
    4320    print "<style type=\"text/css\">\n";
    4421    print "\th1 \{font-family: sans-serif; font-size: 20px}\n";
     22    print "\tp.sans {font-family: sans-serif}\n";
     23    print "\ttd.sans {font-family: sans-serif}\n";
    4524    print "</style>\n"
    4625}
    … …  
    6140#print "}\n";
    6241#print "\n";
    63 print "function viewdetails() {\n";
    64 print "\talert(\"This function is still being researched, please try again later\");\n}\n";
    65 print "</script>";
     42
    6643print "</head><body onLoad=\"if(parseInt(navigator.appVersion)>3)\{window.resizeTo(420,300);\}\" bgcolor=\"#FFFFFF\">\n";
     44
     45($imageloc) = usabcgi::get_config_info("httpimg");
     46if(!($imageloc =~ "http")) {$imageloc="http://".$ENV{HTTP_HOST}.$imageloc;}
    6747print "<table width=\"400px\"><tr>\n<td><h1>Greenstone Usability - Thank you</h1></td>\n";
    6848print "<td align=\"right\">";
    6949if ($imageloc) { print "<img src=\"$imageloc\/usabbanner.gif\" alt=\"Greenstone koru design\" title=\"Greenstone koru design\">"; }
    7050print "</td>\n</tr></table>";
    71 print "<p><a href=\"http://nzdl2.cs.waikato.ac.nz/cgi-bin/dana/library?a=p&p=Usability\" target=\"_blank\">About</a> &#8226; <a href=\"http://nzdl2.cs.waikato.ac.nz/cgi-bin/dana/library?a=p&p=Privacy\" target=\"_blank\">Privacy</a>";
     51
     52($fileoutloc) = usabcgi::get_config_info("gsdlhome");
     53if(!($fileoutloc =~/\/$/)) {$fileoutloc.="/";}
     54$fileoutloc .= "etc/usability.txt";
     55
     56if(!(-e $fileoutloc)){
     57    open FILEOUT, (">>$fileoutloc");
     58}
     59else {
     60    open FILEOUT, (">$fileoutloc");
     61}
     62
     63print "<p class=\"sans\"><a href=\"http://nzdl2.cs.waikato.ac.nz/cgi-bin/dana/library?a=p&p=Usability\" target=\"_blank\">About</a> &#8226; <a href=\"http://nzdl2.cs.waikato.ac.nz/cgi-bin/dana/library?a=p&p=Privacy\" target=\"_blank\">Privacy</a>";
    7264print "<p>Your comments have been noted.  Thank you for helping us make Greenstone more usable!";
    7365print "<table width=\"400px\"><tr>\n";
    74 print "<td><a href=\"readresults.cgi?$idno\" target=\"_blank\">View report details</a></td>\n";
    75 print "<td><a href=\"http://nzdl2.cs.waikato.ac.nz/dana/gsdl/test.html\" target=\"_blank\">Track report</a></td>";
    76 print "<td align=\"right\"><p><form action=\"\"><input type=\"Button\" value=\"Close Window\" onClick=\"window.close();\"></form></td>\n";
     66print "<td class=\"sans\"><a href=\"readresults.cgi?$idno\" target=\"_blank\">View report details</a></td>\n";
     67print "<td class=\"sans\"><a href=\"http://nzdl2.cs.waikato.ac.nz/dana/gsdl/test.html\" target=\"_blank\">Track report</a></td>";
     68print "<td align=\"right\"><form action=\"\"><button type=\"button\" onClick=\"window.close();\"><b>Close Window</b></button></form></td>\n";
    7769print"</tr></table>\n";
    7870
    … …  
    9789else { open FILEOUT, (">$fileoutloc") or print "cannot open file $fileoutloc\n"; }
    9890#print FILEOUT "-------------------------------------\n";
    99 print FILEOUT "report-id := $idno\n";
     91print FILEOUT "report-id := $idno\&usabend;\n";
    10092foreach $key (keys(%FORM)) {
    10193    if($key eq "URL") {
    … …  
    10395    $url =~s/\&/\&amp\;/g;
    10496    }
    105     print FILEOUT "$key := $FORM{$key}\n";
     97    print FILEOUT "$key := $FORM{$key}\&usabend;\n";
    10698}
    107 print FILEOUT "browser-read-by-server :=  $ENV{HTTP_USER_AGENT}\n";
    108 print FILEOUT "browser-ip-no :=  $ENV{REMOTE_ADDR}\n";
    109 print FILEOUT "server-ip-no :=  $ENV{SERVER_ADDR}\n";
    110 print FILEOUT "time := ".scalar(localtime(time))."\n";
     99print FILEOUT "browser-read-by-server :=  $ENV{HTTP_USER_AGENT}\&usabend;\n";
     100print FILEOUT "browser-ip-no :=  $ENV{REMOTE_ADDR}\&usabend;\n";
     101print FILEOUT "server-ip-no :=  $ENV{SERVER_ADDR}\&usabend;\n";
     102print FILEOUT "time := ".scalar(localtime(time))."\&usabend;\n";
    111103print FILEOUT "----------------------------------------------\n";
    112104close (FILEOUT);
Note: See TracChangeset for help on using the changeset viewer.