beenull/mailcow-fossbilling
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix request mode

Browse source
This commit is contained in:
Guillaume ARNOUX 2024-01-22 16:27:51 +01:00
parent e06b571e7d
commit 18e455fece
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Mailcow.php
View file

@ -77,7 +77,7 @@ class Server_Manager_Mailcow extends Server_Manager
// Server headers // Server headers
$headers['X-API-Key'] = $this->_config['accesshash']; $headers['X-API-Key'] = $this->_config['accesshash'];
$headers['Content-Type'] = 'application/json'; $headers['Content-Type'] = "application/json";
// Send POST query // Send POST query
$client = $this->getHttpClient()->withOptions([ $client = $this->getHttpClient()->withOptions([
@ -87,14 +87,14 @@ class Server_Manager_Mailcow extends Server_Manager
]); ]);
$response = $client->request($type, $host . $path, [ $response = $client->request($type, $host . $path, [
'headers' => $headers, 'headers' => $headers,
...$params ...$params
]); ]);
$result = $response->getContent(); $result = $response->getContent();
if (str_contains($result, 'authentication failed')) { if (str_contains($result, 'authentication failed')) {
throw new Server_Exception('Failed to connect to the :type: server. Please verify your credentials and configuration', [':type:' => 'Mailcow']); throw new Server_Exception('Failed to connect to the :type: server. Please verify your credentials and configuration', [':type:' => 'Mailcow']);
} elseif (str_contains($result, 'error')) { } elseif (str_contains($result, 'error')) {
error_log("Mailcow returned error $result for the " . $path . ' command');] error_log("Mailcow returned error $result for the " . $path . ' command');
} }
return $result; return $result;
@ -156,6 +156,7 @@ class Server_Manager_Mailcow extends Server_Manager
"active" => "1", "active" => "1",
"aliases" => $p->getMaxSubdomains(), "aliases" => $p->getMaxSubdomains(),
"backupmx" => "0", "backupmx" => "0",
"gal" => true,
"defquota" => $p->getQuota(), "defquota" => $p->getQuota(),
"description" => $a->getDomain() . " domain", "description" => $a->getDomain() . " domain",
"domain" => $a->getDomain(), "domain" => $a->getDomain(),
@ -182,17 +183,17 @@ class Server_Manager_Mailcow extends Server_Manager
] ]
]; ];
$result2 = $this->_makeRequest('POST', 'add/domain-admin', $domainAdminData); $result2 = $this->_makeRequest('POST', 'add/domain-admin', $domainAdminData);
if (! str_contains($result2, 'success')) {
$placeholders = [':action:' => __trans('create domain'), ':type:' => 'Mailcow'];
throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders);
}
} else { } else {
$placeholders = [':action:' => __trans('create user'), ':type:' => 'Mailcow']; $placeholders = [':action:' => __trans('create user'), ':type:' => 'Mailcow'];
throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders); throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders);
} }
if (! str_contains($result2, 'success')) {
$placeholders = [':action:' => __trans('create domain'), ':type:' => 'Mailcow'];
throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders);
}
return true; return true;
} }
@ -245,11 +246,9 @@ class Server_Manager_Mailcow extends Server_Manager
*/ */
public function cancelAccount(Server_Account $a) public function cancelAccount(Server_Account $a)
{ {
$p = $a->getPackage();
$client = $a->getClient();
// Prepare POST query // Prepare POST query
$domainData = [ $domainData = [
'body' => [ 'json' => [
$a->getDomain(), $a->getDomain(),
] ]
]; ];
@ -258,23 +257,23 @@ class Server_Manager_Mailcow extends Server_Manager
if (str_contains($result1, 'success')) { if (str_contains($result1, 'success')) {
// Delete Domain Admin in mailcow // Delete Domain Admin in mailcow
$domainAdminData = [ $domainAdminData = [
'body' => [ 'json' => [
"adm_" . str_replace(".", "", $a->getDomain()), "adm_" . str_replace(".", "", $a->getDomain()),
] ]
]; ];
$result2 = $this->_makeRequest('POST', 'delete/domain-admin', $domainAdminData); $result2 = $this->_makeRequest('POST', 'delete/domain-admin', $domainAdminData);
} else { if (! str_contains($result2, 'success')) {
$placeholders = [':action:' => __trans('delete domain'), ':type:' => 'Mailcow'];
throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders);
} } else {
$placeholders = [':action:' => __trans('delete user'), ':type:' => 'Mailcow']; $placeholders = [':action:' => __trans('delete user'), ':type:' => 'Mailcow'];
throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders); throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders);
} }
if (! str_contains($result2, 'success')) { return true;
$placeholders = [':action:' => __trans('delete domain'), ':type:' => 'Mailcow'];
throw new Server_Exception('Failed to :action: on the :type: server, check the error logs for further details', $placeholders);
}
return true;
} }
/** /**