Changeset 41 for trunk/dns.cgi

Timestamp:

12/03/09 17:59:06 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Look-n-feel cleanup, checkpoint

File:

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

trunk/dns.cgi

@@ -74 +74 @@
 
 # NB:  these must match the field name and SQL ascend/descend syntax respectively
-my $sortfield = "domains";
-my $sortorder = "asc";
+my $sortby = "domain";
+my $sortorder = "ASC";
 
 my ($dbh,$msg) = connectDB("dnsdb","dnsdb","secret","dbhost");
@@ -663 +663 @@
 # le sigh.  and we need to strip any previous action
   $tmp_ruri =~ s/\&action=[^&]+//g;
+# and any bits from the "starts with" letter block - (ab)using this widget
+# to fill the bulk of the URI so the template doesn't grow to insanity
+  $tmp_ruri =~ s/\&startwith=[a-z09-]+//g;
 #  $page->param(whereami => $ENV{REQUEST_URI});
   $page->param(whereami => $tmp_ruri);
@@ -860 +863 @@
 ##fixme
   if ($offset eq 'all') {
-    push @debugbits, "foo!  wanna see'em all\n";
+# uhm....
   } else {
     # all these bits only have sensible behaviour if offset is numeric. err, probably.
@@ -901 +904 @@
 
 sub listdomains {
+
+##fixme:  account for searches and starts-with filters
   my $sth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
   $sth->execute($curgroup);
@@ -910 +915 @@
   fill_fpnla($count);
 
-##fixme - group
+# sort/order
+  $sortby= $webvar{sortby} if $webvar{sortby};
+  $sortorder = $webvar{order} if $webvar{order};
+
+if ($sortby eq 'domain') {
+  $page->param(domorder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
+  $page->param(statorder => 'ASC');
+  $page->param(grporder => 'ASC');
+  $page->param(sortdomain => 1);
+} elsif ($sortby eq 'status') {
+  $page->param(domorder => 'ASC');
+  $page->param(statorder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
+  $page->param(grporder => 'ASC');
+  $page->param(sortstatus => 1);
+} elsif ($sortby eq 'group') {
+  $page->param(domorder => 'ASC');
+  $page->param(statorder => 'ASC');
+  $page->param(grporder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
+  $page->param(sortgroup => 1);
+} else {
+  $page->param(domorder => 'ASC');
+  $page->param(statorder => 'ASC');
+  $page->param(grporder => 'ASC');
+}
+
+  $page->param(sortorder => $sortorder);
+  # hack! hack! pthbttt.  have to rethink the status column storage,
+  # or inactive comes "before" active.  *sigh*
+  $sortorder = ($sortorder eq 'ASC' ? 'DESC' : 'ASC') if $sortby eq 'status';
+
+  $page->param("start$webvar{startwith}" => 1) if $webvar{startwith} && $webvar{startwith} =~ /^[a-z]$/;
+
+  $page->param(filter => $webvar{filter}) if $webvar{filter};
+
+##fixme
+##fixme  push the SQL and direct database fiddling off into a sub in DNSDB.pm
+##fixme
+
   $page->param(group => $curgroup);
   my @domlist;
-  $sth = $dbh->prepare("SELECT domain_id,domain,status,groups.group_name FROM domains".
+  my $sql = "SELECT domain_id,domain,status,groups.group_name AS group FROM domains".
         " INNER JOIN groups ON domains.group_id=groups.group_id".
         " WHERE domains.group_id=?".
-        " ORDER BY domain".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
+##fixme:  don't do variable subs in SQL, use placeholders and params in ->execute()
+        (defined($webvar{startwith}) ? " AND domain ~* '^[$webvar{startwith}]'" : '').
+        (defined($webvar{filter}) ? " AND domain ~* '$webvar{filter}'" : '').
+        " ORDER BY ".($sortby eq 'group' ? 'groups.group_name' : $sortby).
+        " $sortorder ".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage);
+  $sth = $dbh->prepare($sql);
   $sth->execute($curgroup);
   my $rownum = 0;
@@ -1029 +1076 @@
   my $rownum = 0;
   while (my @data = $sth->fetchrow_array) {
+    no warnings "uninitialized";        # Just In Case something stupid happens and a user gets no first or last name
     my %row;
     $row{userid} = $data[0];