diff options
| author | Karl Vollmer <karl.vollmer@dal.ca> | 2011-11-23 10:45:43 -0400 |
|---|---|---|
| committer | Karl Vollmer <karl.vollmer@dal.ca> | 2011-11-23 10:45:43 -0400 |
| commit | d7c65985289d61ba1ef87d55f8df5485b73e5a48 (patch) | |
| tree | b784db229e01ed9acb0d4688190d163b7c642c74 /admin | |
| parent | 806b0c0b85f99a27cc169e9f99f88b6911687f4a (diff) | |
| download | ampache-d7c65985289d61ba1ef87d55f8df5485b73e5a48.tar.gz ampache-d7c65985289d61ba1ef87d55f8df5485b73e5a48.tar.bz2 ampache-d7c65985289d61ba1ef87d55f8df5485b73e5a48.zip | |
Fix DB updates so catalog remote_username and remote_password are added correctly, also fix catalog creation so they are stored in the database
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/catalog.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index 1beb6fef..df9166b8 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -213,9 +213,8 @@ switch ($_REQUEST['action']) { if (substr($_POST['path'],0,7) != 'http://' && $_POST['type'] == 'remote') { Error::add('general',_('Error: Remote selected, but path is not a URL')); } - - if ($_POST['type'] == 'remote' && !strlen($_POST['key'])) { - Error::add('general',_('Error: Remote Catalog specified, but no key provided')); + if ($POST['type'] == 'local' AND (!strlen($POST['remote_username']) OR !strlen($POST['remote_password']))) { + Error::add('general',_('Error: Username and Password Required for Remote Catalogs')); } if (!Core::form_verify('add_catalog','post')) { |