Changeset 463 for branches/htmlform/cgi-bin

Timestamp:

08/05/10 17:34:29 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Validation nitpick fix in assign.tmpl - also fixes missing field
name on alloctype list. <headdesk>
Convert new assignment result page to template.
Add missing error handling, missing IP pool selection on confirm.tmpl
Create footer template object earlier to allow pushing bits into
it during processing
Prepare to move initial output further down execution to prepare for
proper error handling in subs
Fix probable bug introduced with r456 where the "Routing" type isn't
available when it should be. Maybe. Probably.
Error messages for sub insertAssign() and confirmAssign could arguably
be further moved into the templates, but the complexity of the template
would go *way* up with little or no benefit.
See #3.

File:

• branches/htmlform/cgi-bin/main.cgi (modified) (12 diffs)

branches/htmlform/cgi-bin/main.cgi

@@ -56 +56 @@
 
 my $header = HTML::Template->new(filename => "header.tmpl");
+my $footer = HTML::Template->new(filename => "footer.tmpl");
+
 $header->param(version => $IPDB::VERSION);
 $header->param(addperm => $IPDBacl{$authuser} =~ /a/);
@@ -183 +185 @@
 #       if $IPDBacl{$authuser} =~ /A/;
 
+## Do all our printing here so we can generate errors and stick them into the slots in the templates.
+
+# can't do this yet, too many blowups
+#print "Content-type: text/html\n\n", $header->output;
+
 print $page->output;
 
-# 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/));
@@ -639 +644 @@
     # could arguably include routing (500) in the list, but ATM it doesn't
     # make sense, and in any case that shouldn't be structurally possible here.
-    $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 500 order by listorder");
+    $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder <= 500 order by listorder");
     $sth->execute;
     my @typelist;
@@ -706 +711 @@
     $sth->execute;
     my $optionlist;
-    while (my @data = $sth->fetchrow_array) {
+
+    my @poollist;
+    while (my ($poolcit,$poolblock,$poolfree) = $sth->fetchrow_array) {
       # city,pool cidr,free IP count
-      if ($data[2] > 0) {
-        $optionlist .= "<option value='$data[1]'>$data[1] [$data[2] free IP(s)] in $data[0]</option>\n";
+      if ($poolfree > 0) {
+        my %row = (poolcit => $poolcit, poolblock => $poolblock, poolfree => $poolfree);
+        push (@poollist, \%row);
       }
     }
+    $page->param(staticip => 1);
+    $page->param(poollist => \@poollist);
     $cidr = "Single static IP";
-    $alloc_from = "<select name=alloc_from>".$optionlist."</select>\n";
+##fixme:  need to handle "no available pools"
 
   } else { # end show pool options
@@ -723 +733 @@
 
       if (!$webvar{maskbits}) {
-        printError("Please specify a CIDR mask length.");
+        $page->param(err => "Please specify a CIDR mask length.");
         return;
       }
@@ -782 +792 @@
       my @data = $sth->fetchrow_array();
       if ($data[0] eq "") {
-        printError($failmsg);
+        $page->param(err => $failmsg);
         return;
       }
@@ -788 +798 @@
     } # check for freeblocks assignment or IPDB-controlled assignment
 
-##fixme:  HTML must be removed from script!
-    $alloc_from = qq($cidr<input type=hidden name=alloc_from value="$cidr">);
+    $alloc_from = "$cidr";
 
     # If the block to be allocated is smaller than the one we found,
@@ -860 +869 @@
   # successful netblock allocation, the IP allocated for static
   # IP, or the error message if an error occurred.
+
   my ($code,$msg) = allocateBlock($ip_dbh, $webvar{fullcidr}, $webvar{alloc_from},
         $webvar{custid}, $webvar{alloctype}, $webvar{city}, $webvar{desc}, $webvar{notes},
@@ -867 +877 @@
     if ($webvar{alloctype} =~ /^.i$/) {
       $msg =~ s|/32||;
-      print qq(<div class="center"><div class="heading">The IP $msg has been allocated to customer $webvar{custid}</div>).
-        ( ($webvar{alloctype} eq 'di' && $webvar{billinguser}) ?
-                qq(<div><a href="https://billing.example.com/radius.pl?).
-                "action=new_radius_user&custid=$webvar{custid}&userid=$webvar{billinguser}".
-                qq(&ipdb=1&ip=$msg">Add this IP to RADIUS user table</a></div>)
-        : "</div>");
+      $page->param(staticip => $msg);
+      $page->param(custid => $webvar{custid});
+      $page->param(billinguser => $webvar{billinguser});
       mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
         "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
@@ -878 +885 @@
     } else {
       my $netblock = new NetAddr::IP $webvar{fullcidr};
-      print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
-        "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div>".
-        ( ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) ?
-                qq(<div><a href="https://billing.example.com/radius.pl?).
-                "action=new_radius_user&custid=$webvar{custid}&userid=$webvar{billinguser}".
-                "&route_subnet=".$netblock->addr."&subnet_slash=".$netblock->masklen.
-                "&include_routed_subnet=1&ipdb=1".
-                qq(">Add this netblock to RADIUS user table</a></div>)
-        : "</div>");
+      $page->param(fullcidr => $webvar{fullcidr});
+      $page->param(alloctype => $disp_alloctypes{$webvar{alloctype}});
+      $page->param(custid => $webvar{custid});
+      if ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) {
+        $page->param(billinguser => $webvar{billinguser});
+        $page->param(custid => $webvar{custid});
+        $page->param(netaddr => $netblock->addr);
+        $page->param(masklen => $netblock->masklen);
+      }
       mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
         "$disp_alloctypes{$webvar{alloctype}} $webvar{fullcidr} allocated to customer $webvar{custid}\n".
@@ -896 +903 @@
     syslog "err", "Allocation of '$webvar{fullcidr}' to '$webvar{custid}' as ".
         "'$webvar{alloctype}' by $authuser failed: '$msg'";
-    printError("Allocation of $webvar{fullcidr} as '$disp_alloctypes{$webvar{alloctype}}'".
+    $page->param(err => "Allocation of $webvar{fullcidr} as '$disp_alloctypes{$webvar{alloctype}}'".
         " failed:<br>\n$msg\n");
   }
@@ -1407 +1414 @@
 
   # 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/));