diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index d5e976989..d4f7ed395 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -379,7 +379,7 @@ SQL; { $file = CcFilesQuery::create()->findPK($p_item, $this->con); - if (isset($file) && $file->displayable()) { + if (isset($file) && $file->visible()) { $entry = $this->blockItem; $entry["id"] = $file->getDbId(); $entry["pos"] = $pos; diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 5d237814a..dd3fe9fff 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -373,7 +373,7 @@ SQL; } if (isset($obj)) { - if (($obj instanceof CcFiles && $obj->displayable()) + if (($obj instanceof CcFiles && $obj->visible()) || $obj instanceof CcWebstream || $obj instanceof CcBlock) { diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 4dcef681d..9d02a4aa9 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -137,7 +137,7 @@ class Application_Model_Scheduler if ($type === "audioclip") { $file = CcFilesQuery::create()->findPK($id, $this->con); - if (is_null($file) || !$file->displayable()) { + if (is_null($file) || !$file->visible()) { throw new Exception("A selected File does not exist!"); } else { $data = $this->fileInfo; @@ -195,7 +195,7 @@ class Application_Model_Scheduler $dynamicFiles = $bl->getListOfFilesUnderLimit(); foreach ($dynamicFiles as $fileId=>$f) { $file = CcFilesQuery::create()->findPk($fileId); - if (isset($file) && $file->displayable()) { + if (isset($file) && $file->visible()) { $data["id"] = $file->getDbId(); $data["cliplength"] = $file->getDbLength(); $data["cuein"] = "00:00:00"; @@ -217,7 +217,7 @@ class Application_Model_Scheduler //need to return $stream = CcWebstreamQuery::create()->findPK($id, $this->con); - if (is_null($stream) /* || !$file->displayable() */) { + if (is_null($stream) /* || !$file->visible() */) { throw new Exception("A selected File does not exist!"); } else { $data = $this->fileInfo; @@ -252,7 +252,7 @@ class Application_Model_Scheduler $dynamicFiles = $bl->getListOfFilesUnderLimit(); foreach ($dynamicFiles as $fileId=>$f) { $file = CcFilesQuery::create()->findPk($fileId); - if (isset($file) && $file->displayable()) { + if (isset($file) && $file->visible()) { $data["id"] = $file->getDbId(); $data["cliplength"] = $file->getDbLength(); $data["cuein"] = "00:00:00"; diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php index 4908add32..9c6bc8359 100644 --- a/airtime_mvc/application/models/airtime/CcFiles.php +++ b/airtime_mvc/application/models/airtime/CcFiles.php @@ -42,7 +42,7 @@ class CcFiles extends BaseCcFiles { } // returns true if the file exists and is not hidden - public function displayable() { + public function visible() { return $this->getDbFileExists() && !$this->getDbHidden(); }