nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

r1984: BIG BROTHER RELEASE // Move user deletion code into authentication module

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1984 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-28 10:48:43 +00:00
parent ef6406d4c9
commit 2be7bfe497
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/authentication/http-auth.inc.php
+6
View File
@@ -65,4 +65,10 @@ function get_userid($username)
return $row['user_id']; return $row['user_id'];
} }
function deluser($username)
{
# Not supported
return 0;
}
?> ?>
html/includes/authentication/ldap.inc.php
+6
View File
@@ -80,4 +80,10 @@ function get_userid($username)
return $row['user_id']; return $row['user_id'];
} }
function deluser($username)
{
# Not supported
return 0;
}
?> ?>
html/includes/authentication/mysql.inc.php
+6
View File
@@ -95,4 +95,10 @@ function get_userid($username)
return $row['user_id']; return $row['user_id'];
} }
function deluser($username)
{
mysql_query("DELETE FROM `users` WHERE `user_id` = '" . mres($_GET['user_id']) . "'");
return mysql_affected_rows();
}
?> ?>
html/pages/adduser.inc.php
+1 -1
View File
@@ -2,7 +2,7 @@
echo("<div style='margin: 10px;'>"); echo("<div style='margin: 10px;'>");
if ($_SESSION['userlevel'] != '10') if ($_SESSION['userlevel'] < '10')
{ {
include("includes/error-no-perm.inc.php"); include("includes/error-no-perm.inc.php");
} }
html/pages/deluser.inc.php
+4 -10
View File
@@ -1,14 +1,13 @@
<?php <?php
echo("<div style='margin: 10px;'>"); echo('<div style="margin: 10px;">');
if ($_SESSION['userlevel'] != '10') { include("includes/error-no-perm.inc.php"); } else if ($_SESSION['userlevel'] < '10') { include("includes/error-no-perm.inc.php"); } else
{ {
echo("<h3>Delete User</h3>"); echo("<h3>Delete User</h3>");
if (auth_usermanagement()) if (auth_usermanagement())
{ {
if ($_GET['action'] == "del") if ($_GET['action'] == "del")
{ {
$delete_username = mysql_result(mysql_query("SELECT username FROM users WHERE user_id = '" . mres($_GET['user_id']) . "'"),0); $delete_username = mysql_result(mysql_query("SELECT username FROM users WHERE user_id = '" . mres($_GET['user_id']) . "'"),0);
@@ -16,11 +15,7 @@ if ($_SESSION['userlevel'] != '10') { include("includes/error-no-perm.inc.php");
if ($_GET['confirm'] == "yes") if ($_GET['confirm'] == "yes")
{ {
mysql_query("DELETE FROM `devices_perms` WHERE `user_id` = '" . mres($_GET['user_id']) . "'"); mysql_query("DELETE FROM `devices_perms` WHERE `user_id` = '" . mres($_GET['user_id']) . "'");
# FIXME v sql query should be replaced by authmodule if (deluser($_GET['user_id'])) { echo("<span class=info>User '$delete_username' deleted!</span>"); }
mysql_query("DELETE FROM `users` WHERE `user_id` = '" . mres($_GET['user_id']) . "'");
if (mysql_affected_rows()) { echo("<span class=info>User '$delete_username' deleted!</span>"); }
} }
else else
{ {
@@ -30,7 +25,6 @@ if ($_SESSION['userlevel'] != '10') { include("includes/error-no-perm.inc.php");
# FIXME v mysql query should be replaced by authmodule # FIXME v mysql query should be replaced by authmodule
$userlist = mysql_query("SELECT * FROM `users`"); $userlist = mysql_query("SELECT * FROM `users`");
while ($userentry = mysql_fetch_array($userlist)) while ($userentry = mysql_fetch_array($userlist))
{ {
$i++; $i++;
@@ -40,7 +34,7 @@ if ($_SESSION['userlevel'] != '10') { include("includes/error-no-perm.inc.php");
} }
else else
{ {
echo("<span class=red>Auth module does not allow user management!</span><br />"); print_error("Authentication module does not allow user management!");
} }
} }