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

Add ability to disable a user.

Browse Source
This commit is contained in:
Mark Crane
2012-08-10 15:53:02 +00:00
parent 7a90a95857
commit 84d5b7b3df
23 changed files with 111 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/users/app_config.php
+5
View File
@@ -160,6 +160,11 @@
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_enabled';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_add_user';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'useradduser';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
core/users/app_defaults.php
+24
View File
@@ -129,6 +129,7 @@
//get the user_uuid
$sql = "select user_uuid from v_users ";
$sql .= "where username = '".$row['username']."' ";
$sql .= "and user_enabled = 'true' ";
$prep_statement_sub = $db->prepare($sql);
$prep_statement_sub->execute();
$sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC);
@@ -144,6 +145,7 @@
else {
//get the number of users
$sql = "select count(*) as num_rows from v_users ";
$sql .= "where user_enabled = 'true' ";
$prep_statement_sub = $db->prepare($sql);
$prep_statement_sub->execute();
$sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC);
@@ -152,6 +154,7 @@
if ($num_rows == 1) {
//get the user_uuid
$sql = "select user_uuid from v_users ";
$sql .= "and user_enabled = 'true' ";
$prep_statement_sub = $db->prepare($sql);
$prep_statement_sub->execute();
$sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC);
@@ -166,4 +169,25 @@
}
}
}
//if there are no permissions listed in v_group_permissions then set the default permissions
$sql = "select count(*) as count from v_users ";
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and user_enabled is null ";
$prep_statement = $db->prepare($sql);
$prep_statement->execute();
$sub_result = $prep_statement->fetch(PDO::FETCH_ASSOC);
unset ($prep_statement);
if ($sub_result['count'] > 0) {
//send output
if ($display_type == "text") {
echo " Users: set enabled=true\n";
}
//set the user_enabled to true
$sql = "update v_users set ";
$sql .= "user_enabled = 'true' ";
$db->exec($sql);
unset($sql);
}
?>
core/users/signup.php
+1
View File
@@ -65,6 +65,7 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
$sql = "SELECT * FROM v_users ";
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and username = '$username' ";
$sql .= "and user_enabled = 'true' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
if (count($prep_statement->fetchAll(PDO::FETCH_NAMED)) > 0) {
core/users/userdelete.php
+2 -2
View File
@@ -38,10 +38,10 @@ else {
$user_uuid = check_str($_GET["id"]);
//get the username from v_users
$sql = "";
$sql .= "select * from v_users ";
$sql = "select * from v_users ";
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and user_uuid = '$user_uuid' ";
$sql .= "and user_enabled = 'true' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
core/users/userlist.php
+8 -8
View File
@@ -85,11 +85,11 @@ echo " <td align=\"center\">\n";
echo "</tr>\n";
//get the user list from the database
$sql = "";
$sql .= " select * from v_users ";
$sql .= " where domain_uuid = '$domain_uuid' ";
$sql = " select * from v_users ";
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and user_enabled = 'true' ";
if (strlen($field_name) > 0 && strlen($field_value) > 0) {
$sql .= " and $field_name = '$field_value' ";
$sql .= "and $field_name = '$field_value' ";
}
if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
$prep_statement = $db->prepare(check_sql($sql));
@@ -104,11 +104,11 @@ echo " <td align=\"center\">\n";
list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page);
$offset = $rows_per_page * $page;
$sql = "";
$sql .= " select * from v_users ";
$sql .= " where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql = "select * from v_users ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and user_enabled = 'true' ";
if (strlen($field_name) > 0 && strlen($field_value) > 0) {
$sql .= " and $field_name like '%$field_value%' ";
$sql .= "and $field_name like '%$field_value%' ";
}
if (strlen($order_by)> 0) {
$sql .= "order by $order_by $order ";
core/users/usersupdate.php
+33 -2
View File
@@ -51,6 +51,7 @@ else {
$sql = "select * from v_users ";
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and user_uuid = '$user_uuid' ";
$sql .= "and user_enabled = 'true' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@@ -118,12 +119,15 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
$user_time_zone = check_str($_POST["user_time_zone"]);
$contact_uuid = check_str($_POST["contact_uuid"]);
$group_member = check_str($_POST["group_member"]);
$user_enabled = check_str($_POST["user_enabled"]);
//if (strlen($password) == 0) { $msg_error .= "Password cannot be blank.<br>\n"; }
//if (strlen($username) == 0) { $msg_error .= "Please provide the username.<br>\n"; }
if ($password != $confirm_password) { $msg_error .= "Passwords did not match.<br>\n"; }
//if (strlen($contact_uuid) == 0) { $msg_error .= "Please provide an email.<br>\n"; }
//if (strlen($user_time_zone) == 0) { $msg_error .= "Please provide an time zone.<br>\n"; }
if (strlen($user_enabled) == 0) { $msg_error .= "Please provide an enable or disable the user.<br>\n"; }
if ($msg_error) {
require_once "includes/header.php";
echo "<div align='center'>";
@@ -240,6 +244,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
$sql .= "salt = '".$salt."', ";
}
$sql .= "user_status = '$user_status', ";
$sql .= "user_enabled = '$user_enabled', ";
if (strlen($contact_uuid) == 0) {
$sql .= "contact_uuid = null ";
}
@@ -294,9 +299,10 @@ else {
}
}
else {
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and username = '$username' ";
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and username = '$username' ";
}
$sql .= "and user_enabled = 'true' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@@ -586,6 +592,31 @@ else {
echo " </td>\n";
echo " </tr>\n";
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " Enabled:\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select class='formfld' name='user_enabled'>\n";
echo " <option value=''></option>\n";
if ($user_enabled == "true" || $user_enabled == "") {
echo " <option value='true' selected='selected'>true</option>\n";
}
else {
echo " <option value='true'>true</option>\n";
}
if ($user_enabled == "false") {
echo " <option value='false' selected='selected'>false</option>\n";
}
else {
echo " <option value='false'>false</option>\n";
}
echo " </select>\n";
echo "<br />\n";
echo "Enable/disable this user.\n";
echo "</td>\n";
echo "</tr>\n";
echo " </table>";
echo "<br>";