Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

VERSION

@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.0.0
+PRODUCT_RELEASE=2.1.0

airtime_mvc/application/Bootstrap.php

@@ -119,5 +119,19 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             $frontController->registerPlugin($debug);
         }
     }
+    
+    protected function _initRouter()
+    {
+    	$front = Zend_Controller_Front::getInstance();
+        $router = $front->getRouter();
+        
+        $router->addRoute(
+            'password-change',
+            new Zend_Controller_Router_Route('password-change/:user_id/:token', array(
+                'module' => 'default',
+                'controller' => 'auth',
+                'action' => 'password-change',
+            )));
+    }
 }
 

airtime_mvc/application/configs/ACL.php

@@ -23,7 +23,8 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
 	  ->add(new Zend_Acl_Resource('search'))
       ->add(new Zend_Acl_Resource('dashboard'))
       ->add(new Zend_Acl_Resource('preference'))
-      ->add(new Zend_Acl_Resource('recorder'));
+      ->add(new Zend_Acl_Resource('recorder'))
+      ->add(new Zend_Acl_Resource('auth'));
 
 /** Creating permissions */
 $ccAcl->allow('G', 'index')
@@ -31,6 +32,7 @@ $ccAcl->allow('G', 'index')
 	  ->allow('G', 'error')
 	  ->allow('G', 'nowplaying')
 	  ->allow('G', 'api')
+	  ->allow('G', 'auth')
       //->allow('G', 'plupload', array('upload-recorded'))
       ->allow('G', 'recorder')
       ->allow('G', 'schedule')

airtime_mvc/application/configs/classmap-airtime-conf.php

@@ -113,6 +113,13 @@ return array (
   'BaseCcSubjsPeer' => 'airtime/om/BaseCcSubjsPeer.php',
   'BaseCcSubjs' => 'airtime/om/BaseCcSubjs.php',
   'BaseCcSubjsQuery' => 'airtime/om/BaseCcSubjsQuery.php',
+  'CcSubjsTokenTableMap' => 'airtime/map/CcSubjsTokenTableMap.php',
+  'CcSubjsTokenPeer' => 'airtime/CcSubjsTokenPeer.php',
+  'CcSubjsToken' => 'airtime/CcSubjsToken.php',
+  'CcSubjsTokenQuery' => 'airtime/CcSubjsTokenQuery.php',
+  'BaseCcSubjsTokenPeer' => 'airtime/om/BaseCcSubjsTokenPeer.php',
+  'BaseCcSubjsToken' => 'airtime/om/BaseCcSubjsToken.php',
+  'BaseCcSubjsTokenQuery' => 'airtime/om/BaseCcSubjsTokenQuery.php',
   'CcCountryTableMap' => 'airtime/map/CcCountryTableMap.php',
   'CcCountryPeer' => 'airtime/CcCountryPeer.php',
   'CcCountry' => 'airtime/CcCountry.php',

airtime_mvc/application/controllers/ApiController.php

@@ -26,6 +26,8 @@ class ApiController extends Zend_Controller_Action
                 ->addActionContext('update-liquidsoap-status', 'json')
                 ->addActionContext('library-init', 'json')
                 ->addActionContext('live-chat', 'json')
+                ->addActionContext('update-file-system-mount', 'json')
+                ->addActionContext('handle-watched-dir-missing', 'json')
                 ->initContext();
     }
 
@@ -561,19 +563,26 @@ class ApiController extends Zend_Controller_Action
 
         // update import timestamp
         Application_Model_Preference::SetImportTimestamp();
-        
         if ($mode == "create") {
             $filepath = $md['MDATA_KEY_FILEPATH'];
             $filepath = str_replace("\\", "", $filepath);
+            $filepath = str_replace("//", "/", $filepath);
 
             $file = Application_Model_StoredFile::RecallByFilepath($filepath);
-
+            
             if (is_null($file)) {
                 $file = Application_Model_StoredFile::Insert($md);
             }
             else {
-                $this->view->error = "File already exists in Airtime.";
-                return;
+                // path already exist
+                if($file->getFileExistsFlag()){
+                    // file marked as exists
+                    $this->view->error = "File already exists in Airtime.";
+                    return;
+                }else{
+                    // file marked as not exists
+                    $file->setFileExistsFlag(true);
+                }
             }
         }
         else if ($mode == "modify") {
@@ -812,5 +821,102 @@ class ApiController extends Zend_Controller_Action
         	"numEntries"=>Application_Model_Preference::GetLibraryNumEntries()
         );
     }
+    
+    // handles addition/deletion of mount point which watched dirs reside
+    public function updateFileSystemMountAction(){
+        global $CC_CONFIG;
+        
+        $request = $this->getRequest();
+        $api_key = $request->getParam('api_key');
+        if (!in_array($api_key, $CC_CONFIG["apiKey"]))
+        {
+            header('HTTP/1.0 401 Unauthorized');
+            print 'You are not allowed to access this resource.';
+            exit;
+        }
+
+        $params = $request->getParams();
+        $added_list = empty($params['added_dir'])?array():explode(',',$params['added_dir']);
+        $removed_list = empty($params['removed_dir'])?array():explode(',',$params['removed_dir']);
+        
+        // get all watched dirs
+        $watched_dirs = Application_Model_MusicDir::getWatchedDirs(null,null);
+        
+            foreach( $added_list as $ad){
+                foreach( $watched_dirs as $dir ){
+                    $dirPath = $dir->getDirectory();
+                    
+                    $ad .= '/';
+                    
+                    // if mount path itself was watched
+                    if($dirPath == $ad){
+                        Application_Model_MusicDir::addWatchedDir($dirPath, false);
+                        break;
+                    }
+                    // if dir contains any dir in removed_list( if watched dir resides on new mounted path )
+                    else if(substr($dirPath, 0, strlen($ad)) === $ad && $dir->getExistsFlag() == false){
+                        Application_Model_MusicDir::addWatchedDir($dirPath, false);
+                        break;
+                    }
+                    // is new mount point within the watched dir?
+                    // pyinotify doesn't notify anyhing in this case, so we add this mount point as
+                    // watched dir
+                    else if(substr($ad, 0, strlen($dirPath)) === $dirPath){
+                        // bypass nested loop check
+                        Application_Model_MusicDir::addWatchedDir($ad, false, true);
+                        break;
+                    }
+                }
+            }
+            foreach( $removed_list as $rd){
+                foreach( $watched_dirs as $dir ){
+                    $dirPath = $dir->getDirectory();
+                    $rd .= '/';
+                    // if dir contains any dir in removed_list( if watched dir resides on new mounted path )
+                    if(substr($dirPath, 0, strlen($rd)) === $rd && $dir->getExistsFlag() == true){
+                        Application_Model_MusicDir::removeWatchedDir($dirPath, false);
+                        break;
+                    }
+                    // is new mount point within the watched dir?
+                    // pyinotify doesn't notify anyhing in this case, so we walk through all files within
+                    // this watched dir in DB and mark them deleted.
+                    // In case of h) of use cases, due to pyinotify behaviour of noticing mounted dir, we need to 
+                    // compare agaisnt all files in cc_files table
+                    else if(substr($rd, 0, strlen($dirPath)) === $dirPath ){
+                        $watchDir = Application_Model_MusicDir::getDirByPath($rd);
+                        // get all the files that is under $dirPath
+                        $files = Application_Model_StoredFile::listAllFiles($dir->getId(), true);
+                        foreach($files as $f){
+                            // if the file is from this mount
+                            if(substr( $f->getFilePath(),0,strlen($rd) ) === $rd){
+                                $f->delete();
+                            }
+                        }
+                        if($watchDir){
+                            Application_Model_MusicDir::removeWatchedDir($rd, false);
+                        }
+                        break;
+                    }
+                }
+            }
+            
+    }
+    
+    // handles case where watched dir is missing
+    public function handleWatchedDirMissingAction(){
+        global $CC_CONFIG;
+        
+        $request = $this->getRequest();
+        $api_key = $request->getParam('api_key');
+        if (!in_array($api_key, $CC_CONFIG["apiKey"]))
+        {
+            header('HTTP/1.0 401 Unauthorized');
+            print 'You are not allowed to access this resource.';
+            exit;
+        }
+        
+        $dir = base64_decode($request->getParam('dir'));
+        Application_Model_MusicDir::removeWatchedDir($dir, false);
+    }
 }
 

airtime_mvc/application/controllers/AuthController.php

@@ -0,0 +1,90 @@
+<?php
+
+class AuthController extends Zend_Controller_Action
+{
+    public function init()
+    {
+    
+    }
+    
+    public function passwordRestoreAction()
+    {
+    	//uses separate layout without a navigation.
+        $this->_helper->layout->setLayout('bare');
+    	
+    	$form = new Application_Form_PasswordRestore();
+
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            $user = CcSubjsQuery::create()
+                ->filterByDbEmail($form->email->getValue())
+                ->findOne();
+
+            if (!empty($user)) {
+                $auth = new Application_Model_Auth();
+                
+                $auth->sendPasswordRestoreLink($user, $this->view);
+                $this->_helper->redirector('password-restore-after', 'auth');
+            } 
+            else {
+                $form->email->addError($this->view->translate("Given email not found."));
+            }
+        }
+
+        $this->view->form = $form;
+    }
+    
+    public function passwordRestoreAfterAction()
+    {
+        //uses separate layout without a navigation.
+        $this->_helper->layout->setLayout('bare');
+    }
+    
+    public function passwordChangeAction()
+    {
+    	//uses separate layout without a navigation.
+        $this->_helper->layout->setLayout('bare');
+        
+        $request = $this->getRequest();
+        $token = $request->getParam("token", false);
+        $user_id = $request->getParam("user_id", 0); 
+
+        $form = new Application_Form_PasswordChange();
+        $auth = new Application_Model_Auth();
+        $user = CcSubjsQuery::create()->findPK($user_id);
+        
+        //check validity of token
+        if (!$auth->checkToken($user_id, $token, 'password.restore')) {
+        	echo "token not valid";
+            //$this->_helper->redirector('index', 'login');
+        }
+        
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+        	
+        	$user->setDbPass(md5($form->password->getValue()));
+        	$user->save();
+        	
+        	$auth->invalidateTokens($user, 'password.restore');
+            
+        	$zend_auth = Zend_Auth::getInstance();
+            $zend_auth->clearIdentity();
+            
+            $authAdapter = Application_Model_Auth::getAuthAdapter();
+            $authAdapter->setIdentity($user->getDbLogin())
+                        ->setCredential($form->password->getValue());
+                        
+            $result = $zend_auth->authenticate($authAdapter);
+                
+            //all info about this user from the login table omit only the password
+            $userInfo = $authAdapter->getResultRowObject(null, 'password');
+            
+            //the default storage is a session with namespace Zend_Auth
+            $authStorage = $zend_auth->getStorage();
+            $authStorage->write($userInfo);
+                
+            $this->_helper->redirector('index', 'nowplaying');     
+        }
+
+        $this->view->form = $form;
+    }
+}

airtime_mvc/application/controllers/LibraryController.php

@@ -11,6 +11,7 @@ class LibraryController extends Zend_Controller_Action
         $ajaxContext = $this->_helper->getHelper('AjaxContext');
         $ajaxContext->addActionContext('contents', 'json')
                     ->addActionContext('delete', 'json')
+                    ->addActionContext('delete-group', 'json')
                     ->addActionContext('context-menu', 'json')
                     ->addActionContext('get-file-meta-data', 'html')
                     ->addActionContext('upload-file-soundcloud', 'json')
@@ -31,12 +32,16 @@ class LibraryController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js','text/javascript');
 
         $this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css');
         $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
-
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColVis.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColReorder.css');
 
         $this->_helper->layout->setLayout('library');
         $this->_helper->viewRenderer->setResponseSegment('library');
@@ -178,27 +183,66 @@ class LibraryController extends Zend_Controller_Action
             $this->view->id = $id;
         }
     }
+    
+    public function deleteGroupAction()
+    {
+        $ids = $this->_getParam('ids');
+        $userInfo = Zend_Auth::getInstance()->getStorage()->read();
+        $user = new Application_Model_User($userInfo->id);
+
+        if ($user->isAdmin()) {
+
+            if (!is_null($ids)) {
+                foreach ($ids as $key => $id) {
+                    $file = Application_Model_StoredFile::Recall($id);
+
+                    if (PEAR::isError($file)) {
+                        $this->view->message = $file->getMessage();
+                        return;
+                    }
+                    else if(is_null($file)) {
+                        $this->view->message = "file doesn't exist";
+                        return;
+                    }
+
+                    $res = $file->delete();
+
+                    if (PEAR::isError($res)) {
+                        $this->view->message = $res->getMessage();
+                        return;
+                    }
+                    else {
+                        $res = settype($res, "integer");
+                        $data = array("filepath" => $file->getFilePath(), "delete" => $res);
+                        Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data);
+                    }
+                }
+                
+                $this->view->ids = $ids;
+            }
+        }
+    }
 
     public function contentsAction()
     {
         $post = $this->getRequest()->getPost();
         $datatables = Application_Model_StoredFile::searchFilesForPlaylistBuilder($post);
-
+        
         //format clip lengh to 1 decimal
         foreach($datatables["aaData"] as &$data){
-            if($data[6] == 'audioclip'){
-                $file = Application_Model_StoredFile::Recall($data[0]);
+            if($data['ftype'] == 'audioclip'){
+                $file = Application_Model_StoredFile::Recall($data['id']);
                 $scid = $file->getSoundCloudId();
                 if($scid == "-2"){
-                    $data[1] .= '<span id="'.$data[0].'" class="small-icon progress"></span>';
+                    $data['track_title'] .= '<span id="'.$data['id'].'" class="small-icon progress"></span>';
                 }else if($scid == "-3"){
-                    $data[1] .= '<span id="'.$data[0].'" class="small-icon sc-error"></span>';
+                    $data['track_title'] .= '<span id="'.$data['id'].'" class="small-icon sc-error"></span>';
                 }else if(!is_null($scid)){
-                    $data[1] .= '<span id="'.$data[0].'" class="small-icon soundcloud"></span>';
+                    $data['track_title'] .= '<span id="'.$data['id'].'" class="small-icon soundcloud"></span>';
                 }
             }
-            $sec = Application_Model_Playlist::playlistTimeToSeconds($data[5]);
-            $data[5] = Application_Model_Playlist::secondsToPlaylistTime($sec);
+            $sec = Application_Model_Playlist::playlistTimeToSeconds($data['length']);
+            $data['length'] = Application_Model_Playlist::secondsToPlaylistTime($sec);
         }
 
         die(json_encode($datatables));

airtime_mvc/application/controllers/LoginController.php

@@ -43,7 +43,7 @@ class LoginController extends Zend_Controller_Action
                 if(Application_Model_Subjects::getLoginAttempts($username) >= 3 && $form->getElement('captcha') == NULL){
                     $form->addRecaptcha();
                 }else{
-                    $authAdapter = $this->getAuthAdapter();
+                    $authAdapter = Application_Model_Auth::getAuthAdapter();
 
                     //pass to the adapter the submitted username and password
                     $authAdapter->setIdentity($username)
@@ -92,25 +92,6 @@ class LoginController extends Zend_Controller_Action
         Zend_Auth::getInstance()->clearIdentity();
         $this->_redirect('login/index');
     }
-
-	 /**
-     * Gets the adapter for authentication against a database table
-     *
-     * @return object
-     */
-    protected function getAuthAdapter()
-    {
-        $dbAdapter = Zend_Db_Table::getDefaultAdapter();
-        $authAdapter = new Zend_Auth_Adapter_DbTable($dbAdapter);
-
-        $authAdapter->setTableName('cc_subjs')
-                    ->setIdentityColumn('login')
-                    ->setCredentialColumn('pass')
-                    ->setCredentialTreatment('MD5(?)');
-                    
-        return $authAdapter;
-    }
-
 }
 
 

airtime_mvc/application/controllers/PlaylistController.php

@@ -8,18 +8,20 @@ class PlaylistController extends Zend_Controller_Action
     {
         $ajaxContext = $this->_helper->getHelper('AjaxContext');
         $ajaxContext->addActionContext('add-item', 'json')
-					->addActionContext('delete-item', 'json')
-					->addActionContext('set-fade', 'json')
-					->addActionContext('set-cue', 'json')
-					->addActionContext('move-item', 'json')
-					->addActionContext('close', 'json')
-					->addActionContext('new', 'json')
-					->addActionContext('edit', 'json')
-					->addActionContext('delete-active', 'json')
-					->addActionContext('delete', 'json')
+                    ->addActionContext('delete-item', 'json')
+                    ->addActionContext('add-group', 'json')
+                    ->addActionContext('delete-group', 'json')
+                    ->addActionContext('set-fade', 'json')
+                    ->addActionContext('set-cue', 'json')
+                    ->addActionContext('move-item', 'json')
+                    ->addActionContext('close', 'json')
+                    ->addActionContext('new', 'json')
+                    ->addActionContext('edit', 'json')
+                    ->addActionContext('delete-active', 'json')
+                    ->addActionContext('delete', 'json')
                     ->addActionContext('set-playlist-fades', 'json')
                     ->addActionContext('set-playlist-name', 'json')
-					->addActionContext('set-playlist-description', 'json')
+                    ->addActionContext('set-playlist-description', 'json')
                     ->initContext();
 
         $this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME);
@@ -209,6 +211,59 @@ class PlaylistController extends Zend_Controller_Action
 		unset($this->view->pl);
     }
 
+    public function addGroupAction()
+    {
+        $ids = $this->_getParam('ids');
+        $pos = $this->_getParam('pos', null);
+
+        if (!is_null($ids)) {
+            $pl = $this->getPlaylist();
+            if ($pl === false) {
+                $this->view->playlist_error = true;
+                return false;
+            }
+            
+            foreach ($ids as $key => $value) {
+                $res = $pl->addAudioClip($value);
+                if (PEAR::isError($res)) {
+                    $this->view->message = $res->getMessage();
+                    break;
+                }
+            }
+
+            $this->view->pl = $pl;
+            $this->view->html = $this->view->render('playlist/update.phtml');
+            $this->view->name = $pl->getName();
+            $this->view->length = $pl->getLength();
+            $this->view->description = $pl->getDescription();
+            return;
+        }
+        $this->view->message =  "a file is not chosen";
+    }
+    
+    public function deleteGroupAction()
+    {
+        $ids = $this->_getParam('ids', null);
+        
+        foreach ($ids as $key => $id) {
+            $pl = Application_Model_Playlist::Recall($id);
+
+            if ($pl !== FALSE) {
+                Application_Model_Playlist::Delete($id);
+                $pl_sess = $this->pl_sess;
+                if($pl_sess->id === $id){
+                    unset($pl_sess->id);
+                }
+            } else {
+                $this->view->playlist_error = true;
+                return false;
+            }
+        }
+        
+        $this->view->ids = $ids;
+        $this->view->html = $this->view->render('playlist/index.phtml');
+    }
+    
     public function setCueAction()
     {
 		$pos = $this->_getParam('pos');

airtime_mvc/application/controllers/ScheduleController.php

@@ -41,11 +41,11 @@ class ScheduleController extends Zend_Controller_Action
         $baseUrl = $request->getBaseUrl();
 
         $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
+	$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
+	$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/fullcalendar/fullcalendar.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker-0.0.6.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/colorpicker/js/colorpicker.js','text/javascript');
+	$this->view->headScript()->appendFile($baseUrl.'/js/colorpicker/js/colorpicker.js','text/javascript');
 
         //full-calendar-functions.js requires this variable, so that datePicker widget can be offset to server time instead of client time
         $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds");
@@ -55,10 +55,10 @@ class ScheduleController extends Zend_Controller_Action
     	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/schedule.js','text/javascript');
     	$this->view->headScript()->appendFile($baseUrl.'/js/meioMask/jquery.meio.mask.js','text/javascript');
 
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery-ui-timepicker.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery-ui-timepicker.css');
         $this->view->headLink()->appendStylesheet($baseUrl.'/css/fullcalendar.css');
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css');
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css');
         $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
 
         Application_Model_Schedule::createNewFormSections($this->view);
@@ -67,6 +67,8 @@ class ScheduleController extends Zend_Controller_Action
         $user = new Application_Model_User($userInfo->id);
         $this->view->isAdmin = $user->isAdmin();
         $this->view->isProgramManager = $user->isUserType('P');
+        
+        $this->view->headScript()->appendScript("var weekStart = ".Application_Model_Preference::GetWeekStartDay().";");
     }
 
     public function eventFeedAction()
@@ -233,9 +235,15 @@ class ScheduleController extends Zend_Controller_Action
         if ($showStartDateHelper->getTimestamp() <= $epochNow &&
                 $epochNow < $showEndDateHelper->getTimestamp() &&
                 $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
+            if ($show->isRecorded()) {
+                $menu[] = array('action' => array('type' => 'fn',
+                    'callback' => "window['confirmCancelRecordedShow']($id)"),
+                    'title' => 'Cancel Current Show');
+            } else {
                 $menu[] = array('action' => array('type' => 'fn',
                     'callback' => "window['confirmCancelShow']($id)"),
                     'title' => 'Cancel Current Show');
+            }
         }
 
         if ($epochNow < $showStartDateHelper->getTimestamp()) {
@@ -339,15 +347,15 @@ class ScheduleController extends Zend_Controller_Action
             return false;
         }
 
-		$playlists = $show->searchPlaylistsForShow($post);
-		foreach( $playlists['aaData'] as &$data){
-		    // calling two functions to format time to 1 decimal place
-            $sec = Application_Model_Playlist::playlistTimeToSeconds($data[4]);
-            $data[4] = Application_Model_Playlist::secondsToPlaylistTime($sec);
-		}
+        $playlists = $show->searchPlaylistsForShow($post);
+        foreach( $playlists['aaData'] as &$data){
+            // calling two functions to format time to 1 decimal place
+            $sec = Application_Model_Playlist::playlistTimeToSeconds($data['length']);
+            $data['length'] = Application_Model_Playlist::secondsToPlaylistTime($sec);
+        }
 
-		//for datatables
-		die(json_encode($playlists));
+        //for datatables
+        die(json_encode($playlists));
     }
 
     public function removeGroupAction()
@@ -443,7 +451,10 @@ class ScheduleController extends Zend_Controller_Action
                 "Rebroadcast of show \"$originalShowName\" from "
                 .$originalDateTime->format("l, F jS")." at ".$originalDateTime->format("G:i");
         }
-		$this->view->showContent = $show->getShowListContent();
+        $this->view->showLength = $show->getShowLength();
+        $this->view->timeFilled = $show->getTimeScheduled();
+        $this->view->percentFilled = $show->getPercentScheduled();
+        $this->view->showContent = $show->getShowListContent();
         $this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml');
         unset($this->view->showContent);
     }

airtime_mvc/application/controllers/plugins/Acl_plugin.php

