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

Timestamp:

05/14/13 18:10:22 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/search.cgi (modified) (13 diffs)

branches/stable/cgi-bin/search.cgi

@@ -14 +14 @@
 use warnings;   
 use CGI::Carp qw(fatalsToBrowser);
+use CGI::Simple;
+use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 use POSIX qw(ceil);
 use NetAddr::IP;
@@ -38 +39 @@
 }
 
+# Global variables
+my $RESULTS_PER_PAGE = 25;
+
+# anyone got a better name?  :P
+my $thingroot = $ENV{SCRIPT_FILENAME};
+$thingroot =~ s|cgi-bin/search.cgi||;
+
+# Set up the CGI object...
+my $q = new CGI::Simple;
+# ... and get query-string params as well as POST params if necessary
+$q->parse_query_string;
+
+# Convenience;  saves changing all references to %webvar
+##fixme:  tweak for handling <select multiple='y' size=3> (list with multiple selection)
+my %webvar = $q->Vars;
+
+if (defined($webvar{rpp})) {
+  ($RESULTS_PER_PAGE) = ($webvar{rpp} =~ /(\d+)/);
+}
+
 # Why not a global DB handle?  (And a global statement handle, as well...)
 # Use the connectDB function, otherwise we end up confusing ourselves
@@ -44 +65 @@
 my $errstr;
 ($ip_dbh,$errstr) = connectDB_My;
