From 7fcb1be0ded44498b3f8cf4cc6369edf0d27dfa4 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 13 Mar 2015 17:34:40 +0000
Subject: [PATCH] move get_config_user function content into main function
 (single useage)

---
 src/etc/inc/config.lib.inc | 56 ++++++++++----------------------------
 1 file changed, 14 insertions(+), 42 deletions(-)

diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc
index 6435e25e4..b33fe9d02 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -337,32 +337,6 @@ function security_checks_disabled()
 	return file_exists('/tmp/disable_security_checks');
 }
 
-function config_validate($conffile) {
-
-	global $g, $xmlerr;
-
-	$xml_parser = xml_parser_create();
-
-	if (!($fp = fopen($conffile, "r"))) {
-		$xmlerr = gettext("XML error: unable to open file");
-		return false;
-	}
-
-	while ($data = fread($fp, 4096)) {
-		if (!xml_parse($xml_parser, $data, feof($fp))) {
-			$xmlerr = sprintf(gettext('%1$s at line %2$d'),
-						xml_error_string(xml_get_error_code($xml_parser)),
-						xml_get_current_line_number($xml_parser));
-			return false;
-		}
-	}
-	xml_parser_free($xml_parser);
-
-	fclose($fp);
-
-	return true;
-}
-
 /**
  * remove old backups
  */
@@ -401,25 +375,23 @@ function set_device_perms() {
 	}
 }
 
-function get_config_user() {
-	if (empty($_SESSION["Username"])) {
-		$username = getenv("USER");
-		if (empty($conuser) || $conuser == "root")
-			$username = "(system)";
-	} else
-		$username = $_SESSION["Username"];
-
-	if (!empty($_SERVER['REMOTE_ADDR']))
-		$username .= '@' . $_SERVER['REMOTE_ADDR'];
-
-	return $username;
-}
 
 function make_config_revision_entry($desc = null, $override_user = null) {
-	if (empty($override_user))
-		$username = get_config_user();
-	else
+	if (empty($override_user)) {
+		if (empty($_SESSION["Username"])) {
+			$username = getenv("USER");
+			if (empty($conuser) || $conuser == "root")
+				$username = "(system)";
+		} else {
+			$username = $_SESSION["Username"];
+		}
+		if (!empty($_SERVER['REMOTE_ADDR'])) {
+			$username .= '@' . $_SERVER['REMOTE_ADDR'];
+		}
+	}
+	else {
 		$username = $override_user;
+	}
 
 	$revision = array();