[Gforge-commits] gforge/www/admin useredit.php,1.9,1.10

[ruben]

Update of /cvsroot/gforge/gforge/www/admin
In directory db.perdue.net:/tmp/cvs-serv30703/www/admin

Modified Files:
        useredit.php 
Log Message:
added User->delete($sure) and changed the way useredit.php deletes users.

Index: useredit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/useredit.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- useredit.php        8 Oct 2004 21:38:01 -0000       1.9
+++ useredit.php        21 Dec 2004 15:59:25 -0000      1.10
@@ -42,7 +42,19 @@
        exit_error('Error',$u->getErrorMessage());
 }
 
-if ($action == "update_user") {
+if ($delete_user != '' && $confirm_delete == '1')
+{
+       // delete user
+       if (!$u->delete(true)) {
+               exit_error(
+                       
$Language->getText('admin_useredit','could_not_complete_operation'),
+                       $u->getErrorMessage()
+               );
+       } else {
+               $feedback .= 
$Language->getText('admin_useredit','deleted').'<br />';
+       }
+
+} elseif ($action == "update_user" && $delete_user == '') {
 
        if (!$u->setEmail($email)
                || !$u->setShell($shell)
@@ -109,16 +121,23 @@
 <?php echo $Language->getText('admin_useredit','web_account_status'); ?>
 </td>
 <td>
-<?php echo html_build_select_box_from_arrays(
-       array('P','A','S','D'),
-       array(
-               $Language->getText('admin_useredit','pending'),
+<?php
+if ($u->getStatus() == 'D') {
+       $status_letter = array('P','A','S','D');
+       $status_text   = array($Language->getText('admin_useredit','pending'),
                $Language->getText('admin_useredit','active'),
                $Language->getText('admin_useredit','suspended'),
-               $Language->getText('admin_useredit','deleted')
-       ),
-       'status', $u->getStatus(),false
-); ?>
+               $Language->getText('admin_useredit','deleted'));
+} else {
+       $status_letter = array('P','A','S');
+       $status_text   = array($Language->getText('admin_useredit','pending'),
+               $Language->getText('admin_useredit','active'),
+               $Language->getText('admin_useredit','suspended'));
+}
+?>
+<?php echo html_build_select_box_from_arrays(
+       $status_letter, $status_text,'status', $u->getStatus(), false);
+?>
 </td>
 </tr>
 
@@ -159,12 +178,15 @@
 <?php echo $u->getConfirmHash(); ?>
 </td>
 </tr>
-
-
+<?php if ($u->getStatus() != 'D') {    ?>
+<tr>
+<td colspan="2"><input type="checkbox" name="confirm_delete" value="1"><?php 
echo $Language->getText('admin_useredit','delete_user_confirm'); ?>
+&nbsp;<input type="submit" name="delete_user" value="<?php echo 
$Language->getText('admin_useredit','delete'); ?>" /><br>&nbsp;
+</td>
+</tr>
+<?php } ?>
 </table>
-
 <input type="submit" name="submit" value="<?php echo 
$Language->getText('admin_useredit','update'); ?>" />
-
 <p>
 <sup>1</sup><?php echo 
$Language->getText('admin_useredit','this_page_allows'); ?>
 </p>