Changeset 48

Timestamp:

11/01/04 12:07:51 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge bugfixes from /trunk r46 and r47

File:

• branches/stable/cgi-bin/main.cgi (modified) (8 diffs)

branches/stable/cgi-bin/main.cgi

@@ -139 +139 @@
     eval { $ip_dbh->rollback; };
     syslog "err", "Could not add master block '$webvar{cidr}' to database: '$@'";
-    printAndExit("Could not add master block $webvar{cidr} to database");
+    printAndExit("Could not add master block $webvar{cidr} to database: $@");
   }
 
@@ -979 +979 @@
     my $cidr = $data[1];
 
-    $sth = $ip_dbh->prepare("update poolips set custid='$webvar{custid}',city='$webvar{city}'".
-        " available='n',description='$webvar{desc}'".
+    $sth = $ip_dbh->prepare("update poolips set custid='$webvar{custid}',".
+        "city='$webvar{city}',available='n',description='$webvar{desc}'".
         " where ip='$cidr'");
     $sth->execute;
     if ($sth->err) {
-      printAndExit("Allocation of $cidr to $webvar{custid} failed: '".$sth->errstr."'");
       syslog "err", "Allocation of $cidr to $webvar{custid} by $authuser failed: ".
         "'".$sth->errstr."'";
+      printAndExit("Allocation of $cidr to $webvar{custid} failed: '".$sth->errstr."'");
     }
     print qq(<div class="center"><div class="heading">The IP $cidr has been allocated to customer $webvar{custid}</div></div>);
@@ -1169 +1169 @@
       if ($webvar{city} !~ /^(?:Huntsville|North Bay|Ottawa|Pembroke|Sault Ste. Marie|Sudbury|Timmins|Thunder Bay|Toronto)$/) {
         printAndExit("Please choose a valid POP location for a routed netblock.  Valid ".
-                "POP locations are currently:<br>\n Huntsville - North Bay - Ottawa -". 
+                "POP locations are currently:<br>\n Elliot Lake - Huntsville - North Bay -".
+                " Ottawa -". 
                 " Pembroke - Sault Ste. Marie - Sudbury - Timmins - Thunder Bay - Toronto");
       }
@@ -1285 +1286 @@
     eval { $ip_dbh->rollback; };
     syslog "err", "$authuser could not update block/IP '$webvar{block}': '$@'";
-    printAndExit("Could not update block/IP $webvar{block}");
+    printAndExit("Could not update block/IP $webvar{block}: $@");
   }
 
@@ -1416 +1417 @@
       @data = $sth->fetchrow_array;
       $sth = $ip_dbh->prepare("update poolips set custid='6750400', available='y',".
-        " city='$data[0]' where ip='$webvar{block}'");
+        " city='$data[0]', description='' where ip='$webvar{block}'");
       $sth->execute;
       $ip_dbh->commit;
@@ -1424 +1425 @@
       eval { $ip_dbh->rollback; };
       syslog "err", "$authuser could not deallocate static IP '$webvar{block}': '$@'";
-      printAndExit("Could not deallocate static IP $webvar{block}");
+      printAndExit("Could not deallocate static IP $webvar{block}: $@");
     }
     print "<div class=heading align=center>Success!  $webvar{block} deallocated.</div>\n";
@@ -1442 +1443 @@
       eval { $ip_dbh->rollback; };
       syslog "err", "$authuser could not remove master block '$webvar{block}': '$@'";
-      printAndExit("Could not remove master block $webvar{block}");
+      printAndExit("Could not remove master block $webvar{block}: $@");
     }
     print "<div class=heading align=center>Success!  Master $webvar{block} removed.</div>\n";
@@ -1538 +1539 @@
       eval { $ip_dbh->rollback; };
       syslog "err", "$authuser could not deallocate netblock '$webvar{block}': '$@'";
-      printAndExit("Could not deallocate netblock $webvar{block}");
+      printAndExit("Could not deallocate netblock $webvar{block}: $@");
     }
     print "<div class=heading align=center>Success!  $webvar{block} deleted.</div>\n";