maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

do not rely on fixed order of import-file for domains-import; first line now has to be the names of the api-parameters used for Domains.add, see https://api.froxlor.org/doc/0.10.0/#v-Domains, fixes #544

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-02 20:06:53 +01:00
parent 1ca1314ac4
commit 2da59f1055
3 changed files with 324 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
admin_domains.php
View File

@@ -658,15 +658,16 @@ if ($page == 'domains' || $page == 'overview') {
standard_error('domain_import_error', $e->getMessage());
}
// @FIXME find a way to display $result['notice'] here somehow,
// as it might be important if you've reached your maximum allocation of domains
if (!empty($bulk->getErrors())) {
dynamic_error(implode("<br>", $bulk->getErrors()));
}
// update customer/admin counters
updateCounters(false);
inserttask('1');
inserttask('4');
$result_str = $result['imported'] . ' / ' . $result['all'];
$result_str = $result['imported'] . ' / ' . $result['all'] . (!empty($result['note']) ? ' ('.$result['note'].')' : '');
standard_success('domain_import_successfully', $result_str, array(
'filename' => $filename,
'action' => '',