From 24b3fb7e8acc71c3482d491ea274a79bfbaa3e55 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 13 Sep 2012 10:26:50 -0400 Subject: [PATCH 1/2] Remvod unused CC_CONFIG, reformatted some code --- airtime_mvc/application/models/Block.php | 2 +- airtime_mvc/application/models/Schedule.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index a91e0fb66..93ada2b34 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -210,7 +210,7 @@ FROM cc_blockcontents AS pc LEFT JOIN cc_files AS f ON pc.file_id=f.id LEFT JOIN cc_block AS bl ON pc.block_id = bl.id WHERE pc.block_id = :block_id -ORDER BY pc.position; +ORDER BY pc.position SQL; $rows = Application_Common_Database::prepareAndExecute($sql, array(':block_id'=>$this->id)); diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 000736b8e..99d44edd9 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -522,7 +522,6 @@ SQL; */ public static function getItems($p_startTime, $p_endTime) { - global $CC_CONFIG; $baseQuery = <<$p_startTime, ':endTime'=>$p_endTime, ':startTime2'=>$p_startTime)); + $rows = Application_Common_Database::prepareAndExecute($sql, array( + ':startTime1' => $p_startTime, + ':endTime' => $p_endTime, + ':startTime2' => $p_startTime)); if (count($rows) < 3) { $dt = new DateTime("@".time()); @@ -572,7 +573,7 @@ WHERE st.ends > :startTime1 ORDER BY st.starts LIMIT 3 SQL; - $sql = " ".$baseQuery." ".$predicates." "; + $sql = $baseQuery." ".$predicates." "; $rows = Application_Common_Database::prepareAndExecute($sql, array( ':startTime1' => $p_startTime, From e1403d45bd642bac186fc265069eec8ebf203bd9 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 13 Sep 2012 10:32:33 -0400 Subject: [PATCH 2/2] CC-4368: Unused local variables in Airtime Controllers. Should be removed. -done --- airtime_mvc/application/controllers/ApiController.php | 4 +++- airtime_mvc/application/controllers/LibraryController.php | 2 +- airtime_mvc/application/controllers/PlaylistController.php | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 7d2584b07..897b437e1 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -441,6 +441,7 @@ class ApiController extends Zend_Controller_Action try { $show_inst = new Application_Model_ShowInstance($show_instance_id); $show_inst->setRecordedFile($file_id); + //$show_start_time = Application_Common_DateHelper::ConvertToLocalDateTimeString($show_inst->getShowInstanceStart()); } catch (Exception $e) { //we've reached here probably because the show was @@ -563,13 +564,14 @@ class ApiController extends Zend_Controller_Action // to some unique id. $request = $this->getRequest(); $responses = array(); - $params = $request->getParams(); + //$params = $request->getParams(); $valid_modes = array('delete_dir', 'delete', 'moved', 'modify', 'create'); foreach ($params as $k => $raw_json) { // Valid requests must start with mdXXX where XXX represents at // least 1 digit if ( !preg_match('/^md\d+$/', $k) ) { continue; } $info_json = json_decode($raw_json, $assoc = true); + unset( $info_json["is_record"] ); // Log invalid requests if ( !array_key_exists('mode', $info_json) ) { Logging::info("Received bad request(key=$k), no 'mode' parameter. Bad request is:"); diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 664833955..9ae0a7873 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -270,7 +270,7 @@ class LibraryController extends Zend_Controller_Action $mediaItems = $this->_getParam('media', null); $user = Application_Model_User::getCurrentUser(); - $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)); + //$isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)); $files = array(); $playlists = array(); diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 42c6a2442..5ea54c576 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -212,7 +212,6 @@ class PlaylistController extends Zend_Controller_Action $objInfo = Application_Model_Library::getObjInfo($type); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new Application_Model_User($userInfo->id); $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME); @@ -300,7 +299,6 @@ class PlaylistController extends Zend_Controller_Action $ids = $this->_getParam('ids'); $ids = (!is_array($ids)) ? array($ids) : $ids; $afterItem = $this->_getParam('afterItem', null); - $modified = $this->_getParam('modified'); $type = $this->_getParam('obj_type'); try {