Skip to content

Commit 4a74098

Browse files
committed
Updates for 2.4.8.0
This includes needed changes to adjust the post create actions to match the latest release of AMP that is upcoming. This also consolidates the "everytime" checkbox into the enum options.
1 parent 8938622 commit 4a74098

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

modules/servers/AMP/AMP.php

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,13 @@ function ($table) {
177177
'Options' =>
178178
[
179179
0 => 'Do nothing',
180-
1 => 'Start instance only',
181-
2 => 'Start instance & update application',
182-
3 => 'Full instance & application startup',
180+
1 => 'Update Once',
181+
2 => 'Update Always',
182+
3 => 'Update and Start Once',
183+
4 => 'Update and Start Always',
184+
5 => 'Start Always',
183185
],
184-
'Description' => '<br><br>Choose what happens after AMP has created the instance'.$script,
186+
'Description' => '<br><br>Choose what the application does inside the instance AMP creates'.$script,
185187
),
186188
'Required Tags' => array(
187189
'Type' => 'text',
@@ -194,10 +196,6 @@ function ($table) {
194196
'Size' => '25',
195197
'Default' => '',
196198
'Description' => $scriptExtraProvisionSettings.'<br>',
197-
),
198-
'Update Every Time' => array(
199-
'Type' => 'yesno',
200-
'Description' => 'Tick this box to update the application every time the instance starts in the future',
201199
),
202200
"Mode" => array(
203201
'Type' => 'dropdown',
@@ -279,10 +277,7 @@ function AMP_CreateAccount(array $params)
279277
$client = new Client($params);
280278
$provisioningTemplateId = $params['configoption1'];
281279
$postCreate = !empty($params['configoption2']) ? $params['configoption2'] : 0;
282-
// Check if the 'Every Time' box is ticked and if so, add 16 to the PostCreate value
283-
if (!empty($params['configoption5'])) {
284-
$postCreate += 16;
285-
}
280+
286281
$templates = $client->call('ADSModule/GetDeploymentTemplates');
287282

288283
$options = [];
@@ -567,7 +562,7 @@ function AMP_ClientArea(array $params)
567562
die;
568563
}
569564

570-
$vars['mode'] = isset($params['configoption6']) ? $params['configoption6'] : 'Standalone URL';
565+
$vars['mode'] = isset($params['configoption5']) ? $params['configoption5'] : 'Standalone URL';
571566

572567

573568
if(!empty($service->instanceId))

modules/servers/AMP/lib/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Client
1010
public $version;
1111
public function __construct(array $params)
1212
{
13-
$this->version = '2.0.6.0';
13+
$this->version = '2.4.8.0';
1414
$this->params = new \stdClass;
1515
$endpoint = (!empty($params['serverhostname']) ? $params['serverhostname'] : $params['serverip']);
1616
$this->params->serverId = $params['serverid'];

0 commit comments

Comments
 (0)