dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update user_edit.php

Browse Source
This commit is contained in:
FusionPBX
2019-09-11 02:34:25 -06:00
committed by GitHub
parent 451c3fe048
commit 6f4fd7bc28
1 changed files with 51 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/users/user_edit.php
+51 -79
View File
@@ -35,7 +35,7 @@
$text = $language->get(); $text = $language->get();
//get user uuid //get user uuid
if ((is_uuid($_REQUEST["id"]) && permission_exists('user_edit')) || (is_uuid($_REQUEST["id"]) && $_REQUEST["id"] == $_SESSION['user_uuid'])) { if ((is_uuid($_REQUEST["id"]) && permission_exists('user_edit')) || (is_uuid($_REQUEST["id"]) && $_REQUEST["id"] == $_SESSION['user_uuid'])) {
$user_uuid = $_REQUEST["id"]; $user_uuid = $_REQUEST["id"];
$action = 'edit'; $action = 'edit';
} }
@@ -98,7 +98,7 @@
//redirect the user //redirect the user
message::add($text['message-update']); message::add($text['message-update']);
header("Location: user_edit.php?id=".$user_uuid); header("Location: user_edit.php?id=".urlencode($user_uuid));
exit; exit;
} }
@@ -144,10 +144,8 @@
if ($username == '') { if ($username == '') {
message::add($text['message-required'].$text['label-username'], 'negative', 7500); message::add($text['message-required'].$text['label-username'], 'negative', 7500);
} }
if ( if ((permission_exists('user_edit') && $action == 'edit' && $username != $username_old && $username != '') ||
(permission_exists('user_edit') && $action == 'edit' && $username != $username_old && $username != '') || (permission_exists('user_add') && $action == 'add' && $username != '')) {
(permission_exists('user_add') && $action == 'add' && $username != '')
) {
$sql = "select count(*) from v_users where username = :username "; $sql = "select count(*) from v_users where username = :username ";
if ($_SESSION["users"]["unique"]["text"] != "global") { if ($_SESSION["users"]["unique"]["text"] != "global") {
$sql .= "and domain_uuid = :domain_uuid "; $sql .= "and domain_uuid = :domain_uuid ";
@@ -206,7 +204,6 @@
//return if error //return if error
if (message::count() != 0) { if (message::count() != 0) {
$_SESSION['tmp'][$_SERVER['PHP_SELF']]['user'] = $_POST;
header("Location: user_edit.php".(permission_exists('user_edit') && $action != 'add' ? "?id=".urlencode($user_uuid) : null)); header("Location: user_edit.php".(permission_exists('user_edit') && $action != 'add' ? "?id=".urlencode($user_uuid) : null));
exit; exit;
} }
@@ -541,84 +538,59 @@
else { else {
message::add($text['message-add'],'positive'); message::add($text['message-add'],'positive');
} }
header("Location: user_edit.php?id=".$user_uuid); header("Location: user_edit.php?id=".urldecode($user_uuid));
exit; exit;
} }
//populate the form with values from session variable //populate the form with values from db
if (is_array($_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']) && sizeof($_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']) != 0) { if ($action == 'edit') {
$domain_uuid = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["domain_uuid"]; $sql = "select * from v_users where user_uuid = :user_uuid ";
$username = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["username"]; if (!permission_exists('user_all')) {
$password = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["password"]; $sql .= "and domain_uuid = :domain_uuid ";
$password_confirm = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["password_confirm"]; $parameters['domain_uuid'] = $domain_uuid;
$api_key = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["api_key"]; }
$user_enabled = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["user_enabled"]; $parameters['user_uuid'] = $user_uuid;
$contact_uuid = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["contact_uuid"]; $database = new database;
$user_status = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']["user_status"]; $row = $database->select($sql, $parameters, 'row');
$password_confirm = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['password_confirm']; if (is_array($row) && sizeof($row) > 0) {
$user_settings['domain']['language']['code'] = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['user_language']; $domain_uuid = $row["domain_uuid"];
$user_settings['domain']['time_zone']['name'] = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['user_time_zone']; $user_uuid = $row["user_uuid"];
$user_email = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['user_email']; $username = $row["username"];
$contact_name_given = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['contact_name_given']; $user_email = $row["user_email"];
$contact_name_family = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['contact_name_family']; $api_key = $row["api_key"];
$contact_organization = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['contact_organization']; $user_enabled = $row["user_enabled"];
$group_uuid_name = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['group_uuid_name']; $contact_uuid = $row["contact_uuid"];
$user_settings["message"]["key"]["text"] = $_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']['message_key']; $user_status = $row["user_status"];
}
else {
message::add($text['message-invalid_user'], 'negative', 7500);
header("Location: user_edit.php?id=".$_SESSION['user_uuid']);
exit;
}
unset($sql, $parameters, $row);
$unsaved = true; //get user settings
unset($_SESSION['tmp'][$_SERVER['PHP_SELF']]['user']); $sql = "select * from v_user_settings ";
} $sql .= "where user_uuid = :user_uuid ";
else { $sql .= "and user_setting_enabled = 'true' ";
//populate the form with values from db $parameters['user_uuid'] = $user_uuid;
if ($action == 'edit') { $database = new database;
$sql = "select * from v_users where user_uuid = :user_uuid "; $result = $database->select($sql, $parameters, 'all');
if (!permission_exists('user_all')) { if (is_array($result)) {
$sql .= "and domain_uuid = :domain_uuid "; foreach($result as $row) {
$parameters['domain_uuid'] = $domain_uuid; $name = $row['user_setting_name'];
} $category = $row['user_setting_category'];
$parameters['user_uuid'] = $user_uuid; $subcategory = $row['user_setting_subcategory'];
$database = new database; if (strlen($subcategory) == 0) {
$row = $database->select($sql, $parameters, 'row'); //$$category[$name] = $row['domain_setting_value'];
if (is_array($row) && sizeof($row) > 0) { $user_settings[$category][$name] = $row['user_setting_value'];
$domain_uuid = $row["domain_uuid"]; }
$user_uuid = $row["user_uuid"]; else {
$username = $row["username"]; $user_settings[$category][$subcategory][$name] = $row['user_setting_value'];
$user_email = $row["user_email"];
$api_key = $row["api_key"];
$user_enabled = $row["user_enabled"];
$contact_uuid = $row["contact_uuid"];
$user_status = $row["user_status"];
}
else {
message::add($text['message-invalid_user'], 'negative', 7500);
header("Location: user_edit.php?id=".$_SESSION['user_uuid']);
exit;
}
unset($sql, $parameters, $row);
//get user settings
$sql = "select * from v_user_settings ";
$sql .= "where user_uuid = :user_uuid ";
$sql .= "and user_setting_enabled = 'true' ";
$parameters['user_uuid'] = $user_uuid;
$database = new database;
$result = $database->select($sql, $parameters, 'all');
if (is_array($result)) {
foreach($result as $row) {
$name = $row['user_setting_name'];
$category = $row['user_setting_category'];
$subcategory = $row['user_setting_subcategory'];
if (strlen($subcategory) == 0) {
//$$category[$name] = $row['domain_setting_value'];
$user_settings[$category][$name] = $row['user_setting_value'];
}
else {
$user_settings[$category][$subcategory][$name] = $row['user_setting_value'];
}
} }
} }
unset($sql, $parameters, $result, $row);
} }
unset($sql, $parameters, $result, $row);
} }
//include the header //include the header
@@ -1063,4 +1035,4 @@
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>