yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Code Issues Releases Wiki Activity

Fix spurious errors from Catalog::create()

Browse source 
is_readable is flaky under Windows, opendir should be more accurate.
This commit is contained in:
Paul Arthur 2012-10-18 17:48:14 -04:00 • committed by Paul Arthur
parent 8821554dda
commit bea34c4261
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/CHANGELOG
View file

@ -2,6 +2,11 @@
--------- Ampache -- CHANGELOG --------- --------- Ampache -- CHANGELOG ---------
-------------------------------------------------------------------------- --------------------------------------------------------------------------
--------------------------------------------------------------------------
v.3.6-future
- Fixed an issue with adding catalogs on Windows caused by inconsistent
behaviour of is_readable() (reported by Lockzi)
-------------------------------------------------------------------------- --------------------------------------------------------------------------
v.3.6-Alpha3 2012-10-15 v.3.6-Alpha3 2012-10-15
- Updated getID3 to 1.9.4b1 - Updated getID3 to 1.9.4b1

10
lib/class/catalog.class.php
View file

@ -275,9 +275,13 @@ class Catalog extends database_object {
$path = Dba::escape($data['path']); $path = Dba::escape($data['path']);
// Make sure the path is readable/exists // Make sure the path is readable/exists
if (!is_readable($data['path']) AND $data['type'] == 'local') { if ($data['type'] == 'local') {
Error::add('general', sprintf(T_('Error: %s is not readable or does not exist'), scrub_out($data['path']))); $handle = opendir($path);
return false; if ($handle === false) {
Error::add('general', sprintf(T_('Error: %s is not readable or does not exist'), scrub_out($data['path'])));
return false;
}
closedir($handle);
} }
// Make sure this path isn't already in use by an existing catalog // Make sure this path isn't already in use by an existing catalog