@@ -110,8 +110,8 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
     {
 		$controller = strtolower($request->getControllerName());
 		
-		if ($controller == 'api'){
-
+		if (in_array($controller, array("api", "auth"))){
+            			
 			$this->setRoleName("G");	
 		} 
         else if (!Zend_Auth::getInstance()->hasIdentity()){

airtime_mvc/application/forms/AddShowRepeats.php

@@ -52,6 +52,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
 		$this->addElement('checkbox', 'add_show_no_end', array(
             'label'      => 'No End?',
             'required'   => false,
+            'checked' => true,
 		));
     }
 

airtime_mvc/application/forms/GeneralPreferences.php

@@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
 
         $defaultFade = Application_Model_Preference::GetDefaultFade();
         if($defaultFade == ""){
-            $defaultFade = '00:00:00.000000';
+            $defaultFade = '00:00:00.500000';
         }
 
         //Station name

airtime_mvc/application/forms/PasswordChange.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ */
+class Application_Form_PasswordChange extends Zend_Form
+{
+    public function init()
+    {
+        $this->addElement('password', 'password', array(
+            'label' => 'Password',
+            'required' => true,
+            'filters' => array('stringTrim'),
+            'validators' => array(
+                array('stringLength', false, array(6, 80)),
+            ),
+        ));
+
+        $this->addElement('password', 'password_confirm', array(
+            'label' => 'Password Confirmation',
+            'required' => true,
+            'filters' => array('stringTrim'),
+            'validators' => array(
+                new Zend_Validate_Callback(function ($value, $context) {
+                    return $value == $context['password'];
+                }),
+            ),
+            'errorMessages' => array("Password confirmation does not match your password."),
+        ));
+
+        $this->addElement('submit', 'submit', array(
+            'label' => 'Set password',
+            'ignore' => true,
+        ));
+    }
+}

airtime_mvc/application/forms/PasswordRestore.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ */
+class Application_Form_PasswordRestore extends Zend_Form
+{
+    public function init()
+    {
+        $this->addElement('text', 'email', array(
+            'label' => 'E-mail',
+            'required' => true,
+            'filters' => array(
+                'stringTrim',
+            ),
+        ));
+
+        $this->addElement('submit', 'submit', array(
+            'label' => 'Restore password',
+            'ignore' => true,
+            'class' => 'ui-button ui-state-default'
+        ));
+    }
+}

airtime_mvc/application/models/Auth.php

@@ -0,0 +1,101 @@
+<?php
+
+class Application_Model_Auth {
+	
+	const TOKEN_LIFETIME = 'P2D'; // DateInterval syntax
+	
+	private function generateToken($action, $user_id) 
+	{
+	   $salt = "pro";
+	   $token = self::generateRandomString();
+	   
+	   $info = new CcSubjsToken();
+	   $info->setDbUserId($user_id);
+	   $info->setDbAction($action);
+	   $info->setDbToken(sha1($token.$salt));
+	   $info->setDbCreated(gmdate('Y-m-d H:i:s'));
+	   $info->save();
+	   
+	   return $token;
+	}
+	
+	public function sendPasswordRestoreLink($user, $view)
+	{
+        $token = $this->generateToken('password.restore', $user->getDbId());
+               
+        $e_link_protocol = empty($_SERVER['HTTPS']) ? "http" : "https";
+        $e_link_base = $_SERVER['SERVER_NAME'];
+        $e_link_path = $view->url(array('user_id' => $user->getDbId(), 
+                                    'token' => $token
+                                    ), 
+                                    'password-change');
+       
+        $message = "Click this link: {$e_link_protocol}://{$e_link_base}{$e_link_path}";
+       
+	    Application_Model_Email::send('Airtime Password Reset', $message, $user->getDbEmail());
+	}
+	
+	public function invalidateTokens($user, $action)
+	{
+	   CcSubjsTokenQuery::create()
+	       ->filterByDbAction($action)
+	       ->filterByDbUserId($user->getDbId())
+	       ->delete();
+	}
+	
+    public function checkToken($user_id, $token, $action)
+    {
+    	$salt = "pro";
+    	
+        $token_info = CcSubjsTokenQuery::create()
+           ->filterByDbAction($action)
+           ->filterByDbUserId($user_id)
+           ->filterByDbToken(sha1($token.$salt))
+           ->findOne();
+
+        if (empty($token_info)) {
+            return false;
+        }
+
+        $now = new DateTime();
+        $token_life = new DateInterval(self::TOKEN_LIFETIME);
+        $token_created = new DateTime($token_info->getDbCreated(), new DateTimeZone("UTC"));
+        
+        return $now->sub($token_life)->getTimestamp() < $token_created->getTimestamp();
+    }	
+	
+    /**
+     * Gets the adapter for authentication against a database table
+     *
+     * @return object
+     */
+    public static function getAuthAdapter()
+    {
+        $dbAdapter = Zend_Db_Table::getDefaultAdapter();
+        $authAdapter = new Zend_Auth_Adapter_DbTable($dbAdapter);
+
+        $authAdapter->setTableName('cc_subjs')
+                    ->setIdentityColumn('login')
+                    ->setCredentialColumn('pass')
+                    ->setCredentialTreatment('MD5(?)');
+                    
+        return $authAdapter;
+    }
+    
+    /**
+     * Get random string
+     *
+     * @param int $length
+     * @param string $allowed_chars
+     * @return string
+     */
+    final public function generateRandomString($length = 12, $allowed_chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
+    {
+        $string = '';
+        for ($i = 0; $i < $length; $i++) {
+            $string .= $allowed_chars[mt_rand(0, strlen($allowed_chars) - 1)];
+        }
+
+        return $string;
+    }
+}

airtime_mvc/application/models/Email.php

@@ -0,0 +1,36 @@
+<?php
+
+class Application_Model_Email {
+	
+    /**
+     * Send email
+     *
+     * @param string $subject
+     * @param string $message
+     * @param mixed $tos
+     * @return void
+     */
+    public static function send($subject, $message, $tos, $from = null)
+    {
+    	/*
+        $configMail = array( 'auth' => 'login',
+                             'username' => 'user@gmail.com',
+                             'password' => 'password',
+                             'ssl' => 'ssl',
+                             'port' => 465
+        );
+        $mailTransport = new Zend_Mail_Transport_Smtp('smtp.gmail.com',$configMail);
+        */
+    	
+        $mail = new Zend_Mail('utf-8');
+        $mail->setSubject($subject);
+        $mail->setBodyText($message);
+        $mail->setFrom(isset($from) ? $from : 'naomi.aro@sourcefabric.org');
+
+        foreach ((array) $tos as $to) {
+            $mail->addTo($to);
+        }
+
+        $mail->send();
+    }
+}

airtime_mvc/application/models/MusicDir.php

@@ -40,24 +40,69 @@ class Application_Model_MusicDir {
         $this->_dir->save();
     }
 
-    public function remove()
+    public function setExistsFlag($flag){
+        $this->_dir->setExists($flag);
+        $this->_dir->save();
+    }
+    
+    public function setWatchedFlag($flag){
+        $this->_dir->setWatched($flag);
+        $this->_dir->save();
+    }
+    
+    public function getWatchedFlag(){
+        return $this->_dir->getWatched();
+    }
+    
+    public function getExistsFlag(){
+        return $this->_dir->getExists();
+    }
+    
+    /** There are 2 cases where this function can be called.
+     * 1. When watched dir was removed
+     * 2. When some dir was watched, but it was unmounted
+     * 
+     *  In case of 1, $userAddedWatchedDir should be true
+     *  In case of 2, $userAddedWatchedDir should be false
+     *  
+     *  When $userAddedWatchedDir is true, it will set "Watched" flag to false
+     *  otherwise, it will set "Exists" flag to true
+    **/ 
+    public function remove($userAddedWatchedDir=true)
     {
         global $CC_DBC;
-
+        
         $music_dir_id = $this->getId();
 
         $sql = "SELECT DISTINCT s.instance_id from cc_music_dirs as md LEFT JOIN cc_files as f on f.directory = md.id
         RIGHT JOIN cc_schedule as s on s.file_id = f.id WHERE md.id = $music_dir_id";
 
         $show_instances = $CC_DBC->GetAll($sql);
-
-        $this->_dir->delete();
-
+        
+        // get all the files on this dir
+        $sql = "SELECT f.id FROM cc_music_dirs as md LEFT JOIN cc_files as f on f.directory = md.id WHERE md.id = $music_dir_id";
+        $files = $CC_DBC->GetAll($sql);
+        
+        // set file_exist flag to false
+        foreach( $files as $file_row ){
+            $temp_file = Application_Model_StoredFile::Recall($file_row['id']);
+            if($temp_file != null){
+                $temp_file->setFileExistsFlag(false);
+            }
+        }
+        
+        // set RemovedFlag to true
+        if($userAddedWatchedDir){
+            self::setWatchedFlag(false);
+        }else{
+            self::setExistsFlag(false);
+        }
+        //$res = $this->_dir->delete();
+        
         foreach ($show_instances as $show_instance_row) {
             $temp_show = new Application_Model_ShowInstance($show_instance_row["instance_id"]);
             $temp_show->updateScheduledTime();
         }
-
         Application_Model_RabbitMq::PushSchedule();
     }
 
@@ -93,7 +138,7 @@ class Application_Model_MusicDir {
     public static function isPathValid($p_path){
         $dirs = self::getWatchedDirs();
         $dirs[] = self::getStorDir();
-
+        
         foreach ($dirs as $dirObj){
             $dir = $dirObj->getDirectory();
             $diff = strlen($dir) - strlen($p_path);
@@ -113,12 +158,37 @@ class Application_Model_MusicDir {
         }
     }
 
-    public static function addDir($p_path, $p_type)
+    /** There are 2 cases where this function can be called.
+     * 1. When watched dir was added
+     * 2. When some dir was watched, but it was unmounted somehow, but gets mounted again
+     * 
+     *  In case of 1, $userAddedWatchedDir should be true
+     *  In case of 2, $userAddedWatchedDir should be false
+     *  
+     *  When $userAddedWatchedDir is true, it will set "Removed" flag to false
+     *  otherwise, it will set "Exists" flag to true
+     *  
+     *  @param $nestedWatch - if true, bypass path check, and Watched to false
+    **/ 
+    public static function addDir($p_path, $p_type, $userAddedWatchedDir=true, $nestedWatch=false)
     {
         if(!is_dir($p_path)){
             return array("code"=>2, "error"=>"'$p_path' is not a valid directory.");
         }
-        $dir = new CcMusicDirs();
+        $real_path = realpath($p_path)."/";
+        if($real_path != "/"){
+            $p_path = $real_path;
+        }
+        
+        $exist_dir = self::getDirByPath($p_path);
+        
+        if( $exist_dir == NULL ){
+            $temp_dir = new CcMusicDirs();
+            $dir = new Application_Model_MusicDir($temp_dir);
+        }else{
+            $dir = $exist_dir;
+        }
+        
         $dir->setType($p_type);
         $p_path = realpath($p_path)."/";
 
@@ -126,10 +196,19 @@ class Application_Model_MusicDir {
         try {
             /* isPathValid() checks if path is a substring or a superstring of an
              * existing dir and if not, throws NestedDirectoryException */
-            self::isPathValid($p_path);
+            if(!$nestedWatch){
+                self::isPathValid($p_path);
+            }
+            if($userAddedWatchedDir){
+                $dir->setWatchedFlag(true);
+            }else{
+                if($nestedWatch){
+                    $dir->setWatchedFlag(false);
+                }
+                $dir->setExistsFlag(true);
+            }
             $dir->setDirectory($p_path);
-
-            $dir->save();
+            
             return array("code"=>0);
         } catch (NestedDirectoryException $nde){
             $msg = $nde->getMessage();
@@ -140,9 +219,20 @@ class Application_Model_MusicDir {
 
     }
 
-    public static function addWatchedDir($p_path)
+    /** There are 2 cases where this function can be called.
+     * 1. When watched dir was added
+     * 2. When some dir was watched, but it was unmounted somehow, but gets mounted again
+     * 
+     *  In case of 1, $userAddedWatchedDir should be true
+     *  In case of 2, $userAddedWatchedDir should be false
+     *  
+     *  When $userAddedWatchedDir is true, it will set "Watched" flag to true
+     *  otherwise, it will set "Exists" flag to true
+    **/ 
+    public static function addWatchedDir($p_path, $userAddedWatchedDir=true, $nestedWatch=false)
     {
-        $res = self::addDir($p_path, "watched");
+        $res = self::addDir($p_path, "watched", $userAddedWatchedDir, $nestedWatch);
+        
         if ($res['code'] == 0){
 
             //convert "linked" files (Airtime <= 1.8.2) to watched files.
@@ -203,7 +293,6 @@ class Application_Model_MusicDir {
         $dir = CcMusicDirsQuery::create()
                     ->filterByDirectory($p_path)
                     ->findOne();
-
         if($dir == NULL){
             return null;
         }
@@ -212,14 +301,26 @@ class Application_Model_MusicDir {
             return $mus_dir;
         }
     }
-
-    public static function getWatchedDirs()
+    
+    /**
+     * Search and returns watched dirs
+     * 
+     * @param $exists search condition with exists flag
+     * @param $watched search condition with watched flag
+     */
+    public static function getWatchedDirs($exists=true, $watched=true)
     {
         $result = array();
 
         $dirs = CcMusicDirsQuery::create()
-                    ->filterByType("watched")
-                    ->find();
+                    ->filterByType("watched");
+        if($exists !== null){
+            $dirs = $dirs->filterByExists($exists);
+        }
+        if($watched !== null){
+            $dirs = $dirs->filterByWatched($watched);
+        }
+         $dirs = $dirs->find();
 
         foreach($dirs as $dir) {
             $result[] = new Application_Model_MusicDir($dir);
@@ -248,7 +349,6 @@ class Application_Model_MusicDir {
         }
         $dir = self::getStorDir();
         // if $p_dir doesn't exist in DB
-        $p_dir = realpath($p_dir)."/";
         $exist = $dir->getDirByPath($p_dir);
         if($exist == NULL){
             $dir->setDirectory($p_dir);
@@ -267,6 +367,7 @@ class Application_Model_MusicDir {
     {
         $dirs = CcMusicDirsQuery::create()
                     ->filterByType(array("watched", "stor"))
+                    ->filterByExists(true)
                     ->find();
 
         foreach($dirs as $dir) {
@@ -280,7 +381,17 @@ class Application_Model_MusicDir {
         return null;
     }
 
-    public static function removeWatchedDir($p_dir){
+    /** There are 2 cases where this function can be called.
+     * 1. When watched dir was removed
+     * 2. When some dir was watched, but it was unmounted
+     * 
+     *  In case of 1, $userAddedWatchedDir should be true
+     *  In case of 2, $userAddedWatchedDir should be false
+     *  
+     *  When $userAddedWatchedDir is true, it will set "Watched" flag to false
+     *  otherwise, it will set "Exists" flag to true
+    **/ 
+    public static function removeWatchedDir($p_dir, $userAddedWatchedDir=true){
         $real_path = realpath($p_dir)."/";
         if($real_path != "/"){
             $p_dir = $real_path;
@@ -289,7 +400,7 @@ class Application_Model_MusicDir {
         if($dir == NULL){
             return array("code"=>1,"error"=>"'$p_dir' doesn't exist in the watched list.");
         }else{
-            $dir->remove();
+            $dir->remove($userAddedWatchedDir);
             $data = array();
             $data["directory"] = $p_dir;
             Application_Model_RabbitMq::SendMessageToMediaMonitor("remove_watch", $data);
@@ -300,7 +411,7 @@ class Application_Model_MusicDir {
     public static function splitFilePath($p_filepath)
     {
         $mus_dir = self::getWatchedDirFromFilepath($p_filepath);
-
+        
         if(is_null($mus_dir)) {
             return null;
         }
@@ -308,7 +419,7 @@ class Application_Model_MusicDir {
         $length_dir = strlen($mus_dir->getDirectory());
         $fp = substr($p_filepath, $length_dir);
 
-        return array($mus_dir->getDirectory(), $fp);
+        return array($mus_dir->getDirectory(), trim($fp));
     }
 
 }

airtime_mvc/application/models/Nowplaying.php

@@ -23,8 +23,9 @@ class Application_Model_Nowplaying
             $showEnds = $showEndDateTime->format("Y-m-d H:i:s");
             $itemStarts = $itemStartDateTime->format("Y-m-d H:i:s");
             $itemEnds = $itemEndDateTime->format("Y-m-d H:i:s");
-        
-            $status = ($dbRow['show_ends'] < $dbRow['item_ends']) ? "x" : "";
+            
+            // Allow show to exceed 1 second per CC-3183
+            $status = ($showEnds < $itemEnds) ? "x" : "";
             
             $type = "a";
             $type .= ($itemStartDateTime->getTimestamp() <= $epochNow 

airtime_mvc/application/models/Playlist.php

@@ -443,7 +443,8 @@ class Application_Model_Playlist {
     	$pl = new CcPlaylist();
     	$pl->setDbName($this->name);
     	$pl->setDbState("incomplete");
-    	$pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC")));
+    	$pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
+        $pl->setDbUtime(new DateTime("now"), new DateTimeZone("UTC"));
     	$pl->save();
 
     	$this->id = $pl->getDbId();
@@ -534,6 +535,10 @@ class Application_Model_Playlist {
 
         $res = $this->insertPlaylistElement($this->id, $p_mediaId, $p_position, $p_cliplength, $p_cuein, $p_cueout, $p_fadeIn, $p_fadeOut);
 
+        $pl = CcPlaylistQuery::create()->findPK($this->id);
+        $pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
+        $pl->save();
+        
         return TRUE;
     }
 
@@ -559,6 +564,11 @@ class Application_Model_Playlist {
             return FALSE;
 
         $row->delete();
+        
+        $pl = CcPlaylistQuery::create()->findPK($this->id);
+        $pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
+        $pl->save();
+        
         return $row;
     }
 
@@ -584,6 +594,10 @@ class Application_Model_Playlist {
         if($res !== TRUE)
             return FALSE;
 
+        $pl = CcPlaylistQuery::create()->findPK($this->id);
+        $pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
+        $pl->save();
+        
         return TRUE;
     }
 

airtime_mvc/application/models/StoredFile.php

@@ -90,6 +90,9 @@ class Application_Model_StoredFile {
             }
             $this->setDbColMetadata($dbMd);
         }
+        
+        $this->_file->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
+        $this->_file->save();
     }
 
     /**
@@ -120,6 +123,7 @@ class Application_Model_StoredFile {
             }
         }
 
+        $this->_file->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
         $this->_file->save();
     }
 
@@ -310,8 +314,13 @@ class Application_Model_StoredFile {
             }
         }
 
-        Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
-        $this->_file->delete();
+        // don't delete from the playslist. We might want to put a flag
+        //Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
+        
+        // set file_exists falg to false
+        $this->_file->setDbFileExists(false);
+        $this->_file->save();
+        //$this->_file->delete();
 
         if (isset($res)) {
             return $res;
@@ -426,6 +435,7 @@ class Application_Model_StoredFile {
     public function setFilePath($p_filepath)
     {
         $path_info = Application_Model_MusicDir::splitFilePath($p_filepath);
+        
         if (is_null($path_info)) {
             return -1;
         }
@@ -488,12 +498,16 @@ class Application_Model_StoredFile {
     {
         $file = new CcFiles();
         $file->setDbGunid(md5(uniqid("", true)));
+        $file->setDbUtime(new DateTime("now"), new DateTimeZone("UTC"));
+        $file->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
 
         $storedFile = new Application_Model_StoredFile();
         $storedFile->_file = $file;
 
         if(isset($md['MDATA_KEY_FILEPATH'])) {
-            $res = $storedFile->setFilePath($md['MDATA_KEY_FILEPATH']);
+            // removed "//" in the path. Always use '/' for path separator 
+            $filepath = str_replace("//", "/", $md['MDATA_KEY_FILEPATH']);
+            $res = $storedFile->setFilePath($filepath);
             if ($res === -1) {
                 return null;
             }
@@ -628,50 +642,63 @@ class Application_Model_StoredFile {
         return $res;
     }
 
-	public static function searchFilesForPlaylistBuilder($datatables) {
-		global $CC_CONFIG;
+    public static function searchFilesForPlaylistBuilder($datatables)
+    {
+        global $CC_CONFIG;
 
-		$displayData = array("track_title", "artist_name", "album_title", "genre", "length", "ftype");
+        $displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype");
 
-		$plSelect = "SELECT ";
+        $plSelect = "SELECT ";
         $fileSelect = "SELECT ";
-        foreach ($displayData as $key){
+        foreach ($displayData as $key) {
 
-            if($key === "track_title"){
+            if ($key === "track_title") {
                 $plSelect .= "name AS ".$key.", ";
                 $fileSelect .= $key.", ";
-            }
-			else if ($key === "ftype"){
+            } else if ($key === "ftype") {
                 $plSelect .= "'playlist' AS ".$key.", ";
                 $fileSelect .= $key.", ";
-            }
-            else if ($key === "artist_name"){
+            } else if ($key === "artist_name") {
                 $plSelect .= "creator AS ".$key.", ";
                 $fileSelect .= $key.", ";
-            }
-            else if ($key === "length"){
+            } else if ($key === "length") {
                 $plSelect .= $key.", ";
                 $fileSelect .= $key.", ";
-            }
-            else {
+            } else if ($key === "year") {
+                $plSelect .= "CAST(utime AS varchar) AS ".$key.", ";
+                $fileSelect .= $key.", ";
+            } else if ($key === "utime") {
+                $plSelect .= $key.", ";
+                $fileSelect .= $key.", ";
+            } else if ($key === "mtime") {
+                $plSelect .= $key.", ";
+                $fileSelect .= $key.", ";
+            } else {
                 $plSelect .= "NULL AS ".$key.", ";
                 $fileSelect .= $key.", ";
             }
         }
 
-		$fromTable = " ((".$plSelect."PL.id
-		    FROM ".$CC_CONFIG["playListTable"]." AS PL
-			LEFT JOIN ".$CC_CONFIG['playListTimeView']." AS PLT USING(id))
+        $fromTable = " ((".$plSelect."PL.id
+            FROM ".$CC_CONFIG["playListTable"]." AS PL
+                LEFT JOIN ".$CC_CONFIG['playListTimeView']." AS PLT USING(id))
+            UNION
+            (".$fileSelect."id FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS";
+        
+        $results = Application_Model_StoredFile::searchFiles($fromTable, $datatables);
+        foreach($results['aaData'] as &$row){
+            // add checkbox row
+            $row['checkbox'] = "<input type='checkbox' name='cb_".$row['id']."'>";
 
-		    UNION
+            // a full timestamp is being returned for playlists' year column;
+            // split it and grab only the year info
+            $yearSplit = explode('-', $row['year']);
+            $row['year'] = $yearSplit[0];
+        }
+        return $results;
+    }
 
-		    (".$fileSelect."id FROM ".$CC_CONFIG["filesTable"]." AS FILES)) AS RESULTS";
-
-		return Application_Model_StoredFile::searchFiles($fromTable, $datatables);
-
-	}
-
-	public static function searchPlaylistsForSchedule($datatables)
+    public static function searchPlaylistsForSchedule($datatables)
     {
 		$fromTable = "cc_playlist AS pl LEFT JOIN cc_playlisttimes AS plt USING(id) LEFT JOIN cc_subjs AS sub ON pl.editedby = sub.id";
         //$datatables["optWhere"][] = "INTERVAL '{$time_remaining}' > INTERVAL '00:00:00'";
@@ -690,7 +717,12 @@ class Application_Model_StoredFile {
 			$searchTerms = explode(" ", $data["sSearch"]);
 
 		$selectorCount = "SELECT COUNT(*)";
-		$selectorRows = "SELECT ". join("," , $columnsDisplayed);
+		foreach( $columnsDisplayed as $key=>$col){
+		  if($col == ''){
+		      unset($columnsDisplayed[$key]);
+		  }
+		}
+		$selectorRows = "SELECT " . join(',', $columnsDisplayed );
 
         $sql = $selectorCount." FROM ".$fromTable;
 		$totalRows = $CC_DBC->getOne($sql);
@@ -732,9 +764,6 @@ class Application_Model_StoredFile {
 		$orderby = join("," , $orderby);
 		// End Order By clause
 
-		//ordered by integer as expected by datatables.
-		$CC_DBC->setFetchMode(DB_FETCHMODE_ORDERED);
-
 		if(isset($where)) {
 			$where = join(" AND ", $where);
 			$sql = $selectorCount." FROM ".$fromTable." WHERE ".$where;
@@ -744,14 +773,9 @@ class Application_Model_StoredFile {
 		else {
 			$sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"];
 		}
-
+		
 		$results = $CC_DBC->getAll($sql);
-		//echo $results;
-		//echo $sql;
-
-		//put back to default fetch mode.
-		$CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
-
+                
 		if(!isset($totalDisplayRows)) {
 			$totalDisplayRows = $totalRows;
 		}
@@ -895,24 +919,34 @@ class Application_Model_StoredFile {
         return $CC_DBC->GetOne($sql);
     }
 
-    public static function listAllFiles($dir_id){
+    /**
+     * 
+     * Enter description here ...
+     * @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){
         global $CC_DBC;
-
-        // $sql = "SELECT m.directory || '/' || f.filepath as fp"
-                // ." FROM CC_MUSIC_DIRS m"
-                // ." LEFT JOIN CC_FILES f"
-                // ." ON m.id = f.directory"
-                // ." WHERE m.id = f.directory"
-                // ." AND m.id = $dir_id";
-        $sql = "SELECT filepath as fp"
-                ." FROM CC_FILES"
-                ." WHERE directory = $dir_id";
-
+        
+        if($propelObj){
+            $sql = "SELECT m.directory || f.filepath as fp"
+                    ." FROM CC_MUSIC_DIRS m"
+                    ." LEFT JOIN CC_FILES f"
+                    ." ON m.id = f.directory WHERE m.id = $dir_id and f.file_exists = 'TRUE'";
+        }else{
+            $sql = "SELECT filepath as fp"
+                    ." FROM CC_FILES"
+                    ." WHERE directory = $dir_id and file_exists = 'TRUE'";
+        }
         $rows = $CC_DBC->getAll($sql);
 
         $results = array();
         foreach ($rows as $row){
-            $results[] = $row["fp"];
+            if($propelObj){
+                $results[] = Application_Model_StoredFile::RecallByFilepath($row["fp"]);
+            }else{
+                $results[] = $row["fp"];
+            }
         }
 
         return $results;
@@ -955,6 +989,15 @@ class Application_Model_StoredFile {
     public function getSoundCloudErrorMsg(){
         return $this->_file->getDbSoundCloudErrorMsg();
     }
+    
+    public function setFileExistsFlag($flag){
+        $this->_file->setDbFileExists($flag)
+            ->save();
+    }
+    
+    public function getFileExistsFlag(){
+        return $this->_file->getDbFileExists();
+    }
 
     public function uploadToSoundCloud()
     {

airtime_mvc/application/models/User.php

@@ -236,8 +236,10 @@ class Application_Model_User {
         
         // mark record which is for the current user
         foreach($res['aaData'] as &$record){
-            if($record[1] == $username){
-                $record[5] = "self";
+            if($record['login'] == $username){
+                $record['delete'] = "self";
+            } else {
+                $record['delete'] = "";
             }
         }
         

airtime_mvc/application/models/airtime/CcSubjsToken.php

@@ -0,0 +1,18 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for representing a row from the 'cc_subjs_token' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.airtime
+ */
+class CcSubjsToken extends BaseCcSubjsToken {
+
+} // CcSubjsToken

airtime_mvc/application/models/airtime/CcSubjsTokenPeer.php

@@ -0,0 +1,18 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'cc_subjs_token' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.airtime
+ */
+class CcSubjsTokenPeer extends BaseCcSubjsTokenPeer {
+
+} // CcSubjsTokenPeer

airtime_mvc/application/models/airtime/CcSubjsTokenQuery.php

@@ -0,0 +1,18 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'cc_subjs_token' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.airtime
+ */
+class CcSubjsTokenQuery extends BaseCcSubjsTokenQuery {
+
+} // CcSubjsTokenQuery

airtime_mvc/application/models/airtime/map/CcFilesTableMap.php

@@ -49,6 +49,8 @@ class CcFilesTableMap extends TableMap {
 		$this->addColumn('CURRENTLYACCESSING', 'DbCurrentlyaccessing', 'INTEGER', true, null, 0);
 		$this->addForeignKey('EDITEDBY', 'DbEditedby', 'INTEGER', 'cc_subjs', 'ID', false, null, null);
 		$this->addColumn('MTIME', 'DbMtime', 'TIMESTAMP', false, 6, null);
+		$this->addColumn('UTIME', 'DbUtime', 'TIMESTAMP', false, 6, null);
+		$this->addColumn('LPTIME', 'DbLPtime', 'TIMESTAMP', false, 6, null);
 		$this->addColumn('MD5', 'DbMd5', 'CHAR', false, 32, null);
 		$this->addColumn('TRACK_TITLE', 'DbTrackTitle', 'VARCHAR', false, 512, null);
 		$this->addColumn('ARTIST_NAME', 'DbArtistName', 'VARCHAR', false, 512, null);
@@ -93,6 +95,7 @@ class CcFilesTableMap extends TableMap {
 		$this->addColumn('SUBJECT', 'DbSubject', 'VARCHAR', false, 512, null);
 		$this->addColumn('CONTRIBUTOR', 'DbContributor', 'VARCHAR', false, 512, null);
 		$this->addColumn('LANGUAGE', 'DbLanguage', 'VARCHAR', false, 512, null);
+		$this->addColumn('FILE_EXISTS', 'DbFileExists', 'BOOLEAN', false, null, true);
 		$this->addColumn('SOUNDCLOUD_ID', 'DbSoundcloudId', 'INTEGER', false, null, null);
 		$this->addColumn('SOUNDCLOUD_ERROR_CODE', 'DbSoundcloudErrorCode', 'INTEGER', false, null, null);
 		$this->addColumn('SOUNDCLOUD_ERROR_MSG', 'DbSoundcloudErrorMsg', 'VARCHAR', false, 512, null);
@@ -106,7 +109,7 @@ class CcFilesTableMap extends TableMap {
 	public function buildRelations()
 	{
     $this->addRelation('CcSubjs', 'CcSubjs', RelationMap::MANY_TO_ONE, array('editedby' => 'id', ), null, null);
-    $this->addRelation('CcMusicDirs', 'CcMusicDirs', RelationMap::MANY_TO_ONE, array('directory' => 'id', ), 'CASCADE', null);
+    $this->addRelation('CcMusicDirs', 'CcMusicDirs', RelationMap::MANY_TO_ONE, array('directory' => 'id', ), null, null);
     $this->addRelation('CcShowInstances', 'CcShowInstances', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null);
     $this->addRelation('CcPlaylistcontents', 'CcPlaylistcontents', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null);
     $this->addRelation('CcSchedule', 'CcSchedule', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null);

airtime_mvc/application/models/airtime/map/CcMusicDirsTableMap.php

@@ -41,6 +41,8 @@ class CcMusicDirsTableMap extends TableMap {
 		$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
 		$this->addColumn('DIRECTORY', 'Directory', 'LONGVARCHAR', false, null, null);
 		$this->addColumn('TYPE', 'Type', 'VARCHAR', false, 255, null);
+		$this->addColumn('EXISTS', 'Exists', 'BOOLEAN', false, null, true);
+		$this->addColumn('WATCHED', 'Watched', 'BOOLEAN', false, null, true);
 		// validators
 	} // initialize()
 
@@ -49,7 +51,7 @@ class CcMusicDirsTableMap extends TableMap {
 	 */
 	public function buildRelations()
 	{
-    $this->addRelation('CcFiles', 'CcFiles', RelationMap::ONE_TO_MANY, array('id' => 'directory', ), 'CASCADE', null);
+    $this->addRelation('CcFiles', 'CcFiles', RelationMap::ONE_TO_MANY, array('id' => 'directory', ), null, null);
 	} // buildRelations()
 
 } // CcMusicDirsTableMap

airtime_mvc/application/models/airtime/map/CcPlaylistTableMap.php

@@ -44,6 +44,8 @@ class CcPlaylistTableMap extends TableMap {
 		$this->addColumn('CURRENTLYACCESSING', 'DbCurrentlyaccessing', 'INTEGER', true, null, 0);
 		$this->addForeignKey('EDITEDBY', 'DbEditedby', 'INTEGER', 'cc_subjs', 'ID', false, null, null);
 		$this->addColumn('MTIME', 'DbMtime', 'TIMESTAMP', false, 6, null);
+		$this->addColumn('UTIME', 'DbUtime', 'TIMESTAMP', false, 6, null);
+		$this->addColumn('LPTIME', 'DbLPtime', 'TIMESTAMP', false, 6, null);
 		$this->addColumn('CREATOR', 'DbCreator', 'VARCHAR', false, 32, null);
 		$this->addColumn('DESCRIPTION', 'DbDescription', 'VARCHAR', false, 512, null);
 		// validators

airtime_mvc/application/models/airtime/map/CcSubjsTableMap.php

@@ -65,6 +65,7 @@ class CcSubjsTableMap extends TableMap {
     $this->addRelation('CcPlaylist', 'CcPlaylist', RelationMap::ONE_TO_MANY, array('id' => 'editedby', ), null, null);
     $this->addRelation('CcPref', 'CcPref', RelationMap::ONE_TO_MANY, array('id' => 'subjid', ), 'CASCADE', null);
     $this->addRelation('CcSess', 'CcSess', RelationMap::ONE_TO_MANY, array('id' => 'userid', ), 'CASCADE', null);
+    $this->addRelation('CcSubjsToken', 'CcSubjsToken', RelationMap::ONE_TO_MANY, array('id' => 'user_id', ), 'CASCADE', null);
 	} // buildRelations()
 
 } // CcSubjsTableMap

airtime_mvc/application/models/airtime/map/CcSubjsTokenTableMap.php

@@ -0,0 +1,57 @@
+<?php
+
+
+
+/**
+ * This class defines the structure of the 'cc_subjs_token' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package    propel.generator.airtime.map
+ */
+class CcSubjsTokenTableMap extends TableMap {
+
+	/**
+	 * The (dot-path) name of this class
+	 */
+	const CLASS_NAME = 'airtime.map.CcSubjsTokenTableMap';
+
+	/**
+	 * Initialize the table attributes, columns and validators
+	 * Relations are not initialized by this method since they are lazy loaded
+	 *
+	 * @return     void
+	 * @throws     PropelException
+	 */
+	public function initialize()
+	{
+	  // attributes
+		$this->setName('cc_subjs_token');
+		$this->setPhpName('CcSubjsToken');
+		$this->setClassname('CcSubjsToken');
+		$this->setPackage('airtime');
+		$this->setUseIdGenerator(true);
+		$this->setPrimaryKeyMethodInfo('cc_subjs_token_id_seq');
+		// columns
+		$this->addPrimaryKey('ID', 'DbId', 'INTEGER', true, null, null);
+		$this->addForeignKey('USER_ID', 'DbUserId', 'INTEGER', 'cc_subjs', 'ID', true, null, null);
+		$this->addColumn('ACTION', 'DbAction', 'VARCHAR', true, 255, null);
+		$this->addColumn('TOKEN', 'DbToken', 'VARCHAR', true, 40, null);
+		$this->addColumn('CREATED', 'DbCreated', 'TIMESTAMP', true, null, null);
+		// validators
+	} // initialize()
+
+	/**
+	 * Build the RelationMap objects for this table relationships
+	 */
+	public function buildRelations()
+	{
+    $this->addRelation('CcSubjs', 'CcSubjs', RelationMap::MANY_TO_ONE, array('user_id' => 'id', ), 'CASCADE', null);
+	} // buildRelations()
+
+} // CcSubjsTokenTableMap

airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php

@@ -26,7 +26,7 @@ abstract class BaseCcFilesPeer {
 	const TM_CLASS = 'CcFilesTableMap';
 	
 	/** The total number of columns. */
-	const NUM_COLUMNS = 59;
+	const NUM_COLUMNS = 62;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -64,6 +64,12 @@ abstract class BaseCcFilesPeer {
 	/** the column name for the MTIME field */
 	const MTIME = 'cc_files.MTIME';
 
+	/** the column name for the UTIME field */
+	const UTIME = 'cc_files.UTIME';
+
+	/** the column name for the LPTIME field */
+	const LPTIME = 'cc_files.LPTIME';
+
 	/** the column name for the MD5 field */
 	const MD5 = 'cc_files.MD5';
 
@@ -196,6 +202,9 @@ abstract class BaseCcFilesPeer {
 	/** the column name for the LANGUAGE field */
 	const LANGUAGE = 'cc_files.LANGUAGE';
 
+	/** the column name for the FILE_EXISTS field */
+	const FILE_EXISTS = 'cc_files.FILE_EXISTS';
+
 	/** the column name for the SOUNDCLOUD_ID field */
 	const SOUNDCLOUD_ID = 'cc_files.SOUNDCLOUD_ID';
 
@@ -224,12 +233,12 @@ abstract class BaseCcFilesPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbGunid', 'DbName', 'DbMime', 'DbFtype', 'DbDirectory', 'DbFilepath', 'DbState', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbMd5', 'DbTrackTitle', 'DbArtistName', 'DbBitRate', 'DbSampleRate', 'DbFormat', 'DbLength', 'DbAlbumTitle', 'DbGenre', 'DbComments', 'DbYear', 'DbTrackNumber', 'DbChannels', 'DbUrl', 'DbBpm', 'DbRating', 'DbEncodedBy', 'DbDiscNumber', 'DbMood', 'DbLabel', 'DbComposer', 'DbEncoder', 'DbChecksum', 'DbLyrics', 'DbOrchestra', 'DbConductor', 'DbLyricist', 'DbOriginalLyricist', 'DbRadioStationName', 'DbInfoUrl', 'DbArtistUrl', 'DbAudioSourceUrl', 'DbRadioStationUrl', 'DbBuyThisUrl', 'DbIsrcNumber', 'DbCatalogNumber', 'DbOriginalArtist', 'DbCopyright', 'DbReportDatetime', 'DbReportLocation', 'DbReportOrganization', 'DbSubject', 'DbContributor', 'DbLanguage', 'DbSoundcloudId', 'DbSoundcloudErrorCode', 'DbSoundcloudErrorMsg', 'DbSoundcloudLinkToFile', ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbGunid', 'dbName', 'dbMime', 'dbFtype', 'dbDirectory', 'dbFilepath', 'dbState', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbMd5', 'dbTrackTitle', 'dbArtistName', 'dbBitRate', 'dbSampleRate', 'dbFormat', 'dbLength', 'dbAlbumTitle', 'dbGenre', 'dbComments', 'dbYear', 'dbTrackNumber', 'dbChannels', 'dbUrl', 'dbBpm', 'dbRating', 'dbEncodedBy', 'dbDiscNumber', 'dbMood', 'dbLabel', 'dbComposer', 'dbEncoder', 'dbChecksum', 'dbLyrics', 'dbOrchestra', 'dbConductor', 'dbLyricist', 'dbOriginalLyricist', 'dbRadioStationName', 'dbInfoUrl', 'dbArtistUrl', 'dbAudioSourceUrl', 'dbRadioStationUrl', 'dbBuyThisUrl', 'dbIsrcNumber', 'dbCatalogNumber', 'dbOriginalArtist', 'dbCopyright', 'dbReportDatetime', 'dbReportLocation', 'dbReportOrganization', 'dbSubject', 'dbContributor', 'dbLanguage', 'dbSoundcloudId', 'dbSoundcloudErrorCode', 'dbSoundcloudErrorMsg', 'dbSoundcloudLinkToFile', ),
-		BasePeer::TYPE_COLNAME => array (self::ID, self::GUNID, self::NAME, self::MIME, self::FTYPE, self::DIRECTORY, self::FILEPATH, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::MD5, self::TRACK_TITLE, self::ARTIST_NAME, self::BIT_RATE, self::SAMPLE_RATE, self::FORMAT, self::LENGTH, self::ALBUM_TITLE, self::GENRE, self::COMMENTS, self::YEAR, self::TRACK_NUMBER, self::CHANNELS, self::URL, self::BPM, self::RATING, self::ENCODED_BY, self::DISC_NUMBER, self::MOOD, self::LABEL, self::COMPOSER, self::ENCODER, self::CHECKSUM, self::LYRICS, self::ORCHESTRA, self::CONDUCTOR, self::LYRICIST, self::ORIGINAL_LYRICIST, self::RADIO_STATION_NAME, self::INFO_URL, self::ARTIST_URL, self::AUDIO_SOURCE_URL, self::RADIO_STATION_URL, self::BUY_THIS_URL, self::ISRC_NUMBER, self::CATALOG_NUMBER, self::ORIGINAL_ARTIST, self::COPYRIGHT, self::REPORT_DATETIME, self::REPORT_LOCATION, self::REPORT_ORGANIZATION, self::SUBJECT, self::CONTRIBUTOR, self::LANGUAGE, self::SOUNDCLOUD_ID, self::SOUNDCLOUD_ERROR_CODE, self::SOUNDCLOUD_ERROR_MSG, self::SOUNDCLOUD_LINK_TO_FILE, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'GUNID', 'NAME', 'MIME', 'FTYPE', 'DIRECTORY', 'FILEPATH', 'STATE', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'MD5', 'TRACK_TITLE', 'ARTIST_NAME', 'BIT_RATE', 'SAMPLE_RATE', 'FORMAT', 'LENGTH', 'ALBUM_TITLE', 'GENRE', 'COMMENTS', 'YEAR', 'TRACK_NUMBER', 'CHANNELS', 'URL', 'BPM', 'RATING', 'ENCODED_BY', 'DISC_NUMBER', 'MOOD', 'LABEL', 'COMPOSER', 'ENCODER', 'CHECKSUM', 'LYRICS', 'ORCHESTRA', 'CONDUCTOR', 'LYRICIST', 'ORIGINAL_LYRICIST', 'RADIO_STATION_NAME', 'INFO_URL', 'ARTIST_URL', 'AUDIO_SOURCE_URL', 'RADIO_STATION_URL', 'BUY_THIS_URL', 'ISRC_NUMBER', 'CATALOG_NUMBER', 'ORIGINAL_ARTIST', 'COPYRIGHT', 'REPORT_DATETIME', 'REPORT_LOCATION', 'REPORT_ORGANIZATION', 'SUBJECT', 'CONTRIBUTOR', 'LANGUAGE', 'SOUNDCLOUD_ID', 'SOUNDCLOUD_ERROR_CODE', 'SOUNDCLOUD_ERROR_MSG', 'SOUNDCLOUD_LINK_TO_FILE', ),
-		BasePeer::TYPE_FIELDNAME => array ('id', 'gunid', 'name', 'mime', 'ftype', 'directory', 'filepath', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'md5', 'track_title', 'artist_name', 'bit_rate', 'sample_rate', 'format', 'length', 'album_title', 'genre', 'comments', 'year', 'track_number', 'channels', 'url', 'bpm', 'rating', 'encoded_by', 'disc_number', 'mood', 'label', 'composer', 'encoder', 'checksum', 'lyrics', 'orchestra', 'conductor', 'lyricist', 'original_lyricist', 'radio_station_name', 'info_url', 'artist_url', 'audio_source_url', 'radio_station_url', 'buy_this_url', 'isrc_number', 'catalog_number', 'original_artist', 'copyright', 'report_datetime', 'report_location', 'report_organization', 'subject', 'contributor', 'language', 'soundcloud_id', 'soundcloud_error_code', 'soundcloud_error_msg', 'soundcloud_link_to_file', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, )
+		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbGunid', 'DbName', 'DbMime', 'DbFtype', 'DbDirectory', 'DbFilepath', 'DbState', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbUtime', 'DbLPtime', 'DbMd5', 'DbTrackTitle', 'DbArtistName', 'DbBitRate', 'DbSampleRate', 'DbFormat', 'DbLength', 'DbAlbumTitle', 'DbGenre', 'DbComments', 'DbYear', 'DbTrackNumber', 'DbChannels', 'DbUrl', 'DbBpm', 'DbRating', 'DbEncodedBy', 'DbDiscNumber', 'DbMood', 'DbLabel', 'DbComposer', 'DbEncoder', 'DbChecksum', 'DbLyrics', 'DbOrchestra', 'DbConductor', 'DbLyricist', 'DbOriginalLyricist', 'DbRadioStationName', 'DbInfoUrl', 'DbArtistUrl', 'DbAudioSourceUrl', 'DbRadioStationUrl', 'DbBuyThisUrl', 'DbIsrcNumber', 'DbCatalogNumber', 'DbOriginalArtist', 'DbCopyright', 'DbReportDatetime', 'DbReportLocation', 'DbReportOrganization', 'DbSubject', 'DbContributor', 'DbLanguage', 'DbFileExists', 'DbSoundcloudId', 'DbSoundcloudErrorCode', 'DbSoundcloudErrorMsg', 'DbSoundcloudLinkToFile', ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbGunid', 'dbName', 'dbMime', 'dbFtype', 'dbDirectory', 'dbFilepath', 'dbState', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbUtime', 'dbLPtime', 'dbMd5', 'dbTrackTitle', 'dbArtistName', 'dbBitRate', 'dbSampleRate', 'dbFormat', 'dbLength', 'dbAlbumTitle', 'dbGenre', 'dbComments', 'dbYear', 'dbTrackNumber', 'dbChannels', 'dbUrl', 'dbBpm', 'dbRating', 'dbEncodedBy', 'dbDiscNumber', 'dbMood', 'dbLabel', 'dbComposer', 'dbEncoder', 'dbChecksum', 'dbLyrics', 'dbOrchestra', 'dbConductor', 'dbLyricist', 'dbOriginalLyricist', 'dbRadioStationName', 'dbInfoUrl', 'dbArtistUrl', 'dbAudioSourceUrl', 'dbRadioStationUrl', 'dbBuyThisUrl', 'dbIsrcNumber', 'dbCatalogNumber', 'dbOriginalArtist', 'dbCopyright', 'dbReportDatetime', 'dbReportLocation', 'dbReportOrganization', 'dbSubject', 'dbContributor', 'dbLanguage', 'dbFileExists', 'dbSoundcloudId', 'dbSoundcloudErrorCode', 'dbSoundcloudErrorMsg', 'dbSoundcloudLinkToFile', ),
+		BasePeer::TYPE_COLNAME => array (self::ID, self::GUNID, self::NAME, self::MIME, self::FTYPE, self::DIRECTORY, self::FILEPATH, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::UTIME, self::LPTIME, self::MD5, self::TRACK_TITLE, self::ARTIST_NAME, self::BIT_RATE, self::SAMPLE_RATE, self::FORMAT, self::LENGTH, self::ALBUM_TITLE, self::GENRE, self::COMMENTS, self::YEAR, self::TRACK_NUMBER, self::CHANNELS, self::URL, self::BPM, self::RATING, self::ENCODED_BY, self::DISC_NUMBER, self::MOOD, self::LABEL, self::COMPOSER, self::ENCODER, self::CHECKSUM, self::LYRICS, self::ORCHESTRA, self::CONDUCTOR, self::LYRICIST, self::ORIGINAL_LYRICIST, self::RADIO_STATION_NAME, self::INFO_URL, self::ARTIST_URL, self::AUDIO_SOURCE_URL, self::RADIO_STATION_URL, self::BUY_THIS_URL, self::ISRC_NUMBER, self::CATALOG_NUMBER, self::ORIGINAL_ARTIST, self::COPYRIGHT, self::REPORT_DATETIME, self::REPORT_LOCATION, self::REPORT_ORGANIZATION, self::SUBJECT, self::CONTRIBUTOR, self::LANGUAGE, self::FILE_EXISTS, self::SOUNDCLOUD_ID, self::SOUNDCLOUD_ERROR_CODE, self::SOUNDCLOUD_ERROR_MSG, self::SOUNDCLOUD_LINK_TO_FILE, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'GUNID', 'NAME', 'MIME', 'FTYPE', 'DIRECTORY', 'FILEPATH', 'STATE', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'UTIME', 'LPTIME', 'MD5', 'TRACK_TITLE', 'ARTIST_NAME', 'BIT_RATE', 'SAMPLE_RATE', 'FORMAT', 'LENGTH', 'ALBUM_TITLE', 'GENRE', 'COMMENTS', 'YEAR', 'TRACK_NUMBER', 'CHANNELS', 'URL', 'BPM', 'RATING', 'ENCODED_BY', 'DISC_NUMBER', 'MOOD', 'LABEL', 'COMPOSER', 'ENCODER', 'CHECKSUM', 'LYRICS', 'ORCHESTRA', 'CONDUCTOR', 'LYRICIST', 'ORIGINAL_LYRICIST', 'RADIO_STATION_NAME', 'INFO_URL', 'ARTIST_URL', 'AUDIO_SOURCE_URL', 'RADIO_STATION_URL', 'BUY_THIS_URL', 'ISRC_NUMBER', 'CATALOG_NUMBER', 'ORIGINAL_ARTIST', 'COPYRIGHT', 'REPORT_DATETIME', 'REPORT_LOCATION', 'REPORT_ORGANIZATION', 'SUBJECT', 'CONTRIBUTOR', 'LANGUAGE', 'FILE_EXISTS', 'SOUNDCLOUD_ID', 'SOUNDCLOUD_ERROR_CODE', 'SOUNDCLOUD_ERROR_MSG', 'SOUNDCLOUD_LINK_TO_FILE', ),
+		BasePeer::TYPE_FIELDNAME => array ('id', 'gunid', 'name', 'mime', 'ftype', 'directory', 'filepath', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'utime', 'lptime', 'md5', 'track_title', 'artist_name', 'bit_rate', 'sample_rate', 'format', 'length', 'album_title', 'genre', 'comments', 'year', 'track_number', 'channels', 'url', 'bpm', 'rating', 'encoded_by', 'disc_number', 'mood', 'label', 'composer', 'encoder', 'checksum', 'lyrics', 'orchestra', 'conductor', 'lyricist', 'original_lyricist', 'radio_station_name', 'info_url', 'artist_url', 'audio_source_url', 'radio_station_url', 'buy_this_url', 'isrc_number', 'catalog_number', 'original_artist', 'copyright', 'report_datetime', 'report_location', 'report_organization', 'subject', 'contributor', 'language', 'file_exists', 'soundcloud_id', 'soundcloud_error_code', 'soundcloud_error_msg', 'soundcloud_link_to_file', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, )
 	);
 
 	/**
@@ -239,12 +248,12 @@ abstract class BaseCcFilesPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbGunid' => 1, 'DbName' => 2, 'DbMime' => 3, 'DbFtype' => 4, 'DbDirectory' => 5, 'DbFilepath' => 6, 'DbState' => 7, 'DbCurrentlyaccessing' => 8, 'DbEditedby' => 9, 'DbMtime' => 10, 'DbMd5' => 11, 'DbTrackTitle' => 12, 'DbArtistName' => 13, 'DbBitRate' => 14, 'DbSampleRate' => 15, 'DbFormat' => 16, 'DbLength' => 17, 'DbAlbumTitle' => 18, 'DbGenre' => 19, 'DbComments' => 20, 'DbYear' => 21, 'DbTrackNumber' => 22, 'DbChannels' => 23, 'DbUrl' => 24, 'DbBpm' => 25, 'DbRating' => 26, 'DbEncodedBy' => 27, 'DbDiscNumber' => 28, 'DbMood' => 29, 'DbLabel' => 30, 'DbComposer' => 31, 'DbEncoder' => 32, 'DbChecksum' => 33, 'DbLyrics' => 34, 'DbOrchestra' => 35, 'DbConductor' => 36, 'DbLyricist' => 37, 'DbOriginalLyricist' => 38, 'DbRadioStationName' => 39, 'DbInfoUrl' => 40, 'DbArtistUrl' => 41, 'DbAudioSourceUrl' => 42, 'DbRadioStationUrl' => 43, 'DbBuyThisUrl' => 44, 'DbIsrcNumber' => 45, 'DbCatalogNumber' => 46, 'DbOriginalArtist' => 47, 'DbCopyright' => 48, 'DbReportDatetime' => 49, 'DbReportLocation' => 50, 'DbReportOrganization' => 51, 'DbSubject' => 52, 'DbContributor' => 53, 'DbLanguage' => 54, 'DbSoundcloudId' => 55, 'DbSoundcloudErrorCode' => 56, 'DbSoundcloudErrorMsg' => 57, 'DbSoundcloudLinkToFile' => 58, ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbGunid' => 1, 'dbName' => 2, 'dbMime' => 3, 'dbFtype' => 4, 'dbDirectory' => 5, 'dbFilepath' => 6, 'dbState' => 7, 'dbCurrentlyaccessing' => 8, 'dbEditedby' => 9, 'dbMtime' => 10, 'dbMd5' => 11, 'dbTrackTitle' => 12, 'dbArtistName' => 13, 'dbBitRate' => 14, 'dbSampleRate' => 15, 'dbFormat' => 16, 'dbLength' => 17, 'dbAlbumTitle' => 18, 'dbGenre' => 19, 'dbComments' => 20, 'dbYear' => 21, 'dbTrackNumber' => 22, 'dbChannels' => 23, 'dbUrl' => 24, 'dbBpm' => 25, 'dbRating' => 26, 'dbEncodedBy' => 27, 'dbDiscNumber' => 28, 'dbMood' => 29, 'dbLabel' => 30, 'dbComposer' => 31, 'dbEncoder' => 32, 'dbChecksum' => 33, 'dbLyrics' => 34, 'dbOrchestra' => 35, 'dbConductor' => 36, 'dbLyricist' => 37, 'dbOriginalLyricist' => 38, 'dbRadioStationName' => 39, 'dbInfoUrl' => 40, 'dbArtistUrl' => 41, 'dbAudioSourceUrl' => 42, 'dbRadioStationUrl' => 43, 'dbBuyThisUrl' => 44, 'dbIsrcNumber' => 45, 'dbCatalogNumber' => 46, 'dbOriginalArtist' => 47, 'dbCopyright' => 48, 'dbReportDatetime' => 49, 'dbReportLocation' => 50, 'dbReportOrganization' => 51, 'dbSubject' => 52, 'dbContributor' => 53, 'dbLanguage' => 54, 'dbSoundcloudId' => 55, 'dbSoundcloudErrorCode' => 56, 'dbSoundcloudErrorMsg' => 57, 'dbSoundcloudLinkToFile' => 58, ),
-		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::GUNID => 1, self::NAME => 2, self::MIME => 3, self::FTYPE => 4, self::DIRECTORY => 5, self::FILEPATH => 6, self::STATE => 7, self::CURRENTLYACCESSING => 8, self::EDITEDBY => 9, self::MTIME => 10, self::MD5 => 11, self::TRACK_TITLE => 12, self::ARTIST_NAME => 13, self::BIT_RATE => 14, self::SAMPLE_RATE => 15, self::FORMAT => 16, self::LENGTH => 17, self::ALBUM_TITLE => 18, self::GENRE => 19, self::COMMENTS => 20, self::YEAR => 21, self::TRACK_NUMBER => 22, self::CHANNELS => 23, self::URL => 24, self::BPM => 25, self::RATING => 26, self::ENCODED_BY => 27, self::DISC_NUMBER => 28, self::MOOD => 29, self::LABEL => 30, self::COMPOSER => 31, self::ENCODER => 32, self::CHECKSUM => 33, self::LYRICS => 34, self::ORCHESTRA => 35, self::CONDUCTOR => 36, self::LYRICIST => 37, self::ORIGINAL_LYRICIST => 38, self::RADIO_STATION_NAME => 39, self::INFO_URL => 40, self::ARTIST_URL => 41, self::AUDIO_SOURCE_URL => 42, self::RADIO_STATION_URL => 43, self::BUY_THIS_URL => 44, self::ISRC_NUMBER => 45, self::CATALOG_NUMBER => 46, self::ORIGINAL_ARTIST => 47, self::COPYRIGHT => 48, self::REPORT_DATETIME => 49, self::REPORT_LOCATION => 50, self::REPORT_ORGANIZATION => 51, self::SUBJECT => 52, self::CONTRIBUTOR => 53, self::LANGUAGE => 54, self::SOUNDCLOUD_ID => 55, self::SOUNDCLOUD_ERROR_CODE => 56, self::SOUNDCLOUD_ERROR_MSG => 57, self::SOUNDCLOUD_LINK_TO_FILE => 58, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'GUNID' => 1, 'NAME' => 2, 'MIME' => 3, 'FTYPE' => 4, 'DIRECTORY' => 5, 'FILEPATH' => 6, 'STATE' => 7, 'CURRENTLYACCESSING' => 8, 'EDITEDBY' => 9, 'MTIME' => 10, 'MD5' => 11, 'TRACK_TITLE' => 12, 'ARTIST_NAME' => 13, 'BIT_RATE' => 14, 'SAMPLE_RATE' => 15, 'FORMAT' => 16, 'LENGTH' => 17, 'ALBUM_TITLE' => 18, 'GENRE' => 19, 'COMMENTS' => 20, 'YEAR' => 21, 'TRACK_NUMBER' => 22, 'CHANNELS' => 23, 'URL' => 24, 'BPM' => 25, 'RATING' => 26, 'ENCODED_BY' => 27, 'DISC_NUMBER' => 28, 'MOOD' => 29, 'LABEL' => 30, 'COMPOSER' => 31, 'ENCODER' => 32, 'CHECKSUM' => 33, 'LYRICS' => 34, 'ORCHESTRA' => 35, 'CONDUCTOR' => 36, 'LYRICIST' => 37, 'ORIGINAL_LYRICIST' => 38, 'RADIO_STATION_NAME' => 39, 'INFO_URL' => 40, 'ARTIST_URL' => 41, 'AUDIO_SOURCE_URL' => 42, 'RADIO_STATION_URL' => 43, 'BUY_THIS_URL' => 44, 'ISRC_NUMBER' => 45, 'CATALOG_NUMBER' => 46, 'ORIGINAL_ARTIST' => 47, 'COPYRIGHT' => 48, 'REPORT_DATETIME' => 49, 'REPORT_LOCATION' => 50, 'REPORT_ORGANIZATION' => 51, 'SUBJECT' => 52, 'CONTRIBUTOR' => 53, 'LANGUAGE' => 54, 'SOUNDCLOUD_ID' => 55, 'SOUNDCLOUD_ERROR_CODE' => 56, 'SOUNDCLOUD_ERROR_MSG' => 57, 'SOUNDCLOUD_LINK_TO_FILE' => 58, ),
-		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'gunid' => 1, 'name' => 2, 'mime' => 3, 'ftype' => 4, 'directory' => 5, 'filepath' => 6, 'state' => 7, 'currentlyaccessing' => 8, 'editedby' => 9, 'mtime' => 10, 'md5' => 11, 'track_title' => 12, 'artist_name' => 13, 'bit_rate' => 14, 'sample_rate' => 15, 'format' => 16, 'length' => 17, 'album_title' => 18, 'genre' => 19, 'comments' => 20, 'year' => 21, 'track_number' => 22, 'channels' => 23, 'url' => 24, 'bpm' => 25, 'rating' => 26, 'encoded_by' => 27, 'disc_number' => 28, 'mood' => 29, 'label' => 30, 'composer' => 31, 'encoder' => 32, 'checksum' => 33, 'lyrics' => 34, 'orchestra' => 35, 'conductor' => 36, 'lyricist' => 37, 'original_lyricist' => 38, 'radio_station_name' => 39, 'info_url' => 40, 'artist_url' => 41, 'audio_source_url' => 42, 'radio_station_url' => 43, 'buy_this_url' => 44, 'isrc_number' => 45, 'catalog_number' => 46, 'original_artist' => 47, 'copyright' => 48, 'report_datetime' => 49, 'report_location' => 50, 'report_organization' => 51, 'subject' => 52, 'contributor' => 53, 'language' => 54, 'soundcloud_id' => 55, 'soundcloud_error_code' => 56, 'soundcloud_error_msg' => 57, 'soundcloud_link_to_file' => 58, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, )
+		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbGunid' => 1, 'DbName' => 2, 'DbMime' => 3, 'DbFtype' => 4, 'DbDirectory' => 5, 'DbFilepath' => 6, 'DbState' => 7, 'DbCurrentlyaccessing' => 8, 'DbEditedby' => 9, 'DbMtime' => 10, 'DbUtime' => 11, 'DbLPtime' => 12, 'DbMd5' => 13, 'DbTrackTitle' => 14, 'DbArtistName' => 15, 'DbBitRate' => 16, 'DbSampleRate' => 17, 'DbFormat' => 18, 'DbLength' => 19, 'DbAlbumTitle' => 20, 'DbGenre' => 21, 'DbComments' => 22, 'DbYear' => 23, 'DbTrackNumber' => 24, 'DbChannels' => 25, 'DbUrl' => 26, 'DbBpm' => 27, 'DbRating' => 28, 'DbEncodedBy' => 29, 'DbDiscNumber' => 30, 'DbMood' => 31, 'DbLabel' => 32, 'DbComposer' => 33, 'DbEncoder' => 34, 'DbChecksum' => 35, 'DbLyrics' => 36, 'DbOrchestra' => 37, 'DbConductor' => 38, 'DbLyricist' => 39, 'DbOriginalLyricist' => 40, 'DbRadioStationName' => 41, 'DbInfoUrl' => 42, 'DbArtistUrl' => 43, 'DbAudioSourceUrl' => 44, 'DbRadioStationUrl' => 45, 'DbBuyThisUrl' => 46, 'DbIsrcNumber' => 47, 'DbCatalogNumber' => 48, 'DbOriginalArtist' => 49, 'DbCopyright' => 50, 'DbReportDatetime' => 51, 'DbReportLocation' => 52, 'DbReportOrganization' => 53, 'DbSubject' => 54, 'DbContributor' => 55, 'DbLanguage' => 56, 'DbFileExists' => 57, 'DbSoundcloudId' => 58, 'DbSoundcloudErrorCode' => 59, 'DbSoundcloudErrorMsg' => 60, 'DbSoundcloudLinkToFile' => 61, ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbGunid' => 1, 'dbName' => 2, 'dbMime' => 3, 'dbFtype' => 4, 'dbDirectory' => 5, 'dbFilepath' => 6, 'dbState' => 7, 'dbCurrentlyaccessing' => 8, 'dbEditedby' => 9, 'dbMtime' => 10, 'dbUtime' => 11, 'dbLPtime' => 12, 'dbMd5' => 13, 'dbTrackTitle' => 14, 'dbArtistName' => 15, 'dbBitRate' => 16, 'dbSampleRate' => 17, 'dbFormat' => 18, 'dbLength' => 19, 'dbAlbumTitle' => 20, 'dbGenre' => 21, 'dbComments' => 22, 'dbYear' => 23, 'dbTrackNumber' => 24, 'dbChannels' => 25, 'dbUrl' => 26, 'dbBpm' => 27, 'dbRating' => 28, 'dbEncodedBy' => 29, 'dbDiscNumber' => 30, 'dbMood' => 31, 'dbLabel' => 32, 'dbComposer' => 33, 'dbEncoder' => 34, 'dbChecksum' => 35, 'dbLyrics' => 36, 'dbOrchestra' => 37, 'dbConductor' => 38, 'dbLyricist' => 39, 'dbOriginalLyricist' => 40, 'dbRadioStationName' => 41, 'dbInfoUrl' => 42, 'dbArtistUrl' => 43, 'dbAudioSourceUrl' => 44, 'dbRadioStationUrl' => 45, 'dbBuyThisUrl' => 46, 'dbIsrcNumber' => 47, 'dbCatalogNumber' => 48, 'dbOriginalArtist' => 49, 'dbCopyright' => 50, 'dbReportDatetime' => 51, 'dbReportLocation' => 52, 'dbReportOrganization' => 53, 'dbSubject' => 54, 'dbContributor' => 55, 'dbLanguage' => 56, 'dbFileExists' => 57, 'dbSoundcloudId' => 58, 'dbSoundcloudErrorCode' => 59, 'dbSoundcloudErrorMsg' => 60, 'dbSoundcloudLinkToFile' => 61, ),
+		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::GUNID => 1, self::NAME => 2, self::MIME => 3, self::FTYPE => 4, self::DIRECTORY => 5, self::FILEPATH => 6, self::STATE => 7, self::CURRENTLYACCESSING => 8, self::EDITEDBY => 9, self::MTIME => 10, self::UTIME => 11, self::LPTIME => 12, self::MD5 => 13, self::TRACK_TITLE => 14, self::ARTIST_NAME => 15, self::BIT_RATE => 16, self::SAMPLE_RATE => 17, self::FORMAT => 18, self::LENGTH => 19, self::ALBUM_TITLE => 20, self::GENRE => 21, self::COMMENTS => 22, self::YEAR => 23, self::TRACK_NUMBER => 24, self::CHANNELS => 25, self::URL => 26, self::BPM => 27, self::RATING => 28, self::ENCODED_BY => 29, self::DISC_NUMBER => 30, self::MOOD => 31, self::LABEL => 32, self::COMPOSER => 33, self::ENCODER => 34, self::CHECKSUM => 35, self::LYRICS => 36, self::ORCHESTRA => 37, self::CONDUCTOR => 38, self::LYRICIST => 39, self::ORIGINAL_LYRICIST => 40, self::RADIO_STATION_NAME => 41, self::INFO_URL => 42, self::ARTIST_URL => 43, self::AUDIO_SOURCE_URL => 44, self::RADIO_STATION_URL => 45, self::BUY_THIS_URL => 46, self::ISRC_NUMBER => 47, self::CATALOG_NUMBER => 48, self::ORIGINAL_ARTIST => 49, self::COPYRIGHT => 50, self::REPORT_DATETIME => 51, self::REPORT_LOCATION => 52, self::REPORT_ORGANIZATION => 53, self::SUBJECT => 54, self::CONTRIBUTOR => 55, self::LANGUAGE => 56, self::FILE_EXISTS => 57, self::SOUNDCLOUD_ID => 58, self::SOUNDCLOUD_ERROR_CODE => 59, self::SOUNDCLOUD_ERROR_MSG => 60, self::SOUNDCLOUD_LINK_TO_FILE => 61, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'GUNID' => 1, 'NAME' => 2, 'MIME' => 3, 'FTYPE' => 4, 'DIRECTORY' => 5, 'FILEPATH' => 6, 'STATE' => 7, 'CURRENTLYACCESSING' => 8, 'EDITEDBY' => 9, 'MTIME' => 10, 'UTIME' => 11, 'LPTIME' => 12, 'MD5' => 13, 'TRACK_TITLE' => 14, 'ARTIST_NAME' => 15, 'BIT_RATE' => 16, 'SAMPLE_RATE' => 17, 'FORMAT' => 18, 'LENGTH' => 19, 'ALBUM_TITLE' => 20, 'GENRE' => 21, 'COMMENTS' => 22, 'YEAR' => 23, 'TRACK_NUMBER' => 24, 'CHANNELS' => 25, 'URL' => 26, 'BPM' => 27, 'RATING' => 28, 'ENCODED_BY' => 29, 'DISC_NUMBER' => 30, 'MOOD' => 31, 'LABEL' => 32, 'COMPOSER' => 33, 'ENCODER' => 34, 'CHECKSUM' => 35, 'LYRICS' => 36, 'ORCHESTRA' => 37, 'CONDUCTOR' => 38, 'LYRICIST' => 39, 'ORIGINAL_LYRICIST' => 40, 'RADIO_STATION_NAME' => 41, 'INFO_URL' => 42, 'ARTIST_URL' => 43, 'AUDIO_SOURCE_URL' => 44, 'RADIO_STATION_URL' => 45, 'BUY_THIS_URL' => 46, 'ISRC_NUMBER' => 47, 'CATALOG_NUMBER' => 48, 'ORIGINAL_ARTIST' => 49, 'COPYRIGHT' => 50, 'REPORT_DATETIME' => 51, 'REPORT_LOCATION' => 52, 'REPORT_ORGANIZATION' => 53, 'SUBJECT' => 54, 'CONTRIBUTOR' => 55, 'LANGUAGE' => 56, 'FILE_EXISTS' => 57, 'SOUNDCLOUD_ID' => 58, 'SOUNDCLOUD_ERROR_CODE' => 59, 'SOUNDCLOUD_ERROR_MSG' => 60, 'SOUNDCLOUD_LINK_TO_FILE' => 61, ),
+		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'gunid' => 1, 'name' => 2, 'mime' => 3, 'ftype' => 4, 'directory' => 5, 'filepath' => 6, 'state' => 7, 'currentlyaccessing' => 8, 'editedby' => 9, 'mtime' => 10, 'utime' => 11, 'lptime' => 12, 'md5' => 13, 'track_title' => 14, 'artist_name' => 15, 'bit_rate' => 16, 'sample_rate' => 17, 'format' => 18, 'length' => 19, 'album_title' => 20, 'genre' => 21, 'comments' => 22, 'year' => 23, 'track_number' => 24, 'channels' => 25, 'url' => 26, 'bpm' => 27, 'rating' => 28, 'encoded_by' => 29, 'disc_number' => 30, 'mood' => 31, 'label' => 32, 'composer' => 33, 'encoder' => 34, 'checksum' => 35, 'lyrics' => 36, 'orchestra' => 37, 'conductor' => 38, 'lyricist' => 39, 'original_lyricist' => 40, 'radio_station_name' => 41, 'info_url' => 42, 'artist_url' => 43, 'audio_source_url' => 44, 'radio_station_url' => 45, 'buy_this_url' => 46, 'isrc_number' => 47, 'catalog_number' => 48, 'original_artist' => 49, 'copyright' => 50, 'report_datetime' => 51, 'report_location' => 52, 'report_organization' => 53, 'subject' => 54, 'contributor' => 55, 'language' => 56, 'file_exists' => 57, 'soundcloud_id' => 58, 'soundcloud_error_code' => 59, 'soundcloud_error_msg' => 60, 'soundcloud_link_to_file' => 61, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, )
 	);
 
 	/**
@@ -327,6 +336,8 @@ abstract class BaseCcFilesPeer {
 			$criteria->addSelectColumn(CcFilesPeer::CURRENTLYACCESSING);
 			$criteria->addSelectColumn(CcFilesPeer::EDITEDBY);
 			$criteria->addSelectColumn(CcFilesPeer::MTIME);
+			$criteria->addSelectColumn(CcFilesPeer::UTIME);
+			$criteria->addSelectColumn(CcFilesPeer::LPTIME);
 			$criteria->addSelectColumn(CcFilesPeer::MD5);
 			$criteria->addSelectColumn(CcFilesPeer::TRACK_TITLE);
 			$criteria->addSelectColumn(CcFilesPeer::ARTIST_NAME);
@@ -371,6 +382,7 @@ abstract class BaseCcFilesPeer {
 			$criteria->addSelectColumn(CcFilesPeer::SUBJECT);
 			$criteria->addSelectColumn(CcFilesPeer::CONTRIBUTOR);
 			$criteria->addSelectColumn(CcFilesPeer::LANGUAGE);
+			$criteria->addSelectColumn(CcFilesPeer::FILE_EXISTS);
 			$criteria->addSelectColumn(CcFilesPeer::SOUNDCLOUD_ID);
 			$criteria->addSelectColumn(CcFilesPeer::SOUNDCLOUD_ERROR_CODE);
 			$criteria->addSelectColumn(CcFilesPeer::SOUNDCLOUD_ERROR_MSG);
@@ -387,6 +399,8 @@ abstract class BaseCcFilesPeer {
 			$criteria->addSelectColumn($alias . '.CURRENTLYACCESSING');
 			$criteria->addSelectColumn($alias . '.EDITEDBY');
 			$criteria->addSelectColumn($alias . '.MTIME');
+			$criteria->addSelectColumn($alias . '.UTIME');
+			$criteria->addSelectColumn($alias . '.LPTIME');
 			$criteria->addSelectColumn($alias . '.MD5');
 			$criteria->addSelectColumn($alias . '.TRACK_TITLE');
 			$criteria->addSelectColumn($alias . '.ARTIST_NAME');
@@ -431,6 +445,7 @@ abstract class BaseCcFilesPeer {
 			$criteria->addSelectColumn($alias . '.SUBJECT');
 			$criteria->addSelectColumn($alias . '.CONTRIBUTOR');
 			$criteria->addSelectColumn($alias . '.LANGUAGE');
+			$criteria->addSelectColumn($alias . '.FILE_EXISTS');
 			$criteria->addSelectColumn($alias . '.SOUNDCLOUD_ID');
 			$criteria->addSelectColumn($alias . '.SOUNDCLOUD_ERROR_CODE');
 			$criteria->addSelectColumn($alias . '.SOUNDCLOUD_ERROR_MSG');

airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php

@@ -17,6 +17,8 @@
  * @method     CcFilesQuery orderByDbCurrentlyaccessing($order = Criteria::ASC) Order by the currentlyaccessing column
  * @method     CcFilesQuery orderByDbEditedby($order = Criteria::ASC) Order by the editedby column
  * @method     CcFilesQuery orderByDbMtime($order = Criteria::ASC) Order by the mtime column
+ * @method     CcFilesQuery orderByDbUtime($order = Criteria::ASC) Order by the utime column
+ * @method     CcFilesQuery orderByDbLPtime($order = Criteria::ASC) Order by the lptime column
  * @method     CcFilesQuery orderByDbMd5($order = Criteria::ASC) Order by the md5 column
  * @method     CcFilesQuery orderByDbTrackTitle($order = Criteria::ASC) Order by the track_title column
  * @method     CcFilesQuery orderByDbArtistName($order = Criteria::ASC) Order by the artist_name column
@@ -61,6 +63,7 @@
  * @method     CcFilesQuery orderByDbSubject($order = Criteria::ASC) Order by the subject column
  * @method     CcFilesQuery orderByDbContributor($order = Criteria::ASC) Order by the contributor column
  * @method     CcFilesQuery orderByDbLanguage($order = Criteria::ASC) Order by the language column
+ * @method     CcFilesQuery orderByDbFileExists($order = Criteria::ASC) Order by the file_exists column
  * @method     CcFilesQuery orderByDbSoundcloudId($order = Criteria::ASC) Order by the soundcloud_id column
  * @method     CcFilesQuery orderByDbSoundcloudErrorCode($order = Criteria::ASC) Order by the soundcloud_error_code column
  * @method     CcFilesQuery orderByDbSoundcloudErrorMsg($order = Criteria::ASC) Order by the soundcloud_error_msg column
@@ -77,6 +80,8 @@
  * @method     CcFilesQuery groupByDbCurrentlyaccessing() Group by the currentlyaccessing column
  * @method     CcFilesQuery groupByDbEditedby() Group by the editedby column
  * @method     CcFilesQuery groupByDbMtime() Group by the mtime column
+ * @method     CcFilesQuery groupByDbUtime() Group by the utime column
+ * @method     CcFilesQuery groupByDbLPtime() Group by the lptime column
  * @method     CcFilesQuery groupByDbMd5() Group by the md5 column
  * @method     CcFilesQuery groupByDbTrackTitle() Group by the track_title column
  * @method     CcFilesQuery groupByDbArtistName() Group by the artist_name column
@@ -121,6 +126,7 @@
  * @method     CcFilesQuery groupByDbSubject() Group by the subject column
  * @method     CcFilesQuery groupByDbContributor() Group by the contributor column
  * @method     CcFilesQuery groupByDbLanguage() Group by the language column
+ * @method     CcFilesQuery groupByDbFileExists() Group by the file_exists column
  * @method     CcFilesQuery groupByDbSoundcloudId() Group by the soundcloud_id column
  * @method     CcFilesQuery groupByDbSoundcloudErrorCode() Group by the soundcloud_error_code column
  * @method     CcFilesQuery groupByDbSoundcloudErrorMsg() Group by the soundcloud_error_msg column
@@ -164,6 +170,8 @@
  * @method     CcFiles findOneByDbCurrentlyaccessing(int $currentlyaccessing) Return the first CcFiles filtered by the currentlyaccessing column
  * @method     CcFiles findOneByDbEditedby(int $editedby) Return the first CcFiles filtered by the editedby column
  * @method     CcFiles findOneByDbMtime(string $mtime) Return the first CcFiles filtered by the mtime column
+ * @method     CcFiles findOneByDbUtime(string $utime) Return the first CcFiles filtered by the utime column
+ * @method     CcFiles findOneByDbLPtime(string $lptime) Return the first CcFiles filtered by the lptime column
  * @method     CcFiles findOneByDbMd5(string $md5) Return the first CcFiles filtered by the md5 column
  * @method     CcFiles findOneByDbTrackTitle(string $track_title) Return the first CcFiles filtered by the track_title column
  * @method     CcFiles findOneByDbArtistName(string $artist_name) Return the first CcFiles filtered by the artist_name column
@@ -208,6 +216,7 @@
  * @method     CcFiles findOneByDbSubject(string $subject) Return the first CcFiles filtered by the subject column
  * @method     CcFiles findOneByDbContributor(string $contributor) Return the first CcFiles filtered by the contributor column
  * @method     CcFiles findOneByDbLanguage(string $language) Return the first CcFiles filtered by the language column
+ * @method     CcFiles findOneByDbFileExists(boolean $file_exists) Return the first CcFiles filtered by the file_exists column
  * @method     CcFiles findOneByDbSoundcloudId(int $soundcloud_id) Return the first CcFiles filtered by the soundcloud_id column
  * @method     CcFiles findOneByDbSoundcloudErrorCode(int $soundcloud_error_code) Return the first CcFiles filtered by the soundcloud_error_code column
  * @method     CcFiles findOneByDbSoundcloudErrorMsg(string $soundcloud_error_msg) Return the first CcFiles filtered by the soundcloud_error_msg column
@@ -224,6 +233,8 @@
  * @method     array findByDbCurrentlyaccessing(int $currentlyaccessing) Return CcFiles objects filtered by the currentlyaccessing column
  * @method     array findByDbEditedby(int $editedby) Return CcFiles objects filtered by the editedby column
  * @method     array findByDbMtime(string $mtime) Return CcFiles objects filtered by the mtime column
+ * @method     array findByDbUtime(string $utime) Return CcFiles objects filtered by the utime column
+ * @method     array findByDbLPtime(string $lptime) Return CcFiles objects filtered by the lptime column
  * @method     array findByDbMd5(string $md5) Return CcFiles objects filtered by the md5 column
  * @method     array findByDbTrackTitle(string $track_title) Return CcFiles objects filtered by the track_title column
  * @method     array findByDbArtistName(string $artist_name) Return CcFiles objects filtered by the artist_name column
@@ -268,6 +279,7 @@
  * @method     array findByDbSubject(string $subject) Return CcFiles objects filtered by the subject column
  * @method     array findByDbContributor(string $contributor) Return CcFiles objects filtered by the contributor column
  * @method     array findByDbLanguage(string $language) Return CcFiles objects filtered by the language column
+ * @method     array findByDbFileExists(boolean $file_exists) Return CcFiles objects filtered by the file_exists column
  * @method     array findByDbSoundcloudId(int $soundcloud_id) Return CcFiles objects filtered by the soundcloud_id column
  * @method     array findByDbSoundcloudErrorCode(int $soundcloud_error_code) Return CcFiles objects filtered by the soundcloud_error_code column
  * @method     array findByDbSoundcloudErrorMsg(string $soundcloud_error_msg) Return CcFiles objects filtered by the soundcloud_error_msg column
@@ -654,6 +666,68 @@ abstract class BaseCcFilesQuery extends ModelCriteria
 		return $this->addUsingAlias(CcFilesPeer::MTIME, $dbMtime, $comparison);
 	}
 
+	/**
+	 * Filter the query on the utime column
+	 * 
+	 * @param     string|array $dbUtime The value to use as filter.
+	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcFilesQuery The current query, for fluid interface
+	 */
+	public function filterByDbUtime($dbUtime = null, $comparison = null)
+	{
+		if (is_array($dbUtime)) {
+			$useMinMax = false;
+			if (isset($dbUtime['min'])) {
+				$this->addUsingAlias(CcFilesPeer::UTIME, $dbUtime['min'], Criteria::GREATER_EQUAL);
+				$useMinMax = true;
+			}
+			if (isset($dbUtime['max'])) {
+				$this->addUsingAlias(CcFilesPeer::UTIME, $dbUtime['max'], Criteria::LESS_EQUAL);
+				$useMinMax = true;
+			}
+			if ($useMinMax) {
+				return $this;
+			}
+			if (null === $comparison) {
+				$comparison = Criteria::IN;
+			}
+		}
+		return $this->addUsingAlias(CcFilesPeer::UTIME, $dbUtime, $comparison);
+	}
+
+	/**
+	 * Filter the query on the lptime column
+	 * 
+	 * @param     string|array $dbLPtime The value to use as filter.
+	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcFilesQuery The current query, for fluid interface
+	 */
+	public function filterByDbLPtime($dbLPtime = null, $comparison = null)
+	{
+		if (is_array($dbLPtime)) {
+			$useMinMax = false;
+			if (isset($dbLPtime['min'])) {
+				$this->addUsingAlias(CcFilesPeer::LPTIME, $dbLPtime['min'], Criteria::GREATER_EQUAL);
+				$useMinMax = true;
+			}
+			if (isset($dbLPtime['max'])) {
+				$this->addUsingAlias(CcFilesPeer::LPTIME, $dbLPtime['max'], Criteria::LESS_EQUAL);
+				$useMinMax = true;
+			}
+			if ($useMinMax) {
+				return $this;
+			}
+			if (null === $comparison) {
+				$comparison = Criteria::IN;
+			}
+		}
+		return $this->addUsingAlias(CcFilesPeer::LPTIME, $dbLPtime, $comparison);
+	}
+
 	/**
 	 * Filter the query on the md5 column
 	 * 
@@ -1649,6 +1723,23 @@ abstract class BaseCcFilesQuery extends ModelCriteria
 		return $this->addUsingAlias(CcFilesPeer::LANGUAGE, $dbLanguage, $comparison);
 	}
 
+	/**
+	 * Filter the query on the file_exists column
+	 * 
+	 * @param     boolean|string $dbFileExists The value to use as filter.
+	 *            Accepts strings ('false', 'off', '-', 'no', 'n', and '0' are false, the rest is true)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcFilesQuery The current query, for fluid interface
+	 */
+	public function filterByDbFileExists($dbFileExists = null, $comparison = null)
+	{
+		if (is_string($dbFileExists)) {
+			$file_exists = in_array(strtolower($dbFileExists), array('false', 'off', '-', 'no', 'n', '0')) ? false : true;
+		}
+		return $this->addUsingAlias(CcFilesPeer::FILE_EXISTS, $dbFileExists, $comparison);
+	}
+
 	/**
 	 * Filter the query on the soundcloud_id column
 	 * 

airtime_mvc/application/models/airtime/om/BaseCcMusicDirs.php

@@ -42,6 +42,20 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 	 */
 	protected $type;
 
+	/**
+	 * The value for the exists field.
+	 * Note: this column has a database default value of: true
+	 * @var        boolean
+	 */
+	protected $exists;
+
+	/**
+	 * The value for the watched field.
+	 * Note: this column has a database default value of: true
+	 * @var        boolean
+	 */
+	protected $watched;
+
 	/**
 	 * @var        array CcFiles[] Collection to store aggregation of CcFiles objects.
 	 */
@@ -61,6 +75,28 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 	 */
 	protected $alreadyInValidation = false;
 
+	/**
+	 * Applies default values to this object.
+	 * This method should be called from the object's constructor (or
+	 * equivalent initialization method).
+	 * @see        __construct()
+	 */
+	public function applyDefaultValues()
+	{
+		$this->exists = true;
+		$this->watched = true;
+	}
+
+	/**
+	 * Initializes internal state of BaseCcMusicDirs object.
+	 * @see        applyDefaults()
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->applyDefaultValues();
+	}
+
 	/**
 	 * Get the [id] column value.
 	 * 
@@ -91,6 +127,26 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 		return $this->type;
 	}
 
+	/**
+	 * Get the [exists] column value.
+	 * 
+	 * @return     boolean
+	 */
+	public function getExists()
+	{
+		return $this->exists;
+	}
+
+	/**
+	 * Get the [watched] column value.
+	 * 
+	 * @return     boolean
+	 */
+	public function getWatched()
+	{
+		return $this->watched;
+	}
+
 	/**
 	 * Set the value of [id] column.
 	 * 
@@ -151,6 +207,46 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 		return $this;
 	} // setType()
 
+	/**
+	 * Set the value of [exists] column.
+	 * 
+	 * @param      boolean $v new value
+	 * @return     CcMusicDirs The current object (for fluent API support)
+	 */
+	public function setExists($v)
+	{
+		if ($v !== null) {
+			$v = (boolean) $v;
+		}
+
+		if ($this->exists !== $v || $this->isNew()) {
+			$this->exists = $v;
+			$this->modifiedColumns[] = CcMusicDirsPeer::EXISTS;
+		}
+
+		return $this;
+	} // setExists()
+
+	/**
+	 * Set the value of [watched] column.
+	 * 
+	 * @param      boolean $v new value
+	 * @return     CcMusicDirs The current object (for fluent API support)
+	 */
+	public function setWatched($v)
+	{
+		if ($v !== null) {
+			$v = (boolean) $v;
+		}
+
+		if ($this->watched !== $v || $this->isNew()) {
+			$this->watched = $v;
+			$this->modifiedColumns[] = CcMusicDirsPeer::WATCHED;
+		}
+
+		return $this;
+	} // setWatched()
+
 	/**
 	 * Indicates whether the columns in this object are only set to default values.
 	 *
@@ -161,6 +257,14 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 	 */
 	public function hasOnlyDefaultValues()
 	{
+			if ($this->exists !== true) {
+				return false;
+			}
+
+			if ($this->watched !== true) {
+				return false;
+			}
+
 		// otherwise, everything was equal, so return TRUE
 		return true;
 	} // hasOnlyDefaultValues()
@@ -186,6 +290,8 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 			$this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null;
 			$this->directory = ($row[$startcol + 1] !== null) ? (string) $row[$startcol + 1] : null;
 			$this->type = ($row[$startcol + 2] !== null) ? (string) $row[$startcol + 2] : null;
+			$this->exists = ($row[$startcol + 3] !== null) ? (boolean) $row[$startcol + 3] : null;
+			$this->watched = ($row[$startcol + 4] !== null) ? (boolean) $row[$startcol + 4] : null;
 			$this->resetModified();
 
 			$this->setNew(false);
@@ -194,7 +300,7 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 				$this->ensureConsistency();
 			}
 
-			return $startcol + 3; // 3 = CcMusicDirsPeer::NUM_COLUMNS - CcMusicDirsPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 5; // 5 = CcMusicDirsPeer::NUM_COLUMNS - CcMusicDirsPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating CcMusicDirs object", $e);
@@ -520,6 +626,12 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 			case 2:
 				return $this->getType();
 				break;
+			case 3:
+				return $this->getExists();
+				break;
+			case 4:
+				return $this->getWatched();
+				break;
 			default:
 				return null;
 				break;
@@ -546,6 +658,8 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 			$keys[0] => $this->getId(),
 			$keys[1] => $this->getDirectory(),
 			$keys[2] => $this->getType(),
+			$keys[3] => $this->getExists(),
+			$keys[4] => $this->getWatched(),
 		);
 		return $result;
 	}
@@ -586,6 +700,12 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 			case 2:
 				$this->setType($value);
 				break;
+			case 3:
+				$this->setExists($value);
+				break;
+			case 4:
+				$this->setWatched($value);
+				break;
 		} // switch()
 	}
 
@@ -613,6 +733,8 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 		if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
 		if (array_key_exists($keys[1], $arr)) $this->setDirectory($arr[$keys[1]]);
 		if (array_key_exists($keys[2], $arr)) $this->setType($arr[$keys[2]]);
+		if (array_key_exists($keys[3], $arr)) $this->setExists($arr[$keys[3]]);
+		if (array_key_exists($keys[4], $arr)) $this->setWatched($arr[$keys[4]]);
 	}
 
 	/**
@@ -627,6 +749,8 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 		if ($this->isColumnModified(CcMusicDirsPeer::ID)) $criteria->add(CcMusicDirsPeer::ID, $this->id);
 		if ($this->isColumnModified(CcMusicDirsPeer::DIRECTORY)) $criteria->add(CcMusicDirsPeer::DIRECTORY, $this->directory);
 		if ($this->isColumnModified(CcMusicDirsPeer::TYPE)) $criteria->add(CcMusicDirsPeer::TYPE, $this->type);
+		if ($this->isColumnModified(CcMusicDirsPeer::EXISTS)) $criteria->add(CcMusicDirsPeer::EXISTS, $this->exists);
+		if ($this->isColumnModified(CcMusicDirsPeer::WATCHED)) $criteria->add(CcMusicDirsPeer::WATCHED, $this->watched);
 
 		return $criteria;
 	}
@@ -690,6 +814,8 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 	{
 		$copyObj->setDirectory($this->directory);
 		$copyObj->setType($this->type);
+		$copyObj->setExists($this->exists);
+		$copyObj->setWatched($this->watched);
 
 		if ($deepCopy) {
 			// important: temporarily setNew(false) because this affects the behavior of
@@ -889,9 +1015,12 @@ abstract class BaseCcMusicDirs extends BaseObject  implements Persistent
 		$this->id = null;
 		$this->directory = null;
 		$this->type = null;
+		$this->exists = null;
+		$this->watched = null;
 		$this->alreadyInSave = false;
 		$this->alreadyInValidation = false;
 		$this->clearAllReferences();
+		$this->applyDefaultValues();
 		$this->resetModified();
 		$this->setNew(true);
 		$this->setDeleted(false);

airtime_mvc/application/models/airtime/om/BaseCcMusicDirsPeer.php

@@ -26,7 +26,7 @@ abstract class BaseCcMusicDirsPeer {
 	const TM_CLASS = 'CcMusicDirsTableMap';
 	
 	/** The total number of columns. */
-	const NUM_COLUMNS = 3;
+	const NUM_COLUMNS = 5;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -40,6 +40,12 @@ abstract class BaseCcMusicDirsPeer {
 	/** the column name for the TYPE field */
 	const TYPE = 'cc_music_dirs.TYPE';
 
+	/** the column name for the EXISTS field */
+	const EXISTS = 'cc_music_dirs.EXISTS';
+
+	/** the column name for the WATCHED field */
+	const WATCHED = 'cc_music_dirs.WATCHED';
+
 	/**
 	 * An identiy map to hold any loaded instances of CcMusicDirs objects.
 	 * This must be public so that other peer classes can access this when hydrating from JOIN
@@ -56,12 +62,12 @@ abstract class BaseCcMusicDirsPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('Id', 'Directory', 'Type', ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'directory', 'type', ),
-		BasePeer::TYPE_COLNAME => array (self::ID, self::DIRECTORY, self::TYPE, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'DIRECTORY', 'TYPE', ),
-		BasePeer::TYPE_FIELDNAME => array ('id', 'directory', 'type', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, )
+		BasePeer::TYPE_PHPNAME => array ('Id', 'Directory', 'Type', 'Exists', 'Watched', ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'directory', 'type', 'exists', 'watched', ),
+		BasePeer::TYPE_COLNAME => array (self::ID, self::DIRECTORY, self::TYPE, self::EXISTS, self::WATCHED, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'DIRECTORY', 'TYPE', 'EXISTS', 'WATCHED', ),
+		BasePeer::TYPE_FIELDNAME => array ('id', 'directory', 'type', 'exists', 'watched', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
 	);
 
 	/**
@@ -71,12 +77,12 @@ abstract class BaseCcMusicDirsPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Directory' => 1, 'Type' => 2, ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'directory' => 1, 'type' => 2, ),
-		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::DIRECTORY => 1, self::TYPE => 2, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'DIRECTORY' => 1, 'TYPE' => 2, ),
-		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'directory' => 1, 'type' => 2, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, )
+		BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Directory' => 1, 'Type' => 2, 'Exists' => 3, 'Watched' => 4, ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'directory' => 1, 'type' => 2, 'exists' => 3, 'watched' => 4, ),
+		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::DIRECTORY => 1, self::TYPE => 2, self::EXISTS => 3, self::WATCHED => 4, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'DIRECTORY' => 1, 'TYPE' => 2, 'EXISTS' => 3, 'WATCHED' => 4, ),
+		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'directory' => 1, 'type' => 2, 'exists' => 3, 'watched' => 4, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
 	);
 
 	/**
@@ -151,10 +157,14 @@ abstract class BaseCcMusicDirsPeer {
 			$criteria->addSelectColumn(CcMusicDirsPeer::ID);
 			$criteria->addSelectColumn(CcMusicDirsPeer::DIRECTORY);
 			$criteria->addSelectColumn(CcMusicDirsPeer::TYPE);
+			$criteria->addSelectColumn(CcMusicDirsPeer::EXISTS);
+			$criteria->addSelectColumn(CcMusicDirsPeer::WATCHED);
 		} else {
 			$criteria->addSelectColumn($alias . '.ID');
 			$criteria->addSelectColumn($alias . '.DIRECTORY');
 			$criteria->addSelectColumn($alias . '.TYPE');
+			$criteria->addSelectColumn($alias . '.EXISTS');
+			$criteria->addSelectColumn($alias . '.WATCHED');
 		}
 	}
 
@@ -348,9 +358,6 @@ abstract class BaseCcMusicDirsPeer {
 	 */
 	public static function clearRelatedInstancePool()
 	{
-		// Invalidate objects in CcFilesPeer instance pool, 
-		// since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
-		CcFilesPeer::clearInstancePool();
 	}
 
 	/**

airtime_mvc/application/models/airtime/om/BaseCcMusicDirsQuery.php

@@ -9,10 +9,14 @@
  * @method     CcMusicDirsQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     CcMusicDirsQuery orderByDirectory($order = Criteria::ASC) Order by the directory column
  * @method     CcMusicDirsQuery orderByType($order = Criteria::ASC) Order by the type column
+ * @method     CcMusicDirsQuery orderByExists($order = Criteria::ASC) Order by the exists column
+ * @method     CcMusicDirsQuery orderByWatched($order = Criteria::ASC) Order by the watched column
  *
  * @method     CcMusicDirsQuery groupById() Group by the id column
  * @method     CcMusicDirsQuery groupByDirectory() Group by the directory column
  * @method     CcMusicDirsQuery groupByType() Group by the type column
+ * @method     CcMusicDirsQuery groupByExists() Group by the exists column
+ * @method     CcMusicDirsQuery groupByWatched() Group by the watched column
  *
  * @method     CcMusicDirsQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
  * @method     CcMusicDirsQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
@@ -28,10 +32,14 @@
  * @method     CcMusicDirs findOneById(int $id) Return the first CcMusicDirs filtered by the id column
  * @method     CcMusicDirs findOneByDirectory(string $directory) Return the first CcMusicDirs filtered by the directory column
  * @method     CcMusicDirs findOneByType(string $type) Return the first CcMusicDirs filtered by the type column
+ * @method     CcMusicDirs findOneByExists(boolean $exists) Return the first CcMusicDirs filtered by the exists column
+ * @method     CcMusicDirs findOneByWatched(boolean $watched) Return the first CcMusicDirs filtered by the watched column
  *
  * @method     array findById(int $id) Return CcMusicDirs objects filtered by the id column
  * @method     array findByDirectory(string $directory) Return CcMusicDirs objects filtered by the directory column
  * @method     array findByType(string $type) Return CcMusicDirs objects filtered by the type column
+ * @method     array findByExists(boolean $exists) Return CcMusicDirs objects filtered by the exists column
+ * @method     array findByWatched(boolean $watched) Return CcMusicDirs objects filtered by the watched column
  *
  * @package    propel.generator.airtime.om
  */
@@ -202,6 +210,40 @@ abstract class BaseCcMusicDirsQuery extends ModelCriteria
 		return $this->addUsingAlias(CcMusicDirsPeer::TYPE, $type, $comparison);
 	}
 
+	/**
+	 * Filter the query on the exists column
+	 * 
+	 * @param     boolean|string $exists The value to use as filter.
+	 *            Accepts strings ('false', 'off', '-', 'no', 'n', and '0' are false, the rest is true)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcMusicDirsQuery The current query, for fluid interface
+	 */
+	public function filterByExists($exists = null, $comparison = null)
+	{
+		if (is_string($exists)) {
+			$exists = in_array(strtolower($exists), array('false', 'off', '-', 'no', 'n', '0')) ? false : true;
+		}
+		return $this->addUsingAlias(CcMusicDirsPeer::EXISTS, $exists, $comparison);
+	}
+
+	/**
+	 * Filter the query on the watched column
+	 * 
+	 * @param     boolean|string $watched The value to use as filter.
+	 *            Accepts strings ('false', 'off', '-', 'no', 'n', and '0' are false, the rest is true)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcMusicDirsQuery The current query, for fluid interface
+	 */
+	public function filterByWatched($watched = null, $comparison = null)
+	{
+		if (is_string($watched)) {
+			$watched = in_array(strtolower($watched), array('false', 'off', '-', 'no', 'n', '0')) ? false : true;
+		}
+		return $this->addUsingAlias(CcMusicDirsPeer::WATCHED, $watched, $comparison);
+	}
+
 	/**
 	 * Filter the query by a related CcFiles object
 	 *

airtime_mvc/application/models/airtime/om/BaseCcPlaylist.php

@@ -63,6 +63,18 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 	 */
 	protected $mtime;
 
+	/**
+	 * The value for the utime field.
+	 * @var        string
+	 */
+	protected $utime;
+
+	/**
+	 * The value for the lptime field.
+	 * @var        string
+	 */
+	protected $lptime;
+
 	/**
 	 * The value for the creator field.
 	 * @var        string
@@ -205,6 +217,72 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 		}
 	}
 
+	/**
+	 * Get the [optionally formatted] temporal [utime] column value.
+	 * 
+	 *
+	 * @param      string $format The date/time format string (either date()-style or strftime()-style).
+	 *							If format is NULL, then the raw DateTime object will be returned.
+	 * @return     mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL
+	 * @throws     PropelException - if unable to parse/validate the date/time value.
+	 */
+	public function getDbUtime($format = 'Y-m-d H:i:s')
+	{
+		if ($this->utime === null) {
+			return null;
+		}
+
+
+
+		try {
+			$dt = new DateTime($this->utime);
+		} catch (Exception $x) {
+			throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->utime, true), $x);
+		}
+
+		if ($format === null) {
+			// Because propel.useDateTimeClass is TRUE, we return a DateTime object.
+			return $dt;
+		} elseif (strpos($format, '%') !== false) {
+			return strftime($format, $dt->format('U'));
+		} else {
+			return $dt->format($format);
+		}
+	}
+
+	/**
+	 * Get the [optionally formatted] temporal [lptime] column value.
+	 * 
+	 *
+	 * @param      string $format The date/time format string (either date()-style or strftime()-style).
+	 *							If format is NULL, then the raw DateTime object will be returned.
+	 * @return     mixed Formatted date/time value as string or DateTime object (if format is NULL), NULL if column is NULL
+	 * @throws     PropelException - if unable to parse/validate the date/time value.
+	 */
+	public function getDbLPtime($format = 'Y-m-d H:i:s')
+	{
+		if ($this->lptime === null) {
+			return null;
+		}
+
+
+
+		try {
+			$dt = new DateTime($this->lptime);
+		} catch (Exception $x) {
+			throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->lptime, true), $x);
+		}
+
+		if ($format === null) {
+			// Because propel.useDateTimeClass is TRUE, we return a DateTime object.
+			return $dt;
+		} elseif (strpos($format, '%') !== false) {
+			return strftime($format, $dt->format('U'));
+		} else {
+			return $dt->format($format);
+		}
+	}
+
 	/**
 	 * Get the [creator] column value.
 	 * 
@@ -378,6 +456,104 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 		return $this;
 	} // setDbMtime()
 
+	/**
+	 * Sets the value of [utime] column to a normalized version of the date/time value specified.
+	 * 
+	 * @param      mixed $v string, integer (timestamp), or DateTime value.  Empty string will
+	 *						be treated as NULL for temporal objects.
+	 * @return     CcPlaylist The current object (for fluent API support)
+	 */
+	public function setDbUtime($v)
+	{
+		// we treat '' as NULL for temporal objects because DateTime('') == DateTime('now')
+		// -- which is unexpected, to say the least.
+		if ($v === null || $v === '') {
+			$dt = null;
+		} elseif ($v instanceof DateTime) {
+			$dt = $v;
+		} else {
+			// some string/numeric value passed; we normalize that so that we can
+			// validate it.
+			try {
+				if (is_numeric($v)) { // if it's a unix timestamp
+					$dt = new DateTime('@'.$v, new DateTimeZone('UTC'));
+					// We have to explicitly specify and then change the time zone because of a
+					// DateTime bug: http://bugs.php.net/bug.php?id=43003
+					$dt->setTimeZone(new DateTimeZone(date_default_timezone_get()));
+				} else {
+					$dt = new DateTime($v);
+				}
+			} catch (Exception $x) {
+				throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
+			}
+		}
+
+		if ( $this->utime !== null || $dt !== null ) {
+			// (nested ifs are a little easier to read in this case)
+
+			$currNorm = ($this->utime !== null && $tmpDt = new DateTime($this->utime)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null;
+			$newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null;
+
+			if ( ($currNorm !== $newNorm) // normalized values don't match 
+					)
+			{
+				$this->utime = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null);
+				$this->modifiedColumns[] = CcPlaylistPeer::UTIME;
+			}
+		} // if either are not null
+
+		return $this;
+	} // setDbUtime()
+
+	/**
+	 * Sets the value of [lptime] column to a normalized version of the date/time value specified.
+	 * 
+	 * @param      mixed $v string, integer (timestamp), or DateTime value.  Empty string will
+	 *						be treated as NULL for temporal objects.
+	 * @return     CcPlaylist The current object (for fluent API support)
+	 */
+	public function setDbLPtime($v)
+	{
+		// we treat '' as NULL for temporal objects because DateTime('') == DateTime('now')
+		// -- which is unexpected, to say the least.
+		if ($v === null || $v === '') {
+			$dt = null;
+		} elseif ($v instanceof DateTime) {
+			$dt = $v;
+		} else {
+			// some string/numeric value passed; we normalize that so that we can
+			// validate it.
+			try {
+				if (is_numeric($v)) { // if it's a unix timestamp
+					$dt = new DateTime('@'.$v, new DateTimeZone('UTC'));
+					// We have to explicitly specify and then change the time zone because of a
+					// DateTime bug: http://bugs.php.net/bug.php?id=43003
+					$dt->setTimeZone(new DateTimeZone(date_default_timezone_get()));
+				} else {
+					$dt = new DateTime($v);
+				}
+			} catch (Exception $x) {
+				throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
+			}
+		}
+
+		if ( $this->lptime !== null || $dt !== null ) {
+			// (nested ifs are a little easier to read in this case)
+
+			$currNorm = ($this->lptime !== null && $tmpDt = new DateTime($this->lptime)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null;
+			$newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null;
+
+			if ( ($currNorm !== $newNorm) // normalized values don't match 
+					)
+			{
+				$this->lptime = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null);
+				$this->modifiedColumns[] = CcPlaylistPeer::LPTIME;
+			}
+		} // if either are not null
+
+		return $this;
+	} // setDbLPtime()
+
 	/**
 	 * Set the value of [creator] column.
 	 * 
@@ -468,8 +644,10 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 			$this->currentlyaccessing = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null;
 			$this->editedby = ($row[$startcol + 4] !== null) ? (int) $row[$startcol + 4] : null;
 			$this->mtime = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
-			$this->creator = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
-			$this->description = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
+			$this->utime = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
+			$this->lptime = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
+			$this->creator = ($row[$startcol + 8] !== null) ? (string) $row[$startcol + 8] : null;
+			$this->description = ($row[$startcol + 9] !== null) ? (string) $row[$startcol + 9] : null;
 			$this->resetModified();
 
 			$this->setNew(false);
@@ -478,7 +656,7 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 				$this->ensureConsistency();
 			}
 
-			return $startcol + 8; // 8 = CcPlaylistPeer::NUM_COLUMNS - CcPlaylistPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 10; // 10 = CcPlaylistPeer::NUM_COLUMNS - CcPlaylistPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating CcPlaylist object", $e);
@@ -842,9 +1020,15 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 				return $this->getDbMtime();
 				break;
 			case 6:
-				return $this->getDbCreator();
+				return $this->getDbUtime();
 				break;
 			case 7:
+				return $this->getDbLPtime();
+				break;
+			case 8:
+				return $this->getDbCreator();
+				break;
+			case 9:
 				return $this->getDbDescription();
 				break;
 			default:
@@ -877,8 +1061,10 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 			$keys[3] => $this->getDbCurrentlyaccessing(),
 			$keys[4] => $this->getDbEditedby(),
 			$keys[5] => $this->getDbMtime(),
-			$keys[6] => $this->getDbCreator(),
-			$keys[7] => $this->getDbDescription(),
+			$keys[6] => $this->getDbUtime(),
+			$keys[7] => $this->getDbLPtime(),
+			$keys[8] => $this->getDbCreator(),
+			$keys[9] => $this->getDbDescription(),
 		);
 		if ($includeForeignObjects) {
 			if (null !== $this->aCcSubjs) {
@@ -934,9 +1120,15 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 				$this->setDbMtime($value);
 				break;
 			case 6:
-				$this->setDbCreator($value);
+				$this->setDbUtime($value);
 				break;
 			case 7:
+				$this->setDbLPtime($value);
+				break;
+			case 8:
+				$this->setDbCreator($value);
+				break;
+			case 9:
 				$this->setDbDescription($value);
 				break;
 		} // switch()
@@ -969,8 +1161,10 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 		if (array_key_exists($keys[3], $arr)) $this->setDbCurrentlyaccessing($arr[$keys[3]]);
 		if (array_key_exists($keys[4], $arr)) $this->setDbEditedby($arr[$keys[4]]);
 		if (array_key_exists($keys[5], $arr)) $this->setDbMtime($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setDbCreator($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setDbDescription($arr[$keys[7]]);
+		if (array_key_exists($keys[6], $arr)) $this->setDbUtime($arr[$keys[6]]);
+		if (array_key_exists($keys[7], $arr)) $this->setDbLPtime($arr[$keys[7]]);
+		if (array_key_exists($keys[8], $arr)) $this->setDbCreator($arr[$keys[8]]);
+		if (array_key_exists($keys[9], $arr)) $this->setDbDescription($arr[$keys[9]]);
 	}
 
 	/**
@@ -988,6 +1182,8 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 		if ($this->isColumnModified(CcPlaylistPeer::CURRENTLYACCESSING)) $criteria->add(CcPlaylistPeer::CURRENTLYACCESSING, $this->currentlyaccessing);
 		if ($this->isColumnModified(CcPlaylistPeer::EDITEDBY)) $criteria->add(CcPlaylistPeer::EDITEDBY, $this->editedby);
 		if ($this->isColumnModified(CcPlaylistPeer::MTIME)) $criteria->add(CcPlaylistPeer::MTIME, $this->mtime);
+		if ($this->isColumnModified(CcPlaylistPeer::UTIME)) $criteria->add(CcPlaylistPeer::UTIME, $this->utime);
+		if ($this->isColumnModified(CcPlaylistPeer::LPTIME)) $criteria->add(CcPlaylistPeer::LPTIME, $this->lptime);
 		if ($this->isColumnModified(CcPlaylistPeer::CREATOR)) $criteria->add(CcPlaylistPeer::CREATOR, $this->creator);
 		if ($this->isColumnModified(CcPlaylistPeer::DESCRIPTION)) $criteria->add(CcPlaylistPeer::DESCRIPTION, $this->description);
 
@@ -1056,6 +1252,8 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 		$copyObj->setDbCurrentlyaccessing($this->currentlyaccessing);
 		$copyObj->setDbEditedby($this->editedby);
 		$copyObj->setDbMtime($this->mtime);
+		$copyObj->setDbUtime($this->utime);
+		$copyObj->setDbLPtime($this->lptime);
 		$copyObj->setDbCreator($this->creator);
 		$copyObj->setDbDescription($this->description);
 
@@ -1309,6 +1507,8 @@ abstract class BaseCcPlaylist extends BaseObject  implements Persistent
 		$this->currentlyaccessing = null;
 		$this->editedby = null;
 		$this->mtime = null;
+		$this->utime = null;
+		$this->lptime = null;
 		$this->creator = null;
 		$this->description = null;
 		$this->alreadyInSave = false;

airtime_mvc/application/models/airtime/om/BaseCcPlaylistPeer.php

@@ -26,7 +26,7 @@ abstract class BaseCcPlaylistPeer {
 	const TM_CLASS = 'CcPlaylistTableMap';
 	
 	/** The total number of columns. */
-	const NUM_COLUMNS = 8;
+	const NUM_COLUMNS = 10;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -49,6 +49,12 @@ abstract class BaseCcPlaylistPeer {
 	/** the column name for the MTIME field */
 	const MTIME = 'cc_playlist.MTIME';
 
+	/** the column name for the UTIME field */
+	const UTIME = 'cc_playlist.UTIME';
+
+	/** the column name for the LPTIME field */
+	const LPTIME = 'cc_playlist.LPTIME';
+
 	/** the column name for the CREATOR field */
 	const CREATOR = 'cc_playlist.CREATOR';
 
@@ -71,12 +77,12 @@ abstract class BaseCcPlaylistPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbName', 'DbState', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbCreator', 'DbDescription', ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbName', 'dbState', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbCreator', 'dbDescription', ),
-		BasePeer::TYPE_COLNAME => array (self::ID, self::NAME, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::CREATOR, self::DESCRIPTION, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'NAME', 'STATE', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'CREATOR', 'DESCRIPTION', ),
-		BasePeer::TYPE_FIELDNAME => array ('id', 'name', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'creator', 'description', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
+		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbName', 'DbState', 'DbCurrentlyaccessing', 'DbEditedby', 'DbMtime', 'DbUtime', 'DbLPtime', 'DbCreator', 'DbDescription', ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbName', 'dbState', 'dbCurrentlyaccessing', 'dbEditedby', 'dbMtime', 'dbUtime', 'dbLPtime', 'dbCreator', 'dbDescription', ),
+		BasePeer::TYPE_COLNAME => array (self::ID, self::NAME, self::STATE, self::CURRENTLYACCESSING, self::EDITEDBY, self::MTIME, self::UTIME, self::LPTIME, self::CREATOR, self::DESCRIPTION, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'NAME', 'STATE', 'CURRENTLYACCESSING', 'EDITEDBY', 'MTIME', 'UTIME', 'LPTIME', 'CREATOR', 'DESCRIPTION', ),
+		BasePeer::TYPE_FIELDNAME => array ('id', 'name', 'state', 'currentlyaccessing', 'editedby', 'mtime', 'utime', 'lptime', 'creator', 'description', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
 	);
 
 	/**
@@ -86,12 +92,12 @@ abstract class BaseCcPlaylistPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbName' => 1, 'DbState' => 2, 'DbCurrentlyaccessing' => 3, 'DbEditedby' => 4, 'DbMtime' => 5, 'DbCreator' => 6, 'DbDescription' => 7, ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbName' => 1, 'dbState' => 2, 'dbCurrentlyaccessing' => 3, 'dbEditedby' => 4, 'dbMtime' => 5, 'dbCreator' => 6, 'dbDescription' => 7, ),
-		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::NAME => 1, self::STATE => 2, self::CURRENTLYACCESSING => 3, self::EDITEDBY => 4, self::MTIME => 5, self::CREATOR => 6, self::DESCRIPTION => 7, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'NAME' => 1, 'STATE' => 2, 'CURRENTLYACCESSING' => 3, 'EDITEDBY' => 4, 'MTIME' => 5, 'CREATOR' => 6, 'DESCRIPTION' => 7, ),
-		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'name' => 1, 'state' => 2, 'currentlyaccessing' => 3, 'editedby' => 4, 'mtime' => 5, 'creator' => 6, 'description' => 7, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
+		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbName' => 1, 'DbState' => 2, 'DbCurrentlyaccessing' => 3, 'DbEditedby' => 4, 'DbMtime' => 5, 'DbUtime' => 6, 'DbLPtime' => 7, 'DbCreator' => 8, 'DbDescription' => 9, ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbName' => 1, 'dbState' => 2, 'dbCurrentlyaccessing' => 3, 'dbEditedby' => 4, 'dbMtime' => 5, 'dbUtime' => 6, 'dbLPtime' => 7, 'dbCreator' => 8, 'dbDescription' => 9, ),
+		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::NAME => 1, self::STATE => 2, self::CURRENTLYACCESSING => 3, self::EDITEDBY => 4, self::MTIME => 5, self::UTIME => 6, self::LPTIME => 7, self::CREATOR => 8, self::DESCRIPTION => 9, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'NAME' => 1, 'STATE' => 2, 'CURRENTLYACCESSING' => 3, 'EDITEDBY' => 4, 'MTIME' => 5, 'UTIME' => 6, 'LPTIME' => 7, 'CREATOR' => 8, 'DESCRIPTION' => 9, ),
+		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'name' => 1, 'state' => 2, 'currentlyaccessing' => 3, 'editedby' => 4, 'mtime' => 5, 'utime' => 6, 'lptime' => 7, 'creator' => 8, 'description' => 9, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
 	);
 
 	/**
@@ -169,6 +175,8 @@ abstract class BaseCcPlaylistPeer {
 			$criteria->addSelectColumn(CcPlaylistPeer::CURRENTLYACCESSING);
 			$criteria->addSelectColumn(CcPlaylistPeer::EDITEDBY);
 			$criteria->addSelectColumn(CcPlaylistPeer::MTIME);
+			$criteria->addSelectColumn(CcPlaylistPeer::UTIME);
+			$criteria->addSelectColumn(CcPlaylistPeer::LPTIME);
 			$criteria->addSelectColumn(CcPlaylistPeer::CREATOR);
 			$criteria->addSelectColumn(CcPlaylistPeer::DESCRIPTION);
 		} else {
@@ -178,6 +186,8 @@ abstract class BaseCcPlaylistPeer {
 			$criteria->addSelectColumn($alias . '.CURRENTLYACCESSING');
 			$criteria->addSelectColumn($alias . '.EDITEDBY');
 			$criteria->addSelectColumn($alias . '.MTIME');
+			$criteria->addSelectColumn($alias . '.UTIME');
+			$criteria->addSelectColumn($alias . '.LPTIME');
 			$criteria->addSelectColumn($alias . '.CREATOR');
 			$criteria->addSelectColumn($alias . '.DESCRIPTION');
 		}

airtime_mvc/application/models/airtime/om/BaseCcPlaylistQuery.php

@@ -12,6 +12,8 @@
  * @method     CcPlaylistQuery orderByDbCurrentlyaccessing($order = Criteria::ASC) Order by the currentlyaccessing column
  * @method     CcPlaylistQuery orderByDbEditedby($order = Criteria::ASC) Order by the editedby column
  * @method     CcPlaylistQuery orderByDbMtime($order = Criteria::ASC) Order by the mtime column
+ * @method     CcPlaylistQuery orderByDbUtime($order = Criteria::ASC) Order by the utime column
+ * @method     CcPlaylistQuery orderByDbLPtime($order = Criteria::ASC) Order by the lptime column
  * @method     CcPlaylistQuery orderByDbCreator($order = Criteria::ASC) Order by the creator column
  * @method     CcPlaylistQuery orderByDbDescription($order = Criteria::ASC) Order by the description column
  *
@@ -21,6 +23,8 @@
  * @method     CcPlaylistQuery groupByDbCurrentlyaccessing() Group by the currentlyaccessing column
  * @method     CcPlaylistQuery groupByDbEditedby() Group by the editedby column
  * @method     CcPlaylistQuery groupByDbMtime() Group by the mtime column
+ * @method     CcPlaylistQuery groupByDbUtime() Group by the utime column
+ * @method     CcPlaylistQuery groupByDbLPtime() Group by the lptime column
  * @method     CcPlaylistQuery groupByDbCreator() Group by the creator column
  * @method     CcPlaylistQuery groupByDbDescription() Group by the description column
  *
@@ -45,6 +49,8 @@
  * @method     CcPlaylist findOneByDbCurrentlyaccessing(int $currentlyaccessing) Return the first CcPlaylist filtered by the currentlyaccessing column
  * @method     CcPlaylist findOneByDbEditedby(int $editedby) Return the first CcPlaylist filtered by the editedby column
  * @method     CcPlaylist findOneByDbMtime(string $mtime) Return the first CcPlaylist filtered by the mtime column
+ * @method     CcPlaylist findOneByDbUtime(string $utime) Return the first CcPlaylist filtered by the utime column
+ * @method     CcPlaylist findOneByDbLPtime(string $lptime) Return the first CcPlaylist filtered by the lptime column
  * @method     CcPlaylist findOneByDbCreator(string $creator) Return the first CcPlaylist filtered by the creator column
  * @method     CcPlaylist findOneByDbDescription(string $description) Return the first CcPlaylist filtered by the description column
  *
@@ -54,6 +60,8 @@
  * @method     array findByDbCurrentlyaccessing(int $currentlyaccessing) Return CcPlaylist objects filtered by the currentlyaccessing column
  * @method     array findByDbEditedby(int $editedby) Return CcPlaylist objects filtered by the editedby column
  * @method     array findByDbMtime(string $mtime) Return CcPlaylist objects filtered by the mtime column
+ * @method     array findByDbUtime(string $utime) Return CcPlaylist objects filtered by the utime column
+ * @method     array findByDbLPtime(string $lptime) Return CcPlaylist objects filtered by the lptime column
  * @method     array findByDbCreator(string $creator) Return CcPlaylist objects filtered by the creator column
  * @method     array findByDbDescription(string $description) Return CcPlaylist objects filtered by the description column
  *
@@ -319,6 +327,68 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria
 		return $this->addUsingAlias(CcPlaylistPeer::MTIME, $dbMtime, $comparison);
 	}
 
+	/**
+	 * Filter the query on the utime column
+	 * 
+	 * @param     string|array $dbUtime The value to use as filter.
+	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcPlaylistQuery The current query, for fluid interface
+	 */
+	public function filterByDbUtime($dbUtime = null, $comparison = null)
+	{
+		if (is_array($dbUtime)) {
+			$useMinMax = false;
+			if (isset($dbUtime['min'])) {
+				$this->addUsingAlias(CcPlaylistPeer::UTIME, $dbUtime['min'], Criteria::GREATER_EQUAL);
+				$useMinMax = true;
+			}
+			if (isset($dbUtime['max'])) {
+				$this->addUsingAlias(CcPlaylistPeer::UTIME, $dbUtime['max'], Criteria::LESS_EQUAL);
+				$useMinMax = true;
+			}
+			if ($useMinMax) {
+				return $this;
+			}
+			if (null === $comparison) {
+				$comparison = Criteria::IN;
+			}
+		}
+		return $this->addUsingAlias(CcPlaylistPeer::UTIME, $dbUtime, $comparison);
+	}
+
+	/**
+	 * Filter the query on the lptime column
+	 * 
+	 * @param     string|array $dbLPtime The value to use as filter.
+	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcPlaylistQuery The current query, for fluid interface
+	 */
+	public function filterByDbLPtime($dbLPtime = null, $comparison = null)
+	{
+		if (is_array($dbLPtime)) {
+			$useMinMax = false;
+			if (isset($dbLPtime['min'])) {
+				$this->addUsingAlias(CcPlaylistPeer::LPTIME, $dbLPtime['min'], Criteria::GREATER_EQUAL);
+				$useMinMax = true;
+			}
+			if (isset($dbLPtime['max'])) {
+				$this->addUsingAlias(CcPlaylistPeer::LPTIME, $dbLPtime['max'], Criteria::LESS_EQUAL);
+				$useMinMax = true;
+			}
+			if ($useMinMax) {
+				return $this;
+			}
+			if (null === $comparison) {
+				$comparison = Criteria::IN;
+			}
+		}
+		return $this->addUsingAlias(CcPlaylistPeer::LPTIME, $dbLPtime, $comparison);
+	}
+
 	/**
 	 * Filter the query on the creator column
 	 * 

airtime_mvc/application/models/airtime/om/BaseCcSubjs.php

@@ -137,6 +137,11 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 	 */
 	protected $collCcSesss;
 
+	/**
+	 * @var        array CcSubjsToken[] Collection to store aggregation of CcSubjsToken objects.
+	 */
+	protected $collCcSubjsTokens;
+
 	/**
 	 * Flag to prevent endless save loop, if this object is referenced
 	 * by another object which falls in this transaction.
@@ -793,6 +798,8 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 
 			$this->collCcSesss = null;
 
+			$this->collCcSubjsTokens = null;
+
 		} // if (deep)
 	}
 
@@ -982,6 +989,14 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 				}
 			}
 
+			if ($this->collCcSubjsTokens !== null) {
+				foreach ($this->collCcSubjsTokens as $referrerFK) {
+					if (!$referrerFK->isDeleted()) {
+						$affectedRows += $referrerFK->save($con);
+					}
+				}
+			}
+
 			$this->alreadyInSave = false;
 
 		}
@@ -1109,6 +1124,14 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 					}
 				}
 
+				if ($this->collCcSubjsTokens !== null) {
+					foreach ($this->collCcSubjsTokens as $referrerFK) {
+						if (!$referrerFK->validate($columns)) {
+							$failureMap = array_merge($failureMap, $referrerFK->getValidationFailures());
+						}
+					}
+				}
+
 
 			$this->alreadyInValidation = false;
 		}
@@ -1459,6 +1482,12 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 				}
 			}
 
+			foreach ($this->getCcSubjsTokens() as $relObj) {
+				if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
+					$copyObj->addCcSubjsToken($relObj->copy($deepCopy));
+				}
+			}
+
 		} // if ($deepCopy)
 
 
@@ -2317,6 +2346,115 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		}
 	}
 
+	/**
+	 * Clears out the collCcSubjsTokens collection
+	 *
+	 * This does not modify the database; however, it will remove any associated objects, causing
+	 * them to be refetched by subsequent calls to accessor method.
+	 *
+	 * @return     void
+	 * @see        addCcSubjsTokens()
+	 */
+	public function clearCcSubjsTokens()
+	{
+		$this->collCcSubjsTokens = null; // important to set this to NULL since that means it is uninitialized
+	}
+
+	/**
+	 * Initializes the collCcSubjsTokens collection.
+	 *
+	 * By default this just sets the collCcSubjsTokens collection to an empty array (like clearcollCcSubjsTokens());
+	 * however, you may wish to override this method in your stub class to provide setting appropriate
+	 * to your application -- for example, setting the initial array to the values stored in database.
+	 *
+	 * @return     void
+	 */
+	public function initCcSubjsTokens()
+	{
+		$this->collCcSubjsTokens = new PropelObjectCollection();
+		$this->collCcSubjsTokens->setModel('CcSubjsToken');
+	}
+
+	/**
+	 * Gets an array of CcSubjsToken objects which contain a foreign key that references this object.
+	 *
+	 * If the $criteria is not null, it is used to always fetch the results from the database.
+	 * Otherwise the results are fetched from the database the first time, then cached.
+	 * Next time the same method is called without $criteria, the cached collection is returned.
+	 * If this CcSubjs is new, it will return
+	 * an empty collection or the current collection; the criteria is ignored on a new object.
+	 *
+	 * @param      Criteria $criteria optional Criteria object to narrow the query
+	 * @param      PropelPDO $con optional connection object
+	 * @return     PropelCollection|array CcSubjsToken[] List of CcSubjsToken objects
+	 * @throws     PropelException
+	 */
+	public function getCcSubjsTokens($criteria = null, PropelPDO $con = null)
+	{
+		if(null === $this->collCcSubjsTokens || null !== $criteria) {
+			if ($this->isNew() && null === $this->collCcSubjsTokens) {
+				// return empty collection
+				$this->initCcSubjsTokens();
+			} else {
+				$collCcSubjsTokens = CcSubjsTokenQuery::create(null, $criteria)
+					->filterByCcSubjs($this)
+					->find($con);
+				if (null !== $criteria) {
+					return $collCcSubjsTokens;
+				}
+				$this->collCcSubjsTokens = $collCcSubjsTokens;
+			}
+		}
+		return $this->collCcSubjsTokens;
+	}
+
+	/**
+	 * Returns the number of related CcSubjsToken objects.
+	 *
+	 * @param      Criteria $criteria
+	 * @param      boolean $distinct
+	 * @param      PropelPDO $con
+	 * @return     int Count of related CcSubjsToken objects.
+	 * @throws     PropelException
+	 */
+	public function countCcSubjsTokens(Criteria $criteria = null, $distinct = false, PropelPDO $con = null)
+	{
+		if(null === $this->collCcSubjsTokens || null !== $criteria) {
+			if ($this->isNew() && null === $this->collCcSubjsTokens) {
+				return 0;
+			} else {
+				$query = CcSubjsTokenQuery::create(null, $criteria);
+				if($distinct) {
+					$query->distinct();
+				}
+				return $query
+					->filterByCcSubjs($this)
+					->count($con);
+			}
+		} else {
+			return count($this->collCcSubjsTokens);
+		}
+	}
+
+	/**
+	 * Method called to associate a CcSubjsToken object to this object
+	 * through the CcSubjsToken foreign key attribute.
+	 *
+	 * @param      CcSubjsToken $l CcSubjsToken
+	 * @return     void
+	 * @throws     PropelException
+	 */
+	public function addCcSubjsToken(CcSubjsToken $l)
+	{
+		if ($this->collCcSubjsTokens === null) {
+			$this->initCcSubjsTokens();
+		}
+		if (!$this->collCcSubjsTokens->contains($l)) { // only add it if the **same** object is not already associated
+			$this->collCcSubjsTokens[]= $l;
+			$l->setCcSubjs($this);
+		}
+	}
+
 	/**
 	 * Clears the current object and sets all attributes to their default values
 	 */
@@ -2390,6 +2528,11 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 					$o->clearAllReferences($deep);
 				}
 			}
+			if ($this->collCcSubjsTokens) {
+				foreach ((array) $this->collCcSubjsTokens as $o) {
+					$o->clearAllReferences($deep);
+				}
+			}
 		} // if ($deep)
 
 		$this->collCcAccesss = null;
@@ -2399,6 +2542,7 @@ abstract class BaseCcSubjs extends BaseObject  implements Persistent
 		$this->collCcPlaylists = null;
 		$this->collCcPrefs = null;
 		$this->collCcSesss = null;
+		$this->collCcSubjsTokens = null;
 	}
 
 	/**

airtime_mvc/application/models/airtime/om/BaseCcSubjsPeer.php

@@ -405,6 +405,9 @@ abstract class BaseCcSubjsPeer {
 		// Invalidate objects in CcSessPeer instance pool, 
 		// since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
 		CcSessPeer::clearInstancePool();
+		// Invalidate objects in CcSubjsTokenPeer instance pool, 
+		// since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
+		CcSubjsTokenPeer::clearInstancePool();
 	}
 
 	/**

airtime_mvc/application/models/airtime/om/BaseCcSubjsQuery.php

@@ -64,6 +64,10 @@
  * @method     CcSubjsQuery rightJoinCcSess($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcSess relation
  * @method     CcSubjsQuery innerJoinCcSess($relationAlias = '') Adds a INNER JOIN clause to the query using the CcSess relation
  *
+ * @method     CcSubjsQuery leftJoinCcSubjsToken($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcSubjsToken relation
+ * @method     CcSubjsQuery rightJoinCcSubjsToken($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcSubjsToken relation
+ * @method     CcSubjsQuery innerJoinCcSubjsToken($relationAlias = '') Adds a INNER JOIN clause to the query using the CcSubjsToken relation
+ *
  * @method     CcSubjs findOne(PropelPDO $con = null) Return the first CcSubjs matching the query
  * @method     CcSubjs findOneOrCreate(PropelPDO $con = null) Return the first CcSubjs matching the query, or a new CcSubjs object populated from the query conditions when no match is found
  *
@@ -935,6 +939,70 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
 			->useQuery($relationAlias ? $relationAlias : 'CcSess', 'CcSessQuery');
 	}
 
+	/**
+	 * Filter the query by a related CcSubjsToken object
+	 *
+	 * @param     CcSubjsToken $ccSubjsToken  the related object to use as filter
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsQuery The current query, for fluid interface
+	 */
+	public function filterByCcSubjsToken($ccSubjsToken, $comparison = null)
+	{
+		return $this
+			->addUsingAlias(CcSubjsPeer::ID, $ccSubjsToken->getDbUserId(), $comparison);
+	}
+
+	/**
+	 * Adds a JOIN clause to the query using the CcSubjsToken relation
+	 * 
+	 * @param     string $relationAlias optional alias for the relation
+	 * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+	 *
+	 * @return    CcSubjsQuery The current query, for fluid interface
+	 */
+	public function joinCcSubjsToken($relationAlias = '', $joinType = Criteria::INNER_JOIN)
+	{
+		$tableMap = $this->getTableMap();
+		$relationMap = $tableMap->getRelation('CcSubjsToken');
+		
+		// create a ModelJoin object for this join
+		$join = new ModelJoin();
+		$join->setJoinType($joinType);
+		$join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+		if ($previousJoin = $this->getPreviousJoin()) {
+			$join->setPreviousJoin($previousJoin);
+		}
+		
+		// add the ModelJoin to the current object
+		if($relationAlias) {
+			$this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+			$this->addJoinObject($join, $relationAlias);
+		} else {
+			$this->addJoinObject($join, 'CcSubjsToken');
+		}
+		
+		return $this;
+	}
+
+	/**
+	 * Use the CcSubjsToken relation CcSubjsToken object
+	 *
+	 * @see       useQuery()
+	 * 
+	 * @param     string $relationAlias optional alias for the relation,
+	 *                                   to be used as main alias in the secondary query
+	 * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+	 *
+	 * @return    CcSubjsTokenQuery A secondary query class using the current class as primary query
+	 */
+	public function useCcSubjsTokenQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN)
+	{
+		return $this
+			->joinCcSubjsToken($relationAlias, $joinType)
+			->useQuery($relationAlias ? $relationAlias : 'CcSubjsToken', 'CcSubjsTokenQuery');
+	}
+
 	/**
 	 * Exclude object from result
 	 *

airtime_mvc/application/models/airtime/om/BaseCcSubjsTokenPeer.php

@@ -0,0 +1,988 @@
+<?php
+
+
+/**
+ * Base static class for performing query and update operations on the 'cc_subjs_token' table.
+ *
+ * 
+ *
+ * @package    propel.generator.airtime.om
+ */
+abstract class BaseCcSubjsTokenPeer {
+
+	/** the default database name for this class */
+	const DATABASE_NAME = 'airtime';
+
+	/** the table name for this class */
+	const TABLE_NAME = 'cc_subjs_token';
+
+	/** the related Propel class for this table */
+	const OM_CLASS = 'CcSubjsToken';
+
+	/** A class that can be returned by this peer. */
+	const CLASS_DEFAULT = 'airtime.CcSubjsToken';
+
+	/** the related TableMap class for this table */
+	const TM_CLASS = 'CcSubjsTokenTableMap';
+	
+	/** The total number of columns. */
+	const NUM_COLUMNS = 5;
+
+	/** The number of lazy-loaded columns. */
+	const NUM_LAZY_LOAD_COLUMNS = 0;
+
+	/** the column name for the ID field */
+	const ID = 'cc_subjs_token.ID';
+
+	/** the column name for the USER_ID field */
+	const USER_ID = 'cc_subjs_token.USER_ID';
+
+	/** the column name for the ACTION field */
+	const ACTION = 'cc_subjs_token.ACTION';
+
+	/** the column name for the TOKEN field */
+	const TOKEN = 'cc_subjs_token.TOKEN';
+
+	/** the column name for the CREATED field */
+	const CREATED = 'cc_subjs_token.CREATED';
+
+	/**
+	 * An identiy map to hold any loaded instances of CcSubjsToken objects.
+	 * This must be public so that other peer classes can access this when hydrating from JOIN
+	 * queries.
+	 * @var        array CcSubjsToken[]
+	 */
+	public static $instances = array();
+
+
+	/**
+	 * holds an array of fieldnames
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+	 */
+	private static $fieldNames = array (
+		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbUserId', 'DbAction', 'DbToken', 'DbCreated', ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbUserId', 'dbAction', 'dbToken', 'dbCreated', ),
+		BasePeer::TYPE_COLNAME => array (self::ID, self::USER_ID, self::ACTION, self::TOKEN, self::CREATED, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'USER_ID', 'ACTION', 'TOKEN', 'CREATED', ),
+		BasePeer::TYPE_FIELDNAME => array ('id', 'user_id', 'action', 'token', 'created', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
+	);
+
+	/**
+	 * holds an array of keys for quick access to the fieldnames array
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
+	 */
+	private static $fieldKeys = array (
+		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbUserId' => 1, 'DbAction' => 2, 'DbToken' => 3, 'DbCreated' => 4, ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbUserId' => 1, 'dbAction' => 2, 'dbToken' => 3, 'dbCreated' => 4, ),
+		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::USER_ID => 1, self::ACTION => 2, self::TOKEN => 3, self::CREATED => 4, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'USER_ID' => 1, 'ACTION' => 2, 'TOKEN' => 3, 'CREATED' => 4, ),
+		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'user_id' => 1, 'action' => 2, 'token' => 3, 'created' => 4, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
+	);
+
+	/**
+	 * Translates a fieldname to another type
+	 *
+	 * @param      string $name field name
+	 * @param      string $fromType One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
+	 *                         BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
+	 * @param      string $toType   One of the class type constants
+	 * @return     string translated name of the field.
+	 * @throws     PropelException - if the specified name could not be found in the fieldname mappings.
+	 */
+	static public function translateFieldName($name, $fromType, $toType)
+	{
+		$toNames = self::getFieldNames($toType);
+		$key = isset(self::$fieldKeys[$fromType][$name]) ? self::$fieldKeys[$fromType][$name] : null;
+		if ($key === null) {
+			throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(self::$fieldKeys[$fromType], true));
+		}
+		return $toNames[$key];
+	}
+
+	/**
+	 * Returns an array of field names.
+	 *
+	 * @param      string $type The type of fieldnames to return:
+	 *                      One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
+	 *                      BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
+	 * @return     array A list of field names
+	 */
+
+	static public function getFieldNames($type = BasePeer::TYPE_PHPNAME)
+	{
+		if (!array_key_exists($type, self::$fieldNames)) {
+			throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. ' . $type . ' was given.');
+		}
+		return self::$fieldNames[$type];
+	}
+
+	/**
+	 * Convenience method which changes table.column to alias.column.
+	 *
+	 * Using this method you can maintain SQL abstraction while using column aliases.
+	 * <code>
+	 *		$c->addAlias("alias1", TablePeer::TABLE_NAME);
+	 *		$c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
+	 * </code>
+	 * @param      string $alias The alias for the current table.
+	 * @param      string $column The column name for current table. (i.e. CcSubjsTokenPeer::COLUMN_NAME).
+	 * @return     string
+	 */
+	public static function alias($alias, $column)
+	{
+		return str_replace(CcSubjsTokenPeer::TABLE_NAME.'.', $alias.'.', $column);
+	}
+
+	/**
+	 * Add all the columns needed to create a new object.
+	 *
+	 * Note: any columns that were marked with lazyLoad="true" in the
+	 * XML schema will not be added to the select list and only loaded
+	 * on demand.
+	 *
+	 * @param      Criteria $criteria object containing the columns to add.
+	 * @param      string   $alias    optional table alias
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function addSelectColumns(Criteria $criteria, $alias = null)
+	{
+		if (null === $alias) {
+			$criteria->addSelectColumn(CcSubjsTokenPeer::ID);
+			$criteria->addSelectColumn(CcSubjsTokenPeer::USER_ID);
+			$criteria->addSelectColumn(CcSubjsTokenPeer::ACTION);
+			$criteria->addSelectColumn(CcSubjsTokenPeer::TOKEN);
+			$criteria->addSelectColumn(CcSubjsTokenPeer::CREATED);
+		} else {
+			$criteria->addSelectColumn($alias . '.ID');
+			$criteria->addSelectColumn($alias . '.USER_ID');
+			$criteria->addSelectColumn($alias . '.ACTION');
+			$criteria->addSelectColumn($alias . '.TOKEN');
+			$criteria->addSelectColumn($alias . '.CREATED');
+		}
+	}
+
+	/**
+	 * Returns the number of rows matching criteria.
+	 *
+	 * @param      Criteria $criteria
+	 * @param      boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
+	 * @param      PropelPDO $con
+	 * @return     int Number of matching rows.
+	 */
+	public static function doCount(Criteria $criteria, $distinct = false, PropelPDO $con = null)
+	{
+		// we may modify criteria, so copy it first
+		$criteria = clone $criteria;
+
+		// We need to set the primary table name, since in the case that there are no WHERE columns
+		// it will be impossible for the BasePeer::createSelectSql() method to determine which
+		// tables go into the FROM clause.
+		$criteria->setPrimaryTableName(CcSubjsTokenPeer::TABLE_NAME);
+
+		if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
+			$criteria->setDistinct();
+		}
+
+		if (!$criteria->hasSelectClause()) {
+			CcSubjsTokenPeer::addSelectColumns($criteria);
+		}
+
+		$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
+		$criteria->setDbName(self::DATABASE_NAME); // Set the correct dbName
+
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+		}
+		// BasePeer returns a PDOStatement
+		$stmt = BasePeer::doCount($criteria, $con);
+
+		if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+			$count = (int) $row[0];
+		} else {
+			$count = 0; // no rows returned; we infer that means 0 matches.
+		}
+		$stmt->closeCursor();
+		return $count;
+	}
+	/**
+	 * Method to select one object from the DB.
+	 *
+	 * @param      Criteria $criteria object used to create the SELECT statement.
+	 * @param      PropelPDO $con
+	 * @return     CcSubjsToken
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doSelectOne(Criteria $criteria, PropelPDO $con = null)
+	{
+		$critcopy = clone $criteria;
+		$critcopy->setLimit(1);
+		$objects = CcSubjsTokenPeer::doSelect($critcopy, $con);
+		if ($objects) {
+			return $objects[0];
+		}
+		return null;
+	}
+	/**
+	 * Method to do selects.
+	 *
+	 * @param      Criteria $criteria The Criteria object used to build the SELECT statement.
+	 * @param      PropelPDO $con
+	 * @return     array Array of selected Objects
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doSelect(Criteria $criteria, PropelPDO $con = null)
+	{
+		return CcSubjsTokenPeer::populateObjects(CcSubjsTokenPeer::doSelectStmt($criteria, $con));
+	}
+	/**
+	 * Prepares the Criteria object and uses the parent doSelect() method to execute a PDOStatement.
+	 *
+	 * Use this method directly if you want to work with an executed statement durirectly (for example
+	 * to perform your own object hydration).
+	 *
+	 * @param      Criteria $criteria The Criteria object used to build the SELECT statement.
+	 * @param      PropelPDO $con The connection to use
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 * @return     PDOStatement The executed PDOStatement object.
+	 * @see        BasePeer::doSelect()
+	 */
+	public static function doSelectStmt(Criteria $criteria, PropelPDO $con = null)
+	{
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+		}
+
+		if (!$criteria->hasSelectClause()) {
+			$criteria = clone $criteria;
+			CcSubjsTokenPeer::addSelectColumns($criteria);
+		}
+
+		// Set the correct dbName
+		$criteria->setDbName(self::DATABASE_NAME);
+
+		// BasePeer returns a PDOStatement
+		return BasePeer::doSelect($criteria, $con);
+	}
+	/**
+	 * Adds an object to the instance pool.
+	 *
+	 * Propel keeps cached copies of objects in an instance pool when they are retrieved
+	 * from the database.  In some cases -- especially when you override doSelect*()
+	 * methods in your stub classes -- you may need to explicitly add objects
+	 * to the cache in order to ensure that the same objects are always returned by doSelect*()
+	 * and retrieveByPK*() calls.
+	 *
+	 * @param      CcSubjsToken $value A CcSubjsToken object.
+	 * @param      string $key (optional) key to use for instance map (for performance boost if key was already calculated externally).
+	 */
+	public static function addInstanceToPool(CcSubjsToken $obj, $key = null)
+	{
+		if (Propel::isInstancePoolingEnabled()) {
+			if ($key === null) {
+				$key = (string) $obj->getDbId();
+			} // if key === null
+			self::$instances[$key] = $obj;
+		}
+	}
+
+	/**
+	 * Removes an object from the instance pool.
+	 *
+	 * Propel keeps cached copies of objects in an instance pool when they are retrieved
+	 * from the database.  In some cases -- especially when you override doDelete
+	 * methods in your stub classes -- you may need to explicitly remove objects
+	 * from the cache in order to prevent returning objects that no longer exist.
+	 *
+	 * @param      mixed $value A CcSubjsToken object or a primary key value.
+	 */
+	public static function removeInstanceFromPool($value)
+	{
+		if (Propel::isInstancePoolingEnabled() && $value !== null) {
+			if (is_object($value) && $value instanceof CcSubjsToken) {
+				$key = (string) $value->getDbId();
+			} elseif (is_scalar($value)) {
+				// assume we've been passed a primary key
+				$key = (string) $value;
+			} else {
+				$e = new PropelException("Invalid value passed to removeInstanceFromPool().  Expected primary key or CcSubjsToken object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value,true)));
+				throw $e;
+			}
+
+			unset(self::$instances[$key]);
+		}
+	} // removeInstanceFromPool()
+
+	/**
+	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+	 *
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
+	 *
+	 * @param      string $key The key (@see getPrimaryKeyHash()) for this instance.
+	 * @return     CcSubjsToken Found object or NULL if 1) no instance exists for specified key or 2) instance pooling has been disabled.
+	 * @see        getPrimaryKeyHash()
+	 */
+	public static function getInstanceFromPool($key)
+	{
+		if (Propel::isInstancePoolingEnabled()) {
+			if (isset(self::$instances[$key])) {
+				return self::$instances[$key];
+			}
+		}
+		return null; // just to be explicit
+	}
+	
+	/**
+	 * Clear the instance pool.
+	 *
+	 * @return     void
+	 */
+	public static function clearInstancePool()
+	{
+		self::$instances = array();
+	}
+	
+	/**
+	 * Method to invalidate the instance pool of all tables related to cc_subjs_token
+	 * by a foreign key with ON DELETE CASCADE
+	 */
+	public static function clearRelatedInstancePool()
+	{
+	}
+
+	/**
+	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+	 *
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
+	 *
+	 * @param      array $row PropelPDO resultset row.
+	 * @param      int $startcol The 0-based offset for reading from the resultset row.
+	 * @return     string A string version of PK or NULL if the components of primary key in result array are all null.
+	 */
+	public static function getPrimaryKeyHashFromRow($row, $startcol = 0)
+	{
+		// If the PK cannot be derived from the row, return NULL.
+		if ($row[$startcol] === null) {
+			return null;
+		}
+		return (string) $row[$startcol];
+	}
+
+	/**
+	 * Retrieves the primary key from the DB resultset row 
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, an array of the primary key columns will be returned.
+	 *
+	 * @param      array $row PropelPDO resultset row.
+	 * @param      int $startcol The 0-based offset for reading from the resultset row.
+	 * @return     mixed The primary key of the row
+	 */
+	public static function getPrimaryKeyFromRow($row, $startcol = 0)
+	{
+		return (int) $row[$startcol];
+	}
+	
+	/**
+	 * The returned array will contain objects of the default type or
+	 * objects that inherit from the default.
+	 *
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function populateObjects(PDOStatement $stmt)
+	{
+		$results = array();
+	
+		// set the class once to avoid overhead in the loop
+		$cls = CcSubjsTokenPeer::getOMClass(false);
+		// populate the object(s)
+		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+			$key = CcSubjsTokenPeer::getPrimaryKeyHashFromRow($row, 0);
+			if (null !== ($obj = CcSubjsTokenPeer::getInstanceFromPool($key))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj->hydrate($row, 0, true); // rehydrate
+				$results[] = $obj;
+			} else {
+				$obj = new $cls();
+				$obj->hydrate($row);
+				$results[] = $obj;
+				CcSubjsTokenPeer::addInstanceToPool($obj, $key);
+			} // if key exists
+		}
+		$stmt->closeCursor();
+		return $results;
+	}
+	/**
+	 * Populates an object of the default type or an object that inherit from the default.
+	 *
+	 * @param      array $row PropelPDO resultset row.
+	 * @param      int $startcol The 0-based offset for reading from the resultset row.
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 * @return     array (CcSubjsToken object, last column rank)
+	 */
+	public static function populateObject($row, $startcol = 0)
+	{
+		$key = CcSubjsTokenPeer::getPrimaryKeyHashFromRow($row, $startcol);
+		if (null !== ($obj = CcSubjsTokenPeer::getInstanceFromPool($key))) {
+			// We no longer rehydrate the object, since this can cause data loss.
+			// See http://www.propelorm.org/ticket/509
+			// $obj->hydrate($row, $startcol, true); // rehydrate
+			$col = $startcol + CcSubjsTokenPeer::NUM_COLUMNS;
+		} else {
+			$cls = CcSubjsTokenPeer::OM_CLASS;
+			$obj = new $cls();
+			$col = $obj->hydrate($row, $startcol);
+			CcSubjsTokenPeer::addInstanceToPool($obj, $key);
+		}
+		return array($obj, $col);
+	}
+
+	/**
+	 * Returns the number of rows matching criteria, joining the related CcSubjs table
+	 *
+	 * @param      Criteria $criteria
+	 * @param      boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
+	 * @param      PropelPDO $con
+	 * @param      String    $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN
+	 * @return     int Number of matching rows.
+	 */
+	public static function doCountJoinCcSubjs(Criteria $criteria, $distinct = false, PropelPDO $con = null, $join_behavior = Criteria::LEFT_JOIN)
+	{
+		// we're going to modify criteria, so copy it first
+		$criteria = clone $criteria;
+
+		// We need to set the primary table name, since in the case that there are no WHERE columns
+		// it will be impossible for the BasePeer::createSelectSql() method to determine which
+		// tables go into the FROM clause.
+		$criteria->setPrimaryTableName(CcSubjsTokenPeer::TABLE_NAME);
+
+		if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
+			$criteria->setDistinct();
+		}
+
+		if (!$criteria->hasSelectClause()) {
+			CcSubjsTokenPeer::addSelectColumns($criteria);
+		}
+		
+		$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
+		
+		// Set the correct dbName
+		$criteria->setDbName(self::DATABASE_NAME);
+
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+		}
+
+		$criteria->addJoin(CcSubjsTokenPeer::USER_ID, CcSubjsPeer::ID, $join_behavior);
+
+		$stmt = BasePeer::doCount($criteria, $con);
+
+		if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+			$count = (int) $row[0];
+		} else {
+			$count = 0; // no rows returned; we infer that means 0 matches.
+		}
+		$stmt->closeCursor();
+		return $count;
+	}
+
+
+	/**
+	 * Selects a collection of CcSubjsToken objects pre-filled with their CcSubjs objects.
+	 * @param      Criteria  $criteria
+	 * @param      PropelPDO $con
+	 * @param      String    $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN
+	 * @return     array Array of CcSubjsToken objects.
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doSelectJoinCcSubjs(Criteria $criteria, $con = null, $join_behavior = Criteria::LEFT_JOIN)
+	{
+		$criteria = clone $criteria;
+
+		// Set the correct dbName if it has not been overridden
+		if ($criteria->getDbName() == Propel::getDefaultDB()) {
+			$criteria->setDbName(self::DATABASE_NAME);
+		}
+
+		CcSubjsTokenPeer::addSelectColumns($criteria);
+		$startcol = (CcSubjsTokenPeer::NUM_COLUMNS - CcSubjsTokenPeer::NUM_LAZY_LOAD_COLUMNS);
+		CcSubjsPeer::addSelectColumns($criteria);
+
+		$criteria->addJoin(CcSubjsTokenPeer::USER_ID, CcSubjsPeer::ID, $join_behavior);
+
+		$stmt = BasePeer::doSelect($criteria, $con);
+		$results = array();
+
+		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+			$key1 = CcSubjsTokenPeer::getPrimaryKeyHashFromRow($row, 0);
+			if (null !== ($obj1 = CcSubjsTokenPeer::getInstanceFromPool($key1))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj1->hydrate($row, 0, true); // rehydrate
+			} else {
+
+				$cls = CcSubjsTokenPeer::getOMClass(false);
+
+				$obj1 = new $cls();
+				$obj1->hydrate($row);
+				CcSubjsTokenPeer::addInstanceToPool($obj1, $key1);
+			} // if $obj1 already loaded
+
+			$key2 = CcSubjsPeer::getPrimaryKeyHashFromRow($row, $startcol);
+			if ($key2 !== null) {
+				$obj2 = CcSubjsPeer::getInstanceFromPool($key2);
+				if (!$obj2) {
+
+					$cls = CcSubjsPeer::getOMClass(false);
+
+					$obj2 = new $cls();
+					$obj2->hydrate($row, $startcol);
+					CcSubjsPeer::addInstanceToPool($obj2, $key2);
+				} // if obj2 already loaded
+
+				// Add the $obj1 (CcSubjsToken) to $obj2 (CcSubjs)
+				$obj2->addCcSubjsToken($obj1);
+
+			} // if joined row was not null
+
+			$results[] = $obj1;
+		}
+		$stmt->closeCursor();
+		return $results;
+	}
+
+
+	/**
+	 * Returns the number of rows matching criteria, joining all related tables
+	 *
+	 * @param      Criteria $criteria
+	 * @param      boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
+	 * @param      PropelPDO $con
+	 * @param      String    $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN
+	 * @return     int Number of matching rows.
+	 */
+	public static function doCountJoinAll(Criteria $criteria, $distinct = false, PropelPDO $con = null, $join_behavior = Criteria::LEFT_JOIN)
+	{
+		// we're going to modify criteria, so copy it first
+		$criteria = clone $criteria;
+
+		// We need to set the primary table name, since in the case that there are no WHERE columns
+		// it will be impossible for the BasePeer::createSelectSql() method to determine which
+		// tables go into the FROM clause.
+		$criteria->setPrimaryTableName(CcSubjsTokenPeer::TABLE_NAME);
+
+		if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
+			$criteria->setDistinct();
+		}
+
+		if (!$criteria->hasSelectClause()) {
+			CcSubjsTokenPeer::addSelectColumns($criteria);
+		}
+		
+		$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
+		
+		// Set the correct dbName
+		$criteria->setDbName(self::DATABASE_NAME);
+
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+		}
+
+		$criteria->addJoin(CcSubjsTokenPeer::USER_ID, CcSubjsPeer::ID, $join_behavior);
+
+		$stmt = BasePeer::doCount($criteria, $con);
+
+		if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+			$count = (int) $row[0];
+		} else {
+			$count = 0; // no rows returned; we infer that means 0 matches.
+		}
+		$stmt->closeCursor();
+		return $count;
+	}
+
+	/**
+	 * Selects a collection of CcSubjsToken objects pre-filled with all related objects.
+	 *
+	 * @param      Criteria  $criteria
+	 * @param      PropelPDO $con
+	 * @param      String    $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN
+	 * @return     array Array of CcSubjsToken objects.
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doSelectJoinAll(Criteria $criteria, $con = null, $join_behavior = Criteria::LEFT_JOIN)
+	{
+		$criteria = clone $criteria;
+
+		// Set the correct dbName if it has not been overridden
+		if ($criteria->getDbName() == Propel::getDefaultDB()) {
+			$criteria->setDbName(self::DATABASE_NAME);
+		}
+
+		CcSubjsTokenPeer::addSelectColumns($criteria);
+		$startcol2 = (CcSubjsTokenPeer::NUM_COLUMNS - CcSubjsTokenPeer::NUM_LAZY_LOAD_COLUMNS);
+
+		CcSubjsPeer::addSelectColumns($criteria);
+		$startcol3 = $startcol2 + (CcSubjsPeer::NUM_COLUMNS - CcSubjsPeer::NUM_LAZY_LOAD_COLUMNS);
+
+		$criteria->addJoin(CcSubjsTokenPeer::USER_ID, CcSubjsPeer::ID, $join_behavior);
+
+		$stmt = BasePeer::doSelect($criteria, $con);
+		$results = array();
+
+		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+			$key1 = CcSubjsTokenPeer::getPrimaryKeyHashFromRow($row, 0);
+			if (null !== ($obj1 = CcSubjsTokenPeer::getInstanceFromPool($key1))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj1->hydrate($row, 0, true); // rehydrate
+			} else {
+				$cls = CcSubjsTokenPeer::getOMClass(false);
+
+				$obj1 = new $cls();
+				$obj1->hydrate($row);
+				CcSubjsTokenPeer::addInstanceToPool($obj1, $key1);
+			} // if obj1 already loaded
+
+			// Add objects for joined CcSubjs rows
+
+			$key2 = CcSubjsPeer::getPrimaryKeyHashFromRow($row, $startcol2);
+			if ($key2 !== null) {
+				$obj2 = CcSubjsPeer::getInstanceFromPool($key2);
+				if (!$obj2) {
+
+					$cls = CcSubjsPeer::getOMClass(false);
+
+					$obj2 = new $cls();
+					$obj2->hydrate($row, $startcol2);
+					CcSubjsPeer::addInstanceToPool($obj2, $key2);
+				} // if obj2 loaded
+
+				// Add the $obj1 (CcSubjsToken) to the collection in $obj2 (CcSubjs)
+				$obj2->addCcSubjsToken($obj1);
+			} // if joined row not null
+
+			$results[] = $obj1;
+		}
+		$stmt->closeCursor();
+		return $results;
+	}
+
+	/**
+	 * Returns the TableMap related to this peer.
+	 * This method is not needed for general use but a specific application could have a need.
+	 * @return     TableMap
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function getTableMap()
+	{
+		return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME);
+	}
+
+	/**
+	 * Add a TableMap instance to the database for this peer class.
+	 */
+	public static function buildTableMap()
+	{
+	  $dbMap = Propel::getDatabaseMap(BaseCcSubjsTokenPeer::DATABASE_NAME);
+	  if (!$dbMap->hasTable(BaseCcSubjsTokenPeer::TABLE_NAME))
+	  {
+	    $dbMap->addTableObject(new CcSubjsTokenTableMap());
+	  }
+	}
+
+	/**
+	 * The class that the Peer will make instances of.
+	 *
+	 * If $withPrefix is true, the returned path
+	 * uses a dot-path notation which is tranalted into a path
+	 * relative to a location on the PHP include_path.
+	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+	 *
+	 * @param      boolean $withPrefix Whether or not to return the path with the class name
+	 * @return     string path.to.ClassName
+	 */
+	public static function getOMClass($withPrefix = true)
+	{
+		return $withPrefix ? CcSubjsTokenPeer::CLASS_DEFAULT : CcSubjsTokenPeer::OM_CLASS;
+	}
+
+	/**
+	 * Method perform an INSERT on the database, given a CcSubjsToken or Criteria object.
+	 *
+	 * @param      mixed $values Criteria or CcSubjsToken object containing data that is used to create the INSERT statement.
+	 * @param      PropelPDO $con the PropelPDO connection to use
+	 * @return     mixed The new primary key.
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doInsert($values, PropelPDO $con = null)
+	{
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_WRITE);
+		}
+
+		if ($values instanceof Criteria) {
+			$criteria = clone $values; // rename for clarity
+		} else {
+			$criteria = $values->buildCriteria(); // build Criteria from CcSubjsToken object
+		}
+
+		if ($criteria->containsKey(CcSubjsTokenPeer::ID) && $criteria->keyContainsValue(CcSubjsTokenPeer::ID) ) {
+			throw new PropelException('Cannot insert a value for auto-increment primary key ('.CcSubjsTokenPeer::ID.')');
+		}
+
+
+		// Set the correct dbName
+		$criteria->setDbName(self::DATABASE_NAME);
+
+		try {
+			// use transaction because $criteria could contain info
+			// for more than one table (I guess, conceivably)
+			$con->beginTransaction();
+			$pk = BasePeer::doInsert($criteria, $con);
+			$con->commit();
+		} catch(PropelException $e) {
+			$con->rollBack();
+			throw $e;
+		}
+
+		return $pk;
+	}
+
+	/**
+	 * Method perform an UPDATE on the database, given a CcSubjsToken or Criteria object.
+	 *
+	 * @param      mixed $values Criteria or CcSubjsToken object containing data that is used to create the UPDATE statement.
+	 * @param      PropelPDO $con The connection to use (specify PropelPDO connection object to exert more control over transactions).
+	 * @return     int The number of affected rows (if supported by underlying database driver).
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doUpdate($values, PropelPDO $con = null)
+	{
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_WRITE);
+		}
+
+		$selectCriteria = new Criteria(self::DATABASE_NAME);
+
+		if ($values instanceof Criteria) {
+			$criteria = clone $values; // rename for clarity
+
+			$comparison = $criteria->getComparison(CcSubjsTokenPeer::ID);
+			$value = $criteria->remove(CcSubjsTokenPeer::ID);
+			if ($value) {
+				$selectCriteria->add(CcSubjsTokenPeer::ID, $value, $comparison);
+			} else {
+				$selectCriteria->setPrimaryTableName(CcSubjsTokenPeer::TABLE_NAME);
+			}
+
+		} else { // $values is CcSubjsToken object
+			$criteria = $values->buildCriteria(); // gets full criteria
+			$selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
+		}
+
+		// set the correct dbName
+		$criteria->setDbName(self::DATABASE_NAME);
+
+		return BasePeer::doUpdate($selectCriteria, $criteria, $con);
+	}
+
+	/**
+	 * Method to DELETE all rows from the cc_subjs_token table.
+	 *
+	 * @return     int The number of affected rows (if supported by underlying database driver).
+	 */
+	public static function doDeleteAll($con = null)
+	{
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_WRITE);
+		}
+		$affectedRows = 0; // initialize var to track total num of affected rows
+		try {
+			// use transaction because $criteria could contain info
+			// for more than one table or we could emulating ON DELETE CASCADE, etc.
+			$con->beginTransaction();
+			$affectedRows += BasePeer::doDeleteAll(CcSubjsTokenPeer::TABLE_NAME, $con, CcSubjsTokenPeer::DATABASE_NAME);
+			// Because this db requires some delete cascade/set null emulation, we have to
+			// clear the cached instance *after* the emulation has happened (since
+			// instances get re-added by the select statement contained therein).
+			CcSubjsTokenPeer::clearInstancePool();
+			CcSubjsTokenPeer::clearRelatedInstancePool();
+			$con->commit();
+			return $affectedRows;
+		} catch (PropelException $e) {
+			$con->rollBack();
+			throw $e;
+		}
+	}
+
+	/**
+	 * Method perform a DELETE on the database, given a CcSubjsToken or Criteria object OR a primary key value.
+	 *
+	 * @param      mixed $values Criteria or CcSubjsToken object or primary key or array of primary keys
+	 *              which is used to create the DELETE statement
+	 * @param      PropelPDO $con the connection to use
+	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+	 *				if supported by native driver or if emulated using Propel.
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	 public static function doDelete($values, PropelPDO $con = null)
+	 {
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_WRITE);
+		}
+
+		if ($values instanceof Criteria) {
+			// invalidate the cache for all objects of this type, since we have no
+			// way of knowing (without running a query) what objects should be invalidated
+			// from the cache based on this Criteria.
+			CcSubjsTokenPeer::clearInstancePool();
+			// rename for clarity
+			$criteria = clone $values;
+		} elseif ($values instanceof CcSubjsToken) { // it's a model object
+			// invalidate the cache for this single object
+			CcSubjsTokenPeer::removeInstanceFromPool($values);
+			// create criteria based on pk values
+			$criteria = $values->buildPkeyCriteria();
+		} else { // it's a primary key, or an array of pks
+			$criteria = new Criteria(self::DATABASE_NAME);
+			$criteria->add(CcSubjsTokenPeer::ID, (array) $values, Criteria::IN);
+			// invalidate the cache for this object(s)
+			foreach ((array) $values as $singleval) {
+				CcSubjsTokenPeer::removeInstanceFromPool($singleval);
+			}
+		}
+
+		// Set the correct dbName
+		$criteria->setDbName(self::DATABASE_NAME);
+
+		$affectedRows = 0; // initialize var to track total num of affected rows
+
+		try {
+			// use transaction because $criteria could contain info
+			// for more than one table or we could emulating ON DELETE CASCADE, etc.
+			$con->beginTransaction();
+			
+			$affectedRows += BasePeer::doDelete($criteria, $con);
+			CcSubjsTokenPeer::clearRelatedInstancePool();
+			$con->commit();
+			return $affectedRows;
+		} catch (PropelException $e) {
+			$con->rollBack();
+			throw $e;
+		}
+	}
+
+	/**
+	 * Validates all modified columns of given CcSubjsToken object.
+	 * If parameter $columns is either a single column name or an array of column names
+	 * than only those columns are validated.
+	 *
+	 * NOTICE: This does not apply to primary or foreign keys for now.
+	 *
+	 * @param      CcSubjsToken $obj The object to validate.
+	 * @param      mixed $cols Column name or array of column names.
+	 *
+	 * @return     mixed TRUE if all columns are valid or the error message of the first invalid column.
+	 */
+	public static function doValidate(CcSubjsToken $obj, $cols = null)
+	{
+		$columns = array();
+
+		if ($cols) {
+			$dbMap = Propel::getDatabaseMap(CcSubjsTokenPeer::DATABASE_NAME);
+			$tableMap = $dbMap->getTable(CcSubjsTokenPeer::TABLE_NAME);
+
+			if (! is_array($cols)) {
+				$cols = array($cols);
+			}
+
+			foreach ($cols as $colName) {
+				if ($tableMap->containsColumn($colName)) {
+					$get = 'get' . $tableMap->getColumn($colName)->getPhpName();
+					$columns[$colName] = $obj->$get();
+				}
+			}
+		} else {
+
+		}
+
+		return BasePeer::doValidate(CcSubjsTokenPeer::DATABASE_NAME, CcSubjsTokenPeer::TABLE_NAME, $columns);
+	}
+
+	/**
+	 * Retrieve a single object by pkey.
+	 *
+	 * @param      int $pk the primary key.
+	 * @param      PropelPDO $con the connection to use
+	 * @return     CcSubjsToken
+	 */
+	public static function retrieveByPK($pk, PropelPDO $con = null)
+	{
+
+		if (null !== ($obj = CcSubjsTokenPeer::getInstanceFromPool((string) $pk))) {
+			return $obj;
+		}
+
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+		}
+
+		$criteria = new Criteria(CcSubjsTokenPeer::DATABASE_NAME);
+		$criteria->add(CcSubjsTokenPeer::ID, $pk);
+
+		$v = CcSubjsTokenPeer::doSelect($criteria, $con);
+
+		return !empty($v) > 0 ? $v[0] : null;
+	}
+
+	/**
+	 * Retrieve multiple objects by pkey.
+	 *
+	 * @param      array $pks List of primary keys
+	 * @param      PropelPDO $con the connection to use
+	 * @throws     PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function retrieveByPKs($pks, PropelPDO $con = null)
+	{
+		if ($con === null) {
+			$con = Propel::getConnection(CcSubjsTokenPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+		}
+
+		$objs = null;
+		if (empty($pks)) {
+			$objs = array();
+		} else {
+			$criteria = new Criteria(CcSubjsTokenPeer::DATABASE_NAME);
+			$criteria->add(CcSubjsTokenPeer::ID, $pks, Criteria::IN);
+			$objs = CcSubjsTokenPeer::doSelect($criteria, $con);
+		}
+		return $objs;
+	}
+
+} // BaseCcSubjsTokenPeer
+
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+BaseCcSubjsTokenPeer::buildTableMap();
+

airtime_mvc/application/models/airtime/om/BaseCcSubjsTokenQuery.php

@@ -0,0 +1,355 @@
+<?php
+
+
+/**
+ * Base class that represents a query for the 'cc_subjs_token' table.
+ *
+ * 
+ *
+ * @method     CcSubjsTokenQuery orderByDbId($order = Criteria::ASC) Order by the id column
+ * @method     CcSubjsTokenQuery orderByDbUserId($order = Criteria::ASC) Order by the user_id column
+ * @method     CcSubjsTokenQuery orderByDbAction($order = Criteria::ASC) Order by the action column
+ * @method     CcSubjsTokenQuery orderByDbToken($order = Criteria::ASC) Order by the token column
+ * @method     CcSubjsTokenQuery orderByDbCreated($order = Criteria::ASC) Order by the created column
+ *
+ * @method     CcSubjsTokenQuery groupByDbId() Group by the id column
+ * @method     CcSubjsTokenQuery groupByDbUserId() Group by the user_id column
+ * @method     CcSubjsTokenQuery groupByDbAction() Group by the action column
+ * @method     CcSubjsTokenQuery groupByDbToken() Group by the token column
+ * @method     CcSubjsTokenQuery groupByDbCreated() Group by the created column
+ *
+ * @method     CcSubjsTokenQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     CcSubjsTokenQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     CcSubjsTokenQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     CcSubjsTokenQuery leftJoinCcSubjs($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcSubjs relation
+ * @method     CcSubjsTokenQuery rightJoinCcSubjs($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcSubjs relation
+ * @method     CcSubjsTokenQuery innerJoinCcSubjs($relationAlias = '') Adds a INNER JOIN clause to the query using the CcSubjs relation
+ *
+ * @method     CcSubjsToken findOne(PropelPDO $con = null) Return the first CcSubjsToken matching the query
+ * @method     CcSubjsToken findOneOrCreate(PropelPDO $con = null) Return the first CcSubjsToken matching the query, or a new CcSubjsToken object populated from the query conditions when no match is found
+ *
+ * @method     CcSubjsToken findOneByDbId(int $id) Return the first CcSubjsToken filtered by the id column
+ * @method     CcSubjsToken findOneByDbUserId(int $user_id) Return the first CcSubjsToken filtered by the user_id column
+ * @method     CcSubjsToken findOneByDbAction(string $action) Return the first CcSubjsToken filtered by the action column
+ * @method     CcSubjsToken findOneByDbToken(string $token) Return the first CcSubjsToken filtered by the token column
+ * @method     CcSubjsToken findOneByDbCreated(string $created) Return the first CcSubjsToken filtered by the created column
+ *
+ * @method     array findByDbId(int $id) Return CcSubjsToken objects filtered by the id column
+ * @method     array findByDbUserId(int $user_id) Return CcSubjsToken objects filtered by the user_id column
+ * @method     array findByDbAction(string $action) Return CcSubjsToken objects filtered by the action column
+ * @method     array findByDbToken(string $token) Return CcSubjsToken objects filtered by the token column
+ * @method     array findByDbCreated(string $created) Return CcSubjsToken objects filtered by the created column
+ *
+ * @package    propel.generator.airtime.om
+ */
+abstract class BaseCcSubjsTokenQuery extends ModelCriteria
+{
+
+	/**
+	 * Initializes internal state of BaseCcSubjsTokenQuery object.
+	 *
+	 * @param     string $dbName The dabase name
+	 * @param     string $modelName The phpName of a model, e.g. 'Book'
+	 * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+	 */
+	public function __construct($dbName = 'airtime', $modelName = 'CcSubjsToken', $modelAlias = null)
+	{
+		parent::__construct($dbName, $modelName, $modelAlias);
+	}
+
+	/**
+	 * Returns a new CcSubjsTokenQuery object.
+	 *
+	 * @param     string $modelAlias The alias of a model in the query
+	 * @param     Criteria $criteria Optional Criteria to build the query from
+	 *
+	 * @return    CcSubjsTokenQuery
+	 */
+	public static function create($modelAlias = null, $criteria = null)
+	{
+		if ($criteria instanceof CcSubjsTokenQuery) {
+			return $criteria;
+		}
+		$query = new CcSubjsTokenQuery();
+		if (null !== $modelAlias) {
+			$query->setModelAlias($modelAlias);
+		}
+		if ($criteria instanceof Criteria) {
+			$query->mergeWith($criteria);
+		}
+		return $query;
+	}
+
+	/**
+	 * Find object by primary key
+	 * Use instance pooling to avoid a database query if the object exists
+	 * <code>
+	 * $obj  = $c->findPk(12, $con);
+	 * </code>
+	 * @param     mixed $key Primary key to use for the query
+	 * @param     PropelPDO $con an optional connection object
+	 *
+	 * @return    CcSubjsToken|array|mixed the result, formatted by the current formatter
+	 */
+	public function findPk($key, $con = null)
+	{
+		if ((null !== ($obj = CcSubjsTokenPeer::getInstanceFromPool((string) $key))) && $this->getFormatter()->isObjectFormatter()) {
+			// the object is alredy in the instance pool
+			return $obj;
+		} else {
+			// the object has not been requested yet, or the formatter is not an object formatter
+			$criteria = $this->isKeepQuery() ? clone $this : $this;
+			$stmt = $criteria
+				->filterByPrimaryKey($key)
+				->getSelectStatement($con);
+			return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
+		}
+	}
+
+	/**
+	 * Find objects by primary key
+	 * <code>
+	 * $objs = $c->findPks(array(12, 56, 832), $con);
+	 * </code>
+	 * @param     array $keys Primary keys to use for the query
+	 * @param     PropelPDO $con an optional connection object
+	 *
+	 * @return    PropelObjectCollection|array|mixed the list of results, formatted by the current formatter
+	 */
+	public function findPks($keys, $con = null)
+	{	
+		$criteria = $this->isKeepQuery() ? clone $this : $this;
+		return $this
+			->filterByPrimaryKeys($keys)
+			->find($con);
+	}
+
+	/**
+	 * Filter the query by primary key
+	 *
+	 * @param     mixed $key Primary key to use for the query
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByPrimaryKey($key)
+	{
+		return $this->addUsingAlias(CcSubjsTokenPeer::ID, $key, Criteria::EQUAL);
+	}
+
+	/**
+	 * Filter the query by a list of primary keys
+	 *
+	 * @param     array $keys The list of primary key to use for the query
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByPrimaryKeys($keys)
+	{
+		return $this->addUsingAlias(CcSubjsTokenPeer::ID, $keys, Criteria::IN);
+	}
+
+	/**
+	 * Filter the query on the id column
+	 * 
+	 * @param     int|array $dbId The value to use as filter.
+	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByDbId($dbId = null, $comparison = null)
+	{
+		if (is_array($dbId) && null === $comparison) {
+			$comparison = Criteria::IN;
+		}
+		return $this->addUsingAlias(CcSubjsTokenPeer::ID, $dbId, $comparison);
+	}
+
+	/**
+	 * Filter the query on the user_id column
+	 * 
+	 * @param     int|array $dbUserId The value to use as filter.
+	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByDbUserId($dbUserId = null, $comparison = null)
+	{
+		if (is_array($dbUserId)) {
+			$useMinMax = false;
+			if (isset($dbUserId['min'])) {
+				$this->addUsingAlias(CcSubjsTokenPeer::USER_ID, $dbUserId['min'], Criteria::GREATER_EQUAL);
+				$useMinMax = true;
+			}
+			if (isset($dbUserId['max'])) {
+				$this->addUsingAlias(CcSubjsTokenPeer::USER_ID, $dbUserId['max'], Criteria::LESS_EQUAL);
+				$useMinMax = true;
+			}
+			if ($useMinMax) {
+				return $this;
+			}
+			if (null === $comparison) {
+				$comparison = Criteria::IN;
+			}
+		}
+		return $this->addUsingAlias(CcSubjsTokenPeer::USER_ID, $dbUserId, $comparison);
+	}
+
+	/**
+	 * Filter the query on the action column
+	 * 
+	 * @param     string $dbAction The value to use as filter.
+	 *            Accepts wildcards (* and % trigger a LIKE)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByDbAction($dbAction = null, $comparison = null)
+	{
+		if (null === $comparison) {
+			if (is_array($dbAction)) {
+				$comparison = Criteria::IN;
+			} elseif (preg_match('/[\%\*]/', $dbAction)) {
+				$dbAction = str_replace('*', '%', $dbAction);
+				$comparison = Criteria::LIKE;
+			}
+		}
+		return $this->addUsingAlias(CcSubjsTokenPeer::ACTION, $dbAction, $comparison);
+	}
+
+	/**
+	 * Filter the query on the token column
+	 * 
+	 * @param     string $dbToken The value to use as filter.
+	 *            Accepts wildcards (* and % trigger a LIKE)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByDbToken($dbToken = null, $comparison = null)
+	{
+		if (null === $comparison) {
+			if (is_array($dbToken)) {
+				$comparison = Criteria::IN;
+			} elseif (preg_match('/[\%\*]/', $dbToken)) {
+				$dbToken = str_replace('*', '%', $dbToken);
+				$comparison = Criteria::LIKE;
+			}
+		}
+		return $this->addUsingAlias(CcSubjsTokenPeer::TOKEN, $dbToken, $comparison);
+	}
+
+	/**
+	 * Filter the query on the created column
+	 * 
+	 * @param     string|array $dbCreated The value to use as filter.
+	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByDbCreated($dbCreated = null, $comparison = null)
+	{
+		if (is_array($dbCreated)) {
+			$useMinMax = false;
+			if (isset($dbCreated['min'])) {
+				$this->addUsingAlias(CcSubjsTokenPeer::CREATED, $dbCreated['min'], Criteria::GREATER_EQUAL);
+				$useMinMax = true;
+			}
+			if (isset($dbCreated['max'])) {
+				$this->addUsingAlias(CcSubjsTokenPeer::CREATED, $dbCreated['max'], Criteria::LESS_EQUAL);
+				$useMinMax = true;
+			}
+			if ($useMinMax) {
+				return $this;
+			}
+			if (null === $comparison) {
+				$comparison = Criteria::IN;
+			}
+		}
+		return $this->addUsingAlias(CcSubjsTokenPeer::CREATED, $dbCreated, $comparison);
+	}
+
+	/**
+	 * Filter the query by a related CcSubjs object
+	 *
+	 * @param     CcSubjs $ccSubjs  the related object to use as filter
+	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function filterByCcSubjs($ccSubjs, $comparison = null)
+	{
+		return $this
+			->addUsingAlias(CcSubjsTokenPeer::USER_ID, $ccSubjs->getDbId(), $comparison);
+	}
+
+	/**
+	 * Adds a JOIN clause to the query using the CcSubjs relation
+	 * 
+	 * @param     string $relationAlias optional alias for the relation
+	 * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function joinCcSubjs($relationAlias = '', $joinType = Criteria::INNER_JOIN)
+	{
+		$tableMap = $this->getTableMap();
+		$relationMap = $tableMap->getRelation('CcSubjs');
+		
+		// create a ModelJoin object for this join
+		$join = new ModelJoin();
+		$join->setJoinType($joinType);
+		$join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+		if ($previousJoin = $this->getPreviousJoin()) {
+			$join->setPreviousJoin($previousJoin);
+		}
+		
+		// add the ModelJoin to the current object
+		if($relationAlias) {
+			$this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+			$this->addJoinObject($join, $relationAlias);
+		} else {
+			$this->addJoinObject($join, 'CcSubjs');
+		}
+		
+		return $this;
+	}
+
+	/**
+	 * Use the CcSubjs relation CcSubjs object
+	 *
+	 * @see       useQuery()
+	 * 
+	 * @param     string $relationAlias optional alias for the relation,
+	 *                                   to be used as main alias in the secondary query
+	 * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+	 *
+	 * @return    CcSubjsQuery A secondary query class using the current class as primary query
+	 */
+	public function useCcSubjsQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN)
+	{
+		return $this
+			->joinCcSubjs($relationAlias, $joinType)
+			->useQuery($relationAlias ? $relationAlias : 'CcSubjs', 'CcSubjsQuery');
+	}
+
+	/**
+	 * Exclude object from result
+	 *
+	 * @param     CcSubjsToken $ccSubjsToken Object to remove from the list of results
+	 *
+	 * @return    CcSubjsTokenQuery The current query, for fluid interface
+	 */
+	public function prune($ccSubjsToken = null)
+	{
+		if ($ccSubjsToken) {
+			$this->addUsingAlias(CcSubjsTokenPeer::ID, $ccSubjsToken->getDbId(), Criteria::NOT_EQUAL);
+	  }
+	  
+		return $this;
+	}
+
+} // BaseCcSubjsTokenQuery

