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

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

Browse source
This commit is contained in:
Martin Konecny 2012-09-14 16:51:48 -04:00
commit 39903be69a
9 changed files with 64 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

33
airtime_mvc/application/models/User.php
View file

@ -70,36 +70,15 @@ class Application_Model_User
return $result;
}
// TODO : refactor code to only accept arrays for isUserType and
// simplify code even further
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)

8
airtime_mvc/application/models/Webstream.php
View file

@ -78,11 +78,11 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
$username = $subjs->getDbLogin();
return array(
"name" => $this->webstream->getDbName(),
"length" => $this->webstream->getDbLength(),
"name" => $this->webstream->getDbName(),
"length" => $this->webstream->getDbLength(),
"description" => $this->webstream->getDbDescription(),
"login"=> $username,
"url" => $this->webstream->getDbUrl(),
"login" => $username,
"url" => $this->webstream->getDbUrl(),
);
}