Add the caller id in the connection status attributes in the show user page

diff --git a/dialup_admin/Changelog b/dialup_admin/Changelog
index 881b4c3..53df19e 100644 (file)
--- a/dialup_admin/Changelog
+++ b/dialup_admin/Changelog
@@ -7,6 +7,7 @@ Ver 1.56:
 * Escape double quotes in attribute values in the user edit page
 * Fix a bug in lib/sql/change_passwd.php3 when not using operators.
   Bug report from Sheldon Fougere <sfougere@solutioninc.com>
+* Add the caller id in the connection status attributes in the show user page
 Ver 1.55:
 * Update the FAQ about missing attributes from the user/group edit pages and add a few comments
   in the configuration files

diff --git a/dialup_admin/htdocs/user_admin.php3 b/dialup_admin/htdocs/user_admin.php3
index d962c48..fb84a2e 100644 (file)
--- a/dialup_admin/htdocs/user_admin.php3
+++ b/dialup_admin/htdocs/user_admin.php3
@@ -181,6 +181,9 @@ if ($link){
                        $lastlog_client_ip = $row['FramedIPAddress'];   
                        $lastlog_server_name = gethostbyaddr($lastlog_server_ip);
                        $lastlog_client_name = gethostbyaddr($lastlog_client_ip);
+                       $lastlog_callerid = $row['CallingStationId'];
+                       if ($lastlog_callerid == '')
+                               $lastlog_callerid = 'not available';
                        $lastlog_input = $row['AcctInputOctets'];
                        if ($lastlog_input)
                                $lastlog_input = bytes2str($lastlog_input);
@@ -208,6 +211,9 @@ if ($link){
                                $lastlog_client_ip = $row['FramedIPAddress'];   
                $lastlog_server_name = ($lastlog_server_ip != '') ? gethostbyaddr($lastlog_server_ip) : '-';
                $lastlog_client_name = ($lastlog_client_ip != '') ? gethostbyaddr($lastlog_client_ip) : '-';
+                               $lastlog_callerid = $row['CallingStationId'];
+                               if ($lastlog_callerid == '')
+                                       $lastlog_callerid = 'not available';
                                $lastlog_input = $row['AcctInputOctets'];
                                $lastlog_input = bytes2str($lastlog_input);
                                $lastlog_output = $row['AcctOutputOctets'];

diff --git a/dialup_admin/html/user_admin.html.php3 b/dialup_admin/html/user_admin.html.php3
index ea1c43e..1dac17f 100644 (file)
--- a/dialup_admin/html/user_admin.html.php3
+++ b/dialup_admin/html/user_admin.html.php3
@@ -110,6 +110,11 @@ if ($logged_now){
        $lastlog_server_port
        </td></tr>
        <tr><td align=center bgcolor="#d0ddb0">
+       Caller Id
+       </td><td>
+       $lastlog_callerid
+       </td></tr>
+       <tr><td align=center bgcolor="#d0ddb0">
        Upload
        </td><td>
        $lastlog_input
@@ -158,6 +163,11 @@ else print <<<EOM
        $lastlog_server_port
        </td></tr>
        <tr><td align=center bgcolor="#d0ddb0">
+       Caller Id
+       </td><td>
+       $lastlog_callerid
+       </td></tr>
+       <tr><td align=center bgcolor="#d0ddb0">
        Upload
        </td><td>
        $lastlog_input