airtime_mvc/application/views/scripts/auth/password-change.phtml

@@ -0,0 +1 @@
+<div><?php echo $this->form ?></div>

airtime_mvc/application/views/scripts/auth/password-restore-after.phtml

@@ -0,0 +1 @@
+<div>Email sent</div>

airtime_mvc/application/views/scripts/auth/password-restore.phtml

@@ -0,0 +1 @@
+<div><?php echo $this->form ?></div>

airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml

@@ -33,12 +33,12 @@
                 </ul>
             <?php endif; ?>
         </dd>
-        <?php $watched_dirs = Application_Model_MusicDir::getWatchedDirs(); ?>
+        <?php $watched_dirs = Application_Model_MusicDir::getWatchedDirs(null, true); ?>
 
         <?php if (count($watched_dirs) > 0): ?>
             <?php foreach($watched_dirs as $watched_dir): ?>
                 <dd class="block-display selected-item">
-                    <span><?php echo $watched_dir->getDirectory(); ?></span><span class="ui-icon ui-icon-close"></span>
+                    <span><?php echo "< Exists? "; echo ($watched_dir->getExistsFlag())?"YES > : ":"NO > : ";?></span><span><?php echo $watched_dir->getDirectory();?></span></span><span class="ui-icon ui-icon-close"></span>
                 </dd>
             <?php endforeach; ?>
         <?php else: ?>

airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml

@@ -15,6 +15,7 @@
 <div><span>Copyright:</span><span><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></span></div>
 <div><span>Isrc Number:</span><span><?php echo ($this->md["MDATA_KEY_ISRC"]);?></span></div>
 <div><span>Website:</span><span><?php echo ($this->md["MDATA_KEY_URL"]);?></span></div>
+<div><span>Language:</span><span><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></span></div>
 
 <?php endif; ?>
 

airtime_mvc/application/views/scripts/playlist/update.phtml

@@ -17,6 +17,7 @@ if (count($items)) : ?>
             </div>
             <div class="text-row">
                 <span class="spl_artist"><?php echo $item["CcFiles"]['artist_name'] ?></span>
+                <span class="spl_artist"><?php echo ($item["CcFiles"]['file_exists'])?"":"NO FILE FOUND!" ?></span>
                 <span class="spl_offset"><?php echo $item["offset"]?></span>
             </div>
             <?php //create the crossfade icon.

airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml

@@ -24,4 +24,10 @@
 <?php $i=$i+1; ?>
 <?php endforeach; ?>
 </table>
+<br/>
+<div id="show_time_info">
+    <span id="show_time_filled" class="time"><?php echo $this->timeFilled; ?></span>
+    <div id="show_progressbar"></div>
+    <span id="show_length" class="time"><?php echo $this->showLength; ?></span>
+</div>
 </div>

airtime_mvc/build/schema.xml

@@ -28,6 +28,8 @@
     <column name="id" phpName="Id" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
     <column name="directory" phpName="Directory" type="LONGVARCHAR" required="false"/>
     <column name="type" phpName="Type" type="VARCHAR" size="255" required="false"/>
+    <column name="exists" phpName="Exists" type="BOOLEAN" required="false" defaultValue="true"/>
+    <column name="watched" phpName="Watched" type="BOOLEAN" required="false" defaultValue="true"/>
     <unique name="cc_music_dir_unique">
       <unique-column name="directory"/>
     </unique>
@@ -44,6 +46,8 @@
     <column name="currentlyaccessing" phpName="DbCurrentlyaccessing" type="INTEGER" required="true" defaultValue="0"/>
     <column name="editedby" phpName="DbEditedby" type="INTEGER" required="false"/>
     <column name="mtime" phpName="DbMtime" type="TIMESTAMP" size="6" required="false"/>
+    <column name="utime" phpName="DbUtime" type="TIMESTAMP" size="6" required="false"/>
+    <column name="lptime" phpName="DbLPtime" type="TIMESTAMP" size="6" required="false"/>
     <column name="md5" phpName="DbMd5" type="CHAR" size="32" required="false"/>
     <column name="track_title" phpName="DbTrackTitle" type="VARCHAR" size="512" required="false"/>
     <column name="artist_name" phpName="DbArtistName" type="VARCHAR" size="512" required="false"/>
@@ -88,6 +92,7 @@
     <column name="subject" phpName="DbSubject" type="VARCHAR" size="512" required="false"/>
     <column name="contributor" phpName="DbContributor" type="VARCHAR" size="512" required="false"/>
     <column name="language" phpName="DbLanguage" type="VARCHAR" size="512" required="false"/>
+    <column name="file_exists" phpName="DbFileExists" type="BOOLEAN" required="false" defaultValue="true"/>
     <column name="soundcloud_id" phpName="DbSoundcloudId" type="Integer" required="false"/>
     <column name="soundcloud_error_code" phpName="DbSoundcloudErrorCode" type="Integer" required="false"/>
     <column name="soundcloud_error_msg" phpName="DbSoundcloudErrorMsg" type="VARCHAR" size="512" required="false"/>
@@ -95,7 +100,7 @@
     <foreign-key foreignTable="cc_subjs" name="cc_files_editedby_fkey">
       <reference local="editedby" foreign="id"/>
     </foreign-key>
-    <foreign-key foreignTable="cc_music_dirs" name="cc_music_dirs_folder_fkey" onDelete="CASCADE">
+    <foreign-key foreignTable="cc_music_dirs" name="cc_music_dirs_folder_fkey">
       <reference local="directory" foreign="id"/>
     </foreign-key>
     <unique name="cc_files_gunid_idx">
@@ -107,6 +112,9 @@
     <index name="cc_files_name_idx">
       <index-column name="name"/>
     </index>
+    <index name="cc_files_file_exists_idx">
+      <index-column name="file_exists"/>
+    </index>
   </table>
   <table name="cc_perms" phpName="CcPerms">
     <column name="permid" phpName="Permid" type="INTEGER" primaryKey="true" required="true"/>
@@ -212,6 +220,8 @@
     <column name="currentlyaccessing" phpName="DbCurrentlyaccessing" type="INTEGER" required="true" defaultValue="0"/>
     <column name="editedby" phpName="DbEditedby" type="INTEGER" required="false"/>
     <column name="mtime" phpName="DbMtime" type="TIMESTAMP" size="6" required="false"/>
+    <column name="utime" phpName="DbUtime" type="TIMESTAMP" size="6" required="false"/>
+    <column name="lptime" phpName="DbLPtime" type="TIMESTAMP" size="6" required="false"/>
     <column name="creator" phpName="DbCreator" type="VARCHAR" size="32" required="false"/>
     <column name="description" phpName="DbDescription" type="VARCHAR" size="512" required="false"/>
     <foreign-key foreignTable="cc_subjs" name="cc_playlist_editedby_fkey">
@@ -325,6 +335,19 @@
       <unique-column name="login"/>
     </unique>
   </table>
+  <table name="cc_subjs_token" phpName="CcSubjsToken">
+    <column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
+    <column name="user_id" phpName="DbUserId" type="INTEGER" required="true"/>
+    <column name="action" phpName="DbAction" type="VARCHAR" size="255" required="true"/>
+    <column name="token" phpName="DbToken" type="VARCHAR" size="40" required="true"/>
+    <column name="created" phpName="DbCreated" type="TIMESTAMP" required="true"/>
+    <unique name="cc_subjs_token_idx">
+      <unique-column name="token"/>
+    </unique>
+    <foreign-key foreignTable="cc_subjs" name="cc_subjs_token_userid_fkey" onDelete="CASCADE">
+      <reference local="user_id" foreign="id"/>
+    </foreign-key>
+  </table>
   <table name="cc_country" phpName="CcCountry">
     <column name="isocode" phpName="DbIsoCode" primaryKey="true" type="CHAR" size="3" required="true"/>
     <column name="name" phpName="DbName" type="VARCHAR" size="255" required="true"/>

airtime_mvc/build/sql/schema.sql

@@ -42,6 +42,8 @@ CREATE TABLE "cc_music_dirs"
 	"id" serial  NOT NULL,
 	"directory" TEXT,
 	"type" VARCHAR(255),
+	"exists" BOOLEAN default 't',
+	"watched" BOOLEAN default 't',
 	PRIMARY KEY ("id"),
 	CONSTRAINT "cc_music_dir_unique" UNIQUE ("directory")
 );
@@ -70,6 +72,8 @@ CREATE TABLE "cc_files"
 	"currentlyaccessing" INTEGER default 0 NOT NULL,
 	"editedby" INTEGER,
 	"mtime" TIMESTAMP(6),
+	"utime" TIMESTAMP(6),
+	"lptime" TIMESTAMP(6),
 	"md5" CHAR(32),
 	"track_title" VARCHAR(512),
 	"artist_name" VARCHAR(512),
@@ -114,6 +118,7 @@ CREATE TABLE "cc_files"
 	"subject" VARCHAR(512),
 	"contributor" VARCHAR(512),
 	"language" VARCHAR(512),
+	"file_exists" BOOLEAN default 't',
 	"soundcloud_id" INTEGER,
 	"soundcloud_error_code" INTEGER,
 	"soundcloud_error_msg" VARCHAR(512),
@@ -130,6 +135,8 @@ CREATE INDEX "cc_files_md5_idx" ON "cc_files" ("md5");
 
 CREATE INDEX "cc_files_name_idx" ON "cc_files" ("name");
 
+CREATE INDEX "cc_files_file_exists_idx" ON "cc_files" ("file_exists");
+
 -----------------------------------------------------------------------------
 -- cc_perms
 -----------------------------------------------------------------------------
@@ -285,6 +292,8 @@ CREATE TABLE "cc_playlist"
 	"currentlyaccessing" INTEGER default 0 NOT NULL,
 	"editedby" INTEGER,
 	"mtime" TIMESTAMP(6),
+	"utime" TIMESTAMP(6),
+	"lptime" TIMESTAMP(6),
 	"creator" VARCHAR(32),
 	"description" VARCHAR(512),
 	PRIMARY KEY ("id")
@@ -448,6 +457,28 @@ CREATE TABLE "cc_subjs"
 COMMENT ON TABLE "cc_subjs" IS '';
 
 
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- cc_subjs_token
+-----------------------------------------------------------------------------
+
+DROP TABLE "cc_subjs_token" CASCADE;
+
+
+CREATE TABLE "cc_subjs_token"
+(
+	"id" serial  NOT NULL,
+	"user_id" INTEGER  NOT NULL,
+	"action" VARCHAR(255)  NOT NULL,
+	"token" VARCHAR(40)  NOT NULL,
+	"created" TIMESTAMP  NOT NULL,
+	PRIMARY KEY ("id"),
+	CONSTRAINT "cc_subjs_token_idx" UNIQUE ("token")
+);
+
+COMMENT ON TABLE "cc_subjs_token" IS '';
+
+
 SET search_path TO public;
 -----------------------------------------------------------------------------
 -- cc_country
@@ -526,7 +557,7 @@ ALTER TABLE "cc_access" ADD CONSTRAINT "cc_access_owner_fkey" FOREIGN KEY ("owne
 
 ALTER TABLE "cc_files" ADD CONSTRAINT "cc_files_editedby_fkey" FOREIGN KEY ("editedby") REFERENCES "cc_subjs" ("id");
 
-ALTER TABLE "cc_files" ADD CONSTRAINT "cc_music_dirs_folder_fkey" FOREIGN KEY ("directory") REFERENCES "cc_music_dirs" ("id") ON DELETE CASCADE;
+ALTER TABLE "cc_files" ADD CONSTRAINT "cc_music_dirs_folder_fkey" FOREIGN KEY ("directory") REFERENCES "cc_music_dirs" ("id");
 
 ALTER TABLE "cc_perms" ADD CONSTRAINT "cc_perms_subj_fkey" FOREIGN KEY ("subj") REFERENCES "cc_subjs" ("id") ON DELETE CASCADE;
 
@@ -557,3 +588,5 @@ ALTER TABLE "cc_schedule" ADD CONSTRAINT "cc_show_inst_fkey" FOREIGN KEY ("insta
 ALTER TABLE "cc_schedule" ADD CONSTRAINT "cc_show_file_fkey" FOREIGN KEY ("file_id") REFERENCES "cc_files" ("id") ON DELETE CASCADE;
 
 ALTER TABLE "cc_sess" ADD CONSTRAINT "cc_sess_userid_fkey" FOREIGN KEY ("userid") REFERENCES "cc_subjs" ("id") ON DELETE CASCADE;
+
+ALTER TABLE "cc_subjs_token" ADD CONSTRAINT "cc_subjs_token_userid_fkey" FOREIGN KEY ("user_id") REFERENCES "cc_subjs" ("id") ON DELETE CASCADE;

airtime_mvc/public/css/datatables/css/ColReorder.css

@@ -0,0 +1,14 @@
+/*
+ * Namespace DTCR - "DataTables ColReorder" plug-in
+ */
+
+table.DTCR_clonedTable {
+	background-color: white;
+	z-index: 998;
+}
+
+div.DTCR_pointer {
+	width: 1px;
+	background-color: #5B5B5B;
+	z-index: 997;
+}

airtime_mvc/public/css/datatables/css/ColVis.css

@@ -0,0 +1,75 @@
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * ColVis styles
+ */
+.ColVis {
+	float: right;
+	margin-bottom: 1em;
+}
+
+.ColVis_Button {
+	position: relative;
+	float: left;
+	margin-right: 3px;
+	padding: 3px 5px;
+	height: 30px;
+	background-color: #fff;
+	border: 1px solid #d0d0d0;
+	cursor: pointer;
+}
+
+button.ColVis_Button::-moz-focus-inner { 
+	border: none !important;
+	padding: 0;
+}
+
+.ColVis_text_hover {
+	border: 1px solid #999;
+	background-color: #f0f0f0;
+}
+
+div.ColVis_collectionBackground {
+	background-color: black;
+	z-index: 996;
+}
+
+div.ColVis_collection {
+	position: relative;
+	width: 130px;
+	background-color: #999;
+	padding: 3px;
+	border: 1px solid #ccc;
+	z-index: 998;
+}
+
+div.ColVis_collection button.ColVis_Button {
+	background-color: white;
+	width: 100%;
+	float: none;
+	margin-bottom: 2px;
+}
+
+div.ColVis_catcher {
+	position: absolute;
+	z-index: 997;
+}
+
+.disabled {
+	color: #999;
+}
+
+
+
+button.ColVis_Button {
+	text-align: left;
+}
+
+div.ColVis_collection button.ColVis_Button:hover {
+	border: 1px solid #999;
+	background-color: #f0f0f0;
+}
+
+span.ColVis_radio {
+	display: inline-block;
+	width: 20px;
+}

airtime_mvc/public/css/media_library.css

@@ -66,4 +66,12 @@
   -moz-user-select: none;
   -o-user-select: none;
   user-select: none;
-}
+}
+
+.datatable_checkbox {
+    text-align: center;
+}
+
+.datatable_checkbox .DataTables_sort_wrapper {
+    text-align: center;
+}

airtime_mvc/public/css/styles.css

@@ -607,10 +607,10 @@ dl.inline-list dd {
 }
 .dataTables_filter input {
     background: url("images/search_auto_bg.png") no-repeat scroll 0 0 #DDDDDD;
-	width: 60%;
-	border: 1px solid #5B5B5B;
-    margin: 0;
-    padding: 4px 3px 4px 25px;	
+    width: 60%;
+    border: 1px solid #5B5B5B;
+    margin-left: -8px;
+    padding: 4px 3px 4px 25px;
 }
 .dataTables_length select {
     background-color: #DDDDDD;
@@ -622,6 +622,30 @@ dl.inline-list dd {
     padding: 2px 2px 2px 0;
     vertical-align: top;
 }
+#library_display thead th, #library_display tbody td {
+    cursor: pointer;
+}
+#library_display thead th.library_checkbox,
+#library_display thead th.library_id,
+#library_display thead th.library_title {
+    cursor: default;
+}
+
+.ColVis.TableTools .ui-button {
+    height: 21px;
+}
+button.ColVis_Button.ColVis_ShowAll {
+    text-align: center;
+    margin-top: 10px;
+}
+.library_toolbar .ui-button, .ColVis.TableTools .ui-button {
+    float: right;
+    text-align:center;
+    font-size:12px;
+    font-weight:normal;
+    padding: 0.2em 1em;
+    margin: 0.5em 0.2em -0.5em 0.2em;
+}
 
 /*----END Data Table----*/
 

airtime_mvc/public/js/airtime/library/library.js

@@ -1,13 +1,17 @@
+var dTable;
+var checkedCount = 0;
+var checkedPLCount = 0;
+
 //used by jjmenu
 function getId() {
-	var tr_id =  $(this.triggerElement).attr("id");
+	var tr_id =  $(this.triggerElement).parent().attr("id");
 	tr_id = tr_id.split("_");
 
 	return tr_id[1];
 }
 
 function getType() {
-	var tr_id =  $(this.triggerElement).attr("id");
+	var tr_id =  $(this.triggerElement).parent().attr("id");
 	tr_id = tr_id.split("_");
 
 	return tr_id[0];
@@ -30,8 +34,20 @@ function deleteAudioClip(json) {
 		return;
 	}
 
-	deleteItem("au", json.id);
+        if (json.ids != undefined) {
+            for (var i = json.ids.length - 1; i >= 0; i--) {
+                deleteItem("au", json.ids[i]);
+            }
+        } else if (json.id != undefined) {
+            deleteItem("au", json.id);
+        }
 	location.reload(true);
+} 
+
+function confirmDeleteGroup() {
+    if(confirm('Are you sure you want to delete the selected items?')){
+        groupDelete();
+    }
 }
 
 //callbacks called by jjmenu
@@ -73,11 +89,17 @@ function checkImportStatus(){
 
 function deletePlaylist(json) {
 	if(json.message) {
-		alert(json.message);
-		return;
+            alert(json.message);
+            return;
 	}
-
-	deleteItem("pl", json.id);
+        
+        if (json.ids != undefined) {
+            for (var i = json.ids.length - 1; i >= 0; i--) {
+                deleteItem("pl", json.ids[i]);
+            }
+        } else if (json.id != undefined) {
+            deleteItem("pl", json.id);
+        }
 	window.location.reload();
 }
 //end callbacks called by jjmenu
@@ -90,7 +112,7 @@ function addLibraryItemEvents() {
 			cursor: 'pointer'
 		});
 
