Changeset 459

Timestamp:

08/04/10 16:08:41 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert "new city" miniscript and page to template, move the "reload
parent" JavaScript fragment into widgets.js. See #3.
Update calls from assign.tmpl and admin.cgi to point to newcity.cgi.

Location:

branches/htmlform

Files:

• cgi-bin/admin.cgi (modified) (1 diff)
• cgi-bin/newcity.cgi (modified) (2 diffs)
• templates/assign.tmpl (modified) (1 diff)
• templates/newcity.tmpl (added)
• templates/widgets.js (modified) (1 diff)

branches/htmlform/cgi-bin/admin.cgi

@@ -224 +224 @@
 $cities
 </select>
-&nbsp;<a href="javascript:popNotes('/ip/newcity.html')">Add new location</a>
+&nbsp;<a href="javascript:popNotes('/ip/cgi-bin/newcity.cgi')">Add new location</a>
 </td>
 </tr>

branches/htmlform/cgi-bin/newcity.cgi

@@ -14 +14 @@
 #use CGI::Carp qw(fatalsToBrowser);
 use CGI::Simple;
+use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
+#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;
@@ -48 +49 @@
 my $sth;
 
+$ENV{HTML_TEMPLATE_ROOT} = '../templates';
+
+my $page = HTML::Template->new(filename => "newcity.tmpl");
+
+if ($webvar{city}) {
+  if ($webvar{pop} eq 'on') {
+    $sth = $dbh->prepare("insert into cities (city,routing) values (?,'y')");
+  } else {
+    $sth = $dbh->prepare("insert into cities (city,routing) values (?,'n')");
+  }
+##fixme:  don't allow duplicate cities
+  $sth->execute($webvar{city});
+  $page->param(city => $webvar{city});
+  if ($sth->err) {
+    $page->param(err => $sth->errstr);
+    my $msg = "$authuser could not add city '$webvar{city}' to database: ".$sth->errstr;
+    mailNotify($dbh, 'f:nci', "IPDB city add failure", $msg);
+    syslog "err", $msg;
+  } else {
+    syslog "notice", "$authuser added city/location '$webvar{pop}'".
+        (($webvar{pop} eq 'on') ? ' as POP location' : '');
+  }
+}
+
 print "Content-type: text/html\n\n";
 
-if ($webvar{pop} eq 'on') {
-  $sth = $dbh->prepare("insert into cities (city,routing) values ('$webvar{city}','y')");
-} else {
-  $sth = $dbh->prepare("insert into cities (city,routing) values ('$webvar{city}','n')");
-}
-$sth->execute;
-
-if ($sth->err) {
-  print "Error adding city to database: ".$sth->errstr;
-  mailNotify($dbh, 'f:nci', "IPDB city add failure",
-        "$authuser could not add city '$webvar{city}' to database: ".$sth->errstr);
-  syslog "err", "$authuser could not add city '$webvar{city}' to database: ".$sth->errstr;
-} else {
-  print "City added.  Closing this window should refresh the page.";
-  syslog "notice", "$authuser added city/location '$webvar{pop}'".
-        (($webvar{pop} eq 'on') ? ' as POP location' : '');
-}
+print $page->output;
 
 finish($dbh);
+

branches/htmlform/templates/assign.tmpl

@@ -27 +27 @@
         <option><TMPL_VAR NAME=city></option></TMPL_LOOP>
 </select>
-&nbsp;<a href="javascript:popNotes('/ip/newcity.html')">Add new location</a>
+&nbsp;<a href="javascript:popNotes('/ip/cgi-bin/newcity.cgi')">Add new location</a>
 </td>
 </tr>

branches/htmlform/templates/widgets.js

@@ -11 +11 @@
         window.open(page, "IPDB_notes", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=400,height=300");
 }
+function redoParent() {
+        opener.location.reload(true);
+}