Changeset 546 for branches/stable/dns.cgi

Timestamp:

12/11/13 15:31:44 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work from /trunk, 3 of mumble.

Includes changes through r440. One minor conflict
due to old partial merge

Location:

branches/stable

Files:

• . (modified) (1 prop)
• dns.cgi (modified) (2 diffs)

branches/stable/dns.cgi

@@ -1362 +1362 @@
 #  }
 
-  if ($webvar{locact} eq 'new') {
-    # uuhhmm....
-  } elsif ($webvar{locact} eq 'add') {
+  $webvar{locact} = '' if !$webvar{locact};
+
+  if ($webvar{locact} eq 'add') {
     changepage(page => "loclist", errmsg => "You are not permitted to add locations/views", id => $webvar{parentid})
         unless ($permissions{admin} || $permissions{location_create});
@@ -1430 +1430 @@
 
     show_msgs();
+  }
+
+} elsif ($webvar{page} eq 'delloc') {
+
+  changepage(page=> "loclist", errmsg => "You are not allowed to delete locations")
+        unless $permissions{admin} || $permissions{location_delete};
+
+  # security check - does the user have permission to access this entity?
+#  if (!check_scope(id => $webvar{id}, type => 'loc')) {
+#    changepage(page => "loclist", errmsg => "You are not permitted to <foo> the requested location/view");
+#  }
+
+  $page->param(locid => $webvar{locid});
+  my $locdata = getLoc($dbh, $webvar{locid});
+  $locdata->{description} = $webvar{locid} if !$locdata->{description};
+  # first pass = confirm y/n (sorta)
+  if (!defined($webvar{del})) {
+    $page->param(del_getconf => 1);
+    $page->param(location => $locdata->{description});
+  } elsif ($webvar{del} eq 'ok') {
+    my ($code,$msg) = delLoc($dbh, $webvar{locid});
+    if ($code eq 'OK') {
+      # success.  go back to the user list, do not pass "GO"
+      changepage(page => "loclist", resultmsg => $msg);
+    } else {
+      changepage(page => "loclist", errmsg => $msg);
+    }
+  } else {
+    # cancelled.  whee!
+    changepage(page => "loclist");
   }