diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-12-20 16:52:43 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-12-20 16:52:43 +0000 |
| commit | d8ea07a04acc03160ac73f5db2a9249890e5fd13 (patch) | |
| tree | 63e0dfedbfc9565a265cb342da405cd79b4ff341 /admin/catalog.php | |
| parent | 69c56f829da3fc44e6dbcc14c364901b86f55421 (diff) | |
| download | ampache-d8ea07a04acc03160ac73f5db2a9249890e5fd13.tar.gz ampache-d8ea07a04acc03160ac73f5db2a9249890e5fd13.tar.bz2 ampache-d8ea07a04acc03160ac73f5db2a9249890e5fd13.zip | |
sync from 3.5.x and fix display issue on playlist view
Diffstat (limited to 'admin/catalog.php')
| -rw-r--r-- | admin/catalog.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index bada8fad..619f96be 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -198,27 +198,32 @@ switch ($_REQUEST['action']) { ob_end_flush(); - if (!strlen($_REQUEST['path']) || !strlen($_REQUEST['name'])) { + if (!strlen($_POST['path']) || !strlen($_POST['name'])) { Error::add('general',_('Error: Name and path not specified')); } - if (substr($_REQUEST['path'],0,7) != 'http://' && $_REQUEST['type'] == 'remote') { + if (substr($_POST['path'],0,7) != 'http://' && $_POST['type'] == 'remote') { Error::add('general',_('Error: Remote selected, but path is not a URL')); } - if ($_REQUEST['type'] == 'remote' && !strlen($_REQUEST['key'])) { + if ($_POST['type'] == 'remote' && !strlen($_POST['key'])) { Error::add('general',_('Error: Remote Catalog specified, but no key provided')); } + if (!Core::form_verify('add_catalog','post')) { + access_denied(); + exit; + } + // Make sure that there isn't a catalog with a directory above this one - if (Catalog::get_from_path($_REQUEST['path'])) { + if (Catalog::get_from_path($_POST['path'])) { Error::add('general',_('Error: Defined Path is inside an existing catalog')); } // If an error hasn't occured if (!Error::occurred()) { - $catalog_id = Catalog::Create($_REQUEST); + $catalog_id = Catalog::Create($_POST); if (!$catalog_id) { require Config::get('prefix') . '/templates/show_add_catalog.inc.php'; @@ -228,7 +233,7 @@ switch ($_REQUEST['action']) { $catalog = new Catalog($catalog_id); // Run our initial add - $catalog->run_add($_REQUEST); + $catalog->run_add($_POST); show_box_top(); echo "<h2>" . _('Catalog Created') . "</h2>"; |