diff options
| author | Simon Rettberg | 2018-02-09 12:12:31 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-02-09 12:12:31 +0100 |
| commit | d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4 (patch) | |
| tree | c1030efbdb837f53651272e015a3ab5562f145c8 /modules-available/dnbd3 | |
| parent | [systemstatus] lang-descriptions for permissions (diff) | |
| parent | [inc/User] Add locationid 0 to allowed locations in fallback mode (diff) | |
| download | slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.tar.gz slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.tar.xz slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'modules-available/dnbd3')
| -rw-r--r-- | modules-available/dnbd3/hooks/runmode/config.json | 4 | ||||
| -rw-r--r-- | modules-available/dnbd3/hooks/statistics/machine-replace.inc.php | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/modules-available/dnbd3/hooks/runmode/config.json b/modules-available/dnbd3/hooks/runmode/config.json index 095cb42f..a3f6d01f 100644 --- a/modules-available/dnbd3/hooks/runmode/config.json +++ b/modules-available/dnbd3/hooks/runmode/config.json @@ -2,5 +2,7 @@ "isClient": false, "configHook": "Dnbd3Util::runmodeConfigHook", "noSysconfig": true, - "systemdDefaultTarget": "dnbd3-proxy" + "systemdDefaultTarget": "dnbd3-proxy", + "allowGenericEditor": true, + "deleteUrlSnippet": "dummyparam=" }
\ No newline at end of file diff --git a/modules-available/dnbd3/hooks/statistics/machine-replace.inc.php b/modules-available/dnbd3/hooks/statistics/machine-replace.inc.php new file mode 100644 index 00000000..5e4c4e75 --- /dev/null +++ b/modules-available/dnbd3/hooks/statistics/machine-replace.inc.php @@ -0,0 +1,6 @@ +<?php + +foreach ($list as $entry) { + unset($entry['datelimit']); + Database::exec('UPDATE IGNORE dnbd3_server SET machineuuid = :new WHERE machineuuid = :old', $entry); +} |