From 9ff73b79e46be2022c861ef332f22b73d6dbe973 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 19 Oct 2010 12:51:12 -0400
Subject: Convert fullname field on users to descr, so it gains CDATA
 protection.

---
 etc/inc/upgrade_config.inc | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'etc/inc/upgrade_config.inc')

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']);
+			}
+		}
+	}
+}
 ?>
-- 
cgit v1.1