Changeset 11656 for trunk

Timestamp:

2006-04-19T15:42:57+12:00 (18 years ago)

Author:

kjdon

Message:

changed email address to greenstone instead of dmn, moved the html files into greenstone/usability, using httpimg to work out the address

File:

• trunk/gsdl/cgi-bin/usabcgi.pm (modified) (5 diffs)

trunk/gsdl/cgi-bin/usabcgi.pm

@@ -3 +3 @@
 
 sub get_config_info {
-    open FILEIN, ("gsdlsite.cfg") 
-    || die "ERROR: Could not open site configuration file\n";
+    open FILEIN, ("gsdlsite.cfg")   || die "ERROR: Could not open site configuration file\n";
 
     my $configfile;
@@ -22 +21 @@
 }
 
+sub get_httpimg {
+    my ($imageloc) = usabcgi::get_config_info("httpimg");
+    if(!($imageloc =~ "http")) {$imageloc="http://".$ENV{HTTP_HOST}.$imageloc;}
+    return $imageloc;
+}
+
+sub get_httpusab {
+    my ($htmlloc) = usabcgi::get_config_info("httpimg");
+    if(!($htmlloc =~ "http")) {$htmlloc="http://".$ENV{HTTP_HOST}.$htmlloc;}
+    $htmlloc =~ s/images/usability/;
+    return  $htmlloc;
+
+}
+
 sub printscript {
     
@@ -33 +46 @@
 sub printbanner {
     ($title)=@_;
-    ($imageloc) = usabcgi::get_config_info("httpimg");
-    if(!($imageloc =~ "http")) {$imageloc="http://".$ENV{HTTP_HOST}.$imageloc;}
+    ($imageloc) = usabcgi::get_httpimg();
     print "<table width=\"100%\"><tr>\n<td><h1>Greenstone Usability - $title</h1></td>\n";
     print "<td align=\"right\">";
-    if ($imageloc) { print "<img src=\"$imageloc\/usabbanner.gif\" alt=\"Greenstone koru design\" title=\"Greenstone koru design\">"; }
+    if ($imageloc) { print "<img src=\"$imageloc\/usabbnr.gif\" alt=\"Greenstone koru design\" title=\"Greenstone koru design\">"; }
     print "</td>\n</tr></table>";
 }
 
 sub printaplinks {
+    # this is a hack
+    ($htmlloc) = usabcgi::get_httpusab();
     print "<p class=\"sans\">\n";
-    print "<a href=\"javascript:showaboutprivacy('http://nzdl2.cs.waikato.ac.nz/dana/gsdl/about.html')\">About</a>\n &#8226; <a href=\"javascript:showaboutprivacy('http://nzdl2.cs.waikato.ac.nz/dana/gsdl/privacy.html')\">Privacy</a>\n";
+    print "<a href=\"javascript:showaboutprivacy('$htmlloc/about.html')\">About</a>\n &#8226; <a href=\"javascript:showaboutprivacy('$htmlloc/privacy.html')\">Privacy</a>\n";
 
 }
@@ -65 +79 @@
     if((!($ENV{QUERY_STRING}=~/\d/)) || ($ENV{QUERY_STRING}=~/\D/) ) {
     print "<h2>Each report sent has an ID number.  This page needs one of those numbers to work.</h2>\n";
-    print "<br><br><p class=\"sans\"><a href=\"mailto:dmn&#064;cs.waikato.ac.nz\">Contact us</a> with any queries about this.\n";
+    print "<br><br><p class=\"sans\"><a href=\"mailto:greenstone&#064;cs.waikato.ac.nz\">Contact us</a> with any queries about this.\n";
     print "</body></html>\n";
     die;
@@ -83 +97 @@
     if(!($etcfile=~ / $ENV{QUERY_STRING}\&usabend;/)) {
     print "<h2>Each report has an ID number.  This program needs one of those ID numbers to work, and the ID number provided wasn't found.</h2>\n";
-    print "<br><br><p class=\"sans\"><a href=\"mailto:dmn&#064;cs.waikato.ac.nz\">Contact us</a> with any queries about this.\n";
+    print "<br><br><p class=\"sans\"><a href=\"mailto:greenstone&#064;cs.waikato.ac.nz\">Contact us</a> with any queries about this.\n";
     print "</body></html>";  
         die;