summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-01-18 15:37:35 -0500
committerjim-p <jimp@pfsense.org>2011-01-18 15:38:04 -0500
commitba4f6e1df684ab22d280fef9d71aa3ffca9c988a (patch)
treed791891d3ff7d6622b890294790a6cd24755ccb0
parentfa09d1b83678658ac791438fddbf8efeeb4005ef (diff)
downloadpfsense-ba4f6e1df684ab22d280fef9d71aa3ffca9c988a.zip
pfsense-ba4f6e1df684ab22d280fef9d71aa3ffca9c988a.tar.gz
Better way to determine the username for config descrs
-rw-r--r--etc/inc/config.lib.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index 32f4f14..1e584f2 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -482,6 +482,8 @@ function write_config($desc="Unknown", $backup = true) {
if($g['booting'])
log_error("WARNING! Configuration written on bootup. This can cause stray openvpn and load balancing items in config.xml");
+ $username = empty($_SESSION["Username"]) ? "(system)" : $_SESSION['Username'];
+
if($backup)
backup_config();
@@ -495,8 +497,8 @@ function write_config($desc="Unknown", $backup = true) {
if ($desc == "Unknown")
$desc = "{$_SERVER['SCRIPT_NAME']} made unknown change";
- $config['revision']['description'] = "{$_SESSION['Username']}: " . $desc;
- $config['revision']['username'] = $_SESSION["Username"];
+ $config['revision']['description'] = "{$username}: " . $desc;
+ $config['revision']['username'] = $username;
conf_mount_rw();
$lockkey = lock('config', LOCK_EX);
OpenPOWER on IntegriCloud