Resolve conflicts and create a converter for old values to the new ones. Also let the user know they should be changing their configuration

This commit is contained in:
Mark Schouten 2015-10-26 10:11:57 +01:00
commit a2aba25712
4 changed files with 41 additions and 52 deletions

View file

@ -50,9 +50,9 @@ $templates[] = array(
$defaults['soa_edit'] = 'INCEPTION-INCREMENT';
$defaults['soa_edit_api'] = 'INCEPTION-INCREMENT';
$defaults['defaulttype'] = 'Master'; # Choose between 'Native' or 'Master'
$defaults['primaryns'] = 'unconfigured.primaryns'; # The value of the first NS-record
$defaults['secondaryns'] = 'unconfigured.secondaryns'; # The value of the second NS-record
$defaults['ttl'] = 3600; # Default TTL for records
$defaults['ns'][0] = 'unconfigured.primaryns'; # The value of the first NS-record
$defaults['ns'][1] = 'unconfigured.secondaryns'; # The value of the second NS-record
$defaults['ttl'] = 3600; # Default TTL for records
## UI Options
$menutype = 'horizontal'; # horizontal|vertical - use a horizontal or vertical menu

View file

@ -31,6 +31,14 @@ if (!isset($authdb)) {
$blocklogin = TRUE;
}
if (isset($defaults['primaryns'])) {
$errormsg = "You should reconfigure your \$defaults['primaryns'] settings to use <code>\$defaults['ns'][0]</code>. We converted if for you now.";
$defaults['ns'][] = $defaults['primaryns'];
if (isset($defaults['secondaryns'])) {
$defaults['ns'][] = $defaults['secondaryns'];
}
}
/* No need to change stuf below */
if (function_exists('curl_init') === FALSE) {