-if (!$ip_dbh) {
-  printAndExit("Failed to connect to database: $errstr\n");
+if ($ip_dbh) {
+  checkDBSanity($ip_dbh);
+  initIPDBGlobals($ip_dbh);
 }
-checkDBSanity($ip_dbh);
-initIPDBGlobals($ip_dbh);
-
-# Global variables
-my $RESULTS_PER_PAGE = 25;
-my %webvar = parse_post();
-cleanInput(\%webvar);
-
-if (defined($webvar{rpp})) {
-  ($RESULTS_PER_PAGE) = ($webvar{rpp} =~ /(\d+)/);
-}
-
+
+# Set up some globals
+$ENV{HTML_TEMPLATE_ROOT} = $thingroot."templates";
+
+my $page;
 if (!defined($webvar{stype})) {
   $webvar{stype} = "<NULL>";   #shuts up the warnings.
+  $page = HTML::Template->new(filename => "search/compsearch.tmpl");
+} else {
+  $page = HTML::Template->new(filename => "search/sresults.tmpl");
 }
 
-# Headerize!  Make sure we replace the $$EXTRA0$$ bit as needed.
-printHeader('', $IPDB::webpath, ($IPDBacl{$authuser} =~ /a/ ?
-        '<td align=right><a href="'.$IPDB::webpath.'/cgi-bin/main.cgi?action=assign">Add new assignment</a></td>' : ''
-        ));
-
-if ($webvar{stype} eq 'q') {
+my $header = HTML::Template->new(filename => "header.tmpl");
+$header->param(version => $IPDB::VERSION);
+$header->param(addperm => $IPDBacl{$authuser} =~ /a/);
+print "Content-type: text/html\n\n", $header->output;
+
+# Handle the DB error first
+if (!$ip_dbh) {
+  $page = HTML::Template->new(filename => "dberr.tmpl");
+  $page->param(errmsg => $errstr);
+} elsif ($webvar{stype} eq 'q') {
   # Quick search.
 
@@ -111 +133 @@
     $sqlconcat = "UNION";
   } else {
-    # We can't get here.  PTHBTT!
-    printAndExit "PTHBTT!!  Your search has been rejected due to Microsoft excuse #4432: ".
-        "Not enough mana";
+    # sum-buddy tryn'a game the system.  Match "all"
+    $sqlconcat = "INTERSECT";
   }
 
@@ -190 +211 @@
         "text(cidr) like '$webvar{cidr}%')";
   } else {
-    # This shouldn't happen, but if it does, whoever gets it deserves what they get...
-    printAndExit("Invalid netblock query.");
+    # do nothing.
+    ##fixme  we'll ignore this to clear out the references to legacy code.
   } # done with CIDR query options.
 
@@ -201 +222 @@
 
   if ($count == 0) {
-    printError "No matches found.  Try eliminating one of the criteria,".
-        " or making one or more criteria more general.";
+    $page->param(errmsg => "No matches found.  Try eliminating one of the criteria,".
+        " or making one or more criteria more general.");
   } else {
     # Add the limit/offset clauses
@@ -225 +246 @@
 
   if ($count == 0) {
-    printError "No customers currently listed as connected through this node.";
+    $page->param(errmsg => "No customers currently listed as connected through this node.");
+##fixme:  still get the results table header
   } else {
     # Add the limit/offset clauses
@@ -237 +259 @@
 } else { # how script was called.  General case is to show the search criteria page.
 
-  # Display search page.  We have to do this here, because otherwise
-  # we can't retrieve data from the database for the types and cities.  >:(
-  my $html;
-  open HTML,"<../compsearch.html";
-  $html = join('',<HTML>);
-  close HTML;
-  $html =~ s/\$\$WEBPATH\$\$/$IPDB::webpath/g;
-
 # Generate table of types
-  my $typetable = "<table class=regular cellspacing=0>\n<tr>";
   $sth = $ip_dbh->prepare("select type,dispname from alloctypes where listorder <500 ".
         "order by listorder");
   $sth->execute;
   my $i=0;
-  while (my @data = $sth->fetchrow_array) {
-    $typetable .= "<td><input type=checkbox name=type[$data[0]]>$data[1]</td>";
-    $i++;
-    $typetable .= "</tr>\n<tr>"
-        if ($i % 4 == 0);
-  }
-  if ($i %4 == 0) {
-    $typetable =~ s/<tr>$//;
-  } else {
-    $typetable .= "</tr>\n";
-  }
-  $typetable .= "</table>\n";
+  my @typelist;
+  while (my ($type,$dispname) = $sth->fetchrow_array) {
+    my %row = (
+        newrow => ($i % 4 == 0),
+        type => $type,
+        dispname => $dispname,
+        endrow => ($i++ % 4 == 3)
+        );
+    push @typelist, \%row;
+  }
+  $page->param(typelist => \@typelist);
 
 # Generate table of cities
-  my $citytable = "<table class=regular cellspacing=0>\n<tr>";
   $sth = $ip_dbh->prepare("select id,city from cities order by city");
   $sth->execute;
-  my $i=0;
-  while (my @data = $sth->fetchrow_array) {
-    $citytable .= "<td><input type=checkbox name=city[$data[0]]>$data[1]</td>";
-    $i++;
-    $citytable .= "</tr>\n<tr>"
-        if ($i % 5 == 0);
-  }
-  if ($i %5 == 0) {
-    $citytable =~ s/<tr>$//;
-  } else {
-    $citytable .= "</tr>\n";
-  }
-  $citytable .= "</table>\n";
-
-  $html =~ s/\$\$TYPELIST\$\$/$typetable/;
-  $html =~ s/\$\$CITYLIST\$\$/$citytable/;
-
-  print $html;
+  $i=0;
+  my @citylist;
+  while (my ($id, $city) = $sth->fetchrow_array) {
+    my %row = (
+        newrow => ($i % 4 == 0),
+        id => $id,
+        city => $city,
+        endrow => ($i++ % 4 == 3)
+        );      
+    push @citylist, \%row;
+  }
+  $page->param(citylist => \@citylist);
+
 }
+
+print $page->output;
 
 # Shut down and clean up.
 finish($ip_dbh);
-printFooter;
+
+# We print the footer here, so we don't have to do it elsewhere.
+my $footer = HTML::Template->new(filename => "footer.tmpl");
+# include the admin tools link in the output?
+$footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));
+
+print $footer->output;
+
 # We shouldn't need to directly execute any code below here;  it's all subroutines.
 exit 0;
@@ -323 +338 @@
   if ($category eq 'all') {
 
-    print qq(<div class="heading">Showing all netblock and static-IP allocations</div><br>\n);
     $sql = "select $cols from searchme";
     my $count = countRows($sql);
@@ -331 +345 @@
   } elsif ($category eq 'cust') {
 
+##fixme:  this and other quick-search areas;  fix up page heading title similar to first grouping above
     print qq(<div class="heading">Searching for Customer IDs containing '$query'</div><br>\n);
 
@@ -394 +409 @@
     } else {
       # This shouldn't happen, but if it does, whoever gets it deserves what they get...
-      printError("Invalid query.");
+      $page->param(errmsg => "Invalid query.");
     }
   } else {
     # This shouldn't happen, but if it does, whoever gets it deserves what they get...
-    printError("Invalid searchfor.");
+    $page->param(errmsg => "Invalid searchfor.");
   }
 } # viewBy
