Changeset 480 for trunk/dns.cgi

Timestamp:

03/13/13 17:57:03 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, 13 of <mumble>. See #11.

• location add/update/delete/retrieve in addLoc(), updateLoc(), delLoc(), getLoc(), getLocCount(), getLocList(), and getLocDropdown() and callers

File:

• trunk/dns.cgi (modified) (9 diffs)

trunk/dns.cgi

@@ -439 +439 @@
 
   fill_grouplist("grouplist");
-  my $loclist = getLocDropdown($dbh, $curgroup);
+  my $loclist = $dnsdb->getLocDropdown($curgroup);
   $page->param(loclist => $loclist);
 
@@ -1363 +1363 @@
         unless ($permissions{admin} || $permissions{location_create});
 
-    my ($code,$msg) = addLoc($dbh, $curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
+    my ($code,$msg) = $dnsdb->addLoc($curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
 
     if ($code eq 'OK' || $code eq 'WARN') {
@@ -1387 +1387 @@
         unless ($permissions{admin} || $permissions{location_edit});
 
-    my $loc = getLoc($dbh, $webvar{loc});
+    my $loc = $dnsdb->getLoc($webvar{loc});
     $page->param(wastrying      => "editing");
     $page->param(todo           => "Edit location/view");
@@ -1400 +1400 @@
         unless ($permissions{admin} || $permissions{location_edit});
 
-    my ($code,$msg) = updateLoc($dbh, $webvar{id}, $curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
+    my ($code,$msg) = $dnsdb->updateLoc($webvar{id}, $curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
 
     if ($code eq 'OK') {
@@ -1438 +1438 @@
 
   $page->param(locid => $webvar{locid});
-  my $locdata = getLoc($dbh, $webvar{locid});
+  my $locdata = $dnsdb->getLoc($webvar{locid});
   $locdata->{description} = $webvar{locid} if !$locdata->{description};
   # first pass = confirm y/n (sorta)
@@ -1445 +1445 @@
     $page->param(location => $locdata->{description});
   } elsif ($webvar{del} eq 'ok') {
-    my ($code,$msg) = delLoc($dbh, $webvar{locid});
+    my ($code,$msg) = $dnsdb->delLoc($webvar{locid});
     if ($code eq 'OK') {
       # success.  go back to the user list, do not pass "GO"
@@ -2174 +2174 @@
 
   if ($permissions{admin} || $permissions{record_locchg}) {
-    my $loclist = getLocDropdown($dbh, $cur, $defloc);
+    my $loclist = $dnsdb->getLocDropdown($cur, $defloc);
     $page->param(record_locchg => 1);
     $page->param(loclist => $loclist);
   } else {
-    my $loc = getLoc($dbh, $defloc);
+    my $loc = $dnsdb->getLoc($defloc);
     $page->param(loc_name => $loc->{description});
   }
@@ -2237 +2237 @@
   my $childlist = join(',',@childgroups);
 
-  my $count = getLocCount($dbh, (childlist => $childlist, curgroup => $curgroup,
-        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
+  my $count = $dnsdb->getLocCount(childlist => $childlist, curgroup => $curgroup,
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2263 +2263 @@
   $page->param(searchsubs => $searchsubs) if $searchsubs;
 
-  my $loclist = getLocList($dbh, (childlist => $childlist, curgroup => $curgroup,
+  my $loclist = $dnsdb->getLocList(childlist => $childlist, curgroup => $curgroup,
         filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder) );
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
   # Some UI things need to be done to the list
   foreach my $l (@{$loclist}) {