Add a column Admin in the badusers table which will contain the administrator usernam...

diff --git a/Changelog b/Changelog
index 1eec2b9d705f7be6f485112988ca13f9e3b8a2d3..bc20eb1347a4f8ec317b4020c5755d1b9c008a7c 100644 (file)
--- 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 be7e5be616a57598e2284430ad172dae29950c25..1f9df167d5477532763a8ada9521e76ecc4bb67b 100644 (file)
--- 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 9852b10218d23cdd74bba9e4493842a78a4b5e1d..2eefab286738e9ceaf08bda3b0f1c82f8260f813 100644 (file)
--- 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 9dc9689e5a8002ebdf96fd02aaec99eec2b9f2f9..c5011b994551caabafa280a7c839cc68f29e400d 100644 (file)
--- 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)