]> git.entuzijast.net Git - freeradius-dialup-admin.git/commitdiff
projects / freeradius-dialup-admin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83333b8)
Add ordering in user_accounting.php3. The results can be either ordered ascending...
authorkkalev <kkalev>
Thu, 7 Feb 2002 09:18:32 +0000 (09:18 +0000)
committerkkalev <kkalev>
Thu, 7 Feb 2002 09:18:32 +0000 (09:18 +0000)
or descending (recent first). Added a corresponding configuration directive.

conf/admin.conf patch | blob | blame | history
htdocs/user_accounting.php3 patch | blob | blame | history

diff --git a/conf/admin.conf b/conf/admin.conf
index 472829a29546fb2ea6a3a10fec74561cec004dc9..0d3d9f46a53086ac90d8c585d2047962f511a0b7 100644 (file)
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -46,6 +46,10 @@ general_auth_request_file: %{general_base_dir}/conf/auth.request
 # can be one of crypt,md5,clear
 #
 general_encryption_method: crypt
+#
+# can be either asc (older dates first) or desc (recent dates first)
+#
+general_accounting_info_order: desc
 
 nas1_name: nas1.%{general_domain}
 nas1_model: Cisco 2511 access server
diff --git a/htdocs/user_accounting.php3 b/htdocs/user_accounting.php3
index e6048f32d19f12bc841690a89411f26e1203445b..4751ef004524ba5d9a80d62d0fec953f94c74fab 100644 (file)
--- a/htdocs/user_accounting.php3
+++ b/htdocs/user_accounting.php3
@@ -26,6 +26,11 @@ $num = 0;
 $pagesize = ($pagesize) ? $pagesize : 10;
 $limit = ($pagesize == 'all') ? '' : "LIMIT $pagesize";
 $selected[$pagesize] = 'selected';
+$order = ($order) ? $order : $config[general_accounting_info_order];
+if ($order != 'desc' && $order != 'asc')
+       $order = 'desc';
+$selected[$order] = 'selected';
+
 
 echo <<<EOM
 <head>
@@ -77,7 +82,7 @@ if ($link){
        $search = @da_sql_query($link,$config,
        "SELECT * FROM $config[sql_accounting_table]
        WHERE UserName = '$login' AND AcctStartTime <= '$now_str'
-       AND AcctStartTime >= '$prev_str' ORDER BY AcctStartTime ASC $limit;");
+       AND AcctStartTime >= '$prev_str' ORDER BY AcctStartTime $order $limit;");
        if ($search){
                while( $row = @da_sql_fetch_array($search,$config) ){
                        $tr_color='white';
@@ -148,7 +153,7 @@ echo <<<EOM
 <tr><td align="center">
        <form action="user_accounting.php3" method="get" name="master">
        <table border=0>
-               <tr><td colspan=5></td>
+               <tr><td colspan=6></td>
                        <td rowspan=3 valign="bottom">
                                <small>
                                the <b>from</b> date matches any login after the 00:00 that day,
@@ -157,8 +162,7 @@ echo <<<EOM
                        </td>
                </tr>
                <tr valign="bottom">
-                       <td><small><b>user</td><td><small><b>from date</td><td><small><b>to date</td><td><small><b>pagesize</td><td>
-&nbsp;</td>
+                       <td><small><b>user</td><td><small><b>from date</td><td><small><b>to date</td><td><small><b>pagesize</td><td><b>order</td>
        <tr valign="middle"><td>
 <input type="text" name="login" size="11" value="$login"></td>
 <td><input type="text" name="prev_str" size="11" value="$prev_str"></td>
@@ -173,6 +177,11 @@ echo <<<EOM
 <option $selected[all] value="all">all
 </select>
 </td>
+<td><select name="order">
+<option $selected[asc] value="asc">older first
+<option $selected[desc] value="desc">recent first
+</select>
+</td>
 EOM;
 ?>
 
FreeRADIUS dialup_admin