Changeset 784

Timestamp:

10/08/15 17:21:20 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Update getBlockData() to retrieve backup data if present. See #52.

File:

• trunk/cgi-bin/IPDB.pm (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -3014 +3014 @@
   my $commonfields = q(custid, type, circuitid, description, notes, modifystamp AS lastmod,
         privdata, vlan, rdns);
+  my $bkfields = q(b.backup_id AS hasbk, b.bkbrand, b.bkmodel, b.bktype, b.bkport, b.bksrc,
+        b.bkuser, b.bkvpass, b.bkepass);
 
   if ($type eq 'i') {
     my $binfo = $dbh->selectrow_hashref(qq(
         SELECT p.id, p.ip AS block, p.city, p.vrf, p.parent_id, p.master_id, $commonfields,
-                d.zone >> p.ip AS revavail
+                d.zone >> p.ip AS revavail,
+                $bkfields
         FROM poolips p
         LEFT JOIN dnsavail d ON p.master_id = d.parent_alloc AND p.ip << d.zone
+        LEFT JOIN backuplist b ON p.backup_id = b.backup_id
         WHERE id = ?
         ), undef, ($id) );
@@ -3034 +3038 @@
         WHERE a.id = ?
         ), undef, ($id) );
+
     return $binfo;
   }