summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-06-17 23:59:04 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-06-17 23:59:04 +0000
commit56c960c34a17746beeec455fc225428360d5d91d (patch)
tree85fae55dbb16f1c42109b85549f3853fd270ba7f /admin
parentb032ac027e531b992a62b1af5d19e865e28e8b7d (diff)
downloadampache-56c960c34a17746beeec455fc225428360d5d91d.tar.gz
ampache-56c960c34a17746beeec455fc225428360d5d91d.tar.bz2
ampache-56c960c34a17746beeec455fc225428360d5d91d.zip
fixed some issues with the installer, and also made it so that you can delete/disable users again
Diffstat (limited to 'admin')
-rw-r--r--admin/users.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/admin/users.php b/admin/users.php
index 56a6fcf5..677c9510 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -119,13 +119,6 @@ switch ($_REQUEST['action']) {
show_confirmation(_('New User Added'),__('%user% has been created with an access level of ' . $access,'%user%',$username),'admin/users.php');
break;
- case 'delete':
- if (conf('demo_mode')) { break; }
- $working_user = new User($user_id);
- show_confirmation(_('Deletion Request'),
- _('Are you sure you want to permanently delete') . " $working_user->fullname ($working_user->username)?",
- "admin/users.php?action=confirm_delete&amp;user_id=$user_id",1);
- break;
case 'enable':
$working_user = new User($user_id);
$working_user->enable();
@@ -156,7 +149,7 @@ switch ($_REQUEST['action']) {
require_once Config::get('prefix') . '/templates/show_edit_user.inc.php';
break;
case 'confirm_delete':
- if (conf('demo_mode')) { break; }
+ if (Config::get('demo_mode')) { break; }
$working_user = new User($_REQUEST['user_id']);
if ($working_user->delete()) {
show_confirmation(_('User Deleted'), "$working_user->username has been Deleted","admin/users.php");
@@ -165,6 +158,13 @@ switch ($_REQUEST['action']) {
show_confirmation(_('Delete Error'), _("Unable to delete last Admin User"),"admin/users.php");
}
break;
+ case 'delete':
+ if (Config::get('demo_mode')) { break; }
+ $client = new User($user_id);
+ show_confirmation(_('Deletion Request'),
+ _('Are you sure you want to permanently delete') . " $client->fullname ($client->username)?",
+ "admin/users.php?action=confirm_delete&amp;user_id=$user_id",1);
+ break;
/* Show IP History for the Specified User */
case 'show_ip_history':
/* get the user and their history */