Merge branch 'master' of dev.sourcefabric.org:campcaster
This commit is contained in:
commit
d5efcac452
56 changed files with 1166 additions and 510 deletions
|
@ -30,7 +30,8 @@ if (PEAR::isError($CC_DBC)) {
|
|||
}
|
||||
$CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||
|
||||
Zend_Session::start();
|
||||
//Zend_Session::start();
|
||||
Zend_Validate::setDefaultNamespaces("Zend");
|
||||
|
||||
class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
// This file generated by Propel 1.5.2 convert-conf target
|
||||
// from XML runtime conf file /home/naomi/dev-campcaster/campcaster/build/runtime-conf.xml
|
||||
// from XML runtime conf file /home/martin/workspace/airtime/build/runtime-conf.xml
|
||||
$conf = array (
|
||||
'datasources' =>
|
||||
array (
|
||||
|
@ -17,4 +17,4 @@ $conf = array (
|
|||
'generator_version' => '1.5.2',
|
||||
);
|
||||
$conf['classmap'] = include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-airtime-conf.php');
|
||||
return $conf;
|
||||
return $conf;
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
*/
|
||||
$pages = array(
|
||||
array(
|
||||
'label' => 'Now Playing',
|
||||
'module' => 'Nowplaying',
|
||||
'controller' => 'index',
|
||||
'action' => 'index',
|
||||
'order' => -100 //make sure home is the first page
|
||||
'label' => 'Now Playing',
|
||||
'module' => 'default',
|
||||
'controller' => 'Nowplaying',
|
||||
'action' => 'index',
|
||||
'resource' => 'Nowplaying'
|
||||
),
|
||||
array(
|
||||
'label' => 'Schedule',
|
||||
|
|
|
@ -85,6 +85,9 @@ class LibraryController extends Zend_Controller_Action
|
|||
'title' => 'Close');
|
||||
}
|
||||
|
||||
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Playlist/metadata/format/json/id/#id#', 'callback' => 'window["createPlaylistMetaForm"]'),
|
||||
'title' => 'Edit Metadata');
|
||||
|
||||
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Playlist/delete'.$params, 'callback' => 'window["deletePlaylist"]'),
|
||||
'title' => 'Delete');
|
||||
|
||||
|
|
|
@ -6,27 +6,38 @@ class NowplayingController extends Zend_Controller_Action
|
|||
public function init()
|
||||
{
|
||||
$ajaxContext = $this->_helper->getHelper('AjaxContext');
|
||||
$ajaxContext->addActionContext('get-data-grid-data', 'json')
|
||||
->initContext();
|
||||
$ajaxContext->addActionContext('get-data-grid-data', 'json')
|
||||
->initContext();
|
||||
}
|
||||
|
||||
public function indexAction()
|
||||
{
|
||||
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/playlist/nowplayingdatagrid.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/playlist/nowview.js','text/javascript');
|
||||
}
|
||||
|
||||
public function getDataGridDataAction()
|
||||
{
|
||||
$viewType = $this->_request->getParam('view');
|
||||
$this->view->entries = Application_Model_Nowplaying::GetDataGridData($viewType);
|
||||
$dateString = $this->_request->getParam('date');
|
||||
$this->view->entries = Application_Model_Nowplaying::GetDataGridData($viewType, $dateString);
|
||||
}
|
||||
|
||||
public function livestreamAction()
|
||||
{
|
||||
//use bare bones layout (no header bar or menu)
|
||||
$this->_helper->layout->setLayout('bare');
|
||||
$this->_helper->layout->setLayout('bare');
|
||||
}
|
||||
|
||||
public function dayViewAction()
|
||||
{
|
||||
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/playlist/nowplayingdatagrid.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/playlist/dayview.js','text/javascript');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -35,3 +46,5 @@ class NowplayingController extends Zend_Controller_Action
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ class PlaylistController extends Zend_Controller_Action
|
|||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
|
||||
$pl = new Playlist();
|
||||
$pl_id = $pl->create("Test Zend Auth");
|
||||
$pl_id = $pl->create("Untitled Playlist");
|
||||
$pl->setPLMetaData('dc:creator', $userInfo->login);
|
||||
|
||||
$this->changePlaylist($pl_id);
|
||||
|
|
|
@ -2,16 +2,12 @@
|
|||
|
||||
class ScheduleController extends Zend_Controller_Action
|
||||
{
|
||||
|
||||
protected $sched_sess = null;
|
||||
|
||||
public function init()
|
||||
{
|
||||
if(!Zend_Auth::getInstance()->hasIdentity())
|
||||
{
|
||||
$this->_redirect('login/index');
|
||||
}
|
||||
|
||||
$ajaxContext = $this->_helper->getHelper('AjaxContext');
|
||||
$ajaxContext = $this->_helper->getHelper('AjaxContext');
|
||||
$ajaxContext->addActionContext('event-feed', 'json')
|
||||
->addActionContext('make-context-menu', 'json')
|
||||
->addActionContext('add-show-dialog', 'json')
|
||||
|
@ -26,6 +22,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
->addActionContext('get-current-playlist', 'json')
|
||||
->addActionContext('find-playlists', 'json')
|
||||
->addActionContext('remove-group', 'json')
|
||||
->addActionContext('edit-show', 'json')
|
||||
->initContext();
|
||||
|
||||
$this->sched_sess = new Zend_Session_Namespace("schedule");
|
||||
|
@ -50,7 +47,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$end = $this->_getParam('end', null);
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
if($user->isAdmin())
|
||||
$editable = true;
|
||||
else
|
||||
|
@ -112,14 +109,8 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
|
||||
$show = new Show(new User($userInfo->id, $userInfo->type));
|
||||
$overlap = $show->addShow($data);
|
||||
|
||||
if(isset($overlap)) {
|
||||
$this->view->overlap = $overlap;
|
||||
}
|
||||
else {
|
||||
$this->_redirect('Schedule');
|
||||
}
|
||||
$show->addShow($data);
|
||||
$this->_redirect('Schedule');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -137,7 +128,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$showInstanceId = $this->_getParam('showInstanceId');
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
|
||||
if($user->isAdmin()) {
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
@ -155,7 +146,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$showInstanceId = $this->_getParam('showInstanceId');
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
|
||||
if($user->isAdmin()) {
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
@ -169,9 +160,9 @@ class ScheduleController extends Zend_Controller_Action
|
|||
public function deleteShowAction()
|
||||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
|
||||
if($user->isAdmin()) {
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
@ -185,7 +176,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$today_timestamp = date("Y-m-d H:i:s");
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
|
||||
$show = new ShowInstance($id);
|
||||
|
||||
|
@ -214,7 +205,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
|
||||
public function scheduleShowAction()
|
||||
{
|
||||
$showInstanceId = $this->sched_sess->showInstanceId;
|
||||
$showInstanceId = $this->sched_sess->showInstanceId;
|
||||
$search = $this->_getParam('search', null);
|
||||
$plId = $this->_getParam('plId');
|
||||
|
||||
|
@ -223,7 +214,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
}
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
||||
if($user->isHost($show->getShowId())) {
|
||||
|
@ -242,12 +233,11 @@ class ScheduleController extends Zend_Controller_Action
|
|||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
||||
if($user->isHost($show->getShowId())) {
|
||||
if($user->isHost($show->getShowId()))
|
||||
$show->clearShow();
|
||||
}
|
||||
}
|
||||
|
||||
public function getCurrentPlaylistAction()
|
||||
|
@ -257,8 +247,8 @@ class ScheduleController extends Zend_Controller_Action
|
|||
|
||||
public function findPlaylistsAction()
|
||||
{
|
||||
$post = $this->getRequest()->getPost();
|
||||
|
||||
$post = $this->getRequest()->getPost();
|
||||
|
||||
$show = new ShowInstance($this->sched_sess->showInstanceId);
|
||||
$playlists = $show->searchPlaylistsForShow($post);
|
||||
|
||||
|
@ -273,7 +263,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$search = $this->_getParam('search', null);
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new User($userInfo->id, $userInfo->type);
|
||||
$user = new User($userInfo->id);
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
||||
if($user->isHost($show->getShowId())) {
|
||||
|
@ -289,7 +279,7 @@ class ScheduleController extends Zend_Controller_Action
|
|||
|
||||
public function scheduleShowDialogAction()
|
||||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
$this->sched_sess->showInstanceId = $showInstanceId;
|
||||
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
@ -331,13 +321,25 @@ class ScheduleController extends Zend_Controller_Action
|
|||
|
||||
public function showContentDialogAction()
|
||||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
$show = new ShowInstance($showInstanceId);
|
||||
|
||||
$this->view->showContent = $show->getShowListContent();
|
||||
$this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml');
|
||||
unset($this->view->showContent);
|
||||
}
|
||||
|
||||
public function editShowAction()
|
||||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
$showInstance = new ShowInstance($showInstanceId);
|
||||
|
||||
$show = new Show($showInstance->getShowId());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -5,43 +5,89 @@ class UserController extends Zend_Controller_Action
|
|||
|
||||
public function init()
|
||||
{
|
||||
$ajaxContext = $this->_helper->getHelper('AjaxContext');
|
||||
$ajaxContext->addActionContext('get-hosts', 'json')
|
||||
->initContext();
|
||||
$ajaxContext = $this->_helper->getHelper('AjaxContext');
|
||||
$ajaxContext->addActionContext('get-hosts', 'json')
|
||||
->addActionContext('get-user-data-table-info', 'json')
|
||||
->addActionContext('get-user-data', 'json')
|
||||
->addActionContext('remove-user', 'json')
|
||||
->initContext();
|
||||
}
|
||||
|
||||
public function indexAction()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public function addUserAction()
|
||||
{
|
||||
$request = $this->getRequest();
|
||||
$form = new Application_Form_AddUser();
|
||||
|
||||
if ($request->isPost()) {
|
||||
if ($form->isValid($request->getPost())) {
|
||||
|
||||
$formdata = $form->getValues();
|
||||
User::addUser($formdata);
|
||||
$form->reset();
|
||||
}
|
||||
}
|
||||
|
||||
$this->view->form = $form;
|
||||
{
|
||||
|
||||
|
||||
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/airtime/user/user.js','text/javascript');
|
||||
$request = $this->getRequest();
|
||||
$form = new Application_Form_AddUser();
|
||||
|
||||
if ($request->isPost()) {
|
||||
if ($form->isValid($request->getPost())) {
|
||||
|
||||
$formdata = $form->getValues();
|
||||
if ($form->validateLogin($formdata)){
|
||||
$user = new User($formdata['user_id']);
|
||||
$user->setFirstName($formdata['first_name']);
|
||||
$user->setLastName($formdata['last_name']);
|
||||
$user->setLogin($formdata['login']);
|
||||
if ($formdata['password'] != "xxxxxx")
|
||||
$user->setPassword($formdata['password']);
|
||||
$user->setType($formdata['type']);
|
||||
$user->save();
|
||||
|
||||
$form->reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->view->form = $form;
|
||||
}
|
||||
|
||||
public function getHostsAction()
|
||||
{
|
||||
$search = $this->_getParam('term');
|
||||
|
||||
$this->view->hosts = User::getHosts($search);
|
||||
$search = $this->_getParam('term');
|
||||
$this->view->hosts = User::getHosts($search);
|
||||
}
|
||||
|
||||
public function getUserDataTableInfoAction()
|
||||
{
|
||||
$post = $this->getRequest()->getPost();
|
||||
$users = User::getUsersDataTablesInfo($post);
|
||||
|
||||
|
||||
die(json_encode($users));
|
||||
}
|
||||
|
||||
public function getUserDataAction()
|
||||
{
|
||||
$id = $this->_getParam('id');
|
||||
$this->view->entries = User::GetUserData($id);
|
||||
}
|
||||
|
||||
public function removeUserAction()
|
||||
{
|
||||
// action body
|
||||
$id = $this->_getParam('id');
|
||||
$user = new User($id);
|
||||
|
||||
$this->view->entries = $user->delete();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -8,7 +8,8 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
|
|||
//Add type select
|
||||
$this->addElement('select', 'add_show_repeat_type', array(
|
||||
'required' => true,
|
||||
'label' => 'Repeat Type:',
|
||||
'label' => 'Repeat Type:',
|
||||
'class' => ' input_select',
|
||||
'multiOptions' => array(
|
||||
"0" => "weekly",
|
||||
"1" => "bi-weekly",
|
||||
|
|
|
@ -5,56 +5,78 @@ class Application_Form_AddUser extends Zend_Form
|
|||
|
||||
public function init()
|
||||
{
|
||||
// Add login element
|
||||
$this->addElement('text', 'login', array(
|
||||
'label' => 'Username:',
|
||||
'required' => true,
|
||||
'filters' => array('StringTrim'),
|
||||
'validators' => array('NotEmpty')
|
||||
));
|
||||
|
||||
// Add password element
|
||||
$this->addElement('text', 'password', array(
|
||||
'label' => 'Password:',
|
||||
'required' => true,
|
||||
'filters' => array('StringTrim'),
|
||||
'validators' => array('NotEmpty')
|
||||
));
|
||||
|
||||
// Add first name element
|
||||
$this->addElement('text', 'first_name', array(
|
||||
'label' => 'Firstname:',
|
||||
'required' => true,
|
||||
'filters' => array('StringTrim'),
|
||||
'validators' => array('NotEmpty')
|
||||
));
|
||||
|
||||
// Add last name element
|
||||
$this->addElement('text', 'last_name', array(
|
||||
'label' => 'Lastname:',
|
||||
'required' => true,
|
||||
'filters' => array('StringTrim'),
|
||||
'validators' => array('NotEmpty')
|
||||
));
|
||||
|
||||
//Add type select
|
||||
$this->addElement('select', 'type', array(
|
||||
'required' => true,
|
||||
'multiOptions' => array(
|
||||
"A" => "admin",
|
||||
/*
|
||||
$this->addElementPrefixPath('Application_Validate',
|
||||
'../application/validate',
|
||||
'validate');
|
||||
* */
|
||||
|
||||
$hidden = new Zend_Form_Element_Hidden('user_id');
|
||||
$hidden->setAttrib('style', 'display: none;');
|
||||
$this->addElement($hidden);
|
||||
|
||||
$login = new Zend_Form_Element_Text('login');
|
||||
$login->setLabel('Username:');
|
||||
$login->setAttrib('class', 'input_text');
|
||||
$login->setRequired(true);
|
||||
$login->addFilter('StringTrim');
|
||||
//$login->addValidator('UserNameValidate');
|
||||
$this->addElement($login);
|
||||
|
||||
$password = new Zend_Form_Element_Password('password');
|
||||
$password->setLabel('Password:');
|
||||
$password->setAttrib('class', 'input_text');
|
||||
$password->setRequired(true);
|
||||
$password->addFilter('StringTrim');
|
||||
$password->addValidator('NotEmpty');
|
||||
$this->addElement($password);
|
||||
|
||||
$firstName = new Zend_Form_Element_Text('first_name');
|
||||
$firstName->setLabel('Firstname:');
|
||||
$firstName->setAttrib('class', 'input_text');
|
||||
$firstName->setRequired(true);
|
||||
$firstName->addFilter('StringTrim');
|
||||
$firstName->addValidator('NotEmpty');
|
||||
$this->addElement($firstName);
|
||||
|
||||
$lastName = new Zend_Form_Element_Text('last_name');
|
||||
$lastName->setLabel('Lastname:');
|
||||
$lastName->setAttrib('class', 'input_text');
|
||||
$lastName->setRequired(true);
|
||||
$lastName->addFilter('StringTrim');
|
||||
$lastName->addValidator('NotEmpty');
|
||||
$this->addElement($lastName);
|
||||
|
||||
$select = new Zend_Form_Element_Select('type');
|
||||
$select->setAttrib('class', 'input_select');
|
||||
$select->setAttrib('style', 'width: 40%');
|
||||
$select->setMultiOptions(array(
|
||||
"A" => "admin",
|
||||
"H" => "host",
|
||||
"G" => "guest",
|
||||
),
|
||||
));
|
||||
|
||||
// Add the submit button
|
||||
$this->addElement('submit', 'submit', array(
|
||||
'ignore' => true,
|
||||
'label' => 'Submit',
|
||||
));
|
||||
|
||||
"G" => "guest",
|
||||
));
|
||||
$select->setRequired(true);
|
||||
$this->addElement($select);
|
||||
|
||||
$submit = new Zend_Form_Element_Submit('submit');
|
||||
$submit->setAttrib('class', 'ui-button ui-state-default right-floated');
|
||||
$submit->setIgnore(true);
|
||||
$submit->setLabel('submit');
|
||||
$this->addElement($submit);
|
||||
}
|
||||
|
||||
public function validateLogin($data){
|
||||
|
||||
if (strlen($data['user_id']) == 0){
|
||||
$count = CcSubjsQuery::create()->filterByDbLogin($data['login'])->count();
|
||||
|
||||
if ($count != 0){
|
||||
$this->getElement('login')->setErrors(array("login name is not unique."));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,14 @@ class Application_Model_DateHelper
|
|||
return date("Y-m-d H:i:s", $this->_timestamp);
|
||||
}
|
||||
|
||||
function getTime(){
|
||||
return date("H:i:s", $this->_timestamp);
|
||||
}
|
||||
|
||||
function setDate($dateString){
|
||||
$this->_timestamp = strtotime($dateString);
|
||||
}
|
||||
|
||||
function getNowDayStartDiff(){
|
||||
$dayStartTS = strtotime(date("Y-m-d", $this->_timestamp));
|
||||
return $this->_timestamp - $dayStartTS;
|
||||
|
|
|
@ -4,8 +4,11 @@ class Application_Model_Nowplaying
|
|||
{
|
||||
|
||||
public static function InsertBlankRow($i, $rows){
|
||||
$startDate = explode(".", $rows[$i-1][3]);
|
||||
$endDate = explode(".", $rows[$i][2]);
|
||||
$startDateFull = $rows[$i-1][3];
|
||||
$endDateFull = $rows[$i][2];
|
||||
|
||||
$startDate = explode(".", $startDateFull);
|
||||
$endDate = explode(".", $endDateFull);
|
||||
|
||||
$epochStartMS = strtotime($startDate[0])*1000;
|
||||
$epochEndMS = strtotime($endDate[0])*1000;
|
||||
|
@ -15,7 +18,7 @@ class Application_Model_Nowplaying
|
|||
if (count($endDate) > 1)
|
||||
$epochEndMS += $endDate[1];
|
||||
|
||||
$blankRow = array(array("b", "-", "-", "-", Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", ""));
|
||||
$blankRow = array(array("b", $startDateFull, $startDateFull, $endDate, Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", ""));
|
||||
array_splice($rows, $i, 0, $blankRow);
|
||||
return $rows;
|
||||
}
|
||||
|
@ -42,13 +45,14 @@ class Application_Model_Nowplaying
|
|||
return $rows;
|
||||
}
|
||||
|
||||
public static function GetDataGridData($viewType){
|
||||
|
||||
$date = Schedule::GetSchedulerTime();
|
||||
$timeNow = $date->getDate();
|
||||
public static function GetDataGridData($viewType, $dateString){
|
||||
|
||||
//echo $dateString;
|
||||
if ($viewType == "now"){
|
||||
|
||||
$date = new Application_Model_DateHelper;
|
||||
$timeNow = $date->getDate();
|
||||
|
||||
/* When do "ORDER BY x DESC LIMIT 5" to ensure that we get the last 5 previously scheduled items.
|
||||
* However using DESC, puts our scheduled items in reverse order, so we need to reverse it again
|
||||
* with array_reverse.
|
||||
|
@ -57,6 +61,10 @@ class Application_Model_Nowplaying
|
|||
$current = Schedule::Get_Scheduled_Item_Data($timeNow, 0);
|
||||
$next = Schedule::Get_Scheduled_Item_Data($timeNow, 1, 10, "24 hours");
|
||||
} else {
|
||||
$date = new Application_Model_DateHelper;
|
||||
$time = $date->getTime();
|
||||
$date->setDate($dateString." ".$time);
|
||||
$timeNow = $date->getDate();
|
||||
|
||||
$previous = array_reverse(Schedule::Get_Scheduled_Item_Data($timeNow, -1, "ALL", $date->getNowDayStartDiff()." seconds"));
|
||||
$current = Schedule::Get_Scheduled_Item_Data($timeNow, 0);
|
||||
|
|
|
@ -419,21 +419,6 @@ class Schedule {
|
|||
return $rows;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the date of the server in the format
|
||||
* "YYYY-MM-DD HH:mm:SS".
|
||||
*
|
||||
* Note: currently assuming that Web Server and Scheduler are on the
|
||||
* same host.
|
||||
*
|
||||
* @return date Current server time.
|
||||
*/
|
||||
public static function GetSchedulerTime() {
|
||||
$date = new Application_Model_DateHelper;
|
||||
return $date;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns data related to the scheduled items.
|
||||
*
|
||||
|
@ -447,7 +432,7 @@ class Schedule {
|
|||
return array();
|
||||
}
|
||||
|
||||
$date = Schedule::GetSchedulerTime();
|
||||
$date = new Application_Model_DateHelper;
|
||||
$timeNow = $date->getDate();
|
||||
return array("env"=>APPLICATION_ENV,
|
||||
"schedulerTime"=>gmdate("Y-m-d H:i:s"),
|
||||
|
|
|
@ -11,16 +11,44 @@ class Show {
|
|||
|
||||
public function getName() {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
|
||||
return $show->getDbName();
|
||||
}
|
||||
|
||||
public function setName($name) {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
|
||||
$show->setDbName($name);
|
||||
}
|
||||
|
||||
public function getDescription() {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
return $show->getDbDescription();
|
||||
}
|
||||
|
||||
public function setDescription($description) {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
$show->setDbDescription($description);
|
||||
}
|
||||
|
||||
public function getColor() {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
return $show->getDbColor();
|
||||
}
|
||||
|
||||
public function setColor($color) {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
$show->setDbColor($color);
|
||||
}
|
||||
|
||||
public function getBackgroundColor() {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
return $show->getDbBackgroundColor();
|
||||
}
|
||||
|
||||
public function setBackgroundColor($backgroundColor) {
|
||||
$show = CcShowQuery::create()->findPK($this->_showId);
|
||||
$show->setDbBackgroundColor($backgroundColor);
|
||||
}
|
||||
|
||||
//end dates are non inclusive.
|
||||
public static function addShow($data) {
|
||||
|
||||
|
|
|
@ -1797,7 +1797,7 @@ class StoredFile {
|
|||
return StoredFile::searchFiles($fromTable, $datatables);
|
||||
}
|
||||
|
||||
private static function searchFiles($fromTable, $data)
|
||||
public static function searchFiles($fromTable, $data)
|
||||
{
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
|
||||
|
|
|
@ -2,41 +2,92 @@
|
|||
|
||||
class User {
|
||||
|
||||
private $_userRole;
|
||||
private $_userId;
|
||||
private $_userInstance;
|
||||
|
||||
public function __construct($userId, $userType='G')
|
||||
public function __construct($userId)
|
||||
{
|
||||
$this->_userRole = $userType;
|
||||
$this->_userId = $userId;
|
||||
if (strlen($userId)==0){
|
||||
$this->_userInstance = $this->createUser();
|
||||
} else {
|
||||
$this->_userInstance = CcSubjsQuery::create()->findPK($userId);
|
||||
}
|
||||
}
|
||||
|
||||
public function getType() {
|
||||
return $this->userRole;
|
||||
}
|
||||
|
||||
public function getId() {
|
||||
return $this->_userId;
|
||||
return $this->_userInstance->getDbId();
|
||||
}
|
||||
|
||||
public function isHost($showId) {
|
||||
return CcShowHostsQuery::create()->filterByDbShow($showId)->filterByDbHost($this->_userId)->count() > 0;
|
||||
$userId = $this->_userInstance->getDbId();
|
||||
return CcShowHostsQuery::create()->filterByDbShow($showId)->filterByDbHost($userId)->count() > 0;
|
||||
}
|
||||
|
||||
public function isAdmin() {
|
||||
return $this->_userRole === 'A';
|
||||
return $this->_userInstance->getDbType() === 'A';
|
||||
}
|
||||
|
||||
public function setLogin($login){
|
||||
$user = $this->_userInstance;
|
||||
$user->setDbLogin($login);
|
||||
}
|
||||
|
||||
public function setPassword($password){
|
||||
$user = $this->_userInstance;
|
||||
$user->setDbPass(md5($password));
|
||||
}
|
||||
|
||||
public function setFirstName($firstName){
|
||||
$user = $this->_userInstance;
|
||||
$user->setDbFirstName($firstName);
|
||||
}
|
||||
|
||||
public function setLastName($lastName){
|
||||
$user = $this->_userInstance;
|
||||
$user->setDbLastName($lastName);
|
||||
}
|
||||
|
||||
public function setType($type){
|
||||
$user = $this->_userInstance;
|
||||
$user->setDbType($type);
|
||||
}
|
||||
|
||||
public function getLogin(){
|
||||
$user = $this->_userInstance;
|
||||
return $user->getDbLogin();
|
||||
}
|
||||
|
||||
public function getPassword(){
|
||||
$user = $this->_userInstance;
|
||||
return $user->getDbPass();
|
||||
}
|
||||
|
||||
public function getFirstName(){
|
||||
$user = $this->_userInstance;
|
||||
return $user->getDbFirstName();
|
||||
}
|
||||
|
||||
public function getLastName(){
|
||||
$user = $this->_userInstance;
|
||||
return $user->getDbLastName();
|
||||
}
|
||||
|
||||
public function getType(){
|
||||
$user = $this->_userInstance;
|
||||
return $user->getDbType();
|
||||
}
|
||||
|
||||
public function save(){
|
||||
$this->_userInstance->save();
|
||||
}
|
||||
|
||||
public function delete(){
|
||||
if (!$this->_userInstance->isDeleted())
|
||||
$this->_userInstance->delete();
|
||||
}
|
||||
|
||||
public static function addUser($data) {
|
||||
|
||||
$user = new CcSubjs();
|
||||
$user->setDbLogin($data['login']);
|
||||
$user->setDbPass(md5($data['password']));
|
||||
$user->setDbFirstName($data['first_name']);
|
||||
$user->setDbLastName($data['last_name']);
|
||||
$user->setDbType($data['type']);
|
||||
$user->save();
|
||||
|
||||
private function createUser() {
|
||||
$user = new CcSubjs();
|
||||
return $user;
|
||||
}
|
||||
|
||||
public static function getUsers($type, $search=NULL) {
|
||||
|
@ -71,5 +122,21 @@ class User {
|
|||
public static function getHosts($search=NULL) {
|
||||
return User::getUsers(array('H', 'A'), $search);
|
||||
}
|
||||
|
||||
public static function getUsersDataTablesInfo($datatables_post) {
|
||||
|
||||
$fromTable = "cc_subjs";
|
||||
return StoredFile::searchFiles($fromTable, $datatables_post);
|
||||
}
|
||||
|
||||
public static function getUserData($id){
|
||||
global $CC_DBC;
|
||||
|
||||
$sql = "SELECT login, first_name, last_name, type, id"
|
||||
." FROM cc_subjs"
|
||||
." WHERE id = $id";
|
||||
|
||||
return $CC_DBC->GetRow($sql);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -46,6 +46,9 @@ class CcSubjsTableMap extends TableMap {
|
|||
$this->addColumn('LAST_NAME', 'DbLastName', 'VARCHAR', true, 255, '');
|
||||
$this->addColumn('LASTLOGIN', 'DbLastlogin', 'TIMESTAMP', false, null, null);
|
||||
$this->addColumn('LASTFAIL', 'DbLastfail', 'TIMESTAMP', false, null, null);
|
||||
$this->addColumn('SKYPE_CONTACT', 'DbSkypeContact', 'VARCHAR', false, 255, null);
|
||||
$this->addColumn('JABBER_CONTACT', 'DbJabberContact', 'VARCHAR', false, 255, null);
|
||||
$this->addColumn('EMAIL', 'DbEmail', 'VARCHAR', false, 255, null);
|
||||
// validators
|
||||
} // initialize()
|
||||
|
||||
|
|
|
@ -77,6 +77,24 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
*/
|
||||
protected $lastfail;
|
||||
|
||||
/**
|
||||
* The value for the skype_contact field.
|
||||
* @var string
|
||||
*/
|
||||
protected $skype_contact;
|
||||
|
||||
/**
|
||||
* The value for the jabber_contact field.
|
||||
* @var string
|
||||
*/
|
||||
protected $jabber_contact;
|
||||
|
||||
/**
|
||||
* The value for the email field.
|
||||
* @var string
|
||||
*/
|
||||
protected $email;
|
||||
|
||||
/**
|
||||
* @var array CcAccess[] Collection to store aggregation of CcAccess objects.
|
||||
*/
|
||||
|
@ -277,6 +295,36 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the [skype_contact] column value.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getDbSkypeContact()
|
||||
{
|
||||
return $this->skype_contact;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the [jabber_contact] column value.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getDbJabberContact()
|
||||
{
|
||||
return $this->jabber_contact;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the [email] column value.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getDbEmail()
|
||||
{
|
||||
return $this->email;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the value of [id] column.
|
||||
*
|
||||
|
@ -495,6 +543,66 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
return $this;
|
||||
} // setDbLastfail()
|
||||
|
||||
/**
|
||||
* Set the value of [skype_contact] column.
|
||||
*
|
||||
* @param string $v new value
|
||||
* @return CcSubjs The current object (for fluent API support)
|
||||
*/
|
||||
public function setDbSkypeContact($v)
|
||||
{
|
||||
if ($v !== null) {
|
||||
$v = (string) $v;
|
||||
}
|
||||
|
||||
if ($this->skype_contact !== $v) {
|
||||
$this->skype_contact = $v;
|
||||
$this->modifiedColumns[] = CcSubjsPeer::SKYPE_CONTACT;
|
||||
}
|
||||
|
||||
return $this;
|
||||
} // setDbSkypeContact()
|
||||
|
||||
/**
|
||||
* Set the value of [jabber_contact] column.
|
||||
*
|
||||
* @param string $v new value
|
||||
* @return CcSubjs The current object (for fluent API support)
|
||||
*/
|
||||
public function setDbJabberContact($v)
|
||||
{
|
||||
if ($v !== null) {
|
||||
$v = (string) $v;
|
||||
}
|
||||
|
||||
if ($this->jabber_contact !== $v) {
|
||||
$this->jabber_contact = $v;
|
||||
$this->modifiedColumns[] = CcSubjsPeer::JABBER_CONTACT;
|
||||
}
|
||||
|
||||
return $this;
|
||||
} // setDbJabberContact()
|
||||
|
||||
/**
|
||||
* Set the value of [email] column.
|
||||
*
|
||||
* @param string $v new value
|
||||
* @return CcSubjs The current object (for fluent API support)
|
||||
*/
|
||||
public function setDbEmail($v)
|
||||
{
|
||||
if ($v !== null) {
|
||||
$v = (string) $v;
|
||||
}
|
||||
|
||||
if ($this->email !== $v) {
|
||||
$this->email = $v;
|
||||
$this->modifiedColumns[] = CcSubjsPeer::EMAIL;
|
||||
}
|
||||
|
||||
return $this;
|
||||
} // setDbEmail()
|
||||
|
||||
/**
|
||||
* Indicates whether the columns in this object are only set to default values.
|
||||
*
|
||||
|
@ -555,6 +663,9 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
$this->last_name = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
|
||||
$this->lastlogin = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
|
||||
$this->lastfail = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null;
|
||||
$this->skype_contact = ($row[$startcol + 8] !== null) ? (string) $row[$startcol + 8] : null;
|
||||
$this->jabber_contact = ($row[$startcol + 9] !== null) ? (string) $row[$startcol + 9] : null;
|
||||
$this->email = ($row[$startcol + 10] !== null) ? (string) $row[$startcol + 10] : null;
|
||||
$this->resetModified();
|
||||
|
||||
$this->setNew(false);
|
||||
|
@ -563,7 +674,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
$this->ensureConsistency();
|
||||
}
|
||||
|
||||
return $startcol + 8; // 8 = CcSubjsPeer::NUM_COLUMNS - CcSubjsPeer::NUM_LAZY_LOAD_COLUMNS).
|
||||
return $startcol + 11; // 11 = CcSubjsPeer::NUM_COLUMNS - CcSubjsPeer::NUM_LAZY_LOAD_COLUMNS).
|
||||
|
||||
} catch (Exception $e) {
|
||||
throw new PropelException("Error populating CcSubjs object", $e);
|
||||
|
@ -1012,6 +1123,15 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
case 7:
|
||||
return $this->getDbLastfail();
|
||||
break;
|
||||
case 8:
|
||||
return $this->getDbSkypeContact();
|
||||
break;
|
||||
case 9:
|
||||
return $this->getDbJabberContact();
|
||||
break;
|
||||
case 10:
|
||||
return $this->getDbEmail();
|
||||
break;
|
||||
default:
|
||||
return null;
|
||||
break;
|
||||
|
@ -1043,6 +1163,9 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
$keys[5] => $this->getDbLastName(),
|
||||
$keys[6] => $this->getDbLastlogin(),
|
||||
$keys[7] => $this->getDbLastfail(),
|
||||
$keys[8] => $this->getDbSkypeContact(),
|
||||
$keys[9] => $this->getDbJabberContact(),
|
||||
$keys[10] => $this->getDbEmail(),
|
||||
);
|
||||
return $result;
|
||||
}
|
||||
|
@ -1098,6 +1221,15 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
case 7:
|
||||
$this->setDbLastfail($value);
|
||||
break;
|
||||
case 8:
|
||||
$this->setDbSkypeContact($value);
|
||||
break;
|
||||
case 9:
|
||||
$this->setDbJabberContact($value);
|
||||
break;
|
||||
case 10:
|
||||
$this->setDbEmail($value);
|
||||
break;
|
||||
} // switch()
|
||||
}
|
||||
|
||||
|
@ -1130,6 +1262,9 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
if (array_key_exists($keys[5], $arr)) $this->setDbLastName($arr[$keys[5]]);
|
||||
if (array_key_exists($keys[6], $arr)) $this->setDbLastlogin($arr[$keys[6]]);
|
||||
if (array_key_exists($keys[7], $arr)) $this->setDbLastfail($arr[$keys[7]]);
|
||||
if (array_key_exists($keys[8], $arr)) $this->setDbSkypeContact($arr[$keys[8]]);
|
||||
if (array_key_exists($keys[9], $arr)) $this->setDbJabberContact($arr[$keys[9]]);
|
||||
if (array_key_exists($keys[10], $arr)) $this->setDbEmail($arr[$keys[10]]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1149,6 +1284,9 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
if ($this->isColumnModified(CcSubjsPeer::LAST_NAME)) $criteria->add(CcSubjsPeer::LAST_NAME, $this->last_name);
|
||||
if ($this->isColumnModified(CcSubjsPeer::LASTLOGIN)) $criteria->add(CcSubjsPeer::LASTLOGIN, $this->lastlogin);
|
||||
if ($this->isColumnModified(CcSubjsPeer::LASTFAIL)) $criteria->add(CcSubjsPeer::LASTFAIL, $this->lastfail);
|
||||
if ($this->isColumnModified(CcSubjsPeer::SKYPE_CONTACT)) $criteria->add(CcSubjsPeer::SKYPE_CONTACT, $this->skype_contact);
|
||||
if ($this->isColumnModified(CcSubjsPeer::JABBER_CONTACT)) $criteria->add(CcSubjsPeer::JABBER_CONTACT, $this->jabber_contact);
|
||||
if ($this->isColumnModified(CcSubjsPeer::EMAIL)) $criteria->add(CcSubjsPeer::EMAIL, $this->email);
|
||||
|
||||
return $criteria;
|
||||
}
|
||||
|
@ -1217,6 +1355,9 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
$copyObj->setDbLastName($this->last_name);
|
||||
$copyObj->setDbLastlogin($this->lastlogin);
|
||||
$copyObj->setDbLastfail($this->lastfail);
|
||||
$copyObj->setDbSkypeContact($this->skype_contact);
|
||||
$copyObj->setDbJabberContact($this->jabber_contact);
|
||||
$copyObj->setDbEmail($this->email);
|
||||
|
||||
if ($deepCopy) {
|
||||
// important: temporarily setNew(false) because this affects the behavior of
|
||||
|
@ -2111,6 +2252,9 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent
|
|||
$this->last_name = null;
|
||||
$this->lastlogin = null;
|
||||
$this->lastfail = null;
|
||||
$this->skype_contact = null;
|
||||
$this->jabber_contact = null;
|
||||
$this->email = null;
|
||||
$this->alreadyInSave = false;
|
||||
$this->alreadyInValidation = false;
|
||||
$this->clearAllReferences();
|
||||
|
|
|
@ -26,7 +26,7 @@ abstract class BaseCcSubjsPeer {
|
|||
const TM_CLASS = 'CcSubjsTableMap';
|
||||
|
||||
/** The total number of columns. */
|
||||
const NUM_COLUMNS = 8;
|
||||
const NUM_COLUMNS = 11;
|
||||
|
||||
/** The number of lazy-loaded columns. */
|
||||
const NUM_LAZY_LOAD_COLUMNS = 0;
|
||||
|
@ -55,6 +55,15 @@ abstract class BaseCcSubjsPeer {
|
|||
/** the column name for the LASTFAIL field */
|
||||
const LASTFAIL = 'cc_subjs.LASTFAIL';
|
||||
|
||||
/** the column name for the SKYPE_CONTACT field */
|
||||
const SKYPE_CONTACT = 'cc_subjs.SKYPE_CONTACT';
|
||||
|
||||
/** the column name for the JABBER_CONTACT field */
|
||||
const JABBER_CONTACT = 'cc_subjs.JABBER_CONTACT';
|
||||
|
||||
/** the column name for the EMAIL field */
|
||||
const EMAIL = 'cc_subjs.EMAIL';
|
||||
|
||||
/**
|
||||
* An identiy map to hold any loaded instances of CcSubjs objects.
|
||||
* This must be public so that other peer classes can access this when hydrating from JOIN
|
||||
|
@ -71,12 +80,12 @@ abstract class BaseCcSubjsPeer {
|
|||
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
|
||||
*/
|
||||
private static $fieldNames = array (
|
||||
BasePeer::TYPE_PHPNAME => array ('DbId', 'DbLogin', 'DbPass', 'DbType', 'DbFirstName', 'DbLastName', 'DbLastlogin', 'DbLastfail', ),
|
||||
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbLogin', 'dbPass', 'dbType', 'dbFirstName', 'dbLastName', 'dbLastlogin', 'dbLastfail', ),
|
||||
BasePeer::TYPE_COLNAME => array (self::ID, self::LOGIN, self::PASS, self::TYPE, self::FIRST_NAME, self::LAST_NAME, self::LASTLOGIN, self::LASTFAIL, ),
|
||||
BasePeer::TYPE_RAW_COLNAME => array ('ID', 'LOGIN', 'PASS', 'TYPE', 'FIRST_NAME', 'LAST_NAME', 'LASTLOGIN', 'LASTFAIL', ),
|
||||
BasePeer::TYPE_FIELDNAME => array ('id', 'login', 'pass', 'type', 'first_name', 'last_name', 'lastlogin', 'lastfail', ),
|
||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
|
||||
BasePeer::TYPE_PHPNAME => array ('DbId', 'DbLogin', 'DbPass', 'DbType', 'DbFirstName', 'DbLastName', 'DbLastlogin', 'DbLastfail', 'DbSkypeContact', 'DbJabberContact', 'DbEmail', ),
|
||||
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbLogin', 'dbPass', 'dbType', 'dbFirstName', 'dbLastName', 'dbLastlogin', 'dbLastfail', 'dbSkypeContact', 'dbJabberContact', 'dbEmail', ),
|
||||
BasePeer::TYPE_COLNAME => array (self::ID, self::LOGIN, self::PASS, self::TYPE, self::FIRST_NAME, self::LAST_NAME, self::LASTLOGIN, self::LASTFAIL, self::SKYPE_CONTACT, self::JABBER_CONTACT, self::EMAIL, ),
|
||||
BasePeer::TYPE_RAW_COLNAME => array ('ID', 'LOGIN', 'PASS', 'TYPE', 'FIRST_NAME', 'LAST_NAME', 'LASTLOGIN', 'LASTFAIL', 'SKYPE_CONTACT', 'JABBER_CONTACT', 'EMAIL', ),
|
||||
BasePeer::TYPE_FIELDNAME => array ('id', 'login', 'pass', 'type', 'first_name', 'last_name', 'lastlogin', 'lastfail', 'skype_contact', 'jabber_contact', 'email', ),
|
||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
|
||||
);
|
||||
|
||||
/**
|
||||
|
@ -86,12 +95,12 @@ abstract class BaseCcSubjsPeer {
|
|||
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
|
||||
*/
|
||||
private static $fieldKeys = array (
|
||||
BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbLogin' => 1, 'DbPass' => 2, 'DbType' => 3, 'DbFirstName' => 4, 'DbLastName' => 5, 'DbLastlogin' => 6, 'DbLastfail' => 7, ),
|
||||
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbLogin' => 1, 'dbPass' => 2, 'dbType' => 3, 'dbFirstName' => 4, 'dbLastName' => 5, 'dbLastlogin' => 6, 'dbLastfail' => 7, ),
|
||||
BasePeer::TYPE_COLNAME => array (self::ID => 0, self::LOGIN => 1, self::PASS => 2, self::TYPE => 3, self::FIRST_NAME => 4, self::LAST_NAME => 5, self::LASTLOGIN => 6, self::LASTFAIL => 7, ),
|
||||
BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'LOGIN' => 1, 'PASS' => 2, 'TYPE' => 3, 'FIRST_NAME' => 4, 'LAST_NAME' => 5, 'LASTLOGIN' => 6, 'LASTFAIL' => 7, ),
|
||||
BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'login' => 1, 'pass' => 2, 'type' => 3, 'first_name' => 4, 'last_name' => 5, 'lastlogin' => 6, 'lastfail' => 7, ),
|
||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
|
||||
BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbLogin' => 1, 'DbPass' => 2, 'DbType' => 3, 'DbFirstName' => 4, 'DbLastName' => 5, 'DbLastlogin' => 6, 'DbLastfail' => 7, 'DbSkypeContact' => 8, 'DbJabberContact' => 9, 'DbEmail' => 10, ),
|
||||
BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbLogin' => 1, 'dbPass' => 2, 'dbType' => 3, 'dbFirstName' => 4, 'dbLastName' => 5, 'dbLastlogin' => 6, 'dbLastfail' => 7, 'dbSkypeContact' => 8, 'dbJabberContact' => 9, 'dbEmail' => 10, ),
|
||||
BasePeer::TYPE_COLNAME => array (self::ID => 0, self::LOGIN => 1, self::PASS => 2, self::TYPE => 3, self::FIRST_NAME => 4, self::LAST_NAME => 5, self::LASTLOGIN => 6, self::LASTFAIL => 7, self::SKYPE_CONTACT => 8, self::JABBER_CONTACT => 9, self::EMAIL => 10, ),
|
||||
BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'LOGIN' => 1, 'PASS' => 2, 'TYPE' => 3, 'FIRST_NAME' => 4, 'LAST_NAME' => 5, 'LASTLOGIN' => 6, 'LASTFAIL' => 7, 'SKYPE_CONTACT' => 8, 'JABBER_CONTACT' => 9, 'EMAIL' => 10, ),
|
||||
BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'login' => 1, 'pass' => 2, 'type' => 3, 'first_name' => 4, 'last_name' => 5, 'lastlogin' => 6, 'lastfail' => 7, 'skype_contact' => 8, 'jabber_contact' => 9, 'email' => 10, ),
|
||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
|
||||
);
|
||||
|
||||
/**
|
||||
|
@ -171,6 +180,9 @@ abstract class BaseCcSubjsPeer {
|
|||
$criteria->addSelectColumn(CcSubjsPeer::LAST_NAME);
|
||||
$criteria->addSelectColumn(CcSubjsPeer::LASTLOGIN);
|
||||
$criteria->addSelectColumn(CcSubjsPeer::LASTFAIL);
|
||||
$criteria->addSelectColumn(CcSubjsPeer::SKYPE_CONTACT);
|
||||
$criteria->addSelectColumn(CcSubjsPeer::JABBER_CONTACT);
|
||||
$criteria->addSelectColumn(CcSubjsPeer::EMAIL);
|
||||
} else {
|
||||
$criteria->addSelectColumn($alias . '.ID');
|
||||
$criteria->addSelectColumn($alias . '.LOGIN');
|
||||
|
@ -180,6 +192,9 @@ abstract class BaseCcSubjsPeer {
|
|||
$criteria->addSelectColumn($alias . '.LAST_NAME');
|
||||
$criteria->addSelectColumn($alias . '.LASTLOGIN');
|
||||
$criteria->addSelectColumn($alias . '.LASTFAIL');
|
||||
$criteria->addSelectColumn($alias . '.SKYPE_CONTACT');
|
||||
$criteria->addSelectColumn($alias . '.JABBER_CONTACT');
|
||||
$criteria->addSelectColumn($alias . '.EMAIL');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -14,6 +14,9 @@
|
|||
* @method CcSubjsQuery orderByDbLastName($order = Criteria::ASC) Order by the last_name column
|
||||
* @method CcSubjsQuery orderByDbLastlogin($order = Criteria::ASC) Order by the lastlogin column
|
||||
* @method CcSubjsQuery orderByDbLastfail($order = Criteria::ASC) Order by the lastfail column
|
||||
* @method CcSubjsQuery orderByDbSkypeContact($order = Criteria::ASC) Order by the skype_contact column
|
||||
* @method CcSubjsQuery orderByDbJabberContact($order = Criteria::ASC) Order by the jabber_contact column
|
||||
* @method CcSubjsQuery orderByDbEmail($order = Criteria::ASC) Order by the email column
|
||||
*
|
||||
* @method CcSubjsQuery groupByDbId() Group by the id column
|
||||
* @method CcSubjsQuery groupByDbLogin() Group by the login column
|
||||
|
@ -23,6 +26,9 @@
|
|||
* @method CcSubjsQuery groupByDbLastName() Group by the last_name column
|
||||
* @method CcSubjsQuery groupByDbLastlogin() Group by the lastlogin column
|
||||
* @method CcSubjsQuery groupByDbLastfail() Group by the lastfail column
|
||||
* @method CcSubjsQuery groupByDbSkypeContact() Group by the skype_contact column
|
||||
* @method CcSubjsQuery groupByDbJabberContact() Group by the jabber_contact column
|
||||
* @method CcSubjsQuery groupByDbEmail() Group by the email column
|
||||
*
|
||||
* @method CcSubjsQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
|
||||
* @method CcSubjsQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
|
||||
|
@ -67,6 +73,9 @@
|
|||
* @method CcSubjs findOneByDbLastName(string $last_name) Return the first CcSubjs filtered by the last_name column
|
||||
* @method CcSubjs findOneByDbLastlogin(string $lastlogin) Return the first CcSubjs filtered by the lastlogin column
|
||||
* @method CcSubjs findOneByDbLastfail(string $lastfail) Return the first CcSubjs filtered by the lastfail column
|
||||
* @method CcSubjs findOneByDbSkypeContact(string $skype_contact) Return the first CcSubjs filtered by the skype_contact column
|
||||
* @method CcSubjs findOneByDbJabberContact(string $jabber_contact) Return the first CcSubjs filtered by the jabber_contact column
|
||||
* @method CcSubjs findOneByDbEmail(string $email) Return the first CcSubjs filtered by the email column
|
||||
*
|
||||
* @method array findByDbId(int $id) Return CcSubjs objects filtered by the id column
|
||||
* @method array findByDbLogin(string $login) Return CcSubjs objects filtered by the login column
|
||||
|
@ -76,6 +85,9 @@
|
|||
* @method array findByDbLastName(string $last_name) Return CcSubjs objects filtered by the last_name column
|
||||
* @method array findByDbLastlogin(string $lastlogin) Return CcSubjs objects filtered by the lastlogin column
|
||||
* @method array findByDbLastfail(string $lastfail) Return CcSubjs objects filtered by the lastfail column
|
||||
* @method array findByDbSkypeContact(string $skype_contact) Return CcSubjs objects filtered by the skype_contact column
|
||||
* @method array findByDbJabberContact(string $jabber_contact) Return CcSubjs objects filtered by the jabber_contact column
|
||||
* @method array findByDbEmail(string $email) Return CcSubjs objects filtered by the email column
|
||||
*
|
||||
* @package propel.generator.airtime.om
|
||||
*/
|
||||
|
@ -374,6 +386,72 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
|
|||
return $this->addUsingAlias(CcSubjsPeer::LASTFAIL, $dbLastfail, $comparison);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter the query on the skype_contact column
|
||||
*
|
||||
* @param string $dbSkypeContact 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 CcSubjsQuery The current query, for fluid interface
|
||||
*/
|
||||
public function filterByDbSkypeContact($dbSkypeContact = null, $comparison = null)
|
||||
{
|
||||
if (null === $comparison) {
|
||||
if (is_array($dbSkypeContact)) {
|
||||
$comparison = Criteria::IN;
|
||||
} elseif (preg_match('/[\%\*]/', $dbSkypeContact)) {
|
||||
$dbSkypeContact = str_replace('*', '%', $dbSkypeContact);
|
||||
$comparison = Criteria::LIKE;
|
||||
}
|
||||
}
|
||||
return $this->addUsingAlias(CcSubjsPeer::SKYPE_CONTACT, $dbSkypeContact, $comparison);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter the query on the jabber_contact column
|
||||
*
|
||||
* @param string $dbJabberContact 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 CcSubjsQuery The current query, for fluid interface
|
||||
*/
|
||||
public function filterByDbJabberContact($dbJabberContact = null, $comparison = null)
|
||||
{
|
||||
if (null === $comparison) {
|
||||
if (is_array($dbJabberContact)) {
|
||||
$comparison = Criteria::IN;
|
||||
} elseif (preg_match('/[\%\*]/', $dbJabberContact)) {
|
||||
$dbJabberContact = str_replace('*', '%', $dbJabberContact);
|
||||
$comparison = Criteria::LIKE;
|
||||
}
|
||||
}
|
||||
return $this->addUsingAlias(CcSubjsPeer::JABBER_CONTACT, $dbJabberContact, $comparison);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter the query on the email column
|
||||
*
|
||||
* @param string $dbEmail 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 CcSubjsQuery The current query, for fluid interface
|
||||
*/
|
||||
public function filterByDbEmail($dbEmail = null, $comparison = null)
|
||||
{
|
||||
if (null === $comparison) {
|
||||
if (is_array($dbEmail)) {
|
||||
$comparison = Criteria::IN;
|
||||
} elseif (preg_match('/[\%\*]/', $dbEmail)) {
|
||||
$dbEmail = str_replace('*', '%', $dbEmail);
|
||||
$comparison = Criteria::LIKE;
|
||||
}
|
||||
}
|
||||
return $this->addUsingAlias(CcSubjsPeer::EMAIL, $dbEmail, $comparison);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter the query by a related CcAccess object
|
||||
*
|
||||
|
|
26
application/validate/UserNameValidate.php
Normal file
26
application/validate/UserNameValidate.php
Normal file
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
|
||||
class Application_Validate_UserNameValidate extends Zend_Validate_Abstract
|
||||
{
|
||||
const LOGIN = 'login';
|
||||
|
||||
protected $_messageTemplates = array(
|
||||
self::LOGIN => "'%value%' is already taken"
|
||||
);
|
||||
|
||||
public function isValid($value)
|
||||
{
|
||||
$this->_setValue($value);
|
||||
|
||||
$count = CcSubjsQuery::create()->filterByDbLogin($value)->count();
|
||||
|
||||
if ($count != 0) {
|
||||
$this->_error(self::LOGIN);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
|
@ -10,5 +10,5 @@
|
|||
</label>
|
||||
<?php $i=$i+1 ?>
|
||||
<?php endforeach; ?>
|
||||
<?php echo $this->formErrors($this->element->getMessages()) ?>
|
||||
<?php if($this->element->hasErrors()) { echo $this->formErrors($this->element->getMessages());} ?>
|
||||
</dd>
|
||||
|
|
|
@ -9,8 +9,5 @@
|
|||
$this->element->getAttribs()
|
||||
) ?>
|
||||
|
||||
<?php if($this->element->hasErrors()) {
|
||||
echo $this->formErrors($this->element->getMessages());
|
||||
}
|
||||
?>
|
||||
<?php if($this->element->hasErrors()) { echo $this->formErrors($this->element->getMessages());} ?>
|
||||
</dd>
|
||||
|
|
5
application/views/scripts/nowplaying/day-view.phtml
Normal file
5
application/views/scripts/nowplaying/day-view.phtml
Normal file
|
@ -0,0 +1,5 @@
|
|||
<div class="button-bar-top">
|
||||
Date:<input type="text" id="datepicker" class="input_text">
|
||||
<a href="javascript:void(0)" class="toggle-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button-active end-button" id="day_view">Day View</a>
|
||||
</div>
|
||||
<div id='demo'></div>
|
|
@ -1,2 +1,4 @@
|
|||
<div style="text-align:right;"><a href="javascript:void(0);" onclick="setViewType(0)">Now View</a> | <a href="javascript:void(0);" onclick="setViewType(1)">Day View</a></div>
|
||||
<div class="button-bar-top">
|
||||
<a href="javascript:void(0)" class="toggle-button-active" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button end-button" id="day_view">Day View</a>
|
||||
</div>
|
||||
<div id='demo'></div>
|
||||
|
|
|
@ -1,4 +1 @@
|
|||
<?php
|
||||
|
||||
$this->form->setAction($this->url());
|
||||
echo $this->form;
|
||||
<?php echo $this->form; ?>
|
||||
|
|
|
@ -1,38 +1,28 @@
|
|||
<div class="wrapper" id="content">
|
||||
<form method="post" action="">
|
||||
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
|
||||
<ul>
|
||||
<li><a href="#schedule-show-what"><span>What</span></a></li>
|
||||
<li><a href="#schedule-show-when"><span>When</span></a></li>
|
||||
<li><a href="#schedule-show-who"><span>Who</span></a></li>
|
||||
<li><a href="#schedule-show-style"><span>Style</span></a></li>
|
||||
</ul>
|
||||
<div class="button-bar">
|
||||
<button id="add-show-submit" class="right-floated">Add this show</button></div>
|
||||
<div class="clear"></div>
|
||||
<form id="add-show-form" method="post" action="">
|
||||
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
|
||||
<div class="button-bar">
|
||||
<button id="add-show-submit" class="right-floated">Add this show</button>
|
||||
<button id="add-show-close" class="right-floated">Close</button>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
<div id="schedule-show-what">
|
||||
<?php echo $this->what ?>
|
||||
</div>
|
||||
<h3 class="collapsible-header"><span class="arrow-icon"></span>When</h3>
|
||||
<div id="schedule-show-when" class="collapsible-content">
|
||||
<?php echo $this->when ?>
|
||||
<?php echo $this->repeats ?>
|
||||
</div>
|
||||
<h3 class="collapsible-header"><span class="arrow-icon"></span>Who</h3>
|
||||
<div id="schedule-show-who" class="collapsible-content">
|
||||
<?php echo $this->who ?>
|
||||
</div>
|
||||
<h3 class="collapsible-header"><span class="arrow-icon"></span>Style</h3>
|
||||
<div id="schedule-show-style" class="collapsible-content">
|
||||
<?php echo $this->style ?>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<?php if(isset($this->overlap)) : ?>
|
||||
<div id="schedule-add-show-overlap" style="display:block;">
|
||||
<div>Overlap</div>
|
||||
<?php echo $this->partialLoop('schedule/show-overlap.phtml', $this->overlap); ?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
<div id="fullcalendar_show_display" class="ui-widget-content block-shadow omega-block padded"></div>
|
||||
|
||||
<div id="schedule-show-what">
|
||||
<?php echo $this->what ?>
|
||||
</div>
|
||||
<div id="schedule-show-when">
|
||||
<?php echo $this->when ?>
|
||||
<?php echo $this->repeats ?>
|
||||
</div>
|
||||
<div id="schedule-show-who">
|
||||
<?php echo $this->who ?>
|
||||
</div>
|
||||
<div id="schedule-show-style">
|
||||
<?php echo $this->style ?>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div id="fullcalendar_show_display" class="ui-widget-content block-shadow omega-block padded"></div>
|
||||
</div>
|
||||
|
|
11
application/views/scripts/schedule/edit-show.phtml
Normal file
11
application/views/scripts/schedule/edit-show.phtml
Normal file
|
@ -0,0 +1,11 @@
|
|||
<div>
|
||||
<div id="schedule-show-what">
|
||||
<?php echo $this->what ?>
|
||||
</div>
|
||||
<div id="schedule-show-who">
|
||||
<?php echo $this->who ?>
|
||||
</div>
|
||||
<div id="schedule-show-style">
|
||||
<?php echo $this->style ?>
|
||||
</div>
|
||||
</div>
|
|
@ -1,4 +0,0 @@
|
|||
<div>
|
||||
<span><?php echo $this->name ?></span>
|
||||
<span><?php echo $this->start_time ?></span>-<span><?php echo $this->end_time ?></span>
|
||||
</div>
|
|
@ -1,3 +1,33 @@
|
|||
<?php
|
||||
|
||||
echo $this->form;
|
||||
<div class=
|
||||
"ui-widget ui-widget-content block-shadow clearfix padded-strong user-management">
|
||||
<h2>
|
||||
Manage users
|
||||
</h2>
|
||||
<div class="user-list-wrapper">
|
||||
<div id="users_wrapper" class="dataTables_wrapper">
|
||||
|
||||
<div class="button-holder">
|
||||
<button type="button" id="add_user_button" name=
|
||||
"search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
|
||||
<span class="ui-button-text">Add user</span></button>
|
||||
</div>
|
||||
|
||||
<table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>id</th>
|
||||
<th>Name</th>
|
||||
<th>Role</th>
|
||||
<th>Delete</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="user-data simple-formblock" id="user_details">
|
||||
<fieldset class="padded">
|
||||
<?php echo $this->form ?>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
<br /><br /><center>View script for controller <b>User</b> and script/action name <b>getUserDataTableInfo</b></center>
|
3
application/views/scripts/user/get-user-data.phtml
Normal file
3
application/views/scripts/user/get-user-data.phtml
Normal file
|
@ -0,0 +1,3 @@
|
|||
<?php
|
||||
echo $this->entries;
|
||||
?>
|
3
application/views/scripts/user/remove-user.phtml
Normal file
3
application/views/scripts/user/remove-user.phtml
Normal file
|
@ -0,0 +1,3 @@
|
|||
<?php
|
||||
echo this->entries;
|
||||
?>
|
Loading…
Add table
Add a link
Reference in a new issue