@@ -438 +453 @@
   $sth->execute();
 
-  startTable('Allocation','CustID','Type','City','Description/Name');
+  $page->param(searchtitle => "Showing all netblock and static-IP allocations");
+
   my $count = 0;
-
-  while (my @data = $sth->fetchrow_array) {
-
-    # cidr,custid,type,city,description,notes
-    # Another bit of HairyPerl(TM) to prefix subblocks with "Sub"
-    my @row = (($data[2] =~ /^.r$/ ? 'Sub ' : '').
-        qq(<a href="$IPDB::webpath/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
-        $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
-    # Allow listing of pool if desired/required.
-    if ($data[2] =~ /^.[pd]$/) {
-      $row[0] .= ' &nbsp; <a href="'.$IPDB::webpath.'/cgi-bin/main.cgi?action=listpool'.
-        "&pool=$data[0]\">List IPs</a>";
-    }
-    printRow(\@row, 'color1', 1) if ($count%2==0); 
-    printRow(\@row, 'color2', 1) if ($count%2!=0);
-    $count++;
-  }
+  my @sresults;
+  while (my ($block, $custid, $type, $city, $desc) = $sth->fetchrow_array) {
+    my %row = (
+        rowclass => $count++ % 2,
+        issub => ($type =~ /^.r$/ ? 1 : 0),
+        block => $block,
+        ispool => ($type =~ /^.[pd]$/ ? 1 : 0),
+        custid => $custid,
+        disptype => $disp_alloctypes{$type},
+        city => $city,
+        desc => $desc
+        );
+    push @sresults, \%row;
+  }
+  $page->param(sresults => \@sresults);
 
   # Have to think on this call, it's primarily to clean up unfetched rows from a select.
@@ -463 +477 @@
 
   my $upper = $offset+$count;
-  print "<tr><td colspan=10 bgcolor=white class=regular>Records found: $rowCount<br><i>Displaying: ".($offset+1)." - $upper</i></td></tr>\n";
-  print "</table></center>\n";
+
+  $page->param(resfound => $rowCount);
+  $page->param(resstart => $offset+1);
+  $page->param(resstop => $upper);
 
   # print the page thing..
   if ($RESULTS_PER_PAGE > 0 && $rowCount > $RESULTS_PER_PAGE) {
+    $page->param(multipage => 1);
     my $pages = ceil($rowCount/$RESULTS_PER_PAGE);
-    print qq(<div class="center"> Page: );
+    my @pagelist;
     for (my $i = 1; $i <= $pages; $i++) {
+      my %row;
+      $row{pgnum} = $i;
       if ($i == $pageNo) {
-        print "<b>$i&nbsp;</b>\n";
+        $row{thispage} = 1;
       } else {
-        print qq(<a href="$IPDB::webpath/cgi-bin/search.cgi?page=$i&stype=$webvar{stype}&);
+        $row{stype} = $webvar{stype};
         if ($webvar{stype} eq 'c') {
-          print "cidr=$webvar{cidr}&custid=$webvar{custid}&desc=$webvar{desc}&".
+          $row{extraopts} = "cidr=$webvar{cidr}&custid=$webvar{custid}&desc=$webvar{desc}&".
                 "notes=$webvar{notes}&which=$webvar{which}&alltypes=$webvar{alltypes}&".
                 "allcities=$webvar{allcities}&";
           foreach my $key (keys %webvar) {
             if ($key =~ /^(?:type|city)\[/ || $key =~ /exclude$/) {
-              print "$key=$webvar{$key}&";
+              $row{extraopts} .= "$key=$webvar{$key}&";
             }
           }
         } else {
-          print "input=$webvar{input}&";
+          $row{extraopts} = "input=$webvar{input}&";
         }
-        print qq(">$i</a>&nbsp;\n);
       }
-    }
-    print "</div>";
-  }
+      push @pagelist, \%row;
+    }
+    $page->param(pgnums => \@pagelist);
+  }
+
 } # queryResults