From 5cc7de95eedffce2ef1997269f06638d1fa5737b Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 23 Sep 2011 17:00:55 -0400 Subject: [PATCH] CC-2833: Use ClassLoaders for PHP Files -Done for class User --- airtime_mvc/application/Bootstrap.php | 2 +- .../controllers/LibraryController.php | 4 +-- .../controllers/NowplayingController.php | 2 +- .../controllers/ScheduleController.php | 28 +++++++++---------- .../controllers/UserController.php | 10 +++---- airtime_mvc/application/forms/AddShowWho.php | 2 +- airtime_mvc/application/models/Preference.php | 2 +- .../models/{Users.php => User.php} | 4 +-- .../pypo/test/airtime-schedule-insert.php | 2 +- utils/airtime-user.php | 10 +++---- utils/phone_home_stat.php | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) rename airtime_mvc/application/models/{Users.php => User.php} (98%) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 594f09f3f..c514ce8ca 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -18,7 +18,7 @@ require_once 'Soundcloud.php'; //require_once 'Schedule.php'; require_once 'Preference.php'; //require_once 'Shows.php'; -require_once 'Users.php'; +//require_once 'User.php'; require_once 'RabbitMq.php'; require_once 'DateHelper.php'; require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php'; diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index b36fb24e6..2f0466b12 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -67,7 +67,7 @@ class LibraryController extends Zend_Controller_Action $paramsPop = str_replace('#type#', $type, $paramsPop); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); $pl_sess = $this->pl_sess; @@ -139,7 +139,7 @@ class LibraryController extends Zend_Controller_Action { $id = $this->_getParam('id'); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if ($user->isAdmin()) { diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php index db37a135e..4b9e0430f 100644 --- a/airtime_mvc/application/controllers/NowplayingController.php +++ b/airtime_mvc/application/controllers/NowplayingController.php @@ -23,7 +23,7 @@ class NowplayingController extends Zend_Controller_Action $refer_sses = new Zend_Session_Namespace('referrer'); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if ($request->isPost()) { $form = new Application_Form_RegisterAirtime(); diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 78ddf8274..4f2ade3cd 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -58,7 +58,7 @@ class ScheduleController extends Zend_Controller_Action Application_Model_Schedule::createNewFormSections($this->view); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); $this->view->isAdmin = $user->isAdmin(); $this->view->isProgramManager = $user->isUserType('P'); } @@ -69,7 +69,7 @@ class ScheduleController extends Zend_Controller_Action $end = $this->_getParam('end', null); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) $editable = true; else @@ -85,7 +85,7 @@ class ScheduleController extends Zend_Controller_Action $showInstanceId = $this->_getParam('showInstanceId'); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { $showInstance = new Application_Model_ShowInstance($showInstanceId); @@ -104,7 +104,7 @@ class ScheduleController extends Zend_Controller_Action $showInstanceId = $this->_getParam('showInstanceId'); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { $show = new Application_Model_ShowInstance($showInstanceId); @@ -120,7 +120,7 @@ class ScheduleController extends Zend_Controller_Action $showInstanceId = $this->_getParam('id'); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { $show = new Application_Model_ShowInstance($showInstanceId); @@ -147,7 +147,7 @@ class ScheduleController extends Zend_Controller_Action $epochNow = time(); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); $show = new Application_Model_ShowInstance($id); $params = '/format/json/id/#id#'; @@ -224,7 +224,7 @@ class ScheduleController extends Zend_Controller_Action } $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); $show = new Application_Model_ShowInstance($showInstanceId); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER, UTYPE_HOST),$show->getShowId())) { @@ -243,7 +243,7 @@ class ScheduleController extends Zend_Controller_Action { $showInstanceId = $this->_getParam('id'); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); $show = new Application_Model_ShowInstance($showInstanceId); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER, UTYPE_HOST),$show->getShowId())) @@ -278,7 +278,7 @@ class ScheduleController extends Zend_Controller_Action $search = $this->_getParam('search', null); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); $show = new Application_Model_ShowInstance($showInstanceId); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER, UTYPE_HOST),$show->getShowId())) { @@ -358,7 +358,7 @@ class ScheduleController extends Zend_Controller_Action public function editShowAction() { $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if(!$user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { return; } @@ -625,7 +625,7 @@ class ScheduleController extends Zend_Controller_Action if(!$isSaas){ if($record && $rebroadAb && $rebroad){ $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { Application_Model_Show::create($data); } @@ -637,7 +637,7 @@ class ScheduleController extends Zend_Controller_Action } }else{ $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { Application_Model_Show::create($data); } @@ -677,7 +677,7 @@ class ScheduleController extends Zend_Controller_Action public function cancelShowAction() { $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { $showInstanceId = $this->_getParam('id'); @@ -692,7 +692,7 @@ class ScheduleController extends Zend_Controller_Action public function cancelCurrentShowAction() { $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new User($userInfo->id); + $user = new Application_Model_User($userInfo->id); if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { $showInstanceId = $this->_getParam('id'); diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index 24d9d78d8..b84a0dede 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -34,7 +34,7 @@ class UserController extends Zend_Controller_Action $formdata = $form->getValues(); if ($form->validateLogin($formdata)){ - $user = new User($formdata['user_id']); + $user = new Application_Model_User($formdata['user_id']); $user->setFirstName($formdata['first_name']); $user->setLastName($formdata['last_name']); $user->setLogin($formdata['login']); @@ -63,13 +63,13 @@ class UserController extends Zend_Controller_Action public function getHostsAction() { $search = $this->_getParam('term'); - $this->view->hosts = User::getHosts($search); + $this->view->hosts = Application_Model_User::getHosts($search); } public function getUserDataTableInfoAction() { $post = $this->getRequest()->getPost(); - $users = User::getUsersDataTablesInfo($post); + $users = Application_Model_User::getUsersDataTablesInfo($post); die(json_encode($users)); } @@ -77,7 +77,7 @@ class UserController extends Zend_Controller_Action public function getUserDataAction() { $id = $this->_getParam('id'); - $this->view->entries = User::GetUserData($id); + $this->view->entries = Application_Model_User::GetUserData($id); } public function removeUserAction() @@ -89,7 +89,7 @@ class UserController extends Zend_Controller_Action $userId = $userInfo->id; if ($delId != $userId){ - $user = new User($delId); + $user = new Application_Model_User($delId); $this->view->entries = $user->delete(); } diff --git a/airtime_mvc/application/forms/AddShowWho.php b/airtime_mvc/application/forms/AddShowWho.php index 76da90c28..360a5abea 100644 --- a/airtime_mvc/application/forms/AddShowWho.php +++ b/airtime_mvc/application/forms/AddShowWho.php @@ -13,7 +13,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm )); $options = array(); - $hosts = User::getHosts(); + $hosts = Application_Model_User::getHosts(); foreach ($hosts as $host) { $options[$host['value']] = $host['label']; diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index d29e6ef39..db4f095ee 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -333,7 +333,7 @@ class Application_Model_Preference $outputArray['WEB_SERVER'] = $headerInfo['Server'][0]; } - $outputArray['NUM_OF_USERS'] = User::getUserCount(); + $outputArray['NUM_OF_USERS'] = Application_Model_User::getUserCount(); $outputArray['NUM_OF_SONGS'] = Application_Model_StoredFile::getFileCount(); $outputArray['NUM_OF_PLAYLISTS'] = Application_Model_Playlist::getPlaylistCount(); $outputArray['NUM_OF_SCHEDULED_PLAYLISTS'] = Application_Model_Schedule::getSchduledPlaylistCount(); diff --git a/airtime_mvc/application/models/Users.php b/airtime_mvc/application/models/User.php similarity index 98% rename from airtime_mvc/application/models/Users.php rename to airtime_mvc/application/models/User.php index f90670fc8..6f0ec13c7 100644 --- a/airtime_mvc/application/models/Users.php +++ b/airtime_mvc/application/models/User.php @@ -5,7 +5,7 @@ define('UTYPE_ADMIN', 'A'); define('UTYPE_GUEST', 'G'); define('UTYPE_PROGRAM_MANAGER', 'P'); -class User { +class Application_Model_User { private $_userInstance; @@ -217,7 +217,7 @@ class User { } public static function getHosts($search=NULL) { - return User::getUsers(array('H'), $search); + return Application_Model_User::getUsers(array('H'), $search); } public static function getUsersDataTablesInfo($datatables_post) { diff --git a/python_apps/pypo/test/airtime-schedule-insert.php b/python_apps/pypo/test/airtime-schedule-insert.php index b79f0676e..1d947225e 100644 --- a/python_apps/pypo/test/airtime-schedule-insert.php +++ b/python_apps/pypo/test/airtime-schedule-insert.php @@ -26,7 +26,7 @@ require_once 'Playlist.php'; require_once 'StoredFile.php'; require_once 'Schedule.php'; require_once 'Shows.php'; -require_once 'Users.php'; +require_once 'User.php'; require_once 'RabbitMq.php'; require_once 'Preference.php'; //require_once APPLICATION_PATH.'/controllers/plugins/RabbitMqPlugin.php'; diff --git a/utils/airtime-user.php b/utils/airtime-user.php index 7a7b2d761..2ac5d3bb5 100644 --- a/utils/airtime-user.php +++ b/utils/airtime-user.php @@ -10,7 +10,7 @@ require_once("$airtime_base_dir/library/propel/runtime/lib/Propel.php"); Propel::init("$airtime_base_dir/application/configs/airtime-conf.php"); require_once("$airtime_base_dir/application/configs/conf.php"); -require_once("$airtime_base_dir/application/models/Users.php"); +require_once("$airtime_base_dir/application/models/User.php"); require_once('DB.php'); require_once('Console/Getopt.php'); @@ -84,17 +84,17 @@ $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC); // Check if the user exists -$id = User::GetUserID($username); +$id = Application_Model_User::GetUserID($username); if ($action == "addupdate") { if ($id < 0) { echo "Creating user\n"; - $user = new User(""); + $user = new Application_Model_User(""); $user->setLogin($username); } else { echo "Updating user\n"; - $user = new User($id); + $user = new Application_Model_User($id); } do{ @@ -130,7 +130,7 @@ if ($action == "addupdate") { exit; } else { echo "Deleting user\n"; - $user = new User($id); + $user = new Application_Model_User($id); $user->delete(); } } diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php index 847064000..e09b442cb 100644 --- a/utils/phone_home_stat.php +++ b/utils/phone_home_stat.php @@ -29,7 +29,7 @@ require_once($CC_CONFIG['phpDir'].'/application/configs/conf.php'); $CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; -require_once($CC_CONFIG['phpDir'].'/application/models/Users.php'); +require_once($CC_CONFIG['phpDir'].'/application/models/User.php'); require_once($CC_CONFIG['phpDir'].'/application/models/StoredFile.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Playlist.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Schedule.php');