parent
c36333ae07
commit
2250d89cbd
airtime_mvc/application
|
@ -632,7 +632,7 @@ class ApiController extends Zend_Controller_Action
|
|||
$all = $request->getParam('all');
|
||||
|
||||
$this->view->files =
|
||||
Application_Model_StoredFile::listAllFiles($dir_id,$all);
|
||||
Application_Model_StoredFile::listAllFiles($dir_id, $all);
|
||||
}
|
||||
|
||||
public function listAllWatchedDirsAction()
|
||||
|
@ -800,7 +800,7 @@ class ApiController extends Zend_Controller_Action
|
|||
$watchDir = Application_Model_MusicDir::getDirByPath($rd);
|
||||
// get all the files that is under $dirPath
|
||||
$files = Application_Model_StoredFile::listAllFiles(
|
||||
$dir->getId(),$all=false, true);
|
||||
$dir->getId(),$all=false);
|
||||
foreach ($files as $f) {
|
||||
// if the file is from this mount
|
||||
if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {
|
||||
|
|
|
@ -1071,7 +1071,7 @@ SQL;
|
|||
* @param $dir_id - if this is not provided, it returns all files with full
|
||||
* path constructed.
|
||||
*/
|
||||
public static function listAllFiles($dir_id=null, $all)
|
||||
public static function listAllFiles($dir_id=null, $all=true)
|
||||
{
|
||||
$con = Propel::getConnection();
|
||||
|
||||
|
@ -1081,10 +1081,6 @@ FROM CC_FILES AS f
|
|||
WHERE f.directory = :dir_id
|
||||
SQL;
|
||||
|
||||
# TODO : the option $all is deprecated now and is always true.
|
||||
# refactor code where it's still being passed
|
||||
$all = true;
|
||||
|
||||
if (!$all) {
|
||||
$sql .= " AND f.file_exists = 'TRUE'";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue