diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index cc95e7fe3..71da9b665 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -368,6 +368,7 @@ class Application_Model_Preference $outputArray['STATION_COUNTRY'] = self::GetStationCountry(); $outputArray['STATION_CITY'] = self::GetStationCity(); $outputArray['STATION_DESCRIPTION'] = self::GetStationDescription(); + // get web server info if(isset($systemInfoArray["AIRTIME_VERSION_URL"])){ @@ -387,6 +388,8 @@ class Application_Model_Preference $outputArray['UNIQUE_ID'] = self::GetUniqueId(); $outputArray['SAAS'] = self::GetPlanLevel(); $outputArray['INSTALL_METHOD'] = self::GetInstallMethod(); + $outputArray['NUM_OF_STREAMS'] = self::GetNumOfStreams(); + $outputArray['STREAM_INFO'] = Application_Model_StreamSetting::getStreamInfoForDataCollection(); $outputArray = array_merge($systemInfoArray, $outputArray); @@ -396,7 +399,16 @@ class Application_Model_Preference continue; } if($out != ''){ - $outputString .= $key.' : '.$out."\n"; + if($key == "STREAM_INFO"){ + $outputString .= $key." :\n"; + foreach($out as $s_info){ + foreach($s_info as $k => $v){ + $outputString .= "\t".strtoupper($k)." : ".$v."\n"; + } + } + }else{ + $outputString .= $key.' : '.$out."\n"; + } } } if($returnArray){ diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php index f2731141e..1e4d77956 100644 --- a/airtime_mvc/application/models/StreamSetting.php +++ b/airtime_mvc/application/models/StreamSetting.php @@ -164,4 +164,31 @@ class Application_Model_StreamSetting { } return $result; } + + /* + * Only returns info that is needed for data collection + * returns array('s1'=>array(keyname=>value)) + */ + public static function getStreamInfoForDataCollection(){ + global $CC_DBC; + + $out = array(); + $enabled_stream = self::getEnabledStreamIds(); + + foreach($enabled_stream as $stream){ + $keys = "'".$stream."_output', "."'".$stream."_type', "."'".$stream."_bitrate', "."'".$stream."_host'"; + + $sql = "SELECT keyname, value FROM cc_stream_setting" + ." WHERE keyname IN ($keys)"; + + $rows = $CC_DBC->getAll($sql); + $info = array(); + foreach($rows as $r){ + $temp = explode("_", $r['keyname']); + $info[$temp[1]] = $r['value']; + $out[$stream] = $info; + } + } + return $out; + } } diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php index 6b3d8ecde..a230f31ad 100644 --- a/utils/phone_home_stat.php +++ b/utils/phone_home_stat.php @@ -36,6 +36,7 @@ require_once($CC_CONFIG['phpDir'].'/application/models/Schedule.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Show.php'); require_once($CC_CONFIG['phpDir'].'/application/models/ShowInstance.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php'); +require_once($CC_CONFIG['phpDir'].'/application/models/StreamSetting.php'); //Pear classes. set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());