Changeset 411

Timestamp:

10/05/12 14:04:00 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Check and munge state in DNSDB::updateUser(), same as addUser().
Clean up copy-paste job for dns-rpc.cgi updateUser and make sure it
works. See #43.

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns-rpc.cgi (modified) (2 diffs)

trunk/DNSDB.pm

@@ -2823 +2823 @@
 
   my $resultmsg = '';
+
+  # Munge in some alternate state values
+  $state = 1 if $state =~ /^active$/;
+  $state = 1 if $state =~ /^on$/;
+  $state = 0 if $state =~ /^inactive$/;
+  $state = 0 if $state =~ /^off$/;
 
   # Allow transactions, and raise an exception on errors so we can catch it later.

trunk/dns-rpc.cgi

@@ -244 +244 @@
   die "Missing UID\n" if !$args{uid};
 
-# not sure how to usefully represent permissions from any further out from DNSDB.pm :/
-# not to mention, permissions are checked at the UI layer, not the DB layer.
-  my $perms = {domain_edit => 1, domain_create => 1, domain_delete => 1,
-        record_edit => 1, record_create => 1, record_delete => 1
-        };
   # bend and twist;  get those arguments in in the right order!
+  $args{type} = 'u' if !$args{type};
   my @userargs = ($args{uid}, $args{username}, $args{group}, $args{pass}, $args{state}, $args{type});
   for my $argname ('fname','lname','phone') {
@@ -257 +253 @@
 ##fixme:  also underlying in DNSDB::updateUser():  no way to just update this or that attribute;
 #         have to pass them all in to be overwritten
-  my ($code,$msg) = DNSDB::addUser($dbh, @userargs);
+  my ($code,$msg) = DNSDB::updateUser($dbh, @userargs);
   die $msg if $code eq 'FAIL';
 }