diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-09 04:30:12 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-09 04:30:12 +0000 |
| commit | 83815169ceb211d4449928b21c02539795f81624 (patch) | |
| tree | aaaba2fda75b216c456ce99fd07aa3c98fbd1c24 /admin | |
| parent | b33aa8aec67006e641f2054e01b35a0bba316922 (diff) | |
| download | ampache-83815169ceb211d4449928b21c02539795f81624.tar.gz ampache-83815169ceb211d4449928b21c02539795f81624.tar.bz2 ampache-83815169ceb211d4449928b21c02539795f81624.zip | |
fixed some +x stuff that shouldnt have been +x and moved the catalog functions back into the content area
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/catalog.php | 11 | ||||
| -rw-r--r-- | admin/index.php | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index bf66e884..64097bc0 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -26,10 +26,7 @@ if (!$GLOBALS['user']->has_access(100)) { exit; } -// We'll need this -$catalog = new Catalog($_REQUEST['catalog_id']); - -require_once Config::get('prefix') . '/templates/header.inc.php'; +show_header(); /* Big switch statement to handle various actions */ switch ($_REQUEST['action']) { @@ -207,6 +204,11 @@ switch ($_REQUEST['action']) { $body = ''; show_confirmation($title,$body,$url); break; + case 'show_catalogs': + $catalog_ids = Catalog::get_catalogs(); + Browse::set_type('catalog'); + Browse::show_objects($catalog_ids); + break; case 'show_add_catalog': require Config::get('prefix') . '/templates/show_add_catalog.inc.php'; break; @@ -235,6 +237,7 @@ switch ($_REQUEST['action']) { show_confirmation(_('Delete Catalog'),_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)",$nexturl,1); break; case 'show_customize_catalog': + $catalog = new Catalog($_REQUEST['catalog_id']); require_once Config::get('prefix') . '/templates/show_edit_catalog.inc.php'; break; case 'gather_album_art': diff --git a/admin/index.php b/admin/index.php index 2e4d957e..ea2d7e14 100644 --- a/admin/index.php +++ b/admin/index.php @@ -28,6 +28,13 @@ if (!$GLOBALS['user']->has_access(100)) { show_header(); - +switch ($_REQUEST['action']) { + default: + // Show Catalogs + $catalog_ids = Catalog::get_catalogs(); + Browse::set_type('catalog'); + Browse::show_objects($catalog_ids); + break; +} show_footer(); |