From ccfa954f0e7088ab407af7e432e7ba5761ce0550 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 26 Mar 2012 15:43:29 -0400
Subject: [PATCH 1/2] CC-3174: Show Content Builder

-fixed indentation
---
 airtime_mvc/application/configs/navigation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index ef1ff8d66..d9a43686f 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -30,7 +30,7 @@ $pages = array(
 		'resource'	=>	'library'
 	),
 	array(
-		'label'      => 'Calendar',
+        'label'      => 'Calendar',
         'module'     => 'default',
         'controller' => 'Schedule',
         'action'     => 'index',

From 45e57ee3304a8abbc5612baad21479393b9317bc Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 26 Mar 2012 16:18:35 -0400
Subject: [PATCH 2/2] CC-3402: airtime-check-system is hardcoded to port 80

-fixed
---
 utils/airtime-check-system.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/utils/airtime-check-system.php b/utils/airtime-check-system.php
index 4f7237fc0..25ec6c4a4 100644
--- a/utils/airtime-check-system.php
+++ b/utils/airtime-check-system.php
@@ -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);