Changeset 586

Timestamp:

01/17/13 15:47:14 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Add rDNS to edit allocation part 1 - retrieve information for
the edit page. See #1.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (1 diff)
• templates/edit.tmpl (modified) (11 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1462 +1462 @@
   } elsif ($btype =~ /^.i$/) {
     my $binfo = $dbh->selectrow_hashref("SELECT ip AS block, custid, type, city, circuitid, description,".
-        " notes, modifystamp AS lastmod, privdata, vrf, pool, rdepth".
+        " notes, modifystamp AS lastmod, privdata, vrf, pool, rdepth, rdns".
         " FROM poolips WHERE ip = ?", undef, ($block) );
 #       " FROM poolips WHERE ip = ? AND vrf = ?", undef, ($block, $vrf) );
@@ -1468 +1468 @@
   } else {
     my $binfo = $dbh->selectrow_hashref("SELECT cidr AS block, parent, custid, type, city, circuitid, ".
-        "description, notes, modifystamp AS lastmod, privdata, vrf, swip, rdepth".
+        "description, notes, modifystamp AS lastmod, privdata, vrf, swip, rdepth, rdns".
         " FROM allocations WHERE cidr = ? AND rdepth = ?", undef, ($block, $rdepth) );
 #       " FROM allocations WHERE cidr = ? AND rdepth = ? AND vrf = ?", undef, ($block, $rdepth, $vrf) );
@@ -1502 +1502 @@
     # or sub-/19 /24 to retrieve - it's the least-wrong way to do things.
 
-    my ($rpcblock) = $cidr->split( ($cidr->masklen <= 16 ? 16 : 24) );
+    my ($rpcblock) = ($cidr->masklen <= 24 ? $cidr->split( ($cidr->masklen <= 16 ? 16 : 24) ) : $cidr);
+
     my %rpcargs = (
         rpcuser => $args{user},
-        rpcsystem => 'ipdb',
         group => $revgroup,     # not sure how this could sanely be exposed, tbh...
         cidr => "$rpcblock",
         );
 
-    eval {
-      $result = $server->call('dnsdb.getRevPattern', %rpcargs);
-    };
-    if ($@) {
-      my $msg = $@;
-      $msg =~ s/Fault returned from XML RPC Server, fault code 4: error executing RPC `dnsdb.addRDNS'\.\s//;
-    }
+    $rdns = _rpc('getRevPattern', %rpcargs);
   }
 

trunk/cgi-bin/main.cgi

@@ -654 +654 @@
   $blockinfo->{type} =~ s/\s//;
 
+  # Get rDNS info;  duplicates a bit of getBlockData but also does the RPC call if possible
+  $blockinfo->{rdns} = getBlockRDNS($ip_dbh, $webvar{block}, $webvar{rdepth}, user => $authuser);
+
   $page->param(block => $webvar{block});
+  $page->param(rdns     => $blockinfo->{rdns});
   $page->param(rdepth   => $blockinfo->{rdepth});
 

trunk/templates/edit.tmpl

@@ -23 +23 @@
 
 <tr class="row1">
+<td class="heading">Reverse DNS pattern:</td>
+<td class="regular">
+<TMPL_IF maychange>
+<input type="text" name="rdns" size="40" value="<TMPL_VAR NAME=rdns>">
+<TMPL_ELSE>
+<TMPL_VAR NAME=rdns>
+</TMPL_IF>
+<input type="button" value=" ? " onclick="helpRDNS()" class="regular">
+</td>
+</tr>
+
+<tr class="row0">
 <td class=heading>City:</td>
 <td class="regular">
@@ -33 +45 @@
 </tr>
 
-<tr class="row0">
+<tr class="row1">
 <td class=heading>Type:</td>
 <td class=regular>
@@ -48 +60 @@
 </tr>
 
-<tr class="row1">
+<tr class="row0">
 <td class=heading>Demarc/tower:</td>
 <td class=regular>
@@ -67 +79 @@
 </tr>
 
-<tr class="row0">
+<tr class="row1">
 <td class=heading>CustID:</td>
 <td class="regular">
@@ -78 +90 @@
 </tr>
 
-<tr class="row1">
+<tr class="row0">
 <td class=heading>SWIPed?:</td>
 <td class=regular>
@@ -93 +105 @@
 </tr>
 
-<tr class="row0">
+<tr class="row1">
 <td class=heading>Last modified:</td>
 <td class=regular><TMPL_VAR NAME=lastmod></td>
 </tr>
 
-<tr class="row1">
+<tr class="row0">
 <td class="heading">Circuit ID:</td>
 <td class="regular">
@@ -109 +121 @@
 </tr>
 
-<tr class="row0">
+<tr class="row1">
 <td class="heading">Description/Name:</td>
 <td class="regular">
@@ -120 +132 @@
 </tr>
 
-<tr class="row1">
+<tr class="row0">
 <td class="heading" valign="top">Notes:</td>
 <td class="regular">
@@ -131 +143 @@
 
 <TMPL_IF nocling>
-<tr class="row0">
+<tr class="row1">
 <td class="heading" valign="top">Restricted data:</td>
 <td class="regular">
@@ -144 +156 @@
 
 <TMPL_IF maychange>
-<tr class="row<TMPL_IF nocling>1<TMPL_ELSE>0</TMPL_IF>">
+<tr class="row<TMPL_IF nocling>0<TMPL_ELSE>1</TMPL_IF>">
 <td colspan="2" class="center">
 <input type="submit" value=" Update this block " class="regular">
@@ -161 +173 @@
 <form method="POST" action="main.cgi">
 <fieldset><legend class="noshow">&nbsp;</legend>
-<div class="row<TMPL_IF nocling><TMPL_IF maychange>0<TMPL_ELSE>1</TMPL_IF><TMPL_ELSE><TMPL_IF maychange>1<TMPL_ELSE>0</TMPL_IF></TMPL_IF>">
+<div class="row<TMPL_IF nocling><TMPL_IF maychange>1<TMPL_ELSE>0</TMPL_IF><TMPL_ELSE><TMPL_IF maychange>0<TMPL_ELSE>1</TMPL_IF></TMPL_IF>">
 <input type="hidden" name="action" value="delete">
 <input type="hidden" name="block" value="<TMPL_VAR NAME=block>">