Skip to content

Commit

Permalink
Convert mythweb's backend handling to use new URLs from API
Browse files Browse the repository at this point in the history
  • Loading branch information
Beirdo committed Mar 10, 2011
1 parent 859357c commit 1be0b63
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions modules/status/handler.php
Expand Up @@ -22,15 +22,15 @@

// Load the status page
if (function_exists('curl_exec')) {
$ch = curl_init("http://$masterhost:$statusport$xml_param");
$ch = curl_init("http://$masterhost:$statusport/Status$xml_param");
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, 5);
$status = curl_exec($ch);
curl_close($ch);
} else if (function_exists('file_get_contents'))
$status = file_get_contents("http://$masterhost:$statusport$xml_param");
$status = file_get_contents("http://$masterhost:$statusport/Status$xml_param");
else
$status = implode("\n", file("http://$masterhost:$statusport$xml_param"));
$status = implode("\n", file("http://$masterhost:$statusport/Status$xml_param"));

// Extract the page title
preg_match('#<title>(.+?)</title>#s', $status, $title);
Expand Down
2 changes: 1 addition & 1 deletion modules/tv/classes/Channel.php
Expand Up @@ -121,7 +121,7 @@ function __construct($chanid) {
// Otherwise, grab it from the backend
else {
// Make the request and store the result
$data = MythBackend::find()->httpRequest('GetChannelIcon', array('ChanID' => $this->chanid));
$data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanID' => $this->chanid));
if ($data)
file_put_contents($this->icon, $data);
unset($data);
Expand Down
2 changes: 1 addition & 1 deletion modules/tv/classes/Program.php
Expand Up @@ -481,7 +481,7 @@ public function thumb_url($width=160, $height=120, $secs_in=-1) {
/**/
public static function get_preview_pixmap($hostname, $chanid, $starttime, $width=160, $height=120, $secs_in=null) {

return MythBackend::find($hostname)->httpRequest('GetPreviewImage', array('ChanId' => $chanid,
return MythBackend::find($hostname)->httpRequest('Content/GetPreviewImage', array('ChanId' => $chanid,
'StartTime' => unix2mythtime($starttime),
'Height' => $height,
'Width' => $width));
Expand Down

0 comments on commit 1be0b63

Please sign in to comment.