Changeset 511 for branches/htmlform/cgi-bin

Timestamp:

09/27/12 18:13:16 (12 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Final prep for merge back to trunk.

• Remove lockin on /ip/ web path as with /branches/stable r507.
• Fix a buglet with the body text color.
• Remove the lingering header and footer template files

See #3.

Location:

branches/htmlform/cgi-bin

Files:

• MyIPDB.pm (modified) (1 diff)
• admin.cgi (modified) (1 diff)
• main.cgi (modified) (2 diffs)

branches/htmlform/cgi-bin/MyIPDB.pm

@@ -22 +22 @@
 # DB host is optional.
 my $dbhost = 'ipdb-db';
+
+# Quick workaround for fixed web path.  Set this to the absolute web path to 
+# your IPDB install, or leave blank for installation at the webroot. 
+$IPDB::webpath = ''; 
 
 # Set some globals declared in IPDB.pm.  Most of these only affect mailNotify().

branches/htmlform/cgi-bin/admin.cgi

@@ -518 +518 @@
 
 ##fixme:  make me a footer param!
-print qq(<hr><div><a href="/ip/">Back</a> to main interface</div>\n);
+print qq(<hr><div><a href="$IPDB::webpath/">Back</a> to main interface</div>\n);
 
 # We print the footer here, so we don't have to do it elsewhere.

branches/htmlform/cgi-bin/main.cgi

@@ -77 +77 @@
 $header->param(version => $IPDB::VERSION);
 $header->param(addperm => $IPDBacl{$authuser} =~ /a/);
+$header->param(webpath => $IPDB::webpath);
 print "Content-type: text/html\n\n", $header->output;
 
@@ -208 +209 @@
 # can't do this yet, too many blowups
 #print "Content-type: text/html\n\n", $header->output;
-
+$page->param(webpath => $IPDB::webpath);
 print $page->output;
 
 # include the admin tools link in the output?
 $footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));
-
+$footer->param(webpath => $IPDB::webpath);
 print $footer->output;