Changeset 944 for trunk

Timestamp:

09/19/23 10:40:24 (14 months ago)

Author:

Kris Deugau

Message:

/trunk

Fix an edge case updating rDNS on a netblock. If all but one per-IP field
is blank, and the remaining field is cleared, the removal wouldn't be sent
to dnsadmin because the hash wouldn't have that IP as a key.

Fixed with an extra flag field indicating "this IP had a DNS name", so we
can explicitly set the hash value to so it'll be cleared when passed
down the chain.

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• templates/edit.tmpl (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -1357 +1357 @@
   # collect per-IP rDNS fields.  only copy over the ones that actually have something in them.
   my %iprev;
-  foreach (keys %webvar) {
-    $iprev{$_} = $webvar{$_} if /host_[\d.a-fA-F:]+/ && $webvar{$_};
+  foreach (sort keys %webvar) {
+    # skip all but the host_* fields
+    next unless /^host_[\d.a-fA-F:]+/;
+    # propagate the per-IP rDNS if present
+    $iprev{$_} = $webvar{$_} if $webvar{$_};
+    # set the rDNS to be cleared if there was a value before (was_host_* field),
+    # but there's no value in the matching visible form field now (host_*)
+    $iprev{$_} = '' if $webvar{"was_$_"} && !$webvar{$_};
   }
 

trunk/templates/edit.tmpl

@@ -82 +82 @@
 <tr>
 <td><TMPL_VAR NAME=r_ip></td>
-<td><input class="host" name="host_<TMPL_VAR NAME=r_ip>" value="<TMPL_VAR NAME=iphost>"></td>
+<td><input class="host" name="host_<TMPL_VAR NAME=r_ip>" value="<TMPL_VAR NAME=iphost>">
+<TMPL_IF iphost><input type="hidden" name="was_host_<TMPL_VAR NAME=r_ip>" value="1"></TMPL_IF></td>
 </tr>
 </TMPL_LOOP>