Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

[fa-stable.git] / admin / users.php

diff --git a/admin/users.php b/admin/users.php
index d51426d71614421484974f88fc6631feb63b6343..fbb42a678c2228ce5b3f3237ea1128095f3c78f5 100644 (file)
--- a/admin/users.php
+++ b/admin/users.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/admin/db/users_db.inc");
 simple_page_mode(true);
 //-------------------------------------------------------------------------------------------------
 
-function can_process() 
+function can_process($new) 
 {
 
        if (strlen($_POST['user_id']) < 4)
@@ -33,7 +33,7 @@ function can_process()
                return false;
        }
 
-       if ($_POST['password'] != "") 
+       if (!$new && ($_POST['password'] != ""))
        {
        if (strlen($_POST['password']) < 4)
        {
@@ -58,7 +58,7 @@ function can_process()
 if (($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') && check_csrf_token())
 {
 
-       if (can_process())
+       if (can_process($Mode == 'ADD_ITEM'))
        {
        if ($selected_id != -1) 
        {
@@ -133,7 +133,9 @@ while ($myrow = db_fetch($result))
 
        alt_table_row_color($k);
 
-       $last_visit_date = sql2date($myrow["last_visit_date"]);
+       $time_format = (user_date_format() == 0 ? "h:i a" : "H:i");
+       $last_visit_date = sql2date($myrow["last_visit_date"]). " " . 
+               date($time_format, strtotime($myrow["last_visit_date"]));
 
        /*The security_headings array is defined in config.php */
        $not_me = strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username);