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

- fixed bug where Description was not sent 

- changed order of display on info box in popup
This commit is contained in:
james 2011-06-21 12:23:43 -04:00
parent 70b1b73d20
commit 66b777aedb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/models/Preference.php
View File

@ -311,7 +311,7 @@ class Application_Model_Preference
$outputArray['STATION_WEB_SITE'] = Application_Model_Preference::GetStationWebSite(); $outputArray['STATION_WEB_SITE'] = Application_Model_Preference::GetStationWebSite();
$outputArray['STATION_COUNTRY'] = Application_Model_Preference::GetStationCountry(); $outputArray['STATION_COUNTRY'] = Application_Model_Preference::GetStationCountry();
$outputArray['STATION_CITY'] = Application_Model_Preference::GetStationCity(); $outputArray['STATION_CITY'] = Application_Model_Preference::GetStationCity();
$outputArrat['STATION_DESCRIPTION'] = Application_Model_Preference::GetStationDescription(); $outputArray['STATION_DESCRIPTION'] = Application_Model_Preference::GetStationDescription();
// get web server info // get web server info
$url = $systemInfoArray["AIRTIME_VERSION_URL"]; $url = $systemInfoArray["AIRTIME_VERSION_URL"];
@ -328,12 +328,14 @@ class Application_Model_Preference
$outputArray['NUM_OF_PAST_SHOWS'] = ShowInstance::GetShowInstanceCount(date("Y-m-d H:i:s")); $outputArray['NUM_OF_PAST_SHOWS'] = ShowInstance::GetShowInstanceCount(date("Y-m-d H:i:s"));
$outputArray['UNIQUE_ID'] = Application_Model_Preference::GetUniqueId(); $outputArray['UNIQUE_ID'] = Application_Model_Preference::GetUniqueId();
$outputArray = array_merge($outputArray, $systemInfoArray); $outputArray = array_merge($systemInfoArray, $outputArray);
$outputString = "\n"; $outputString = "\n";
foreach($outputArray as $key => $out){ foreach($outputArray as $key => $out){
if(!empty($out)){
$outputString .= $key.' : '.$out."\n"; $outputString .= $key.' : '.$out."\n";
} }
}
if($returnArray){ if($returnArray){
$outputArray['LOGOIMG'] = Application_Model_Preference::GetStationLogo(); $outputArray['LOGOIMG'] = Application_Model_Preference::GetStationLogo();
return $outputArray; return $outputArray;