Changeset 445 for branches/stable/cgi-bin/search.cgi

Timestamp:

07/26/10 17:00:00 (14 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Bring /branches/stable up to date with /trunk. See #13.

Location:

branches/stable

Files:

• . (modified) (2 props)
• cgi-bin/search.cgi (modified) (5 diffs)

branches/stable

@@ -1 +1 @@
 local.css
+*.tar.gz

@@ -1 +1 @@
 local.css
+*.tar.gz

branches/stable/cgi-bin/search.cgi

@@ -9 +9 @@
 # Last update by $Author$
 ###
-# Copyright 2005,2006 Kris Deugau
+# Copyright 2005-2010 - Kris Deugau
 
 use strict;             
@@ -16 +16 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use MyIPDB;
 use POSIX qw(ceil);
 use NetAddr::IP;
 
-# Don't need a username or syslog here.  syslog left active for debugging.
+# don't remove!  required for GNU/FHS-ish install from tarball
+##uselib##
+
+use MyIPDB;
+
+# Don't formally need a username or syslog here.  syslog left active for debugging.
 use Sys::Syslog;
-openlog "IPDBsearch","pid","local2";
+openlog "IPDBsearch","pid","$IPDB::syslog_facility";
+
+# ... but we do *use* the username on ACLs now.
+# Collect the username from HTTP auth.  If undefined, we're in
+# a test environment, or called without a username.
+my $authuser;
+if (!defined($ENV{'REMOTE_USER'})) {
+  $authuser = '__temptest';
+} else {
+  $authuser = $ENV{'REMOTE_USER'};
+}
 
 # Why not a global DB handle?  (And a global statement handle, as well...)
@@ -49 +63 @@
 }
 
-printHeader('Searching...');
+# Headerize!  Make sure we replace the $$EXTRA0$$ bit as needed.
+printHeader('', ($IPDBacl{$authuser} =~ /a/ ?
+        '<td align=right><a href="/ip/cgi-bin/main.cgi?action=assign">Add new assignment</a></td>' : ''
+        ));
 
 if ($webvar{stype} eq 'q') {
@@ -148 +165 @@
   if ($webvar{cidr} eq '') { # We has a blank CIDR.  Ignore it.
   } elsif ($webvar{cidr} =~ /\//) {
-    # 209.91.179/26 should show all /26 subnets in 209.91.179
+    # 192.168.179/26 should show all /26 subnets in 192.168.179
     my ($net,$maskbits) = split /\//, $webvar{cidr};
     if ($webvar{cidr} =~ /^(\d{1,3}\.){3}\d{1,3}\/\d{2}$/) {
@@ -340 +357 @@
     $query =~ s/\s+//g;
     if ($query =~ /\//) {
-      # 209.91.179/26 should show all /26 subnets in 209.91.179
+      # 192.168.179/26 should show all /26 subnets in 192.168.179
       my ($net,$maskbits) = split /\//, $query;
       if ($query =~ /^(\d{1,3}\.){3}\d{1,3}\/\d{2}$/) {

@@ -1 +1 @@
 local.css
+*.tar.gz