Skip to content

Commit 4b13099

Browse files
committed
Need to account for 'messageid' when sending email
1 parent 8426dbb commit 4b13099

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

modules/servers/AMP/hooks.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
use WHMCS\Database\Capsule;
44

55
add_hook('EmailPreSend', 1, function($vars) {
6-
if($vars['service_id'])
6+
if($vars['messageid'] == 'AMP Welcome Email' && $vars['relid'])
77
{
8-
$service = Capsule::table('ampServices')->where('serviceId', $vars['service_id'])->first();
9-
$serverId = Capsule::table('tblhosting')->where('id', $vars['service_id'])->value('server');
10-
8+
$relid = $vars['relid'];
9+
10+
$service = Capsule::table('ampServices')->where('serviceId', $relid)->first();
11+
$serverId = Capsule::table('tblhosting')->where('id', $relid)->value('server');
1112
$server = Capsule::table('tblservers')->where('id', $serverId)->first();
1213

13-
$endpoint = (!empty( $server->hostname) ? $server->hostname: $server->ipaddress);
14+
$endpoint = (!empty($server->hostname) ? $server->hostname: $server->ipaddress);
1415
$endpoint = (!empty($server->secure) ? 'https://' : 'http://' ). $endpoint ;
1516

1617
$endpoint = $endpoint . ((!empty($server->port) && $server->secure != true ) ? ':'.$params['serverport'] : '');
1718

1819
$merge_fields = [];
19-
$merge_fields['ampEndpoints'] = json_decode($service->endpoints, 1);
20-
20+
$merge_fields['ampEndpoints'] = json_decode($service->endpoints, 1);
2121
$merge_fields['ampApplicationUrl'] = $endpoint . '/?instance='. $service->instanceId;
22+
$merge_fields['ampInstanceId'] = $service->instanceId;
2223

2324
return $merge_fields;
2425
}
@@ -149,7 +150,7 @@ function tableToJson(table) {
149150
var tableRow = table.rows[i];
150151
var rowData = [];
151152
for (var j=0; j<tableRow.cells.length - 1; j++) {
152-
rowData.push(tableRow.cells[j].innerHTML);;
153+
rowData.push(tableRow.cells[j].innerHTML);
153154
}
154155
data.push(rowData);
155156
}

0 commit comments

Comments
 (0)