diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-05-13 07:27:16 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-05-13 07:27:16 +0000 |
| commit | 6546c826432b5c18c22a2ac2cd7dd1d77a7002c3 (patch) | |
| tree | 425469fcd29d5fbb26455220b40d3f576802dc38 /admin | |
| parent | ada740ec4123cf286c8abc3a09eb62ed80716fba (diff) | |
| download | ampache-6546c826432b5c18c22a2ac2cd7dd1d77a7002c3.tar.gz ampache-6546c826432b5c18c22a2ac2cd7dd1d77a7002c3.tar.bz2 ampache-6546c826432b5c18c22a2ac2cd7dd1d77a7002c3.zip | |
fixed playlists thing for real this time
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/catalog.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index c3c3799e..54fac154 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -46,7 +46,8 @@ switch ($_REQUEST['action']) { include(conf('prefix') . '/templates/flag.inc'); break; case 'add_to_all_catalogs': - $_REQUEST['catalogs'] = Catalog::get_catalog_ids(); + $catalog = new Catalog(); + $_REQUEST['catalogs'] = $catalog->get_catalog_ids(); case 'add_to_catalog': if (conf('demo_mode')) { break; } if ($_REQUEST['catalogs'] ) { @@ -65,7 +66,7 @@ switch ($_REQUEST['action']) { case _("Add to all Catalogs"): if (conf('demo_mode')) { break; } - /* If they are using the file MPD type, and it's currently enabled lets do a DBRefresh for em */ + /* If they are using the file MPD type, and it's currently enabled lets do a DBRefresh for em if (conf('mpd_method') == 'file' AND conf('allow_mpd_playback')) { // Connect to the MPD if (!class_exists('mpd')) { require_once(conf('prefix') . "/modules/mpd/mpd.class.php"); } @@ -77,6 +78,8 @@ switch ($_REQUEST['action']) { $myMpd->DBRefresh(); } // if MPD enabled + //FIXME: File Method no longer exists... leaving this in for a bit + */ $catalogs = $catalog->get_catalogs(); foreach ($catalogs as $data) { @@ -85,7 +88,8 @@ switch ($_REQUEST['action']) { include(conf('prefix') . '/templates/catalog.inc'); break; case 'update_all_catalogs': - $_REQUEST['catalogs'] = Catalog::get_catalog_ids(); + $catalog = new Catalog(); + $_REQUEST['catalogs'] = $catalog->get_catalog_ids(); case 'update_catalog': /* If they are in demo mode stop here */ if (conf('demo_mode')) { break; } @@ -104,11 +108,12 @@ switch ($_REQUEST['action']) { show_confirmation($title,$body,$url); break; case 'full_service': + $catalog = new Catalog(); /* Make sure they aren't in demo mode */ if (conf('demo_mode')) { break; } if (!$_REQUEST['catalogs']) { - $_REQUEST['catalogs'] = Catalog::get_catalog_ids(); + $_REQUEST['catalogs'] = $catalog->get_catalog_ids(); } /* This runs the clean/verify/add in that order */ @@ -157,7 +162,8 @@ switch ($_REQUEST['action']) { show_confirmation($title,$body,$url); break; case 'clean_all_catalogs': - $_REQUEST['catalogs'] = Catalog::get_catalog_ids(); + $catalog = new Catalog(); + $_REQUEST['catalogs'] = $catalog->get_catalog_ids(); case 'clean_catalog': /* If they are in demo mode stop them here */ if (conf('demo_mode')) { break; } |