-removed airtime-clean-storage.php + airtime-import.php
-default created stor dir now has www-data:www-data permission -created airtime-install.ini file for specifying install defaults -removed all references to storDir in /etc/airtime/airtime.conf, and get value from database instead.
This commit is contained in:
parent
2659932cfb
commit
2c4e2afb8b
16 changed files with 23 additions and 628 deletions
|
@ -336,9 +336,11 @@ class StoredFile {
|
|||
if (Schedule::IsFileScheduledInTheFuture($this->getId())) {
|
||||
return PEAR::raiseError('Cannot delete a file that is scheduled in the future.');
|
||||
}
|
||||
|
||||
$storageDir = MusicDir::getStorDir()->getDirectory();
|
||||
|
||||
// Only delete the file from filesystem if it has been copied to the storage directory
|
||||
if (substr($this->getFilePath(), 0, strlen($CC_CONFIG["storageDir"])) == $CC_CONFIG["storageDir"]) {
|
||||
if (substr($this->getFilePath(), 0, strlen($storageDir) == $storageDir)) {
|
||||
// Delete the file
|
||||
$res = unlink($this->getFilePath());
|
||||
if (!$res) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue