Fix a small issue with the general_accounting_info_order

diff --git a/AUTHORS b/AUTHORS
index 439babead019b56426340121b683184d95886e3c..fc3346e11e97616e2ed181c4c3d505eb48c8e511 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,3 +16,6 @@ A number of bug reports and a lot of crash testing
 Alex Savguira: alexs@ravdata.com
 Ido Shavit
 Patches for auto generate password
+
+Nick Marino <nickm@kryptontech.com>
+A number of bug reports

diff --git a/Changelog b/Changelog
index 701231fd23fa2437654de2e7116e86d3559b7d61..0debab49386dcaae2a964bf919d5da99a5f65a10 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -19,6 +19,7 @@ Ver 1.60:
 * In lib/functions.php3 pass a second argument to date2timediv with the current time. user_finger calls that
   function for each online user so we now don't need to do a lot of calls to time() but only one. That should make
   user_finger somewhat faster.
+* Fix a small issue with the general_accounting_info_order
 Ver 1.59:
 * Small html fixes in user_edit.php3 and password.php3
 * Show number of failed logins in the last 7 days in the user admin page

diff --git a/htdocs/failed_logins.php3 b/htdocs/failed_logins.php3
index 548cc65752c7286d41c5c1a29e9ef5ec3a2f56e9..45701f9fa34c3883a5dfce02fa4f0f829782ae72 100644 (file)
--- a/htdocs/failed_logins.php3
+++ b/htdocs/failed_logins.php3
@@ -29,7 +29,7 @@ $prev_str = date($config[sql_full_date_format],$start);
 $pagesize = ($pagesize) ? $pagesize : 10;
 $limit = ($pagesize == 'all') ? '' : "LIMIT $pagesize";
 $selected[$pagesize] = 'selected';
-$order = ($order) ? $order : $config[general_accounting_info_order];
+$order = ($order != '') ? $order : $config[general_accounting_info_order];
 if ($order != 'desc' && $order != 'asc')
        $order = 'desc';
 $selected[$order] = 'selected';

diff --git a/htdocs/user_accounting.php3 b/htdocs/user_accounting.php3
index e4d944ae5e9c07b5a71f4386284e82fcb45d5973..86547f3a6c2653e03f2ff1d91c1c60b66d4631ed 100644 (file)
--- a/htdocs/user_accounting.php3
+++ b/htdocs/user_accounting.php3
@@ -28,7 +28,7 @@ $num = 0;
 $pagesize = ($pagesize) ? $pagesize : 10;
 $limit = ($pagesize == 'all') ? '' : "LIMIT $pagesize";
 $selected[$pagesize] = 'selected';
-$order = ($order) ? $order : $config[general_accounting_info_order];
+$order = ($order != '') ? $order : $config[general_accounting_info_order];
 if ($order != 'desc' && $order != 'asc')
        $order = 'desc';
 $selected[$order] = 'selected';