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

Merge branch 'saas-623' into saas 

Conflicts:
	airtime_mvc/application/common/Billing.php
This commit is contained in:
Albert Santoni 2015-03-05 18:23:09 -05:00
parent df48de607b 8cdecff022
commit e9adf1a7ed
1 changed files with 5 additions and 2 deletions
airtime_mvc/application/common
Billing.php

7
airtime_mvc/application/common/Billing.php
View File

@ -18,8 +18,11 @@ class Billing
return $currentProduct["id"]; return $currentProduct["id"];
//XXX: Major hack attack. Since this function gets called often, rather than querying WHMCS //XXX: Major hack attack. Since this function gets called often, rather than querying WHMCS
// we're just going to extract it from airtime.conf since it's the same as the rabbitmq username. // we're just going to extract it from airtime.conf since it's the same as the rabbitmq username.
//$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
//$instanceId = $CC_CONFIG['rabbitmq']['username']; $instanceId = $CC_CONFIG['rabbitmq']['user'];
if (!is_numeric($instanceId)) {
throw new Exception("Invalid instance id in " . __FUNCTION__ . ": " . $instanceId);
}
return $instanceId; return $instanceId;
} }