diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/auth.inc | 2 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 15 |
3 files changed, 16 insertions, 3 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index ac1e4ec..0097e10 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -333,7 +333,7 @@ function local_user_set(& $user) { /* add or mod pw db */ $cmd = "/usr/sbin/pw {$user_op} -q -u {$user_uid} -n {$user_name}". " -g {$user_group} -s {$user_shell} -d {$user_home}". - " -c ".escapeshellarg($user['fullname'])." -H 0 2>&1"; + " -c ".escapeshellarg($user['descr'])." -H 0 2>&1"; if($debug) log_error("Running: {$cmd}"); diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index fcb9026..b11e17b 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -89,7 +89,7 @@ $g = array( "disablehelpmenu" => false, "disablehelpicon" => false, "debug" => false, - "latest_config" => "7.3", + "latest_config" => "7.4", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "105", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index f4f8bb6..71644fa 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -590,7 +590,7 @@ function upgrade_039_to_040() { $config['system']['user'] = array(); $config['system']['user'][0]['name'] = "{$config['system']['username']}"; - $config['system']['user'][0]['fullname'] = "System Administrator"; + $config['system']['user'][0]['descr'] = "System Administrator"; $config['system']['user'][0]['scope'] = "system"; $config['system']['user'][0]['groupname'] = "admins"; $config['system']['user'][0]['password'] = "{$config['system']['password']}"; @@ -2245,4 +2245,17 @@ function upgrade_072_to_073() { desc_to_descr($config['load_balancer']['lbprotocol']); desc_to_descr($config['load_balancer']['virtual_server']); } + +function upgrade_073_to_074() { + global $config; + + if (is_array($config['system']['user'])) { + foreach($config['system']['user'] as & $userent) { + if (!empty($userent['fullname'])) { + $userent['descr'] = $userent['fullname']; + unset($userent['fullname']); + } + } + } +} ?> |
