diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-09-30 04:15:11 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-09-30 04:15:11 +0000 |
| commit | edcf34c986d14fb6583eb29958bf88140cd97b5b (patch) | |
| tree | dde8c48e1ca303426a87459057913fc030b66869 /admin | |
| parent | 6b7284fab7f49f54f4d72db6c690bbea7f7b7af7 (diff) | |
| download | ampache-edcf34c986d14fb6583eb29958bf88140cd97b5b.tar.gz ampache-edcf34c986d14fb6583eb29958bf88140cd97b5b.tar.bz2 ampache-edcf34c986d14fb6583eb29958bf88140cd97b5b.zip | |
fixed up xmlrpc hopefully (needs testing) and fixed duplicates, cleaned up burgundy a little more
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/catalog.php | 9 | ||||
| -rw-r--r-- | admin/duplicates.php | 5 | ||||
| -rw-r--r-- | admin/users.php | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index cc57bd3f..19ef1d3b 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -147,18 +147,15 @@ switch ($_REQUEST['action']) { $song = $_REQUEST['song']; - echo "<div class=\"confirmation-box\">"; if (count($song)) { $catalog->remove_songs($song); - echo "<p align=\"center\">Songs Removed... </p>"; + $body = _('Songs Removed'); } else { - echo "<p align=\"center\">No Songs Removed... </p>"; + $body = _('No Songs Removed'); } - echo "</div><br />\n"; $url = conf('web_path') . '/admin/index.php'; $title = _('Disabled Songs Processed'); - $body = ''; show_confirmation($title,$body,$url); break; case 'clean_all_catalogs': @@ -265,7 +262,7 @@ switch ($_REQUEST['action']) { require (conf('prefix') . '/templates/show_disabled_songs.inc'); } else { - echo "<div class=\"error\" align=\"center\">No Disabled songs found</div>"; + echo "<div class=\"error\" align=\"center\">" . _('No Disabled songs found') . "</div>"; } break; case 'show_delete_catalog': diff --git a/admin/duplicates.php b/admin/duplicates.php index 3dede7e4..660a7162 100644 --- a/admin/duplicates.php +++ b/admin/duplicates.php @@ -36,8 +36,8 @@ $search_type = scrub_in($_REQUEST['search_type']); show_template('header'); -switch ($action) -{ +/* Switch on Action */ +switch ($action) { case 'search': $flags = get_duplicate_songs($search_type); show_duplicate_songs($flags,$search_type); @@ -45,5 +45,6 @@ switch ($action) default: show_duplicate_searchbox($search_type); } + show_footer(); ?> diff --git a/admin/users.php b/admin/users.php index 6e164b53..31d4ba37 100644 --- a/admin/users.php +++ b/admin/users.php @@ -141,11 +141,10 @@ switch ($action) { break; case 'delete': if (conf('demo_mode')) { break; } - show_confirm_action(_("Are you sure you want to permanently delete") . " $temp_user->fullname ($temp_user->username) ?", - "admin/users.php", - "action=confirm_delete&user=$temp_user->username"); + show_confirmation(_('Deletion Request'), + _("Are you sure you want to permanently delete") . " $temp_user->fullname ($temp_user->username) ?", + "admin/users.php?action=confirm_delete&user=$temp_user->id"); break; - case 'confirm_delete': if (conf('demo_mode')) { break; } if ($_REQUEST['confirm'] == _("No")) { show_manage_users(); break; } |