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 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
This commit is contained in:
James 2012-09-10 18:04:35 -04:00
commit 645593f954
16 changed files with 1762 additions and 766 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/ApiController.php
View file

@ -337,6 +337,7 @@ class ApiController extends Zend_Controller_Action
$this->_helper->viewRenderer->setNoRender(true);
$data = Application_Model_Schedule::getSchedule();
header("Content-Type: application/json");
echo json_encode($data, JSON_FORCE_OBJECT);
}
@ -701,9 +702,12 @@ class ApiController extends Zend_Controller_Action
{
$request = $this->getRequest();
$dir_id = $request->getParam('dir_id');
$all = $request->getParam('all');
Logging::info("All param is: $all");
$this->view->files =
Application_Model_StoredFile::listAllFiles($dir_id,$all=true);
Application_Model_StoredFile::listAllFiles($dir_id,$all);
}
public function listAllWatchedDirsAction()

6
airtime_mvc/application/models/Preference.php
View file

@ -31,12 +31,6 @@ class Application_Model_Preference
$result = Application_Common_Database::prepareAndExecute($sql, $paramMap, 'column');
if ($value == "") {
$value = "NULL";
} else {
$value = "$value";
}
$paramMap = array();
if ($result == 1) {
// result found

5
airtime_mvc/application/models/StoredFile.php
View file

@ -51,11 +51,6 @@ class Application_Model_StoredFile
"owner_id" => "DbOwnerId"
);
public function __construct()
{
}
public function getId()
{
return $this->_file->getDbId();

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

@ -268,7 +268,6 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
private static function getPlsUrl($url)
{
$content = self::getUrlData($url);
$ini = parse_ini_string($content, true);
if ($ini !== false && isset($ini["playlist"]) && isset($ini["playlist"]["File1"])) {