From 05908d121f347a1a29178e5859ccd72fb3d18459 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 28 Aug 2012 13:15:02 -0400
Subject: [PATCH] cc-4274: Fixed bad table name.

---
 airtime_mvc/application/controllers/ApiController.php | 5 +++--
 airtime_mvc/application/models/StoredFile.php         | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 2711825f1..f8752aa66 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -690,7 +690,7 @@ class ApiController extends Zend_Controller_Action
         $dir_id = $request->getParam('dir_id');
 
         $this->view->files = 
-            Application_Model_StoredFile::listAllFiles($dir_id, $all=true);
+            Application_Model_StoredFile::listAllFiles($dir_id,$all=true);
     }
 
     public function listAllWatchedDirsAction()
@@ -863,7 +863,8 @@ 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(), true);
+                    $files = Application_Model_StoredFile::listAllFiles(
+                        $dir->getId(),$all=false, true);
                     foreach ($files as $f) {
                         // if the file is from this mount
                         if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index f392d7b19..6dac96734 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -1003,8 +1003,7 @@ class Application_Model_StoredFile
      * @param $dir_id - if this is not provided, it returns all files with full path constructed.
      * @param $propelObj - if this is true, it returns array of proepl obj
      */
-    public static function listAllFiles($dir_id=null, $propelObj=false, 
-        $all=false)
+    public static function listAllFiles($dir_id=null, $all, $propelObj=false)
     {
         $con = Propel::getConnection();
 
@@ -1017,8 +1016,8 @@ class Application_Model_StoredFile
                     ." ON m.id = f.directory WHERE m.id = $dir_id $file_exists";
         } else {
             $sql = "SELECT filepath as fp"
-                    ." FROM CC_FILES"
-                    ." WHERE directory = $dir_id $file_exists";
+                    ." FROM CC_FILES as f"
+                    ." WHERE f.directory = $dir_id $file_exists";
         }
         $rows = $con->query($sql)->fetchAll();