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

Merge branch 'saas-dev' into saas-speedy

Browse source
This commit is contained in:
Duncan Sommerville 2015-05-04 13:09:51 -04:00
commit 8b380086c3
32 changed files with 4981 additions and 1287 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1441,4 +1441,16 @@ class Application_Model_Preference
self::setDiskUsage($currentDiskUsage + $filesize);
}
public static function setProvisioningStatus($status)
{
//See constants.php for the list of valid values. eg. PROVISIONING_STATUS_ACTIVE
self::setValue("provisioning_status", $status);
}
public static function getProvisioningStatus()
{
return self::getValue("provisioning_status");
}
}

7
airtime_mvc/application/models/Schedule.php
View file

@ -64,13 +64,6 @@ SQL;
{
//Everything in this function must be done in UTC. You will get a swift kick in the pants if you mess that up.
if (!is_int($p_prev) || !is_int($p_next)) {
//must enter integers to specify ranges
Logging::info("Invalid range parameters: $p_prev or $p_next");
return array();
}
// when timeEnd is unspecified, return to the default behaviour - set a range of 48 hours from current time
if (!$utcTimeEnd) {
$end = new DateTime();