diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-12 05:30:30 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-12 05:30:30 +0000 |
| commit | 7be9eb4ea1e868fa0725334697057e1b7b994460 (patch) | |
| tree | 5d4c634f2d64f2202cad95b4ce74c87838655e3d /admin/catalog.php | |
| parent | 12f679cf51ed9440c44cdc0cb178687f0ad17c3b (diff) | |
| download | ampache-7be9eb4ea1e868fa0725334697057e1b7b994460.tar.gz ampache-7be9eb4ea1e868fa0725334697057e1b7b994460.tar.bz2 ampache-7be9eb4ea1e868fa0725334697057e1b7b994460.zip | |
re-added ability to delete catalogs, fixed exception error with id3 library
Diffstat (limited to 'admin/catalog.php')
| -rw-r--r-- | admin/catalog.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index 8c29fa9c..37403d0c 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -99,13 +99,12 @@ switch ($_REQUEST['action']) { break; case 'delete_catalog': /* Make sure they aren't in demo mode */ - if (conf('demo_mode')) { break; } + if (Config::get('demo_mode')) { break; } /* Delete the sucker, we don't need to check perms as thats done above */ - $catalog = new Catalog($_REQUEST['catalog_id']); - $catalog->delete_catalog(); - $next_url = conf('web_path') . '/admin/index.php'; - show_confirmation(_('Catalog Deleted'),_('The Catalog and all associated records has been deleted'),$nexturl); + Catalog::delete($_REQUEST['catalog_id']); + $next_url = Config::get('web_path') . '/admin/index.php'; + show_confirmation(_('Catalog Deleted'),_('The Catalog and all associated records have been deleted'),$nexturl); break; case 'remove_disabled': if (conf('demo_mode')) { break; } @@ -226,9 +225,10 @@ switch ($_REQUEST['action']) { break; case 'show_delete_catalog': /* Stop the demo hippies */ - if (conf('demo_mode')) { break; } + if (Config::get('demo_mode')) { break; } + $catalog = new Catalog($_REQUEST['catalog_id']); - $nexturl = conf('web_path') . '/admin/catalog.php?action=delete_catalog&catalog_id=' . scrub_out($_REQUEST['catalog_id']); + $nexturl = Config::get('web_path') . '/admin/catalog.php?action=delete_catalog&catalog_id=' . scrub_out($_REQUEST['catalog_id']); show_confirmation(_('Delete Catalog'),_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)",$nexturl,1); break; case 'show_customize_catalog': |