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

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

This commit is contained in:
James 2012-03-26 17:21:30 -04:00
parent d7819b6dd2 3308cbb7de
commit 191d0f0e4d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/configs/navigation.php
View File

@ -30,7 +30,7 @@ $pages = array(
'resource' => 'library'
),
array(
'label' => 'Calendar',
'label' => 'Calendar',
'module' => 'default',
'controller' => 'Schedule',
'action' => 'index',

7
utils/airtime-check-system.php
View File

@ -13,9 +13,10 @@ if (substr($sapi_type, 0, 3) == 'cli') {
$airtimeIni = AirtimeCheck::GetAirtimeConf();
$apiKey = $airtimeIni['general']['api_key'];
$baseUrl = $airtimeIni['general']['base_url'];
$base_port = $airtimeIni['general']['base_port'];
$status = AirtimeCheck::GetStatus($baseUrl, $apiKey);
$status = AirtimeCheck::GetStatus($baseUrl, $base_port, $apiKey);
AirtimeCheck::PrintStatus($baseUrl, $status);
}
@ -99,9 +100,9 @@ class AirtimeCheck {
return $headerInfo['Server'][0];
}
public static function GetStatus($p_baseUrl, $p_apiKey){
public static function GetStatus($p_baseUrl, $p_basePort, $p_apiKey){
$url = "http://$p_baseUrl/api/status/format/json/api_key/%%api_key%%";
$url = "http://$p_baseUrl:$p_basePort/api/status/format/json/api_key/%%api_key%%";
self::output_status("AIRTIME_STATUS_URL", $url);
$url = str_replace("%%api_key%%", $p_apiKey, $url);