Changeset 3 for trunk/dns.cgi

Timestamp:

08/18/09 18:04:14 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint
Continued development to reach ~ VegaDNS equivalence

File:

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

trunk/dns.cgi

@@ -7 +7 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2008 - Kris Deugau <kdeugau@deepnet.cx>
+# Copyright (C) 2008,2009 - Kris Deugau <kdeugau@deepnet.cx>
 
 use strict;
@@ -63 +63 @@
 
 # default
-my $perpage = 15;
+#my $perpage = 15;
+my $perpage = 3;
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
@@ -82 +83 @@
 # Default page is a login page
 my $page;       # to be initialized as an HTML::Template entity sooner or later
+
+
 
 # decide which page to spit out...
@@ -93 +96 @@
 
 if ($webvar{page} eq 'domlist' or $webvar{page} eq 'index') {
+
+# hmm.  seeing problems in some possibly-not-so-corner cases.
+  if (defined($webvar{action})) {
+    domStatus($dbh,$webvar{id},$webvar{action});
+  }
+
   my $sth = $dbh->prepare("select count(*) from domains");
   $sth->execute;
   my ($count) = ($sth->fetchrow_array);
 
-  if ($count > $perpage) {
-    # if there are more results than the default, always show the "all" link
-    $page->param(navall => 1);
-
-    if ($offset > 0) {
-      $page->param(navfirst => 1);
-      $page->param(navprev => 1);
-      $page->param(prevoffs => $offset-1);
+##fixme
+  if ($offset eq 'all') {
+    print "foo!  wanna see'em all\n";
+  } else {
+    # all these bits only have sensible behaviour if offset is numeric. err, probably.
+    if ($count > $perpage) {
+      # if there are more results than the default, always show the "all" link
+      $page->param(navall => 1);
+
+      if ($offset > 0) {
+        $page->param(navfirst => 1);
+        $page->param(navprev => 1);
+        $page->param(prevoffs => $offset-1);
+      }
+
+      # show "next" and "last" links if we're not on the last page of results
+      if ( (($offset+1) * $perpage - $count) < 0 ) {
+        $page->param(navnext => 1);
+        $page->param(nextoffs => $offset+1);
+        $page->param(navlast => 1);
+        $page->param(lastoffs => int $count/$perpage);
+      }
     }
-
-    # show "next" and "last" links if we're not on the last page of results
-    if ( (($offset+1) * $perpage - $count) < 0 ) {
-      $page->param(navnext => 1);
-      $page->param(nextoffs => $offset+1);
-      $page->param(navlast => 1);
-      $page->param(lastoffs => int $count/$perpage);
-    }
   }
 
   $page->param(ndomains => $count);
-
+  $page->param(nstart => (($offset eq 'all' ? 0 : $offset)*$perpage+1));
+  $page->param(npglast => ($offset eq 'all' ? $count :
+        ( (($offset+1)*$perpage) > $count ? $count : (($offset+1)*$perpage) )
+        ));
   my @domlist;
   $sth = $dbh->prepare("select domain_id,domain,status,groups.name from domains".
         " inner join groups on domains.group_id=groups.group_id".
-        " order by domain limit $perpage offset ".$offset*$perpage);
+        " order by domain".($offset eq 'all' ? '' : " limit $perpage offset ".$offset*$perpage));
   $sth->execute;
   my $rownum = 0;
@@ -128 +146 @@
     $row{domainid} = $data[0];
     $row{domain} = $data[1];
-    $row{status} = $data[2];
+    $row{status} = ($data[2] ? 'Active' : 'Inactive');
     $row{group} = $data[3];
     $row{bg} = ($rownum++)%2;
-    $row{mkactive} = ($data[2] eq 'inactive' ? 1 : 0);
+#    $row{mkactive} = ($data[2] eq 'inactive' ? 1 : 0);
+    $row{mkactive} = !$data[2];
     $row{sid} = $sid;
+    $row{offset} = $offset;
 ##fixme:  need to clean up status indicator/usage/inversion
     push @domlist, \%row;
@@ -190 +210 @@
   print "whee!\n";
 
-newrec();
+  # populate most fields as needed.  (eg, type list.)
+  newrec();
 
 } elsif ($webvar{page} eq 'addrec') {
@@ -221 +242 @@
   }
 
+  $page->param(defrec => $webvar{defrec});
+
 } elsif ($webvar{page} eq 'conf_del') {
 
@@ -236 +259 @@
   if (!defined($webvar{del})) {
     $page->param(del_getconf => 1);
-  } else {
-#    $page->param(
-  }
-##work
+    my %rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
+    $page->param(host => $rec{host});
+    $page->param(ftype => $typemap{$rec{type}});
+    $page->param(recval => $rec{val});
+  } else {
+    my ($code,$msg) = delRec($dbh,$webvar{defrec},$webvar{id});
+    if ($code ne 'OK') {
+## need to find failure mode
+      $page->param(del_failed => 1);
+      $page->param(errmsg => $msg);
+    }
+##fixme:  group/parent instead of hardcoded 1
+    showdomain('y',1);
+  }
 
 } elsif ($webvar{page} eq 'editsoa') {
@@ -258 +291 @@
   $sth = $dbh->prepare($sql);
   $sth->execute;
-print "DEBUG: $sql<br>\n";
-#print "DEBUG: ".$DBI::errstr;
 
   if ($sth->err) {
@@ -279 +310 @@
 # hokay, a bit of magic to decide which page we hit.
   if ($code eq 'OK') {
-    $page = HTML::Template->new(filename => "$templatedir/domlist.tmpl");
+    $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
+    showdomain(0,$msg);
+##work
   } else {
 # oooh, yeah, this is supposed to be a redirect.  er, maybe.  whee.
@@ -288 +321 @@
   }
 
-#  my $sth = $dbh->prepare("insert into domains (domain,group_id,status) values (?,?,?)");
-#  $sth->execute($webvar{domain},1,($webvar{makeactive} ? 'active' : 'inactive')) or die $DBI::errstr;
-#  $sth = $dbh->prepare("select domain_id from domains where domain='$webvar{domain}'");
-#  $sth->execute;
-#  my ($dom_id) = $sth->fetchrow_array();
-#  $sth = $dbh->prepare("select host,type,val,distance,ttl from default_records where group_id=1");
-#  my $sth_in = $dbh->prepare("insert into records (domain_id,host,type,val,distance,ttl)".
-#       " values ($dom_id,?,?,?,?,?)");
-#  $sth->execute;
-#  while (my ($host,$type,$val,$dist,$ttl) = $sth->fetchrow_array()) {
-#    $host =~ s/DOMAIN/$webvar{domain}/g;
-#    $sth_in->execute($host,$type,$val,$dist,$ttl);
-#  }
-#  $dbh->commit or print "failed to add $webvar{domain}: ".$DBI::errstr."\n";
-
-#  $page->param(add_failed => 1);
+
 }
 
@@ -410 +428 @@
   $page->param(typelist => \@typelist);
   $page->param(domain   => domainName($dbh,$webvar{domainid}));
-  $page->param(parentid => $webvar{parentid});
   $page->param(defrec   => $webvar{defrec});
   $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $DNSDB::def{minttl}));
-}
+  if ($webvar{defrec} eq 'y') {
+    ##fixme - should be groupid
+    $page->param(parentid => 1);
+  } else {
+    $page->param(parentid => $webvar{parentid});
+  }
+}