-	$('#library_display tbody tr')
+	$('#library_display tbody tr td').not('[class=library_checkbox]')
 		.jjmenu("click",
 			[{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}],
 			{id: getId, type: getType},
@@ -101,36 +123,36 @@ function addLibraryItemEvents() {
 function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
 	var id, type, once;
 
-    type = aData[6].substring(0,2);
-    id = aData[0];
-
+    type = aData["ftype"].substring(0,2);
+    id = aData["id"];
+    
     if(type == "au") {
-        $('td:eq(5)', nRow).html( '<img src="css/images/icon_audioclip.png">' );
-    }
-    else if(type == "pl") {
-        $('td:eq(5)', nRow).html( '<img src="css/images/icon_playlist.png">' );
+        $('td.library_type', nRow).html( '<img src="css/images/icon_audioclip.png">' );
+    } else if(type == "pl") {
+        $('td.library_type', nRow).html( '<img src="css/images/icon_playlist.png">' );
     }
 
-	$(nRow).attr("id", type+'_'+id);
+    $(nRow).attr("id", type+'_'+id);
 
-	// insert id on lenth field
-	$('td:eq(4)', nRow).attr("id", "length");
+    // insert id on lenth field
+    $('td.library_length', nRow).attr("id", "length");
 
-	return nRow;
+    return nRow;
 }
 
 function dtDrawCallback() {
-	addLibraryItemEvents();
-	addMetadataQtip();
-        saveNumEntriesSetting();
+    addLibraryItemEvents();
+    addMetadataQtip();
+    saveNumEntriesSetting();
+    setupGroupActions();
 }
 
 function addProgressIcon(id) {
-    if($("#au_"+id).find("td:eq(0)").find("span").length > 0){
-        $("#au_"+id).find("td:eq(0)").find("span").removeClass();
+    if($("#au_"+id).find("td.library_title").find("span").length > 0){
+        $("#au_"+id).find("td.library_title").find("span").removeClass();
         $("span[id="+id+"]").addClass("small-icon progress");
     }else{
-        $("#au_"+id).find("td:eq(0)").append('<span id="'+id+'" class="small-icon progress"></span>')
+        $("#au_"+id).find("td.library_title").append('<span id="'+id+'" class="small-icon progress"></span>')
     }
 }
 
@@ -229,7 +251,7 @@ function addQtipToSCIcons(){
 function addMetadataQtip(){
     var tableRow = $('#library_display tbody tr');
     tableRow.each(function(){
-        var title = $(this).find('td:eq(0)').html()
+        var title = $(this).find('td.library_title').html()
         var info = $(this).attr("id")
         info = info.split("_");
         var id = info[1];
@@ -297,31 +319,212 @@ function getNumEntriesPreference(data) {
     return parseInt(data.libraryInit.numEntries);
 }
 
+function groupAdd() {
+    if (checkedPLCount > 0) {
+        alert("Can't add playlist to another playlist");
+        return;
+    }
+    disableGroupBtn('library_group_add');
+    
+    var ids = new Array();
+    var addGroupUrl = '/Playlist/add-group';
+    var newSPLUrl = '/Playlist/new/format/json';
+    var dirty = true;
+    $('#library_display tbody tr').each(function() {
+        var idSplit = $(this).attr('id').split("_");
+        var id = idSplit.pop();
+        var type = idSplit.pop();
+        if (dirty && $(this).find(":checkbox").attr("checked")) {
+            if (type == "au") {
+                ids.push(id);
+            } else if (type == "pl") {
+                alert("Can't add playlist to another playlist");
+                dirty = false;
+            }
+        }
+    });
+    
+    if (dirty && ids.length > 0) {
+        stopAudioPreview();
+        
+        if ($('#spl_sortable').length == 0) {
+            $.post(newSPLUrl, function(json) {
+                openDiffSPL(json);
+		redrawDataTablePage();
+                
+                $.post(addGroupUrl, {format: "json", ids: ids}, setSPLContent);
+            });
+        } else {
+            $.post(addGroupUrl, {format: "json", ids: ids}, setSPLContent);
+        }
+    }
+}
+
+function groupDelete() {
+    disableGroupBtn('library_group_delete');
+    
+    var auIds = new Array();
+    var plIds = new Array();
+    var auUrl = '/Library/delete-group';
+    var plUrl = '/Playlist/delete-group';
+    var dirty = true;
+    $('#library_display tbody tr').each(function() {
+        var idSplit = $(this).attr('id').split("_");
+        var id = idSplit.pop();
+        var type = idSplit.pop();
+        if (dirty && $(this).find(":checkbox").attr("checked")) {
+            if (type == "au") {
+                auIds.push(id);
+            } else if (type == "pl") {
+                plIds.push(id);
+            }
+        }
+    });
+    
+    if (dirty && (auIds.length > 0 || plIds.length > 0)) {
+        stopAudioPreview();
+        
+        if (auIds.length > 0) {
+            $.post(auUrl, {format: "json", ids: auIds}, deleteAudioClip);
+        }
+        if (plIds.length > 0) {
+            $.post(plUrl, {format: "json", ids: plIds}, deletePlaylist);
+        }
+    }
+}
+
+function toggleAll() {
+    var checked = $(this).attr("checked");
+    $('#library_display tr').each(function() {
+        var idSplit = $(this).attr('id').split("_");
+        var type = idSplit[0];
+        $(this).find(":checkbox").attr("checked", checked);
+        if (checked) {
+            if (type == "pl") {
+                checkedPLCount++;
+            }
+            $(this).addClass('selected');
+        } else {
+            $(this).removeClass('selected');
+        }
+    });
+    
+    if (checked) {
+        checkedCount = $('#library_display tbody tr').size();
+        enableGroupBtn('library_group_add', groupAdd);
+        enableGroupBtn('library_group_delete', confirmDeleteGroup);
+    } else {
+        checkedCount = 0;
+        checkedPLCount = 0;
+        disableGroupBtn('library_group_add');
+        disableGroupBtn('library_group_delete');
+    }
+}
+
+function enableGroupBtn(btnId, func) {
+    btnId = '#' + btnId;
+    if ($(btnId).hasClass('ui-state-disabled')) {
+        $(btnId).removeClass('ui-state-disabled');
+        $(btnId).unbind("click").click(func);
+    }
+}
+
+function disableGroupBtn(btnId) {
+    btnId = '#' + btnId;
+    if (!$(btnId).hasClass('ui-state-disabled')) {
+        $(btnId).addClass('ui-state-disabled');
+        $(btnId).unbind("click");
+    }
+}
+
+function checkBoxChanged() {
+    var cbAll = $('#library_display thead').find(":checkbox");
+    var cbAllChecked = cbAll.attr("checked");
+    var checked = $(this).attr("checked");
+    var size = $('#library_display tbody tr').size();
+    var idSplit = $(this).parent().parent().attr('id').split("_");
+    var type = idSplit[0];
+    if (checked) {
+       if (checkedCount < size) {
+           checkedCount++;
+       }
+       if (type == "pl" && checkedPLCount < size) {
+           checkedPLCount++;
+       }
+       enableGroupBtn('library_group_add', groupAdd);
+       enableGroupBtn('library_group_delete', confirmDeleteGroup);
+       $(this).parent().parent().addClass('selected');
+    } else {
+        if (checkedCount > 0) {
+            checkedCount--;
+        }
+        if (type == "pl" && checkedPLCount > 0) {
+           checkedPLCount--;
+        }
+        if (checkedCount == 0) {
+            disableGroupBtn('library_group_add');
+            disableGroupBtn('library_group_delete');
+        }
+        $(this).parent().parent().removeClass('selected');
+    }
+    
+    if (cbAllChecked && checkedCount < size) {
+        cbAll.attr("checked", false);
+    } else if (!cbAllChecked && checkedCount == size) {
+        cbAll.attr("checked", true);
+    }
+}
+
+function setupGroupActions() {
+    checkedCount = 0;
+    checkedPLCount = 0;
+    $('#library_display tr:nth-child(1)').find(":checkbox").attr("checked", false);
+    $('#library_display thead').find(":checkbox").unbind('change').change(toggleAll);
+    $('#library_display tbody tr').each(function() {
+        $(this).find(":checkbox").unbind('change').change(checkBoxChanged);
+    });
+    
+    disableGroupBtn('library_group_add');
+    disableGroupBtn('library_group_delete');
+}
+
+function fnShowHide(iCol) {
+	/* Get the DataTables object again - this is not a recreation, just a get of the object */
+	var oTable = dTable;
+	
+	var bVis = oTable.fnSettings().aoColumns[iCol].bVisible;
+	oTable.fnSetColumnVis( iCol, bVis ? false : true );
+}
+
 function createDataTable(data) {
-    var dTable = $('#library_display').dataTable( {
+    dTable = $('#library_display').dataTable( {
 		"bProcessing": true,
 		"bServerSide": true,
 		"sAjaxSource": "/Library/contents/format/json",
-		"fnServerData": function ( sSource, aoData, fnCallback ) {
+		"fnServerData": function ( sSource, aoData, testCallback ) {
 			$.ajax( {
 				"dataType": 'json',
 				"type": "POST",
 				"url": sSource,
 				"data": aoData,
-				"success": fnCallback
+				"success": testCallback
 			} );
 		},
 		"fnRowCallback": dtRowCallback,
 		"fnDrawCallback": dtDrawCallback,
 		"aoColumns": [
-			/* Id */		{ "sName": "id", "bSearchable": false, "bVisible": false },
-			/* Title */		{ "sTitle": "Title", "sName": "track_title" },
-			/* Creator */	{ "sTitle": "Creator", "sName": "artist_name" },
-			/* Album */		{ "sTitle": "Album", "sName": "album_title" },
-			/* Genre */		{ "sTitle": "Genre", "sName": "genre" },
-			/* Length */	{ "sTitle": "Length", "sName": "length" },
-			/* Type */		{ "sTitle": "Type", "sName": "ftype", "bSearchable": false }
-		],
+                    /* Checkbox */      {"sTitle": "<input type='checkbox' name='cb_all'>", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"},
+                    /* Id */            {"sName": "id", "bSearchable": false, "bVisible": false, "mDataProp": "id", "sClass": "library_id"},
+                    /* Title */         {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"},
+                    /* Creator */       {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"},
+                    /* Album */         {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"},
+                    /* Genre */         {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sWidth": "10%", "sClass": "library_genre"},
+                    /* Year */          {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sWidth": "8%", "sClass": "library_year"},
+                    /* Length */        {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sWidth": "10%", "sClass": "library_length"},
+                    /* Type */          {"sTitle": "Type", "sName": "ftype", "bSearchable": false, "mDataProp": "ftype", "sWidth": "9%", "sClass": "library_type"},
+                    /* Upload Time */   {"sTitle": "Upload Time", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"},
+                    /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"},
+                ],
 		"aaSorting": [[2,'asc']],
 		"sPaginationType": "full_numbers",
 		"bJQueryUI": true,
@@ -330,20 +533,42 @@ function createDataTable(data) {
                     "sSearch": ""
                 },
                 "iDisplayLength": getNumEntriesPreference(data),
-                "bStateSave": true
+                "bStateSave": true,
+                // R = ColReorder, C = ColVis, see datatables doc for others
+                "sDom": 'Rlfr<"H"C<"library_toolbar">>t<"F"ip>',
+                "oColVis": {
+                    "buttonText": "Show/Hide Columns",
+                    "sAlign": "right",
+                    "aiExclude": [0, 1, 2],
+                    "sSize": "css",
+                    "bShowAll": true
+		},
+                "oColReorder": {
+                    "aiOrder": [ 0, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] /* code this */,
+                    "iFixedColumns": 3
+		}
     });
     dTable.fnSetFilteringDelay(350);
+    
+    $("div.library_toolbar").html('<span class="fg-button ui-button ui-state-default" id="library_order_reset">Reset Order</span>' + 
+        '<span class="fg-button ui-button ui-state-default ui-state-disabled" id="library_group_delete">Delete</span>' + 
+        '<span class="fg-button ui-button ui-state-default ui-state-disabled" id="library_group_add">Add</span>');
+    
+    $('#library_order_reset').click(function() {
+        ColReorder.fnReset( dTable );
+        return false;
+    });
 }
 
 $(document).ready(function() {
     $('.tabs').tabs();
     
-    $.ajax({ url: "/Api/library-init/format/json", dataType:"json", success:createDataTable, 
+    $.ajax({url: "/Api/library-init/format/json", dataType:"json", success:createDataTable, 
         error:function(jqXHR, textStatus, errorThrown){}});
     
-    checkImportStatus()
+    checkImportStatus();
     setInterval( "checkImportStatus()", 5000 );
     setInterval( "checkSCUploadStatus()", 5000 );
-
+    
     addQtipToSCIcons()
 });

airtime_mvc/public/js/airtime/library/spl.js

@@ -449,6 +449,9 @@ function setUpSPL() {
             }
             
             $("#fieldset-metadate_change").addClass("closed");
+            
+            // update the "Last Modified" time for this playlist
+            redrawDataTablePage();
         });
     });
 

airtime_mvc/public/js/airtime/schedule/add-show.js

@@ -33,7 +33,8 @@ function createDateInput(el, onSelect) {
 			onSelect: onSelect,
 			dateFormat: 'yy-mm-dd',
 			closeText: 'Close',
-			showButtonPanel: true
+			showButtonPanel: true,
+                        firstDay: weekStart
 		});
 }
 
@@ -190,7 +191,8 @@ function setAddShowEvents() {
 		minDate: adjustDateToServerDate(new Date(), timezoneOffset),
 		dateFormat: 'yy-mm-dd',
 		closeText: 'Close',
-		showButtonPanel: true
+		showButtonPanel: true,
+                firstDay: weekStart
 	});
     form.find('input[name^="add_show_rebroadcast_time"]').timepicker({
         amPmText: ['', ''],

airtime_mvc/public/js/airtime/schedule/schedule.js

@@ -86,7 +86,7 @@ function setScheduleDialogEvents(dialog) {
 }
 
 function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
-	var id = "pl_" + aData[0];
+	var id = "pl_" + aData['id'];
 
 	$(nRow).attr("id", id);
 
@@ -125,12 +125,12 @@ function makeScheduleDialog(dialog, json) {
 		"fnRowCallback": dtRowCallback,
 		"fnDrawCallback": dtDrawCallback,
 		"aoColumns": [ 
-			/* Id */			{ "sName": "pl.id", "bSearchable": false, "bVisible": false },
-			/* Description */	{ "sName": "pl.description", "bVisible": false },
-			/* Name */			{ "sName": "pl.name" },
-			/* Creator */		{ "sName": "pl.creator" },
-			/* Length */		{ "sName": "plt.length" },
-			/* Editing */		{ "sName": "sub.login" }
+			/* Id */		{"sTitle": "ID", "sName": "pl.id", "bSearchable": false, "bVisible": false, "mDataProp": "id"},
+                        /* Description */	{"sTitle": "Description", "sName": "pl.description", "bSearchable": false, "bVisible": false, "mDataProp": "description"},
+			/* Name */		{"sTitle": "Title", "sName": "pl.name", "mDataProp": "name"},
+			/* Creator */		{"sTitle": "Creator", "sName": "pl.creator", "mDataProp": "creator"},
+			/* Length */		{"sTitle": "Length", "sName": "plt.length", "mDataProp": "length"},
+			/* Editing */		{"sTitle": "Editing", "sName": "sub.login", "mDataProp": "login"}
 		],
 		"aaSorting": [[2,'asc']],
 		"sPaginationType": "full_numbers",
@@ -184,6 +184,16 @@ function confirmCancelShow(show_instance_id){
     }
 }
 
+function confirmCancelRecordedShow(show_instance_id){
+    if(confirm('Erase current show and stop recording?')){
+        var url = "/Schedule/cancel-current-show/id/"+show_instance_id;
+        $.ajax({
+          url: url,
+          success: function(data){scheduleRefetchEvents(data);}
+        });
+    }
+}
+
 function uploadToSoundCloud(show_instance_id){
     
     var url = "/Schedule/upload-to-sound-cloud";
@@ -219,7 +229,11 @@ function buildContentDialog(json){
         alertShowErrorAndReload();
     }
 	var dialog = $(json.dialog);
-	
+        
+	dialog.find("#show_progressbar").progressbar({
+		value: json.percentFilled
+	});
+        
 	var viewportwidth;
 	var viewportheight;
 

airtime_mvc/public/js/airtime/user/user.js

@@ -35,23 +35,23 @@ function removeUserCallback(row_id, nRow){
 }
 
 function rowCallback( nRow, aData, iDisplayIndex ){
-    $(nRow).click(function(){rowClickCallback(aData[0])});
-    if( aData[5] != "self"){
-    	$('td:eq(4)', nRow).append( '<span class="ui-icon ui-icon-closethick"></span>').children('span').click(function(e){e.stopPropagation(); removeUserCallback(aData[0], nRow)});
+    $(nRow).click(function(){rowClickCallback(aData['id'])});
+    if( aData['delete'] != "self"){
+    	$('td:eq(4)', nRow).append( '<span class="ui-icon ui-icon-closethick"></span>').children('span').click(function(e){e.stopPropagation(); removeUserCallback(aData['id'], nRow)});
     }else{
     	$('td:eq(4)', nRow).empty().append( '<span class="ui-icon ui-icon-closethick"></span>').children('span').click(function(e){e.stopPropagation(); alert("Can't delete yourself!")});
     }
 
-    if ( aData[4] == "A" )
+    if ( aData['type'] == "A" )
     {
 	    $('td:eq(3)', nRow).html( 'Admin' );
-    } else if ( aData[4] == "H" )
+    } else if ( aData['type'] == "H" )
     {
 	    $('td:eq(3)', nRow).html( 'DJ' );
-    } else if ( aData[4] == "G" )
+    } else if ( aData['type'] == "G" )
     {
 	    $('td:eq(3)', nRow).html( 'Guest' );
-    } else if ( aData[4] == "P" )
+    } else if ( aData['type'] == "P" )
     {
     	$('td:eq(3)', nRow).html( 'Program Manager' );
     }
@@ -75,12 +75,12 @@ $(document).ready(function() {
         },
         "fnRowCallback": rowCallback,
         "aoColumns": [
-            /* Id */         { "sName": "id", "bSearchable": false, "bVisible": false },
-            /* user name */  { "sName": "login" },
-            /* first name */ { "sName": "first_name" },
-            /* last name */  { "sName": "last_name" },
-            /* user type */  { "sName": "type", "bSearchable": false },
-            /* del button */ { "sName": "null as delete", "bSearchable": false, "bSortable": false}
+            /* Id */         { "sName": "id", "bSearchable": false, "bVisible": false, "mDataProp": "id" },
+            /* user name */  { "sName": "login", "mDataProp": "login" },
+            /* first name */ { "sName": "first_name", "mDataProp": "first_name" },
+            /* last name */  { "sName": "last_name", "mDataProp": "last_name" },
+            /* user type */  { "sName": "type", "bSearchable": false, "mDataProp": "type" },
+            /* del button */ { "sName": "null as delete", "bSearchable": false, "bSortable": false, "mDataProp": "delete"}
         ],
         "bJQueryUI": true,
         "bAutoWidth": false,

airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js

@@ -0,0 +1,987 @@
+/*
+ * File:        ColReorder.js
+ * Version:     1.0.4
+ * CVS:         $Id$
+ * Description: Controls for column visiblity in DataTables
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Created:     Wed Sep 15 18:23:29 BST 2010
+ * Modified:    $Date$ by $Author$
+ * Language:    Javascript
+ * License:     GPL v2 or BSD 3 point style
+ * Project:     DataTables
+ * Contact:     www.sprymedia.co.uk/contact
+ * 
+ * Copyright 2010-2011 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ *
+ */
+
+
+(function($, window, document) {
+
+
+/**
+ * Switch the key value pairing of an index array to be value key (i.e. the old value is now the
+ * key). For example consider [ 2, 0, 1 ] this would be returned as [ 1, 2, 0 ].
+ *  @method  fnInvertKeyValues
+ *  @param   array aIn Array to switch around
+ *  @returns array
+ */
+function fnInvertKeyValues( aIn )
+{
+	var aRet=[];
+	for ( var i=0, iLen=aIn.length ; i<iLen ; i++ )
+	{
+		aRet[ aIn[i] ] = i;
+	}
+	return aRet;
+}
+
+
+/**
+ * Modify an array by switching the position of two elements
+ *  @method  fnArraySwitch
+ *  @param   array aArray Array to consider, will be modified by reference (i.e. no return)
+ *  @param   int iFrom From point
+ *  @param   int iTo Insert point
+ *  @returns void
+ */
+function fnArraySwitch( aArray, iFrom, iTo )
+{
+	var mStore = aArray.splice( iFrom, 1 )[0];
+	aArray.splice( iTo, 0, mStore );
+}
+
+
+/**
+ * Switch the positions of nodes in a parent node (note this is specifically designed for 
+ * table rows). Note this function considers all element nodes under the parent!
+ *  @method  fnDomSwitch
+ *  @param   string sTag Tag to consider
+ *  @param   int iFrom Element to move
+ *  @param   int Point to element the element to (before this point), can be null for append
+ *  @returns void
+ */
+function fnDomSwitch( nParent, iFrom, iTo )
+{
+	var anTags = [];
+	for ( var i=0, iLen=nParent.childNodes.length ; i<iLen ; i++ )
+	{
+		if ( nParent.childNodes[i].nodeType == 1 )
+		{
+			anTags.push( nParent.childNodes[i] );
+		}
+	}
+	var nStore = anTags[ iFrom ];
+	
+	if ( iTo !== null )
+	{
+		nParent.insertBefore( nStore, anTags[iTo] );
+	}
+	else
+	{
+		nParent.appendChild( nStore );
+	}
+}
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables plug-in API functions
+ *
+ * This are required by ColReorder in order to perform the tasks required, and also keep this
+ * code portable, to be used for other column reordering projects with DataTables, if needed.
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+/**
+ * Plug-in for DataTables which will reorder the internal column structure by taking the column
+ * from one position (iFrom) and insert it into a given point (iTo).
+ *  @method  $.fn.dataTableExt.oApi.fnColReorder
+ *  @param   object oSettings DataTables settings object - automatically added by DataTables! 
+ *  @param   int iFrom Take the column to be repositioned from this point
+ *  @param   int iTo and insert it into this point
+ *  @returns void
+ */
+$.fn.dataTableExt.oApi.fnColReorder = function ( oSettings, iFrom, iTo )
+{
+	var i, iLen, j, jLen, iCols=oSettings.aoColumns.length, nTrs, oCol;
+	
+	/* Sanity check in the input */
+	if ( iFrom == iTo )
+	{
+		/* Pointless reorder */
+		return;
+	}
+	
+	if ( iFrom < 0 || iFrom >= iCols )
+	{
+		this.oApi._fnLog( oSettings, 1, "ColReorder 'from' index is out of bounds: "+iFrom );
+		return;
+	}
+	
+	if ( iTo < 0 || iTo >= iCols )
+	{
+		this.oApi._fnLog( oSettings, 1, "ColReorder 'to' index is out of bounds: "+iTo );
+		return;
+	}
+	
+	/*
+	 * Calculate the new column array index, so we have a mapping between the old and new
+	 */
+	var aiMapping = [];
+	for ( i=0, iLen=iCols ; i<iLen ; i++ )
+	{
+		aiMapping[i] = i;
+	}
+	fnArraySwitch( aiMapping, iFrom, iTo );
+	var aiInvertMapping = fnInvertKeyValues( aiMapping );
+	
+	
+	/*
+	 * Convert all internal indexing to the new column order indexes
+	 */
+	/* Sorting */
+	for ( i=0, iLen=oSettings.aaSorting.length ; i<iLen ; i++ )
+	{
+		oSettings.aaSorting[i][0] = aiInvertMapping[ oSettings.aaSorting[i][0] ];
+	}
+	
+	/* Fixed sorting */
+	if ( oSettings.aaSortingFixed !== null )
+	{
+		for ( i=0, iLen=oSettings.aaSortingFixed.length ; i<iLen ; i++ )
+		{
+			oSettings.aaSortingFixed[i][0] = aiInvertMapping[ oSettings.aaSortingFixed[i][0] ];
+		}
+	}
+	
+	/* Data column sorting (the column which the sort for a given column should take place on) */
+	for ( i=0, iLen=iCols ; i<iLen ; i++ )
+	{
+		oSettings.aoColumns[i].iDataSort = aiInvertMapping[ oSettings.aoColumns[i].iDataSort ];
+	}
+	
+	/* Update the Get and Set functions for each column */
+	for ( i=0, iLen=iCols ; i<iLen ; i++ )
+	{
+		oCol = oSettings.aoColumns[i];
+		if ( typeof oCol.mDataProp == 'number' ) {
+			oCol.mDataProp = aiInvertMapping[ oCol.mDataProp ];
+			oCol.fnGetData = oSettings.oApi._fnGetObjectDataFn( oCol.mDataProp );
+			oCol.fnSetData = oSettings.oApi._fnSetObjectDataFn( oCol.mDataProp );
+		}
+	}
+	
+	
+	/*
+	 * Move the DOM elements
+	 */
+	if ( oSettings.aoColumns[iFrom].bVisible )
+	{
+		/* Calculate the current visible index and the point to insert the node before. The insert
+		 * before needs to take into account that there might not be an element to insert before,
+		 * in which case it will be null, and an appendChild should be used
+		 */
+		var iVisibleIndex = this.oApi._fnColumnIndexToVisible( oSettings, iFrom );
+		var iInsertBeforeIndex = null;
+		
+		i = iTo < iFrom ? iTo : iTo + 1;
+		while ( iInsertBeforeIndex === null && i < iCols )
+		{
+			iInsertBeforeIndex = this.oApi._fnColumnIndexToVisible( oSettings, i );
+			i++;
+		}
+		
+		/* Header */
+		nTrs = oSettings.nTHead.getElementsByTagName('tr');
+		for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+		{
+			fnDomSwitch( nTrs[i], iVisibleIndex, iInsertBeforeIndex );
+		}
+		
+		/* Footer */
+		if ( oSettings.nTFoot !== null )
+		{
+			nTrs = oSettings.nTFoot.getElementsByTagName('tr');
+			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+			{
+				fnDomSwitch( nTrs[i], iVisibleIndex, iInsertBeforeIndex );
+			}
+		}
+		
+		/* Body */
+		for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+		{
+			if ( oSettings.aoData[i].nTr !== null )
+			{
+				fnDomSwitch( oSettings.aoData[i].nTr, iVisibleIndex, iInsertBeforeIndex );
+			}
+		}
+	}
+	
+	
+	/* 
+	 * Move the internal array elements
+	 */
+	/* Columns */
+	fnArraySwitch( oSettings.aoColumns, iFrom, iTo );
+	
+	/* Search columns */
+	fnArraySwitch( oSettings.aoPreSearchCols, iFrom, iTo );
+	
+	/* Array array - internal data anodes cache */
+	for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+	{
+		if ( $.isArray( oSettings.aoData[i]._aData ) ) {
+		  fnArraySwitch( oSettings.aoData[i]._aData, iFrom, iTo );
+		}
+		fnArraySwitch( oSettings.aoData[i]._anHidden, iFrom, iTo );
+	}
+	
+	/* Reposition the header elements in the header layout array */
+	for ( i=0, iLen=oSettings.aoHeader.length ; i<iLen ; i++ )
+	{
+		fnArraySwitch( oSettings.aoHeader[i], iFrom, iTo );
+	}
+	
+	if ( oSettings.aoFooter !== null )
+	{
+		for ( i=0, iLen=oSettings.aoFooter.length ; i<iLen ; i++ )
+		{
+			fnArraySwitch( oSettings.aoFooter[i], iFrom, iTo );
+		}
+	}
+	
+	
+	/*
+	 * Update DataTables' event handlers
+	 */
+	
+	/* Sort listener */
+	for ( i=0, iLen=iCols ; i<iLen ; i++ )
+	{
+		$(oSettings.aoColumns[i].nTh).unbind('click');
+		this.oApi._fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
+	}
+	
+	
+	/*
+	 * Any extra operations for the other plug-ins
+	 */
+	if ( typeof ColVis != 'undefined' )
+	{
+		ColVis.fnRebuild( oSettings.oInstance );
+	}
+	
+	if ( typeof oSettings.oInstance._oPluginFixedHeader != 'undefined' )
+	{
+		oSettings.oInstance._oPluginFixedHeader.fnUpdate();
+	}
+};
+
+
+
+
+/** 
+ * ColReorder provides column visiblity control for DataTables
+ * @class ColReorder
+ * @constructor
+ * @param {object} DataTables object
+ * @param {object} ColReorder options
+ */
+ColReorder = function( oTable, oOpts )
+{
+	/* Santiy check that we are a new instance */
+	if ( !this.CLASS || this.CLASS != "ColReorder" )
+	{
+		alert( "Warning: ColReorder must be initialised with the keyword 'new'" );
+	}
+	
+	if ( typeof oOpts == 'undefined' )
+	{
+		oOpts = {};
+	}
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Public class variables
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/**
+	 * @namespace Settings object which contains customisable information for ColReorder instance
+	 */
+	this.s = {
+		/**
+		 * DataTables settings object
+		 *  @property dt
+		 *  @type     Object
+		 *  @default  null
+		 */
+		"dt": null,
+		
+		/**
+		 * Initialisation object used for this instance
+		 *  @property init
+		 *  @type     object
+		 *  @default  {}
+		 */
+		"init": oOpts,
+		
+		/**
+		 * Number of columns to fix (not allow to be reordered)
+		 *  @property fixed
+		 *  @type     int
+		 *  @default  0
+		 */
+		"fixed": 0,
+		
+		/**
+		 * Callback function for once the reorder has been done
+		 *  @property dropcallback
+		 *  @type     function
+		 *  @default  null
+		 */
+		"dropCallback": null,
+		
+		/**
+		 * @namespace Information used for the mouse drag
+		 */
+		"mouse": {
+			"startX": -1,
+			"startY": -1,
+			"offsetX": -1,
+			"offsetY": -1,
+			"target": -1,
+			"targetIndex": -1,
+			"fromIndex": -1
+		},
+		
+		/**
+		 * Information which is used for positioning the insert cusor and knowing where to do the
+		 * insert. Array of objects with the properties:
+		 *   x: x-axis position
+		 *   to: insert point
+		 *  @property aoTargets
+		 *  @type     array
+		 *  @default  []
+		 */
+		"aoTargets": []
+	};
+	
+	
+	/**
+	 * @namespace Common and useful DOM elements for the class instance
+	 */
+	this.dom = {
+		/**
+		 * Dragging element (the one the mouse is moving)
+		 *  @property drag
+		 *  @type     element
+		 *  @default  null
+		 */
+		"drag": null,
+		
+		/**
+		 * The insert cursor
+		 *  @property pointer
+		 *  @type     element
+		 *  @default  null
+		 */
+		"pointer": null
+	};
+	
+	
+	/* Constructor logic */
+	this.s.dt = oTable.fnSettings();
+	this._fnConstruct();
+	
+	/* Store the instance for later use */
+	ColReorder.aoInstances.push( this );
+	return this;
+};
+
+
+
+ColReorder.prototype = {
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Public methods
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	"fnReset": function ()
+	{
+		var a = [];
+		for ( var i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
+		{
+			a.push( this.s.dt.aoColumns[i]._ColReorder_iOrigCol );
+		}
+		
+		this._fnOrderColumns( a );
+	},
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Private methods (they are of course public in JS, but recommended as private)
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/**
+	 * Constructor logic
+	 *  @method  _fnConstruct
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnConstruct": function ()
+	{
+		var that = this;
+		var i, iLen;
+		
+		/* Columns discounted from reordering - counting left to right */
+		if ( typeof this.s.init.iFixedColumns != 'undefined' )
+		{
+			this.s.fixed = this.s.init.iFixedColumns;
+		}
+		
+		/* Drop callback initialisation option */
+		if ( typeof this.s.init.fnReorderCallback != 'undefined' )
+		{
+			this.s.dropCallback = this.s.init.fnReorderCallback;
+		}
+		
+		/* Add event handlers for the drag and drop, and also mark the original column order */
+		for ( i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
+		{
+			if ( i > this.s.fixed-1 )
+			{
+				this._fnMouseListener( i, this.s.dt.aoColumns[i].nTh );
+			}
+			
+			/* Mark the original column order for later reference */
+			this.s.dt.aoColumns[i]._ColReorder_iOrigCol = i;
+		}
+		
+		/* State saving */
+		this.s.dt.aoStateSave.push( {
+			"fn": function (oS, sVal) {
+				return that._fnStateSave.call( that, sVal );
+			},
+			"sName": "ColReorder_State"
+		} );
+		
+		/* An initial column order has been specified */
+		var aiOrder = null;
+		if ( typeof this.s.init.aiOrder != 'undefined' )
+		{
+			aiOrder = this.s.init.aiOrder.slice();
+		}
+		
+		/* State loading, overrides the column order given */
+		if ( this.s.dt.oLoadedState && typeof this.s.dt.oLoadedState.ColReorder != 'undefined' &&
+		  this.s.dt.oLoadedState.ColReorder.length == this.s.dt.aoColumns.length )
+		{
+			aiOrder = this.s.dt.oLoadedState.ColReorder;
+		}
+		
+		/* If we have an order to apply - do so */
+		if ( aiOrder )
+		{
+			/* We might be called during or after the DataTables initialisation. If before, then we need
+			 * to wait until the draw is done, if after, then do what we need to do right away
+			 */
+			if ( !that.s.dt._bInitComplete )
+			{
+				var bDone = false;
+				this.s.dt.aoDrawCallback.push( {
+					"fn": function () {
+						if ( !that.s.dt._bInitComplete && !bDone )
+						{
+							bDone = true;
+							var resort = fnInvertKeyValues( aiOrder );
+							that._fnOrderColumns.call( that, resort );
+						}
+					},
+					"sName": "ColReorder_Pre"
+				} );
+			}
+			else
+			{
+				var resort = fnInvertKeyValues( aiOrder );
+				that._fnOrderColumns.call( that, resort );
+			}
+		}
+	},
+	
+	
+	/**
+	 * Set the column order from an array
+	 *  @method  _fnOrderColumns
+	 *  @param   array a An array of integers which dictate the column order that should be applied
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnOrderColumns": function ( a )
+	{
+		if ( a.length != this.s.dt.aoColumns.length )
+		{
+			this.s.dt.oInstance.oApi._fnLog( oDTSettings, 1, "ColReorder - array reorder does not "+
+			 	"match known number of columns. Skipping." );
+			return;
+		}
+		
+		for ( var i=0, iLen=a.length ; i<iLen ; i++ )
+		{
+			var currIndex = $.inArray( i, a );
+			if ( i != currIndex )
+			{
+				/* Reorder our switching array */
+				fnArraySwitch( a, currIndex, i );
+				
+				/* Do the column reorder in the table */
+				this.s.dt.oInstance.fnColReorder( currIndex, i );
+			}
+		}
+		
+		/* When scrolling we need to recalculate the column sizes to allow for the shift */
+		if ( this.s.dt.oScroll.sX !== "" || this.s.dt.oScroll.sY !== "" )
+		{
+			this.s.dt.oInstance.fnAdjustColumnSizing();
+		}
+			
+		/* Save the state */
+		this.s.dt.oInstance.oApi._fnSaveState( this.s.dt );
+	},
+	
+	
+	/**
+	 * This function effectively replaces the state saving function in DataTables (this is needed
+	 * because otherwise DataTables would state save the columns in their reordered state, not the
+	 * original which is needed on first draw). This is sensitive to any changes in the DataTables
+	 * state saving method!
+	 *  @method  _fnStateSave
+	 *  @param   string sCurrentVal 
+	 *  @returns string JSON encoded cookie string for DataTables
+	 *  @private 
+	 */
+	"_fnStateSave": function ( sCurrentVal )
+	{
+		var i, iLen, sTmp;
+		var sValue = sCurrentVal.split('"aaSorting"')[0];
+		var a = [];
+		var oSettings = this.s.dt;
+		
+		/* Sorting */
+		sValue += '"aaSorting":[ ';
+		for ( i=0 ; i<oSettings.aaSorting.length ; i++ )
+		{
+			sValue += '['+oSettings.aoColumns[ oSettings.aaSorting[i][0] ]._ColReorder_iOrigCol+
+				',"'+oSettings.aaSorting[i][1]+'"],';
+		}
+		sValue = sValue.substring(0, sValue.length-1);
+		sValue += "],";
+		
+		/* Column filter */
+		for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+		{
+			a[ oSettings.aoColumns[i]._ColReorder_iOrigCol ] = {
+				"sSearch": encodeURIComponent(oSettings.aoPreSearchCols[i].sSearch),
+				"bRegex": !oSettings.aoPreSearchCols[i].bRegex
+			};
+		}
+		
+		sValue += '"aaSearchCols":[ ';
+		for ( i=0 ; i<a.length ; i++ )
+		{
+			sValue += '["'+a[i].sSearch+'",'+a[i].bRegex+'],';
+		}
+		sValue = sValue.substring(0, sValue.length-1);
+		sValue += "],";
+		
+		/* Visibility */
+		a = [];
+		for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+		{
+			a[ oSettings.aoColumns[i]._ColReorder_iOrigCol ] = oSettings.aoColumns[i].bVisible;
+		}
+		
+		sValue += '"abVisCols":[ ';
+		for ( i=0 ; i<a.length ; i++ )
+		{
+			sValue += a[i]+",";
+		}
+		sValue = sValue.substring(0, sValue.length-1);
+		sValue += "],";
+		
+		/* Column reordering */
+		a = [];
+		for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ ) {
+			a.push( oSettings.aoColumns[i]._ColReorder_iOrigCol );
+		}
+		sValue += '"ColReorder":['+a.join(',')+']';
+		
+		return sValue;
+	},
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Mouse drop and drag
+	 */
+	
+	/**
+	 * Add a mouse down listener to a particluar TH element
+	 *  @method  _fnMouseListener
+	 *  @param   int i Column index
+	 *  @param   element nTh TH element clicked on
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnMouseListener": function ( i, nTh )
+	{
+		var that = this;
+		$(nTh).bind( 'mousedown.ColReorder', function (e) {
+			that._fnMouseDown.call( that, e, nTh );
+			return false;
+		} );
+	},
+	
+	
+	/**
+	 * Mouse down on a TH element in the table header
+	 *  @method  _fnMouseDown
+	 *  @param   event e Mouse event
+	 *  @param   element nTh TH element to be dragged
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnMouseDown": function ( e, nTh )
+	{
+		var
+			that = this,
+			aoColumns = this.s.dt.aoColumns;
+		
+		/* Store information about the mouse position */
+		var nThTarget = e.target.nodeName == "TH" ? e.target : $(e.target).parents('TH')[0];
+		var offset = $(nThTarget).offset();
+		this.s.mouse.startX = e.pageX;
+		this.s.mouse.startY = e.pageY;
+		this.s.mouse.offsetX = e.pageX - offset.left;
+		this.s.mouse.offsetY = e.pageY - offset.top;
+		this.s.mouse.target = nTh;
+		this.s.mouse.targetIndex = $('th', nTh.parentNode).index( nTh );
+		this.s.mouse.fromIndex = this.s.dt.oInstance.oApi._fnVisibleToColumnIndex( this.s.dt, 
+			this.s.mouse.targetIndex );
+		
+		/* Calculate a cached array with the points of the column inserts, and the 'to' points */
+		this.s.aoTargets.splice( 0, this.s.aoTargets.length );
+		
+		this.s.aoTargets.push( {
+			"x":  $(this.s.dt.nTable).offset().left,
+			"to": 0
+		} );
+		
+		var iToPoint = 0;
+		for ( var i=0, iLen=aoColumns.length ; i<iLen ; i++ )
+		{
+			/* For the column / header in question, we want it's position to remain the same if the 
+			 * position is just to it's immediate left or right, so we only incremement the counter for
+			 * other columns
+			 */
+			if ( i != this.s.mouse.fromIndex )
+			{
+				iToPoint++;
+			}
+			
+			if ( aoColumns[i].bVisible )
+			{
+				this.s.aoTargets.push( {
+					"x":  $(aoColumns[i].nTh).offset().left + $(aoColumns[i].nTh).outerWidth(),
+					"to": iToPoint
+				} );
+			}
+		}
+		
+		/* Disallow columns for being reordered by drag and drop, counting left to right */
+		if ( this.s.fixed !== 0 )
+		{
+			this.s.aoTargets.splice( 0, this.s.fixed );
+		}
+		
+		/* Add event handlers to the document */
+		$(document).bind( 'mousemove.ColReorder', function (e) {
+			that._fnMouseMove.call( that, e );
+		} );
+		
+		$(document).bind( 'mouseup.ColReorder', function (e) {
+			that._fnMouseUp.call( that, e );
+		} );
+	},
+	
+	
+	/**
+	 * Deal with a mouse move event while dragging a node
+	 *  @method  _fnMouseMove
+	 *  @param   event e Mouse event
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnMouseMove": function ( e )
+	{
+		var that = this;
+		
+		if ( this.dom.drag === null )
+		{
+			/* Only create the drag element if the mouse has moved a specific distance from the start
+			 * point - this allows the user to make small mouse movements when sorting and not have a
+			 * possibly confusing drag element showing up
+			 */
+			if ( Math.pow(
+				Math.pow(e.pageX - this.s.mouse.startX, 2) + 
+				Math.pow(e.pageY - this.s.mouse.startY, 2), 0.5 ) < 5 )
+			{
+				return;
+			}
+			this._fnCreateDragNode();
+		}
+		
+		/* Position the element - we respect where in the element the click occured */
+		this.dom.drag.style.left = (e.pageX - this.s.mouse.offsetX) + "px";
+		this.dom.drag.style.top = (e.pageY - this.s.mouse.offsetY) + "px";
+		
+		/* Based on the current mouse position, calculate where the insert should go */
+		var bSet = false;
+		for ( var i=1, iLen=this.s.aoTargets.length ; i<iLen ; i++ )
+		{
+			if ( e.pageX < this.s.aoTargets[i-1].x + ((this.s.aoTargets[i].x-this.s.aoTargets[i-1].x)/2) )
+			{
+				this.dom.pointer.style.left = this.s.aoTargets[i-1].x +"px";
+				this.s.mouse.toIndex = this.s.aoTargets[i-1].to;
+				bSet = true;
+				break;
+			}
+		}
+		
+		/* The insert element wasn't positioned in the array (less than operator), so we put it at 
+		 * the end
+		 */
+		if ( !bSet )
+		{
+			this.dom.pointer.style.left = this.s.aoTargets[this.s.aoTargets.length-1].x +"px";
+			this.s.mouse.toIndex = this.s.aoTargets[this.s.aoTargets.length-1].to;
+		}
+	},
+	
+	
+	/**
+	 * Finish off the mouse drag and insert the column where needed
+	 *  @method  _fnMouseUp
+	 *  @param   event e Mouse event
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnMouseUp": function ( e )
+	{
+		var that = this;
+		
+		$(document).unbind( 'mousemove.ColReorder' );
+		$(document).unbind( 'mouseup.ColReorder' );
+		
+		if ( this.dom.drag !== null )
+		{
+			/* Remove the guide elements */
+			document.body.removeChild( this.dom.drag );
+			document.body.removeChild( this.dom.pointer );
+			this.dom.drag = null;
+			this.dom.pointer = null;
+			
+			/* Actually do the reorder */
+			this.s.dt.oInstance.fnColReorder( this.s.mouse.fromIndex, this.s.mouse.toIndex );
+			
+			/* When scrolling we need to recalculate the column sizes to allow for the shift */
+			if ( this.s.dt.oScroll.sX !== "" || this.s.dt.oScroll.sY !== "" )
+			{
+				this.s.dt.oInstance.fnAdjustColumnSizing();
+			}
+			
+			if ( this.s.dropCallback !== null )
+			{
+				this.s.dropCallback.call( this );
+			}
+			
+			/* Save the state */
+			this.s.dt.oInstance.oApi._fnSaveState( this.s.dt );
+		}
+	},
+	
+	
+	/**
+	 * Copy the TH element that is being drags so the user has the idea that they are actually 
+	 * moving it around the page.
+	 *  @method  _fnCreateDragNode
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnCreateDragNode": function ()
+	{
+		var that = this;
+		
+		this.dom.drag = $(this.s.dt.nTHead.parentNode).clone(true)[0];
+		this.dom.drag.className += " DTCR_clonedTable";
+		while ( this.dom.drag.getElementsByTagName('caption').length > 0 )
+		{
+			this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('caption')[0] );
+		}
+		while ( this.dom.drag.getElementsByTagName('tbody').length > 0 )
+		{
+			this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('tbody')[0] );
+		}
+		while ( this.dom.drag.getElementsByTagName('tfoot').length > 0 )
+		{
+			this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('tfoot')[0] );
+		}
+		
+		$('thead tr:eq(0)', this.dom.drag).each( function () {
+			$('th:not(:eq('+that.s.mouse.targetIndex+'))', this).remove();
+		} );
+		$('tr', this.dom.drag).height( $('tr:eq(0)', that.s.dt.nTHead).height() );
+		
+		$('thead tr:gt(0)', this.dom.drag).remove();
+		
+		$('thead th:eq(0)', this.dom.drag).each( function (i) {
+			this.style.width = $('th:eq('+that.s.mouse.targetIndex+')', that.s.dt.nTHead).width()+"px";
+		} );
+		
+		this.dom.drag.style.position = "absolute";
+		this.dom.drag.style.top = "0px";
+		this.dom.drag.style.left = "0px";
+		this.dom.drag.style.width = $('th:eq('+that.s.mouse.targetIndex+')', that.s.dt.nTHead).outerWidth()+"px";
+		
+		
+		this.dom.pointer = document.createElement( 'div' );
+		this.dom.pointer.className = "DTCR_pointer";
+		this.dom.pointer.style.position = "absolute";
+		
+		if ( this.s.dt.oScroll.sX === "" && this.s.dt.oScroll.sY === "" )
+		{
+			this.dom.pointer.style.top = $(this.s.dt.nTable).offset().top+"px";
+			this.dom.pointer.style.height = $(this.s.dt.nTable).height()+"px";
+		}
+		else
+		{
+			this.dom.pointer.style.top = $('div.dataTables_scroll', this.s.dt.nTableWrapper).offset().top+"px";
+			this.dom.pointer.style.height = $('div.dataTables_scroll', this.s.dt.nTableWrapper).height()+"px";
+		}
+	
+		document.body.appendChild( this.dom.pointer );
+		document.body.appendChild( this.dom.drag );
+	}
+};
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Static parameters
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/**
+ * Array of all ColReorder instances for later reference
+ *  @property ColReorder.aoInstances
+ *  @type     array
+ *  @default  []
+ *  @static
+ */
+ColReorder.aoInstances = [];
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Static functions
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/**
+ * Reset the column ordering for a DataTables instance
+ *  @method  ColReorder.fnReset
+ *  @param   object oTable DataTables instance to consider
+ *  @returns void
+ *  @static
+ */
+ColReorder.fnReset = function ( oTable )
+{
+	for ( var i=0, iLen=ColReorder.aoInstances.length ; i<iLen ; i++ )
+	{
+		if ( ColReorder.aoInstances[i].s.dt.oInstance == oTable )
+		{
+			ColReorder.aoInstances[i].fnReset();
+		}
+	}
+};
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Constants
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/**
+ * Name of this class
+ *  @constant CLASS
+ *  @type     String
+ *  @default  ColReorder
+ */
+ColReorder.prototype.CLASS = "ColReorder";
+
+
+/**
+ * ColReorder version
+ *  @constant  VERSION
+ *  @type      String
+ *  @default   As code
+ */
+ColReorder.VERSION = "1.0.4";
+ColReorder.prototype.VERSION = ColReorder.VERSION;
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Initialisation
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Register a new feature with DataTables
+ */
+if ( typeof $.fn.dataTable == "function" &&
+     typeof $.fn.dataTableExt.fnVersionCheck == "function" &&
+     $.fn.dataTableExt.fnVersionCheck('1.8.0') )
+{
+	$.fn.dataTableExt.aoFeatures.push( {
+		"fnInit": function( oDTSettings ) {
+			var oTable = oDTSettings.oInstance;
+			if ( typeof oTable._oPluginColReorder == 'undefined' ) {
+				var opts = typeof oDTSettings.oInit.oColReorder != 'undefined' ? 
+					oDTSettings.oInit.oColReorder : {};
+				oTable._oPluginColReorder = new ColReorder( oDTSettings.oInstance, opts );
+			} else {
+				oTable.oApi._fnLog( oDTSettings, 1, "ColReorder attempted to initialise twice. Ignoring second" );
+			}
+			
+			return null; /* No node to insert */
+		},
+		"cFeature": "R",
+		"sFeature": "ColReorder"
+	} );
+}
+else
+{
+	alert( "Warning: ColReorder requires DataTables 1.8.0 or greater - www.datatables.net/download");
+}
+
+})(jQuery, window, document);

airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js

@@ -0,0 +1,995 @@
+/*
+ * File:        ColVis.js
+ * Version:     1.0.7.dev
+ * CVS:         $Id$
+ * Description: Controls for column visiblity in DataTables
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Created:     Wed Sep 15 18:23:29 BST 2010
+ * Modified:    $Date$ by $Author$
+ * Language:    Javascript
+ * License:     GPL v2 or BSD 3 point style
+ * Project:     Just a little bit of fun :-)
+ * Contact:     www.sprymedia.co.uk/contact
+ * 
+ * Copyright 2010-2011 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ */
+
+(function($) {
+
+/** 
+ * ColVis provides column visiblity control for DataTables
+ * @class ColVis
+ * @constructor
+ * @param {object} DataTables settings object
+ */
+ColVis = function( oDTSettings, oInit )
+{
+	/* Santiy check that we are a new instance */
+	if ( !this.CLASS || this.CLASS != "ColVis" )
+	{
+		alert( "Warning: ColVis must be initialised with the keyword 'new'" );
+	}
+	
+	if ( typeof oInit == 'undefined' )
+	{
+		oInit = {};
+	}
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Public class variables
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/**
+	 * @namespace Settings object which contains customisable information for ColVis instance
+	 */
+	this.s = {
+		/**
+		 * DataTables settings object
+		 *  @property dt
+		 *  @type     Object
+		 *  @default  null
+		 */
+		"dt": null,
+		
+		/**
+		 * Customisation object
+		 *  @property oInit
+		 *  @type     Object
+		 *  @default  passed in
+		 */
+		"oInit": oInit,
+		
+		/**
+		 * Callback function to tell the user when the state has changed
+		 *  @property fnStateChange
+		 *  @type     function
+		 *  @default  null
+		 */
+		"fnStateChange": null,
+		
+		/**
+		 * Mode of activation. Can be 'click' or 'mouseover'
+		 *  @property activate
+		 *  @type     String
+		 *  @default  click
+		 */
+		"activate": "click",
+		
+		/**
+		 * Position of the collection menu when shown - align "left" or "right"
+		 *  @property sAlign
+		 *  @type     String
+		 *  @default  right
+		 */
+		"sAlign": "left",
+		
+		/**
+		 * Text used for the button
+		 *  @property buttonText
+		 *  @type     String
+		 *  @default  Show / hide columns
+		 */
+		"buttonText": "Show / hide columns",
+		
+		/**
+		 * Flag to say if the collection is hidden
+		 *  @property hidden
+		 *  @type     boolean
+		 *  @default  true
+		 */
+		"hidden": true,
+		
+		/**
+		 * List of columns (integers) which should be excluded from the list
+		 *  @property aiExclude
+		 *  @type     Array
+		 *  @default  []
+		 */
+		"aiExclude": [],
+		
+		/**
+		 * Store the original viisbility settings so they could be restored
+		 *  @property abOriginal
+		 *  @type     Array
+		 *  @default  []
+		 */
+		"abOriginal": [],
+		
+		/**
+		 * Show Show-All button
+		 *  @property bShowAll
+		 *  @type     Array
+		 *  @default  []
+		 */
+		"bShowAll": false,
+		
+		/**
+		 * Show All button text
+		 *  @property sShowAll
+		 *  @type     String
+		 *  @default  Restore original
+		 */
+		"sShowAll": "Show All",
+		
+		/**
+		 * Show restore button
+		 *  @property bRestore
+		 *  @type     Array
+		 *  @default  []
+		 */
+		"bRestore": false,
+		
+		/**
+		 * Restore button text
+		 *  @property sRestore
+		 *  @type     String
+		 *  @default  Restore original
+		 */
+		"sRestore": "Restore original",
+		
+		/**
+		 * Overlay animation duration in mS
+		 *  @property iOverlayFade
+		 *  @type     Integer
+		 *  @default  500
+		 */
+		"iOverlayFade": 500,
+		
+		/**
+		 * Label callback for column names. Takes three parameters: 1. the column index, 2. the column
+		 * title detected by DataTables and 3. the TH node for the column
+		 *  @property fnLabel
+		 *  @type     Function
+		 *  @default  null
+		 */
+		"fnLabel": null,
+		
+		/**
+		 * Indicate if ColVis should automatically calculate the size of buttons or not. The default
+		 * is for it to do so. Set to "css" to disable the automatic sizing
+		 *  @property sSize
+		 *  @type     String
+		 *  @default  auto
+		 */
+		"sSize": "auto",
+		
+		/**
+		 * Indicate if the column list should be positioned by Javascript, visually below the button
+		 * or allow CSS to do the positioning
+		 *  @property bCssPosition
+		 *  @type     boolean
+		 *  @default  false
+		 */
+		"bCssPosition": false
+	};
+	
+	
+	/**
+	 * @namespace Common and useful DOM elements for the class instance
+	 */
+	this.dom = {
+		/**
+		 * Wrapper for the button - given back to DataTables as the node to insert
+		 *  @property wrapper
+		 *  @type     Node
+		 *  @default  null
+		 */
+		"wrapper": null,
+		
+		/**
+		 * Activation button
+		 *  @property button
+		 *  @type     Node
+		 *  @default  null
+		 */
+		"button": null,
+		
+		/**
+		 * Collection list node
+		 *  @property collection
+		 *  @type     Node
+		 *  @default  null
+		 */
+		"collection": null,
+		
+		/**
+		 * Background node used for shading the display and event capturing
+		 *  @property background
+		 *  @type     Node
+		 *  @default  null
+		 */
+		"background": null,
+		
+		/**
+		 * Element to position over the activation button to catch mouse events when using mouseover
+		 *  @property catcher
+		 *  @type     Node
+		 *  @default  null
+		 */
+		"catcher": null,
+		
+		/**
+		 * List of button elements
+		 *  @property buttons
+		 *  @type     Array
+		 *  @default  []
+		 */
+		"buttons": [],
+		
+		/**
+		 * Restore button
+		 *  @property restore
+		 *  @type     Node
+		 *  @default  null
+		 */
+		"restore": null
+	};
+	
+	/* Store global reference */
+	ColVis.aInstances.push( this );
+	
+	/* Constructor logic */
+	this.s.dt = oDTSettings;
+	this._fnConstruct();
+	return this;
+};
+
+
+
+ColVis.prototype = {
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Public methods
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/**
+	 * Rebuild the list of buttons for this instance (i.e. if there is a column header update)
+	 *  @method  fnRebuild
+	 *  @returns void
+	 */
+	"fnRebuild": function ()
+	{
+		/* Remove the old buttons */
+		for ( var i=this.dom.buttons.length-1 ; i>=0 ; i-- )
+		{
+			if ( this.dom.buttons[i] !== null )
+			{
+				this.dom.collection.removeChild( this.dom.buttons[i] );
+			}
+		}
+		this.dom.buttons.splice( 0, this.dom.buttons.length );
+		
+		if ( this.dom.restore )
+		{
+			this.dom.restore.parentNode( this.dom.restore );
+		}
+		
+		/* Re-add them (this is not the optimal way of doing this, it is fast and effective) */
+		this._fnAddButtons();
+		
+		/* Update the checkboxes */
+		this._fnDrawCallback();
+	},
+	
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Private methods (they are of course public in JS, but recommended as private)
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/**
+	 * Constructor logic
+	 *  @method  _fnConstruct
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnConstruct": function ()
+	{
+		this._fnApplyCustomisation();
+		
+		var that = this;
+		this.dom.wrapper = document.createElement('div');
+		this.dom.wrapper.className = "ColVis TableTools";
+		
+		this.dom.button = this._fnDomBaseButton( this.s.buttonText );
+		this.dom.button.className += " ColVis_MasterButton";
+		this.dom.wrapper.appendChild( this.dom.button );
+		
+		this.dom.catcher = this._fnDomCatcher();
+		this.dom.collection = this._fnDomCollection();
+		this.dom.background = this._fnDomBackground();
+		
+		this._fnAddButtons();
+		
+		/* Store the original visbility information */
+		for ( var i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
+		{
+			this.s.abOriginal.push( this.s.dt.aoColumns[i].bVisible );
+		}
+		
+		/* Update on each draw */
+		this.s.dt.aoDrawCallback.push( {
+			"fn": function () {
+				that._fnDrawCallback.call( that );
+			},
+			"sName": "ColVis"
+		} );
+	},
+	
+	
+	/**
+	 * Apply any customisation to the settings from the DataTables initialisation
+	 *  @method  _fnApplyCustomisation
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnApplyCustomisation": function ()
+	{
+		var oConfig = this.s.oInit;
+		
+		if ( typeof oConfig.activate != 'undefined' )
+		{
+			this.s.activate = oConfig.activate;
+		}
+		
+		if ( typeof oConfig.buttonText != 'undefined' )
+		{
+			this.s.buttonText = oConfig.buttonText;
+		}
+		
+		if ( typeof oConfig.aiExclude != 'undefined' )
+		{
+			this.s.aiExclude = oConfig.aiExclude;
+		}
+		
+		if ( typeof oConfig.bRestore != 'undefined' )
+		{
+			this.s.bRestore = oConfig.bRestore;
+		}
+		
+		if ( typeof oConfig.sRestore != 'undefined' )
+		{
+			this.s.sRestore = oConfig.sRestore;
+		}
+		
+		if ( typeof oConfig.bShowAll != 'undefined' )
+		{
+			this.s.bShowAll = oConfig.bShowAll;
+		}
+		
+		if ( typeof oConfig.sShowAll != 'undefined' )
+		{
+			this.s.sShowAll = oConfig.sShowAll;
+		}
+		
+		if ( typeof oConfig.sAlign != 'undefined' )
+		{
+			this.s.sAlign = oConfig.sAlign;
+		}
+		
+		if ( typeof oConfig.fnStateChange != 'undefined' )
+		{
+			this.s.fnStateChange = oConfig.fnStateChange;
+		}
+		
+		if ( typeof oConfig.iOverlayFade != 'undefined' )
+		{
+			this.s.iOverlayFade = oConfig.iOverlayFade;
+		}
+		
+		if ( typeof oConfig.fnLabel != 'undefined' )
+		{
+			this.s.fnLabel = oConfig.fnLabel;
+		}
+		
+		if ( typeof oConfig.sSize != 'undefined' )
+		{
+			this.s.sSize = oConfig.sSize;
+		}
+
+		if ( typeof oConfig.bCssPosition != 'undefined' )
+		{
+			this.s.bCssPosition = oConfig.bCssPosition;
+		}
+	},
+	
+	
+	/**
+	 * On each table draw, check the visiblity checkboxes as needed. This allows any process to
+	 * update the table's column visiblity and ColVis will still be accurate.
+	 *  @method  _fnDrawCallback
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnDrawCallback": function ()
+	{
+		var aoColumns = this.s.dt.aoColumns;
+		
+		for ( var i=0, iLen=aoColumns.length ; i<iLen ; i++ )
+		{
+			if ( this.dom.buttons[i] !== null )
+			{
+				if ( aoColumns[i].bVisible )
+				{
+					$('input', this.dom.buttons[i]).attr('checked','checked');
+				}
+				else
+				{
+					$('input', this.dom.buttons[i]).removeAttr('checked');
+				}
+			}
+		}
+	},
+	
+	
+	/**
+	 * Loop through the columns in the table and as a new button for each one.
+	 *  @method  _fnAddButtons
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnAddButtons": function ()
+	{
+		var
+			nButton,
+			sExclude = ","+this.s.aiExclude.join(',')+",";
+		
+		for ( var i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
+		{
+			if ( sExclude.indexOf( ","+i+"," ) == -1 )
+			{
+				nButton = this._fnDomColumnButton( i );
+				this.dom.buttons.push( nButton );
+				this.dom.collection.appendChild( nButton );
+			}
+			else
+			{
+				this.dom.buttons.push( null );
+			}
+		}
+		
+		if ( this.s.bRestore )
+		{
+			nButton = this._fnDomRestoreButton();
+			nButton.className += " ColVis_Restore";
+			this.dom.buttons.push( nButton );
+			this.dom.collection.appendChild( nButton );
+		}
+		
+		if ( this.s.bShowAll )
+		{
+			nButton = this._fnDomShowAllButton();
+			nButton.className += " ColVis_ShowAll";
+			this.dom.buttons.push( nButton );
+			this.dom.collection.appendChild( nButton );
+		}
+	},
+	
+	
+	/**
+	 * Create a button which allows a "restore" action
+	 *  @method  _fnDomRestoreButton
+	 *  @returns {Node} Created button
+	 *  @private 
+	 */
+	"_fnDomRestoreButton": function ()
+	{
+		var
+			that = this,
+			nButton = document.createElement('button'),
+			nSpan = document.createElement('span');
+		
+		nButton.className = !this.s.dt.bJUI ? "ColVis_Button TableTools_Button" :
+			"ColVis_Button TableTools_Button ui-button ui-state-default";
+		nButton.appendChild( nSpan );
+		$(nSpan).html( '<span class="ColVis_title">'+this.s.sRestore+'</span>' );
+		
+		$(nButton).click( function (e) {
+			for ( var i=0, iLen=that.s.abOriginal.length ; i<iLen ; i++ )
+			{
+				that.s.dt.oInstance.fnSetColumnVis( i, that.s.abOriginal[i], false );
+			}
+			that._fnAdjustOpenRows();
+			that.s.dt.oInstance.fnDraw( false );
+		} );
+		
+		return nButton;
+	},
+	
+	
+	/**
+	 * Create a button which allows a "show all" action
+	 *  @method  _fnDomShowAllButton
+	 *  @returns {Node} Created button
+	 *  @private 
+	 */
+	"_fnDomShowAllButton": function ()
+	{
+		var
+			that = this,
+			nButton = document.createElement('button'),
+			nSpan = document.createElement('span');
+		
+		nButton.className = !this.s.dt.bJUI ? "ColVis_Button TableTools_Button" :
+			"ColVis_Button TableTools_Button ui-button ui-state-default";
+		nButton.appendChild( nSpan );
+		$(nSpan).html( '<span class="ColVis_title">'+this.s.sShowAll+'</span>' );
+		
+		$(nButton).click( function (e) {
+			for ( var i=0, iLen=that.s.abOriginal.length ; i<iLen ; i++ )
+			{
+				if (that.s.aiExclude.indexOf(i) === -1)
+				{
+					that.s.dt.oInstance.fnSetColumnVis( i, true, false );
+				}
+			}
+			that._fnAdjustOpenRows();
+			that.s.dt.oInstance.fnDraw( false );
+		} );
+		
+		return nButton;
+	},
+	
+	
+	/**
+	 * Create the DOM for a show / hide button
+	 *  @method  _fnDomColumnButton
+	 *  @param {int} i Column in question
+	 *  @returns {Node} Created button
+	 *  @private 
+	 */
+	"_fnDomColumnButton": function ( i )
+	{
+		var
+			that = this,
+			oColumn = this.s.dt.aoColumns[i],
+			nButton = document.createElement('button'),
+			nSpan = document.createElement('span'),
+			dt = this.s.dt;
+		
+		nButton.className = !dt.bJUI ? "ColVis_Button TableTools_Button" :
+			"ColVis_Button TableTools_Button ui-button ui-state-default";
+		nButton.appendChild( nSpan );
+		var sTitle = this.s.fnLabel===null ? oColumn.sTitle : this.s.fnLabel( i, oColumn.sTitle, oColumn.nTh );
+		$(nSpan).html(
+			'<span class="ColVis_radio"><input type="checkbox"/></span>'+
+			'<span class="ColVis_title">'+sTitle+'</span>' );
+		
+		$(nButton).click( function (e) {
+			var showHide = !$('input', this).is(":checked");
+			if ( e.target.nodeName.toLowerCase() == "input" )
+			{
+				showHide = $('input', this).is(":checked");
+			}
+			
+			/* Need to consider the case where the initialiser created more than one table - change the
+			 * API index that DataTables is using
+			 */
+			var oldIndex = $.fn.dataTableExt.iApiIndex;
+			$.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that);
+
+			// Optimisation for server-side processing when scrolling - don't do a full redraw
+			if ( dt.oFeatures.bServerSide && (dt.oScroll.sX !== "" || dt.oScroll.sY !== "" ) )
+			{
+				that.s.dt.oInstance.fnSetColumnVis( i, showHide, false );
+				that.s.dt.oInstance.oApi._fnScrollDraw( that.s.dt );
+				that._fnDrawCallback();
+			}
+			else
+			{
+				that.s.dt.oInstance.fnSetColumnVis( i, showHide );
+			}
+
+			$.fn.dataTableExt.iApiIndex = oldIndex; /* Restore */
+			
+			if ( that.s.fnStateChange !== null )
+			{
+				that.s.fnStateChange.call( that, i, showHide );
+			}
+		} );
+		
+		return nButton;
+	},
+	
+	
+	/**
+	 * Get the position in the DataTables instance array of the table for this instance of ColVis
+	 *  @method  _fnDataTablesApiIndex
+	 *  @returns {int} Index
+	 *  @private 
+	 */
+	"_fnDataTablesApiIndex": function ()
+	{
+		for ( var i=0, iLen=this.s.dt.oInstance.length ; i<iLen ; i++ )
+		{
+			if ( this.s.dt.oInstance[i] == this.s.dt.nTable )
+			{
+				return i;
+			}
+		}
+		return 0;
+	},
+	
+	
+	/**
+	 * Create the DOM needed for the button and apply some base properties. All buttons start here
+	 *  @method  _fnDomBaseButton
+	 *  @param   {String} text Button text
+	 *  @returns {Node} DIV element for the button
+	 *  @private 
+	 */
+	"_fnDomBaseButton": function ( text )
+	{
+		var
+			that = this,
+			nButton = document.createElement('button'),
+			nSpan = document.createElement('span'),
+			sEvent = this.s.activate=="mouseover" ? "mouseover" : "click";
+		
+		nButton.className = !this.s.dt.bJUI ? "ColVis_Button TableTools_Button" :
+			"ColVis_Button TableTools_Button ui-button ui-state-default";
+		nButton.appendChild( nSpan );
+		nSpan.innerHTML = text;
+		
+		$(nButton).bind( sEvent, function (e) {
+			that._fnCollectionShow();
+			e.preventDefault();
+		} );
+		
+		return nButton;
+	},
+	
+	
+	/**
+	 * Create the element used to contain list the columns (it is shown and hidden as needed)
+	 *  @method  _fnDomCollection
+	 *  @returns {Node} div container for the collection
+	 *  @private 
+	 */
+	"_fnDomCollection": function ()
+	{
+		var that = this;
+		var nHidden = document.createElement('div');
+		nHidden.style.display = "none";
+		nHidden.className = !this.s.dt.bJUI ? "ColVis_collection TableTools_collection" :
+			"ColVis_collection TableTools_collection ui-buttonset ui-buttonset-multi";
+		
+		if ( !this.s.bCssPosition )
+		{
+			nHidden.style.position = "absolute";
+		}
+		$(nHidden).css('opacity', 0);
+		
+		return nHidden;
+	},
+	
+	
+	/**
+	 * An element to be placed on top of the activate button to catch events
+	 *  @method  _fnDomCatcher
+	 *  @returns {Node} div container for the collection
+	 *  @private 
+	 */
+	"_fnDomCatcher": function ()
+	{
+		var 
+			that = this,
+			nCatcher = document.createElement('div');
+		nCatcher.className = "ColVis_catcher TableTools_catcher";
+		
+		$(nCatcher).click( function () {
+			that._fnCollectionHide.call( that, null, null );
+		} );
+		
+		return nCatcher;
+	},
+	
+	
+	/**
+	 * Create the element used to shade the background, and capture hide events (it is shown and 
+	 * hidden as needed)
+	 *  @method  _fnDomBackground
+	 *  @returns {Node} div container for the background
+	 *  @private 
+	 */
+	"_fnDomBackground": function ()
+	{
+		var that = this;
+		
+		var nBackground = document.createElement('div');
+		nBackground.style.position = "absolute";
+		nBackground.style.left = "0px";
+		nBackground.style.top = "0px";
+		nBackground.className = "ColVis_collectionBackground TableTools_collectionBackground";
+		$(nBackground).css('opacity', 0);
+		
+		$(nBackground).click( function () {
+			that._fnCollectionHide.call( that, null, null );
+		} );
+		
+		/* When considering a mouse over action for the activation, we also consider a mouse out
+		 * which is the same as a mouse over the background - without all the messing around of
+		 * bubbling events. Use the catcher element to avoid messing around with bubbling
+		 */
+		if ( this.s.activate == "mouseover" )
+		{
+			$(nBackground).mouseover( function () {
+				that.s.overcollection = false;
+				that._fnCollectionHide.call( that, null, null );
+			} );
+		}
+		
+		return nBackground;
+	},
+	
+	
+	/**
+	 * Show the show / hide list and the background
+	 *  @method  _fnCollectionShow
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnCollectionShow": function ()
+	{
+		var that = this, i, iLen;
+		var oPos = $(this.dom.button).offset();
+		var nHidden = this.dom.collection;
+		var nBackground = this.dom.background;
+		var iDivX = parseInt(oPos.left, 10);
+		var iDivY = parseInt(oPos.top + $(this.dom.button).outerHeight(), 10);
+		
+		if ( !this.s.bCssPosition )
+		{
+			nHidden.style.top = iDivY+"px";
+			nHidden.style.left = iDivX+"px";
+		}
+		nHidden.style.display = "block";
+		$(nHidden).css('opacity',0);
+		
+		var iWinHeight = $(window).height(), iDocHeight = $(document).height(),
+		 	iWinWidth = $(window).width(), iDocWidth = $(document).width();
+		
+		nBackground.style.height = ((iWinHeight>iDocHeight)? iWinHeight : iDocHeight) +"px";
+		nBackground.style.width = ((iWinWidth<iDocWidth)? iWinWidth : iDocWidth) +"px";
+		
+		var oStyle = this.dom.catcher.style;
+		oStyle.height = $(this.dom.button).outerHeight()+"px";
+		oStyle.width = $(this.dom.button).outerWidth()+"px";
+		oStyle.top = oPos.top+"px";
+		oStyle.left = iDivX+"px";
+		
+		document.body.appendChild( nBackground );
+		document.body.appendChild( nHidden );
+		document.body.appendChild( this.dom.catcher );
+		
+		/* Resize the buttons */
+		if ( this.s.sSize == "auto" )
+		{
+			var aiSizes = [];
+			this.dom.collection.style.width = "auto";
+			for ( i=0, iLen=this.dom.buttons.length ; i<iLen ; i++ )
+			{
+				if ( this.dom.buttons[i] !== null )
+				{
+					this.dom.buttons[i].style.width = "auto";
+					aiSizes.push( $(this.dom.buttons[i]).outerWidth() );
+				}
+			}
+			iMax = Math.max.apply(window, aiSizes);
+			for ( i=0, iLen=this.dom.buttons.length ; i<iLen ; i++ )
+			{
+				if ( this.dom.buttons[i] !== null )
+				{
+					this.dom.buttons[i].style.width = iMax+"px";
+				}
+			}
+			this.dom.collection.style.width = iMax+"px";
+		}
+		
+		/* Visual corrections to try and keep the collection visible */
+		if ( !this.s.bCssPosition )
+		{
+			nHidden.style.left = this.s.sAlign=="left" ?
+				iDivX+"px" : (iDivX-$(nHidden).outerWidth()+$(this.dom.button).outerWidth())+"px";
+
+			var iDivWidth = $(nHidden).outerWidth();
+			var iDivHeight = $(nHidden).outerHeight();
+			
+			if ( iDivX + iDivWidth > iDocWidth )
+			{
+				nHidden.style.left = (iDocWidth-iDivWidth)+"px";
+			}
+		}
+		
+		/* This results in a very small delay for the end user but it allows the animation to be
+		 * much smoother. If you don't want the animation, then the setTimeout can be removed
+		 */
+		setTimeout( function () {
+			$(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
+			$(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
+				/* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
+				 * reflected. As such, we need to do it here, once it is visible. Unbelievable.
+				 */
+				if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
+				{
+					that._fnDrawCallback();
+				}
+			});
+		}, 10 );
+		
+		this.s.hidden = false;
+	},
+	
+	
+	/**
+	 * Hide the show / hide list and the background
+	 *  @method  _fnCollectionHide
+	 *  @returns void
+	 *  @private 
+	 */
+	"_fnCollectionHide": function (  )
+	{
+		var that = this;
+		
+		if ( !this.s.hidden && this.dom.collection !== null )
+		{
+			this.s.hidden = true;
+			
+			$(this.dom.collection).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
+				this.style.display = "none";
+			} );
+			
+			$(this.dom.background).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
+				document.body.removeChild( that.dom.background );
+				document.body.removeChild( that.dom.catcher );
+			} );
+		}
+	},
+	
+	
+	/**
+	 * 
+	 */
+	"_fnAdjustOpenRows": function ()
+	{
+		var aoOpen = this.s.dt.aoOpenRows;
+		var iVisible = this.s.dt.oApi._fnVisbleColumns( this.s.dt );
+		
+		for ( var i=0, iLen=aoOpen.length ; i<iLen ; i++ ) {
+			aoOpen[i].nTr.getElementsByTagName('td')[0].colSpan = iVisible;
+		}
+	}
+};
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Static object methods
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/**
+ * Rebuild the collection for a given table, or all tables if no parameter given
+ *  @method  ColVis.fnRebuild
+ *  @static
+ *  @param   object oTable DataTable instance to consider - optional
+ *  @returns void
+ */
+ColVis.fnRebuild = function ( oTable )
+{
+	var nTable = null;
+	if ( typeof oTable != 'undefined' )
+	{
+		nTable = oTable.fnSettings().nTable;
+	}
+	
+	for ( var i=0, iLen=ColVis.aInstances.length ; i<iLen ; i++ )
+	{
+		if ( typeof oTable == 'undefined' || nTable == ColVis.aInstances[i].s.dt.nTable )
+		{
+			ColVis.aInstances[i].fnRebuild();
+		}
+	}
+};
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Static object propterties
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/**
+ * Collection of all ColVis instances
+ *  @property ColVis.aInstances
+ *  @static
+ *  @type     Array
+ *  @default  []
+ */
+ColVis.aInstances = [];
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Constants
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/**
+ * Name of this class
+ *  @constant CLASS
+ *  @type     String
+ *  @default  ColVis
+ */
+ColVis.prototype.CLASS = "ColVis";
+
+
+/**
+ * ColVis version
+ *  @constant  VERSION
+ *  @type      String
+ *  @default   See code
+ */
+ColVis.VERSION = "1.0.7.dev";
+ColVis.prototype.VERSION = ColVis.VERSION;
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Initialisation
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Register a new feature with DataTables
+ */
+if ( typeof $.fn.dataTable == "function" &&
+     typeof $.fn.dataTableExt.fnVersionCheck == "function" &&
+     $.fn.dataTableExt.fnVersionCheck('1.7.0') )
+{
+	$.fn.dataTableExt.aoFeatures.push( {
+		"fnInit": function( oDTSettings ) {
+			var init = (typeof oDTSettings.oInit.oColVis == 'undefined') ?
+				{} : oDTSettings.oInit.oColVis;
+			var oColvis = new ColVis( oDTSettings, init );
+			return oColvis.dom.wrapper;
+		},
+		"cFeature": "C",
+		"sFeature": "ColVis"
+	} );
+}
+else
+{
+	alert( "Warning: ColVis requires DataTables 1.7 or greater - www.datatables.net/download");
+}
+
+})(jQuery);

python_apps/api_clients/api_client.cfg

@@ -48,6 +48,12 @@ remove_watched_dir = 'remove-watched-dir/format/json/api_key/%%api_key%%/path/%%
 # URL to tell Airtime we want to add watched directory
 set_storage_dir = 'set-storage-dir/format/json/api_key/%%api_key%%/path/%%path%%'
 
+# URL to tell Airtime about file system mount change
+update_fs_mount = 'update-file-system-mount/format/json/api_key/%%api_key%%'
+
+# URL to tell Airtime about file system mount change
+handle_watched_dir_missing = 'handle-watched-dir-missing/format/json/api_key/%%api_key%%/dir/%%dir%%'
+
 #############################
 ## Config for Recorder
 #############################

python_apps/api_clients/api_client.py

@@ -20,6 +20,7 @@ import os
 from urlparse import urlparse
 import base64
 from configobj import ConfigObj
+import string
 
 AIRTIME_VERSION = "2.0.0"
 
@@ -399,7 +400,7 @@ class AirTimeApiClient(ApiClientInterface):
         try:
             url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["media_setup_url"])
             url = url.replace("%%api_key%%", self.config["api_key"])
