Changeset 370 for trunk/DNSDB.pm

Timestamp:

07/29/12 22:02:48 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint; adding location/view support. See #10.

• add location to menu
• add table and link fields to initial tabledef and upgrade SQL
• add listing subs and list page
• update permissions list and subpage template with new permissions

File:

• trunk/DNSDB.pm (modified) (5 diffs)

trunk/DNSDB.pm

@@ -47 +47 @@
         &addUser &updateUser &delUser &userFullName &userStatus &getUserData
         &getUserCount &getUserList &getUserDropdown
+        &addLoc &updateLoc &delLoc
+        &getLocCount &getLocList &getLocDropdown
         &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
         &addRec &updateRec &delRec
@@ -72 +74 @@
                 &addUser &updateUser &delUser &userFullName &userStatus &getUserData
                 &getUserCount &getUserList &getUserDropdown
+                &addLoc &updateLoc &delLoc
+                &getLocCount &getLocList &getLocDropdown
                 &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
                 &addRec &updateRec &delRec
@@ -106 +110 @@
 
 # Arguably defined wholly in the db, but little reason to change without supporting code changes
+# group_view, user_view permissions? separate rDNS permission(s)?
 our @permtypes = qw (
         group_edit      group_create    group_delete
@@ -111 +116 @@
         domain_edit     domain_create   domain_delete
         record_edit     record_create   record_delete
+        location_edit   location_create location_delete location_view
         self_edit       admin
 );
@@ -2891 +2897 @@
 
 } # end getUserData()
+
+
+## DNSDB::addLoc()
+sub addLoc {}
+
+## DNSDB::updateLoc()
+sub updateLoc {}
+
+## DNSDB::delLoc()
+sub delLoc {}
+
+
+## DNSDB::getLocCount()
+# Get count of locations/views
+# Takes a database handle and hash containing at least the current group, and optionally:
+# - a reference list of secondary groups
+# - a filter string
+# - a "Starts with" string
+sub getLocCount {
+  my $dbh = shift;
+
+  my %args = @_;
+
+  my @filterargs;
+
+  $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
+  push @filterargs, "^$args{startwith}" if $args{startwith};
+  push @filterargs, $args{filter} if $args{filter};
+
+
+  my $sql = "SELECT count(*) FROM locations ".
+        "WHERE group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
+        ($args{startwith} ? " AND description ~* ?" : '').
+        ($args{filter} ? " AND description ~* ?" : '');
+  my ($count) = $dbh->selectrow_array($sql, undef, (@filterargs) );
+  $errstr = $dbh->errstr if !$count;
+  return $count;
+} # end getLocCount()
+
+
+## DNSDB::getLocList()
+sub getLocList {
+  my $dbh = shift;
+
+  my %args = @_;
+
+  my @filterargs;
+
+  $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
+  push @filterargs, "^$args{startwith}" if $args{startwith};
+  push @filterargs, $args{filter} if $args{filter};
+
+  # better to request sorts on "simple" names, but it means we need to map it to real columns
+#  my %sortmap = (user => 'u.username', type => 'u.type', group => 'g.group_name', status => 'u.status',
+#       fname => 'fname');
+#  $args{sortby} = $sortmap{$args{sortby}};
+
+  # protection against bad or missing arguments
+  $args{sortorder} = 'ASC' if !$args{sortorder};
+  $args{sortby} = 'l.description' if !$args{sortby};
+  $args{offset} = 0 if !$args{offset};
+
+  my $sql = "SELECT l.location, l.description, l.iplist, g.group_name ".
+        "FROM locations l ".
+        "INNER JOIN groups g ON l.group_id=g.group_id ".
+        "WHERE l.group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
+        ($args{startwith} ? " AND l.description ~* ?" : '').
+        ($args{filter} ? " AND l.description ~* ?" : '').
+        " ORDER BY $args{sortby} $args{sortorder} ".
+        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
+  my $ulist = $dbh->selectall_arrayref($sql, { Slice => {} }, (@filterargs) );
+  $errstr = $dbh->errstr if !$ulist;
+  return $ulist;
+} # end getLocList()
+
+
+## DNSDB::getLocDropdown()