Changeset 593 for branches/stable/cgi-bin/IPDB.pm

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/IPDB.pm (modified) (9 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -24 +24 @@
 @EXPORT_OK    = qw(
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist @masterblocks
-        %allocated %free %routed %bigfree %IPDBacl
+        %allocated %free %routed %bigfree %IPDBacl %aclmsg
         &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &addMaster
         &deleteBlock &getBlockData &mailNotify
@@ -32 +32 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-                @masterblocks %allocated %free %routed %bigfree %IPDBacl
+                @masterblocks %allocated %free %routed %bigfree %IPDBacl %aclmsg
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
                 &addMaster &deleteBlock &getBlockData &mailNotify
@@ -52 +52 @@
 our %bigfree;
 our %IPDBacl;
+
+# mapping table for functional-area => error message
+our %aclmsg = (
+        addmaster       => 'add a master block',
+        addblock        => 'add an allocation',
+        updateblock     => 'update a block',
+        delblock        => 'delete an allocation',
+        );
 
 our $org_name = 'Example Corp';
@@ -126 +134 @@
   }
 
+##fixme:  initialize HTML::Template env var for template path
+# something like $self->path().'/templates' ?
+#  $ENV{HTML_TEMPLATE_ROOT} = 'foo/bar';
+
   return (1,"OK");
 } # end initIPDBGlobals
@@ -174 +186 @@
 sub finish {
   my $dbh = $_[0];
-  $dbh->disconnect;
+  $dbh->disconnect if $dbh;
 } # end finish
 
@@ -360 +372 @@
       }
 
-      $sth = $dbh->prepare("update poolips set custid='$custid',".
-        "city='$city',available='n',description='$desc',notes='$notes',".
-        "circuitid='$circid',privdata='$privdata'".
-        " where ip='$cidr'");
-      $sth->execute;
+      $sth = $dbh->prepare("update poolips set custid=?,city=?,".
+        "available='n',description=?,notes=?,circuitid=?,privdata=?".
+        " where ip=?");
+      $sth->execute($custid, $city, $desc, $notes, $circid, $privdata, "$cidr");
 # node hack
       if ($nodeid && $nodeid ne '') {
@@ -413 +424 @@
           $sth = $dbh->prepare("insert into allocations".
                 " (cidr,custid,type,city,description,notes,maskbits,circuitid,privdata)".
-                " values ('$cidr','$custid','$type','$city',?,?,".
-                $cidr->masklen.",?,?)");
-          $sth->execute($desc,$notes,$circid,$privdata);
+                " values (?,?,?,?,?,?,?,?,?)");
+          $sth->execute("$cidr", $custid, $type, $city, $desc, $notes, $cidr->masklen, $circid, $privdata);
 
           # And initialize the pool, if necessary
@@ -527 +537 @@
           $sth = $dbh->prepare("insert into allocations (cidr,custid,type,city,".
                 "description,notes,maskbits,circuitid,privdata)".
-                " values ('$cidr','$custid','$type','$city',?,?,".
-                $cidr->masklen.",?,?)");
-          $sth->execute($desc,$notes,$circid,$privdata);
+                " values (?,?,?,?,?,?,?,?,?)");
+          $sth->execute("$cidr", $custid, $type, $city, $desc, $notes, $cidr->masklen, $circid, $privdata);
 
           # And initialize the pool, if necessary
@@ -653 +662 @@
     eval {
       $msg = "Unable to deallocate $disp_alloctypes{$type} $cidr";
-      $sth = $dbh->prepare("update poolips set custid='$defcustid',available='y',".
-        "city=(select city from allocations where cidr >>= '$cidr'".
+      $sth = $dbh->prepare("update poolips set custid=?,available='y',".
+        "city=(select city from allocations where cidr >>= ?".
         " order by masklen(cidr) desc limit 1),".
-        "description='',notes='',circuitid='' where ip='$cidr'");
-      $sth->execute;
+        "description='',notes='',circuitid='' where ip=?");
+      $sth->execute($defcustid, "$cidr", "$cidr");
       $dbh->commit;
     };