-
+            
             response = self.get_response_from_server(url)
             response = json.loads(response)
             logger.info("Connected to Airtime Server. Json Media Storage Dir: %s", response)
@@ -582,11 +583,58 @@ class AirTimeApiClient(ApiClientInterface):
             url = url.replace("%%msg%%", encoded_msg)
             url = url.replace("%%stream_id%%", stream_id)
             url = url.replace("%%boot_time%%", time)
-            logger.debug(url)
+            
             req = urllib2.Request(url)
             response = urllib2.urlopen(req).read()
         except Exception, e:
             logger.error("Exception: %s", e)
+    
+    """
+    This function updates status of mounted file system information on airtime
+    """
+    def update_file_system_mount(self, added_dir, removed_dir):
+        logger = logging.getLogger()
+        try:
+            url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_fs_mount"])
+            
+            url = url.replace("%%api_key%%", self.config["api_key"])
+
+            added_data_string = string.join(added_dir, ',')
+            removed_data_string = string.join(removed_dir, ',')
+            
+            map = [("added_dir", added_data_string),("removed_dir",removed_data_string)]
+            
+            data = urllib.urlencode(map)
+            
+            req = urllib2.Request(url, data)
+            response = urllib2.urlopen(req).read()
+            logger.info("update file system mount: %s", response)
+        except Exception, e:
+            import traceback
+            top = traceback.format_exc()
+            logger.error('Exception: %s', e)
+            logger.error("traceback: %s", top)
+    
+    """
+        When watched dir is missing(unplugged or something) on boot up, this function will get called
+        and will call appropriate function on Airtime.
+    """
+    def handle_watched_dir_missing(self, dir):
+        logger = logging.getLogger()
+        try:
+            url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["handle_watched_dir_missing"])
+            
+            url = url.replace("%%api_key%%", self.config["api_key"])
+            url = url.replace("%%dir%%", base64.b64encode(dir))
+            
+            req = urllib2.Request(url)
+            response = urllib2.urlopen(req).read()
+            logger.info("update file system mount: %s", response)
+        except Exception, e:
+            import traceback
+            top = traceback.format_exc()
+            logger.error('Exception: %s', e)
+            logger.error("traceback: %s", top)
         
 ################################################################################
 # OpenBroadcast API Client

python_apps/media-monitor/MediaMonitor.py

@@ -62,7 +62,7 @@ try:
     mmc = MediaMonitorCommon(config, wm=wm)
     pe = AirtimeProcessEvent(queue=multi_queue, airtime_config=config, wm=wm, mmc=mmc, api_client=api_client)
 
-    bootstrap = AirtimeMediaMonitorBootstrap(logger, pe, api_client, mmc)
+    bootstrap = AirtimeMediaMonitorBootstrap(logger, pe, api_client, mmc, wm)
     bootstrap.scan()
     
     notifier = AirtimeNotifier(wm, pe, read_freq=0, timeout=0, airtime_config=config, api_client=api_client, bootstrap=bootstrap, mmc=mmc)

python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py

@@ -1,11 +1,13 @@
 import os
 import time
+import pyinotify
+import shutil
 
 from subprocess import Popen, PIPE
 from api_clients import api_client
 
 class AirtimeMediaMonitorBootstrap():
-
+    
     """AirtimeMediaMonitorBootstrap constructor
 
     Keyword Arguments:
@@ -13,11 +15,21 @@ class AirtimeMediaMonitorBootstrap():
     pe          -- reference to an instance of ProcessEvent
     api_clients -- reference of api_clients to communicate with airtime-server
     """
-    def __init__(self, logger, pe, api_client, mmc):
+    def __init__(self, logger, pe, api_client, mmc, wm):
         self.logger = logger
         self.pe = pe
         self.api_client = api_client
         self.mmc = mmc
+        self.wm = wm
+        # add /etc on watch list so we can detect mount
+        self.mount_file = "/etc"
+        self.curr_mtab_file = "/var/tmp/airtime/media-monitor/currMtab"
+        self.logger.info("Adding %s on watch list...", self.mount_file)
+        self.wm.add_watch(self.mount_file, pyinotify.ALL_EVENTS, rec=False, auto_add=False)
+        
+        # create currMtab file if it's the first time
+        if not os.path.exists(self.curr_mtab_file):
+            shutil.copy('/etc/mtab', self.curr_mtab_file)
 
     """On bootup we want to scan all directories and look for files that
     weren't there or files that changed before media-monitor process
@@ -79,6 +91,10 @@ class AirtimeMediaMonitorBootstrap():
             if len(file_path.strip(" \n")) > 0:
                 all_files_set.add(file_path[len(dir):])
 
+        # if dir doesn't exists, update db
+        if not os.path.exists(dir):
+            self.pe.handle_watched_dir_missing(dir)
+
         if os.path.exists(self.mmc.timestamp_file):
             """find files that have been modified since the last time media-monitor process started."""
             time_diff_sec = time.time() - os.path.getmtime(self.mmc.timestamp_file)

python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py

@@ -2,6 +2,8 @@ import socket
 import logging
 import time
 import os
+import shutil
+import difflib
 
 import pyinotify
 from pyinotify import ProcessEvent
@@ -38,6 +40,10 @@ class AirtimeProcessEvent(ProcessEvent):
         self.mmc = mmc
         self.api_client = api_client
         self.create_dict = {}
+        self.mount_file_dir = "/etc";
+        self.mount_file = "/etc/mtab";
+        self.curr_mtab_file = "/var/tmp/airtime/media-monitor/currMtab"
+        self.prev_mtab_file = "/var/tmp/airtime/media-monitor/prevMtab"
 
     def add_filepath_to_ignore(self, filepath):
         self.ignore_event.add(filepath)
@@ -74,6 +80,8 @@ class AirtimeProcessEvent(ProcessEvent):
                 
             
     def process_IN_DELETE_SELF(self, event):
+        if event.path in self.mount_file_dir:
+            return
         self.logger.info("event: %s", event)
         path = event.path + '/'
         if event.dir:
@@ -90,6 +98,8 @@ class AirtimeProcessEvent(ProcessEvent):
                     self.logger.info("Removing the watch folder failed: %s", res['msg']['error'])
     
     def process_IN_CREATE(self, event):
+        if event.path in self.mount_file_dir:
+            return
         self.logger.info("event: %s", event)
         if not event.dir:
             # record the timestamp of the time on IN_CREATE event
@@ -101,6 +111,8 @@ class AirtimeProcessEvent(ProcessEvent):
     # we used to use IN_CREATE event, but the IN_CREATE event gets fired before the
     # copy was done. Hence, IN_CLOSE_WRITE is the correct one to handle.    
     def process_IN_CLOSE_WRITE(self, event):
+        if event.path in self.mount_file_dir:
+            return
         self.logger.info("event: %s", event)
         self.logger.info("create_dict: %s", self.create_dict)
         
@@ -145,6 +157,9 @@ class AirtimeProcessEvent(ProcessEvent):
         self.handle_modified_file(event.dir, event.pathname, event.name)
 
     def handle_modified_file(self, dir, pathname, name):
+        # if /etc/mtab is modified
+        if pathname in self.mount_file:
+            self.handle_mount_change()
         # update timestamp on create_dict for the entry with pathname as the key
         if pathname in self.create_dict:
             self.create_dict[pathname] = time.time()
@@ -152,12 +167,48 @@ class AirtimeProcessEvent(ProcessEvent):
             self.logger.info("Modified: %s", pathname)
             if self.mmc.is_audio_file(name):
                 self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY})
-
+    
+    # if change is detected on /etc/mtab, we check what mount(file system) was added/removed
+    # and act accordingly
+    def handle_mount_change(self):
+        self.logger.info("Mount change detected, handling changes...");
+        # take snapshot of mtab file and update currMtab and prevMtab
+        # move currMtab to prevMtab and create new currMtab
+        shutil.move(self.curr_mtab_file, self.prev_mtab_file)
+        # create the file
+        shutil.copy(self.mount_file, self.curr_mtab_file)
+        
+        d = difflib.Differ()
+        curr_fh = open(self.curr_mtab_file, 'r')
+        prev_fh = open(self.prev_mtab_file, 'r')
+        
+        diff = list(d.compare(prev_fh.readlines(), curr_fh.readlines()))
+        added_mount_points = []
+        removed_mount_points = []
+        
+        for dir in diff:
+            info = dir.split(' ')
+            if info[0] == '+':
+                added_mount_points.append(info[2])
+            elif info[0] == '-':
+                removed_mount_points.append(info[2])
+        
+        self.logger.info("added: %s", added_mount_points)
+        self.logger.info("removed: %s", removed_mount_points)
+        
+        # send current mount information to Airtime
+        self.api_client.update_file_system_mount(added_mount_points, removed_mount_points);
+    
+    def handle_watched_dir_missing(self, dir):
+        self.api_client.handle_watched_dir_missing(dir);
+        
     #if a file is moved somewhere, this callback is run. With details about
     #where the file is being moved from. The corresponding process_IN_MOVED_TO
     #callback is only called if the destination of the file is also in a watched
     #directory.
     def process_IN_MOVED_FROM(self, event):
+        if event.path in self.mount_file:
+            return
         self.logger.info("process_IN_MOVED_FROM: %s", event)
         if not event.dir:
             if event.pathname in self.temp_files:
@@ -171,6 +222,10 @@ class AirtimeProcessEvent(ProcessEvent):
 
     def process_IN_MOVED_TO(self, event):
         self.logger.info("process_IN_MOVED_TO: %s", event)
+        # if /etc/mtab is modified
+        filename = self.mount_file_dir +"/mtab"
+        if event.pathname in filename:
+            self.handle_mount_change()
         #if stuff dropped in stor via a UI move must change file permissions.
         self.mmc.set_needed_file_permissions(event.pathname, event.dir)
         if not event.dir:
@@ -221,6 +276,8 @@ class AirtimeProcessEvent(ProcessEvent):
 
 
     def process_IN_DELETE(self, event):
+        if event.path in self.mount_file_dir:
+            return
         self.logger.info("process_IN_DELETE: %s", event)
         self.handle_removed_file(event.dir, event.pathname)
 

python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

@@ -10,7 +10,7 @@ import pyinotify
 
 class MediaMonitorCommon:
 
-    timestamp_file = "/var/tmp/airtime/last_index"
+    timestamp_file = "/var/tmp/airtime/media-monitor/last_index"
 
     def __init__(self, airtime_config, wm=None):
         self.supported_file_formats = ['mp3', 'ogg']

python_apps/media-monitor/install/media-monitor-initialize.py

@@ -6,7 +6,9 @@ if os.geteuid() != 0:
     sys.exit(1)
 
 try:
-    
+    #create media-monitor dir under /var/tmp/airtime
+    if not os.path.exists("/var/tmp/airtime/media-monitor"):
+        os.makedirs("/var/tmp/airtime/media-monitor")
     if os.environ["disable_auto_start_services"] == "f":
         #update-rc.d init script
         p = Popen("update-rc.d airtime-media-monitor defaults >/dev/null 2>&1", shell=True)