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

SAAS-52: New auto-feedback metrics: 1) Debian or manual install,

Browse source 
2) SaaS or Non-SaaS

- done
This commit is contained in:
James 2011-11-09 13:13:21 -05:00
parent b2ce0d396a
commit 6c740effde
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
airtime_mvc/application/models/Preference.php
View file

@ -369,11 +369,16 @@ class Application_Model_Preference
$outputArray['NUM_OF_SCHEDULED_PLAYLISTS'] = Application_Model_Schedule::getSchduledPlaylistCount(); $outputArray['NUM_OF_SCHEDULED_PLAYLISTS'] = Application_Model_Schedule::getSchduledPlaylistCount();
$outputArray['NUM_OF_PAST_SHOWS'] = Application_Model_ShowInstance::GetShowInstanceCount(date("Y-m-d H:i:s")); $outputArray['NUM_OF_PAST_SHOWS'] = Application_Model_ShowInstance::GetShowInstanceCount(date("Y-m-d H:i:s"));
$outputArray['UNIQUE_ID'] = self::GetUniqueId(); $outputArray['UNIQUE_ID'] = self::GetUniqueId();
$outputArray['SAAS'] = self::GetPlanLevel();
$outputArray['INSTALL_METHOD'] = self::GetInstallMethod();
$outputArray = array_merge($systemInfoArray, $outputArray); $outputArray = array_merge($systemInfoArray, $outputArray);
$outputString = "\n"; $outputString = "\n";
foreach($outputArray as $key => $out){ foreach($outputArray as $key => $out){
if($key == 'SAAS' && ($out != '' || $out != 'disabled')){
continue;
}
if($out != ''){ if($out != ''){
$outputString .= $key.' : '.$out."\n"; $outputString .= $key.' : '.$out."\n";
} }
@ -387,6 +392,20 @@ class Application_Model_Preference
} }
} }
public static function GetInstallMethod(){
$easy_install = file_exists('/usr/bin/airtime-easy-install');
$debian_install = file_exists('/var/lib/dpkg/info/airtime.config');
if($debian_install){
if($easy_install){
return "easy_install";
}else{
return "debian_install";
}
}else{
return "manual_install";
}
}
public static function SetRemindMeDate($now){ public static function SetRemindMeDate($now){
$weekAfter = mktime(0, 0, 0, date("m") , date("d")+7, date("Y")); $weekAfter = mktime(0, 0, 0, date("m") , date("d")+7, date("Y"));
self::SetValue("remindme", $weekAfter); self::SetValue("remindme", $weekAfter);
@ -446,7 +465,11 @@ class Application_Model_Preference
} }
public static function GetPlanLevel(){ public static function GetPlanLevel(){
return self::GetValue("plan_level"); $plan = self::GetValue("plan_level");
if(trim($plan) == ''){
$plan = 'disabled';
}
return $plan;
} }
public static function SetTrialEndingDate($date){ public static function SetTrialEndingDate($date){