lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 09:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

move get_config_user function content into main function (single useage)

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-13 17:34:40 +00:00
parent b068f75bbb
commit 7fcb1be0de
1 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/etc/inc/config.lib.inc
View File

@ -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();