Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-4431: Fixed isUserType

This commit is contained in:
Rudi Grinberg 2012-09-14 16:47:55 -04:00
parent b61abe2474
commit bf651a96aa
2 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
airtime_mvc/application/controllers/WebstreamController.php
View File

@ -17,8 +17,9 @@ class WebstreamController extends Zend_Controller_Action
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
if (!$this->isAuthorized(-1)) {
// TODO: this header call does not actually print any error message
header("Status: 401 Not Authorized");
Logging::info("Ain't not Authorized");
return;
}
@ -94,30 +95,35 @@ class WebstreamController extends Zend_Controller_Action
}
/*TODO : make a user object be passed a parameter into this function so
that it does not have to be fetched multiple times.*/
public function isAuthorized($webstream_id)
{
$hasPermission = false;
$user = Application_Model_User::getCurrentUser();
if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
$hasPermission = true;
return true;
}
if (!$hasPermission && $user->isHost()) {
if ($user->isHost()) {
// not creating a webstream
if ($webstream_id != -1) {
$webstream = CcWebstreamQuery::create()->findPK($webstream_id);
//we are updating a playlist. Ensure that if the user is a host/dj, that he has the correct permission.
/*we are updating a playlist. Ensure that if the user is a
host/dj, that he has the correct permission.*/
$user = Application_Model_User::getCurrentUser();
if ($webstream->getDbCreatorId() == $user->getId()) {
$hasPermission = true;
}
} else {
//we are creating a new stream. Don't need to check whether the DJ/Host owns the stream
$hasPermission = true;
//only allow when webstream belongs to the DJ
Logging::info("Webstream id:".$webstream->getDbCreatorId());
Logging::info("User id:".$user->getId());
return $webstream->getDbCreatorId() == $user->getId();
}
/*we are creating a new stream. Don't need to check whether the
DJ/Host owns the stream*/
return true;
} else {
Logging::info( $user );
}
return $hasPermission;
Logging::info("what the fuck");
return false;
}
public function saveAction()

31
airtime_mvc/application/models/User.php
View File

@ -72,34 +72,11 @@ class Application_Model_User
public function isUserType($type)
{
if (is_array($type)) {
$result = false;
foreach ($type as $t) {
switch ($t) {
case UTYPE_ADMIN:
$result = $this->_userInstance->getDbType() === 'A';
break;
case UTYPE_HOST:
$result = $this->_userInstance->getDbType() === 'H';
break;
case UTYPE_PROGRAM_MANAGER:
$result = $this->_userInstance->getDbType() === 'P';
break;
}
if ($result) {
return $result;
}
}
} else {
switch ($type) {
case UTYPE_ADMIN:
return $this->_userInstance->getDbType() === 'A';
case UTYPE_HOST:
return $this->_userInstance->getDbId() === 'H';
case UTYPE_PROGRAM_MANAGER:
return $this->_userInstance->getDbType() === 'P';
}
if (!is_array($type)) {
$type = array($type);
}
$real_type = $this->_userInstance->getDbType();
return in_array($real_type, $type);
}
public function setLogin($login)