Changeset 593 for branches/stable/cgi-bin/newnode.cgi

Timestamp:

05/14/13 18:10:22 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/newnode.cgi (modified) (2 diffs)

branches/stable/cgi-bin/newnode.cgi

@@ -13 +13 @@
 use warnings;
 #use CGI::Carp qw(fatalsToBrowser);
+use CGI::Simple;
+use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;
@@ -34 +35 @@
 }
 
-my %webvar = parse_post();
-cleanInput(\%webvar);
+# Set up the CGI object...
+my $q = new CGI::Simple;
+# ... and get query-string params as well as POST params if necessary
+$q->parse_query_string;
+
+# Convenience;  saves changing all references to %webvar
+##fixme:  tweak for handling <select multiple='y' size=3> (list with multiple selection)
+my %webvar = $q->Vars;
 
 my ($dbh,$errstr) = connectDB_My;
 my $sth;
 
+$ENV{HTML_TEMPLATE_ROOT} = '../templates';
+
+my $page = HTML::Template->new(filename => "newnode.tmpl");
+
+if ($webvar{nodename}) {
+  $sth = $dbh->prepare("insert into nodes (node_type,node_name,node_ip) values (?,?,?)");
+  $sth->execute($webvar{type}, $webvar{nodename}, $webvar{nodeip});
+  $page->param(nodename => $webvar{nodename});
+  if ($sth->err) {
+    $page->param(err => $sth->errstr);
+    my $msg = "$authuser could not add node '$webvar{nodename}','$webvar{type}' to database: ".$sth->errstr;
+    mailNotify($dbh, 'f:nno', "IPDB node add failure", $msg);
+    syslog "err", $msg;
+  } else {
+    syslog "notice", "$authuser added node '$webvar{nodename}'";
+  }
+}
+
 print "Content-type: text/html\n\n";
 
-$sth = $dbh->prepare("insert into nodes (node_type,node_name,node_ip)".
-        " values ('$webvar{type}','$webvar{nodename}','$webvar{nodeip}')");
-$sth->execute;
-
-if ($sth->err) {
-  print "Error adding node to database: ".$sth->errstr;
-  mailNotify($dbh, 'f:nno', "IPDB node add failure",
-        "$authuser could not add node '$webvar{nodename}','$webvar{type}' to database: ".$sth->errstr);
-  syslog "err", "$authuser could not add node '$webvar{nodename}','$webvar{type}' to database: ".$sth->errstr;
-} else {
-  print "Node added.  Closing this window should refresh the page.";
-  syslog "notice", "$authuser added node '$webvar{nodename}'";
-}
+print $page->output;
 
 finish($dbh);