Merge branch 'saas-dev' into saas
Conflicts: airtime_mvc/application/common/FileDataHelper.php
This commit is contained in:
commit
75914b791c
40 changed files with 615 additions and 603 deletions
|
@ -11,6 +11,7 @@ class ProvisioningHelper
|
|||
private $dbuser, $dbpass, $dbname, $dbhost, $dbowner, $apikey;
|
||||
private $instanceId;
|
||||
private $stationName, $description;
|
||||
private $defaultIcecastPassword;
|
||||
|
||||
public function __construct($apikey)
|
||||
{
|
||||
|
@ -122,6 +123,9 @@ class ProvisioningHelper
|
|||
if (isset($_POST['description'])) {
|
||||
$this->description = $_POST['description'];
|
||||
}
|
||||
if (isset($_POST['icecast_pass'])) {
|
||||
$this->defaultIcecastPassword = $_POST['icecast_pass'];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -212,6 +216,9 @@ class ProvisioningHelper
|
|||
if ($this->description) {
|
||||
Application_Model_Preference::SetStationDescription($this->description);
|
||||
}
|
||||
if (isset($this->defaultIcecastPassword)) {
|
||||
Application_Model_Preference::setDefaultIcecastPassword($this->defaultIcecastPassword);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue