Commit f6ad7505 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Add a couple of table cleanups when a user is denied access to a

project and the account is removed. Add some better warm fuzzies.
Also some changes to command line args to backend scripts.
parent ba3d5a21
<?php <?php
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
include("defs.php3"); include("defs.php3");
...@@ -234,11 +234,18 @@ elseif (strcmp($approval, "approve") == 0) { ...@@ -234,11 +234,18 @@ elseif (strcmp($approval, "approve") == 0) {
# Invoke the script. This does it all. If it fails, we will find out # Invoke the script. This does it all. If it fails, we will find out
# about it. # about it.
# #
SUEXEC($uid, $TBADMINGROUP, "webmkproj $pid", 0); echo "<br>
Project '$pid' is being created!<br><br>
This will take a minute or two. <b>Please</b> do not click the Stop
button during this time. If you do not receive notification within
a reasonable amount of time, please contact $TBMAILADDR.\n";
flush();
echo "<h3><p> SUEXEC($uid, $TBADMINGROUP, "webmkproj $pid", 1);
Project $pid (User: $headuid) has been approved.
</h3>\n"; echo "<p><b>
Project $pid (User: $headuid) has been approved.
</b>\n";
} }
else { else {
TBERROR("Invalid approval value $approval in approveproject.php3.", 1); TBERROR("Invalid approval value $approval in approveproject.php3.", 1);
......
<?php <?php
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
include("defs.php3"); include("defs.php3");
...@@ -429,13 +429,15 @@ while (list ($header, $value) = each ($HTTP_POST_VARS)) { ...@@ -429,13 +429,15 @@ while (list ($header, $value) = each ($HTTP_POST_VARS)) {
\n"; \n";
continue; continue;
} }
$query_result = DBQueryFatal("delete FROM users where uid='$user'"); DBQueryFatal("delete from users where uid='$user'");
DBQueryFatal("delete from user_pubkeys where uid='$user'");
DBQueryFatal("delete from user_sfskeys where uid='$user'");
echo "<p> echo "<p>
User $user was <b>denied</b> membership in $project/$group. User $user was <b>denied</b> membership in $project/$group.
<br> <br>
The account has also been <b>terminated</b> with prejudice!\n"; The account has also been <b>terminated</b>!\n";
continue; continue;
} }
...@@ -494,7 +496,7 @@ while (list ($header, $value) = each ($HTTP_POST_VARS)) { ...@@ -494,7 +496,7 @@ while (list ($header, $value) = each ($HTTP_POST_VARS)) {
# #
# Create user account on control node. # Create user account on control node.
# #
MKACCT($uid, "webmkacct -a $user"); MKACCT($uid, "webmkacct $user");
SUEXEC($uid, $TBADMINGROUP, "websetgroups $user", 0); SUEXEC($uid, $TBADMINGROUP, "websetgroups $user", 0);
continue; continue;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment