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

added unit-tests for version-check; implemented settings import/export in API; minor variable declarations

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-11-25 11:17:56 +01:00
parent f6e0298d25
commit c269cd5c5c
9 changed files with 146 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin_settings.php
View File

@@ -300,7 +300,8 @@ elseif ($page == 'importexport' && $userinfo['change_serversettings'] == '1')
if (isset($_GET['action']) && $_GET['action'] == "export") {
// export
try {
$json_export = SImExporter::export();
$json_result = Froxlor::getLocal($userinfo)->exportSettings();
$json_export = json_decode($json_result, true)['data'];
} catch(Exception $e) {
dynamic_error($e->getMessage());
}
@@ -315,16 +316,10 @@ elseif ($page == 'importexport' && $userinfo['change_serversettings'] == '1')
if (isset($_FILES["import_file"]["tmp_name"])) {
$imp_content = file_get_contents($_FILES["import_file"]["tmp_name"]);
try {
SImExporter::import($imp_content);
Froxlor::getLocal($userinfo, array('json_str' => $imp_content))->importSettings();
} catch(Exception $e) {
dynamic_error($e->getMessage());
}
inserttask('1');
inserttask('10');
// Using nameserver, insert a task which rebuilds the server config
inserttask('4');
// cron.d file
inserttask('99');
standard_success('settingsimported', '', array('filename' => 'admin_settings.php'));
}
dynamic_error("Upload failed");