Changeset 135 for trunk

Timestamp:

01/26/05 15:30:30 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes from /branches/stable r130:134

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (2 diffs)
• main.cgi (modified) (3 diffs)

trunk/cgi-bin/IPDB.pm

@@ -203 +203 @@
 ##err Need better handling here;  what if there's no free IPs when this sub gets called?
       my @data = $sth->fetchrow_array;
-      my $cidr = $data[1];
+      $cidr = $data[1];  # $cidr is already declared when we get here!
 
       $sth = $dbh->prepare("update poolips set custid='$custid',".
@@ -545 +545 @@
   $mailer->to($recip);
   $mailer->data("From: \"IP Database\" <ipdb\@example.com>\n",
+        "To: $recip\n",
         "Date: ".strftime("%a, %d %b %Y %H:%M:%S %z",localtime)."\n",
         "Subject: {IPDB} $subj\n",

trunk/cgi-bin/main.cgi

@@ -317 +317 @@
   }
 
-  foreach my $element (@$rowRef) {
-    print "<td></td>" if (!defined($element));
+ELEMENT:  foreach my $element (@$rowRef) {
+    if (!defined($element)) {
+      print "<td></td>\n";
+      next ELEMENT;
+    }
     $element =~ s|\n|</br>|g;
     print "<td>$element</td>\n";
@@ -1080 +1083 @@
 # this has now been Requested, so here goes.
 
-  if ($data[2] =~ /^d[nyc]|cn|ee|ii$/) {
+  if ($data[2] =~ /^d[nyc]|cn|ee|in$/) {
     # Block that can be changed
     my $blockoptions = "<select name=alloctype><option".
@@ -1088 +1091 @@
         (($data[2] eq 'cn') ? ' selected' : '') ." value='cn'>Customer netblock</option>\n<option".
         (($data[2] eq 'ee') ? ' selected' : '') ." value='ee'>End-use netblock</option>\n<option".
-        (($data[2] eq 'ii') ? ' selected' : '') ." value='ii'>Internal netblock</option>\n".
+        (($data[2] eq 'in') ? ' selected' : '') ." value='in'>Internal netblock</option>\n".
         "</select>\n";
     $html =~ s/\$\$TYPESELECT\$\$/$blockoptions/g;