From f2bf92297a5ab6933e7067c9e77fb0cfd04dc38f Mon Sep 17 00:00:00 2001
From: James <james@james-HP-Pavilion-g6-Notebook-PC>
Date: Sun, 23 Oct 2011 06:29:06 -0400
Subject: [PATCH] CC-2745: Show status of liquidsoap/icecast connection on
 Stream Settings page

- fixed a case where it was displaying "OK" when liquidsoap was not running
---
 airtime_mvc/application/controllers/ApiController.php        | 2 +-
 airtime_mvc/application/controllers/PreferenceController.php | 2 +-
 airtime_mvc/application/models/StreamSetting.php             | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index b25ba74fb..6dee2c194 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -732,7 +732,7 @@ class ApiController extends Zend_Controller_Action
         
         $stream_id = $request->getParam('stream_id');
         // setting error_msg as "" when there is no error_msg
-        Application_Model_StreamSetting::setLiquidsoapError($stream_id, "");
+        Application_Model_StreamSetting::setLiquidsoapError($stream_id, "OK");
     }
     
     /**
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index ece06790e..414f3dae2 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -292,7 +292,7 @@ class PreferenceController extends Zend_Controller_Action
         $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         for($i=1; $i<=$num_of_stream; $i++){
             $status = Application_Model_StreamSetting::getLiquidsoapError($i);
-            $status = $status == ''?"OK":$status;
+            $status = $status == NULL?"Problem with Liquidsoap...":$status;
             if(!Application_Model_StreamSetting::getStreamEnabled($i)){
                 $status = "N/A";
             }
diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index aeedeb0c7..5675de6c2 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -108,10 +108,11 @@ class Application_Model_StreamSetting {
     public static function getStreamEnabled($stream_id){
         global $CC_DBC;
         
-        $keyname = "s".$stream_id."_ouput";
+        $keyname = "s".$stream_id."_output";
         $sql = "SELECT value FROM cc_stream_setting"
         ." WHERE keyname = '$keyname'";
         $result = $CC_DBC->GetOne($sql);
+        
         if($result == 'disabled'){
             $result = false;
         }else{