Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x

This commit is contained in:
drigato 2015-05-11 12:16:55 -04:00
parent 28997344fc efad7be91a
commit 56e5e959ec
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
airtime_mvc/application/models/Webstream.php
View File

@ -93,6 +93,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
$isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
if (!$isAdminOrPM) {
//Make sure the user has ownership of ALL the selected webstreams before
$leftOver = self::streamsNotOwnedByUser($p_ids, $p_userId);
if (count($leftOver) == 0) {
CcWebstreamQuery::create()->findPKs($p_ids)->delete();
@ -280,13 +281,22 @@ 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"])) {
return $ini["playlist"]["File1"];
$matches = array();
$numStreams = 0; //Number of streams explicitly listed in the PLS.
if (preg_match("/NumberOfEntries=([0-9]*)/", $content, $matches) !== FALSE) {
$numStreams = $matches[1];
}
throw new Exception(_("Could not parse PLS playlist"));
//Find all the stream URLs in the playlist
if (preg_match_all("/File[0-9]*=(.*)/", $content, $matches) !== FALSE) {
//This array contains all the streams! If we need fallback stream URLs in the future,
//they're already in this array...
return $matches[1][0];
} else {
throw new Exception(_("Could not parse PLS playlist"));
}
}
private static function getM3uUrl($url)