From f8646de48340a5307d74d1a03fb1de05d557ee91 Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Tue, 28 Jan 2003 15:32:19 +0000
Subject: [PATCH] Add a column Admin in the badusers table which will contain
 the administrator username if that is available

---
 Changelog             | 1 +
 htdocs/badusers.php3  | 6 +++++-
 lib/add_badusers.php3 | 7 +++++--
 sql/badusers.sql      | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 1eec2b9..bc20eb1 100644
--- a/Changelog
+++ b/Changelog
@@ -34,6 +34,7 @@ Ver 1.62:
 * Fix a small problem with debugging
 * Do a write lock in radacct before truncating it in truncate_radacct
 * In user_new show a select box with all the available groups. Based on an idea by Karel Stadler (kstadler)
+* Add a column Admin in the badusers table which will contain the administrator username if that is available
 Ver 1.61:
 * Add a string encoder for greek
 * If general_decode_normal_attributes is set then encode attributes in lib/ldap/change_info. In the near future
diff --git a/htdocs/badusers.php3 b/htdocs/badusers.php3
index be7e5be..1f9df16 100644
--- a/htdocs/badusers.php3
+++ b/htdocs/badusers.php3
@@ -79,7 +79,7 @@ EOM;
 <p>
 	<table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
 	<tr bgcolor="#d0ddb0">
-	<th>#</th><th>user</th><th>date</th><th>reason</th>
+	<th>#</th><th>user</th><th>date</th><th>admin</th><th>reason</th>
 	</tr>
 
 <?php
@@ -95,6 +95,9 @@ if ($link){
 			$user = "$row[UserName]";
 			$date = "$row[Date]";
 			$reason = "$row[Reason]";
+			$admin = "$row[Admin]";
+			if ($admin == '')
+				$admin = '-';
 			if ($reason == '')
 				$reason = '-';
 			echo <<<EOM
@@ -102,6 +105,7 @@ if ($link){
 				<td>$num</td>
 				<td><a href="user_admin.php3?login=$user" title="Edit user $user">$user</a></td>
 				<td>$date</td>
+				<td>$admin</td>
 				<td>$reason</td>
 			</tr>
 EOM;
diff --git a/lib/add_badusers.php3 b/lib/add_badusers.php3
index 9852b10..2eefab2 100644
--- a/lib/add_badusers.php3
+++ b/lib/add_badusers.php3
@@ -9,14 +9,17 @@ else{
 $date=date($config[sql_full_date_format]);
 $lockmsg_name = $attrmap['Dialup-Lock-Msg'] . '0';
 $msg = $$lockmsg_name;
+$admin = '-';
+if ($HTTP_SERVER_VARS["PHP_AUTH_USER"] != '')
+	$admin = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
 if ($msg == '')
 	echo "<b>Lock Message should not be empty</b><br>\n";
 else{
 	$link = @da_sql_pconnect($config);
 	if ($link){
 		$r = da_sql_query($link,$config,
-		"INSERT INTO $config[sql_badusers_table] (UserName,Date,Reason)
-		VALUES ('$login','$date','$msg');");
+		"INSERT INTO $config[sql_badusers_table] (UserName,Date,Admin,Reason)
+		VALUES ('$login','$date','$admin','$msg');");
 		if (!$r)
 			echo "<b>SQL Error:" . da_sql_error($link,$config) . "</b><br>\n";
 	}
diff --git a/sql/badusers.sql b/sql/badusers.sql
index 9dc9689..c5011b9 100644
--- a/sql/badusers.sql
+++ b/sql/badusers.sql
@@ -6,6 +6,7 @@ CREATE TABLE badusers (
   UserName varchar(30),
   Date	datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
   Reason varchar(200),
+  Admin varchar(30) DEFAULT '-',
   PRIMARY KEY (id),
   KEY UserName (UserName),
   KEY Date (Date)
-- 
2.39.5