* Only delete sessions which are not open in truncate_radacct. Bug noted by Evren...

* Add a user input tag in user_stats.php3

diff --git a/Changelog b/Changelog
index a16efebf2ed9bd20a354b28f1fd3208fa035b570..176691607b28f922dbfaf8f0a50d8d7079e5ed99 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -35,6 +35,8 @@ Ver 1.63:
 * Add 3 more help pages from Stadler Karel <Karel.Stadler@psi.ch> for Service-Type,Framed-Protocol and Filter-ID
 * Make all scripts use the mysql binary instead of DBI  and make the sql password even if it is empty
 * Make log_badlogins work with usernames containing spaces
+* Only delete sessions which are not open in truncate_radacct. Bug noted by Evren Yurtesen <yurtesen@ispro.net.tr>
+* Add a user input tag in user_stats.php3
 Ver 1.62:
 * Remove one sql query from user_admin which was not needed.
 * Instead of a query like "LIKE 'YYYY-MM-DD%'" use "AcctStopTime >= 'YYYY-MM-DD 00:00:00 AND AcctStopTime

diff --git a/bin/truncate_radacct b/bin/truncate_radacct
index b6b52c364205f439ecce4d505a347f6d822200d9..00c6a6ccf609b07a89234c520c353cbf1242dbaf 100755 (executable)
--- a/bin/truncate_radacct
+++ b/bin/truncate_radacct
@@ -29,7 +29,7 @@ $date = POSIX::strftime("%Y-%m-%d %T",$sec,$min,$hour,($mday - $back_days),$mon,
 print "$date\n";
 
 $query = "LOCK TABLES $sql_accounting_table WRITE;";
-$query .= "DELETE FROM $sql_accounting_table WHERE AcctStopTime < '$date';";
+$query .= "DELETE FROM $sql_accounting_table WHERE AcctStopTime < '$date' AND AcctStopTime != 0;";
 $query .= "UNLOCK TABLES;";
 print "$query\n";
 open TMP, ">/tmp/truncate_radacct.query"

diff --git a/htdocs/user_stats.php3 b/htdocs/user_stats.php3
index 1892bb1fb1b408679ea7f0ba8f4aadef5254e0d5..2182cba5690c37ee5e9a0c27614d84df1a404955 100644 (file)
--- a/htdocs/user_stats.php3
+++ b/htdocs/user_stats.php3
@@ -40,6 +40,7 @@ else
        $order_attr = 'ConnNum';
 if ($server != '' && $server != 'all')
        $server_str = "AND NASIPAddress = '$server'";
+$login_str = ($login) ? "AND UserName = '$login' " : '';
 
 $selected[$order] = 'selected';
 $selected[$sortby] = 'selected';
@@ -90,7 +91,7 @@ $link = @da_sql_pconnect($config);
 if ($link){
        $search = @da_sql_query($link,$config,
        "SELECT * FROM $config[sql_total_accounting_table]
-       WHERE AcctDate >= '$start' AND AcctDate <= '$stop' $server_str
+       WHERE AcctDate >= '$start' AND AcctDate <= '$stop' $server_str $login_str
        ORDER BY $order_attr $order $limit;");
 
        if ($search){
@@ -176,7 +177,9 @@ EOM;
 <td><input type="submit" class=button value="show"></td></tr>
 <tr><td>
 <b>On Access Server:</b>
-</td></tr><tr><td>
+</td>
+<td><b>User</b></td></tr>
+<tr><td>
 <select name="server">
 <?php
 while(1){
@@ -196,7 +199,9 @@ if ($server == '' || $server == 'all')
        echo "<option selected value=\"all\">all\n";
 ?>
 </select>
-</td></tr>
+</td>
+<td><input type="text" name="login" size="11" value="<?php echo $login ?>"></td>
+</tr>
 </table></td></tr></form>
 </table>
 </tr>